From 1c44b38fbd65896ff67a2d784d11518c389f8c94 Mon Sep 17 00:00:00 2001 From: Cyp Date: Fri, 25 Feb 2011 19:57:40 +0100 Subject: [PATCH 01/59] Use std::swap in swapMissionPointers. --- src/mission.cpp | 68 ++++++++++++------------------------------------ src/missiondef.h | 22 ++++++++-------- 2 files changed, 28 insertions(+), 62 deletions(-) diff --git a/src/mission.cpp b/src/mission.cpp index b685bdfd5..d28cf9874 100644 --- a/src/mission.cpp +++ b/src/mission.cpp @@ -1420,63 +1420,29 @@ void processMissionLimbo(void) // Pay special attention on what is getting swapped! void swapMissionPointers(void) { - void *pVoid; - UDWORD udwTemp, inc; - debug(LOG_SAVE, "called"); - // Swap psMapTiles - pVoid = (void*)psMapTiles; - psMapTiles = mission.psMapTiles; - mission.psMapTiles = (MAPTILE *)pVoid; - // Swap map sizes - udwTemp = mapWidth; - mapWidth = mission.mapWidth; - mission.mapWidth = udwTemp; - udwTemp = mapHeight; - mapHeight = mission.mapHeight; - mission.mapHeight = udwTemp; + std::swap(psMapTiles, mission.psMapTiles); + std::swap(mapWidth, mission.mapWidth); + std::swap(mapHeight, mission.mapHeight); //swap gateway zones - pVoid = (void*)gwGetGateways(); + GATEWAY *gateway = gwGetGateways(); gwSetGateways(mission.psGateways); - mission.psGateways = (struct _gateway *)pVoid; - // Swap scroll limits - udwTemp = scrollMinX; - scrollMinX = mission.scrollMinX; - mission.scrollMinX = udwTemp; - udwTemp = scrollMinY; - scrollMinY = mission.scrollMinY; - mission.scrollMinY = udwTemp; - udwTemp = scrollMaxX; - scrollMaxX = mission.scrollMaxX; - mission.scrollMaxX = udwTemp; - udwTemp = scrollMaxY; - scrollMaxY = mission.scrollMaxY; - mission.scrollMaxY = udwTemp; - for (inc = 0; inc < MAX_PLAYERS; inc++) + mission.psGateways = gateway; + std::swap(scrollMinX, mission.scrollMinX); + std::swap(scrollMinY, mission.scrollMinY); + std::swap(scrollMaxX, mission.scrollMaxX); + std::swap(scrollMaxY, mission.scrollMaxY); + for (unsigned inc = 0; inc < MAX_PLAYERS; inc++) { - pVoid = (void*)apsDroidLists[inc]; - apsDroidLists[inc] = mission.apsDroidLists[inc]; - mission.apsDroidLists[inc] = (DROID *)pVoid; - pVoid = (void*)apsStructLists[inc]; - apsStructLists[inc] = mission.apsStructLists[inc]; - mission.apsStructLists[inc] = (STRUCTURE *)pVoid; - pVoid = (void*)apsFeatureLists[inc]; - apsFeatureLists[inc] = mission.apsFeatureLists[inc]; - mission.apsFeatureLists[inc] = (FEATURE *)pVoid; - pVoid = (void*)apsFlagPosLists[inc]; - apsFlagPosLists[inc] = mission.apsFlagPosLists[inc]; - mission.apsFlagPosLists[inc] = (FLAG_POSITION *)pVoid; - pVoid = (void*)apsExtractorLists[inc]; - apsExtractorLists[inc] = mission.apsExtractorLists[inc]; - mission.apsExtractorLists[inc] = (STRUCTURE *)pVoid; + std::swap(apsDroidLists[inc], mission.apsDroidLists[inc]); + std::swap(apsStructLists[inc], mission.apsStructLists[inc]); + std::swap(apsFeatureLists[inc], mission.apsFeatureLists[inc]); + std::swap(apsFlagPosLists[inc], mission.apsFlagPosLists[inc]); + std::swap(apsExtractorLists[inc], mission.apsExtractorLists[inc]); } - pVoid = (void*)apsSensorList[0]; - apsSensorList[0] = mission.apsSensorList[0]; - mission.apsSensorList[0] = (BASE_OBJECT *)pVoid; - pVoid = (void*)apsOilList[0]; - apsOilList[0] = mission.apsOilList[0]; - mission.apsOilList[0] = (FEATURE *)pVoid; + std::swap(apsSensorList[0], mission.apsSensorList[0]); + std::swap(apsOilList[0], mission.apsOilList[0]); } void endMission(void) diff --git a/src/missiondef.h b/src/missiondef.h index 9ddd4aa7d..bb73b9070 100644 --- a/src/missiondef.h +++ b/src/missiondef.h @@ -38,26 +38,26 @@ //this is used to compare the value passed in from the scripts with which is multiplied by 100 #define LZ_COMPROMISED_TIME 99999900 -typedef struct _landing_zone +struct LANDING_ZONE { uint8_t x1; uint8_t y1; uint8_t x2; uint8_t y2; -} LANDING_ZONE; +}; //storage structure for values that need to be kept between missions -typedef struct _mission +struct MISSION { UDWORD type; //defines which start and end functions to use - see levels_type in levels.h MAPTILE *psMapTiles; //the original mapTiles - UDWORD mapWidth; //the original mapWidth - UDWORD mapHeight; //the original mapHeight - struct _gateway *psGateways; //the gateway list - UDWORD scrollMinX; //scroll coords for original map - UDWORD scrollMinY; - UDWORD scrollMaxX; - UDWORD scrollMaxY; + int32_t mapWidth; //the original mapWidth + int32_t mapHeight; //the original mapHeight + struct _gateway * psGateways; //the gateway list + int32_t scrollMinX; //scroll coords for original map + int32_t scrollMinY; + int32_t scrollMaxX; + int32_t scrollMaxY; STRUCTURE *apsStructLists[MAX_PLAYERS], *apsExtractorLists[MAX_PLAYERS]; //original object lists DROID *apsDroidLists[MAX_PLAYERS]; FEATURE *apsFeatureLists[MAX_PLAYERS]; @@ -86,6 +86,6 @@ typedef struct _mission UWORD iTranspExitTileX[MAX_PLAYERS]; UWORD iTranspExitTileY[MAX_PLAYERS]; -} MISSION; +}; #endif // __INCLUDED_MISSIONDEF_H__ From a7730ccd15b0646d59f125cdc79ebf54e1ca40f2 Mon Sep 17 00:00:00 2001 From: Cyp Date: Fri, 25 Feb 2011 21:30:13 +0100 Subject: [PATCH 02/59] Change "typedef struct {...} Blah;" into "struct Blah {...};". Removed a few structs due to disuse. --- lib/framework/SDL_framerate.h | 5 +- lib/framework/configfile.cpp | 6 +- lib/framework/cursors.h | 6 +- lib/framework/debug.h | 12 +- lib/framework/frame.h | 4 +- lib/framework/frameresource.cpp | 4 +- lib/framework/frameresource.h | 12 +- lib/framework/input.cpp | 13 +- lib/framework/input.h | 8 +- lib/framework/lexer_input.h | 6 +- lib/framework/strres.cpp | 4 +- lib/framework/tagfile.cpp | 12 +- lib/framework/treap.cpp | 6 +- lib/gamelib/anim.h | 49 +++--- lib/gamelib/animobj.h | 66 ++----- lib/gamelib/gtime.h | 5 +- lib/gamelib/hashtable.h | 12 +- lib/ivis_opengl/ivisdef.h | 36 ++-- lib/ivis_opengl/pieblitfunc.h | 4 +- lib/ivis_opengl/pieclip.h | 4 +- lib/ivis_opengl/piedef.h | 23 ++- lib/ivis_opengl/piedraw.cpp | 10 +- lib/ivis_opengl/piematrix.cpp | 8 +- lib/ivis_opengl/piestate.h | 7 +- lib/ivis_opengl/pietypes.h | 31 ++-- lib/ivis_opengl/tex.h | 4 +- lib/netplay/netplay.cpp | 8 +- lib/netplay/netplay.h | 51 +++--- lib/netplay/netsocket.h | 4 +- lib/netplay/nettypes.h | 12 +- lib/script/chat_processing.h | 8 +- lib/script/event.h | 32 ++-- lib/script/eventsave.cpp | 4 +- lib/script/interpreter.cpp | 4 +- lib/script/interpreter.h | 52 +++--- lib/script/parse.h | 80 ++++----- lib/script/script.cpp | 2 +- lib/script/script.h | 4 +- lib/script/script_parser.y | 4 +- lib/script/stack.cpp | 6 +- lib/sequence/sequence.cpp | 8 +- lib/sound/audio_id.cpp | 5 +- lib/sound/audio_id.h | 7 +- lib/sound/cdaudio.h | 4 +- lib/sound/oggvorbis.h | 4 +- lib/sound/openal_track.cpp | 12 +- lib/sound/playlist.cpp | 6 +- lib/sound/track.h | 14 +- src/action.cpp | 4 +- src/actiondef.h | 4 +- src/astar.h | 4 +- src/atmos.cpp | 8 +- src/atmos.h | 8 +- src/basedef.h | 4 +- src/bridge.h | 4 +- src/bucket3d.h | 4 +- src/cheat.cpp | 4 +- src/console.cpp | 11 +- src/console.h | 4 +- src/data.cpp | 8 +- src/design.cpp | 12 +- src/difficulty.h | 4 +- src/display.h | 12 +- src/display3d.h | 8 +- src/displaydef.h | 4 +- src/droid.h | 8 +- src/edit3d.h | 8 +- src/effects.cpp | 5 +- src/effects.h | 16 +- src/featuredef.h | 4 +- src/frontend.h | 5 +- src/game.cpp | 299 ++++++++++++++------------------ src/game.h | 8 +- src/gateway.h | 6 +- src/geometry.h | 4 +- src/hci.cpp | 10 +- src/init.h | 8 +- src/intdisplay.h | 22 +-- src/intimage.cpp | 15 +- src/intimage.h | 10 +- src/keymap.cpp | 4 +- src/keymap.h | 17 +- src/levels.cpp | 4 +- src/levels.h | 14 +- src/lighting.h | 8 +- src/loadsave.h | 4 +- src/loop.cpp | 16 +- src/loop.h | 9 +- src/main.cpp | 4 +- src/main.h | 5 +- src/map.cpp | 21 +-- src/map.h | 15 +- src/message_parser.y | 10 +- src/messagedef.h | 48 ++--- src/miscimd.h | 4 +- src/missiondef.h | 4 +- src/move.cpp | 4 +- src/multiint.cpp | 4 +- src/parsetest.h | 4 +- src/power.cpp | 4 +- src/projectile.cpp | 4 +- src/projectiledef.h | 4 +- src/radar.h | 4 +- src/raycast.cpp | 5 +- src/research.h | 3 +- src/researchdef.h | 12 +- src/scores.cpp | 4 +- src/scores.h | 12 +- src/scriptai.h | 8 +- src/scriptfuncs.h | 4 +- src/scriptvals.cpp | 6 +- src/scriptvals.h | 16 +- src/selection.h | 8 +- src/seqdisp.cpp | 12 +- src/seqdisp.h | 4 +- src/structure.cpp | 4 +- src/terrain.cpp | 12 +- src/texture.h | 4 +- src/visibility.cpp | 7 +- src/warcam.h | 4 +- src/warzoneconfig.cpp | 4 +- src/warzoneconfig.h | 7 +- src/wavecast.h | 6 +- src/weapondef.h | 4 +- src/wrappers.cpp | 4 +- src/wrappers.h | 5 +- 126 files changed, 778 insertions(+), 815 deletions(-) diff --git a/lib/framework/SDL_framerate.h b/lib/framework/SDL_framerate.h index 48b31be5e..d7d82d3c3 100644 --- a/lib/framework/SDL_framerate.h +++ b/lib/framework/SDL_framerate.h @@ -22,12 +22,13 @@ /* --------- Structure variables */ - typedef struct { +struct FPSmanager +{ Uint32 framecount; float rateticks; Uint32 lastticks; Uint32 rate; - } FPSmanager; +}; /* Functions return 0 or value for sucess and -1 for error */ diff --git a/lib/framework/configfile.cpp b/lib/framework/configfile.cpp index d871633f3..6c18e8561 100644 --- a/lib/framework/configfile.cpp +++ b/lib/framework/configfile.cpp @@ -29,12 +29,12 @@ #define REGISTRY_HASH_SIZE 32 -typedef struct regkey_t +struct regkey_t { char *key; char *value; - struct regkey_t *next; -} regkey_t; + regkey_t * next; +}; static regkey_t* registry[REGISTRY_HASH_SIZE] = { NULL }; static char RegFilePath[PATH_MAX]; diff --git a/lib/framework/cursors.h b/lib/framework/cursors.h index 2961a12b6..5bb3121af 100644 --- a/lib/framework/cursors.h +++ b/lib/framework/cursors.h @@ -27,7 +27,7 @@ #include -typedef enum +enum CURSOR { CURSOR_ARROW, CURSOR_DEST, @@ -59,7 +59,7 @@ typedef enum CURSOR_SELECT, CURSOR_MAX, -} CURSOR; +}; enum CURSOR_TYPE { @@ -67,7 +67,7 @@ enum CURSOR_TYPE CURSOR_32, }; -extern SDL_Cursor* init_system_cursor(CURSOR cur, enum CURSOR_TYPE type); +extern SDL_Cursor* init_system_cursor(CURSOR cur, CURSOR_TYPE type); extern SDL_Cursor* init_system_cursor16(CURSOR cur); extern SDL_Cursor* init_system_cursor32(CURSOR cur); diff --git a/lib/framework/debug.h b/lib/framework/debug.h index 51bc95a0a..06a284819 100644 --- a/lib/framework/debug.h +++ b/lib/framework/debug.h @@ -147,7 +147,8 @@ template<> class StaticAssert{}; ***/ /** Debug enums. Must match code_part_names in debug.c */ -typedef enum { +enum code_part +{ LOG_ALL, /* special: sets all to on */ LOG_MAIN, LOG_SOUND, @@ -181,7 +182,7 @@ typedef enum { LOG_POPUP, // special, on by default, for both debug & release builds (used for OS dependent popup code) LOG_CONSOLE, // send console messages to file LOG_LAST /**< _must_ be last! */ -} code_part; +}; extern bool enabled_debug[LOG_LAST]; @@ -189,13 +190,14 @@ typedef void (*debug_callback_fn)(void**, const char*); typedef bool (*debug_callback_init)(void**); typedef void (*debug_callback_exit)(void**); -typedef struct _debug_callback { - struct _debug_callback * next; +struct debug_callback +{ + debug_callback * next; debug_callback_fn callback; /// Function which does the output debug_callback_init init; /// Setup function debug_callback_exit exit; /// Cleaning function void * data; /// Used to pass data to the above functions. Eg a filename or handle. -} debug_callback; +}; /** * Call once to initialize the debug logging system. diff --git a/lib/framework/frame.h b/lib/framework/frame.h index 34585abc6..6ab6317f7 100644 --- a/lib/framework/frame.h +++ b/lib/framework/frame.h @@ -60,11 +60,11 @@ typedef uint16_t PlayerMask; #error Warzone 2100 is not a MMO. #endif -typedef enum +enum QUEUE_MODE { ModeQueue, ///< Sends a message on the game queue, which will get synchronised, by sending a GAME_ message. ModeImmediate ///< Performs the action immediately. Must already have been synchronised, for example by sending a GAME_ message. -} QUEUE_MODE; +}; /** Initialise the framework library diff --git a/lib/framework/frameresource.cpp b/lib/framework/frameresource.cpp index cb3ec49f3..ad1ebe8fe 100644 --- a/lib/framework/frameresource.cpp +++ b/lib/framework/frameresource.cpp @@ -251,12 +251,12 @@ void SetLastResourceFilename(const char *pName) // Structure for each file currently in use in the resource ... probably only going to be one ... but we will handle upto MAXLOADEDRESOURCE -typedef struct +struct RESOURCEFILE { char *pBuffer; // a pointer to the data UDWORD size; // number of bytes UBYTE type; // what type of resource is it -} RESOURCEFILE; +}; #define RESFILETYPE_EMPTY (0) // empty entry #define RESFILETYPE_PC_SBL (1) // Johns SBL stuff diff --git a/lib/framework/frameresource.h b/lib/framework/frameresource.h index 639b47537..5f3fabc93 100644 --- a/lib/framework/frameresource.h +++ b/lib/framework/frameresource.h @@ -44,23 +44,23 @@ typedef void (*RES_FREE)(void *pData); /** callback type for resload display callback. */ typedef void (*RESLOAD_CALLBACK)(void); -typedef struct res_data +struct RES_DATA { void *pData; // pointer to the acutal data SDWORD blockID; // which of the blocks is it in (so we can clear some of them...) UDWORD HashedID; // hashed version of the name of the id - struct res_data *psNext; // next entry - most likely to be following on! + RES_DATA * psNext; // next entry - most likely to be following on! UDWORD usage; // Reference count // ID of the resource - filename from the .wrf - e.g. "TRON.PIE" const char* aID; -} RES_DATA; +}; // New reduced resource type ... specially for PSX // These types are statically defined in data.c -typedef struct _res_type +struct RES_TYPE { // type is still needed on psx ... strings are defined in source - data.c (yak!) char aType[RESTYPE_MAXCHAR]; // type string (e.g. "PIE" - just for debug use only, only aplicable when loading from wrf (not wdg) @@ -73,8 +73,8 @@ typedef struct _res_type UDWORD HashedType; // hashed version of the name of the id - // a null hashedtype indicates end of list RES_FILELOAD fileLoad; // This isn't really used any more ? - struct _res_type *psNext; -} RES_TYPE; + RES_TYPE * psNext; +}; /** Set the function to call when loading files with resloadfile. */ diff --git a/lib/framework/input.cpp b/lib/framework/input.cpp index 03604567b..4f38f36d1 100644 --- a/lib/framework/input.cpp +++ b/lib/framework/input.cpp @@ -36,7 +36,7 @@ #include "lib/gamelib/gtime.h" /* The possible states for keys */ -typedef enum _key_state +enum KEY_STATE { KEY_UP, KEY_PRESSED, @@ -45,14 +45,15 @@ typedef enum _key_state KEY_PRESSRELEASE, // When a key goes up and down in a frame KEY_DOUBLECLICK, // Only used by mouse keys KEY_DRAG, // Only used by mouse keys -} KEY_STATE; +}; -typedef struct _input_state { +struct INPUT_STATE +{ KEY_STATE state; /// Last key/mouse state UDWORD lastdown; /// last key/mouse button down timestamp Vector2i pressPos; ///< Location of last mouse press event. Vector2i releasePos; ///< Location of last mouse release event. -} INPUT_STATE; +}; /// constant for the interval between 2 singleclicks for doubleclick event in ms #define DOUBLE_CLICK_INTERVAL 250 @@ -80,11 +81,11 @@ static INPUT_STATE aMouseState[6]; #define INPUT_MAXSTR 512 /* The input string buffer */ -typedef struct _InputKey +struct InputKey { UDWORD key; utf_32_char unicode; -} InputKey; +}; static InputKey pInputBuffer[INPUT_MAXSTR]; static InputKey *pStartBuffer, *pEndBuffer; diff --git a/lib/framework/input.h b/lib/framework/input.h index 36e7d16c9..06f73066c 100644 --- a/lib/framework/input.h +++ b/lib/framework/input.h @@ -36,7 +36,7 @@ #include "vector.h" /** Defines for all the key codes used. */ -typedef enum _key_code +enum KEY_CODE { KEY_ESC =SDLK_ESCAPE, KEY_1 =SDLK_1, @@ -143,7 +143,7 @@ typedef enum _key_code KEY_KPENTER =SDLK_KP_ENTER, KEY_IGNORE =5190 -} KEY_CODE; +}; /** The largest possible scan code. */ #define KEY_MAXSCAN SDLK_LAST @@ -170,14 +170,14 @@ extern bool keyPressed(KEY_CODE code); /** This returns true if the key went from being down to being up this frame. */ extern bool keyReleased(KEY_CODE code); -typedef enum _mouse_key_code +enum MOUSE_KEY_CODE { MOUSE_LMB = SDL_BUTTON_LEFT, MOUSE_MMB = SDL_BUTTON_MIDDLE, MOUSE_RMB = SDL_BUTTON_RIGHT, MOUSE_WUP = SDL_BUTTON_WHEELUP, MOUSE_WDN = SDL_BUTTON_WHEELDOWN -} MOUSE_KEY_CODE; +}; /** Return the current X position of the mouse. */ extern Uint16 mouseX(void) WZ_DECL_PURE; diff --git a/lib/framework/lexer_input.h b/lib/framework/lexer_input.h index d9ca9c769..d08d95822 100644 --- a/lib/framework/lexer_input.h +++ b/lib/framework/lexer_input.h @@ -30,7 +30,7 @@ enum lexinput_type LEXINPUT_BUFFER, }; -typedef struct +struct lexerinput_t { union { @@ -42,8 +42,8 @@ typedef struct const char* end; } buffer; } input; - enum lexinput_type type; -} lexerinput_t; + lexinput_type type; +}; #ifdef YY_EXTRA_TYPE # undef YY_EXTRA_TYPE diff --git a/lib/framework/strres.cpp b/lib/framework/strres.cpp index cab17df66..5546516aa 100644 --- a/lib/framework/strres.cpp +++ b/lib/framework/strres.cpp @@ -37,10 +37,10 @@ #include "strresly.h" /* A String Resource */ -typedef struct STR_RES +struct STR_RES { struct TREAP_NODE** psIDTreap; ///< The treap to store string identifiers -} STR_RES; +}; /* Initialise the string system */ STR_RES* strresCreate() diff --git a/lib/framework/tagfile.cpp b/lib/framework/tagfile.cpp index 38e2b4ac4..c41f95295 100644 --- a/lib/framework/tagfile.cpp +++ b/lib/framework/tagfile.cpp @@ -26,15 +26,15 @@ enum internal_types }; // A definition group -typedef struct _define +struct define_t { unsigned int vm; //! value multiple element_t element; //! tag number char vr[2]; //! value representation (type) - struct _define *parent; //! parent group - struct _define *group; //! child group - struct _define *next; //! sibling group - struct _define *current; //! where in the sibling list we currently are + define_t *parent; //! parent group + define_t *group; //! child group + define_t *next; //! sibling group + define_t *current; //! where in the sibling list we currently are bool defaultval; //! default value union { uint32_t uint32_tval; @@ -44,7 +44,7 @@ typedef struct _define // debugging temp variables below int countItems; // check group items against number of separators given int expectedItems; // group items expected in current group -} define_t; +}; static bool tag_error = false; // are we in an error condition? diff --git a/lib/framework/treap.cpp b/lib/framework/treap.cpp index 236a9f090..b5c98334d 100644 --- a/lib/framework/treap.cpp +++ b/lib/framework/treap.cpp @@ -34,13 +34,13 @@ #include "debug.h" #include "treap.h" -typedef struct TREAP_NODE +struct TREAP_NODE { const char* key; //< The key to sort the node on unsigned int priority; //< Treap priority const char* string; //< The string stored in the treap - struct TREAP_NODE *psLeft, *psRight; //< The sub trees -} TREAP_NODE; + TREAP_NODE *psLeft, *psRight; //< The sub trees +}; /* A useful comparison function - keys are char pointers */ static int treapStringCmp(const char *key1, const char *key2) diff --git a/lib/gamelib/anim.h b/lib/gamelib/anim.h index 054a4003b..4357a3ff8 100644 --- a/lib/gamelib/anim.h +++ b/lib/gamelib/anim.h @@ -17,18 +17,15 @@ along with Warzone 2100; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -/***************************************************************************/ /*! \file anim.h * \brief Animation types and function headers * * Gareth Jones 11/7/97 */ -/***************************************************************************/ #ifndef _ANIM_H_ #define _ANIM_H_ -/***************************************************************************/ #include @@ -40,16 +37,13 @@ #define NO_ANIM 0xFFFD #define NO_IMD 0xFFFC -/***************************************************************************/ -typedef enum +enum ANIM_MODE { - ANIM_2D, - ANIM_3D_FRAMES, + ANIM_3D_FRAMES = 1, ANIM_3D_TRANS -} ANIM_MODE; +}; -/***************************************************************************/ struct ANIM_STATE; struct BASEANIM; @@ -66,36 +60,35 @@ struct BASEANIM; struct ANIM_STATE *psStates; \ struct BASEANIM *psNext; -/* ensure ANIM2D/3D structs same size */ -#define ANIM_3D_ELEMENTS \ - ANIM_BASE_ELEMENTS \ - iIMDShape *psFrames; \ - iIMDShape **apFrame; -/***************************************************************************/ - -typedef struct ANIM_STATE +struct ANIM_STATE { UWORD uwFrame; /* frame to play */ Vector3i vecPos; Vector3i vecAngle; Vector3i vecScale; -} -ANIM_STATE; +}; -typedef struct BASEANIM +struct BASEANIM { - ANIM_BASE_ELEMENTS -} -BASEANIM; + char szFileName[ANIM_MAX_STR]; + char animType; + UWORD uwID; + UWORD uwFrameRate; + UWORD uwStates; + UWORD uwObj; + UWORD uwAnimTime; + ANIM_MODE ubType; + ANIM_STATE * psStates; + BASEANIM * psNext; +}; -typedef struct ANIM3D +struct ANIM3D : public BASEANIM { - ANIM_3D_ELEMENTS -} -ANIM3D; + iIMDShape * psFrames; + iIMDShape ** apFrame; +}; -/***************************************************************************/ BOOL anim_Init(void); BOOL anim_Shutdown(void); diff --git a/lib/gamelib/animobj.h b/lib/gamelib/animobj.h index 396204a25..c3c952ceb 100644 --- a/lib/gamelib/animobj.h +++ b/lib/gamelib/animobj.h @@ -28,65 +28,39 @@ #ifndef _ANIMOBJ_H_ #define _ANIMOBJ_H_ -/***************************************************************************/ - #include "anim.h" -/***************************************************************************/ #define ANIM_MAX_COMPONENTS 10 -/***************************************************************************/ -/* forward struct declarations */ - -struct ANIM_OBJECT; -struct COMPONENT_OBJECT; - -/***************************************************************************/ -/* typedefs */ typedef void (* ANIMOBJDONEFUNC) ( struct ANIM_OBJECT *psObj ); typedef BOOL (* ANIMOBJDIEDTESTFUNC) ( void *psParent ); -/***************************************************************************/ -/* struct member macros */ - -#define COMPONENT_ELEMENTS(pointerType) \ - Vector3i position; \ - Vector3i orientation; \ - void *psParent; \ - iIMDShape *psShape; - -#define ANIM_OBJECT_ELEMENTS(pointerType) \ - UWORD uwID; \ - ANIM3D *psAnim; \ - void *psParent; \ - UDWORD udwStartTime; \ - UDWORD udwStartDelay; \ - UWORD uwCycles; \ - BOOL bVisible; \ - ANIMOBJDONEFUNC pDoneFunc; \ - /* this must be the last entry in this structure */ \ - COMPONENT_OBJECT apComponents[ANIM_MAX_COMPONENTS]; - -/***************************************************************************/ - -typedef struct COMPONENT_OBJECT +struct COMPONENT_OBJECT { - COMPONENT_ELEMENTS( struct COMPONENT_OBJECT ) -} -COMPONENT_OBJECT; + Vector3i position; + Vector3i orientation; + void * psParent; + iIMDShape * psShape; +}; -typedef struct ANIM_OBJECT +struct ANIM_OBJECT { - struct ANIM_OBJECT *psNext; + ANIM_OBJECT * psNext; + UWORD uwID; + ANIM3D * psAnim; + void * psParent; + UDWORD udwStartTime; + UDWORD udwStartDelay; + UWORD uwCycles; + BOOL bVisible; + ANIMOBJDONEFUNC pDoneFunc; /* this must be the last entry in this structure */ - ANIM_OBJECT_ELEMENTS( struct ANIM_OBJECT ) -} -ANIM_OBJECT; + COMPONENT_OBJECT apComponents[ANIM_MAX_COMPONENTS]; +}; -/***************************************************************************/ BOOL animObj_Init( ANIMOBJDIEDTESTFUNC pDiedFunc ); void animObj_Update( void ); @@ -103,8 +77,4 @@ ANIM_OBJECT * animObj_GetFirst( void ); ANIM_OBJECT * animObj_GetNext( void ); ANIM_OBJECT * animObj_Find( void *pParentObj, int iAnimID ); -/***************************************************************************/ - #endif /* _ANIMOBJ_H_ */ - -/***************************************************************************/ diff --git a/lib/gamelib/gtime.h b/lib/gamelib/gtime.h index f52de2123..00d503350 100644 --- a/lib/gamelib/gtime.h +++ b/lib/gamelib/gtime.h @@ -24,8 +24,7 @@ #ifndef _gtime_h #define _gtime_h -//#include "lib/netplay/nettypes.h" -typedef struct _netqueue NETQUEUE_; +struct NETQUEUE; /// The number of time units per second of the game clock. #define GAME_TICKS_PER_SEC 1000 @@ -157,7 +156,7 @@ static inline float realTimeAdjustedIncrement(float value) } void sendPlayerGameTime(void); ///< Sends a GAME_GAME_TIME message with gameTime plus latency to our game queues. -void recvPlayerGameTime(NETQUEUE_ queue); ///< Processes a GAME_GAME_TIME message. +void recvPlayerGameTime(NETQUEUE queue); ///< Processes a GAME_GAME_TIME message. bool checkPlayerGameTime(unsigned player); ///< Checks that we are not waiting for a GAME_GAME_TIME message from this player. (player can be NET_ALL_PLAYERS.) void setPlayerGameTime(unsigned player, uint32_t time); ///< Sets the player's time. diff --git a/lib/gamelib/hashtable.h b/lib/gamelib/hashtable.h index c9378e045..dcbf59156 100644 --- a/lib/gamelib/hashtable.h +++ b/lib/gamelib/hashtable.h @@ -60,16 +60,15 @@ typedef void (* HASHFREEFUNC) ( void *psElement ); /* structs */ -typedef struct HASHNODE +struct HASHNODE { intptr_t iKey1; intptr_t iKey2; void *psElement; - struct HASHNODE *psNext; -} -HASHNODE; + HASHNODE * psNext; +}; -typedef struct HASHTABLE +struct HASHTABLE { HASHNODE **ppsNode; HASHNODE *psNextNode; @@ -80,8 +79,7 @@ typedef struct HASHTABLE UDWORD udwExtElements; UDWORD udwElementSize; UDWORD sdwCurIndex; -} -HASHTABLE; +}; /***************************************************************************/ /* functions diff --git a/lib/ivis_opengl/ivisdef.h b/lib/ivis_opengl/ivisdef.h index 9be566d24..57f145f17 100644 --- a/lib/ivis_opengl/ivisdef.h +++ b/lib/ivis_opengl/ivisdef.h @@ -37,16 +37,20 @@ // screen surface structure // //************************************************************************* -typedef struct { int32_t left, top, right, bottom; } iClip; +struct iClip +{ + int32_t left, top, right, bottom; +}; -typedef struct _iSurface { +struct iSurface +{ int xcentre; int ycentre; iClip clip; int width; int height; -} iSurface; +}; //************************************************************************* // @@ -55,12 +59,13 @@ typedef struct _iSurface { //************************************************************************* /// Stores the from and to verticles from an edge -typedef struct edge_ +struct EDGE { int from, to; -} EDGE; +}; -typedef struct { +struct iIMDPoly +{ uint32_t flags; int32_t zcentre; unsigned int npnts; @@ -68,9 +73,10 @@ typedef struct { int pindex[3]; Vector2f *texCoord; Vector2f texAnim; -} iIMDPoly; +}; -typedef struct _iIMDShape { +struct iIMDShape +{ unsigned int flags; int texpage; int tcmaskpage; @@ -95,8 +101,8 @@ typedef struct _iIMDShape { float material[LIGHT_MAX][4]; float shininess; - struct _iIMDShape *next; // next pie in multilevel pies (NULL for non multilevel !) -} iIMDShape; + iIMDShape *next; // next pie in multilevel pies (NULL for non multilevel !) +}; //************************************************************************* @@ -105,7 +111,8 @@ typedef struct _iIMDShape { // //************************************************************************* -typedef struct { +struct IMAGEDEF +{ unsigned int TPageID; /**< Which associated file to read our info from */ unsigned int Tu; /**< First vertex coordinate */ unsigned int Tv; /**< Second vertex coordinate */ @@ -113,13 +120,14 @@ typedef struct { unsigned int Height; /**< Height of image */ int XOffset; /**< X offset into source position */ int YOffset; /**< Y offset into source position */ -} IMAGEDEF; +}; #define MAX_NUM_TPAGEIDS 16 -typedef struct { +struct IMAGEFILE +{ int NumImages; /**< Number of images contained here */ int TPageIDs[MAX_NUM_TPAGEIDS]; /**< OpenGL Texture IDs */ IMAGEDEF *ImageDefs; /**< Stored images */ -} IMAGEFILE; +}; #endif // _ivisdef_h diff --git a/lib/ivis_opengl/pieblitfunc.h b/lib/ivis_opengl/pieblitfunc.h index c657cc07e..b02b33d6d 100644 --- a/lib/ivis_opengl/pieblitfunc.h +++ b/lib/ivis_opengl/pieblitfunc.h @@ -77,12 +77,12 @@ extern void pie_RenderRadar(int x, int y, int width, int height); extern void pie_UploadDisplayBuffer(void); -typedef enum _screenType +enum SCREENTYPE { SCREEN_RANDOMBDROP, SCREEN_CREDITS, SCREEN_MISSIONEND, -} SCREENTYPE; +}; extern void pie_LoadBackDrop(SCREENTYPE screenType); diff --git a/lib/ivis_opengl/pieclip.h b/lib/ivis_opengl/pieclip.h index a558a2b23..742f05e25 100644 --- a/lib/ivis_opengl/pieclip.h +++ b/lib/ivis_opengl/pieclip.h @@ -41,12 +41,12 @@ */ /***************************************************************************/ -typedef struct +struct CLIP_VERTEX { Vector3i pos; unsigned int u, v; PIELIGHT light; -} CLIP_VERTEX; +}; /***************************************************************************/ /* diff --git a/lib/ivis_opengl/piedef.h b/lib/ivis_opengl/piedef.h index 094a3bc35..968f63776 100644 --- a/lib/ivis_opengl/piedef.h +++ b/lib/ivis_opengl/piedef.h @@ -42,13 +42,28 @@ */ /***************************************************************************/ -typedef struct { UBYTE r, g, b, a; } PIELIGHTBYTES; +struct PIELIGHTBYTES +{ + uint8_t r, g, b, a; +}; /** Our basic colour type. Use whenever you want to define a colour. * Set bytes separetely, and do not assume a byte order between the components. */ -typedef union { PIELIGHTBYTES byte; UDWORD rgba; UBYTE vector[4]; } PIELIGHT; -typedef struct {SWORD x, y, w, h;} PIERECT; /**< Screen rectangle. */ -typedef struct {SDWORD texPage; SWORD tu, tv, tw, th;} PIEIMAGE; /**< An area of texture. */ +union PIELIGHT +{ + PIELIGHTBYTES byte; + UDWORD rgba; + UBYTE vector[4]; +}; +struct PIERECT ///< Screen rectangle. +{ + SWORD x, y, w, h; +}; +struct PIEIMAGE ///< An area of texture. +{ + SDWORD texPage; + SWORD tu, tv, tw, th; +}; /***************************************************************************/ /* diff --git a/lib/ivis_opengl/piedraw.cpp b/lib/ivis_opengl/piedraw.cpp index 4134d6772..47fa9ce92 100644 --- a/lib/ivis_opengl/piedraw.cpp +++ b/lib/ivis_opengl/piedraw.cpp @@ -105,22 +105,24 @@ void pie_EndLighting(void) * Avoids recalculating vertex projections for every poly ***************************************************************************/ -typedef struct { +struct shadowcasting_shape_t +{ float matrix[16]; iIMDShape* shape; int flag; int flag_data; Vector3f light; -} shadowcasting_shape_t; +}; -typedef struct { +struct transluscent_shape_t +{ float matrix[16]; iIMDShape* shape; int frame; PIELIGHT colour; int flag; int flag_data; -} transluscent_shape_t; +}; static shadowcasting_shape_t* scshapes = NULL; static unsigned int scshapes_size = 0; diff --git a/lib/ivis_opengl/piematrix.cpp b/lib/ivis_opengl/piematrix.cpp index 150b7f651..1e617eeb6 100644 --- a/lib/ivis_opengl/piematrix.cpp +++ b/lib/ivis_opengl/piematrix.cpp @@ -44,7 +44,13 @@ * [ c f i l ] * [ 0 0 0 1 ] */ -typedef struct { SDWORD a, b, c, d, e, f, g, h, i, j, k, l; } SDMATRIX; +struct SDMATRIX +{ + SDWORD a, b, c, + d, e, f, + g, h, i, + j, k, l; +}; static SDMATRIX aMatrixStack[MATRIX_MAX]; static SDMATRIX *psMatrix = &aMatrixStack[0]; diff --git a/lib/ivis_opengl/piestate.h b/lib/ivis_opengl/piestate.h index fe686e52e..073053292 100644 --- a/lib/ivis_opengl/piestate.h +++ b/lib/ivis_opengl/piestate.h @@ -40,16 +40,15 @@ */ /***************************************************************************/ -typedef struct RENDER_STATE - { +struct RENDER_STATE +{ BOOL fogEnabled; BOOL fog; PIELIGHT fogColour; SDWORD texPage; REND_MODE rendMode; BOOL keyingOn; - } - RENDER_STATE; +}; /***************************************************************************/ /* diff --git a/lib/ivis_opengl/pietypes.h b/lib/ivis_opengl/pietypes.h index d0d005352..61b18af39 100644 --- a/lib/ivis_opengl/pietypes.h +++ b/lib/ivis_opengl/pietypes.h @@ -58,52 +58,59 @@ #define pie_RAISE_SCALE 256 -typedef enum +enum LIGHTING_TYPE { LIGHT_EMISSIVE, LIGHT_AMBIENT, LIGHT_DIFFUSE, LIGHT_SPECULAR, LIGHT_MAX -} LIGHTING_TYPE; +}; -typedef enum +enum REND_MODE { REND_ALPHA, REND_ADDITIVE, REND_OPAQUE, REND_MULTIPLICATIVE -} REND_MODE; +}; -typedef enum +enum DEPTH_MODE { DEPTH_CMP_LEQ_WRT_ON, DEPTH_CMP_ALWAYS_WRT_ON, DEPTH_CMP_LEQ_WRT_OFF, DEPTH_CMP_ALWAYS_WRT_OFF -} DEPTH_MODE; +}; -typedef enum +enum TEXPAGE_TYPE { TEXPAGE_NONE = -1, TEXPAGE_EXTERN = -2 -} TEXPAGE_TYPE; +}; -typedef enum SHADER_MODE +enum SHADER_MODE { SHADER_NONE, SHADER_COMPONENT, SHADER_BUTTON, SHADER_MAX -} SHADER_MODE; +}; //************************************************************************* // // Simple derived types // //************************************************************************* -typedef struct { Vector3i p, r; } iView; +struct iView +{ + Vector3i p, r; +}; -typedef struct { unsigned int width, height, depth; unsigned char *bmp; } iV_Image; +struct iV_Image +{ + unsigned int width, height, depth; + unsigned char *bmp; +}; #endif // _pieTypes_h diff --git a/lib/ivis_opengl/tex.h b/lib/ivis_opengl/tex.h index 2e4cf2d7d..64b660e06 100644 --- a/lib/ivis_opengl/tex.h +++ b/lib/ivis_opengl/tex.h @@ -33,11 +33,11 @@ //************************************************************************* -typedef struct +struct iTexPage { char name[iV_TEXNAME_MAX]; GLuint id; -} iTexPage; +}; //************************************************************************* diff --git a/lib/netplay/netplay.cpp b/lib/netplay/netplay.cpp index 8384bfb5a..a127b26a1 100644 --- a/lib/netplay/netplay.cpp +++ b/lib/netplay/netplay.cpp @@ -97,20 +97,20 @@ SYNC_COUNTER sync_counter; // keeps track on how well we are in sync // //////////////////////////////////////////////////////////////////////// // Types -typedef struct // data regarding the last one second or so. +struct NETSTATS // data regarding the last one second or so. { UDWORD bytesRecvd; UDWORD bytesSent; // number of bytes sent in about 1 sec. UDWORD packetsSent; UDWORD packetsRecvd; -} NETSTATS; +}; -typedef struct +struct NET_PLAYER_DATA { uint16_t size; void* data; size_t buffer_size; -} NET_PLAYER_DATA; +}; // //////////////////////////////////////////////////////////////////////// // Variables diff --git a/lib/netplay/netplay.h b/lib/netplay/netplay.h index 210617c9f..59ebeb0d8 100644 --- a/lib/netplay/netplay.h +++ b/lib/netplay/netplay.h @@ -31,7 +31,7 @@ // Lobby Connection errors -typedef enum +enum LOBBY_ERROR_TYPES { ERROR_NOERROR, ERROR_CONNECTION, @@ -43,9 +43,9 @@ typedef enum ERROR_HOSTDROPPED, ERROR_WRONGDATA, ERROR_UNKNOWNFILEISSUE -} LOBBY_ERROR_TYPES; +}; -typedef enum +enum CONNECTION_STATUS { CONNECTIONSTATUS_PLAYER_DROPPED, CONNECTIONSTATUS_PLAYER_LEAVING, @@ -53,9 +53,9 @@ typedef enum CONNECTIONSTATUS_WAITING_FOR_PLAYER, CONNECTIONSTATUS_NORMAL -} CONNECTION_STATUS; +}; -typedef enum +enum MESSAGE_TYPES { NET_MIN_TYPE = 33, ///< Minimum-1 valid NET_ type, *MUST* be first. NET_PING, ///< ping players. @@ -119,7 +119,7 @@ typedef enum GAME_DROIDDISEMBARK, ///< droid disembarked from a Transporter // End of redundant messages. GAME_MAX_TYPE ///< Maximum+1 valid GAME_ type, *MUST* be last. -} MESSAGE_TYPES; +}; //#define SYNC_FLAG (NUM_GAME_PACKETS * NUM_GAME_PACKETS) //special flag used for logging. #define SYNC_FLAG 0x10000000 //special flag used for logging. (Not sure what this is. Was added in trunk, NUM_GAME_PACKETS not in newnet.) @@ -139,20 +139,21 @@ typedef enum #define MAX_CONNECTED_PLAYERS MAX_PLAYERS #define MAX_TMP_SOCKETS 16 -typedef struct { //Available game storage... JUST FOR REFERENCE! +struct SESSIONDESC //Available game storage... JUST FOR REFERENCE! +{ int32_t dwSize; int32_t dwFlags; char host[40]; // host's ip address (can fit a full IPv4 and IPv6 address + terminating NUL) int32_t dwMaxPlayers; int32_t dwCurrentPlayers; int32_t dwUserFlags[4]; -} SESSIONDESC; +}; /** * @note when changing this structure, NETsendGAMESTRUCT, NETrecvGAMESTRUCT and * the lobby server should be changed accordingly. */ -typedef struct +struct GAMESTRUCT { /* Version of this structure and thus the binary lobby protocol. * @NOTE: MUST be the first item of this struct. @@ -179,7 +180,7 @@ typedef struct uint32_t future2; // for future use uint32_t future3; // for future use uint32_t future4; // for future use -} GAMESTRUCT; +}; // //////////////////////////////////////////////////////////////////////// // Message information. ie. the packets sent between machines. @@ -187,7 +188,8 @@ typedef struct #define NET_ALL_PLAYERS 255 #define NET_HOST_ONLY 0 // the following structure is going to be used to track if we sync or not -typedef struct { +struct SYNC_COUNTER +{ uint64_t sentDroidCheck; uint64_t unsentDroidCheck; uint64_t sentStructureCheck; @@ -205,9 +207,9 @@ typedef struct { uint16_t cantjoin; uint16_t banned; uint16_t rejected; -} SYNC_COUNTER; +}; -typedef struct +struct WZFile { PHYSFS_file *pFileHandle; // handle PHYSFS_sint32 fileSize_32; // size @@ -215,21 +217,21 @@ typedef struct BOOL isSending; // sending to this player BOOL isCancelled; // player cancelled int32_t filetype; // future use (1=map 2=mod 3=...) -} WZFile; +}; -typedef struct +struct wzFileStatus { int32_t player; // the client we sent data to int32_t done; // how far done we are (100= finished) int32_t byteCount; // current byte count -} wzFileStatus; +}; -typedef enum +enum wzFileEnum { WZ_FILE_OK, ALREADY_HAVE_FILE, STUCK_IN_FILE_LOOP -} wzFileEnum; +}; enum { @@ -239,7 +241,7 @@ enum // //////////////////////////////////////////////////////////////////////// // Player information. Filled when players join, never re-ordered. selectedPlayer global points to // currently controlled player. -typedef struct +struct PLAYER { char name[StringSize]; ///< Player name int32_t position; ///< Map starting position @@ -256,11 +258,12 @@ typedef struct BOOL needFile; ///< if We need a file sent to us WZFile wzFile; ///< for each player, we keep track of map progress char IPtextAddress[40]; ///< IP of this player -} PLAYER; +}; // //////////////////////////////////////////////////////////////////////// // all the luvly Netplay info.... -typedef struct { +struct NETPLAY +{ GAMESTRUCT games[MaxGames]; ///< The collection of games PLAYER players[MAX_PLAYERS]; ///< The array of players. uint32_t playercount; ///< Number of players in game. @@ -275,13 +278,13 @@ typedef struct { bool ShowedMOTD; // only want to show this once char MOTDbuffer[255]; // buffer for MOTD char* MOTD; -} NETPLAY; +}; -typedef struct +struct PLAYER_IP { char pname[40]; char IPAddress[40]; -} PLAYER_IP; +}; #define MAX_BANS 255 // //////////////////////////////////////////////////////////////////////// // variables diff --git a/lib/netplay/netsocket.h b/lib/netplay/netsocket.h index 3d113bac5..8d9fb9099 100644 --- a/lib/netplay/netsocket.h +++ b/lib/netplay/netsocket.h @@ -23,8 +23,8 @@ #include "lib/framework/types.h" -typedef struct Socket Socket; -typedef struct SocketSet SocketSet; +struct Socket; +struct SocketSet; typedef struct addrinfo SocketAddress; #ifndef WZ_OS_WIN diff --git a/lib/netplay/nettypes.h b/lib/netplay/nettypes.h index 03558a237..e6e987d14 100644 --- a/lib/netplay/nettypes.h +++ b/lib/netplay/nettypes.h @@ -28,28 +28,28 @@ #include "lib/framework/vector.h" #include "lib/netplay/netqueue.h" -typedef enum packetDirectionEnum +enum PACKETDIR { PACKET_ENCODE, PACKET_DECODE, PACKET_INVALID -} PACKETDIR; +}; -typedef enum QueueType +enum QueueType { QUEUE_TMP, QUEUE_NET, QUEUE_GAME, QUEUE_BROADCAST, -} QUEUETYPE; +}; -typedef struct _netqueue +struct NETQUEUE { void *queue; ///< Is either a (NetQueuePair **) or a (NetQueue *). (Note different numbers of *.) BOOL isPair; uint8_t index; uint8_t queueType; -} NETQUEUE; +}; NETQUEUE NETnetTmpQueue(unsigned tmpPlayer); ///< One of the temp queues from before a client has joined the game. (See comments on tmpQueues in nettypes.cpp.) NETQUEUE NETnetQueue(unsigned player); ///< The queue pair used for sending and receiving data directly from another client. (See comments on netQueues in nettypes.cpp.) diff --git a/lib/script/chat_processing.h b/lib/script/chat_processing.h index 87c079286..6cb6f8236 100644 --- a/lib/script/chat_processing.h +++ b/lib/script/chat_processing.h @@ -41,20 +41,20 @@ /* Holds information for each recognized * command in a chat message */ -typedef struct _chat_command_data +struct CHAT_CMD_DATA { const char *pCmdDescription; /* String representing a certain command */ BOOL bPlayerAddressed[MAX_PLAYERS]; /* Flag to indicate whether a command was addressed to a certain player */ SDWORD numCmdParams; /* Number of extracted parameters associated with each command */ INTERP_VAL parameter[MAX_CHAT_CMD_PARAMS]; /* Parameters extracted from text - to be used with scripts */ -}CHAT_CMD_DATA; +}; -typedef struct _chat_command +struct CHAT_MSG { char lastMessage[MAXSTRLEN]; /* Parse the same mesage only once - in case more than one player is trying to parse */ SDWORD numCommands; /* Total number of commands in chat message */ CHAT_CMD_DATA cmdData[MAX_CHAT_COMMANDS]; /* Holds information for each recognized command */ -}CHAT_MSG; +}; extern CHAT_MSG chat_msg; diff --git a/lib/script/event.h b/lib/script/event.h index df4aab255..266ea4f81 100644 --- a/lib/script/event.h +++ b/lib/script/event.h @@ -32,34 +32,34 @@ #define CONTEXT_VALS 20 /* One chunk of variables for a script context */ -typedef struct _val_chunk +struct VAL_CHUNK { INTERP_VAL asVals[CONTEXT_VALS]; - struct _val_chunk *psNext; -} VAL_CHUNK; + VAL_CHUNK * psNext; +}; /* The number of links in a context event link chunk */ #define CONTEXT_LINKS 10 /* One chunk of event links for a script context */ -typedef struct _link_chunk +struct LINK_CHUNK { SWORD aLinks[CONTEXT_LINKS]; - struct _link_chunk *psNext; -} LINK_CHUNK; + LINK_CHUNK * psNext; +}; // Whether a context is released when there are no active triggers for it -typedef enum _context_release +enum CONTEXT_RELEASE { CR_RELEASE, // release the context CR_NORELEASE, // do not release the context -} CONTEXT_RELEASE; +}; /* The data needed within an object to run a script */ -typedef struct _script_context +struct SCRIPT_CONTEXT { SCRIPT_CODE *psCode; // The actual script to run VAL_CHUNK *psGlobals; // The objects copy of the global variables @@ -67,15 +67,15 @@ typedef struct _script_context CONTEXT_RELEASE release; // Whether to release the context when there are no triggers SWORD id; - struct _script_context *psNext; -} SCRIPT_CONTEXT; + SCRIPT_CONTEXT * psNext; +}; /* * A currently active trigger. * If the type of the triggger == TR_PAUSE, the trigger number stored is the * index of the trigger to replace this one when the event restarts */ -typedef struct _active_trigger +struct ACTIVE_TRIGGER { UDWORD testTime; SCRIPT_CONTEXT *psContext; @@ -84,11 +84,11 @@ typedef struct _active_trigger UWORD event; UWORD offset; BOOL deactivated; // Whether the trigger is marked for deletion - struct _active_trigger *psNext; -} ACTIVE_TRIGGER; + ACTIVE_TRIGGER * psNext; +}; // ID numbers for each user type -typedef enum _scr_user_types +enum SCR_USER_TYPES { ST_INTMESSAGE = VAL_USERTYPESTART, // Intelligence message ?? (6) - (pointer) ST_BASEOBJECT, // Base object (pointer) @@ -124,7 +124,7 @@ typedef enum _scr_user_types ST_POINTER_STRUCTSTAT, //for NULLSTRUCTURESTAT ST_MAXTYPE, // maximum possible type - should always be last -} SCR_USER_TYPES; +}; // The list of currently active triggers diff --git a/lib/script/eventsave.cpp b/lib/script/eventsave.cpp index 76d448faa..c50368756 100644 --- a/lib/script/eventsave.cpp +++ b/lib/script/eventsave.cpp @@ -34,11 +34,11 @@ // the event save file header -typedef struct _event_save_header +struct EVENT_SAVE_HDR // : public GAME_SAVEHEADER { char aFileType[4]; UDWORD version; -} EVENT_SAVE_HDR; +}; // save the context information for the script system diff --git a/lib/script/interpreter.cpp b/lib/script/interpreter.cpp index 6ecaf4fdc..a41356845 100644 --- a/lib/script/interpreter.cpp +++ b/lib/script/interpreter.cpp @@ -40,11 +40,11 @@ static INTERP_VAL *varEnvironment[MAX_FUNC_CALLS]; //environments for local variables of events/functions -typedef struct +struct ReturnAddressStack_t { UDWORD CallerIndex; INTERP_VAL *ReturnAddress; -} ReturnAddressStack_t; +}; /** * Reset the return address stack diff --git a/lib/script/interpreter.h b/lib/script/interpreter.h index 7b9b18707..32e3181e5 100644 --- a/lib/script/interpreter.h +++ b/lib/script/interpreter.h @@ -32,7 +32,7 @@ typedef BOOL (*SCRIPT_FUNC)(void); typedef BOOL (*SCRIPT_VARFUNC)(UDWORD index); /* The possible value types for scripts */ -typedef enum _interp_type +enum INTERP_TYPE { // Basic types VAL_BOOL, @@ -55,11 +55,11 @@ typedef enum _interp_type VAL_USERTYPESTART, //!< user defined types should start with this id VAL_REF = 0x00100000 //!< flag to specify a variable reference rather than simple value -} INTERP_TYPE; +}; /* A value consists of its type and value */ -typedef struct _interp_val +struct INTERP_VAL { INTERP_TYPE type; //Value type for interpreter; opcode or value type for compiler union @@ -72,22 +72,22 @@ typedef struct _interp_val int ival; // Integer value - VAL_INT BOOL bval; //Boolean value - VAL_BOOL } v; -} INTERP_VAL; +}; // maximum number of equivalent types for a type #define INTERP_MAXEQUIV 10 // type equivalences -typedef struct _interp_typeequiv +struct TYPE_EQUIV { INTERP_TYPE base; // the type that the others are equivalent to unsigned int numEquiv; // number of equivalent types INTERP_TYPE aEquivTypes[INTERP_MAXEQUIV]; // the equivalent types -} TYPE_EQUIV; +}; /* Opcodes for the script interpreter */ -typedef enum _op_code +enum OPCODE { OP_PUSH, // Push value onto stack OP_PUSHREF, // Push a pointer to a variable onto the stack @@ -146,7 +146,7 @@ typedef enum _op_code OP_PUSHLOCALREF, //variable of object type (pointer) OP_TO_FLOAT, //float cast OP_TO_INT, //int cast -} OPCODE; +}; /* How far the opcode is shifted up a UDWORD to allow other data to be * stored in the same UDWORD @@ -164,50 +164,50 @@ typedef enum _op_code #define ARRAY_DIMENSION_MASK 0x00f00000 /* The possible storage types for a variable */ -typedef enum _storage_type +enum enum_STORAGE_TYPE { ST_PUBLIC, // Public variable ST_PRIVATE, // Private variable ST_OBJECT, // A value stored in an objects data space. ST_EXTERN, // An external value accessed by function call ST_LOCAL, // A local variable -} enum_STORAGE_TYPE; +}; typedef UBYTE STORAGE_TYPE; /* Variable debugging info for a script */ -typedef struct _var_debug +struct VAR_DEBUG { char *pIdent; STORAGE_TYPE storage; -} VAR_DEBUG; +}; /* Array info for a script */ -typedef struct _array_data +struct ARRAY_DATA { UDWORD base; // the base index of the array values INTERP_TYPE type; // the array data type UBYTE dimensions; UBYTE elements[VAR_MAX_DIMENSIONS]; -} ARRAY_DATA; +}; /* Array debug info for a script */ -typedef struct _array_debug +struct ARRAY_DEBUG { char *pIdent; UBYTE storage; -} ARRAY_DEBUG; +}; /* Line debugging information for a script */ -typedef struct _script_debug +struct SCRIPT_DEBUG { UDWORD offset; // Offset in the compiled script that corresponds to UDWORD line; // this line in the original script. char *pLabel; // the trigger/event that starts at this line -} SCRIPT_DEBUG; +}; /* Different types of triggers */ -typedef enum _trigger_type +enum TRIGGER_TYPE { TR_INIT, // Trigger fires when the script is first run TR_CODE, // Trigger uses script code @@ -216,18 +216,18 @@ typedef enum _trigger_type TR_PAUSE, // Event has paused for an interval and will restart in the middle of it's code TR_CALLBACKSTART, // The user defined callback triggers should start with this id -} TRIGGER_TYPE; +}; /* Description of a trigger for the SCRIPT_CODE */ -typedef struct _trigger_data +struct TRIGGER_DATA { TRIGGER_TYPE type; // Type of trigger UWORD code; // BOOL - is there code with this trigger UDWORD time; // How often to check the trigger -} TRIGGER_DATA; +}; /* A compiled script and its associated data */ -typedef struct _script_code +struct SCRIPT_CODE { UDWORD size; // The size (in bytes) of the compiled code INTERP_VAL *pCode; // Pointer to the compiled code @@ -258,15 +258,15 @@ typedef struct _script_code UWORD debugEntries; // Number of entries in psDebug SCRIPT_DEBUG *psDebug; // Debugging info for the script -} SCRIPT_CODE; +}; /* What type of code should be run by the interpreter */ -typedef enum _interp_runtype +enum INTERP_RUNTYPE { IRT_TRIGGER, // Run trigger code IRT_EVENT, // Run event code -} INTERP_RUNTYPE; +}; /* The size of each opcode */ diff --git a/lib/script/parse.h b/lib/script/parse.h index 633708a09..206d07557 100644 --- a/lib/script/parse.h +++ b/lib/script/parse.h @@ -51,40 +51,40 @@ #define MAX_SCR_MACRO_LEN 32 /* Structure to hold script define directive information */ -typedef struct _scr_define +struct SCR_MACRO { char scr_define_macro[MAX_SCR_MACRO_LEN]; char scr_define_body[MAXSTRLEN]; -}SCR_MACRO; +}; /* Definition for the chunks of code that are used within the compiler */ -typedef struct _code_block +struct CODE_BLOCK { UDWORD size; // size of the code block INTERP_VAL *pCode; // pointer to the code data UDWORD debugEntries; SCRIPT_DEBUG *psDebug; // Debugging info for the script. INTERP_TYPE type; // The type of the code block -} CODE_BLOCK; +}; /* The chunk of code returned from parsing a parameter list. */ -typedef struct _param_block +struct PARAM_BLOCK { UDWORD numParams; INTERP_TYPE *aParams; // List of parameter types UDWORD size; INTERP_VAL *pCode; // The code that puts the parameters onto the stack -}PARAM_BLOCK; +}; /* The types of a functions parameters, returned from parsing a parameter declaration */ -typedef struct _param_decl +struct PARAM_DECL { UDWORD numParams; INTERP_TYPE *aParams; -} PARAM_DECL; +}; /* The chunk of code used while parsing a conditional statement */ -typedef struct _cond_block +struct COND_BLOCK { UDWORD numOffsets; UDWORD *aOffsets; // Positions in the code that have to be @@ -94,14 +94,14 @@ typedef struct _cond_block INTERP_VAL *pCode; UDWORD debugEntries; // Number of debugging entries in psDebug. SCRIPT_DEBUG *psDebug; // Debugging info for the script. -} COND_BLOCK; +}; /* The possible access types for a type */ -typedef enum _access_type +enum ACCESS_TYPE { AT_SIMPLE, // The type represents a simple data value AT_OBJECT, // The type represents an object -} ACCESS_TYPE; +}; // function pointer for script variable saving @@ -112,25 +112,25 @@ typedef BOOL (*SCR_VAL_SAVE)(INTERP_VAL *psVal, char *pBuffer, UDWORD *pSize); typedef BOOL (*SCR_VAL_LOAD)(SDWORD version, INTERP_VAL *psVal, char *pBuffer, UDWORD size); /* Type for a user type symbol */ -typedef struct _type_symbol +struct TYPE_SYMBOL { const char *pIdent; // Type identifier INTERP_TYPE typeID; // The type id to use in the type field of values SWORD accessType; // Whether the type is an object or a simple value SCR_VAL_SAVE saveFunc; // load and save functions SCR_VAL_LOAD loadFunc; // -} TYPE_SYMBOL; +}; /* Type for a variable identifier declaration */ -typedef struct _var_ident_decl +struct VAR_IDENT_DECL { char *pIdent; // variable identifier SDWORD dimensions; // number of dimensions of an array - 0 for normal var SDWORD elements[VAR_MAX_DIMENSIONS]; // number of elements in an array -} VAR_IDENT_DECL; +}; /* Type for a variable symbol */ -typedef struct _var_symbol +struct VAR_SYMBOL { const char *pIdent; // variable's identifier INTERP_TYPE type; // variable type @@ -141,12 +141,12 @@ typedef struct _var_symbol UDWORD dimensions; // number of dimensions of an array - 0 for normal var SDWORD elements[VAR_MAX_DIMENSIONS]; // number of elements in an array - struct _var_symbol *psNext; -} VAR_SYMBOL; + VAR_SYMBOL * psNext; +}; /* Type for an array access block */ -typedef struct _array_block +struct ARRAY_BLOCK { VAR_SYMBOL *psArrayVar; UDWORD dimensions; @@ -155,10 +155,10 @@ typedef struct _array_block INTERP_VAL *pCode; UDWORD debugEntries; // Number of debugging entries in psDebug. SCRIPT_DEBUG *psDebug; // Debugging info for the script. -} ARRAY_BLOCK; +}; /* Type for a constant symbol */ -typedef struct _const_symbol +struct CONST_SYMBOL { const char *pIdent; // variable's identifier INTERP_TYPE type; // variable type @@ -172,22 +172,22 @@ typedef struct _const_symbol void *oval; char *sval; //String values float fval; -} CONST_SYMBOL; +}; /* The chunk of code used to reference an object variable */ -typedef struct _objvar_block +struct OBJVAR_BLOCK { VAR_SYMBOL *psObjVar; // The object variables symbol UDWORD size; INTERP_VAL *pCode; // The code to get the object value on the stack -} OBJVAR_BLOCK; +}; /* The maximum number of parameters for an instinct function */ #define INST_MAXPARAMS 20 /* Type for a function symbol */ -typedef struct _func_symbol +struct FUNC_SYMBOL { const char *pIdent; // function's identifier SCRIPT_FUNC pFunc; // Pointer to the instinct function @@ -203,27 +203,27 @@ typedef struct _func_symbol UDWORD debugEntries; // Number of debugging entries in psDebug. SCRIPT_DEBUG *psDebug; // Debugging info for the script. - struct _func_symbol *psNext; -} FUNC_SYMBOL; + FUNC_SYMBOL * psNext; +}; /* The type for a variable declaration */ -typedef struct _var_decl +struct VAR_DECL { INTERP_TYPE type; STORAGE_TYPE storage; -} VAR_DECL; +}; /* The type for a trigger sub declaration */ -typedef struct _trigger_decl +struct TRIGGER_DECL { TRIGGER_TYPE type; UDWORD size; INTERP_VAL *pCode; UDWORD time; -} TRIGGER_DECL; +}; /* Type for a trigger symbol */ -typedef struct _trigger_symbol +struct TRIGGER_SYMBOL { char *pIdent; // Trigger's identifier UDWORD index; // The triggers index number @@ -235,11 +235,11 @@ typedef struct _trigger_symbol UDWORD debugEntries; SCRIPT_DEBUG *psDebug; - struct _trigger_symbol *psNext; -} TRIGGER_SYMBOL; + TRIGGER_SYMBOL *psNext; +}; /* The type for a callback trigger symbol */ -typedef struct _callback_symbol +struct CALLBACK_SYMBOL { const char *pIdent; // Callback identifier TRIGGER_TYPE type; // user defined callback id >= TR_CALLBACKSTART @@ -247,11 +247,11 @@ typedef struct _callback_symbol UDWORD numParams; // Number of parameters to the function uint32_t/*INTERP_TYPE*/ aParams[INST_MAXPARAMS]; // List of parameter types -} CALLBACK_SYMBOL; +}; /* Type for an event symbol */ -typedef struct _event_symbol +struct EVENT_SYMBOL { char *pIdent; // Event's identifier UDWORD index; // the events index number @@ -271,8 +271,8 @@ typedef struct _event_symbol INTERP_TYPE aParams[INST_MAXPARAMS]; - struct _event_symbol *psNext; -} EVENT_SYMBOL; + EVENT_SYMBOL * psNext; +}; /* The table of user types */ extern TYPE_SYMBOL *asScrTypeTab; diff --git a/lib/script/script.cpp b/lib/script/script.cpp index e1b0bde8b..4b64e7889 100644 --- a/lib/script/script.cpp +++ b/lib/script/script.cpp @@ -175,7 +175,7 @@ BOOL scriptGetVarIndex(SCRIPT_CODE *psCode, char *pID, UDWORD *pIndex) these aren't currently checked for, but it's a lot clearer what's going on if they're all here */ BOOL scriptTypeIsPointer(INTERP_TYPE type) { - ASSERT((_scr_user_types)type < ST_MAXTYPE || type >= VAL_REF, "Invalid type: %d", type); + ASSERT((SCR_USER_TYPES)type < ST_MAXTYPE || type >= VAL_REF, "Invalid type: %d", type); // any value or'ed with VAL_REF is a pointer if (type >= VAL_REF) return true; switch ((unsigned)type) // Unsigned cast to suppress compiler warnings due to enum abuse. diff --git a/lib/script/script.h b/lib/script/script.h index 7a7fa5f60..6ae8271de 100644 --- a/lib/script/script.h +++ b/lib/script/script.h @@ -33,11 +33,11 @@ #include "eventsave.h" /* Whether to include debug info when compiling */ -typedef enum _scr_debugtype +enum SCR_DEBUGTYPE { SCR_DEBUGINFO, // Generate debug info SCR_NODEBUG, // Do not generate debug info -} SCR_DEBUGTYPE; +}; // If this is defined we save out the compiled scripts #define SCRIPTTYPE SCR_DEBUGINFO diff --git a/lib/script/script_parser.y b/lib/script/script_parser.y index 98d3a3909..b4314f462 100644 --- a/lib/script/script_parser.y +++ b/lib/script/script_parser.y @@ -42,12 +42,12 @@ extern int scr_lex(void); extern int scr_lex_destroy(void); /* Error return codes for code generation functions */ -typedef enum _code_error +enum CODE_ERROR { CE_OK, // No error CE_MEMORY, // Out of memory CE_PARSE // A parse error occured -} CODE_ERROR; +}; /* Turn off a couple of warnings that the yacc generated code gives */ diff --git a/lib/script/stack.cpp b/lib/script/stack.cpp index b0cde3a54..1f277aedc 100644 --- a/lib/script/stack.cpp +++ b/lib/script/stack.cpp @@ -42,13 +42,13 @@ char STRSTACK[MAXSTACKLEN][MAXSTRLEN]; //simple string 'stack' UDWORD CURSTACKSTR = 0; //Points to the top of the string stack /* store for a 'chunk' of the stack */ -typedef struct _stack_chunk +struct STACK_CHUNK { INTERP_VAL *aVals; UDWORD size; - struct _stack_chunk *psNext, *psPrev; -} STACK_CHUNK; + STACK_CHUNK * psNext, *psPrev; +}; /* The first chunk of the stack */ static STACK_CHUNK *psStackBase=NULL; diff --git a/lib/sequence/sequence.cpp b/lib/sequence/sequence.cpp index c6aeffe42..ea00db346 100644 --- a/lib/sequence/sequence.cpp +++ b/lib/sequence/sequence.cpp @@ -80,7 +80,7 @@ # endif // stick this in sequence.h perhaps? -typedef struct +struct AudioData { ALuint buffer1; // buffer 1 ALuint buffer2; // buffer 2 @@ -88,11 +88,11 @@ typedef struct int totbufstarted; // number of buffers started int audiofd_fragsize; // audio fragment size, used to calculate how big audiobuf is int audiobuf_fill; // how full our audio buffer is -} AudioData; +}; #endif -typedef struct +struct VideoData { ogg_sync_state oy; // ogg sync state ogg_page og; // ogg page @@ -107,7 +107,7 @@ typedef struct vorbis_block vb; // vorbis block vorbis_comment vc; // vorbis comment #endif -} VideoData; +}; // stick that in sequence.h perhaps? #if !defined(WZ_NOSOUND) diff --git a/lib/sound/audio_id.cpp b/lib/sound/audio_id.cpp index 17e4daccf..b1e0776bb 100644 --- a/lib/sound/audio_id.cpp +++ b/lib/sound/audio_id.cpp @@ -30,12 +30,11 @@ /***************************************************************************/ -typedef struct AUDIO_ID_MAP +struct AUDIO_ID_MAP { INGAME_AUDIO ID; const char* fileName; -} -AUDIO_ID_MAP; +}; /***************************************************************************/ diff --git a/lib/sound/audio_id.h b/lib/sound/audio_id.h index 84375cc87..c2e92920a 100644 --- a/lib/sound/audio_id.h +++ b/lib/sound/audio_id.h @@ -21,9 +21,7 @@ #ifndef __INCLUDED_LIB_SOUND_AUDIO_ID_H__ #define __INCLUDED_LIB_SOUND_AUDIO_ID_H__ -/* INGAME AUDIO */ - -typedef enum +enum INGAME_AUDIO { NO_SOUND = -1, @@ -494,8 +492,7 @@ typedef enum /* Last ID */ ID_SOUND_NEXT, // Thanks to this dummy we don't have to redefine ID_MAX_SOUND every time in terms of the preceding enum value ID_MAX_SOUND = ID_SOUND_NEXT - 1, -} -INGAME_AUDIO; +}; INGAME_AUDIO audio_GetIDFromStr(const char *pWavStr); diff --git a/lib/sound/cdaudio.h b/lib/sound/cdaudio.h index 371c7e792..48d027173 100644 --- a/lib/sound/cdaudio.h +++ b/lib/sound/cdaudio.h @@ -21,11 +21,11 @@ #ifndef __INCLUDED_LIB_SOUND_CDAUDIO_H__ #define __INCLUDED_LIB_SOUND_CDAUDIO_H__ -typedef enum +enum SONG_CONTEXT { SONG_FRONTEND, SONG_INGAME, -} SONG_CONTEXT; +}; BOOL cdAudio_Open(const char* user_musicdir); void cdAudio_Close(void); diff --git a/lib/sound/oggvorbis.h b/lib/sound/oggvorbis.h index 67a42a6a5..fd55750a2 100644 --- a/lib/sound/oggvorbis.h +++ b/lib/sound/oggvorbis.h @@ -23,7 +23,7 @@ #include "lib/framework/frame.h" #include -typedef struct +struct soundDataBuffer { // the size of the data contained in *data (NOTE: this is *NOT* the size of *data itself) size_t size; @@ -37,7 +37,7 @@ typedef struct // the raw PCM data char* data; -} soundDataBuffer; +}; // Forward declaration so we can take pointers to this type struct OggVorbisDecoderState; diff --git a/lib/sound/openal_track.cpp b/lib/sound/openal_track.cpp index c2e86c1bb..3b14426d6 100644 --- a/lib/sound/openal_track.cpp +++ b/lib/sound/openal_track.cpp @@ -55,7 +55,7 @@ ALuint current_queue_sample = -1; static BOOL openal_initialized = false; -struct __audio_stream +struct AUDIO_STREAM { #ifndef WZ_NOSOUND ALuint source; // OpenAL name of the sound source @@ -71,14 +71,14 @@ struct __audio_stream size_t bufferSize; // Linked list pointer - struct __audio_stream *next; + AUDIO_STREAM * next; }; -typedef struct SAMPLE_LIST +struct SAMPLE_LIST { - struct AUDIO_SAMPLE *curr; - struct SAMPLE_LIST *next; -} SAMPLE_LIST; + AUDIO_SAMPLE * curr; + SAMPLE_LIST * next; +}; static SAMPLE_LIST *active_samples = NULL; diff --git a/lib/sound/playlist.cpp b/lib/sound/playlist.cpp index be1781edc..dbbe17a91 100644 --- a/lib/sound/playlist.cpp +++ b/lib/sound/playlist.cpp @@ -27,11 +27,11 @@ #define BUFFER_SIZE 2048 -typedef struct _wzTrack +struct WZ_TRACK { char path[PATH_MAX]; - struct _wzTrack *next; -} WZ_TRACK; + WZ_TRACK * next; +}; static WZ_TRACK *currentSong = NULL; static int numSongs = 0; diff --git a/lib/sound/track.h b/lib/sound/track.h index 0160eb647..e7e822c58 100644 --- a/lib/sound/track.h +++ b/lib/sound/track.h @@ -44,13 +44,13 @@ */ typedef BOOL (* AUDIO_CALLBACK) ( void *psObj ); -typedef struct __audio_stream AUDIO_STREAM; +struct AUDIO_STREAM; /* structs */ struct SIMPLE_OBJECT; -typedef struct AUDIO_SAMPLE +struct AUDIO_SAMPLE { SDWORD iTrack; // ID number identifying a specific sound; currently (r1182) mapped in audio_id.c #ifndef WZ_NOSOUND @@ -66,11 +66,11 @@ typedef struct AUDIO_SAMPLE BOOL bFinishedPlaying; AUDIO_CALLBACK pCallback; SIMPLE_OBJECT * psObj; - struct AUDIO_SAMPLE *psPrev; - struct AUDIO_SAMPLE *psNext; -} AUDIO_SAMPLE; + AUDIO_SAMPLE * psPrev; + AUDIO_SAMPLE * psNext; +}; -typedef struct TRACK +struct TRACK { BOOL bLoop; SDWORD iVol; @@ -82,7 +82,7 @@ typedef struct TRACK ALuint iBufferName; // OpenAL name of the buffer #endif const char* fileName; -} TRACK; +}; /* functions */ diff --git a/src/action.cpp b/src/action.cpp index f99e4abed..b5b6e1972 100644 --- a/src/action.cpp +++ b/src/action.cpp @@ -67,14 +67,14 @@ #define PULL_BACK_DIST 10 // data required for any action -typedef struct _droid_action_data +struct DROID_ACTION_DATA { DROID_ACTION action; UDWORD x,y; //multiple action target info BASE_OBJECT *psObj; BASE_STATS *psStats; -} DROID_ACTION_DATA; +}; // Check if a droid has stopped moving #define DROID_STOPPED(psDroid) \ diff --git a/src/actiondef.h b/src/actiondef.h index e349e10ce..c3be05ef6 100644 --- a/src/actiondef.h +++ b/src/actiondef.h @@ -28,7 +28,7 @@ * What a droid is currently doing. Not necessarily the same as its order as the micro-AI may get a droid to do * something else whilst carrying out an order. */ -typedef enum _droid_action +enum DROID_ACTION { DACTION_NONE, ///< 0 not doing anything DACTION_MOVE, ///< 1 moving to a location @@ -74,6 +74,6 @@ typedef enum _droid_action DACTION_RETURNTOPOS, ///< 38 used by scout/patrol order when returning to route DACTION_FIRESUPPORT_RETREAT, ///< 39 used by firesupport order when sensor retreats DACTION_CIRCLE = 41, ///< 41 circling while engaging -} DROID_ACTION; +}; #endif // __INCLUDED_SRC_ACTIONDEF_H__ diff --git a/src/astar.h b/src/astar.h index a6cce6799..042218534 100644 --- a/src/astar.h +++ b/src/astar.h @@ -27,12 +27,12 @@ * * @ingroup pathfinding */ -typedef enum +enum ASR_RETVAL { ASR_OK, ///< found a route ASR_FAILED, ///< no route could be found ASR_NEAREST, ///< found a partial route to a nearby position -} ASR_RETVAL; +}; /** Use the A* algorithm to find a path * diff --git a/src/atmos.cpp b/src/atmos.cpp index 87438916b..fa9369346 100644 --- a/src/atmos.cpp +++ b/src/atmos.cpp @@ -48,17 +48,17 @@ #define TYPE_WATER 75 #define TYPE_LAND 76 -typedef enum +enum AP_TYPE { AP_RAIN, AP_SNOW -} AP_TYPE; +}; -typedef enum +enum AP_STATUS { APS_ACTIVE, APS_INACTIVE, -} AP_STATUS; +}; static ATPART asAtmosParts[MAX_ATMOS_PARTICLES]; static UDWORD freeParticle; diff --git a/src/atmos.h b/src/atmos.h index da58594cc..5ce291a0a 100644 --- a/src/atmos.h +++ b/src/atmos.h @@ -24,7 +24,7 @@ #include "lib/framework/vector.h" #include "lib/ivis_opengl/ivisdef.h" -typedef struct _atmosParticle +struct ATPART { UBYTE status; UBYTE type; @@ -32,14 +32,14 @@ typedef struct _atmosParticle Vector3f position; Vector3f velocity; iIMDShape *imd; -} ATPART; +}; -typedef enum +enum WT_CLASS { WT_RAINING, WT_SNOWING, WT_NONE -} WT_CLASS; +}; void atmosInitSystem(void); void atmosUpdateSystem(void); diff --git a/src/basedef.h b/src/basedef.h index 773255f00..755ffb300 100644 --- a/src/basedef.h +++ b/src/basedef.h @@ -41,10 +41,10 @@ enum OBJECT_TYPE OBJ_NUM_TYPES, ///< number of object types - MUST BE LAST }; -typedef struct _tilePos +struct TILEPOS { UBYTE x, y; -} TILEPOS; +}; /* Coordinate system used for objects in Warzone 2100: diff --git a/src/bridge.h b/src/bridge.h index 79017829c..f1fa51d69 100644 --- a/src/bridge.h +++ b/src/bridge.h @@ -23,14 +23,14 @@ #include "structuredef.h" -typedef struct _bridge_info +struct BRIDGE_INFO { int startX, startY, endX, endY; // Copy of coordinates of bridge. int heightChange; // How much to raise lowest end by. int bridgeHeight; // How high are the sections? int bridgeLength; // How many tiles long? bool bConstantX, startHighest; // Which axis is it on and which end is highest? -} BRIDGE_INFO; +}; /* Establishes whether a bridge could be built along the coordinates given */ bool bridgeValid(int startX, int startY, int endX, int endY); diff --git a/src/bucket3d.h b/src/bucket3d.h index 65264930c..273ad1a8d 100644 --- a/src/bucket3d.h +++ b/src/bucket3d.h @@ -21,7 +21,7 @@ #ifndef __INCLUDED_SRC_BUCKET3D_H__ #define __INCLUDED_SRC_BUCKET3D_H__ -typedef enum _render_type +enum RENDER_TYPE { RENDER_DROID, RENDER_STRUCTURE, @@ -33,7 +33,7 @@ typedef enum _render_type RENDER_EFFECT, RENDER_DELIVPOINT, RENDER_PARTICLE -} RENDER_TYPE; +}; //function prototypes diff --git a/src/cheat.cpp b/src/cheat.cpp index c8e2354a6..255bc6a0c 100644 --- a/src/cheat.cpp +++ b/src/cheat.cpp @@ -30,11 +30,11 @@ #include "keybind.h" #include "keymap.h" -typedef struct _cheat_entry +struct CHEAT_ENTRY { const char *pName; void (*function)(void); // pointer to void* function -} CHEAT_ENTRY; +}; bool Cheated = false; static CHEAT_ENTRY cheatCodes[] = diff --git a/src/console.cpp b/src/console.cpp index c49370f16..f5d7e648d 100644 --- a/src/console.cpp +++ b/src/console.cpp @@ -43,26 +43,25 @@ #define CON_BORDER_WIDTH 4 #define CON_BORDER_HEIGHT 4 -typedef struct _console +struct CONSOLE { UDWORD topX; UDWORD topY; UDWORD width; UDWORD textDepth; BOOL permanent; -} CONSOLE; +}; /* Definition of a message */ -typedef struct _console_message +struct CONSOLE_MESSAGE { char text[MAX_CONSOLE_STRING_LENGTH]; // Text of the message UDWORD timeAdded; // When was it added to our list? - //UDWORD screenIndex; // Info for justification UDWORD JustifyType; UDWORD id; SDWORD player; // Player who sent this message or SYSTEM_MESSAGE - struct _console_message *psNext; -} CONSOLE_MESSAGE; + CONSOLE_MESSAGE * psNext; +}; /** Is the console history on or off? */ static BOOL bConsoleDropped = false; diff --git a/src/console.h b/src/console.h index 310055d43..6752e0a12 100644 --- a/src/console.h +++ b/src/console.h @@ -25,13 +25,13 @@ #define MAX_CONSOLE_STRING_LENGTH (255) #define MAX_CONSOLE_TMP_STRING_LENGTH (255) -typedef enum +enum CONSOLE_TEXT_JUSTIFICATION { LEFT_JUSTIFY, RIGHT_JUSTIFY, CENTRE_JUSTIFY, DEFAULT_JUSTIFY -} CONSOLE_TEXT_JUSTIFICATION; +}; /* ID to use for addConsoleMessage() in case of a system message */ #define SYSTEM_MESSAGE (-1) diff --git a/src/data.cpp b/src/data.cpp index 35005b47c..15361ed66 100644 --- a/src/data.cpp +++ b/src/data.cpp @@ -1083,12 +1083,12 @@ static bool dataScriptLoadVals(const char* fileName, void **ppData) // These are statically defined in data.c // this is also defined in frameresource.c - needs moving to a .h file // This basically matches the argument list of resAddBufferLoad in frameresource.c -typedef struct +struct RES_TYPE_MIN_BUF { const char *aType; ///< points to the string defining the type (e.g. SCRIPT) - NULL indicates end of list RES_BUFFERLOAD buffLoad; ///< routine to process the data for this type RES_FREE release; ///< routine to release the data (NULL indicates none) -} RES_TYPE_MIN_BUF; +}; static const RES_TYPE_MIN_BUF BufferResourceTypes[] = { @@ -1127,12 +1127,12 @@ static const RES_TYPE_MIN_BUF BufferResourceTypes[] = {"IMD", dataIMDBufferLoad, (RES_FREE)iV_IMDRelease}, }; -typedef struct +struct RES_TYPE_MIN_FILE { const char *aType; ///< points to the string defining the type (e.g. SCRIPT) - NULL indicates end of list RES_FILELOAD fileLoad; ///< routine to process the data for this type RES_FREE release; ///< routine to release the data (NULL indicates none) -} RES_TYPE_MIN_FILE; +}; static const RES_TYPE_MIN_FILE FileResourceTypes[] = { diff --git a/src/design.cpp b/src/design.cpp index 9ef5a4560..64f15237a 100644 --- a/src/design.cpp +++ b/src/design.cpp @@ -106,7 +106,7 @@ /* Which type of system is displayed on the design screen */ -typedef enum _des_sysmode +enum DES_SYSMODE { IDES_SENSOR, // The sensor clickable is displayed IDES_ECM, // The ECM clickable is displayed @@ -115,7 +115,7 @@ typedef enum _des_sysmode IDES_WEAPON, // The Weapon clickable is displayed IDES_COMMAND, // The command droid clickable is displayed IDES_NOSYSTEM, // No system clickable has been displayed -} DES_SYSMODE; +}; static DES_SYSMODE desSysMode; /* The major component tabs on the design screen */ @@ -125,7 +125,7 @@ static DES_SYSMODE desSysMode; /* Which component type is being selected on the design screen */ //added IDES_TURRET_A,IDES_TURRET_B,changing the name of IDES_TURRET might break exist codes -typedef enum _des_compmode +enum DES_COMPMODE { IDES_SYSTEM, // The main system for the droid (sensor, ECM, constructor) IDES_TURRET, // The weapon for the droid @@ -134,16 +134,16 @@ typedef enum _des_compmode IDES_NOCOMPONENT, // No system has been selected IDES_TURRET_A, // The 2nd turret IDES_TURRET_B, // The 3rd turret -} DES_COMPMODE; +}; static DES_COMPMODE desCompMode; /* Which type of propulsion is being selected */ -typedef enum _des_propmode +enum DES_PROPMODE { IDES_GROUND, // Ground propulsion (wheeled, tracked, etc). IDES_AIR, // Air propulsion IDES_NOPROPULSION, // No propulsion has been selected -} DES_PROPMODE; +}; static DES_PROPMODE desPropMode; diff --git a/src/difficulty.h b/src/difficulty.h index 9e79c50e0..916e6d726 100644 --- a/src/difficulty.h +++ b/src/difficulty.h @@ -21,14 +21,14 @@ #ifndef __INCLUDED_SRC_DIFFICULTY_H__ #define __INCLUDED_SRC_DIFFICULTY_H__ -typedef enum _difficulty_level +enum DIFFICULTY_LEVEL { DL_EASY, DL_NORMAL, DL_HARD, DL_TOUGH, DL_KILLER -} DIFFICULTY_LEVEL; +}; void setDifficultyLevel(DIFFICULTY_LEVEL lev); DIFFICULTY_LEVEL getDifficultyLevel(void); diff --git a/src/display.h b/src/display.h index 4e3c189d6..cd2433ef7 100644 --- a/src/display.h +++ b/src/display.h @@ -98,7 +98,7 @@ UDWORD pulse; extern struct _dragBox dragBox3D,wallDrag; -typedef enum _pointer +enum MOUSE_POINTER { MP_ATTACH = 99, MP_ATTACK, @@ -115,9 +115,9 @@ MP_SELECT, MP_LOCKON, MP_MENSELECT, MP_BOMB -} MOUSE_POINTER; +}; -typedef enum _selectionTypes +enum SELECTION_TYPE { SC_DROID_CONSTRUCT, SC_DROID_DIRECT, @@ -134,9 +134,9 @@ SC_DROID_DEMOLISH, SC_DROID_REPAIR, SC_INVALID, -} SELECTION_TYPE; +}; -typedef enum _targets +enum MOUSE_TARGET { MT_TERRAIN, MT_RESOURCE, @@ -163,7 +163,7 @@ MT_SENSORSTRUCT, MT_SENSORSTRUCTDAM, MT_NOTARGET //leave as last one -} MOUSE_TARGET; +}; extern BOOL gameStats; extern BOOL godMode; diff --git a/src/display3d.h b/src/display3d.h index feab32c1d..e4c1d6177 100644 --- a/src/display3d.h +++ b/src/display3d.h @@ -32,21 +32,21 @@ /*! * Special tile types */ -typedef enum +enum TILE_ID { RIVERBED_TILE = 5, //! Underwater ground WATER_TILE = 17, //! Water surface RUBBLE_TILE = 54, //! You can drive over these BLOCKING_RUBBLE_TILE = 67 //! You cannot drive over these -} TILE_ID; +}; -typedef enum +enum ENERGY_BAR { BAR_SELECTED, BAR_DROIDS, BAR_DROIDS_AND_STRUCTURES, BAR_LAST -} ENERGY_BAR; +}; extern bool showFPS; extern bool showSAMPLES; diff --git a/src/displaydef.h b/src/displaydef.h index 121cd9868..9b1e66650 100644 --- a/src/displaydef.h +++ b/src/displaydef.h @@ -32,12 +32,12 @@ //#define BOUNDARY_X (DISP_WIDTH/20) // proportional to resolution - Alex M //#define BOUNDARY_Y (DISP_WIDTH/16) -typedef struct _screen_disp_data +struct SCREEN_DISP_DATA { iIMDShape *imd; UDWORD frameNumber; // last frame it was drawn UDWORD screenX,screenY; UDWORD screenR; -} SCREEN_DISP_DATA; +}; #endif // __INCLUDED_DISPLAYDEF_H__ diff --git a/src/droid.h b/src/droid.h index 28b259643..3b069ecd8 100644 --- a/src/droid.h +++ b/src/droid.h @@ -66,12 +66,12 @@ extern DROID_TEMPLATE *apsStaticTemplates; // for AIs and scripts /* Minumum number of droids a commander can control in its group */ #define MIN_CMD_GROUP_DROIDS 6 -typedef enum +enum PICKTILE { NO_FREE_TILE, FREE_TILE, HALF_FREE_TILE -} PICKTILE; +}; // the structure that was last hit extern DROID *psLastDroidHit; @@ -90,13 +90,13 @@ extern BOOL loadDroidWeapons(const char *pWeaponData, UDWORD bufferSize); /*initialise the template build and power points */ extern void initTemplatePoints(void); -typedef struct InitialDroidOrders +struct INITIAL_DROID_ORDERS { uint32_t secondaryOrder; int32_t moveToX; int32_t moveToY; uint32_t factoryId; -} INITIAL_DROID_ORDERS; +}; /*Builds an instance of a Structure - the x/y passed in are in world coords.*/ /// Sends a GAME_DROID message if bMultiMessages is true, or actually creates it if false. Only uses initialOrders if sending a GAME_DROID message. extern DROID* buildDroid(DROID_TEMPLATE *pTemplate, UDWORD x, UDWORD y, UDWORD player, BOOL onMission, const INITIAL_DROID_ORDERS *initialOrders); diff --git a/src/edit3d.h b/src/edit3d.h index c926557a7..a4cf24491 100644 --- a/src/edit3d.h +++ b/src/edit3d.h @@ -42,11 +42,11 @@ extern void raiseTile(int tile3dX, int tile3dY); extern void lowerTile(int tile3dX, int tile3dY); BOOL inHighlight ( UDWORD realX, UDWORD realY ); -typedef struct _highlight +struct HIGHLIGHT { UWORD xTL,yTL; // Top left of box to highlight UWORD xBR,yBR; // Bottom right of box to highlight -} HIGHLIGHT; +}; extern HIGHLIGHT buildSite; @@ -57,14 +57,14 @@ extern HIGHLIGHT buildSite; #define BUILD3D_VALID 102 -typedef struct _build_details +struct BUILDDETAILS { BUILDCALLBACK CallBack; void *UserData; //this holds the OBJECT_POSITION pointer for a Deliv Point UDWORD x,y; UDWORD width,height; BASE_STATS *psStats; -} BUILDDETAILS; +}; extern BUILDDETAILS sBuildDetails; diff --git a/src/effects.cpp b/src/effects.cpp index a9dd5e593..2bf72d4f3 100644 --- a/src/effects.cpp +++ b/src/effects.cpp @@ -168,9 +168,8 @@ /*! A memory chunk of effects */ -typedef struct _EffectChunk EffectChunk; - -struct _EffectChunk { +struct EffectChunk +{ EFFECT effects[EFFECT_CHUNK_SIZE]; //!< Chunk of effects EffectChunk *next; //!< Next element in list }; diff --git a/src/effects.h b/src/effects.h index c9f4f5c9b..49acee698 100644 --- a/src/effects.h +++ b/src/effects.h @@ -36,7 +36,7 @@ /* All the effect groups */ -typedef enum +enum EFFECT_GROUP { EFFECT_EXPLOSION, EFFECT_CONSTRUCTION, @@ -50,11 +50,11 @@ typedef enum EFFECT_DUST_BALL, EFFECT_FIRE, EFFECT_FIREWORK -} EFFECT_GROUP; +}; /* Might not even need this */ -typedef enum +enum EFFECT_TYPE { EXPLOSION_TYPE_SMALL, EXPLOSION_TYPE_VERY_SMALL, @@ -108,20 +108,18 @@ typedef enum FIREWORK_TYPE_STARBURST, FIREWORK_TYPE_LAUNCHER, - -} EFFECT_TYPE; +}; -typedef enum +enum LAND_LIGHT_SPEC { LL_MIDDLE, LL_INNER, LL_OUTER -} LAND_LIGHT_SPEC; +}; -typedef struct _effect_def EFFECT; -struct _effect_def +struct EFFECT { uint8_t player; // when the effect in question needs a player's color uint8_t control; // Controls the bits above - essential,flips etc diff --git a/src/featuredef.h b/src/featuredef.h index c43fe5875..ae857e716 100644 --- a/src/featuredef.h +++ b/src/featuredef.h @@ -27,7 +27,7 @@ #include "basedef.h" #include "statsdef.h" -typedef enum _feature_type +enum FEATURE_TYPE { FEAT_BUILD_WRECK, FEAT_HOVER, @@ -55,7 +55,7 @@ typedef enum _feature_type //FEAT_BOULDER3, //FEAT_FUTCAR, //FEAT_FUTVAN, -} FEATURE_TYPE; +}; /* Stats for a feature */ struct FEATURE_STATS : public BASE_STATS diff --git a/src/frontend.h b/src/frontend.h index da6536569..9053d264a 100644 --- a/src/frontend.h +++ b/src/frontend.h @@ -24,7 +24,8 @@ #include "lib/widget/widgbase.h" // determines which option screen to use. when in GS_TITLE_SCREEN mode. -typedef enum _title_mode { +enum tMode +{ TITLE, // 0 intro mode SINGLE, // 1 single player menu MULTI, // 2 multiplayer menu @@ -46,7 +47,7 @@ typedef enum _title_mode { AUDIO_OPTIONS, // 18 audio options menu VIDEO_OPTIONS, // 19 video options menu MOUSE_OPTIONS, // 20 mouse options menu -} tMode; +}; extern tMode titleMode; // the global case extern tMode lastTitleMode; diff --git a/src/game.cpp b/src/game.cpp index 3deffe8fe..f3579af35 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -103,11 +103,11 @@ static const UDWORD NULL_ID = UDWORD_MAX; static UDWORD RemapPlayerNumber(UDWORD OldNumber); static void plotFeature(char *backDropSprite); -typedef struct _game_save_header +struct GAME_SAVEHEADER { char aFileType[4]; uint32_t version; -} GAME_SAVEHEADER; +}; static bool serializeSaveGameHeader(PHYSFS_file* fileHandle, const GAME_SAVEHEADER* serializeHeader) { @@ -162,104 +162,77 @@ static bool deserializeSaveGameHeader(PHYSFS_file* fileHandle, GAME_SAVEHEADER* return true; } -typedef struct _droid_save_header +struct DROID_SAVEHEADER : public GAME_SAVEHEADER { - char aFileType[4]; - UDWORD version; UDWORD quantity; -} DROID_SAVEHEADER; +}; -typedef struct _struct_save_header +struct STRUCT_SAVEHEADER : public GAME_SAVEHEADER { - char aFileType[4]; - UDWORD version; UDWORD quantity; -} STRUCT_SAVEHEADER; +}; -typedef struct _template_save_header +struct TEMPLATE_SAVEHEADER : public GAME_SAVEHEADER { - char aFileType[4]; - UDWORD version; UDWORD quantity; -} TEMPLATE_SAVEHEADER; +}; -typedef struct _feature_save_header +struct FEATURE_SAVEHEADER : public GAME_SAVEHEADER { - char aFileType[4]; - UDWORD version; UDWORD quantity; -} FEATURE_SAVEHEADER; +}; /* Structure definitions for loading and saving map data */ -typedef struct { - char aFileType[4]; - UDWORD version; +struct TILETYPE_SAVEHEADER : public GAME_SAVEHEADER +{ UDWORD quantity; -} TILETYPE_SAVEHEADER; +}; /* Structure definitions for loading and saving map data */ -typedef struct _compList_save_header +struct COMPLIST_SAVEHEADER : public GAME_SAVEHEADER { - char aFileType[4]; - UDWORD version; UDWORD quantity; -} COMPLIST_SAVEHEADER; +}; /* Structure definitions for loading and saving map data */ -typedef struct _structList_save_header +struct STRUCTLIST_SAVEHEADER : public GAME_SAVEHEADER { - char aFileType[4]; - UDWORD version; UDWORD quantity; -} STRUCTLIST_SAVEHEADER; +}; -typedef struct _research_save_header +struct RESEARCH_SAVEHEADER : public GAME_SAVEHEADER { - char aFileType[4]; - UDWORD version; UDWORD quantity; -} RESEARCH_SAVEHEADER; +}; -typedef struct _message_save_header +struct MESSAGE_SAVEHEADER : public GAME_SAVEHEADER { - char aFileType[4]; - UDWORD version; UDWORD quantity; -} MESSAGE_SAVEHEADER; +}; -typedef struct _proximity_save_header +struct PROXIMITY_SAVEHEADER : public GAME_SAVEHEADER { - char aFileType[4]; - UDWORD version; UDWORD quantity; -} PROXIMITY_SAVEHEADER; +}; -typedef struct _flag_save_header +struct FLAG_SAVEHEADER : public GAME_SAVEHEADER { - char aFileType[4]; - UDWORD version; UDWORD quantity; -} FLAG_SAVEHEADER; +}; -typedef struct _production_save_header +struct PRODUCTION_SAVEHEADER : public GAME_SAVEHEADER { - char aFileType[4]; - UDWORD version; -} PRODUCTION_SAVEHEADER; +}; -typedef struct _structLimits_save_header +struct STRUCTLIMITS_SAVEHEADER : public GAME_SAVEHEADER { - char aFileType[4]; - UDWORD version; UDWORD quantity; -} STRUCTLIMITS_SAVEHEADER; +}; -typedef struct _command_save_header +struct COMMAND_SAVEHEADER : public GAME_SAVEHEADER { - char aFileType[4]; - UDWORD version; UDWORD quantity; -} COMMAND_SAVEHEADER; +}; /* Sanity check definitions for the save struct file sizes */ #define GAME_HEADER_SIZE 8 @@ -304,37 +277,37 @@ typedef struct _command_save_header UDWORD burnDamage -typedef struct _save_component_v19 +struct SAVE_COMPONENT_V19 { char name[MAX_SAVE_NAME_SIZE_V19]; -} SAVE_COMPONENT_V19; +}; -typedef struct _save_component +struct SAVE_COMPONENT { char name[MAX_SAVE_NAME_SIZE]; -} SAVE_COMPONENT; +}; -typedef struct _save_weapon_v19 +struct SAVE_WEAPON_V19 { char name[MAX_SAVE_NAME_SIZE_V19]; UDWORD hitPoints; // UNUSED: only here to keep struct size intact UDWORD ammo; UDWORD lastFired; -} SAVE_WEAPON_V19; +}; -typedef struct _save_weapon +struct SAVE_WEAPON { char name[MAX_SAVE_NAME_SIZE]; UDWORD hitPoints; // UNUSED: only here to keep struct size intact UDWORD ammo; UDWORD lastFired; -} SAVE_WEAPON; +}; -typedef struct _savePower +struct SAVE_POWER { uint32_t currentPower; uint32_t extractedPower; // UNUSED -} SAVE_POWER; +}; static bool serializeSavePowerData(PHYSFS_file* fileHandle, const SAVE_POWER* serializePower) { @@ -1445,14 +1418,14 @@ static bool deserializeSaveGameData(PHYSFS_file* fileHandle, SAVE_GAME* serializ #define SAVE_COMP_PROGRAM 8 #define SAVE_COMP_WEAPON 9 -typedef struct _path_point +struct PATH_POINT { UBYTE x,y; -} PATH_POINT; +}; #define TRAVELSIZE 100 -typedef struct _save_move_control +struct SAVE_MOVE_CONTROL { UBYTE Status; // Inactive, Navigating or moving point to point status UBYTE Position; // Position in asPath @@ -1475,7 +1448,7 @@ typedef struct _save_move_control SWORD iVertSpeed; UDWORD iAttackRuns[DROID_MAXWEAPS]; float fz; -} SAVE_MOVE_CONTROL; +}; #define DROID_SAVE_V9 \ @@ -1488,10 +1461,10 @@ typedef struct _save_move_control SAVE_WEAPON_V19 asWeaps[TEMP_DROID_MAXPROGS]; \ UDWORD numKills -typedef struct _save_droid_v9 +struct SAVE_DROID_V9 { DROID_SAVE_V9; -} SAVE_DROID_V9; +}; /*save DROID SAVE 11 */ #define DROID_SAVE_V11 \ @@ -1506,10 +1479,10 @@ typedef struct _save_droid_v9 UWORD turretRotation; \ UWORD turretPitch -typedef struct _save_droid_v11 +struct SAVE_DROID_V11 { DROID_SAVE_V11; -} SAVE_DROID_V11; +}; #define DROID_SAVE_V12 \ DROID_SAVE_V9; \ @@ -1528,10 +1501,10 @@ typedef struct _save_droid_v11 UDWORD actionPoints; \ UWORD actionHeight -typedef struct _save_droid_v12 +struct SAVE_DROID_V12 { DROID_SAVE_V12; -} SAVE_DROID_V12; +}; #define DROID_SAVE_V14 \ DROID_SAVE_V12; \ @@ -1544,10 +1517,10 @@ typedef struct _save_droid_v12 UDWORD died; \ UDWORD lastEmission -typedef struct _save_droid_v14 +struct SAVE_DROID_V14 { DROID_SAVE_V14; -} SAVE_DROID_V14; +}; //DROID_SAVE_18 replaces DROID_SAVE_14 #define DROID_SAVE_V18 \ @@ -1561,10 +1534,10 @@ typedef struct _save_droid_v14 UDWORD died; \ UDWORD lastEmission -typedef struct _save_droid_v18 +struct SAVE_DROID_V18 { DROID_SAVE_V18; -} SAVE_DROID_V18; +}; //DROID_SAVE_20 replaces all previous saves uses 60 character names #define DROID_SAVE_V20 \ @@ -1599,19 +1572,19 @@ typedef struct _save_droid_v18 UDWORD died; \ UDWORD lastEmission -typedef struct _save_droid_v20 +struct SAVE_DROID_V20 { DROID_SAVE_V20; -} SAVE_DROID_V20; +}; #define DROID_SAVE_V21 \ DROID_SAVE_V20; \ UDWORD commandId -typedef struct _save_droid_v21 +struct SAVE_DROID_V21 { DROID_SAVE_V21; -} SAVE_DROID_V21; +}; #define DROID_SAVE_V24 \ DROID_SAVE_V21; \ @@ -1621,10 +1594,10 @@ typedef struct _save_droid_v21 SDWORD formationX; \ SDWORD formationY -typedef struct _save_droid_v24 +struct SAVE_DROID_V24 { DROID_SAVE_V24; -} SAVE_DROID_V24; +}; //Watermelon: I need DROID_SAVE_V99... #define DROID_SAVE_V99 \ @@ -1665,29 +1638,27 @@ typedef struct _save_droid_v24 SDWORD formationX; \ SDWORD formationY -typedef struct _save_droid_v99 +struct SAVE_DROID_V99 { DROID_SAVE_V99; -} SAVE_DROID_V99; +}; //Watermelon:V99 'test' -typedef struct _save_droid +struct SAVE_DROID { DROID_SAVE_V99; -} SAVE_DROID; +}; -typedef struct _droidinit_save_header +struct DROIDINIT_SAVEHEADER : public GAME_SAVEHEADER { - char aFileType[4]; - UDWORD version; UDWORD quantity; -} DROIDINIT_SAVEHEADER; +}; -typedef struct _save_droidinit +struct SAVE_DROIDINIT { OBJECT_SAVE_V19; -} SAVE_DROIDINIT; +}; /* * STRUCTURE Definitions @@ -1707,10 +1678,10 @@ typedef struct _save_droidinit UDWORD capacity; \ UDWORD quantity -typedef struct _save_structure_v2 +struct SAVE_STRUCTURE_V2 { STRUCTURE_SAVE_V2; -} SAVE_STRUCTURE_V2; +}; #define STRUCTURE_SAVE_V12 \ STRUCTURE_SAVE_V2; \ @@ -1722,37 +1693,37 @@ typedef struct _save_structure_v2 UDWORD timeToBuild; \ UDWORD timeStartHold -typedef struct _save_structure_v12 +struct SAVE_STRUCTURE_V12 { STRUCTURE_SAVE_V12; -} SAVE_STRUCTURE_V12; +}; #define STRUCTURE_SAVE_V14 \ STRUCTURE_SAVE_V12; \ UBYTE visible[MAX_PLAYERS] -typedef struct _save_structure_v14 +struct SAVE_STRUCTURE_V14 { STRUCTURE_SAVE_V14; -} SAVE_STRUCTURE_V14; +}; #define STRUCTURE_SAVE_V15 \ STRUCTURE_SAVE_V14; \ char researchName[MAX_SAVE_NAME_SIZE_V19] -typedef struct _save_structure_v15 +struct SAVE_STRUCTURE_V15 { STRUCTURE_SAVE_V15; -} SAVE_STRUCTURE_V15; +}; #define STRUCTURE_SAVE_V17 \ STRUCTURE_SAVE_V15;\ SWORD currentPowerAccrued -typedef struct _save_structure_v17 +struct SAVE_STRUCTURE_V17 { STRUCTURE_SAVE_V17; -} SAVE_STRUCTURE_V17; +}; #define STRUCTURE_SAVE_V20 \ OBJECT_SAVE_V20; \ @@ -1778,24 +1749,24 @@ typedef struct _save_structure_v17 char researchName[MAX_SAVE_NAME_SIZE]; \ SWORD currentPowerAccrued -typedef struct _save_structure_v20 +struct SAVE_STRUCTURE_V20 { STRUCTURE_SAVE_V20; -} SAVE_STRUCTURE_V20; +}; #define STRUCTURE_SAVE_V21 \ STRUCTURE_SAVE_V20; \ UDWORD commandId -typedef struct _save_structure_v21 +struct SAVE_STRUCTURE_V21 { STRUCTURE_SAVE_V21; -} SAVE_STRUCTURE_V21; +}; -typedef struct _save_structure +struct SAVE_STRUCTURE { STRUCTURE_SAVE_V21; -} SAVE_STRUCTURE; +}; //PROGRAMS NEED TO BE REMOVED FROM DROIDS - 7/8/98 @@ -1834,57 +1805,57 @@ typedef struct _save_structure -typedef struct _save_template_v2 +struct SAVE_TEMPLATE_V2 { TEMPLATE_SAVE_V2; -} SAVE_TEMPLATE_V2; +}; -typedef struct _save_template_v14 +struct SAVE_TEMPLATE_V14 { TEMPLATE_SAVE_V14; -} SAVE_TEMPLATE_V14; +}; -typedef struct _save_template_v20 +struct SAVE_TEMPLATE_V20 { TEMPLATE_SAVE_V20; -} SAVE_TEMPLATE_V20; +}; -typedef struct _save_template +struct SAVE_TEMPLATE { TEMPLATE_SAVE_V20; -} SAVE_TEMPLATE; +}; #define FEATURE_SAVE_V2 \ OBJECT_SAVE_V19 -typedef struct _save_feature_v2 +struct SAVE_FEATURE_V2 { FEATURE_SAVE_V2; -} SAVE_FEATURE_V2; +}; #define FEATURE_SAVE_V14 \ FEATURE_SAVE_V2; \ UBYTE visible[MAX_PLAYERS] -typedef struct _save_feature_v14 +struct SAVE_FEATURE_V14 { FEATURE_SAVE_V14; -} SAVE_FEATURE_V14; +}; #define FEATURE_SAVE_V20 \ OBJECT_SAVE_V20; \ UBYTE visible[MAX_PLAYERS] -typedef struct _save_feature_v20 +struct SAVE_FEATURE_V20 { FEATURE_SAVE_V20; -} SAVE_FEATURE_V20; +}; -typedef struct _save_feature +struct SAVE_FEATURE { FEATURE_SAVE_V20; -} SAVE_FEATURE; +}; #define COMPLIST_SAVE_V6 \ @@ -1900,20 +1871,20 @@ typedef struct _save_feature UBYTE player -typedef struct _save_compList_v6 +struct SAVE_COMPLIST_V6 { COMPLIST_SAVE_V6; -} SAVE_COMPLIST_V6; +}; -typedef struct _save_compList_v20 +struct SAVE_COMPLIST_V20 { COMPLIST_SAVE_V20; -} SAVE_COMPLIST_V20; +}; -typedef struct _save_compList +struct SAVE_COMPLIST { COMPLIST_SAVE_V20; -} SAVE_COMPLIST; +}; @@ -1929,20 +1900,20 @@ typedef struct _save_compList UBYTE state; \ UBYTE player -typedef struct _save_structList_v6 +struct SAVE_STRUCTLIST_V6 { STRUCTLIST_SAVE_V6; -} SAVE_STRUCTLIST_V6; +}; -typedef struct _save_structList_v20 +struct SAVE_STRUCTLIST_V20 { STRUCTLIST_SAVE_V20; -} SAVE_STRUCTLIST_V20; +}; -typedef struct _save_structList +struct SAVE_STRUCTLIST { STRUCTLIST_SAVE_V20; -} SAVE_STRUCTLIST; +}; #define RESEARCH_SAVE_V8 \ @@ -1958,22 +1929,22 @@ typedef struct _save_structList UDWORD currentPoints[MAX_PLAYERS] -typedef struct _save_research_v8 +struct SAVE_RESEARCH_V8 { RESEARCH_SAVE_V8; -} SAVE_RESEARCH_V8; +}; -typedef struct _save_research_v20 +struct SAVE_RESEARCH_V20 { RESEARCH_SAVE_V20; -} SAVE_RESEARCH_V20; +}; -typedef struct _save_research +struct SAVE_RESEARCH { RESEARCH_SAVE_V20; -} SAVE_RESEARCH; +}; -typedef struct _save_message +struct SAVE_MESSAGE { MESSAGE_TYPE type; //The type of message BOOL bObj; @@ -1982,9 +1953,9 @@ typedef struct _save_message BOOL read; //flag to indicate whether message has been read UDWORD player; //which player this message belongs to -} SAVE_MESSAGE; +}; -typedef struct _save_message_v36 +struct SAVE_MESSAGE_36 { MESSAGE_TYPE type; //The type of message BOOL bObj; @@ -1995,9 +1966,9 @@ typedef struct _save_message_v36 MSG_DATA_TYPE dataType; //actual type of pViewData UDWORD locX,locY; SDWORD sender; //sender of the message -} SAVE_MESSAGE_36; +}; -typedef struct _save_flag_v18 +struct SAVE_FLAG_V18 { POSITION_TYPE type; /*the type of position obj - FlagPos or ProxDisp*/ UDWORD frameNumber; /*when the Position was last drawn*/ @@ -2011,9 +1982,9 @@ typedef struct _save_flag_v18 UBYTE factoryType; //indicates whether standard, cyborg or vtol factory UBYTE dummyNOTUSED; //sub value. needed to order production points. UBYTE dummyNOTUSED2; -} SAVE_FLAG_V18; +}; -typedef struct _save_flag +struct SAVE_FLAG { POSITION_TYPE type; /*the type of position obj - FlagPos or ProxDisp*/ UDWORD frameNumber; /*when the Position was last drawn*/ @@ -2028,15 +1999,15 @@ typedef struct _save_flag UBYTE dummyNOTUSED; //sub value. needed to order production points. UBYTE dummyNOTUSED2; UDWORD repairId; -} SAVE_FLAG; +}; //PRODUCTION_RUN asProductionRun[NUM_FACTORY_TYPES][MAX_FACTORY][MAX_PROD_RUN]; -typedef struct _save_production +struct SAVE_PRODUCTION { UBYTE quantity; //number to build UBYTE built; //number built on current run UDWORD multiPlayerID; //template to build -} SAVE_PRODUCTION; +}; struct SAVE_STRUCTLIMITS { @@ -2048,23 +2019,23 @@ struct SAVE_STRUCTLIMITS #define COMMAND_SAVE_V20 \ UDWORD droidID -typedef struct _save_command_v20 +struct SAVE_COMMAND_V20 { COMMAND_SAVE_V20; -} SAVE_COMMAND_V20; +}; -typedef struct _save_command +struct SAVE_COMMAND { COMMAND_SAVE_V20; -} SAVE_COMMAND; +}; /* The different types of droid */ -typedef enum _droid_save_type +enum DROID_SAVE_TYPE { DROID_NORMAL, // Weapon droid DROID_ON_TRANSPORT, -} DROID_SAVE_TYPE; +}; /***************************************************************************/ /* diff --git a/src/game.h b/src/game.h index 54a0b52a0..81c72e6c9 100644 --- a/src/game.h +++ b/src/game.h @@ -89,21 +89,21 @@ #define VALIDITYKEY_CHEAT_MODE 0x08 #define VALIDITYKEY_MID_GAME 0x10 -typedef enum +enum GAME_TYPE { GTYPE_SCENARIO_START, ///< Initial scenario state. GTYPE_SCENARIO_EXPAND, ///< Scenario scroll area expansion. GTYPE_MISSION, ///< Stand alone mission. GTYPE_SAVE_START, ///< User saved game - at the start of a level. GTYPE_SAVE_MIDMISSION, ///< User saved game - in the middle of a level -} GAME_TYPE; +}; -typedef struct _vis_save_header +struct VIS_SAVEHEADER { char aFileType[4]; uint32_t version; -} VIS_SAVEHEADER; +}; /***************************************************************************/ diff --git a/src/gateway.h b/src/gateway.h index 91f612bb3..ee333ca15 100644 --- a/src/gateway.h +++ b/src/gateway.h @@ -24,11 +24,11 @@ #ifndef __INCLUDED_SRC_GATEWAY_H__ #define __INCLUDED_SRC_GATEWAY_H__ -typedef struct _gateway +struct GATEWAY { UBYTE x1,y1, x2,y2; - struct _gateway *psNext; -} GATEWAY; + GATEWAY * psNext; +}; /// Initialise the gateway system BOOL gwInitialise(void); diff --git a/src/geometry.h b/src/geometry.h index ff1c9d239..acc12ef17 100644 --- a/src/geometry.h +++ b/src/geometry.h @@ -24,10 +24,10 @@ #include "map.h" #include "hci.h" -typedef struct _t_quad +struct QUAD { Vector2i coords[4]; -} QUAD; +}; extern uint16_t calcDirection(int32_t x0, int32_t y0, int32_t x1, int32_t y1); extern int inQuad( const Vector2i *pt, const QUAD *quad ); diff --git a/src/hci.cpp b/src/hci.cpp index 58ca386f0..460dd0d13 100644 --- a/src/hci.cpp +++ b/src/hci.cpp @@ -99,16 +99,18 @@ enum { // Reticule button indecies. RETBUT_COMMAND, }; -typedef struct { +struct BUTSTATE +{ UDWORD id; BOOL Enabled; BOOL Hidden; -} BUTSTATE; +}; -typedef struct { +struct BUTOFFSET +{ SWORD x; SWORD y; -} BUTOFFSET; +}; BUTOFFSET ReticuleOffsets[NUMRETBUTS] = { // Reticule button form relative positions. {48,47}, // RETBUT_CANCEL, diff --git a/src/init.h b/src/init.h index 75d4f26c8..c922c44ca 100644 --- a/src/init.h +++ b/src/init.h @@ -47,14 +47,14 @@ extern BOOL campaignReset(void); // Reset the game when loading a save game extern BOOL saveGameReset(void); -typedef struct _wzSearchPath +struct wzSearchPath { char path[PATH_MAX]; unsigned int priority; - struct _wzSearchPath * higherPriority, * lowerPriority; -} wzSearchPath; + wzSearchPath * higherPriority, * lowerPriority; +}; -typedef enum { mod_clean=0, mod_campaign=1, mod_multiplay=2, mod_override=3 } searchPathMode; +enum searchPathMode { mod_clean, mod_campaign, mod_multiplay, mod_override }; void cleanSearchPath( void ); void registerSearchPath( const char path[], unsigned int priority ); diff --git a/src/intdisplay.h b/src/intdisplay.h index 30c9f3559..13f1796b9 100644 --- a/src/intdisplay.h +++ b/src/intdisplay.h @@ -60,22 +60,11 @@ enum { IMDTYPE_STRUCTURESTAT, }; -typedef struct { - char *Token; - SWORD ID; -} TOKENID; - -typedef struct { - char *Token; - SWORD ID; - SWORD IMD; -} RESEARCHICON; - - -typedef struct { +struct BUTTON_SURFACE +{ UBYTE *Buffer; // Bitmap buffer. iSurface *Surface; // Ivis surface definition. -} BUTTON_SURFACE; +}; #define RENDERBUTTON_INUSE(x) ((x)->InUse=true) @@ -87,7 +76,8 @@ typedef struct { #define IsBufferInitialised(x) ((x)->Initialised) #define IsBufferInUse(x) ((x)->InUse) -typedef struct { +struct RENDERED_BUTTON +{ BOOL InUse; // Is it in use. BOOL Initialised; // Is it initialised. SDWORD ImdRotation; // Rotation if button is an IMD. @@ -97,7 +87,7 @@ typedef struct { BUTTON_SURFACE *ButSurf; // Surface to render the button into. // uint8 *Buffer; // Bitmap buffer. // iSurface *Surface; // Ivis surface definition. -} RENDERED_BUTTON; +}; extern RENDERED_BUTTON TopicBuffers[NUM_TOPICBUFFERS]; extern RENDERED_BUTTON ObjectBuffers[NUM_OBJECTBUFFERS]; diff --git a/src/intimage.cpp b/src/intimage.cpp index e09523327..8e018982f 100644 --- a/src/intimage.cpp +++ b/src/intimage.cpp @@ -40,24 +40,27 @@ enum { FR_KEYED, //< Bitmap drawn with colour 0 transparent. }; -typedef enum { +enum FRAMERECTTYPE +{ FR_IGNORE, //< Fill rect is ignored. FR_FRAME, //< Fill rect drawn relative to frame. FR_LEFT, //< Fill rect drawn relative to left of frame. FR_RIGHT, //< Fill rect drawn relative to right of frame. FR_TOP, //< Fill rect drawn relative to top of frame. FR_BOTTOM, //< Fill rect drawn relative to bottom of frame. -} FRAMERECTTYPE; +}; -typedef struct { +struct FRAMERECT +{ FRAMERECTTYPE Type; //< One of the FR_... values. int TLXOffset, TLYOffset; //< Offsets for the rect fill. int BRXOffset, BRYOffset; int ColourIndex; //< Hackish index into the WZCOLOR palette -} FRAMERECT; +}; // Frame definition structure. -typedef struct { +struct IMAGEFRAME +{ SWORD OffsetX0,OffsetY0; //< Offset top left of frame. SWORD OffsetX1,OffsetY1; //< Offset bottom right of frame. SWORD TopLeft; //< Image indecies for the corners ( -1 = don't draw). @@ -69,7 +72,7 @@ typedef struct { SWORD BottomEdge,BottomType; SWORD LeftEdge,LeftType; FRAMERECT FRect[5]; //< Fill rectangles. -} IMAGEFRAME; +}; IMAGEFILE *IntImages; // All the 2d graphics for the user interface. diff --git a/src/intimage.h b/src/intimage.h index c255fad6c..5d06879ba 100644 --- a/src/intimage.h +++ b/src/intimage.h @@ -28,11 +28,13 @@ #define FILLTRANS 128 /** Frame type */ -typedef enum { +enum FRAMETYPE +{ FRAME_NORMAL, FRAME_RADAR -} FRAMETYPE; +}; -typedef struct { +struct TABDEF +{ SWORD MajorUp; //< Index of image to use for tab not pressed. SWORD MajorDown; //< Index of image to use for tab pressed. SWORD MajorHilight; //< Index of image to use for tab hilighted by mouse. @@ -42,7 +44,7 @@ typedef struct { SWORD MinorDown; SWORD MinorHilight; SWORD MinorSelected; -} TABDEF; +}; extern IMAGEFILE *IntImages; //< All the 2d graphics for the user interface. diff --git a/src/keymap.cpp b/src/keymap.cpp index 833c993be..0864c8a67 100644 --- a/src/keymap.cpp +++ b/src/keymap.cpp @@ -67,12 +67,12 @@ KEY_MAPPING *psMapping,*psReturn; /* Some stuff allowing the user to add key mappings themselves */ #define NUM_QWERTY_KEYS 26 -typedef struct _keymap_Marker +struct KEYMAP_MARKER { KEY_MAPPING *psMapping; UDWORD xPos,yPos; SDWORD spin; -} KEYMAP_MARKER; +}; static KEYMAP_MARKER qwertyKeyMappings[NUM_QWERTY_KEYS]; diff --git a/src/keymap.h b/src/keymap.h index 8d6fe9800..7f67bb03e 100644 --- a/src/keymap.h +++ b/src/keymap.h @@ -26,26 +26,23 @@ #define NO_META_KEY 9999 #define KEYFUNC_TOGGLE_RADAR 20 -typedef enum +enum KEY_ACTION { KEYMAP_DOWN, KEYMAP_PRESSED, KEYMAP_RELEASED -}KEY_ACTION; +}; -typedef enum +enum KEY_STATUS { KEYMAP__DEBUG, KEYMAP_ALWAYS, KEYMAP_ASSIGNABLE, KEYMAP_ALWAYS_PROCESS, KEYMAP___HIDE -}KEY_STATUS; +}; -// moved to lib/framework/input.h -//#define KEY_IGNORE 5190 - -typedef struct _keyMapping +struct KEY_MAPPING { void (*function)(void); BOOL active; @@ -56,8 +53,8 @@ KEY_CODE altMetaKeyCode; KEY_CODE subKeyCode; KEY_ACTION action; char *pName; -struct _keyMapping *psNext; -} KEY_MAPPING; +KEY_MAPPING * psNext; +}; extern KEY_MAPPING *keyAddMapping ( KEY_STATUS status, KEY_CODE metaCode, KEY_CODE subcode, KEY_ACTION action, void (*pKeyMapFunc)(void), const char *name ); diff --git a/src/levels.cpp b/src/levels.cpp index 7ec64cf5a..7827fbb2d 100644 --- a/src/levels.cpp +++ b/src/levels.cpp @@ -74,7 +74,7 @@ char *pLevToken; SDWORD levVal; static SDWORD levelLoadType; // modes for the parser -typedef enum +enum LEVELPARSER_STATE { LP_START, // no input received LP_LEVEL, // level token received @@ -85,7 +85,7 @@ typedef enum LP_WAITDATA, // defining level data, waiting for data token LP_DATA, // data token received LP_GAME, // game token received -} LEVELPARSER_STATE; +}; // initialise the level system diff --git a/src/levels.h b/src/levels.h index 8ce8bc62a..2aef2d034 100644 --- a/src/levels.h +++ b/src/levels.h @@ -35,7 +35,7 @@ // types of level datasets -typedef enum +enum LEVEL_TYPE { LDS_COMPLETE, // all data required for a stand alone level LDS_CAMPAIGN, // the data set for a campaign (no map data) @@ -50,12 +50,12 @@ typedef enum LDS_NONE, //flags when not got a mission to go back to or when //already on one - ****LEAVE AS LAST ONE**** LDS_MULTI_TYPE_START, ///< Start number for custom type numbers (as used by a `type` instruction) -} LEVEL_TYPE; +}; // the WRF/WDG files needed for a particular level // the WRF/WDG files needed for a particular level -typedef struct _level_dataset +struct LEVEL_DATASET { SWORD type; // type of map SWORD players; // number of players for the map @@ -64,11 +64,11 @@ typedef struct _level_dataset searchPathMode dataDir; // title for the level char *apDataFiles[LEVEL_MAXFILES]; // the WRF/WDG files for the level // in load order - struct _level_dataset *psBaseData; // LEVEL_DATASET that must be loaded for this level to load - struct _level_dataset *psChange; // LEVEL_DATASET used when changing to this level from another + LEVEL_DATASET *psBaseData; // LEVEL_DATASET that must be loaded for this level to load + LEVEL_DATASET *psChange; // LEVEL_DATASET used when changing to this level from another - struct _level_dataset *psNext; -} LEVEL_DATASET; + LEVEL_DATASET *psNext; +}; // the current level descriptions diff --git a/src/lighting.h b/src/lighting.h index 463b8b5d1..39be03e37 100644 --- a/src/lighting.h +++ b/src/lighting.h @@ -31,22 +31,22 @@ extern UDWORD fogStatus; -typedef enum _lightcols +enum LIGHT_COLOUR { LIGHT_RED, LIGHT_GREEN, LIGHT_BLUE, LIGHT_YELLOW, LIGHT_WHITE -}LIGHT_COLOUR; +}; -typedef struct _light +struct LIGHT { Vector3i position; UBYTE type; UDWORD range; LIGHT_COLOUR colour; -} LIGHT; +}; extern void setTheSun(Vector3f newSun); extern Vector3f getTheSun(void); diff --git a/src/loadsave.h b/src/loadsave.h index c2166edec..ed8472c56 100644 --- a/src/loadsave.h +++ b/src/loadsave.h @@ -27,14 +27,14 @@ */ /***************************************************************************/ -typedef enum _loadsave_mode +enum LOADSAVE_MODE { LOAD_FRONTEND, LOAD_MISSIONEND, SAVE_MISSIONEND, LOAD_INGAME, SAVE_INGAME -}LOADSAVE_MODE; +}; /***************************************************************************/ /* diff --git a/src/loop.cpp b/src/loop.cpp index 887113205..6c785b2e7 100644 --- a/src/loop.cpp +++ b/src/loop.cpp @@ -108,15 +108,15 @@ static BOOL paused=false; static BOOL video=false; //holds which pause is valid at any one time -typedef struct _pause_state +struct PAUSE_STATE { - unsigned gameUpdatePause : 1; - unsigned audioPause : 1; - unsigned scriptPause : 1; - unsigned scrollPause : 1; - unsigned consolePause : 1; - unsigned editPause : 1; -} PAUSE_STATE; + bool gameUpdatePause; + bool audioPause; + bool scriptPause; + bool scrollPause; + bool consolePause; + bool editPause; +}; static PAUSE_STATE pauseState; static UDWORD numDroids[MAX_PLAYERS]; diff --git a/src/loop.h b/src/loop.h index a793f2413..098b2a079 100644 --- a/src/loop.h +++ b/src/loop.h @@ -26,7 +26,8 @@ #include "lib/framework/frame.h" -typedef enum { +enum GAMECODE +{ GAMECODE_CONTINUE, GAMECODE_RESTARTGAME, GAMECODE_QUITGAME, @@ -34,10 +35,10 @@ typedef enum { GAMECODE_NEWLEVEL, GAMECODE_FASTEXIT, GAMECODE_LOADGAME, -} GAMECODE; +}; // the states the loop goes through before starting a new level -typedef enum +enum LOOP_MISSION_STATE { LMS_NORMAL, // normal state of the loop LMS_SETUPMISSION, // make the call to set up mission @@ -45,7 +46,7 @@ typedef enum LMS_NEWLEVEL, // start a new level LMS_LOADGAME, // load a savegame LMS_CLEAROBJECTS, // make the call to destroy objects -} LOOP_MISSION_STATE; +}; extern LOOP_MISSION_STATE loopMissionState; // this is set by scrStartMission to say what type of new level is to be started diff --git a/src/main.cpp b/src/main.cpp index 0cb890ae5..d7d2ceed2 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -86,11 +86,11 @@ # define WZ_DATADIR "data" #endif -typedef enum _focus_state +enum FOCUS_STATE { FOCUS_OUT, // Window does not have the focus FOCUS_IN, // Window has got the focus -} FOCUS_STATE; +}; #if defined(WZ_OS_WIN) # define WZ_WRITEDIR "Warzone 2100 master" diff --git a/src/main.h b/src/main.h index 052931d94..58d1bff43 100644 --- a/src/main.h +++ b/src/main.h @@ -21,11 +21,12 @@ #ifndef __INCLUDED_SRC_MAIN_H__ #define __INCLUDED_SRC_MAIN_H__ -typedef enum { +enum GS_GAMEMODE +{ GS_TITLE_SCREEN, GS_NORMAL, GS_SAVEGAMELOAD -} GS_GAMEMODE; +}; //flag to indicate when initialisation is complete extern BOOL gameInitialised; diff --git a/src/map.cpp b/src/map.cpp index 51d21ef43..b6a7dca4b 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -74,37 +74,38 @@ struct ffnode SDWORD scrollMinX, scrollMaxX, scrollMinY, scrollMaxY; /* Structure definitions for loading and saving map data */ -typedef struct _map_save_header +struct MAP_SAVEHEADER // : public GAME_SAVEHEADER { char aFileType[4]; UDWORD version; UDWORD width; UDWORD height; -} MAP_SAVEHEADER; +}; -typedef struct _map_save_tilev2 +struct MAP_SAVETILE { UWORD texture; UBYTE height; -} MAP_SAVETILE; +}; -typedef struct _gateway_save_header +struct GATEWAY_SAVEHEADER { UDWORD version; UDWORD numGateways; -} GATEWAY_SAVEHEADER; +}; -typedef struct _gateway_save +struct GATEWAY_SAVE { UBYTE x0,y0,x1,y1; -} GATEWAY_SAVE; +}; -typedef struct _zonemap_save_header { +struct ZONEMAP_SAVEHEADER +{ UWORD version; UWORD numZones; UWORD numEquivZones; UWORD pad; -} ZONEMAP_SAVEHEADER; +}; /* Sanity check definitions for the save struct file sizes */ #define SAVE_HEADER_SIZE 16 diff --git a/src/map.h b/src/map.h index 68b4a0a74..5dda58dfb 100644 --- a/src/map.h +++ b/src/map.h @@ -32,7 +32,7 @@ #include "display.h" /* The different types of terrain as far as the game is concerned */ -typedef enum _terrain_type +enum TYPE_OF_TERRAIN { TER_SAND, TER_SANDYBRUSH, @@ -48,7 +48,7 @@ typedef enum _terrain_type TER_SLUSH, TER_MAX, -} TYPE_OF_TERRAIN; +}; #define TILESET_ARIZONA 0 #define TILESET_URBAN 1 @@ -83,11 +83,11 @@ static inline unsigned short TileNumber_texture(unsigned short tilenumber) #define BITS_ON_FIRE 0x20 ///< Whether tile is burning #define BITS_GATEWAY 0x40 ///< Bit set to show a gateway on the tile -typedef struct _ground_type +struct GROUND_TYPE { const char *textureName; float textureSize; -} GROUND_TYPE; +}; /* Information stored with each tile */ struct MAPTILE @@ -509,13 +509,6 @@ WZ_DECL_ALWAYS_INLINE static inline bool worldOnMap3f(Vector3f pos) } -/* Store a map coordinate and it's associated tile */ -typedef struct _tile_coord -{ - UDWORD x,y; - MAPTILE *psTile; -} TILE_COORD; - /* Intersect a line with the map and report tile intersection points */ bool map_Intersect(int *Cx, int *Cy, int *Vx, int* Vy, int *Sx, int *Sy); diff --git a/src/message_parser.y b/src/message_parser.y index ffaa3f296..6267fb177 100644 --- a/src/message_parser.y +++ b/src/message_parser.y @@ -37,11 +37,11 @@ void yyerror(const char* msg) debug(LOG_ERROR, "SMSG file parse error:\n%s at line %d\nText: '%s'", msg, message_get_lineno(), message_get_text()); } -typedef struct TEXT_MESSAGE +struct TEXT_MESSAGE { char * str; - struct TEXT_MESSAGE* psNext; -} TEXT_MESSAGE; + TEXT_MESSAGE *psNext; +}; static void freeTextMessageList(TEXT_MESSAGE* list) { @@ -54,11 +54,11 @@ static void freeTextMessageList(TEXT_MESSAGE* list) } } -typedef struct VIEWDATAMESSAGE +struct VIEWDATAMESSAGE { VIEWDATA view; struct VIEWDATAMESSAGE* psNext; -} VIEWDATAMESSAGE; +}; static void freeViewDataMessageList(VIEWDATAMESSAGE* list) { diff --git a/src/messagedef.h b/src/messagedef.h index 57b9d5243..17ee49283 100644 --- a/src/messagedef.h +++ b/src/messagedef.h @@ -32,7 +32,7 @@ /// max number of text strings or sequences for VIEWDATA static const unsigned int MAX_DATA = 4; -typedef enum _message_type +enum MESSAGE_TYPE { MSG_RESEARCH, // Research message MSG_CAMPAIGN, // Campaign message @@ -40,9 +40,9 @@ typedef enum _message_type MSG_PROXIMITY, // Proximity message MSG_TYPES, -} MESSAGE_TYPE; +}; -typedef enum _view_type +enum VIEW_TYPE { VIEW_RES, // research view VIEW_RPL, // full screen view sequence - flic @@ -50,27 +50,27 @@ typedef enum _view_type VIEW_RPLX, // full screen view sequence - flic. extended format VIEW_BEACON, // Beacon message -} VIEW_TYPE; +}; -typedef enum _prox_type +enum PROX_TYPE { PROX_ENEMY, //enemy proximity message PROX_RESOURCE, //resource proximity message PROX_ARTEFACT, //artefact proximity message PROX_TYPES, -} PROX_TYPE; +}; // info required to view an object in Intelligence screen -typedef struct _view_research +struct VIEW_RESEARCH { iIMDShape *pIMD; iIMDShape *pIMD2; //allows base plates and turrets to be drawn as well char sequenceName[MAX_STR_LENGTH]; //which windowed flic to display char *pAudio; /*name of audio track to play (for this seq)*/ -} VIEW_RESEARCH; +}; -typedef struct _seq_display +struct SEQ_DISPLAY { char sequenceName[MAX_STR_LENGTH]; @@ -79,17 +79,17 @@ typedef struct _seq_display //this sequence const char** ppTextMsg; //Pointer to text messages - if any char *pAudio; /*name of audio track to play (for this seq)*/ -} SEQ_DISPLAY; +}; //info required to view a flic in Intelligence Screen -typedef struct _view_replay +struct VIEW_REPLAY { UBYTE numSeq; SEQ_DISPLAY *pSeqList; -} VIEW_REPLAY; +}; // info required to view a proximity message -typedef struct _view_proximity +struct VIEW_PROXIMITY { UDWORD x; //world coords for position of Proximity message UDWORD y; @@ -98,9 +98,9 @@ typedef struct _view_proximity SDWORD audioID; /*ID of the audio track to play - if any */ SDWORD sender; //user who sent this msg SDWORD timeAdded; //remember when was added, so can remove after certain period of time -} VIEW_PROXIMITY; +}; -typedef struct _viewdata +struct VIEWDATA { char *pName; //name ID of the message - used for loading in and identifying VIEW_TYPE type; //the type of view @@ -108,18 +108,18 @@ typedef struct _viewdata const char** ppTextMsg; //Pointer to text messages - if any void* pData; /*the data required to view - either a VIEW_RESEARCH, VIEW_PROXIMITY or VIEW_REPLAY*/ -} VIEWDATA; +}; typedef void* MSG_VIEWDATA; -typedef enum _msg_data_type +enum MSG_DATA_TYPE { MSG_DATA_DEFAULT, // Message's pViewData has a BASE_OBJECT stored MSG_DATA_BEACON, // Message's pViewData has beacon data stored -} MSG_DATA_TYPE; +}; //base structure for each message -typedef struct _message +struct MESSAGE { MESSAGE_TYPE type; //The type of message UDWORD id; //ID number of the message @@ -129,8 +129,8 @@ typedef struct _message MSG_DATA_TYPE dataType; //stores actual type of data pViewData points to //only relevant for messages of type MSG_PROXIMITY - struct _message *psNext; //pointer to the next in the list -} MESSAGE; + MESSAGE * psNext; //pointer to the next in the list +}; //used to display the proximity messages struct PROXIMITY_DISPLAY : public OBJECT_POSITION @@ -142,11 +142,11 @@ struct PROXIMITY_DISPLAY : public OBJECT_POSITION PROXIMITY_DISPLAY * psNext; //pointer to the next in the list }; -typedef struct _viewData_list +struct VIEWDATA_LIST { VIEWDATA *psViewData; //array of data UBYTE numViewData; //number in array - struct _viewData_list *psNext; //next array of data -} VIEWDATA_LIST; + VIEWDATA_LIST * psNext; //next array of data +}; #endif // __INCLUDED_MESSAGEDEF_H__ diff --git a/src/miscimd.h b/src/miscimd.h index e4fe4ffe0..6f325790d 100644 --- a/src/miscimd.h +++ b/src/miscimd.h @@ -71,11 +71,11 @@ extern iIMDShape *landingImd; extern iIMDShape *shockImd; /* An imd entry */ -typedef struct _misc_imd +struct MISC_IMD { iIMDShape *pImd; const char *pName; -} MISC_IMD; +}; enum { diff --git a/src/missiondef.h b/src/missiondef.h index bb73b9070..332a1472e 100644 --- a/src/missiondef.h +++ b/src/missiondef.h @@ -46,6 +46,8 @@ struct LANDING_ZONE uint8_t y2; }; +struct GATEWAY; + //storage structure for values that need to be kept between missions struct MISSION { @@ -53,7 +55,7 @@ struct MISSION MAPTILE *psMapTiles; //the original mapTiles int32_t mapWidth; //the original mapWidth int32_t mapHeight; //the original mapHeight - struct _gateway * psGateways; //the gateway list + GATEWAY * psGateways; //the gateway list int32_t scrollMinX; //scroll coords for original map int32_t scrollMinY; int32_t scrollMaxX; diff --git a/src/move.cpp b/src/move.cpp index dbe1551d5..b366ebcd0 100644 --- a/src/move.cpp +++ b/src/move.cpp @@ -536,11 +536,11 @@ void updateDroidOrientation(DROID *psDroid) } -typedef struct +struct BLOCKING_CALLBACK_DATA { PROPULSION_TYPE propulsionType; bool blocking; -} BLOCKING_CALLBACK_DATA; +}; static bool moveBlockingTileCallback(Vector3i pos, int32_t dist, void *data_) { diff --git a/src/multiint.cpp b/src/multiint.cpp index 729a31446..4166e50e7 100644 --- a/src/multiint.cpp +++ b/src/multiint.cpp @@ -1230,12 +1230,12 @@ static void addBlueForm(UDWORD parent,UDWORD id, const char *txt,UDWORD x,UDWORD } -typedef struct +struct LimitIcon { char const *stat; char const *desc; int icon; -} LimitIcon; +}; static const LimitIcon limitIcons[] = { {"A0LightFactory", N_("Tanks disabled!!"), IMAGE_NO_TANK}, diff --git a/src/parsetest.h b/src/parsetest.h index 2b4ea9d22..654b18b85 100644 --- a/src/parsetest.h +++ b/src/parsetest.h @@ -20,11 +20,11 @@ #ifndef __INCLUDED_SRC_PARSETEST_H__ #define __INCLUDED_SRC_PARSETEST_H__ -typedef struct +struct test_files { const char* testname; const char* content; -} test_files; +}; extern void parseTest(void); diff --git a/src/power.cpp b/src/power.cpp index 57084069e..596eb42aa 100644 --- a/src/power.cpp +++ b/src/power.cpp @@ -64,14 +64,14 @@ static int64_t updateExtractedPower(STRUCTURE *psBuilding); //returns the relevant list based on OffWorld or OnWorld static STRUCTURE* powerStructList(UBYTE player); -typedef struct _player_power +struct PLAYER_POWER { // All fields are 32.32 fixed point. int64_t currentPower; ///< The current amount of power avaialble to the player. int64_t powerProduced; ///< Power produced int64_t powerRequested; ///< Power requested int64_t economyThrottle; ///< What fraction of the requested power is actually delivered -} PLAYER_POWER; +}; static PLAYER_POWER asPower[MAX_PLAYERS]; diff --git a/src/projectile.cpp b/src/projectile.cpp index 5fce2879f..1fcb378c2 100644 --- a/src/projectile.cpp +++ b/src/projectile.cpp @@ -65,10 +65,10 @@ #define VTOL_HITBOX_MODIFICATOR 100 -typedef struct _interval +struct INTERVAL { int begin, end; // Time 1 = 0, time 2 = 1024. Or begin >= end if empty. -} INTERVAL; +}; // Watermelon:they are from droid.c /* The range for neighbouring objects */ diff --git a/src/projectiledef.h b/src/projectiledef.h index b513578ec..6171e6eed 100644 --- a/src/projectiledef.h +++ b/src/projectiledef.h @@ -29,13 +29,13 @@ #include -typedef enum PROJ_STATE +enum PROJ_STATE { PROJ_INFLIGHTDIRECT, PROJ_INFLIGHTINDIRECT, PROJ_IMPACT, PROJ_POSTIMPACT -} PROJ_STATE; +}; struct PROJECTILE : public SIMPLE_OBJECT { diff --git a/src/radar.h b/src/radar.h index 4bb824eb9..d38a1d75b 100644 --- a/src/radar.h +++ b/src/radar.h @@ -46,7 +46,7 @@ extern uint8_t GetRadarZoom(void); ///< Get current zoom level. extern BOOL CoordInRadar(int x, int y); ///< Is screen coordinate inside minimap? /** Different mini-map draw modes. */ -typedef enum _radar_draw_mode +enum RADAR_DRAW_MODE { RADAR_MODE_TERRAIN, ///< Draw terrain map RADAR_MODE_DEFAULT = RADAR_MODE_TERRAIN, ///< Default is terrain map @@ -55,7 +55,7 @@ typedef enum _radar_draw_mode RADAR_MODE_COMBINED, RADAR_MODE_NO_TERRAIN, ///< Only display objects NUM_RADAR_MODES -}RADAR_DRAW_MODE; +}; extern BOOL bEnemyAllyRadarColor; ///< Enemy/ally minimap color extern RADAR_DRAW_MODE radarDrawMode; ///< Current minimap mode diff --git a/src/raycast.cpp b/src/raycast.cpp index 4a0c14ef1..4476b3995 100644 --- a/src/raycast.cpp +++ b/src/raycast.cpp @@ -31,10 +31,11 @@ #include "display3d.h" // TILE_SIZE and clipXY() -typedef struct { +struct HeightCallbackHelp_t +{ const int height; uint16_t pitch; -} HeightCallbackHelp_t; +}; void rayCast(Vector3i src, uint16_t direction, uint32_t length, RAY_CALLBACK callback, void *data) diff --git a/src/research.h b/src/research.h index b7684c15d..7ff70d29b 100644 --- a/src/research.h +++ b/src/research.h @@ -118,7 +118,8 @@ extern RESEARCH * getResearch(const char *pName, BOOL resName); extern void cancelResearch(STRUCTURE *psBuilding, QUEUE_MODE mode); /* For a given view data get the research this is related to */ -extern RESEARCH * getResearchForMsg(struct _viewdata *pViewData); +struct VIEWDATA; +RESEARCH *getResearchForMsg(VIEWDATA *pViewData); /* Sets the 'possible' flag for a player's research so the topic will appear in the research list next time the Research Facilty is selected */ diff --git a/src/researchdef.h b/src/researchdef.h index 492bbd9f3..c08cfeb11 100644 --- a/src/researchdef.h +++ b/src/researchdef.h @@ -25,13 +25,14 @@ #define __INCLUDED_RESEARCHDEF_H__ #include "lib/framework/frame.h" +#include "statsdef.h" /* Research struct type definitions */ -typedef enum +enum TECH_CODE { TC_MAJOR, TC_MINOR, -} TECH_CODE; +}; struct RESEARCH : public BASE_STATS { @@ -65,8 +66,7 @@ struct RESEARCH : public BASE_STATS COMPONENT_STATS **pReplacedArtefacts;/*List of artefacts that are replaced by the above result - not necessarily any! 1 to 1 relation with above list */ - struct _viewdata *pViewData; /*data used to display a message in the - Intelligence Screen*/ + struct VIEWDATA * pViewData; // data used to display a message in the Intelligence Screen UWORD iconID; /* the ID from 'Framer' for which graphic to draw in interface*/ BASE_STATS *psStat; /* A stat used to define which graphic is drawn instead of the two fields below*/ @@ -74,7 +74,7 @@ struct RESEARCH : public BASE_STATS iIMDShape *pIMD2; /* the 2nd IMD for base plates/turrets*/ }; -typedef struct _player_research +struct PLAYER_RESEARCH { UDWORD currentPoints; // If the research has been suspended then this value contains the number of points generated at the suspension/cancel point // normally it is null @@ -82,7 +82,7 @@ typedef struct _player_research UBYTE ResearchStatus; // Bit flags ... see below bool possible; ///< is the research possible ... so can enable topics vis scripts -} PLAYER_RESEARCH; +}; #define STARTED_RESEARCH 0x01 // research in progress #define CANCELLED_RESEARCH 0x02 // research has been canceled diff --git a/src/scores.cpp b/src/scores.cpp index 6b39bd79c..436987be2 100644 --- a/src/scores.cpp +++ b/src/scores.cpp @@ -68,7 +68,7 @@ #define RANK_BAR_WIDTH 100 #define STAT_BAR_WIDTH 100 -typedef enum +enum MR_STRING { STR_MR_UNITS_LOST, STR_MR_UNITS_KILLED, @@ -88,7 +88,7 @@ typedef enum STR_MR_LEVEL_ELITE, STR_MR_LEVEL_SPECIAL, STR_MR_LEVEL_ACE -} MR_STRING; +}; // return translated string diff --git a/src/scores.h b/src/scores.h index 4a0b4a5a4..60d35787d 100644 --- a/src/scores.h +++ b/src/scores.h @@ -21,7 +21,7 @@ #ifndef __INCLUDED_SRC_SCORES_H__ #define __INCLUDED_SRC_SCORES_H__ -typedef enum data_index +enum DATA_INDEX { WD_UNITS_BUILT, WD_UNITS_KILLED, @@ -34,11 +34,11 @@ WD_MISSION_STARTED, WD_SHOTS_ON_TARGET, WD_SHOTS_OFF_TARGET, WD_BARBARIANS_MOWED_DOWN -} DATA_INDEX; +}; // -------------------------------------------------------------------- /* The mission results data */ -typedef struct mission_data +struct MISSION_DATA { uint32_t unitsBuilt; // How many units were built uint32_t unitsKilled; // How many enemy units you blew up @@ -51,10 +51,10 @@ typedef struct mission_data uint32_t shotsOnTarget; // How many hits uint32_t shotsOffTarget; // How many misses uint32_t babasMowedDown; // How many barbarians did we mow down? -} MISSION_DATA; +}; // Could use widgets, but hey..... -typedef struct _stat_bar +struct STAT_BAR { UDWORD topX,topY; // Obvious UDWORD width,height; // Height down screen and width _unfilled_ @@ -64,7 +64,7 @@ UDWORD queTime; // How many game ticks before it's active? BOOL bQueued; // Already fired off? BOOL bActive; // Is this one active? UDWORD number; // %d string for the associated text string. -}STAT_BAR; +}; enum { diff --git a/src/scriptai.h b/src/scriptai.h index 68fadeb7f..70b66d838 100644 --- a/src/scriptai.h +++ b/src/scriptai.h @@ -94,7 +94,7 @@ extern BOOL scrCmdDroidMaxGroup(void); extern BOOL scrDroidCanReach(void); // types for structure targets -typedef enum _scr_struct_tar +enum SCR_STRUCT_TAR { // normal structure types SCR_ST_HQ = 0x00000001, @@ -115,10 +115,10 @@ typedef enum _scr_struct_tar SCR_ST_DEF_AIR = 0x00002000, SCR_ST_DEF_IDF = 0x00004000, SCR_ST_DEF_ALL = 0x00007000, -} SCR_STRUCT_TAR; +}; -typedef enum _scr_droid_tar +enum SCR_DROID_TAR { // turret types SCR_DT_COMMAND = 0x00000001, @@ -145,7 +145,7 @@ typedef enum _scr_droid_tar SCR_DT_VTOL = 0x00008000, SCR_DT_HOVER = 0x00010000, SCR_DT_PROPELLOR = 0x00020000, -} SCR_DROID_TAR; +}; // reset the structure preferences diff --git a/src/scriptfuncs.h b/src/scriptfuncs.h index 33f9e031d..712dc1282 100644 --- a/src/scriptfuncs.h +++ b/src/scriptfuncs.h @@ -472,12 +472,12 @@ extern BOOL scrForceDamage( void ); extern BOOL scrGetGameStatus(void); -typedef enum gamestatus +enum GAMESTATUS { STATUS_ReticuleIsOpen, STATUS_BattleMapViewEnabled, STATUS_DeliveryReposInProgress -} GAMESTATUS; +}; //get the colour number used by a player extern BOOL scrGetPlayerColour(void); diff --git a/src/scriptvals.cpp b/src/scriptvals.cpp index e8ee39d2f..48e94276b 100644 --- a/src/scriptvals.cpp +++ b/src/scriptvals.cpp @@ -37,14 +37,14 @@ #include "group.h" // Keep all the loaded script contexts -typedef struct _scrv_store +struct SCRV_STORE { SCRV_TYPE type; char *pIDString; SCRIPT_CONTEXT *psContext; - struct _scrv_store *psNext; -} SCRV_STORE; + SCRV_STORE * psNext; +}; // The list of script contexts static SCRV_STORE *psContextStore=NULL; diff --git a/src/scriptvals.h b/src/scriptvals.h index 4b7ec3d74..b4d56c649 100644 --- a/src/scriptvals.h +++ b/src/scriptvals.h @@ -30,29 +30,29 @@ #include // The possible types of initialisation values -typedef enum _init_type +enum INIT_TYPE { IT_BOOL, IT_INDEX, IT_STRING, -} INIT_TYPE; +}; // All the possible values that may be used to initialise a variable -typedef struct _var_init +struct VAR_INIT { INIT_TYPE type; SDWORD index; char *pString; -} VAR_INIT; +}; // store array access data -typedef struct _array_indexes +struct ARRAY_INDEXES { SDWORD dimensions; SDWORD elements[VAR_MAX_DIMENSIONS]; -} ARRAY_INDEXES; +}; /* A simple error reporting routine */ @@ -68,11 +68,11 @@ extern BOOL scrvLookUpVar(const char *pIdent, UDWORD *pIndex); extern BOOL scrvLookUpArray(const char *pIdent, UDWORD *pIndex); // Whether the script is run immediately or stored for later use -typedef enum _scrv_type +enum SCRV_TYPE { SCRV_EXEC, SCRV_NOEXEC, -} SCRV_TYPE; +}; // Add a new context to the list extern BOOL scrvAddContext(char *pID, SCRIPT_CONTEXT *psContext, SCRV_TYPE type); diff --git a/src/selection.h b/src/selection.h index 068965534..925a4c465 100644 --- a/src/selection.h +++ b/src/selection.h @@ -21,13 +21,13 @@ #ifndef __INCLUDED_SRC_SELECTION_H__ #define __INCLUDED_SRC_SELECTION_H__ -typedef enum _selection_class +enum SELECTION_CLASS { DS_ALL_UNITS, DS_BY_TYPE -} SELECTION_CLASS; +}; -typedef enum _selectiontype +enum SELECTIONTYPE { DST_UNUSED, DST_VTOL, @@ -38,7 +38,7 @@ DST_HALF_TRACKED, DST_ALL_COMBAT, DST_ALL_DAMAGED, DST_ALL_SAME -} SELECTIONTYPE; +}; // EXTERNALLY REFERENCED FUNCTIONS extern UDWORD selDroidSelection( UDWORD player, SELECTION_CLASS droidClass, diff --git a/src/seqdisp.cpp b/src/seqdisp.cpp index 2c429f2f5..3963a24e0 100644 --- a/src/seqdisp.cpp +++ b/src/seqdisp.cpp @@ -67,7 +67,7 @@ static int D_W2 = 0; // Text width offset static int D_H2 = 0; // Text height offset -typedef struct +struct SEQTEXT { char pText[MAX_STR_LENGTH]; UDWORD x; @@ -75,16 +75,16 @@ typedef struct UDWORD startFrame; UDWORD endFrame; BOOL bSubtitle; -} SEQTEXT; +}; -typedef struct +struct SEQLIST { const char *pSeq; //name of the sequence to play const char *pAudio; //name of the wav to play BOOL bSeqLoop; //loop this sequence SDWORD currentText; //cuurent number of text messages for this seq SEQTEXT aText[MAX_TEXT_OVERLAYS]; //text data to display for this sequence -} SEQLIST; +}; /***************************************************************************/ /* * local Variables @@ -111,11 +111,11 @@ static BOOL g_bResumeInGame = false; */ /***************************************************************************/ -typedef enum +enum VIDEO_RESOLUTION { VIDEO_PRESELECTED_RESOLUTION, VIDEO_USER_CHOSEN_RESOLUTION, -} VIDEO_RESOLUTION; +}; static bool seq_StartFullScreenVideo(const char* videoName, const char* audioName, VIDEO_RESOLUTION resolution); BOOL seq_SetupVideoBuffers(void); diff --git a/src/seqdisp.h b/src/seqdisp.h index d82e4e6c2..62f4a73ad 100644 --- a/src/seqdisp.h +++ b/src/seqdisp.h @@ -38,7 +38,7 @@ #define SEQUENCE_KILL 3//stop #define SEQUENCE_HOLD 4//play once and hold last frame -typedef enum +enum SEQ_TEXT_POSITIONING { /** * Position text. @@ -54,7 +54,7 @@ typedef enum * Justify if less than 520/600 length. */ SEQ_TEXT_JUSTIFY, -} SEQ_TEXT_POSITIONING; +}; /***************************************************************************/ /* diff --git a/src/structure.cpp b/src/structure.cpp index 2c1fa01af..5fd579204 100644 --- a/src/structure.cpp +++ b/src/structure.cpp @@ -3962,10 +3962,10 @@ UDWORD fillStructureList(STRUCTURE_STATS **ppList, UDWORD selectedPlayer, UDWORD } -typedef enum +enum STRUCTURE_PACKABILITY { PACKABILITY_EMPTY = 0, PACKABILITY_DEFENSE = 1, PACKABILITY_NORMAL = 2, PACKABILITY_REPAIR = 3 -} STRUCTURE_PACKABILITY; +}; static inline bool canPack(STRUCTURE_PACKABILITY a, STRUCTURE_PACKABILITY b) { diff --git a/src/terrain.cpp b/src/terrain.cpp index 3899a24c2..58a890f7c 100644 --- a/src/terrain.cpp +++ b/src/terrain.cpp @@ -53,7 +53,7 @@ * The actual geometry and texture data is not stored in here but in large VBO's. * The sector only stores the index and length of the pieces it's going to use. */ -typedef struct +struct Sector { int geometryOffset; ///< The point in the geometry VBO where our geometry starts int geometrySize; ///< The size of our geometry @@ -71,20 +71,20 @@ typedef struct int decalSize; ///< Size of the part of the decal VBO we are going to use bool draw; ///< Do we draw this sector this frame? bool dirty; ///< Do we need to update the geometry for this sector? -} Sector; +}; /// A vertex with just a position -typedef struct +struct RenderVertex { GLfloat x, y, z; // Vertex -} RenderVertex; +}; /// A vertex with a position and texture coordinates -typedef struct +struct DecalVertex { GLfloat x, y, z; GLfloat u, v; // uv -} DecalVertex; +}; /// The lightmap texture static GLuint lightmap_tex_num; diff --git a/src/texture.h b/src/texture.h index 5931b22ef..c9107c95a 100644 --- a/src/texture.h +++ b/src/texture.h @@ -25,12 +25,12 @@ bool texLoad(const char *fileName); -typedef struct _tileTexInfo +struct TILE_TEX_INFO { float uOffset; // Offset into texture page to left hand edge float vOffset; // Offset into texture page to top hand edge unsigned int texPage; // Which textpage is the tile in? TileNumber/16 basically; -} TILE_TEX_INFO; +}; // these constants are adapted for fitting 256 textures of size 128x128 into a 2048x2048 // texture page; if such large texture pages are not available, just scaled everything down diff --git a/src/visibility.cpp b/src/visibility.cpp index 76ce6af7b..4b2d03aee 100644 --- a/src/visibility.cpp +++ b/src/visibility.cpp @@ -64,7 +64,8 @@ static SDWORD visLevelInc, visLevelDec; // horrible hack because this code is full of them and I ain't rewriting it all - Per #define MAX_SEEN_TILES (29*29 * 355/113) // Increased hack to support 28 tile sensor radius. - Cyp -typedef struct { +struct VisibleObjectHelp_t +{ bool rayStart; // Whether this is the first point on the ray const bool wallsBlock; // Whether walls block line of sight const int startHeight; // The height at the view point @@ -73,7 +74,7 @@ typedef struct { int currGrad; // The current obscuring gradient int numWalls; // Whether the LOS has hit a wall Vector2i wall; // The position of a wall if it is on the LOS -} VisibleObjectHelp_t; +}; static int *gNumWalls = NULL; @@ -139,7 +140,7 @@ static void doWaveTerrain(int sx, int sy, int sz, unsigned radius, int rayPlayer { size_t i; size_t size; - const WAVECAST_TILE *tiles = getWavecastTable(radius, &size); + const WavecastTile *tiles = getWavecastTable(radius, &size); int tileHeight, perspectiveHeight; #define MAX_WAVECAST_LIST_SIZE 1360 // Trivial upper bound to what a fully upgraded WSS can use (its number of angles). Should probably be some factor times the maximum possible radius. Is probably a lot more than needed. Tested to need at least 180. int heights[2][MAX_WAVECAST_LIST_SIZE]; diff --git a/src/warcam.h b/src/warcam.h index b976e81ce..897e7dc74 100644 --- a/src/warcam.h +++ b/src/warcam.h @@ -52,7 +52,7 @@ CAM_TRACK_LOCATION }; /* Storage for old viewnagles etc */ -typedef struct _warcam +struct WARCAM { UDWORD status; UDWORD trackClass; @@ -69,7 +69,7 @@ Vector3f rotAccel; UDWORD oldDistance; BASE_OBJECT *target; -}WARCAM; +}; /* Externally referenced functions */ extern void initWarCam ( void ); diff --git a/src/warzoneconfig.cpp b/src/warzoneconfig.cpp index f1891b3ab..ebac0d0d1 100644 --- a/src/warzoneconfig.cpp +++ b/src/warzoneconfig.cpp @@ -42,7 +42,7 @@ */ /***************************************************************************/ -typedef struct _warzoneGlobals +struct WARZONE_GLOBALS { FMV_MODE FMVmode; BOOL bFog; @@ -58,7 +58,7 @@ typedef struct _warzoneGlobals bool ColouredCursor; bool MusicEnabled; int8_t SPcolor; -} WARZONE_GLOBALS; +}; /***************************************************************************/ /* diff --git a/src/warzoneconfig.h b/src/warzoneconfig.h index 8ba080e43..f73a90dc3 100644 --- a/src/warzoneconfig.h +++ b/src/warzoneconfig.h @@ -31,14 +31,13 @@ * Global Definitions */ /***************************************************************************/ -typedef enum FMV_MODE - { +enum FMV_MODE +{ FMV_FULLSCREEN, FMV_1X, FMV_2X, FMV_MAX - } - FMV_MODE; +}; /***************************************************************************/ /* diff --git a/src/wavecast.h b/src/wavecast.h index f6d908399..5ffbf7ead 100644 --- a/src/wavecast.h +++ b/src/wavecast.h @@ -20,15 +20,15 @@ #ifndef _WAVE_CAST_H_ #define _WAVE_CAST_H_ -typedef struct WavecastTile +struct WavecastTile { int16_t dx, dy; ///< Tile coordinates. int32_t invRadius; ///< Arbitrary constant divided by radius. int16_t angBegin, angEnd; ///< Start and finish angles for obstruction of view. Non-linear units, for comparison purposes only. -} WAVECAST_TILE; +}; // Not thread safe if someone calls with a new radius. Thread safe, otherwise. -const WAVECAST_TILE *getWavecastTable(unsigned radius, size_t *size); +const WavecastTile *getWavecastTable(unsigned radius, size_t *size); #endif //_WAVE_CAST_H_ diff --git a/src/weapondef.h b/src/weapondef.h index 7d9498553..ac5e85434 100644 --- a/src/weapondef.h +++ b/src/weapondef.h @@ -24,7 +24,7 @@ #ifndef __INCLUDED_WEAPONDEF_H__ #define __INCLUDED_WEAPONDEF_H__ -typedef struct _weapon +struct WEAPON { unsigned int nStat; ///< Index into the asWeaponStats global array uint32_t ammo; @@ -33,6 +33,6 @@ typedef struct _weapon uint32_t recoilValue; Rotation rot; Rotation prevRot; -} WEAPON; +}; #endif // __INCLUDED_WEAPONDEF_H__ diff --git a/src/wrappers.cpp b/src/wrappers.cpp index 97ae357e9..34881af69 100644 --- a/src/wrappers.cpp +++ b/src/wrappers.cpp @@ -43,12 +43,12 @@ #include "warzoneconfig.h" #include "wrappers.h" -typedef struct _star +struct STAR { int xPos; int speed; PIELIGHT colour; -} STAR; +}; static BOOL firstcall = false; static BOOL bPlayerHasLost = false; diff --git a/src/wrappers.h b/src/wrappers.h index 670993457..5b7754294 100644 --- a/src/wrappers.h +++ b/src/wrappers.h @@ -21,13 +21,14 @@ #ifndef __INCLUDED_SRC_WRAPPERS_H__ #define __INCLUDED_SRC_WRAPPERS_H__ -typedef enum { +enum TITLECODE +{ TITLECODE_CONTINUE, TITLECODE_STARTGAME, TITLECODE_QUITGAME, TITLECODE_SHOWINTRO, TITLECODE_SAVEGAMELOAD, -} TITLECODE; +}; //used to set the scriptWinLoseVideo variable #define PLAY_NONE 0 From cc150fc2f79da2d9000e1d1f9428fb6b155f11d8 Mon Sep 17 00:00:00 2001 From: Cyp Date: Fri, 25 Feb 2011 22:49:02 +0100 Subject: [PATCH 03/59] Exit if shaders are not supported, and revert "Hack in the team colour when shaders aren't supported." This reverts commit e0617af5e655d10a2ad5cb9709611d4c9529f2ba. If you are building from source, and you cannot upgrade your graphics drivers, you can revert this revert, and the game may be playable for now. --- lib/ivis_opengl/piedef.h | 2 +- lib/ivis_opengl/piedraw.cpp | 16 +++++----------- lib/ivis_opengl/screen.cpp | 7 ++----- lib/ivis_opengl/screen.h | 2 -- src/component.cpp | 10 +++++----- src/display3d.cpp | 12 ++++++------ 6 files changed, 19 insertions(+), 30 deletions(-) diff --git a/lib/ivis_opengl/piedef.h b/lib/ivis_opengl/piedef.h index 968f63776..b68119808 100644 --- a/lib/ivis_opengl/piedef.h +++ b/lib/ivis_opengl/piedef.h @@ -70,7 +70,7 @@ struct PIEIMAGE ///< An area of texture. * Global ProtoTypes */ /***************************************************************************/ -extern void pie_Draw3DShape(iIMDShape *shape, int frame, int team, PIELIGHT colour, int pieFlag, int pieFlagData, int shaderlessTeamColourHackAmount = 0); +extern void pie_Draw3DShape(iIMDShape *shape, int frame, int team, PIELIGHT colour, int pieFlag, int pieFlagData); extern void pie_DrawImage(const PIEIMAGE *image, const PIERECT *dest); extern void pie_GetResetCounts(unsigned int* pPieCount, unsigned int* pTileCount, unsigned int* pPolyCount, unsigned int* pStateCount); diff --git a/lib/ivis_opengl/piedraw.cpp b/lib/ivis_opengl/piedraw.cpp index 47fa9ce92..89a032d19 100644 --- a/lib/ivis_opengl/piedraw.cpp +++ b/lib/ivis_opengl/piedraw.cpp @@ -131,19 +131,13 @@ static transluscent_shape_t* tshapes = NULL; static unsigned int tshapes_size = 0; static unsigned int nb_tshapes = 0; -static void pie_Draw3DShape2(iIMDShape *shape, int frame, PIELIGHT colour, PIELIGHT teamcolour, int pieFlag, int pieFlagData, int shaderlessTeamColourHackAmount = 0) +static void pie_Draw3DShape2(iIMDShape *shape, int frame, PIELIGHT colour, PIELIGHT teamcolour, int pieFlag, int pieFlagData) { - if (bShaderlessTeamcolourHack) - { - colour.byte.r = (colour.byte.r*(256 - shaderlessTeamColourHackAmount) + teamcolour.byte.r*shaderlessTeamColourHackAmount) / 256; // Ugly, but better than being colourblind. - colour.byte.g = (colour.byte.g*(256 - shaderlessTeamColourHackAmount) + teamcolour.byte.g*shaderlessTeamColourHackAmount) / 256; - colour.byte.b = (colour.byte.b*(256 - shaderlessTeamColourHackAmount) + teamcolour.byte.b*shaderlessTeamColourHackAmount) / 256; - } - iIMDPoly *pPolys; bool light = true; pie_SetAlphaTest(true); + /* Set fog status */ if (!(pieFlag & pie_FORCE_FOG) && (pieFlag & pie_ADDITIVE || pieFlag & pie_TRANSLUCENT || pieFlag & pie_BUTTON)) @@ -470,7 +464,7 @@ void pie_CleanUp( void ) scshapes = NULL; } -void pie_Draw3DShape(iIMDShape *shape, int frame, int team, PIELIGHT colour, int pieFlag, int pieFlagData, int shaderlessTeamColourHackAmount) +void pie_Draw3DShape(iIMDShape *shape, int frame, int team, PIELIGHT colour, int pieFlag, int pieFlagData) { PIELIGHT teamcolour; @@ -487,7 +481,7 @@ void pie_Draw3DShape(iIMDShape *shape, int frame, int team, PIELIGHT colour, int if (drawing_interface || !shadows) { - pie_Draw3DShape2(shape, frame, colour, teamcolour, pieFlag, pieFlagData, shaderlessTeamColourHackAmount); + pie_Draw3DShape2(shape, frame, colour, teamcolour, pieFlag, pieFlagData); } else { @@ -567,7 +561,7 @@ void pie_Draw3DShape(iIMDShape *shape, int frame, int team, PIELIGHT colour, int } } - pie_Draw3DShape2(shape, frame, colour, teamcolour, pieFlag, pieFlagData, shaderlessTeamColourHackAmount); + pie_Draw3DShape2(shape, frame, colour, teamcolour, pieFlag, pieFlagData); } } } diff --git a/lib/ivis_opengl/screen.cpp b/lib/ivis_opengl/screen.cpp index 976476364..6bd29b034 100644 --- a/lib/ivis_opengl/screen.cpp +++ b/lib/ivis_opengl/screen.cpp @@ -48,8 +48,6 @@ UDWORD screenWidth = 0; UDWORD screenHeight = 0; UDWORD screenDepth = 0; -bool bShaderlessTeamcolourHack = false; - /* global used to indicate preferred internal OpenGL format */ int wz_texture_compression; @@ -262,9 +260,8 @@ bool screenInitialise( } else { - debug(LOG_POPUP, "OpenGL 2.0 is not supported by your system, current shaders require this."); - debug(LOG_POPUP, "Team colors will not function correctly on your system."); - bShaderlessTeamcolourHack = true; + debug(LOG_POPUP, "OpenGL 2.0 is not supported by your system, current shaders require this. Please upgrade your graphics drivers if possible."); + exit(1); } glViewport(0, 0, width, height); diff --git a/lib/ivis_opengl/screen.h b/lib/ivis_opengl/screen.h index e582433f9..5d15c314d 100644 --- a/lib/ivis_opengl/screen.h +++ b/lib/ivis_opengl/screen.h @@ -35,8 +35,6 @@ #include "lib/framework/types.h" -extern bool bShaderlessTeamcolourHack; - /* ------------------------------------------------------------------------------------------- */ /* Legacy stuff diff --git a/src/component.cpp b/src/component.cpp index 5ded40921..b76529eda 100644 --- a/src/component.cpp +++ b/src/component.cpp @@ -212,7 +212,7 @@ void displayStructureButton(STRUCTURE *psStructure, Vector3i *rotation, Vector3i if(baseImd!=NULL) { pie_Draw3DShape(baseImd, 0, getPlayerColour(selectedPlayer), WZCOL_WHITE, pie_BUTTON, 0); } - pie_Draw3DShape(psStructure->sDisplay.imd, 0, getPlayerColour(selectedPlayer), WZCOL_WHITE, pie_BUTTON, 0, 64); + pie_Draw3DShape(psStructure->sDisplay.imd, 0, getPlayerColour(selectedPlayer), WZCOL_WHITE, pie_BUTTON, 0); //and draw the turret if(psStructure->sDisplay.imd->nconnectors) { @@ -310,7 +310,7 @@ void displayStructureStatButton(STRUCTURE_STATS *Stats, Vector3i *Rotation, Vect { pie_Draw3DShape(baseImd, 0, getPlayerColour(selectedPlayer), WZCOL_WHITE, pie_BUTTON, 0); } - pie_Draw3DShape(Stats->pIMD, 0, getPlayerColour(selectedPlayer), WZCOL_WHITE, pie_BUTTON, 0, 64); + pie_Draw3DShape(Stats->pIMD, 0, getPlayerColour(selectedPlayer), WZCOL_WHITE, pie_BUTTON, 0); //and draw the turret if(Stats->pIMD->nconnectors) @@ -565,7 +565,7 @@ static void displayCompObj(DROID *psDroid, BOOL bButton) psShapeTemp = (leftFirst ? getLeftPropulsionIMD(psDroid) : getRightPropulsionIMD(psDroid)); if(psShapeTemp!=NULL) { - pie_Draw3DShape(psShapeTemp, 0, colour, brightness, pieFlag, iPieData, 256); + pie_Draw3DShape(psShapeTemp, 0, colour, brightness, pieFlag, iPieData); } /* set default components transparent */ @@ -601,7 +601,7 @@ static void displayCompObj(DROID *psDroid, BOOL bButton) /* draw body if cyborg not animating */ if ( psDroid->psCurAnim == NULL || psDroid->psCurAnim->bVisible == false ) { - pie_Draw3DShape(psShapeTemp, 0, colour, brightness, pieFlag, iPieData, 256); + pie_Draw3DShape(psShapeTemp, 0, colour, brightness, pieFlag, iPieData); } } else @@ -936,7 +936,7 @@ static void displayCompObj(DROID *psDroid, BOOL bButton) psShape = (leftFirst ? getRightPropulsionIMD(psDroid) : getLeftPropulsionIMD(psDroid)); if(psShape!=NULL) { - pie_Draw3DShape(psShape, 0, colour, brightness, pieFlag, iPieData, 256); + pie_Draw3DShape(psShape, 0, colour, brightness, pieFlag, iPieData); } } diff --git a/src/display3d.cpp b/src/display3d.cpp index d2fdb817d..6f4c93249 100644 --- a/src/display3d.cpp +++ b/src/display3d.cpp @@ -1374,7 +1374,7 @@ void renderAnimComponent( const COMPONENT_OBJECT *psObj ) pie_MatRotZ(-psObj->orientation.y); pie_MatRotX(-psObj->orientation.x); - pie_Draw3DShape(psObj->psShape, 0, iPlayer, brightness, pie_STATIC_SHADOW, 0, 256); + pie_Draw3DShape(psObj->psShape, 0, iPlayer, brightness, pie_STATIC_SHADOW, 0); /* clear stack */ pie_MatEnd(); @@ -2172,7 +2172,7 @@ void renderStructure(STRUCTURE *psStructure) pieFlag = pie_TRANSLUCENT | pie_FORCE_FOG; pieFlagData = 255; } - pie_Draw3DShape(psStructure->pStructureType->pBaseIMD, 0, colour, buildingBrightness, pieFlag, pieFlagData, 64); + pie_Draw3DShape(psStructure->pStructureType->pBaseIMD, 0, colour, buildingBrightness, pieFlag, pieFlagData); } // override @@ -2190,7 +2190,7 @@ void renderStructure(STRUCTURE *psStructure) //first check if partially built - ANOTHER HACK! if (psStructure->status == SS_BEING_BUILT || psStructure->status == SS_BEING_DEMOLISHED) { - pie_Draw3DShape(strImd, 0, colour, buildingBrightness, pie_HEIGHT_SCALED | pie_SHADOW, structHeightScale(psStructure) * pie_RAISE_SCALE, 64); + pie_Draw3DShape(strImd, 0, colour, buildingBrightness, pie_HEIGHT_SCALED | pie_SHADOW, structHeightScale(psStructure) * pie_RAISE_SCALE); } else { @@ -2208,7 +2208,7 @@ void renderStructure(STRUCTURE *psStructure) { pie_SetShaderStretchDepth(psStructure->pos.z - psStructure->foundationDepth); } - pie_Draw3DShape(strImd, animFrame, colour, buildingBrightness, pieFlag, pieFlagData, 64); + pie_Draw3DShape(strImd, animFrame, colour, buildingBrightness, pieFlag, pieFlagData); pie_SetShaderStretchDepth(0); // It might have weapons on it @@ -2616,7 +2616,7 @@ static BOOL renderWallSection(STRUCTURE *psStructure) (psStructure->status == SS_BEING_BUILT && psStructure->pStructureType->type == REF_RESOURCE_EXTRACTOR) ) { pie_Draw3DShape(psStructure->sDisplay.imd, 0, getPlayerColour(psStructure->player), - brightness, pie_HEIGHT_SCALED|pie_SHADOW, structHeightScale(psStructure) * pie_RAISE_SCALE, 64); + brightness, pie_HEIGHT_SCALED|pie_SHADOW, structHeightScale(psStructure) * pie_RAISE_SCALE); } else { @@ -2638,7 +2638,7 @@ static BOOL renderWallSection(STRUCTURE *psStructure) } pieFlagData = 0; } - pie_Draw3DShape(imd, 0, getPlayerColour(psStructure->player), brightness, pieFlag, pieFlagData, 64); + pie_Draw3DShape(imd, 0, getPlayerColour(psStructure->player), brightness, pieFlag, pieFlagData); } imd->points = temp; From 6a10c06fd3caf2eddc2a5555bb56fee95641eca6 Mon Sep 17 00:00:00 2001 From: cybersphinx Date: Fri, 25 Feb 2011 23:33:51 +0100 Subject: [PATCH 04/59] Update translations. --- po/cs.po | 655 ++++++++++++++++++++++++++-------------------------- po/da.po | 655 ++++++++++++++++++++++++++-------------------------- po/de.po | 655 ++++++++++++++++++++++++++-------------------------- po/en_GB.po | 655 ++++++++++++++++++++++++++-------------------------- po/es.po | 655 ++++++++++++++++++++++++++-------------------------- po/et_EE.po | 655 ++++++++++++++++++++++++++-------------------------- po/fi.po | 655 ++++++++++++++++++++++++++-------------------------- po/fr.po | 139 +++++------ po/fy.po | 655 ++++++++++++++++++++++++++-------------------------- po/ga.po | 655 ++++++++++++++++++++++++++-------------------------- po/hr.po | 655 ++++++++++++++++++++++++++-------------------------- po/it.po | 655 ++++++++++++++++++++++++++-------------------------- po/ko.po | 655 ++++++++++++++++++++++++++-------------------------- po/la.po | 655 ++++++++++++++++++++++++++-------------------------- po/lt.po | 655 ++++++++++++++++++++++++++-------------------------- po/nb.po | 655 ++++++++++++++++++++++++++-------------------------- po/nl.po | 655 ++++++++++++++++++++++++++-------------------------- po/pl.po | 655 ++++++++++++++++++++++++++-------------------------- po/pt.po | 139 +++++------ po/pt_BR.po | 139 +++++------ po/ro.po | 655 ++++++++++++++++++++++++++-------------------------- po/ru.po | 655 ++++++++++++++++++++++++++-------------------------- po/sk.po | 655 ++++++++++++++++++++++++++-------------------------- po/sl.po | 655 ++++++++++++++++++++++++++-------------------------- po/tr.po | 637 +++++++++++++++++++++++++------------------------- po/uk_UA.po | 655 ++++++++++++++++++++++++++-------------------------- po/zh_CN.po | 655 ++++++++++++++++++++++++++-------------------------- po/zh_TW.po | 655 ++++++++++++++++++++++++++-------------------------- 28 files changed, 8401 insertions(+), 8373 deletions(-) diff --git a/po/cs.po b/po/cs.po index f57bf09cd..457d6b859 100644 --- a/po/cs.po +++ b/po/cs.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-01-18 00:54+0100\n" +"POT-Creation-Date: 2011-02-25 23:35+0100\n" "PO-Revision-Date: 2008-05-09 16:05+0000\n" "Last-Translator: Lubos \n" "Language-Team: Czech \n" @@ -5730,7 +5730,7 @@ msgid "New Design" msgstr "" #: data/base/messages/strings/names.txt:15 -#: src/design.cpp:1313 +#: src/design.cpp:1275 msgid "Transport" msgstr "" @@ -12056,26 +12056,26 @@ msgid "System locale" msgstr "Systémové místo" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1043 +#: lib/netplay/netplay.cpp:1042 msgid "Enter password here" msgstr "" -#: lib/netplay/netplay.cpp:2048 +#: lib/netplay/netplay.cpp:2060 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "" -#: lib/netplay/netplay.cpp:2062 +#: lib/netplay/netplay.cpp:2082 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "" #: src/challenge.cpp:184 -#: src/hci.cpp:922 -#: src/hci.cpp:3390 -#: src/hci.cpp:3513 -#: src/hci.cpp:3924 -#: src/hci.cpp:4942 +#: src/hci.cpp:916 +#: src/hci.cpp:3378 +#: src/hci.cpp:3501 +#: src/hci.cpp:3912 +#: src/hci.cpp:4930 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12229,150 +12229,150 @@ msgstr "" #: src/configuration.cpp:393 #: src/configuration.cpp:394 -#: src/multistat.cpp:130 +#: src/multistat.cpp:124 msgid "Player" msgstr "Hráč" -#: src/design.cpp:449 -#: src/design.cpp:469 -#: src/design.cpp:3501 +#: src/design.cpp:443 +#: src/design.cpp:455 +#: src/design.cpp:3464 msgid "New Vehicle" msgstr "Nové vozidlo" -#: src/design.cpp:515 +#: src/design.cpp:500 msgid "Vehicle Body" msgstr "Tělo vozidla" -#: src/design.cpp:535 +#: src/design.cpp:520 msgid "Vehicle Propulsion" msgstr "Pohon vozidla" -#: src/design.cpp:556 -#: src/design.cpp:579 -#: src/design.cpp:603 +#: src/design.cpp:541 +#: src/design.cpp:564 +#: src/design.cpp:588 msgid "Vehicle Turret" msgstr "Věž vozidla" -#: src/design.cpp:622 +#: src/design.cpp:607 msgid "Delete Design" msgstr "Smazat náčrtek" -#: src/design.cpp:673 -#: src/design.cpp:720 +#: src/design.cpp:658 +#: src/design.cpp:705 msgid "Kinetic Armour" msgstr "Pohybové brnění" -#: src/design.cpp:682 -#: src/design.cpp:730 +#: src/design.cpp:667 +#: src/design.cpp:715 msgid "Thermal Armour" msgstr "Tepelné brnění" -#: src/design.cpp:698 -#: src/design.cpp:750 +#: src/design.cpp:683 +#: src/design.cpp:735 #, fuzzy msgid "Engine Output" msgstr "Výfuk" -#: src/design.cpp:706 -#: src/design.cpp:759 -#: src/design.cpp:1529 -#: src/design.cpp:1553 -#: src/design.cpp:1574 -#: src/design.cpp:1590 -#: src/design.cpp:1610 -#: src/design.cpp:1627 -#: src/design.cpp:1647 -#: src/design.cpp:1664 -#: src/design.cpp:1705 -#: src/design.cpp:1737 -#: src/design.cpp:1869 -#: src/design.cpp:1885 -#: src/design.cpp:1923 -#: src/design.cpp:1956 +#: src/design.cpp:691 +#: src/design.cpp:744 +#: src/design.cpp:1486 +#: src/design.cpp:1510 +#: src/design.cpp:1531 +#: src/design.cpp:1547 +#: src/design.cpp:1567 +#: src/design.cpp:1584 +#: src/design.cpp:1604 +#: src/design.cpp:1621 +#: src/design.cpp:1662 +#: src/design.cpp:1694 +#: src/design.cpp:1826 +#: src/design.cpp:1842 +#: src/design.cpp:1880 +#: src/design.cpp:1913 msgid "Weight" msgstr "Hmotnost" -#: src/design.cpp:790 -#: src/design.cpp:808 +#: src/design.cpp:775 +#: src/design.cpp:793 msgid "Total Power Required" msgstr "Celkem požadovaná energie" -#: src/design.cpp:821 -#: src/design.cpp:840 +#: src/design.cpp:806 +#: src/design.cpp:825 msgid "Total Body Points" msgstr "" -#: src/design.cpp:1027 -#: src/design.cpp:1059 +#: src/design.cpp:996 +#: src/design.cpp:1025 msgid "Power Usage" msgstr "Použitá energie" -#: src/design.cpp:1335 +#: src/design.cpp:1298 msgid "Hydra " msgstr "" -#: src/design.cpp:1509 -#: src/design.cpp:1537 +#: src/design.cpp:1466 +#: src/design.cpp:1494 msgid "Sensor Range" msgstr "Dosah snímačů" -#: src/design.cpp:1521 -#: src/design.cpp:1545 +#: src/design.cpp:1478 +#: src/design.cpp:1502 msgid "Sensor Power" msgstr "" -#: src/design.cpp:1566 -#: src/design.cpp:1582 +#: src/design.cpp:1523 +#: src/design.cpp:1539 msgid "ECM Power" msgstr "" -#: src/design.cpp:1602 -#: src/design.cpp:1619 -#: src/design.cpp:1639 -#: src/design.cpp:1656 +#: src/design.cpp:1559 +#: src/design.cpp:1576 +#: src/design.cpp:1596 +#: src/design.cpp:1613 msgid "Build Points" msgstr "" -#: src/design.cpp:1677 -#: src/design.cpp:1713 +#: src/design.cpp:1634 +#: src/design.cpp:1670 msgid "Range" msgstr "Rozsah" -#: src/design.cpp:1689 -#: src/design.cpp:1721 +#: src/design.cpp:1646 +#: src/design.cpp:1678 msgid "Damage" msgstr "Poškození" -#: src/design.cpp:1697 -#: src/design.cpp:1729 +#: src/design.cpp:1654 +#: src/design.cpp:1686 msgid "Rate-of-Fire" msgstr "" -#: src/design.cpp:1857 -#: src/design.cpp:1877 +#: src/design.cpp:1814 +#: src/design.cpp:1834 msgid "Air Speed" msgstr "Rychlost letu" -#: src/design.cpp:1895 -#: src/design.cpp:1932 +#: src/design.cpp:1852 +#: src/design.cpp:1889 msgid "Road Speed" msgstr "Rychlost po cestě" -#: src/design.cpp:1905 -#: src/design.cpp:1940 +#: src/design.cpp:1862 +#: src/design.cpp:1897 msgid "Off-Road Speed" msgstr "Rychlost v terénu" -#: src/design.cpp:1913 -#: src/design.cpp:1948 +#: src/design.cpp:1870 +#: src/design.cpp:1905 msgid "Water Speed" msgstr "Rychlost po vodě" -#: src/design.cpp:2074 +#: src/design.cpp:2031 msgid "Weapons" msgstr "Zbraně" -#: src/design.cpp:2094 +#: src/design.cpp:2051 msgid "Systems" msgstr "" @@ -12387,7 +12387,7 @@ msgid "Player dropped" msgstr "Hráč" #: src/display3d.cpp:599 -#: src/multiint.cpp:2116 +#: src/multiint.cpp:2125 msgid "Waiting for other players" msgstr "" @@ -12395,46 +12395,46 @@ msgstr "" msgid "Out of sync" msgstr "" -#: src/display.cpp:1651 +#: src/display.cpp:1649 msgid "Cannot Build. Oil Resource Burning." msgstr "Nemohu stavět. Ropný vrt hoří." -#: src/display.cpp:1830 -#: src/display.cpp:2423 +#: src/display.cpp:1828 +#: src/display.cpp:2421 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - Poškození %d%% - Zkušenosti %d, %s" -#: src/display.cpp:1846 +#: src/display.cpp:1844 #, fuzzy, c-format msgid "%s - Allied - Damage %d%% - Experience %d, %s" msgstr "%s - Poškození %d%% - Zkušenosti %d, %s" -#: src/display.cpp:2044 +#: src/display.cpp:2042 #, fuzzy msgid "Truck ordered to build Oil Derrick" msgstr "Nákladní auto dostalo rozkaz postavit ropnou věž" -#: src/display.cpp:2045 +#: src/display.cpp:2043 #, fuzzy msgid "2 trucks ordered to build Oil Derrick" msgstr "Nákladní auto dostalo rozkaz postavit ropnou věž" -#: src/display.cpp:2046 +#: src/display.cpp:2044 #, fuzzy, c-format msgid "%d trucks ordered to build Oil Derrick" msgstr "Nákladní auto dostalo rozkaz postavit ropnou věž" -#: src/droid.cpp:208 +#: src/droid.cpp:211 msgid "Unit Lost!" msgstr "Jednotka ztracena!" -#: src/droid.cpp:1370 +#: src/droid.cpp:1376 #, fuzzy msgid "Structure Restored" msgstr "Budova obnovena" -#: src/droid.cpp:2712 +#: src/droid.cpp:2732 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" @@ -12442,7 +12442,7 @@ msgstr[0] "Skupina %u vybrána - %u Jednotka" msgstr[1] "Skupina %u vybrána - %u Jednotky" msgstr[2] "Skupina %u vybrána - %u Jednotek" -#: src/droid.cpp:2725 +#: src/droid.cpp:2745 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" @@ -12450,7 +12450,7 @@ msgstr[0] "%u jednotka začleněna do Skupiny %u" msgstr[1] "%u jednotky začleněny do Skupiny %u" msgstr[2] "%u jednotek začleněno do Skupiny %u" -#: src/droid.cpp:2738 +#: src/droid.cpp:2758 #, fuzzy, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" @@ -12458,7 +12458,7 @@ msgstr[0] "Zameřeno na skupinu %u - %u jednotka" msgstr[1] "Zameřeno na skupinu %u - %u jednotky" msgstr[2] "Zameřeno na skupinu %u - %u jednotek" -#: src/droid.cpp:2742 +#: src/droid.cpp:2762 #, fuzzy, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" @@ -12466,50 +12466,50 @@ msgstr[0] "Vyrovnání se skupinou %u - %u jednotka" msgstr[1] "Vyrovnání se skupinou %u - %u jednotky" msgstr[2] "Vyrovnání se skupinou %u - %u jednotek" -#: src/droid.cpp:3080 +#: src/droid.cpp:3093 msgid "Rookie" msgstr "Nováček" -#: src/droid.cpp:3081 +#: src/droid.cpp:3094 msgctxt "rank" msgid "Green" msgstr "Zelenáč" -#: src/droid.cpp:3082 +#: src/droid.cpp:3095 #, fuzzy msgid "Trained" msgstr "Trénovaný" -#: src/droid.cpp:3083 +#: src/droid.cpp:3096 msgid "Regular" msgstr "Běžný" -#: src/droid.cpp:3084 +#: src/droid.cpp:3097 msgid "Professional" msgstr "Profesionální" -#: src/droid.cpp:3085 +#: src/droid.cpp:3098 msgid "Veteran" msgstr "Veterán" -#: src/droid.cpp:3086 +#: src/droid.cpp:3099 msgid "Elite" msgstr "Elita" -#: src/droid.cpp:3087 +#: src/droid.cpp:3100 msgid "Special" msgstr "Speciální" -#: src/droid.cpp:3088 +#: src/droid.cpp:3101 msgid "Hero" msgstr "Hrdina" -#: src/droid.cpp:4110 +#: src/droid.cpp:4123 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "" -#: src/droid.cpp:4114 +#: src/droid.cpp:4127 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "" @@ -12530,7 +12530,7 @@ msgid "Tutorial" msgstr "Tutoriál" #: src/frontend.cpp:100 -#: src/hci.cpp:3499 +#: src/hci.cpp:3487 msgid "Options" msgstr "Nastavení" @@ -12583,7 +12583,7 @@ msgid "Challenges" msgstr "" #: src/frontend.cpp:215 -#: src/ingameop.cpp:275 +#: src/ingameop.cpp:272 msgid "Load Game" msgstr "Nahraj Hru" @@ -12592,9 +12592,9 @@ msgid "SINGLE PLAYER" msgstr "HRA JEDNOHO HRÁČE" #: src/frontend.cpp:303 -#: src/ingameop.cpp:498 -#: src/mission.cpp:2527 -#: src/mission.cpp:2630 +#: src/ingameop.cpp:494 +#: src/mission.cpp:2493 +#: src/mission.cpp:2596 msgid "Load Saved Game" msgstr "Načti Uloženou Hru" @@ -12611,7 +12611,7 @@ msgid "Join Game" msgstr "Připojit se ke hře" #: src/frontend.cpp:422 -#: src/multiint.cpp:1276 +#: src/multiint.cpp:1285 msgid "OPTIONS" msgstr "NASTAVENÍ" @@ -12629,7 +12629,7 @@ msgid "Video Options" msgstr "Zvuková nastavení" #: src/frontend.cpp:426 -#: src/ingameop.cpp:270 +#: src/ingameop.cpp:267 msgid "Audio Options" msgstr "Zvuková nastavení" @@ -12708,7 +12708,7 @@ msgid "Off" msgstr "Vypnuto" #: src/frontend.cpp:523 -#: src/multiint.cpp:1345 +#: src/multiint.cpp:1354 msgid "Fog" msgstr "Mlha" @@ -12719,7 +12719,7 @@ msgstr "Mlha" #: src/frontend.cpp:530 #: src/frontend.cpp:595 -#: src/multiint.cpp:1347 +#: src/multiint.cpp:1356 msgid "Fog Of War" msgstr "Válečná mlha" @@ -12887,207 +12887,207 @@ msgid "GAME OPTIONS" msgstr "HERNÍ NASTAVENÍ" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2389 +#: src/multiint.cpp:2398 msgid "Mod: " msgstr "" -#: src/hci.cpp:1245 +#: src/hci.cpp:1237 #, fuzzy msgid "MAP SAVED!" msgstr "HRA ULOŽENA!" -#: src/hci.cpp:1584 +#: src/hci.cpp:1573 #: src/loop.cpp:558 #: src/loop.cpp:574 #, fuzzy msgid "GAME SAVED: " msgstr "HRA ULOŽENA!" -#: src/hci.cpp:1971 +#: src/hci.cpp:1960 msgid "Failed to create building" msgstr "" -#: src/hci.cpp:1988 +#: src/hci.cpp:1977 #, fuzzy, c-format msgid "Player %u is cheating (debug menu) him/herself a new structure: %s." msgstr "Hráč %u podvádí ( ladící menu ) sebe sama novou budovou: %s" -#: src/hci.cpp:2003 +#: src/hci.cpp:1992 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new feature: %s." msgstr "" -#: src/hci.cpp:2025 +#: src/hci.cpp:2014 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid: %s." msgstr "" -#: src/hci.cpp:2036 +#: src/hci.cpp:2025 #, fuzzy, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "Hráč %u podvádí ( ladící menu ) sebe sama novou budovou: %s" -#: src/hci.cpp:3310 +#: src/hci.cpp:3298 msgid "Commanders (F6)" msgstr "Velitelé (F6)" -#: src/hci.cpp:3323 +#: src/hci.cpp:3311 msgid "Intelligence Display (F5)" msgstr "Zpravodajský display (F5)" -#: src/hci.cpp:3336 +#: src/hci.cpp:3324 msgid "Manufacture (F1)" msgstr "Výroba (F1)" -#: src/hci.cpp:3349 +#: src/hci.cpp:3337 msgid "Design (F4)" msgstr "Konstrukce (F4)" -#: src/hci.cpp:3362 +#: src/hci.cpp:3350 msgid "Research (F2)" msgstr "Výzkum (F2)" -#: src/hci.cpp:3375 +#: src/hci.cpp:3363 msgid "Build (F3)" msgstr "Stavba (F3)" -#: src/hci.cpp:3446 -#: src/multiint.cpp:1392 +#: src/hci.cpp:3434 +#: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Energie" -#: src/hci.cpp:3537 +#: src/hci.cpp:3525 msgid "Map:" msgstr "" -#: src/hci.cpp:3550 +#: src/hci.cpp:3538 #, fuzzy msgid "Load" msgstr "Nahraj Hru" -#: src/hci.cpp:3551 +#: src/hci.cpp:3539 #, fuzzy msgid "Load Map File" msgstr "Nahraj Hru" -#: src/hci.cpp:3558 +#: src/hci.cpp:3546 #, fuzzy msgid "Save" msgstr "Uložit hru" -#: src/hci.cpp:3559 +#: src/hci.cpp:3547 #, fuzzy msgid "Save Map File" msgstr "Uložit hru" -#: src/hci.cpp:3567 +#: src/hci.cpp:3555 msgid "New" msgstr "" -#: src/hci.cpp:3568 +#: src/hci.cpp:3556 msgid "New Blank Map" msgstr "" -#: src/hci.cpp:3604 +#: src/hci.cpp:3592 #, fuzzy msgid "Tile" msgstr "soubor" -#: src/hci.cpp:3605 +#: src/hci.cpp:3593 #, fuzzy msgid "Place tiles on map" msgstr "Nastavení limitu budov" -#: src/hci.cpp:3614 +#: src/hci.cpp:3602 msgid "Unit" msgstr "Jednotka" -#: src/hci.cpp:3615 +#: src/hci.cpp:3603 #, fuzzy msgid "Place Unit on map" msgstr "Nastavení limitu budov" -#: src/hci.cpp:3623 +#: src/hci.cpp:3611 msgid "Struct" msgstr "Stavba" -#: src/hci.cpp:3624 +#: src/hci.cpp:3612 #, fuzzy msgid "Place Structures on map" msgstr "Nastavení limitu budov" -#: src/hci.cpp:3632 +#: src/hci.cpp:3620 msgid "Feat" msgstr "" -#: src/hci.cpp:3633 +#: src/hci.cpp:3621 #, fuzzy msgid "Place Features on map" msgstr "Nastavení limitu budov" -#: src/hci.cpp:3643 +#: src/hci.cpp:3631 msgid "Pause" msgstr "" -#: src/hci.cpp:3644 +#: src/hci.cpp:3632 #, fuzzy msgid "Pause or unpause the game" msgstr "Hostitel opustil hru!" -#: src/hci.cpp:3658 +#: src/hci.cpp:3646 msgid "Align height of all map objects" msgstr "" -#: src/hci.cpp:3668 +#: src/hci.cpp:3656 msgid "Edit" msgstr "" -#: src/hci.cpp:3669 +#: src/hci.cpp:3657 #, fuzzy msgid "Start Edit Mode" msgstr "Začni bez Základen" -#: src/hci.cpp:3683 +#: src/hci.cpp:3671 #: src/ingameop.cpp:112 -#: src/ingameop.cpp:258 -#: src/ingameop.cpp:263 +#: src/ingameop.cpp:256 +#: src/ingameop.cpp:260 msgid "Quit" msgstr "Ukončit" -#: src/hci.cpp:3684 +#: src/hci.cpp:3672 msgid "Exit Game" msgstr "Ukončit hru" -#: src/hci.cpp:3710 +#: src/hci.cpp:3698 #, fuzzy msgid "Current Player:" msgstr "Hra pro Více Hráčů" -#: src/hci.cpp:4001 +#: src/hci.cpp:3989 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "Panel průběhu" -#: src/hci.cpp:4867 +#: src/hci.cpp:4855 msgid "Factory Delivery Point" msgstr "" -#: src/hci.cpp:4885 +#: src/hci.cpp:4873 msgid "Loop Production" msgstr "Opakovat výrobu" -#: src/hci.cpp:4965 +#: src/hci.cpp:4953 msgid "Tab Scroll left" msgstr "" -#: src/hci.cpp:4980 +#: src/hci.cpp:4968 msgid "Tab Scroll right" msgstr "" #: src/ingameop.cpp:111 -#: src/ingameop.cpp:193 -#: src/ingameop.cpp:267 +#: src/ingameop.cpp:195 +#: src/ingameop.cpp:264 msgid "Resume Game" msgstr "Pokračovat ve hře" @@ -13095,33 +13095,33 @@ msgstr "Pokračovat ve hře" msgid "WARNING: You're the host. If you quit, the game ends for everyone!" msgstr "" -#: src/ingameop.cpp:185 -#: src/ingameop.cpp:527 +#: src/ingameop.cpp:186 +#: src/ingameop.cpp:523 msgid "Tactical UI (Target Origin Icon): Show" msgstr "" -#: src/ingameop.cpp:190 -#: src/ingameop.cpp:531 +#: src/ingameop.cpp:191 +#: src/ingameop.cpp:527 msgid "Tactical UI (Target Origin Icon): Hide" msgstr "" -#: src/ingameop.cpp:277 -#: src/ingameop.cpp:502 -#: src/mission.cpp:2514 -#: src/mission.cpp:2633 +#: src/ingameop.cpp:274 +#: src/ingameop.cpp:498 +#: src/mission.cpp:2480 +#: src/mission.cpp:2599 msgid "Save Game" msgstr "Uložit hru" -#: src/ingameop.cpp:343 +#: src/ingameop.cpp:339 #, fuzzy msgid "Host has quit the game!" msgstr "Hostitel opustil hru!" -#: src/ingameop.cpp:349 +#: src/ingameop.cpp:345 msgid "The game can't continue without the host." msgstr "" -#: src/ingameop.cpp:355 +#: src/ingameop.cpp:351 msgid "--> QUIT <--" msgstr "" @@ -13505,55 +13505,55 @@ msgstr "" msgid "Screen shake when things die: On" msgstr "" -#: src/keybind.cpp:2603 -#: src/keybind.cpp:2646 +#: src/keybind.cpp:2604 +#: src/keybind.cpp:2647 #, fuzzy msgid "Sorry, but game speed cannot be changed in multiplayer." msgstr "Omlouváme se, ale tento podvod je vypnutý ve hře pro více hráčů." -#: src/keybind.cpp:2624 -#: src/keybind.cpp:2667 -#: src/keybind.cpp:2689 +#: src/keybind.cpp:2625 +#: src/keybind.cpp:2668 +#: src/keybind.cpp:2690 #, fuzzy msgid "Game Speed Reset" msgstr "Restartování herní rychlosti" -#: src/keybind.cpp:2628 +#: src/keybind.cpp:2629 #, c-format msgid "Game Speed Increased to %3.1f" msgstr "Rychlost Hry Zvýšena na %3.1f" -#: src/keybind.cpp:2671 +#: src/keybind.cpp:2672 #, c-format msgid "Game Speed Reduced to %3.1f" msgstr "Rychlost Hry Snížena na %3.1f" -#: src/keybind.cpp:2701 +#: src/keybind.cpp:2702 msgid "Radar showing friend-foe colors" msgstr "" -#: src/keybind.cpp:2705 +#: src/keybind.cpp:2706 msgid "Radar showing player colors" msgstr "Radar ukazuje barvy hráčů" -#: src/keybind.cpp:2726 +#: src/keybind.cpp:2727 msgid "Radar showing only objects" msgstr "Radar ukazuje pouze objekty" -#: src/keybind.cpp:2729 +#: src/keybind.cpp:2730 msgid "Radar blending terrain and height" msgstr "" -#: src/keybind.cpp:2732 +#: src/keybind.cpp:2733 msgid "Radar showing terrain" msgstr "Radar ukazuje terén" -#: src/keybind.cpp:2735 +#: src/keybind.cpp:2736 #, fuzzy msgid "Radar showing revealed terrain" msgstr "Radar ukazuje terén" -#: src/keybind.cpp:2738 +#: src/keybind.cpp:2739 msgid "Radar showing height" msgstr "Radar ukazuje výšku" @@ -13562,9 +13562,9 @@ msgid "KEY MAPPING" msgstr "MAPOVÁNÍ KLÁVES" #: src/keyedit.cpp:372 -#: src/multiint.cpp:662 -#: src/multiint.cpp:1072 -#: src/multiint.cpp:1478 +#: src/multiint.cpp:671 +#: src/multiint.cpp:1081 +#: src/multiint.cpp:1487 msgid "Return To Previous Screen" msgstr "Zpět na Předchozí Obrazovku" @@ -14072,39 +14072,39 @@ msgstr "" msgid "Could not save game!" msgstr "Nahrát uloženou hru" -#: src/mission.cpp:2075 +#: src/mission.cpp:2041 msgid "Load Transport" msgstr "Naložit transport" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 #, fuzzy msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "CÍL SPLNĚN" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED" msgstr "CÍL SPLNĚN" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 #, fuzzy msgid "OBJECTIVE FAILED--and you cheated!" msgstr "SELHÁNÍ" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED" msgstr "SELHÁNÍ" -#: src/mission.cpp:2493 -#: src/mission.cpp:2533 -#: src/mission.cpp:2647 +#: src/mission.cpp:2459 +#: src/mission.cpp:2499 +#: src/mission.cpp:2613 msgid "Quit To Main Menu" msgstr "Vyskočit do hlavního menu" -#: src/mission.cpp:2501 +#: src/mission.cpp:2467 msgid "Continue Game" msgstr "Pokračovat ve hře" -#: src/mission.cpp:2598 +#: src/mission.cpp:2564 #, fuzzy msgid "GAME SAVED :" msgstr "HRA ULOŽENA!" @@ -14164,356 +14164,361 @@ msgstr "%s uzavřel spojenectví s %s" msgid "You Discover Blueprints For %s" msgstr "Nalezl jsi plány na %s" -#: src/multiint.cpp:600 +#: src/multiint.cpp:609 #: src/multilimit.cpp:190 msgid "Accept Settings" msgstr "Potvrď nastavení" -#: src/multiint.cpp:602 -#: src/multiint.cpp:1117 +#: src/multiint.cpp:611 +#: src/multiint.cpp:1126 #, fuzzy msgid "Cancel" msgstr "Azurová" -#: src/multiint.cpp:613 +#: src/multiint.cpp:622 msgid "IP Address or Machine Name" msgstr "IP Adresa nebo Jméno Stroje" -#: src/multiint.cpp:659 +#: src/multiint.cpp:668 msgid "CONNECTION" msgstr "SPOJENÍ" -#: src/multiint.cpp:664 +#: src/multiint.cpp:673 msgid "Lobby" msgstr "Lobby" -#: src/multiint.cpp:665 +#: src/multiint.cpp:674 msgid "IP" msgstr "IP" -#: src/multiint.cpp:854 +#: src/multiint.cpp:863 #, fuzzy msgid "No games are available" msgstr "Posily jsou k dispozici." -#: src/multiint.cpp:857 +#: src/multiint.cpp:866 msgid "Game is full" msgstr "" -#: src/multiint.cpp:861 +#: src/multiint.cpp:870 msgid "You were kicked!" msgstr "" -#: src/multiint.cpp:864 +#: src/multiint.cpp:873 msgid "Wrong Game Version!" msgstr "" -#: src/multiint.cpp:867 +#: src/multiint.cpp:876 msgid "You have an incompatible mod." msgstr "" -#: src/multiint.cpp:871 +#: src/multiint.cpp:880 msgid "Host couldn't send file?" msgstr "" -#: src/multiint.cpp:875 +#: src/multiint.cpp:884 msgid "Incorrect Password!" msgstr "" -#: src/multiint.cpp:878 +#: src/multiint.cpp:887 msgid "Host has dropped connection!" msgstr "" -#: src/multiint.cpp:882 +#: src/multiint.cpp:891 msgid "Connection Error" msgstr "" -#: src/multiint.cpp:1012 +#: src/multiint.cpp:1021 msgid "Searching" msgstr "Hledám" -#: src/multiint.cpp:1069 +#: src/multiint.cpp:1078 msgid "GAMES" msgstr "HRY" -#: src/multiint.cpp:1077 +#: src/multiint.cpp:1086 msgid "Refresh Games List" msgstr "Aktualizuj Seznam Her" -#: src/multiint.cpp:1097 +#: src/multiint.cpp:1106 msgid "Enter Password:" msgstr "" -#: src/multiint.cpp:1115 +#: src/multiint.cpp:1124 msgid "OK" msgstr "" -#: src/multiint.cpp:1232 +#: src/multiint.cpp:1241 msgid "Tanks disabled!!" msgstr "" -#: src/multiint.cpp:1233 +#: src/multiint.cpp:1242 msgid "Cyborgs disabled." msgstr "" -#: src/multiint.cpp:1234 +#: src/multiint.cpp:1243 msgid "VTOLs disabled." msgstr "" -#: src/multiint.cpp:1281 -#: src/multiint.cpp:1288 +#: src/multiint.cpp:1290 +#: src/multiint.cpp:1297 msgid "Select Game Name" msgstr "Vyber jméno hry" -#: src/multiint.cpp:1281 +#: src/multiint.cpp:1290 msgid "One-Player Skirmish" msgstr "" -#: src/multiint.cpp:1291 +#: src/multiint.cpp:1300 msgid "Select Map" msgstr "Vyber Mapu" -#: src/multiint.cpp:1299 +#: src/multiint.cpp:1308 msgid "Click to set Password" msgstr "" -#: src/multiint.cpp:1309 -#: src/multiint.cpp:1310 +#: src/multiint.cpp:1318 +#: src/multiint.cpp:1319 msgid "Scavengers" msgstr "" -#: src/multiint.cpp:1312 +#: src/multiint.cpp:1321 msgid "No Scavengers" msgstr "" -#: src/multiint.cpp:1342 +#: src/multiint.cpp:1351 msgid "Select Player Name" msgstr "Vyber jméno hráče" -#: src/multiint.cpp:1348 +#: src/multiint.cpp:1357 #, fuzzy msgid "Distance Fog" msgstr "vzdálená mlha" -#: src/multiint.cpp:1359 +#: src/multiint.cpp:1368 #: src/multimenu.cpp:756 msgid "Alliances" msgstr "Spojenectví" -#: src/multiint.cpp:1362 +#: src/multiint.cpp:1371 msgid "No Alliances" msgstr "Bez Spojenectví" -#: src/multiint.cpp:1364 +#: src/multiint.cpp:1373 msgid "Allow Alliances" msgstr "Povolená Spojenectví" -#: src/multiint.cpp:1368 +#: src/multiint.cpp:1377 msgid "Locked Teams" msgstr "Pevné Týmy" -#: src/multiint.cpp:1394 +#: src/multiint.cpp:1403 #, fuzzy msgid "Low Power Levels" msgstr "Nízkoenergetické úrovně" -#: src/multiint.cpp:1396 +#: src/multiint.cpp:1405 #, fuzzy msgid "Medium Power Levels" msgstr "Středně energetické úrovně" -#: src/multiint.cpp:1398 +#: src/multiint.cpp:1407 #, fuzzy msgid "High Power Levels" msgstr "Vysokoenergetické úrovně" -#: src/multiint.cpp:1430 +#: src/multiint.cpp:1439 msgid "Base" msgstr "Základna" -#: src/multiint.cpp:1432 +#: src/multiint.cpp:1441 msgid "Start with No Bases" msgstr "Začni bez Základen" -#: src/multiint.cpp:1434 +#: src/multiint.cpp:1443 msgid "Start with Bases" msgstr "Začni se Základnami" -#: src/multiint.cpp:1436 +#: src/multiint.cpp:1445 msgid "Start with Advanced Bases" msgstr "Začni s Rozvinutými Základnami" -#: src/multiint.cpp:1468 +#: src/multiint.cpp:1477 msgid "Map Preview" msgstr "" -#: src/multiint.cpp:1470 +#: src/multiint.cpp:1479 msgid "Click to see Map" msgstr "" -#: src/multiint.cpp:1484 +#: src/multiint.cpp:1493 #, fuzzy msgid "Start Hosting Game" msgstr "Začni hostovat hru" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 #, fuzzy msgid "Show Structure Limits" msgstr "Nastavení limitu budov" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 msgid "Set Structure Limits" msgstr "Nastavení limitu budov" -#: src/multiint.cpp:1587 +#: src/multiint.cpp:1596 msgid "DIFFICULTY" msgstr "" -#: src/multiint.cpp:1601 +#: src/multiint.cpp:1610 msgid "Less aggressive and starts with less units" msgstr "" -#: src/multiint.cpp:1602 +#: src/multiint.cpp:1611 #, fuzzy msgid "Plays nice" msgstr "Hráč" -#: src/multiint.cpp:1603 +#: src/multiint.cpp:1612 msgid "No holds barred" msgstr "" -#: src/multiint.cpp:1604 +#: src/multiint.cpp:1613 msgid "Starts with advantages and gets twice as much oil from derricks" msgstr "" -#: src/multiint.cpp:1632 +#: src/multiint.cpp:1641 msgid "CHOOSE AI" msgstr "" -#: src/multiint.cpp:1648 +#: src/multiint.cpp:1657 msgid "Allow human players to join in this slot" msgstr "" -#: src/multiint.cpp:1656 +#: src/multiint.cpp:1665 msgid "Leave this slot unused" msgstr "" -#: src/multiint.cpp:1736 +#: src/multiint.cpp:1745 #, fuzzy msgid "Player colour" msgstr "Hráč" -#: src/multiint.cpp:2062 +#: src/multiint.cpp:2071 msgid "Team" msgstr "" -#: src/multiint.cpp:2074 +#: src/multiint.cpp:2083 #, fuzzy msgid "Kick player" msgstr "2 hráči" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 #, fuzzy msgid "Click to change difficulty" msgstr "Radar ukazuje barvy hráčů" -#: src/multiint.cpp:2121 +#: src/multiint.cpp:2130 msgid "Click when ready" msgstr "" -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2134 msgid "READY?" msgstr "" -#: src/multiint.cpp:2169 +#: src/multiint.cpp:2178 msgid "PLAYERS" msgstr "HRÁČI" -#: src/multiint.cpp:2204 +#: src/multiint.cpp:2213 msgid "Click to change to this slot" msgstr "" -#: src/multiint.cpp:2232 +#: src/multiint.cpp:2241 #, fuzzy msgid "Choose Team" msgstr "Pevné Týmy" -#: src/multiint.cpp:2262 +#: src/multiint.cpp:2271 #, fuzzy msgid "Click to change player colour" msgstr "Radar ukazuje barvy hráčů" -#: src/multiint.cpp:2290 +#: src/multiint.cpp:2299 #, fuzzy msgid "Click to change player position" msgstr "Braň pozici" -#: src/multiint.cpp:2296 +#: src/multiint.cpp:2305 #, fuzzy msgid "Click to change AI" msgstr "Radar ukazuje barvy hráčů" -#: src/multiint.cpp:2300 +#: src/multiint.cpp:2309 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2362 +#: src/multiint.cpp:2371 msgid "CHAT" msgstr "CHAT" -#: src/multiint.cpp:2394 +#: src/multiint.cpp:2403 msgid "All players need to have the same mods to join your game." msgstr "" -#: src/multiint.cpp:2552 +#: src/multiint.cpp:2561 #, c-format msgid "*** password [%s] is now required! ***" msgstr "" -#: src/multiint.cpp:2560 +#: src/multiint.cpp:2569 msgid "*** password is NOT required! ***" msgstr "" -#: src/multiint.cpp:2801 +#: src/multiint.cpp:2810 msgid "Sorry! Failed to host the game." msgstr "" -#: src/multiint.cpp:2922 +#: src/multiint.cpp:2931 #, fuzzy msgid "'Locked Teams' mode enabled" msgstr "Pevné Týmy" -#: src/multiint.cpp:3003 +#: src/multiint.cpp:3012 #, c-format msgid "The host has kicked %s from the game!" msgstr "Hostitel vyhodil %s ze hry!" -#: src/multiint.cpp:3073 +#: src/multiint.cpp:3082 msgid "Host is Starting Game" msgstr "Host začíná hru" -#: src/multiint.cpp:3639 +#: src/multiint.cpp:3648 msgid "Players" msgstr "Hráči" -#: src/multiint.cpp:3772 +#: src/multiint.cpp:3786 #, c-format msgid "Sending Map: %d%% " msgstr "" -#: src/multiint.cpp:3780 +#: src/multiint.cpp:3794 #, c-format msgid "Map: %d%% downloaded" msgstr "" -#: src/multiint.cpp:3803 +#: src/multiint.cpp:3820 msgid "HOST" msgstr "" +#: src/multiint.cpp:3827 +#: src/multimenu.cpp:772 +msgid "Ping" +msgstr "" + #: src/multijoin.cpp:100 #: src/multijoin.cpp:101 msgid "Players Still Joining" @@ -14529,17 +14534,17 @@ msgstr "" msgid "File transfer has been aborted for %d." msgstr "" -#: src/multijoin.cpp:376 +#: src/multijoin.cpp:373 #, c-format msgid "%s (%u) has an incompatible mod, and has been kicked." msgstr "" -#: src/multijoin.cpp:415 +#: src/multijoin.cpp:412 #, c-format msgid "%s is Joining the Game" msgstr "" -#: src/multijoin.cpp:425 +#: src/multijoin.cpp:422 #, fuzzy msgid "System message:" msgstr "Systémové místo" @@ -14655,10 +14660,6 @@ msgstr "" msgid "Units" msgstr "Jednotka" -#: src/multimenu.cpp:772 -msgid "Ping" -msgstr "" - #: src/multimenu.cpp:776 #, fuzzy msgid "Structs" @@ -14693,84 +14694,84 @@ msgstr "" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "" -#: src/multiplay.cpp:1146 +#: src/multiplay.cpp:1057 #, fuzzy msgid "(allies" msgstr "Spojenectví" -#: src/multiplay.cpp:1154 +#: src/multiplay.cpp:1065 msgid "(private to " msgstr "" -#: src/multiplay.cpp:1167 +#: src/multiplay.cpp:1078 msgid "[invalid]" msgstr "" -#: src/multiplay.cpp:2057 +#: src/multiplay.cpp:1942 msgid "Green" msgstr "Zelená" -#: src/multiplay.cpp:2058 +#: src/multiplay.cpp:1943 msgid "Orange" msgstr "Oranžová" -#: src/multiplay.cpp:2059 +#: src/multiplay.cpp:1944 msgid "Grey" msgstr "Šedá" -#: src/multiplay.cpp:2060 +#: src/multiplay.cpp:1945 msgid "Black" msgstr "Černá" -#: src/multiplay.cpp:2061 +#: src/multiplay.cpp:1946 msgid "Red" msgstr "Červená" -#: src/multiplay.cpp:2062 +#: src/multiplay.cpp:1947 msgid "Blue" msgstr "Modrá" -#: src/multiplay.cpp:2063 +#: src/multiplay.cpp:1948 msgid "Pink" msgstr "Růžová" -#: src/multiplay.cpp:2064 +#: src/multiplay.cpp:1949 msgid "Cyan" msgstr "Azurová" -#: src/multiplay.cpp:2065 +#: src/multiplay.cpp:1950 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:2066 +#: src/multiplay.cpp:1951 msgid "Purple" msgstr "" -#: src/multiplay.cpp:2067 +#: src/multiplay.cpp:1952 msgid "White" msgstr "" -#: src/multiplay.cpp:2068 +#: src/multiplay.cpp:1953 msgid "Bright blue" msgstr "" -#: src/multiplay.cpp:2069 +#: src/multiplay.cpp:1954 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:2070 +#: src/multiplay.cpp:1955 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:2071 +#: src/multiplay.cpp:1956 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:2072 +#: src/multiplay.cpp:1957 msgid "Brown" msgstr "" -#: src/order.cpp:841 +#: src/order.cpp:800 msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "" @@ -14905,20 +14906,20 @@ msgstr "Celkový Čas Hry - %s" msgid "You cheated!" msgstr "" -#: src/scriptfuncs.cpp:3250 +#: src/scriptfuncs.cpp:3287 msgid "YOU ARE VICTORIOUS!" msgstr "" -#: src/scriptfuncs.cpp:3254 +#: src/scriptfuncs.cpp:3291 msgid "YOU WERE DEFEATED!" msgstr "" -#: src/scriptfuncs.cpp:9500 +#: src/scriptfuncs.cpp:9537 #, c-format msgid "Beacon received from %s!" msgstr "" -#: src/scriptfuncs.cpp:9546 +#: src/scriptfuncs.cpp:9583 #, c-format msgid "Beacon %d" msgstr "" @@ -14948,62 +14949,62 @@ msgstr "Nemohu nalézt žádnou senzorovou jednotku!" msgid "Unable to locate any Commanders!" msgstr "Nemohu nalézt žádného velitele!" -#: src/structure.cpp:2615 +#: src/structure.cpp:2614 msgid "Command Control Limit Reached - Production Halted" msgstr "" -#: src/structure.cpp:5815 -#: src/structure.cpp:5840 +#: src/structure.cpp:5806 +#: src/structure.cpp:5831 #, fuzzy, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" msgstr[0] "Jednotka přiřazena" msgstr[1] "Jednotky přiřazeny" -#: src/structure.cpp:5845 -#: src/structure.cpp:5913 -#: src/structure.cpp:5929 -#: src/structure.cpp:5943 +#: src/structure.cpp:5836 +#: src/structure.cpp:5904 +#: src/structure.cpp:5920 +#: src/structure.cpp:5934 #, fuzzy, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - Poškození %3.0f%%" -#: src/structure.cpp:5895 +#: src/structure.cpp:5886 #, fuzzy, c-format msgid "%s - Connected %u of %u" msgstr "%s - Připojeno %u z %u" -#: src/structure.cpp:6059 -#: src/structure.cpp:6104 +#: src/structure.cpp:6050 +#: src/structure.cpp:6095 #, c-format msgid "%s - Electronically Damaged" msgstr "" -#: src/structure.cpp:6341 +#: src/structure.cpp:6332 msgid "Electronic Reward - Visibility Report" msgstr "" -#: src/structure.cpp:6381 +#: src/structure.cpp:6372 msgid "Factory Reward - Propulsion" msgstr "" -#: src/structure.cpp:6405 +#: src/structure.cpp:6396 msgid "Factory Reward - Body" msgstr "" -#: src/structure.cpp:6429 +#: src/structure.cpp:6420 msgid "Factory Reward - Weapon" msgstr "" -#: src/structure.cpp:6438 +#: src/structure.cpp:6429 msgid "Factory Reward - Nothing" msgstr "" -#: src/structure.cpp:6466 +#: src/structure.cpp:6457 msgid "Repair Facility Award - Repair" msgstr "" -#: src/structure.cpp:6473 +#: src/structure.cpp:6464 msgid "Repair Facility Award - Nothing" msgstr "" diff --git a/po/da.po b/po/da.po index 781177e10..d5d648064 100644 --- a/po/da.po +++ b/po/da.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-01-18 00:54+0100\n" +"POT-Creation-Date: 2011-02-25 23:35+0100\n" "PO-Revision-Date: 2008-05-09 16:08+0000\n" "Last-Translator: carson \n" "Language-Team: Dansk \n" @@ -5781,7 +5781,7 @@ msgid "New Design" msgstr "Nyt design" #: data/base/messages/strings/names.txt:15 -#: src/design.cpp:1313 +#: src/design.cpp:1275 msgid "Transport" msgstr "Transport" @@ -12315,26 +12315,26 @@ msgid "System locale" msgstr "Elektronik" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1043 +#: lib/netplay/netplay.cpp:1042 msgid "Enter password here" msgstr "" -#: lib/netplay/netplay.cpp:2048 +#: lib/netplay/netplay.cpp:2060 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "" -#: lib/netplay/netplay.cpp:2062 +#: lib/netplay/netplay.cpp:2082 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "" #: src/challenge.cpp:184 -#: src/hci.cpp:922 -#: src/hci.cpp:3390 -#: src/hci.cpp:3513 -#: src/hci.cpp:3924 -#: src/hci.cpp:4942 +#: src/hci.cpp:916 +#: src/hci.cpp:3378 +#: src/hci.cpp:3501 +#: src/hci.cpp:3912 +#: src/hci.cpp:4930 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12486,151 +12486,151 @@ msgstr "" #: src/configuration.cpp:393 #: src/configuration.cpp:394 -#: src/multistat.cpp:130 +#: src/multistat.cpp:124 msgid "Player" msgstr "Spiller" -#: src/design.cpp:449 -#: src/design.cpp:469 -#: src/design.cpp:3501 +#: src/design.cpp:443 +#: src/design.cpp:455 +#: src/design.cpp:3464 msgid "New Vehicle" msgstr "Nyt design" -#: src/design.cpp:515 +#: src/design.cpp:500 msgid "Vehicle Body" msgstr "Skrog" -#: src/design.cpp:535 +#: src/design.cpp:520 msgid "Vehicle Propulsion" msgstr "Fremdrift" -#: src/design.cpp:556 -#: src/design.cpp:579 -#: src/design.cpp:603 +#: src/design.cpp:541 +#: src/design.cpp:564 +#: src/design.cpp:588 msgid "Vehicle Turret" msgstr "Tårn" -#: src/design.cpp:622 +#: src/design.cpp:607 msgid "Delete Design" msgstr "Slet design" -#: src/design.cpp:673 -#: src/design.cpp:720 +#: src/design.cpp:658 +#: src/design.cpp:705 msgid "Kinetic Armour" msgstr "Kinetisk panser" -#: src/design.cpp:682 -#: src/design.cpp:730 +#: src/design.cpp:667 +#: src/design.cpp:715 msgid "Thermal Armour" msgstr "Termisk panser" -#: src/design.cpp:698 -#: src/design.cpp:750 +#: src/design.cpp:683 +#: src/design.cpp:735 msgid "Engine Output" msgstr "Hestekrafter" -#: src/design.cpp:706 -#: src/design.cpp:759 -#: src/design.cpp:1529 -#: src/design.cpp:1553 -#: src/design.cpp:1574 -#: src/design.cpp:1590 -#: src/design.cpp:1610 -#: src/design.cpp:1627 -#: src/design.cpp:1647 -#: src/design.cpp:1664 -#: src/design.cpp:1705 -#: src/design.cpp:1737 -#: src/design.cpp:1869 -#: src/design.cpp:1885 -#: src/design.cpp:1923 -#: src/design.cpp:1956 +#: src/design.cpp:691 +#: src/design.cpp:744 +#: src/design.cpp:1486 +#: src/design.cpp:1510 +#: src/design.cpp:1531 +#: src/design.cpp:1547 +#: src/design.cpp:1567 +#: src/design.cpp:1584 +#: src/design.cpp:1604 +#: src/design.cpp:1621 +#: src/design.cpp:1662 +#: src/design.cpp:1694 +#: src/design.cpp:1826 +#: src/design.cpp:1842 +#: src/design.cpp:1880 +#: src/design.cpp:1913 msgid "Weight" msgstr "Vægt" -#: src/design.cpp:790 -#: src/design.cpp:808 +#: src/design.cpp:775 +#: src/design.cpp:793 #, fuzzy msgid "Total Power Required" msgstr "Produktionsomkostninger" -#: src/design.cpp:821 -#: src/design.cpp:840 +#: src/design.cpp:806 +#: src/design.cpp:825 msgid "Total Body Points" msgstr "Total pansring" -#: src/design.cpp:1027 -#: src/design.cpp:1059 +#: src/design.cpp:996 +#: src/design.cpp:1025 msgid "Power Usage" msgstr "Energi forbrug" -#: src/design.cpp:1335 +#: src/design.cpp:1298 msgid "Hydra " msgstr "" -#: src/design.cpp:1509 -#: src/design.cpp:1537 +#: src/design.cpp:1466 +#: src/design.cpp:1494 msgid "Sensor Range" msgstr "Rækkevide" # This is always 1000 ingame... any reason to have this at all? is it ever used? -#: src/design.cpp:1521 -#: src/design.cpp:1545 +#: src/design.cpp:1478 +#: src/design.cpp:1502 msgid "Sensor Power" msgstr "Watt" -#: src/design.cpp:1566 -#: src/design.cpp:1582 +#: src/design.cpp:1523 +#: src/design.cpp:1539 msgid "ECM Power" msgstr "ECM Effekt" -#: src/design.cpp:1602 -#: src/design.cpp:1619 -#: src/design.cpp:1639 -#: src/design.cpp:1656 +#: src/design.cpp:1559 +#: src/design.cpp:1576 +#: src/design.cpp:1596 +#: src/design.cpp:1613 msgid "Build Points" msgstr "Effektivitet" -#: src/design.cpp:1677 -#: src/design.cpp:1713 +#: src/design.cpp:1634 +#: src/design.cpp:1670 msgid "Range" msgstr "Rækkevide" -#: src/design.cpp:1689 -#: src/design.cpp:1721 +#: src/design.cpp:1646 +#: src/design.cpp:1678 msgid "Damage" msgstr "Skade" -#: src/design.cpp:1697 -#: src/design.cpp:1729 +#: src/design.cpp:1654 +#: src/design.cpp:1686 msgid "Rate-of-Fire" msgstr "Kadance" -#: src/design.cpp:1857 -#: src/design.cpp:1877 +#: src/design.cpp:1814 +#: src/design.cpp:1834 msgid "Air Speed" msgstr "Lufthastighed" -#: src/design.cpp:1895 -#: src/design.cpp:1932 +#: src/design.cpp:1852 +#: src/design.cpp:1889 msgid "Road Speed" msgstr "Vejhastighed" -#: src/design.cpp:1905 -#: src/design.cpp:1940 +#: src/design.cpp:1862 +#: src/design.cpp:1897 msgid "Off-Road Speed" msgstr "Hastighed i terræn" -#: src/design.cpp:1913 -#: src/design.cpp:1948 +#: src/design.cpp:1870 +#: src/design.cpp:1905 msgid "Water Speed" msgstr "Vandhastighed" -#: src/design.cpp:2074 +#: src/design.cpp:2031 msgid "Weapons" msgstr "Våben" -#: src/design.cpp:2094 +#: src/design.cpp:2051 msgid "Systems" msgstr "Systemer" @@ -12645,7 +12645,7 @@ msgid "Player dropped" msgstr "Spiller" #: src/display3d.cpp:599 -#: src/multiint.cpp:2116 +#: src/multiint.cpp:2125 msgid "Waiting for other players" msgstr "" @@ -12653,114 +12653,114 @@ msgstr "" msgid "Out of sync" msgstr "" -#: src/display.cpp:1651 +#: src/display.cpp:1649 msgid "Cannot Build. Oil Resource Burning." msgstr "Kan ikke bygge på brændende oilebrøn." -#: src/display.cpp:1830 -#: src/display.cpp:2423 +#: src/display.cpp:1828 +#: src/display.cpp:2421 #, fuzzy, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - Skade %d%% - Drab %d, %s" -#: src/display.cpp:1846 +#: src/display.cpp:1844 #, fuzzy, c-format msgid "%s - Allied - Damage %d%% - Experience %d, %s" msgstr "%s - Skade %d%% - Drab %d, %s" -#: src/display.cpp:2044 +#: src/display.cpp:2042 msgid "Truck ordered to build Oil Derrick" msgstr "Truck beordret til at bygge oliebrøn." -#: src/display.cpp:2045 +#: src/display.cpp:2043 #, fuzzy msgid "2 trucks ordered to build Oil Derrick" msgstr "Truck beordret til at bygge oliebrøn." -#: src/display.cpp:2046 +#: src/display.cpp:2044 #, fuzzy, c-format msgid "%d trucks ordered to build Oil Derrick" msgstr "Truck beordret til at bygge oliebrøn." -#: src/droid.cpp:208 +#: src/droid.cpp:211 msgid "Unit Lost!" msgstr "Enhed tabt!" -#: src/droid.cpp:1370 +#: src/droid.cpp:1376 msgid "Structure Restored" msgstr "Bygning restoreret" -#: src/droid.cpp:2712 +#: src/droid.cpp:2732 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" msgstr[0] "Gruppe %u valgt - %u Enheder" msgstr[1] "Gruppe %u valgt - %u Enheder" -#: src/droid.cpp:2725 +#: src/droid.cpp:2745 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" msgstr[0] "%u Enheder tildelt gruppe %u" msgstr[1] "%u Enheder tildelt gruppe %u" -#: src/droid.cpp:2738 +#: src/droid.cpp:2758 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" msgstr[0] "Fokuseret på gruppe %u - %u Enheder" msgstr[1] "Fokuseret på gruppe %u - %u Enheder" -#: src/droid.cpp:2742 +#: src/droid.cpp:2762 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" msgstr[0] "Korigerede med gruppe %u - %u Enheder" msgstr[1] "Korigerede med gruppe %u - %u Enheder" -#: src/droid.cpp:3080 +#: src/droid.cpp:3093 msgid "Rookie" msgstr "Utrænet" -#: src/droid.cpp:3081 +#: src/droid.cpp:3094 msgctxt "rank" msgid "Green" msgstr "Grøn" -#: src/droid.cpp:3082 +#: src/droid.cpp:3095 msgid "Trained" msgstr "Trænet" -#: src/droid.cpp:3083 +#: src/droid.cpp:3096 msgid "Regular" msgstr "Regulær" -#: src/droid.cpp:3084 +#: src/droid.cpp:3097 msgid "Professional" msgstr "Professionel" -#: src/droid.cpp:3085 +#: src/droid.cpp:3098 msgid "Veteran" msgstr "Veteran" -#: src/droid.cpp:3086 +#: src/droid.cpp:3099 msgid "Elite" msgstr "Elite" -#: src/droid.cpp:3087 +#: src/droid.cpp:3100 msgid "Special" msgstr "Speciel" -#: src/droid.cpp:3088 +#: src/droid.cpp:3101 msgid "Hero" msgstr "Helt" -#: src/droid.cpp:4110 +#: src/droid.cpp:4123 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "" -#: src/droid.cpp:4114 +#: src/droid.cpp:4127 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "" @@ -12781,7 +12781,7 @@ msgid "Tutorial" msgstr "Gennemgang" #: src/frontend.cpp:100 -#: src/hci.cpp:3499 +#: src/hci.cpp:3487 msgid "Options" msgstr "Indstillinger" @@ -12835,7 +12835,7 @@ msgid "Challenges" msgstr "Hestekrafter" #: src/frontend.cpp:215 -#: src/ingameop.cpp:275 +#: src/ingameop.cpp:272 msgid "Load Game" msgstr "Indlæs spil" @@ -12844,9 +12844,9 @@ msgid "SINGLE PLAYER" msgstr "SOLO SPILLER" #: src/frontend.cpp:303 -#: src/ingameop.cpp:498 -#: src/mission.cpp:2527 -#: src/mission.cpp:2630 +#: src/ingameop.cpp:494 +#: src/mission.cpp:2493 +#: src/mission.cpp:2596 msgid "Load Saved Game" msgstr "Indlæs gemt spil" @@ -12863,7 +12863,7 @@ msgid "Join Game" msgstr "Forbind til vært" #: src/frontend.cpp:422 -#: src/multiint.cpp:1276 +#: src/multiint.cpp:1285 msgid "OPTIONS" msgstr "TILVALG" @@ -12881,7 +12881,7 @@ msgid "Video Options" msgstr "Lyd indstillinger" #: src/frontend.cpp:426 -#: src/ingameop.cpp:270 +#: src/ingameop.cpp:267 msgid "Audio Options" msgstr "Lyd indstillinger" @@ -12960,7 +12960,7 @@ msgid "Off" msgstr "Fra" #: src/frontend.cpp:523 -#: src/multiint.cpp:1345 +#: src/multiint.cpp:1354 msgid "Fog" msgstr "Tåge" @@ -12971,7 +12971,7 @@ msgstr "Afstandståge" #: src/frontend.cpp:530 #: src/frontend.cpp:595 -#: src/multiint.cpp:1347 +#: src/multiint.cpp:1356 msgid "Fog Of War" msgstr "Krigståge" @@ -13141,209 +13141,209 @@ msgid "GAME OPTIONS" msgstr "SPIL INDSTILLINGER" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2389 +#: src/multiint.cpp:2398 msgid "Mod: " msgstr "" -#: src/hci.cpp:1245 +#: src/hci.cpp:1237 #, fuzzy msgid "MAP SAVED!" msgstr "SPIL GEMT!" -#: src/hci.cpp:1584 +#: src/hci.cpp:1573 #: src/loop.cpp:558 #: src/loop.cpp:574 #, fuzzy msgid "GAME SAVED: " msgstr "SPIL GEMT!" -#: src/hci.cpp:1971 +#: src/hci.cpp:1960 msgid "Failed to create building" msgstr "" -#: src/hci.cpp:1988 +#: src/hci.cpp:1977 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new structure: %s." msgstr "" -#: src/hci.cpp:2003 +#: src/hci.cpp:1992 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new feature: %s." msgstr "" -#: src/hci.cpp:2025 +#: src/hci.cpp:2014 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid: %s." msgstr "" -#: src/hci.cpp:2036 +#: src/hci.cpp:2025 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "" -#: src/hci.cpp:3310 +#: src/hci.cpp:3298 msgid "Commanders (F6)" msgstr "Kommandører (F6)" -#: src/hci.cpp:3323 +#: src/hci.cpp:3311 #, fuzzy msgid "Intelligence Display (F5)" msgstr "Kommando Pult" -#: src/hci.cpp:3336 +#: src/hci.cpp:3324 #, fuzzy msgid "Manufacture (F1)" msgstr "Fabrikering" -#: src/hci.cpp:3349 +#: src/hci.cpp:3337 msgid "Design (F4)" msgstr "Design (F4)" -#: src/hci.cpp:3362 +#: src/hci.cpp:3350 msgid "Research (F2)" msgstr "Forskning (F2)" -#: src/hci.cpp:3375 +#: src/hci.cpp:3363 msgid "Build (F3)" msgstr "Konstruktion (F3)" -#: src/hci.cpp:3446 -#: src/multiint.cpp:1392 +#: src/hci.cpp:3434 +#: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Kraft" -#: src/hci.cpp:3537 +#: src/hci.cpp:3525 msgid "Map:" msgstr "" -#: src/hci.cpp:3550 +#: src/hci.cpp:3538 #, fuzzy msgid "Load" msgstr "Indlæs spil" -#: src/hci.cpp:3551 +#: src/hci.cpp:3539 #, fuzzy msgid "Load Map File" msgstr "Indlæs spil" -#: src/hci.cpp:3558 +#: src/hci.cpp:3546 #, fuzzy msgid "Save" msgstr "Gem spil" -#: src/hci.cpp:3559 +#: src/hci.cpp:3547 #, fuzzy msgid "Save Map File" msgstr "Gem spil" -#: src/hci.cpp:3567 +#: src/hci.cpp:3555 msgid "New" msgstr "" -#: src/hci.cpp:3568 +#: src/hci.cpp:3556 msgid "New Blank Map" msgstr "" -#: src/hci.cpp:3604 +#: src/hci.cpp:3592 #, fuzzy msgid "Tile" msgstr "fil" -#: src/hci.cpp:3605 +#: src/hci.cpp:3593 #, fuzzy msgid "Place tiles on map" msgstr "Tabte bygninger" -#: src/hci.cpp:3614 +#: src/hci.cpp:3602 msgid "Unit" msgstr "Enhed" -#: src/hci.cpp:3615 +#: src/hci.cpp:3603 #, fuzzy msgid "Place Unit on map" msgstr "Tabte bygninger" -#: src/hci.cpp:3623 +#: src/hci.cpp:3611 msgid "Struct" msgstr "" -#: src/hci.cpp:3624 +#: src/hci.cpp:3612 #, fuzzy msgid "Place Structures on map" msgstr "Tabte bygninger" -#: src/hci.cpp:3632 +#: src/hci.cpp:3620 msgid "Feat" msgstr "" -#: src/hci.cpp:3633 +#: src/hci.cpp:3621 #, fuzzy msgid "Place Features on map" msgstr "Tabte bygninger" -#: src/hci.cpp:3643 +#: src/hci.cpp:3631 msgid "Pause" msgstr "" -#: src/hci.cpp:3644 +#: src/hci.cpp:3632 #, fuzzy msgid "Pause or unpause the game" msgstr "Værten har forladt spillet" -#: src/hci.cpp:3658 +#: src/hci.cpp:3646 msgid "Align height of all map objects" msgstr "" -#: src/hci.cpp:3668 +#: src/hci.cpp:3656 msgid "Edit" msgstr "" -#: src/hci.cpp:3669 +#: src/hci.cpp:3657 #, fuzzy msgid "Start Edit Mode" msgstr "Start uden baser" -#: src/hci.cpp:3683 +#: src/hci.cpp:3671 #: src/ingameop.cpp:112 -#: src/ingameop.cpp:258 -#: src/ingameop.cpp:263 +#: src/ingameop.cpp:256 +#: src/ingameop.cpp:260 msgid "Quit" msgstr "Afslut" -#: src/hci.cpp:3684 +#: src/hci.cpp:3672 msgid "Exit Game" msgstr "Forlad spil" -#: src/hci.cpp:3710 +#: src/hci.cpp:3698 #, fuzzy msgid "Current Player:" msgstr "Flerbruger spil" -#: src/hci.cpp:4001 +#: src/hci.cpp:3989 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "Statuslinje" -#: src/hci.cpp:4867 +#: src/hci.cpp:4855 msgid "Factory Delivery Point" msgstr "Leveringspunkt" -#: src/hci.cpp:4885 +#: src/hci.cpp:4873 msgid "Loop Production" msgstr "Gentag produktion" -#: src/hci.cpp:4965 +#: src/hci.cpp:4953 msgid "Tab Scroll left" msgstr "" -#: src/hci.cpp:4980 +#: src/hci.cpp:4968 msgid "Tab Scroll right" msgstr "" #: src/ingameop.cpp:111 -#: src/ingameop.cpp:193 -#: src/ingameop.cpp:267 +#: src/ingameop.cpp:195 +#: src/ingameop.cpp:264 msgid "Resume Game" msgstr "Genoptag spil" @@ -13351,33 +13351,33 @@ msgstr "Genoptag spil" msgid "WARNING: You're the host. If you quit, the game ends for everyone!" msgstr "" -#: src/ingameop.cpp:185 -#: src/ingameop.cpp:527 +#: src/ingameop.cpp:186 +#: src/ingameop.cpp:523 msgid "Tactical UI (Target Origin Icon): Show" msgstr "" -#: src/ingameop.cpp:190 -#: src/ingameop.cpp:531 +#: src/ingameop.cpp:191 +#: src/ingameop.cpp:527 msgid "Tactical UI (Target Origin Icon): Hide" msgstr "" -#: src/ingameop.cpp:277 -#: src/ingameop.cpp:502 -#: src/mission.cpp:2514 -#: src/mission.cpp:2633 +#: src/ingameop.cpp:274 +#: src/ingameop.cpp:498 +#: src/mission.cpp:2480 +#: src/mission.cpp:2599 msgid "Save Game" msgstr "Gem spil" -#: src/ingameop.cpp:343 +#: src/ingameop.cpp:339 #, fuzzy msgid "Host has quit the game!" msgstr "Værten har forladt spillet" -#: src/ingameop.cpp:349 +#: src/ingameop.cpp:345 msgid "The game can't continue without the host." msgstr "" -#: src/ingameop.cpp:355 +#: src/ingameop.cpp:351 msgid "--> QUIT <--" msgstr "" @@ -13762,52 +13762,52 @@ msgstr "" msgid "Screen shake when things die: On" msgstr "" -#: src/keybind.cpp:2603 -#: src/keybind.cpp:2646 +#: src/keybind.cpp:2604 +#: src/keybind.cpp:2647 msgid "Sorry, but game speed cannot be changed in multiplayer." msgstr "" -#: src/keybind.cpp:2624 -#: src/keybind.cpp:2667 -#: src/keybind.cpp:2689 +#: src/keybind.cpp:2625 +#: src/keybind.cpp:2668 +#: src/keybind.cpp:2690 msgid "Game Speed Reset" msgstr "Nulstillet spilhastighed" -#: src/keybind.cpp:2628 +#: src/keybind.cpp:2629 #, c-format msgid "Game Speed Increased to %3.1f" msgstr "Spillehastighed forøget til %3.1f" -#: src/keybind.cpp:2671 +#: src/keybind.cpp:2672 #, c-format msgid "Game Speed Reduced to %3.1f" msgstr "Spillehastighed reduceret til %3.1f" -#: src/keybind.cpp:2701 +#: src/keybind.cpp:2702 msgid "Radar showing friend-foe colors" msgstr "" -#: src/keybind.cpp:2705 +#: src/keybind.cpp:2706 msgid "Radar showing player colors" msgstr "" -#: src/keybind.cpp:2726 +#: src/keybind.cpp:2727 msgid "Radar showing only objects" msgstr "" -#: src/keybind.cpp:2729 +#: src/keybind.cpp:2730 msgid "Radar blending terrain and height" msgstr "" -#: src/keybind.cpp:2732 +#: src/keybind.cpp:2733 msgid "Radar showing terrain" msgstr "" -#: src/keybind.cpp:2735 +#: src/keybind.cpp:2736 msgid "Radar showing revealed terrain" msgstr "" -#: src/keybind.cpp:2738 +#: src/keybind.cpp:2739 msgid "Radar showing height" msgstr "" @@ -13816,9 +13816,9 @@ msgid "KEY MAPPING" msgstr "TASTATUR MAPPING" #: src/keyedit.cpp:372 -#: src/multiint.cpp:662 -#: src/multiint.cpp:1072 -#: src/multiint.cpp:1478 +#: src/multiint.cpp:671 +#: src/multiint.cpp:1081 +#: src/multiint.cpp:1487 msgid "Return To Previous Screen" msgstr "Tilbage" @@ -14326,39 +14326,39 @@ msgstr "Forfølgelseskamera" msgid "Could not save game!" msgstr "Hent et gemt spil" -#: src/mission.cpp:2075 +#: src/mission.cpp:2041 msgid "Load Transport" msgstr "Fyld transportskib" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 #, fuzzy msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "MISSIONEN LYKKEDES" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED" msgstr "MISSIONEN LYKKEDES" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 #, fuzzy msgid "OBJECTIVE FAILED--and you cheated!" msgstr "MISSIONEN FEJLEDE" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED" msgstr "MISSIONEN FEJLEDE" -#: src/mission.cpp:2493 -#: src/mission.cpp:2533 -#: src/mission.cpp:2647 +#: src/mission.cpp:2459 +#: src/mission.cpp:2499 +#: src/mission.cpp:2613 msgid "Quit To Main Menu" msgstr "Tilbage til hovedmenu" -#: src/mission.cpp:2501 +#: src/mission.cpp:2467 msgid "Continue Game" msgstr "Fortsæt spil" -#: src/mission.cpp:2598 +#: src/mission.cpp:2564 #, fuzzy msgid "GAME SAVED :" msgstr "SPIL GEMT!" @@ -14418,357 +14418,362 @@ msgstr "%s Danner aliance med %s" msgid "You Discover Blueprints For %s" msgstr "Du opdager plantegninger for %s" -#: src/multiint.cpp:600 +#: src/multiint.cpp:609 #: src/multilimit.cpp:190 msgid "Accept Settings" msgstr "Akceptér opsætning" -#: src/multiint.cpp:602 -#: src/multiint.cpp:1117 +#: src/multiint.cpp:611 +#: src/multiint.cpp:1126 #, fuzzy msgid "Cancel" msgstr "Turkis" -#: src/multiint.cpp:613 +#: src/multiint.cpp:622 msgid "IP Address or Machine Name" msgstr "IP adressse eller computernavn" -#: src/multiint.cpp:659 +#: src/multiint.cpp:668 msgid "CONNECTION" msgstr "FORBINDELSE" -#: src/multiint.cpp:664 +#: src/multiint.cpp:673 msgid "Lobby" msgstr "" -#: src/multiint.cpp:665 +#: src/multiint.cpp:674 msgid "IP" msgstr "IP" -#: src/multiint.cpp:854 +#: src/multiint.cpp:863 #, fuzzy msgid "No games are available" msgstr "Forstærkninger er tilgængelige." -#: src/multiint.cpp:857 +#: src/multiint.cpp:866 msgid "Game is full" msgstr "" -#: src/multiint.cpp:861 +#: src/multiint.cpp:870 msgid "You were kicked!" msgstr "" -#: src/multiint.cpp:864 +#: src/multiint.cpp:873 msgid "Wrong Game Version!" msgstr "" -#: src/multiint.cpp:867 +#: src/multiint.cpp:876 msgid "You have an incompatible mod." msgstr "" -#: src/multiint.cpp:871 +#: src/multiint.cpp:880 msgid "Host couldn't send file?" msgstr "" -#: src/multiint.cpp:875 +#: src/multiint.cpp:884 msgid "Incorrect Password!" msgstr "" -#: src/multiint.cpp:878 +#: src/multiint.cpp:887 msgid "Host has dropped connection!" msgstr "" -#: src/multiint.cpp:882 +#: src/multiint.cpp:891 msgid "Connection Error" msgstr "" -#: src/multiint.cpp:1012 +#: src/multiint.cpp:1021 msgid "Searching" msgstr "Søger" -#: src/multiint.cpp:1069 +#: src/multiint.cpp:1078 msgid "GAMES" msgstr "SPIL" -#: src/multiint.cpp:1077 +#: src/multiint.cpp:1086 msgid "Refresh Games List" msgstr "Opdatér spilliste" -#: src/multiint.cpp:1097 +#: src/multiint.cpp:1106 msgid "Enter Password:" msgstr "" -#: src/multiint.cpp:1115 +#: src/multiint.cpp:1124 msgid "OK" msgstr "" -#: src/multiint.cpp:1232 +#: src/multiint.cpp:1241 msgid "Tanks disabled!!" msgstr "" -#: src/multiint.cpp:1233 +#: src/multiint.cpp:1242 msgid "Cyborgs disabled." msgstr "" -#: src/multiint.cpp:1234 +#: src/multiint.cpp:1243 msgid "VTOLs disabled." msgstr "" -#: src/multiint.cpp:1281 -#: src/multiint.cpp:1288 +#: src/multiint.cpp:1290 +#: src/multiint.cpp:1297 msgid "Select Game Name" msgstr "Vælg spilnavn" -#: src/multiint.cpp:1281 +#: src/multiint.cpp:1290 #, fuzzy msgid "One-Player Skirmish" msgstr "Spil mod computeren" -#: src/multiint.cpp:1291 +#: src/multiint.cpp:1300 msgid "Select Map" msgstr "Vælg kort" -#: src/multiint.cpp:1299 +#: src/multiint.cpp:1308 msgid "Click to set Password" msgstr "" -#: src/multiint.cpp:1309 -#: src/multiint.cpp:1310 +#: src/multiint.cpp:1318 +#: src/multiint.cpp:1319 #, fuzzy msgid "Scavengers" msgstr "Hestekrafter" -#: src/multiint.cpp:1312 +#: src/multiint.cpp:1321 #, fuzzy msgid "No Scavengers" msgstr "Hestekrafter" -#: src/multiint.cpp:1342 +#: src/multiint.cpp:1351 #, fuzzy msgid "Select Player Name" msgstr "Flerbruger spil" -#: src/multiint.cpp:1348 +#: src/multiint.cpp:1357 msgid "Distance Fog" msgstr "Afstandståge" -#: src/multiint.cpp:1359 +#: src/multiint.cpp:1368 #: src/multimenu.cpp:756 msgid "Alliances" msgstr "Aliancer" -#: src/multiint.cpp:1362 +#: src/multiint.cpp:1371 msgid "No Alliances" msgstr "Uden alliancer" -#: src/multiint.cpp:1364 +#: src/multiint.cpp:1373 msgid "Allow Alliances" msgstr "Med alliancer" -#: src/multiint.cpp:1368 +#: src/multiint.cpp:1377 msgid "Locked Teams" msgstr "Låste hold" -#: src/multiint.cpp:1394 +#: src/multiint.cpp:1403 msgid "Low Power Levels" msgstr "Sparsom energi" -#: src/multiint.cpp:1396 +#: src/multiint.cpp:1405 msgid "Medium Power Levels" msgstr "Medium energi" -#: src/multiint.cpp:1398 +#: src/multiint.cpp:1407 msgid "High Power Levels" msgstr "Meget energi" -#: src/multiint.cpp:1430 +#: src/multiint.cpp:1439 msgid "Base" msgstr "Base" -#: src/multiint.cpp:1432 +#: src/multiint.cpp:1441 msgid "Start with No Bases" msgstr "Start uden baser" -#: src/multiint.cpp:1434 +#: src/multiint.cpp:1443 msgid "Start with Bases" msgstr "Start med baser" -#: src/multiint.cpp:1436 +#: src/multiint.cpp:1445 msgid "Start with Advanced Bases" msgstr "Start med advancerede baser" -#: src/multiint.cpp:1468 +#: src/multiint.cpp:1477 msgid "Map Preview" msgstr "" -#: src/multiint.cpp:1470 +#: src/multiint.cpp:1479 msgid "Click to see Map" msgstr "" -#: src/multiint.cpp:1484 +#: src/multiint.cpp:1493 #, fuzzy msgid "Start Hosting Game" msgstr "Værten starter spillet" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 #, fuzzy msgid "Show Structure Limits" msgstr "Tabte bygninger" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 #, fuzzy msgid "Set Structure Limits" msgstr "Tabte bygninger" -#: src/multiint.cpp:1587 +#: src/multiint.cpp:1596 msgid "DIFFICULTY" msgstr "" -#: src/multiint.cpp:1601 +#: src/multiint.cpp:1610 msgid "Less aggressive and starts with less units" msgstr "" -#: src/multiint.cpp:1602 +#: src/multiint.cpp:1611 #, fuzzy msgid "Plays nice" msgstr "Spiller" -#: src/multiint.cpp:1603 +#: src/multiint.cpp:1612 msgid "No holds barred" msgstr "" -#: src/multiint.cpp:1604 +#: src/multiint.cpp:1613 msgid "Starts with advantages and gets twice as much oil from derricks" msgstr "" -#: src/multiint.cpp:1632 +#: src/multiint.cpp:1641 msgid "CHOOSE AI" msgstr "" -#: src/multiint.cpp:1648 +#: src/multiint.cpp:1657 msgid "Allow human players to join in this slot" msgstr "" -#: src/multiint.cpp:1656 +#: src/multiint.cpp:1665 msgid "Leave this slot unused" msgstr "" -#: src/multiint.cpp:1736 +#: src/multiint.cpp:1745 #, fuzzy msgid "Player colour" msgstr "Spiller" -#: src/multiint.cpp:2062 +#: src/multiint.cpp:2071 #, fuzzy msgid "Team" msgstr "Hurtgigt spil" -#: src/multiint.cpp:2074 +#: src/multiint.cpp:2083 #, fuzzy msgid "Kick player" msgstr "2 spillere" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 #, fuzzy msgid "Click to change difficulty" msgstr "Bevogt position" -#: src/multiint.cpp:2121 +#: src/multiint.cpp:2130 msgid "Click when ready" msgstr "" -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2134 msgid "READY?" msgstr "" -#: src/multiint.cpp:2169 +#: src/multiint.cpp:2178 msgid "PLAYERS" msgstr "SPILLERE" -#: src/multiint.cpp:2204 +#: src/multiint.cpp:2213 msgid "Click to change to this slot" msgstr "" -#: src/multiint.cpp:2232 +#: src/multiint.cpp:2241 #, fuzzy msgid "Choose Team" msgstr "Låste hold" -#: src/multiint.cpp:2262 +#: src/multiint.cpp:2271 msgid "Click to change player colour" msgstr "" -#: src/multiint.cpp:2290 +#: src/multiint.cpp:2299 #, fuzzy msgid "Click to change player position" msgstr "Bevogt position" -#: src/multiint.cpp:2296 +#: src/multiint.cpp:2305 #, fuzzy msgid "Click to change AI" msgstr "Bevogt position" -#: src/multiint.cpp:2300 +#: src/multiint.cpp:2309 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2362 +#: src/multiint.cpp:2371 msgid "CHAT" msgstr "BESKEDER" -#: src/multiint.cpp:2394 +#: src/multiint.cpp:2403 msgid "All players need to have the same mods to join your game." msgstr "" -#: src/multiint.cpp:2552 +#: src/multiint.cpp:2561 #, c-format msgid "*** password [%s] is now required! ***" msgstr "" -#: src/multiint.cpp:2560 +#: src/multiint.cpp:2569 msgid "*** password is NOT required! ***" msgstr "" -#: src/multiint.cpp:2801 +#: src/multiint.cpp:2810 msgid "Sorry! Failed to host the game." msgstr "" -#: src/multiint.cpp:2922 +#: src/multiint.cpp:2931 #, fuzzy msgid "'Locked Teams' mode enabled" msgstr "Låste hold" -#: src/multiint.cpp:3003 +#: src/multiint.cpp:3012 #, fuzzy, c-format msgid "The host has kicked %s from the game!" msgstr "%s har forladt spillet" -#: src/multiint.cpp:3073 +#: src/multiint.cpp:3082 msgid "Host is Starting Game" msgstr "Værten starter spillet" -#: src/multiint.cpp:3639 +#: src/multiint.cpp:3648 msgid "Players" msgstr "Spillere" -#: src/multiint.cpp:3772 +#: src/multiint.cpp:3786 #, c-format msgid "Sending Map: %d%% " msgstr "" -#: src/multiint.cpp:3780 +#: src/multiint.cpp:3794 #, c-format msgid "Map: %d%% downloaded" msgstr "" -#: src/multiint.cpp:3803 +#: src/multiint.cpp:3820 msgid "HOST" msgstr "" +#: src/multiint.cpp:3827 +#: src/multimenu.cpp:772 +msgid "Ping" +msgstr "Ping" + #: src/multijoin.cpp:100 #: src/multijoin.cpp:101 msgid "Players Still Joining" @@ -14784,17 +14789,17 @@ msgstr "%s har forladt spillet" msgid "File transfer has been aborted for %d." msgstr "" -#: src/multijoin.cpp:376 +#: src/multijoin.cpp:373 #, c-format msgid "%s (%u) has an incompatible mod, and has been kicked." msgstr "" -#: src/multijoin.cpp:415 +#: src/multijoin.cpp:412 #, c-format msgid "%s is Joining the Game" msgstr "%s kom med i spillet" -#: src/multijoin.cpp:425 +#: src/multijoin.cpp:422 #, fuzzy msgid "System message:" msgstr "Elektronik" @@ -14910,10 +14915,6 @@ msgstr "Drabte" msgid "Units" msgstr "Enhed" -#: src/multimenu.cpp:772 -msgid "Ping" -msgstr "Ping" - #: src/multimenu.cpp:776 #, fuzzy msgid "Structs" @@ -14948,84 +14949,84 @@ msgstr "Forær energi" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "" -#: src/multiplay.cpp:1146 +#: src/multiplay.cpp:1057 #, fuzzy msgid "(allies" msgstr "Aliancer" -#: src/multiplay.cpp:1154 +#: src/multiplay.cpp:1065 msgid "(private to " msgstr "" -#: src/multiplay.cpp:1167 +#: src/multiplay.cpp:1078 msgid "[invalid]" msgstr "" -#: src/multiplay.cpp:2057 +#: src/multiplay.cpp:1942 msgid "Green" msgstr "Grøn" -#: src/multiplay.cpp:2058 +#: src/multiplay.cpp:1943 msgid "Orange" msgstr "Orange" -#: src/multiplay.cpp:2059 +#: src/multiplay.cpp:1944 msgid "Grey" msgstr "Grå" -#: src/multiplay.cpp:2060 +#: src/multiplay.cpp:1945 msgid "Black" msgstr "Sort" -#: src/multiplay.cpp:2061 +#: src/multiplay.cpp:1946 msgid "Red" msgstr "Rød" -#: src/multiplay.cpp:2062 +#: src/multiplay.cpp:1947 msgid "Blue" msgstr "Blå" -#: src/multiplay.cpp:2063 +#: src/multiplay.cpp:1948 msgid "Pink" msgstr "Lyserød" -#: src/multiplay.cpp:2064 +#: src/multiplay.cpp:1949 msgid "Cyan" msgstr "Turkis" -#: src/multiplay.cpp:2065 +#: src/multiplay.cpp:1950 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:2066 +#: src/multiplay.cpp:1951 msgid "Purple" msgstr "" -#: src/multiplay.cpp:2067 +#: src/multiplay.cpp:1952 msgid "White" msgstr "" -#: src/multiplay.cpp:2068 +#: src/multiplay.cpp:1953 msgid "Bright blue" msgstr "" -#: src/multiplay.cpp:2069 +#: src/multiplay.cpp:1954 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:2070 +#: src/multiplay.cpp:1955 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:2071 +#: src/multiplay.cpp:1956 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:2072 +#: src/multiplay.cpp:1957 msgid "Brown" msgstr "" -#: src/order.cpp:841 +#: src/order.cpp:800 msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "" @@ -15160,20 +15161,20 @@ msgstr "Total anvendt tid: %s" msgid "You cheated!" msgstr "" -#: src/scriptfuncs.cpp:3250 +#: src/scriptfuncs.cpp:3287 msgid "YOU ARE VICTORIOUS!" msgstr "" -#: src/scriptfuncs.cpp:3254 +#: src/scriptfuncs.cpp:3291 msgid "YOU WERE DEFEATED!" msgstr "" -#: src/scriptfuncs.cpp:9500 +#: src/scriptfuncs.cpp:9537 #, c-format msgid "Beacon received from %s!" msgstr "" -#: src/scriptfuncs.cpp:9546 +#: src/scriptfuncs.cpp:9583 #, c-format msgid "Beacon %d" msgstr "" @@ -15202,62 +15203,62 @@ msgstr "Kan ikke finde nogle rekonniseringsenheder!" msgid "Unable to locate any Commanders!" msgstr "Kan ikke finde nogle kommandører!" -#: src/structure.cpp:2615 +#: src/structure.cpp:2614 msgid "Command Control Limit Reached - Production Halted" msgstr "Kommandobegrænsning nået - indstiller produktion" -#: src/structure.cpp:5815 -#: src/structure.cpp:5840 +#: src/structure.cpp:5806 +#: src/structure.cpp:5831 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" msgstr[0] "" msgstr[1] "" -#: src/structure.cpp:5845 -#: src/structure.cpp:5913 -#: src/structure.cpp:5929 -#: src/structure.cpp:5943 +#: src/structure.cpp:5836 +#: src/structure.cpp:5904 +#: src/structure.cpp:5920 +#: src/structure.cpp:5934 #, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - Skade %3.0f%%" -#: src/structure.cpp:5895 +#: src/structure.cpp:5886 #, c-format msgid "%s - Connected %u of %u" msgstr "%s - Forbundet %u af %u" -#: src/structure.cpp:6059 -#: src/structure.cpp:6104 +#: src/structure.cpp:6050 +#: src/structure.cpp:6095 #, c-format msgid "%s - Electronically Damaged" msgstr "%s - Elektronisk beskadiget" -#: src/structure.cpp:6341 +#: src/structure.cpp:6332 msgid "Electronic Reward - Visibility Report" msgstr "Elektronisk gevinst - Rekonniseringsrapport" -#: src/structure.cpp:6381 +#: src/structure.cpp:6372 msgid "Factory Reward - Propulsion" msgstr "Fabriksgevinst - Fremdrift" -#: src/structure.cpp:6405 +#: src/structure.cpp:6396 msgid "Factory Reward - Body" msgstr "Fabriksgevinst - Skrog" -#: src/structure.cpp:6429 +#: src/structure.cpp:6420 msgid "Factory Reward - Weapon" msgstr "Frabriskgevinst - Våben" -#: src/structure.cpp:6438 +#: src/structure.cpp:6429 msgid "Factory Reward - Nothing" msgstr "Fabriksgevinst - Ingen" -#: src/structure.cpp:6466 +#: src/structure.cpp:6457 msgid "Repair Facility Award - Repair" msgstr "Reperationsgevinst - Reperation" -#: src/structure.cpp:6473 +#: src/structure.cpp:6464 msgid "Repair Facility Award - Nothing" msgstr "Reperationsgevinst - Ingen" diff --git a/po/de.po b/po/de.po index ff31b9e57..4327f6416 100644 --- a/po/de.po +++ b/po/de.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-01-18 00:54+0100\n" +"POT-Creation-Date: 2011-02-25 23:35+0100\n" "PO-Revision-Date: 2010-06-05 07:09+0100\n" "Last-Translator: Steven 'Kreuvf' Koenig \n" "Language-Team: Deutsch \n" @@ -5744,7 +5744,7 @@ msgid "New Design" msgstr "Neuer Entwurf" #: data/base/messages/strings/names.txt:15 -#: src/design.cpp:1313 +#: src/design.cpp:1275 msgid "Transport" msgstr "Transporter" @@ -12056,26 +12056,26 @@ msgid "System locale" msgstr "Systemsprache" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1043 +#: lib/netplay/netplay.cpp:1042 msgid "Enter password here" msgstr "Passwort hier eingeben" -#: lib/netplay/netplay.cpp:2048 +#: lib/netplay/netplay.cpp:2060 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "Konnte Lobbyserver-Namen nicht auflösen (%s)!" -#: lib/netplay/netplay.cpp:2062 +#: lib/netplay/netplay.cpp:2082 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "Konnte nicht mit Lobbyserver kommunizieren! Ist der TCP-Port %u für ausgehenden Verkehr geöffnet?" #: src/challenge.cpp:184 -#: src/hci.cpp:922 -#: src/hci.cpp:3390 -#: src/hci.cpp:3513 -#: src/hci.cpp:3924 -#: src/hci.cpp:4942 +#: src/hci.cpp:916 +#: src/hci.cpp:3378 +#: src/hci.cpp:3501 +#: src/hci.cpp:3912 +#: src/hci.cpp:4930 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12228,149 +12228,149 @@ msgstr "Direkt zum Spielleiterschirm" #: src/configuration.cpp:393 #: src/configuration.cpp:394 -#: src/multistat.cpp:130 +#: src/multistat.cpp:124 msgid "Player" msgstr "Spieler" -#: src/design.cpp:449 -#: src/design.cpp:469 -#: src/design.cpp:3501 +#: src/design.cpp:443 +#: src/design.cpp:455 +#: src/design.cpp:3464 msgid "New Vehicle" msgstr "Neues Fahrzeug" -#: src/design.cpp:515 +#: src/design.cpp:500 msgid "Vehicle Body" msgstr "Fahrzeugrumpf" -#: src/design.cpp:535 +#: src/design.cpp:520 msgid "Vehicle Propulsion" msgstr "Fahrzeugantrieb" -#: src/design.cpp:556 -#: src/design.cpp:579 -#: src/design.cpp:603 +#: src/design.cpp:541 +#: src/design.cpp:564 +#: src/design.cpp:588 msgid "Vehicle Turret" msgstr "Fahrzeugturm" -#: src/design.cpp:622 +#: src/design.cpp:607 msgid "Delete Design" msgstr "Entwurf löschen" -#: src/design.cpp:673 -#: src/design.cpp:720 +#: src/design.cpp:658 +#: src/design.cpp:705 msgid "Kinetic Armour" msgstr "Kinetische Panzerung" -#: src/design.cpp:682 -#: src/design.cpp:730 +#: src/design.cpp:667 +#: src/design.cpp:715 msgid "Thermal Armour" msgstr "Thermalpanzerung" -#: src/design.cpp:698 -#: src/design.cpp:750 +#: src/design.cpp:683 +#: src/design.cpp:735 msgid "Engine Output" msgstr "Motorleistung" -#: src/design.cpp:706 -#: src/design.cpp:759 -#: src/design.cpp:1529 -#: src/design.cpp:1553 -#: src/design.cpp:1574 -#: src/design.cpp:1590 -#: src/design.cpp:1610 -#: src/design.cpp:1627 -#: src/design.cpp:1647 -#: src/design.cpp:1664 -#: src/design.cpp:1705 -#: src/design.cpp:1737 -#: src/design.cpp:1869 -#: src/design.cpp:1885 -#: src/design.cpp:1923 -#: src/design.cpp:1956 +#: src/design.cpp:691 +#: src/design.cpp:744 +#: src/design.cpp:1486 +#: src/design.cpp:1510 +#: src/design.cpp:1531 +#: src/design.cpp:1547 +#: src/design.cpp:1567 +#: src/design.cpp:1584 +#: src/design.cpp:1604 +#: src/design.cpp:1621 +#: src/design.cpp:1662 +#: src/design.cpp:1694 +#: src/design.cpp:1826 +#: src/design.cpp:1842 +#: src/design.cpp:1880 +#: src/design.cpp:1913 msgid "Weight" msgstr "Gewicht" -#: src/design.cpp:790 -#: src/design.cpp:808 +#: src/design.cpp:775 +#: src/design.cpp:793 msgid "Total Power Required" msgstr "Benötigte Gesamtenergie" -#: src/design.cpp:821 -#: src/design.cpp:840 +#: src/design.cpp:806 +#: src/design.cpp:825 msgid "Total Body Points" msgstr "Gesamte Rumpfpunkte" -#: src/design.cpp:1027 -#: src/design.cpp:1059 +#: src/design.cpp:996 +#: src/design.cpp:1025 msgid "Power Usage" msgstr "Energieverbrauch" -#: src/design.cpp:1335 +#: src/design.cpp:1298 msgid "Hydra " msgstr "Hydra " -#: src/design.cpp:1509 -#: src/design.cpp:1537 +#: src/design.cpp:1466 +#: src/design.cpp:1494 msgid "Sensor Range" msgstr "Sensorreichweite" -#: src/design.cpp:1521 -#: src/design.cpp:1545 +#: src/design.cpp:1478 +#: src/design.cpp:1502 msgid "Sensor Power" msgstr "Sensorstärke" -#: src/design.cpp:1566 -#: src/design.cpp:1582 +#: src/design.cpp:1523 +#: src/design.cpp:1539 msgid "ECM Power" msgstr "ECM-Stärke" -#: src/design.cpp:1602 -#: src/design.cpp:1619 -#: src/design.cpp:1639 -#: src/design.cpp:1656 +#: src/design.cpp:1559 +#: src/design.cpp:1576 +#: src/design.cpp:1596 +#: src/design.cpp:1613 msgid "Build Points" msgstr "Konstruktionspunkte" -#: src/design.cpp:1677 -#: src/design.cpp:1713 +#: src/design.cpp:1634 +#: src/design.cpp:1670 msgid "Range" msgstr "Reichweite" -#: src/design.cpp:1689 -#: src/design.cpp:1721 +#: src/design.cpp:1646 +#: src/design.cpp:1678 msgid "Damage" msgstr "Schaden" -#: src/design.cpp:1697 -#: src/design.cpp:1729 +#: src/design.cpp:1654 +#: src/design.cpp:1686 msgid "Rate-of-Fire" msgstr "Feuerrate" -#: src/design.cpp:1857 -#: src/design.cpp:1877 +#: src/design.cpp:1814 +#: src/design.cpp:1834 msgid "Air Speed" msgstr "Fluggeschwindigkeit" -#: src/design.cpp:1895 -#: src/design.cpp:1932 +#: src/design.cpp:1852 +#: src/design.cpp:1889 msgid "Road Speed" msgstr "Straßengeschwindigkeit" -#: src/design.cpp:1905 -#: src/design.cpp:1940 +#: src/design.cpp:1862 +#: src/design.cpp:1897 msgid "Off-Road Speed" msgstr "Geländegeschwindigkeit" -#: src/design.cpp:1913 -#: src/design.cpp:1948 +#: src/design.cpp:1870 +#: src/design.cpp:1905 msgid "Water Speed" msgstr "Wassergeschwindigkeit" -#: src/design.cpp:2074 +#: src/design.cpp:2031 msgid "Weapons" msgstr "Waffen" -#: src/design.cpp:2094 +#: src/design.cpp:2051 msgid "Systems" msgstr "Systeme" @@ -12383,7 +12383,7 @@ msgid "Player dropped" msgstr "Spieler ausgefallen" #: src/display3d.cpp:599 -#: src/multiint.cpp:2116 +#: src/multiint.cpp:2125 msgid "Waiting for other players" msgstr "Warte auf andere Spieler" @@ -12391,113 +12391,113 @@ msgstr "Warte auf andere Spieler" msgid "Out of sync" msgstr "" -#: src/display.cpp:1651 +#: src/display.cpp:1649 msgid "Cannot Build. Oil Resource Burning." msgstr "Bau nicht möglich. Ölquelle brennt." -#: src/display.cpp:1830 -#: src/display.cpp:2423 +#: src/display.cpp:1828 +#: src/display.cpp:2421 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - Schaden %d%% - Erfahrung %d, %s" -#: src/display.cpp:1846 +#: src/display.cpp:1844 #, c-format msgid "%s - Allied - Damage %d%% - Experience %d, %s" msgstr "%s - Verbündet - Schaden %d%% - Erfahrung %d, %s" -#: src/display.cpp:2044 +#: src/display.cpp:2042 msgid "Truck ordered to build Oil Derrick" msgstr "LKW wurde beauftragt, einen Ölbohrturm zu bauen" -#: src/display.cpp:2045 +#: src/display.cpp:2043 msgid "2 trucks ordered to build Oil Derrick" msgstr "LKW wurde beauftragt, einen Ölbohrturm zu bauen" -#: src/display.cpp:2046 +#: src/display.cpp:2044 #, fuzzy, c-format msgid "%d trucks ordered to build Oil Derrick" msgstr "LKW wurde beauftragt, einen Ölbohrturm zu bauen" -#: src/droid.cpp:208 +#: src/droid.cpp:211 msgid "Unit Lost!" msgstr "Einheit verloren!" -#: src/droid.cpp:1370 +#: src/droid.cpp:1376 msgid "Structure Restored" msgstr "Gebäude wiederhergestellt" -#: src/droid.cpp:2712 +#: src/droid.cpp:2732 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" msgstr[0] "Gruppe %u ausgewählt - %u Einheit" msgstr[1] "Gruppe %u ausgewählt - %u Einheiten" -#: src/droid.cpp:2725 +#: src/droid.cpp:2745 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" msgstr[0] "%u Einheit zur Gruppe %u hinzugefügt" msgstr[1] "%u Einheiten zur Gruppe %u hinzugefügt" -#: src/droid.cpp:2738 +#: src/droid.cpp:2758 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" msgstr[0] "Auf Gruppe %u zentriert - %u Einheit" msgstr[1] "Auf Gruppe %u zentriert - %u Einheiten" -#: src/droid.cpp:2742 +#: src/droid.cpp:2762 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" msgstr[0] "An Gruppe %u ausgerichtet - %u Einheit" msgstr[1] "An Gruppe %u ausgerichtet - %u Einheiten" -#: src/droid.cpp:3080 +#: src/droid.cpp:3093 msgid "Rookie" msgstr "Anfänger" -#: src/droid.cpp:3081 +#: src/droid.cpp:3094 msgctxt "rank" msgid "Green" msgstr "Neuling" -#: src/droid.cpp:3082 +#: src/droid.cpp:3095 msgid "Trained" msgstr "Geübter" -#: src/droid.cpp:3083 +#: src/droid.cpp:3096 msgid "Regular" msgstr "Durchschnitt" -#: src/droid.cpp:3084 +#: src/droid.cpp:3097 msgid "Professional" msgstr "Profi" -#: src/droid.cpp:3085 +#: src/droid.cpp:3098 msgid "Veteran" msgstr "Veteran" -#: src/droid.cpp:3086 +#: src/droid.cpp:3099 msgid "Elite" msgstr "Elite" -#: src/droid.cpp:3087 +#: src/droid.cpp:3100 msgid "Special" msgstr "Spezialist" -#: src/droid.cpp:3088 +#: src/droid.cpp:3101 msgid "Hero" msgstr "Held" -#: src/droid.cpp:4110 +#: src/droid.cpp:4123 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "" -#: src/droid.cpp:4114 +#: src/droid.cpp:4127 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "" @@ -12516,7 +12516,7 @@ msgid "Tutorial" msgstr "Tutorial" #: src/frontend.cpp:100 -#: src/hci.cpp:3499 +#: src/hci.cpp:3487 msgid "Options" msgstr "Optionen" @@ -12567,7 +12567,7 @@ msgid "Challenges" msgstr "Herausforderungen" #: src/frontend.cpp:215 -#: src/ingameop.cpp:275 +#: src/ingameop.cpp:272 msgid "Load Game" msgstr "Spielstand laden" @@ -12576,9 +12576,9 @@ msgid "SINGLE PLAYER" msgstr "Einzelspieler" #: src/frontend.cpp:303 -#: src/ingameop.cpp:498 -#: src/mission.cpp:2527 -#: src/mission.cpp:2630 +#: src/ingameop.cpp:494 +#: src/mission.cpp:2493 +#: src/mission.cpp:2596 msgid "Load Saved Game" msgstr "Spielstand laden" @@ -12595,7 +12595,7 @@ msgid "Join Game" msgstr "Spiel beitreten" #: src/frontend.cpp:422 -#: src/multiint.cpp:1276 +#: src/multiint.cpp:1285 msgid "OPTIONS" msgstr "OPTIONEN" @@ -12612,7 +12612,7 @@ msgid "Video Options" msgstr "Videoeinstellungen" #: src/frontend.cpp:426 -#: src/ingameop.cpp:270 +#: src/ingameop.cpp:267 msgid "Audio Options" msgstr "Audioeinstellungen" @@ -12690,7 +12690,7 @@ msgid "Off" msgstr "Aus" #: src/frontend.cpp:523 -#: src/multiint.cpp:1345 +#: src/multiint.cpp:1354 msgid "Fog" msgstr "Nebel" @@ -12701,7 +12701,7 @@ msgstr "Dunst" #: src/frontend.cpp:530 #: src/frontend.cpp:595 -#: src/multiint.cpp:1347 +#: src/multiint.cpp:1356 msgid "Fog Of War" msgstr "Nebel des Krieges" @@ -12863,201 +12863,201 @@ msgid "GAME OPTIONS" msgstr "SPIELOPTIONEN" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2389 +#: src/multiint.cpp:2398 msgid "Mod: " msgstr "Mod: " -#: src/hci.cpp:1245 +#: src/hci.cpp:1237 msgid "MAP SAVED!" msgstr "KARTE GESPEICHERT!" -#: src/hci.cpp:1584 +#: src/hci.cpp:1573 #: src/loop.cpp:558 #: src/loop.cpp:574 msgid "GAME SAVED: " msgstr "SPIEL GESPEICHERT!" -#: src/hci.cpp:1971 +#: src/hci.cpp:1960 msgid "Failed to create building" msgstr "Gebäude konnte nicht erstellt werden" -#: src/hci.cpp:1988 +#: src/hci.cpp:1977 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new structure: %s." msgstr "Spieler %u erschummelt (Debugmenü) sich ein neues Gebäude: %s." -#: src/hci.cpp:2003 +#: src/hci.cpp:1992 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new feature: %s." msgstr "Spieler %u erschummelt (Debugmenü) sich ein neues Feature: %s." -#: src/hci.cpp:2025 +#: src/hci.cpp:2014 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid: %s." msgstr "Spieler %u erschummelt (Debugmenü) sich eine neue Einheit: %s." -#: src/hci.cpp:2036 +#: src/hci.cpp:2025 #, fuzzy, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "Spieler %u erschummelt (Debugmenü) sich eine neue Einheit: %s." # Commander kann als Eigenname im Deutschen allerdings mit deutschem Plural stehen bleiben -Kreuvf -#: src/hci.cpp:3310 +#: src/hci.cpp:3298 msgid "Commanders (F6)" msgstr "Commandermenü" -#: src/hci.cpp:3323 +#: src/hci.cpp:3311 msgid "Intelligence Display (F5)" msgstr "Aufklärungsbildschirm" -#: src/hci.cpp:3336 +#: src/hci.cpp:3324 msgid "Manufacture (F1)" msgstr "Produktionsmenü" -#: src/hci.cpp:3349 +#: src/hci.cpp:3337 msgid "Design (F4)" msgstr "Entwurfmenü" -#: src/hci.cpp:3362 +#: src/hci.cpp:3350 msgid "Research (F2)" msgstr "Forschungsmenü" -#: src/hci.cpp:3375 +#: src/hci.cpp:3363 msgid "Build (F3)" msgstr "Konstruktionsmenü" -#: src/hci.cpp:3446 -#: src/multiint.cpp:1392 +#: src/hci.cpp:3434 +#: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Energie" -#: src/hci.cpp:3537 +#: src/hci.cpp:3525 msgid "Map:" msgstr "" -#: src/hci.cpp:3550 +#: src/hci.cpp:3538 #, fuzzy msgid "Load" msgstr "Spielstand laden" -#: src/hci.cpp:3551 +#: src/hci.cpp:3539 #, fuzzy msgid "Load Map File" msgstr "Spielstand laden" -#: src/hci.cpp:3558 +#: src/hci.cpp:3546 #, fuzzy msgid "Save" msgstr "Spiel speichern" -#: src/hci.cpp:3559 +#: src/hci.cpp:3547 #, fuzzy msgid "Save Map File" msgstr "Spiel speichern" -#: src/hci.cpp:3567 +#: src/hci.cpp:3555 msgid "New" msgstr "" -#: src/hci.cpp:3568 +#: src/hci.cpp:3556 msgid "New Blank Map" msgstr "" -#: src/hci.cpp:3604 +#: src/hci.cpp:3592 msgid "Tile" msgstr "Kartenkachel" -#: src/hci.cpp:3605 +#: src/hci.cpp:3593 msgid "Place tiles on map" msgstr "Kartenkacheln platzieren" -#: src/hci.cpp:3614 +#: src/hci.cpp:3602 msgid "Unit" msgstr "Einheit" -#: src/hci.cpp:3615 +#: src/hci.cpp:3603 msgid "Place Unit on map" msgstr "Einheit auf der Karte platzieren" -#: src/hci.cpp:3623 +#: src/hci.cpp:3611 msgid "Struct" msgstr "Gebäude" -#: src/hci.cpp:3624 +#: src/hci.cpp:3612 msgid "Place Structures on map" msgstr "Gebäude auf der Karte platzieren" # gemäß: http://dict.leo.org/ende?search=Feat -Kreuvf -#: src/hci.cpp:3632 +#: src/hci.cpp:3620 msgid "Feat" msgstr "Leistung" -#: src/hci.cpp:3633 +#: src/hci.cpp:3621 msgid "Place Features on map" msgstr "Feature auf der Karte platzieren" -#: src/hci.cpp:3643 +#: src/hci.cpp:3631 msgid "Pause" msgstr "" -#: src/hci.cpp:3644 +#: src/hci.cpp:3632 msgid "Pause or unpause the game" msgstr "Spiel pausieren oder fortsetzen" -#: src/hci.cpp:3658 +#: src/hci.cpp:3646 msgid "Align height of all map objects" msgstr "Höhe aller Kartenobjekte abgleichen" -#: src/hci.cpp:3668 +#: src/hci.cpp:3656 msgid "Edit" msgstr "" -#: src/hci.cpp:3669 +#: src/hci.cpp:3657 #, fuzzy msgid "Start Edit Mode" msgstr "Ohne Basen starten" -#: src/hci.cpp:3683 +#: src/hci.cpp:3671 #: src/ingameop.cpp:112 -#: src/ingameop.cpp:258 -#: src/ingameop.cpp:263 +#: src/ingameop.cpp:256 +#: src/ingameop.cpp:260 msgid "Quit" msgstr "Beenden" -#: src/hci.cpp:3684 +#: src/hci.cpp:3672 msgid "Exit Game" msgstr "Spiel verlassen" -#: src/hci.cpp:3710 +#: src/hci.cpp:3698 #, fuzzy msgid "Current Player:" msgstr "Mehrspieler" -#: src/hci.cpp:4001 +#: src/hci.cpp:3989 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "Fortschrittsbalken" -#: src/hci.cpp:4867 +#: src/hci.cpp:4855 msgid "Factory Delivery Point" msgstr "Fabrik-Auslieferungspunkt" -#: src/hci.cpp:4885 +#: src/hci.cpp:4873 msgid "Loop Production" msgstr "Produktion wiederholen" -#: src/hci.cpp:4965 +#: src/hci.cpp:4953 msgid "Tab Scroll left" msgstr "Reiter nach links durchschalten" -#: src/hci.cpp:4980 +#: src/hci.cpp:4968 msgid "Tab Scroll right" msgstr "Reiter nach rechts durchschalten" #: src/ingameop.cpp:111 -#: src/ingameop.cpp:193 -#: src/ingameop.cpp:267 +#: src/ingameop.cpp:195 +#: src/ingameop.cpp:264 msgid "Resume Game" msgstr "Spiel fortsetzen" @@ -13065,32 +13065,32 @@ msgstr "Spiel fortsetzen" msgid "WARNING: You're the host. If you quit, the game ends for everyone!" msgstr "Warnung: Sie sind Spielleiter. Wenn Sie das Spiel verlassen, endet es für alle!" -#: src/ingameop.cpp:185 -#: src/ingameop.cpp:527 +#: src/ingameop.cpp:186 +#: src/ingameop.cpp:523 msgid "Tactical UI (Target Origin Icon): Show" msgstr "Taktische Anzeige (Zielherkunftssymbol): Anzeigen" -#: src/ingameop.cpp:190 -#: src/ingameop.cpp:531 +#: src/ingameop.cpp:191 +#: src/ingameop.cpp:527 msgid "Tactical UI (Target Origin Icon): Hide" msgstr "Taktische Anzeige (Zielherkunftssymbol): Verstecken" -#: src/ingameop.cpp:277 -#: src/ingameop.cpp:502 -#: src/mission.cpp:2514 -#: src/mission.cpp:2633 +#: src/ingameop.cpp:274 +#: src/ingameop.cpp:498 +#: src/mission.cpp:2480 +#: src/mission.cpp:2599 msgid "Save Game" msgstr "Spiel speichern" -#: src/ingameop.cpp:343 +#: src/ingameop.cpp:339 msgid "Host has quit the game!" msgstr "Der Spielleiter hat das Spiel verlassen!" -#: src/ingameop.cpp:349 +#: src/ingameop.cpp:345 msgid "The game can't continue without the host." msgstr "Das Spiel kann ohne Spielleiter nicht weitergehen." -#: src/ingameop.cpp:355 +#: src/ingameop.cpp:351 msgid "--> QUIT <--" msgstr "--> BEENDEN <--" @@ -13472,52 +13472,52 @@ msgstr "Bildschirm wackelt bei Zerstörung: Aus" msgid "Screen shake when things die: On" msgstr "Bildschirm wackelt bei Zerstörung: An" -#: src/keybind.cpp:2603 -#: src/keybind.cpp:2646 +#: src/keybind.cpp:2604 +#: src/keybind.cpp:2647 msgid "Sorry, but game speed cannot be changed in multiplayer." msgstr "Entschuldige, aber die Spielgeschwindigkeit kann im Mehrspielermodus nicht verändert werden." -#: src/keybind.cpp:2624 -#: src/keybind.cpp:2667 -#: src/keybind.cpp:2689 +#: src/keybind.cpp:2625 +#: src/keybind.cpp:2668 +#: src/keybind.cpp:2690 msgid "Game Speed Reset" msgstr "Spielgeschwindigkeit zurückgesetzt" -#: src/keybind.cpp:2628 +#: src/keybind.cpp:2629 #, c-format msgid "Game Speed Increased to %3.1f" msgstr "Spielgeschwindigkeit auf %3.1f erhöht" -#: src/keybind.cpp:2671 +#: src/keybind.cpp:2672 #, c-format msgid "Game Speed Reduced to %3.1f" msgstr "Spielgeschwindigkeit auf %3.1f gesenkt" -#: src/keybind.cpp:2701 +#: src/keybind.cpp:2702 msgid "Radar showing friend-foe colors" msgstr "Radar zeigt Freund-Feind-Farben" -#: src/keybind.cpp:2705 +#: src/keybind.cpp:2706 msgid "Radar showing player colors" msgstr "Radar zeigt Spielerfarben" -#: src/keybind.cpp:2726 +#: src/keybind.cpp:2727 msgid "Radar showing only objects" msgstr "Radar zeigt nur Objekte" -#: src/keybind.cpp:2729 +#: src/keybind.cpp:2730 msgid "Radar blending terrain and height" msgstr "Radar zeigt Gelände und Höheninformation überlagert" -#: src/keybind.cpp:2732 +#: src/keybind.cpp:2733 msgid "Radar showing terrain" msgstr "Radar zeigt Gelände" -#: src/keybind.cpp:2735 +#: src/keybind.cpp:2736 msgid "Radar showing revealed terrain" msgstr "Radar zeigt aufgedecktes Gelände" -#: src/keybind.cpp:2738 +#: src/keybind.cpp:2739 msgid "Radar showing height" msgstr "Radar zeigt Höheninformation" @@ -13526,9 +13526,9 @@ msgid "KEY MAPPING" msgstr "TASTENZUORDNUNG" #: src/keyedit.cpp:372 -#: src/multiint.cpp:662 -#: src/multiint.cpp:1072 -#: src/multiint.cpp:1478 +#: src/multiint.cpp:671 +#: src/multiint.cpp:1081 +#: src/multiint.cpp:1487 msgid "Return To Previous Screen" msgstr "Zurück zum vorherigen Bildschirm" @@ -14035,37 +14035,37 @@ msgstr "Verfolgerkamera umschalten" msgid "Could not save game!" msgstr "Konnte Spiel nicht speichern!" -#: src/mission.cpp:2075 +#: src/mission.cpp:2041 msgid "Load Transport" msgstr "Transporter beladen" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "ZIEL ERREICHT durch Schummeln!" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED" msgstr "MISSION ERFOLGREICH" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED--and you cheated!" msgstr "ZIEL NICHT ERREICHT--und Sie haben geschummelt!" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED" msgstr "MISSION FEHLGESCHLAGEN" -#: src/mission.cpp:2493 -#: src/mission.cpp:2533 -#: src/mission.cpp:2647 +#: src/mission.cpp:2459 +#: src/mission.cpp:2499 +#: src/mission.cpp:2613 msgid "Quit To Main Menu" msgstr "Zurück zum Hauptmenü" -#: src/mission.cpp:2501 +#: src/mission.cpp:2467 msgid "Continue Game" msgstr "Spiel fortsetzen" -#: src/mission.cpp:2598 +#: src/mission.cpp:2564 msgid "GAME SAVED :" msgstr "SPIEL GESPEICHERT :" @@ -14124,350 +14124,355 @@ msgstr "%s geht ein Bündnis mit %s ein" msgid "You Discover Blueprints For %s" msgstr "Sie haben Entwürfe für %s entdeckt" -#: src/multiint.cpp:600 +#: src/multiint.cpp:609 #: src/multilimit.cpp:190 msgid "Accept Settings" msgstr "Einstellungen annehmen" -#: src/multiint.cpp:602 -#: src/multiint.cpp:1117 +#: src/multiint.cpp:611 +#: src/multiint.cpp:1126 msgid "Cancel" msgstr "Abbrechen" -#: src/multiint.cpp:613 +#: src/multiint.cpp:622 msgid "IP Address or Machine Name" msgstr "IP-Adresse oder Hostname" -#: src/multiint.cpp:659 +#: src/multiint.cpp:668 msgid "CONNECTION" msgstr "VERBINDUNG" -#: src/multiint.cpp:664 +#: src/multiint.cpp:673 msgid "Lobby" msgstr "Eingangshalle" -#: src/multiint.cpp:665 +#: src/multiint.cpp:674 msgid "IP" msgstr "IP" -#: src/multiint.cpp:854 +#: src/multiint.cpp:863 msgid "No games are available" msgstr "Es sind keine Spiele verfügbar" -#: src/multiint.cpp:857 +#: src/multiint.cpp:866 msgid "Game is full" msgstr "Spiel ist voll" -#: src/multiint.cpp:861 +#: src/multiint.cpp:870 msgid "You were kicked!" msgstr "Sie wurden rausgeschmissen!" -#: src/multiint.cpp:864 +#: src/multiint.cpp:873 msgid "Wrong Game Version!" msgstr "Falsche Spielversion!" -#: src/multiint.cpp:867 +#: src/multiint.cpp:876 msgid "You have an incompatible mod." msgstr "Sie haben einen inkompatiblen Mod." -#: src/multiint.cpp:871 +#: src/multiint.cpp:880 msgid "Host couldn't send file?" msgstr "Spielleiter konnte Datei nicht senden?" -#: src/multiint.cpp:875 +#: src/multiint.cpp:884 msgid "Incorrect Password!" msgstr "Falsches Passwort!" -#: src/multiint.cpp:878 +#: src/multiint.cpp:887 msgid "Host has dropped connection!" msgstr "Spielleiter hat die Verbindung gekappt!" -#: src/multiint.cpp:882 +#: src/multiint.cpp:891 msgid "Connection Error" msgstr "Verbindungsfehler" -#: src/multiint.cpp:1012 +#: src/multiint.cpp:1021 msgid "Searching" msgstr "Suche..." -#: src/multiint.cpp:1069 +#: src/multiint.cpp:1078 msgid "GAMES" msgstr "SPIELE" -#: src/multiint.cpp:1077 +#: src/multiint.cpp:1086 msgid "Refresh Games List" msgstr "Spieleliste aktualisieren" -#: src/multiint.cpp:1097 +#: src/multiint.cpp:1106 msgid "Enter Password:" msgstr "Passwort eingeben:" -#: src/multiint.cpp:1115 +#: src/multiint.cpp:1124 msgid "OK" msgstr "OK" -#: src/multiint.cpp:1232 +#: src/multiint.cpp:1241 msgid "Tanks disabled!!" msgstr "" -#: src/multiint.cpp:1233 +#: src/multiint.cpp:1242 #, fuzzy msgid "Cyborgs disabled." msgstr "Neuer Cyborg verfügbar" -#: src/multiint.cpp:1234 +#: src/multiint.cpp:1243 msgid "VTOLs disabled." msgstr "" -#: src/multiint.cpp:1281 -#: src/multiint.cpp:1288 +#: src/multiint.cpp:1290 +#: src/multiint.cpp:1297 msgid "Select Game Name" msgstr "Spielname auswählen" -#: src/multiint.cpp:1281 +#: src/multiint.cpp:1290 msgid "One-Player Skirmish" msgstr "Einzelspieler-Geplänkel" -#: src/multiint.cpp:1291 +#: src/multiint.cpp:1300 msgid "Select Map" msgstr "Karte auswählen" -#: src/multiint.cpp:1299 +#: src/multiint.cpp:1308 msgid "Click to set Password" msgstr "Klicken zum Setzen eines Passworts" -#: src/multiint.cpp:1309 -#: src/multiint.cpp:1310 +#: src/multiint.cpp:1318 +#: src/multiint.cpp:1319 msgid "Scavengers" msgstr "Scavenger" -#: src/multiint.cpp:1312 +#: src/multiint.cpp:1321 msgid "No Scavengers" msgstr "Keine Scavenger" -#: src/multiint.cpp:1342 +#: src/multiint.cpp:1351 msgid "Select Player Name" msgstr "Spielernamen auswählen" -#: src/multiint.cpp:1348 +#: src/multiint.cpp:1357 msgid "Distance Fog" msgstr "Entfernungsnebel" -#: src/multiint.cpp:1359 +#: src/multiint.cpp:1368 #: src/multimenu.cpp:756 msgid "Alliances" msgstr "Bündnisse" -#: src/multiint.cpp:1362 +#: src/multiint.cpp:1371 msgid "No Alliances" msgstr "Keine Bündnisse" -#: src/multiint.cpp:1364 +#: src/multiint.cpp:1373 msgid "Allow Alliances" msgstr "Bündnisse erlauben" # festgelegt ungleich fest -Kreuvf -#: src/multiint.cpp:1368 +#: src/multiint.cpp:1377 msgid "Locked Teams" msgstr "Feste Teams" -#: src/multiint.cpp:1394 +#: src/multiint.cpp:1403 msgid "Low Power Levels" msgstr "Niedriges Energieniveau" -#: src/multiint.cpp:1396 +#: src/multiint.cpp:1405 msgid "Medium Power Levels" msgstr "Mittleres Energieniveau" -#: src/multiint.cpp:1398 +#: src/multiint.cpp:1407 msgid "High Power Levels" msgstr "Hohes Energieniveau" -#: src/multiint.cpp:1430 +#: src/multiint.cpp:1439 msgid "Base" msgstr "Basis" -#: src/multiint.cpp:1432 +#: src/multiint.cpp:1441 msgid "Start with No Bases" msgstr "Ohne Basen starten" -#: src/multiint.cpp:1434 +#: src/multiint.cpp:1443 msgid "Start with Bases" msgstr "Mit Basen starten" -#: src/multiint.cpp:1436 +#: src/multiint.cpp:1445 msgid "Start with Advanced Bases" msgstr "Mit fortschrittlichen Basen starten" -#: src/multiint.cpp:1468 +#: src/multiint.cpp:1477 msgid "Map Preview" msgstr "Kartenvorschau" -#: src/multiint.cpp:1470 +#: src/multiint.cpp:1479 msgid "Click to see Map" msgstr "Klicken für Kartenansicht" -#: src/multiint.cpp:1484 +#: src/multiint.cpp:1493 msgid "Start Hosting Game" msgstr "Spiel eröffnen" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 msgid "Show Structure Limits" msgstr "Zeige Gebäudebeschränkungen" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 msgid "Set Structure Limits" msgstr "Gebäudebeschränkungen einstellen" -#: src/multiint.cpp:1587 +#: src/multiint.cpp:1596 msgid "DIFFICULTY" msgstr "" -#: src/multiint.cpp:1601 +#: src/multiint.cpp:1610 msgid "Less aggressive and starts with less units" msgstr "" -#: src/multiint.cpp:1602 +#: src/multiint.cpp:1611 #, fuzzy msgid "Plays nice" msgstr "Spieler" -#: src/multiint.cpp:1603 +#: src/multiint.cpp:1612 msgid "No holds barred" msgstr "" -#: src/multiint.cpp:1604 +#: src/multiint.cpp:1613 msgid "Starts with advantages and gets twice as much oil from derricks" msgstr "" -#: src/multiint.cpp:1632 +#: src/multiint.cpp:1641 msgid "CHOOSE AI" msgstr "" -#: src/multiint.cpp:1648 +#: src/multiint.cpp:1657 msgid "Allow human players to join in this slot" msgstr "" -#: src/multiint.cpp:1656 +#: src/multiint.cpp:1665 msgid "Leave this slot unused" msgstr "" -#: src/multiint.cpp:1736 +#: src/multiint.cpp:1745 msgid "Player colour" msgstr "Spielerfarbe" -#: src/multiint.cpp:2062 +#: src/multiint.cpp:2071 msgid "Team" msgstr "Gruppe" -#: src/multiint.cpp:2074 +#: src/multiint.cpp:2083 msgid "Kick player" msgstr "Spieler rauswerfen" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 #, fuzzy msgid "Click to change difficulty" msgstr "Klicken zum Setzen eines Passworts" -#: src/multiint.cpp:2121 +#: src/multiint.cpp:2130 msgid "Click when ready" msgstr "Klicken, wenn bereit" -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2134 msgid "READY?" msgstr "BEREIT?" -#: src/multiint.cpp:2169 +#: src/multiint.cpp:2178 msgid "PLAYERS" msgstr "SPIELER" -#: src/multiint.cpp:2204 +#: src/multiint.cpp:2213 #, fuzzy msgid "Click to change to this slot" msgstr "Klicken zum Setzen eines Passworts" # festgelegt ungleich fest -Kreuvf -#: src/multiint.cpp:2232 +#: src/multiint.cpp:2241 #, fuzzy msgid "Choose Team" msgstr "Feste Teams" -#: src/multiint.cpp:2262 +#: src/multiint.cpp:2271 #, fuzzy msgid "Click to change player colour" msgstr "Radar zeigt Spielerfarben" -#: src/multiint.cpp:2290 +#: src/multiint.cpp:2299 #, fuzzy msgid "Click to change player position" msgstr "Position bewachen" -#: src/multiint.cpp:2296 +#: src/multiint.cpp:2305 #, fuzzy msgid "Click to change AI" msgstr "Klicken zum Setzen eines Passworts" -#: src/multiint.cpp:2300 +#: src/multiint.cpp:2309 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2362 +#: src/multiint.cpp:2371 msgid "CHAT" msgstr "CHAT" -#: src/multiint.cpp:2394 +#: src/multiint.cpp:2403 msgid "All players need to have the same mods to join your game." msgstr "Alle Spieler benötigen dieselben Mods, um Ihrem Spiel beitreten zu können." -#: src/multiint.cpp:2552 +#: src/multiint.cpp:2561 #, fuzzy, c-format msgid "*** password [%s] is now required! ***" msgstr "*** Jetzt wird ein Passwort benötigt! ***" -#: src/multiint.cpp:2560 +#: src/multiint.cpp:2569 msgid "*** password is NOT required! ***" msgstr "*** Passwort wird nicht benötigt! ***" -#: src/multiint.cpp:2801 +#: src/multiint.cpp:2810 msgid "Sorry! Failed to host the game." msgstr "Tut mir leid! Spieleröffnung fehlgeschlagen." # festgelegt ungleich fest -Kreuvf -#: src/multiint.cpp:2922 +#: src/multiint.cpp:2931 msgid "'Locked Teams' mode enabled" msgstr "\"Feste Teams\"-Modus aktiviert" -#: src/multiint.cpp:3003 +#: src/multiint.cpp:3012 #, c-format msgid "The host has kicked %s from the game!" msgstr "Der Spielleiter hat %s aus dem Spiel geworfen!" -#: src/multiint.cpp:3073 +#: src/multiint.cpp:3082 msgid "Host is Starting Game" msgstr "Der Spielleiter startet das Spiel" -#: src/multiint.cpp:3639 +#: src/multiint.cpp:3648 msgid "Players" msgstr "Spieler" -#: src/multiint.cpp:3772 +#: src/multiint.cpp:3786 #, c-format msgid "Sending Map: %d%% " msgstr "Sende Karte: %d%%" -#: src/multiint.cpp:3780 +#: src/multiint.cpp:3794 #, c-format msgid "Map: %d%% downloaded" msgstr "Karte: %d%% heruntergeladen" -#: src/multiint.cpp:3803 +#: src/multiint.cpp:3820 msgid "HOST" msgstr "SPIELLEITER" +#: src/multiint.cpp:3827 +#: src/multimenu.cpp:772 +msgid "Ping" +msgstr "Ping" + #: src/multijoin.cpp:100 #: src/multijoin.cpp:101 msgid "Players Still Joining" @@ -14483,17 +14488,17 @@ msgstr "%s hat das Spiel verlassen" msgid "File transfer has been aborted for %d." msgstr "Dateiübertragung für %d abgebrochen." -#: src/multijoin.cpp:376 +#: src/multijoin.cpp:373 #, c-format msgid "%s (%u) has an incompatible mod, and has been kicked." msgstr "%s (%u) hat einen inkompatiblen Mod und wurde rausgeschmissen." -#: src/multijoin.cpp:415 +#: src/multijoin.cpp:412 #, c-format msgid "%s is Joining the Game" msgstr "%s ist dem Spiel beigetreten" -#: src/multijoin.cpp:425 +#: src/multijoin.cpp:422 msgid "System message:" msgstr "Systemnachricht:" @@ -14606,10 +14611,6 @@ msgstr "Abschüsse" msgid "Units" msgstr "Einheiten" -#: src/multimenu.cpp:772 -msgid "Ping" -msgstr "Ping" - #: src/multimenu.cpp:776 msgid "Structs" msgstr "Gebäude" @@ -14643,83 +14644,83 @@ msgstr "Energie übertragen" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "Werfe Spieler %s hinaus wegen des Versuchs die Datenintegritätsprüfung zu umgehen!" -#: src/multiplay.cpp:1146 +#: src/multiplay.cpp:1057 msgid "(allies" msgstr "(Verbündete" -#: src/multiplay.cpp:1154 +#: src/multiplay.cpp:1065 msgid "(private to " msgstr "(direkt an " -#: src/multiplay.cpp:1167 +#: src/multiplay.cpp:1078 msgid "[invalid]" msgstr "[ungültig]" -#: src/multiplay.cpp:2057 +#: src/multiplay.cpp:1942 msgid "Green" msgstr "Grün" -#: src/multiplay.cpp:2058 +#: src/multiplay.cpp:1943 msgid "Orange" msgstr "Orange" -#: src/multiplay.cpp:2059 +#: src/multiplay.cpp:1944 msgid "Grey" msgstr "Grau" -#: src/multiplay.cpp:2060 +#: src/multiplay.cpp:1945 msgid "Black" msgstr "Schwarz" -#: src/multiplay.cpp:2061 +#: src/multiplay.cpp:1946 msgid "Red" msgstr "Rot" -#: src/multiplay.cpp:2062 +#: src/multiplay.cpp:1947 msgid "Blue" msgstr "Blau" -#: src/multiplay.cpp:2063 +#: src/multiplay.cpp:1948 msgid "Pink" msgstr "Pink" -#: src/multiplay.cpp:2064 +#: src/multiplay.cpp:1949 msgid "Cyan" msgstr "Cyan" -#: src/multiplay.cpp:2065 +#: src/multiplay.cpp:1950 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:2066 +#: src/multiplay.cpp:1951 msgid "Purple" msgstr "" -#: src/multiplay.cpp:2067 +#: src/multiplay.cpp:1952 msgid "White" msgstr "" -#: src/multiplay.cpp:2068 +#: src/multiplay.cpp:1953 msgid "Bright blue" msgstr "" -#: src/multiplay.cpp:2069 +#: src/multiplay.cpp:1954 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:2070 +#: src/multiplay.cpp:1955 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:2071 +#: src/multiplay.cpp:1956 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:2072 +#: src/multiplay.cpp:1957 msgid "Brown" msgstr "" -#: src/order.cpp:841 +#: src/order.cpp:800 msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "" @@ -14854,20 +14855,20 @@ msgstr "Gesamte Spielzeit - %s" msgid "You cheated!" msgstr "Sie haben geschummelt!" -#: src/scriptfuncs.cpp:3250 +#: src/scriptfuncs.cpp:3287 msgid "YOU ARE VICTORIOUS!" msgstr "SIE HABEN GEWONNEN!" -#: src/scriptfuncs.cpp:3254 +#: src/scriptfuncs.cpp:3291 msgid "YOU WERE DEFEATED!" msgstr "SIE WURDEN BESIEGT!" -#: src/scriptfuncs.cpp:9500 +#: src/scriptfuncs.cpp:9537 #, c-format msgid "Beacon received from %s!" msgstr "Signal von %s erhalten!" -#: src/scriptfuncs.cpp:9546 +#: src/scriptfuncs.cpp:9583 #, c-format msgid "Beacon %d" msgstr "Signal %d" @@ -14896,64 +14897,64 @@ msgstr "Kann keine Sensoreinheit finden!" msgid "Unable to locate any Commanders!" msgstr "Kann keine Commander finden!" -#: src/structure.cpp:2615 +#: src/structure.cpp:2614 msgid "Command Control Limit Reached - Production Halted" msgstr "Commandereinheit hat Kontrollgrenze erreicht - Produktion angehalten" # nix Gruppe! -Kreuvf -#: src/structure.cpp:5815 -#: src/structure.cpp:5840 +#: src/structure.cpp:5806 +#: src/structure.cpp:5831 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" msgstr[0] "%s - %u Einheit hinzugefügt" msgstr[1] "%s - %u Einheiten hinzugefügt" -#: src/structure.cpp:5845 -#: src/structure.cpp:5913 -#: src/structure.cpp:5929 -#: src/structure.cpp:5943 +#: src/structure.cpp:5836 +#: src/structure.cpp:5904 +#: src/structure.cpp:5920 +#: src/structure.cpp:5934 #, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - Schaden %3.0f%%" -#: src/structure.cpp:5895 +#: src/structure.cpp:5886 #, c-format msgid "%s - Connected %u of %u" msgstr "%s - %u von %u verbunden" -#: src/structure.cpp:6059 -#: src/structure.cpp:6104 +#: src/structure.cpp:6050 +#: src/structure.cpp:6095 #, c-format msgid "%s - Electronically Damaged" msgstr "%s - Elektronisch beschädigt" # Reward ist zwar nicht Beute, aber im Krieg erbeutet man eben Dinge -Kreuvf -#: src/structure.cpp:6341 +#: src/structure.cpp:6332 msgid "Electronic Reward - Visibility Report" msgstr "Elektronische Beute - Sichtbarkeitsbericht" -#: src/structure.cpp:6381 +#: src/structure.cpp:6372 msgid "Factory Reward - Propulsion" msgstr "Fabrikbeute - Antrieb" -#: src/structure.cpp:6405 +#: src/structure.cpp:6396 msgid "Factory Reward - Body" msgstr "Fabrikbeute - Rumpf" -#: src/structure.cpp:6429 +#: src/structure.cpp:6420 msgid "Factory Reward - Weapon" msgstr "Fabrikbeute - Waffe" -#: src/structure.cpp:6438 +#: src/structure.cpp:6429 msgid "Factory Reward - Nothing" msgstr "Fabrikbeute - Nichts" -#: src/structure.cpp:6466 +#: src/structure.cpp:6457 msgid "Repair Facility Award - Repair" msgstr "Beute aus Reparatureinrichtung - Reparatur" -#: src/structure.cpp:6473 +#: src/structure.cpp:6464 msgid "Repair Facility Award - Nothing" msgstr "Beute aus Reparatureinrichtung - Nichts" diff --git a/po/en_GB.po b/po/en_GB.po index f6ed00c04..ee9051961 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-01-18 00:54+0100\n" +"POT-Creation-Date: 2011-02-25 23:35+0100\n" "PO-Revision-Date: 2008-05-05 12:29+0000\n" "Last-Translator: Jen Ockwell \n" "Language-Team: English (United Kingdom) \n" @@ -5733,7 +5733,7 @@ msgid "New Design" msgstr "New Design" #: data/base/messages/strings/names.txt:15 -#: src/design.cpp:1313 +#: src/design.cpp:1275 msgid "Transport" msgstr "Transport" @@ -12332,26 +12332,26 @@ msgid "System locale" msgstr "System locale" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1043 +#: lib/netplay/netplay.cpp:1042 msgid "Enter password here" msgstr "" -#: lib/netplay/netplay.cpp:2048 +#: lib/netplay/netplay.cpp:2060 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "" -#: lib/netplay/netplay.cpp:2062 +#: lib/netplay/netplay.cpp:2082 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "" #: src/challenge.cpp:184 -#: src/hci.cpp:922 -#: src/hci.cpp:3390 -#: src/hci.cpp:3513 -#: src/hci.cpp:3924 -#: src/hci.cpp:4942 +#: src/hci.cpp:916 +#: src/hci.cpp:3378 +#: src/hci.cpp:3501 +#: src/hci.cpp:3912 +#: src/hci.cpp:4930 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12504,149 +12504,149 @@ msgstr "" #: src/configuration.cpp:393 #: src/configuration.cpp:394 -#: src/multistat.cpp:130 +#: src/multistat.cpp:124 msgid "Player" msgstr "Player" -#: src/design.cpp:449 -#: src/design.cpp:469 -#: src/design.cpp:3501 +#: src/design.cpp:443 +#: src/design.cpp:455 +#: src/design.cpp:3464 msgid "New Vehicle" msgstr "New Vehicle" -#: src/design.cpp:515 +#: src/design.cpp:500 msgid "Vehicle Body" msgstr "Vehicle Body" -#: src/design.cpp:535 +#: src/design.cpp:520 msgid "Vehicle Propulsion" msgstr "Vehicle Propulsion" -#: src/design.cpp:556 -#: src/design.cpp:579 -#: src/design.cpp:603 +#: src/design.cpp:541 +#: src/design.cpp:564 +#: src/design.cpp:588 msgid "Vehicle Turret" msgstr "Vehicle Turret" -#: src/design.cpp:622 +#: src/design.cpp:607 msgid "Delete Design" msgstr "Delete Design" -#: src/design.cpp:673 -#: src/design.cpp:720 +#: src/design.cpp:658 +#: src/design.cpp:705 msgid "Kinetic Armour" msgstr "Kinetic Armour" -#: src/design.cpp:682 -#: src/design.cpp:730 +#: src/design.cpp:667 +#: src/design.cpp:715 msgid "Thermal Armour" msgstr "Thermal Armour" -#: src/design.cpp:698 -#: src/design.cpp:750 +#: src/design.cpp:683 +#: src/design.cpp:735 msgid "Engine Output" msgstr "Engine Output" -#: src/design.cpp:706 -#: src/design.cpp:759 -#: src/design.cpp:1529 -#: src/design.cpp:1553 -#: src/design.cpp:1574 -#: src/design.cpp:1590 -#: src/design.cpp:1610 -#: src/design.cpp:1627 -#: src/design.cpp:1647 -#: src/design.cpp:1664 -#: src/design.cpp:1705 -#: src/design.cpp:1737 -#: src/design.cpp:1869 -#: src/design.cpp:1885 -#: src/design.cpp:1923 -#: src/design.cpp:1956 +#: src/design.cpp:691 +#: src/design.cpp:744 +#: src/design.cpp:1486 +#: src/design.cpp:1510 +#: src/design.cpp:1531 +#: src/design.cpp:1547 +#: src/design.cpp:1567 +#: src/design.cpp:1584 +#: src/design.cpp:1604 +#: src/design.cpp:1621 +#: src/design.cpp:1662 +#: src/design.cpp:1694 +#: src/design.cpp:1826 +#: src/design.cpp:1842 +#: src/design.cpp:1880 +#: src/design.cpp:1913 msgid "Weight" msgstr "Weight" -#: src/design.cpp:790 -#: src/design.cpp:808 +#: src/design.cpp:775 +#: src/design.cpp:793 msgid "Total Power Required" msgstr "Total Power Required" -#: src/design.cpp:821 -#: src/design.cpp:840 +#: src/design.cpp:806 +#: src/design.cpp:825 msgid "Total Body Points" msgstr "Total Body Points" -#: src/design.cpp:1027 -#: src/design.cpp:1059 +#: src/design.cpp:996 +#: src/design.cpp:1025 msgid "Power Usage" msgstr "Power Usage" -#: src/design.cpp:1335 +#: src/design.cpp:1298 msgid "Hydra " msgstr "" -#: src/design.cpp:1509 -#: src/design.cpp:1537 +#: src/design.cpp:1466 +#: src/design.cpp:1494 msgid "Sensor Range" msgstr "Sensor Range" -#: src/design.cpp:1521 -#: src/design.cpp:1545 +#: src/design.cpp:1478 +#: src/design.cpp:1502 msgid "Sensor Power" msgstr "Sensor Power" -#: src/design.cpp:1566 -#: src/design.cpp:1582 +#: src/design.cpp:1523 +#: src/design.cpp:1539 msgid "ECM Power" msgstr "ECM Power" -#: src/design.cpp:1602 -#: src/design.cpp:1619 -#: src/design.cpp:1639 -#: src/design.cpp:1656 +#: src/design.cpp:1559 +#: src/design.cpp:1576 +#: src/design.cpp:1596 +#: src/design.cpp:1613 msgid "Build Points" msgstr "Build Points" -#: src/design.cpp:1677 -#: src/design.cpp:1713 +#: src/design.cpp:1634 +#: src/design.cpp:1670 msgid "Range" msgstr "Range" -#: src/design.cpp:1689 -#: src/design.cpp:1721 +#: src/design.cpp:1646 +#: src/design.cpp:1678 msgid "Damage" msgstr "Damage" -#: src/design.cpp:1697 -#: src/design.cpp:1729 +#: src/design.cpp:1654 +#: src/design.cpp:1686 msgid "Rate-of-Fire" msgstr "Rate-of-Fire" -#: src/design.cpp:1857 -#: src/design.cpp:1877 +#: src/design.cpp:1814 +#: src/design.cpp:1834 msgid "Air Speed" msgstr "Air Speed" -#: src/design.cpp:1895 -#: src/design.cpp:1932 +#: src/design.cpp:1852 +#: src/design.cpp:1889 msgid "Road Speed" msgstr "Road Speed" -#: src/design.cpp:1905 -#: src/design.cpp:1940 +#: src/design.cpp:1862 +#: src/design.cpp:1897 msgid "Off-Road Speed" msgstr "Off-Road Speed" -#: src/design.cpp:1913 -#: src/design.cpp:1948 +#: src/design.cpp:1870 +#: src/design.cpp:1905 msgid "Water Speed" msgstr "Water Speed" -#: src/design.cpp:2074 +#: src/design.cpp:2031 msgid "Weapons" msgstr "Weapons" -#: src/design.cpp:2094 +#: src/design.cpp:2051 msgid "Systems" msgstr "Systems" @@ -12661,7 +12661,7 @@ msgid "Player dropped" msgstr "Player" #: src/display3d.cpp:599 -#: src/multiint.cpp:2116 +#: src/multiint.cpp:2125 msgid "Waiting for other players" msgstr "" @@ -12669,114 +12669,114 @@ msgstr "" msgid "Out of sync" msgstr "" -#: src/display.cpp:1651 +#: src/display.cpp:1649 msgid "Cannot Build. Oil Resource Burning." msgstr "Cannot Build. Oil Resource Burning." -#: src/display.cpp:1830 -#: src/display.cpp:2423 +#: src/display.cpp:1828 +#: src/display.cpp:2421 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - Damage %d%% - Experience %d, %s" -#: src/display.cpp:1846 +#: src/display.cpp:1844 #, fuzzy, c-format msgid "%s - Allied - Damage %d%% - Experience %d, %s" msgstr "%s - Damage %d%% - Experience %d, %s" -#: src/display.cpp:2044 +#: src/display.cpp:2042 msgid "Truck ordered to build Oil Derrick" msgstr "Truck ordered to build Oil Derrick" -#: src/display.cpp:2045 +#: src/display.cpp:2043 #, fuzzy msgid "2 trucks ordered to build Oil Derrick" msgstr "Truck ordered to build Oil Derrick" -#: src/display.cpp:2046 +#: src/display.cpp:2044 #, fuzzy, c-format msgid "%d trucks ordered to build Oil Derrick" msgstr "Truck ordered to build Oil Derrick" -#: src/droid.cpp:208 +#: src/droid.cpp:211 msgid "Unit Lost!" msgstr "Unit Lost!" -#: src/droid.cpp:1370 +#: src/droid.cpp:1376 msgid "Structure Restored" msgstr "Structure Restored" -#: src/droid.cpp:2712 +#: src/droid.cpp:2732 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" msgstr[0] "Group %u selected - %u Unit" msgstr[1] "Group %u selected - %u Units" -#: src/droid.cpp:2725 +#: src/droid.cpp:2745 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" msgstr[0] "%u unit assigned to Group %u" msgstr[1] "%u units assigned to Group %u" -#: src/droid.cpp:2738 +#: src/droid.cpp:2758 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" msgstr[0] "Centred on Group %u - %u Unit" msgstr[1] "Centred on Group %u - %u Units" -#: src/droid.cpp:2742 +#: src/droid.cpp:2762 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" msgstr[0] "Aligning with Group %u - %u Unit" msgstr[1] "Aligning with Group %u - %u Units" -#: src/droid.cpp:3080 +#: src/droid.cpp:3093 msgid "Rookie" msgstr "Rookie" -#: src/droid.cpp:3081 +#: src/droid.cpp:3094 msgctxt "rank" msgid "Green" msgstr "Green" -#: src/droid.cpp:3082 +#: src/droid.cpp:3095 msgid "Trained" msgstr "Trained" -#: src/droid.cpp:3083 +#: src/droid.cpp:3096 msgid "Regular" msgstr "Regular" -#: src/droid.cpp:3084 +#: src/droid.cpp:3097 msgid "Professional" msgstr "Professional" -#: src/droid.cpp:3085 +#: src/droid.cpp:3098 msgid "Veteran" msgstr "Veteran" -#: src/droid.cpp:3086 +#: src/droid.cpp:3099 msgid "Elite" msgstr "Elite" -#: src/droid.cpp:3087 +#: src/droid.cpp:3100 msgid "Special" msgstr "Special" -#: src/droid.cpp:3088 +#: src/droid.cpp:3101 msgid "Hero" msgstr "Hero" -#: src/droid.cpp:4110 +#: src/droid.cpp:4123 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "" -#: src/droid.cpp:4114 +#: src/droid.cpp:4127 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "" @@ -12797,7 +12797,7 @@ msgid "Tutorial" msgstr "Tutorial" #: src/frontend.cpp:100 -#: src/hci.cpp:3499 +#: src/hci.cpp:3487 msgid "Options" msgstr "Options" @@ -12851,7 +12851,7 @@ msgid "Challenges" msgstr "Scavenger" #: src/frontend.cpp:215 -#: src/ingameop.cpp:275 +#: src/ingameop.cpp:272 msgid "Load Game" msgstr "Load Game" @@ -12860,9 +12860,9 @@ msgid "SINGLE PLAYER" msgstr "SINGLE PLAYER" #: src/frontend.cpp:303 -#: src/ingameop.cpp:498 -#: src/mission.cpp:2527 -#: src/mission.cpp:2630 +#: src/ingameop.cpp:494 +#: src/mission.cpp:2493 +#: src/mission.cpp:2596 msgid "Load Saved Game" msgstr "Load Saved Game" @@ -12879,7 +12879,7 @@ msgid "Join Game" msgstr "Join Game" #: src/frontend.cpp:422 -#: src/multiint.cpp:1276 +#: src/multiint.cpp:1285 msgid "OPTIONS" msgstr "OPTIONS" @@ -12897,7 +12897,7 @@ msgid "Video Options" msgstr "Audio Options" #: src/frontend.cpp:426 -#: src/ingameop.cpp:270 +#: src/ingameop.cpp:267 msgid "Audio Options" msgstr "Audio Options" @@ -12976,7 +12976,7 @@ msgid "Off" msgstr "Off" #: src/frontend.cpp:523 -#: src/multiint.cpp:1345 +#: src/multiint.cpp:1354 msgid "Fog" msgstr "Fog" @@ -12987,7 +12987,7 @@ msgstr "Mist" #: src/frontend.cpp:530 #: src/frontend.cpp:595 -#: src/multiint.cpp:1347 +#: src/multiint.cpp:1356 msgid "Fog Of War" msgstr "Fog Of War" @@ -13155,204 +13155,204 @@ msgid "GAME OPTIONS" msgstr "GAME OPTIONS" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2389 +#: src/multiint.cpp:2398 msgid "Mod: " msgstr "" -#: src/hci.cpp:1245 +#: src/hci.cpp:1237 #, fuzzy msgid "MAP SAVED!" msgstr "GAME SAVED!" -#: src/hci.cpp:1584 +#: src/hci.cpp:1573 #: src/loop.cpp:558 #: src/loop.cpp:574 #, fuzzy msgid "GAME SAVED: " msgstr "GAME SAVED!" -#: src/hci.cpp:1971 +#: src/hci.cpp:1960 msgid "Failed to create building" msgstr "" -#: src/hci.cpp:1988 +#: src/hci.cpp:1977 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new structure: %s." msgstr "Player %u is cheating (debug menu) him/herself a new structure: %s." -#: src/hci.cpp:2003 +#: src/hci.cpp:1992 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new feature: %s." msgstr "Player %u is cheating (debug menu) him/herself a new feature: %s." -#: src/hci.cpp:2025 +#: src/hci.cpp:2014 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid: %s." msgstr "Player %u is cheating (debug menu) him/herself a new droid: %s." -#: src/hci.cpp:2036 +#: src/hci.cpp:2025 #, fuzzy, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "Player %u is cheating (debug menu) him/herself a new droid: %s." -#: src/hci.cpp:3310 +#: src/hci.cpp:3298 msgid "Commanders (F6)" msgstr "Commanders (F6)" -#: src/hci.cpp:3323 +#: src/hci.cpp:3311 msgid "Intelligence Display (F5)" msgstr "Intelligence Display (F5)" -#: src/hci.cpp:3336 +#: src/hci.cpp:3324 msgid "Manufacture (F1)" msgstr "Manufacture (F1)" -#: src/hci.cpp:3349 +#: src/hci.cpp:3337 msgid "Design (F4)" msgstr "Design (F4)" -#: src/hci.cpp:3362 +#: src/hci.cpp:3350 msgid "Research (F2)" msgstr "Research (F2)" -#: src/hci.cpp:3375 +#: src/hci.cpp:3363 msgid "Build (F3)" msgstr "Build (F3)" -#: src/hci.cpp:3446 -#: src/multiint.cpp:1392 +#: src/hci.cpp:3434 +#: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Power" -#: src/hci.cpp:3537 +#: src/hci.cpp:3525 msgid "Map:" msgstr "" -#: src/hci.cpp:3550 +#: src/hci.cpp:3538 #, fuzzy msgid "Load" msgstr "Load Game" -#: src/hci.cpp:3551 +#: src/hci.cpp:3539 #, fuzzy msgid "Load Map File" msgstr "Load Game" -#: src/hci.cpp:3558 +#: src/hci.cpp:3546 #, fuzzy msgid "Save" msgstr "Save Game" -#: src/hci.cpp:3559 +#: src/hci.cpp:3547 #, fuzzy msgid "Save Map File" msgstr "Save Game" -#: src/hci.cpp:3567 +#: src/hci.cpp:3555 msgid "New" msgstr "" -#: src/hci.cpp:3568 +#: src/hci.cpp:3556 msgid "New Blank Map" msgstr "" -#: src/hci.cpp:3604 +#: src/hci.cpp:3592 #, fuzzy msgid "Tile" msgstr "file" -#: src/hci.cpp:3605 +#: src/hci.cpp:3593 msgid "Place tiles on map" msgstr "" -#: src/hci.cpp:3614 +#: src/hci.cpp:3602 msgid "Unit" msgstr "Unit" -#: src/hci.cpp:3615 +#: src/hci.cpp:3603 msgid "Place Unit on map" msgstr "" -#: src/hci.cpp:3623 +#: src/hci.cpp:3611 msgid "Struct" msgstr "Struct" -#: src/hci.cpp:3624 +#: src/hci.cpp:3612 #, fuzzy msgid "Place Structures on map" msgstr "Set Structure Limits" -#: src/hci.cpp:3632 +#: src/hci.cpp:3620 msgid "Feat" msgstr "Feat" -#: src/hci.cpp:3633 +#: src/hci.cpp:3621 msgid "Place Features on map" msgstr "" -#: src/hci.cpp:3643 +#: src/hci.cpp:3631 msgid "Pause" msgstr "" -#: src/hci.cpp:3644 +#: src/hci.cpp:3632 #, fuzzy msgid "Pause or unpause the game" msgstr "The host has left the game!" -#: src/hci.cpp:3658 +#: src/hci.cpp:3646 msgid "Align height of all map objects" msgstr "" -#: src/hci.cpp:3668 +#: src/hci.cpp:3656 msgid "Edit" msgstr "" -#: src/hci.cpp:3669 +#: src/hci.cpp:3657 #, fuzzy msgid "Start Edit Mode" msgstr "Start with No Bases" -#: src/hci.cpp:3683 +#: src/hci.cpp:3671 #: src/ingameop.cpp:112 -#: src/ingameop.cpp:258 -#: src/ingameop.cpp:263 +#: src/ingameop.cpp:256 +#: src/ingameop.cpp:260 msgid "Quit" msgstr "Quit" -#: src/hci.cpp:3684 +#: src/hci.cpp:3672 msgid "Exit Game" msgstr "Exit Game" -#: src/hci.cpp:3710 +#: src/hci.cpp:3698 #, fuzzy msgid "Current Player:" msgstr "Multi Player Game" -#: src/hci.cpp:4001 +#: src/hci.cpp:3989 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "Progress Bar" -#: src/hci.cpp:4867 +#: src/hci.cpp:4855 msgid "Factory Delivery Point" msgstr "Factory Delivery Point" -#: src/hci.cpp:4885 +#: src/hci.cpp:4873 msgid "Loop Production" msgstr "Loop Production" -#: src/hci.cpp:4965 +#: src/hci.cpp:4953 msgid "Tab Scroll left" msgstr "Tab Scroll left" -#: src/hci.cpp:4980 +#: src/hci.cpp:4968 msgid "Tab Scroll right" msgstr "Tab Scroll right" #: src/ingameop.cpp:111 -#: src/ingameop.cpp:193 -#: src/ingameop.cpp:267 +#: src/ingameop.cpp:195 +#: src/ingameop.cpp:264 msgid "Resume Game" msgstr "Resume Game" @@ -13360,33 +13360,33 @@ msgstr "Resume Game" msgid "WARNING: You're the host. If you quit, the game ends for everyone!" msgstr "" -#: src/ingameop.cpp:185 -#: src/ingameop.cpp:527 +#: src/ingameop.cpp:186 +#: src/ingameop.cpp:523 msgid "Tactical UI (Target Origin Icon): Show" msgstr "" -#: src/ingameop.cpp:190 -#: src/ingameop.cpp:531 +#: src/ingameop.cpp:191 +#: src/ingameop.cpp:527 msgid "Tactical UI (Target Origin Icon): Hide" msgstr "" -#: src/ingameop.cpp:277 -#: src/ingameop.cpp:502 -#: src/mission.cpp:2514 -#: src/mission.cpp:2633 +#: src/ingameop.cpp:274 +#: src/ingameop.cpp:498 +#: src/mission.cpp:2480 +#: src/mission.cpp:2599 msgid "Save Game" msgstr "Save Game" -#: src/ingameop.cpp:343 +#: src/ingameop.cpp:339 #, fuzzy msgid "Host has quit the game!" msgstr "The host has left the game!" -#: src/ingameop.cpp:349 +#: src/ingameop.cpp:345 msgid "The game can't continue without the host." msgstr "" -#: src/ingameop.cpp:355 +#: src/ingameop.cpp:351 msgid "--> QUIT <--" msgstr "" @@ -13770,54 +13770,54 @@ msgstr "" msgid "Screen shake when things die: On" msgstr "" -#: src/keybind.cpp:2603 -#: src/keybind.cpp:2646 +#: src/keybind.cpp:2604 +#: src/keybind.cpp:2647 #, fuzzy msgid "Sorry, but game speed cannot be changed in multiplayer." msgstr "Sorry, that cheat is disabled in multiplayer games." -#: src/keybind.cpp:2624 -#: src/keybind.cpp:2667 -#: src/keybind.cpp:2689 +#: src/keybind.cpp:2625 +#: src/keybind.cpp:2668 +#: src/keybind.cpp:2690 msgid "Game Speed Reset" msgstr "Game Speed Reset" -#: src/keybind.cpp:2628 +#: src/keybind.cpp:2629 #, c-format msgid "Game Speed Increased to %3.1f" msgstr "Game Speed Increased to %3.1f" -#: src/keybind.cpp:2671 +#: src/keybind.cpp:2672 #, c-format msgid "Game Speed Reduced to %3.1f" msgstr "Game Speed Reduced to %3.1f" -#: src/keybind.cpp:2701 +#: src/keybind.cpp:2702 msgid "Radar showing friend-foe colors" msgstr "Radar showing friend-foe colours" -#: src/keybind.cpp:2705 +#: src/keybind.cpp:2706 msgid "Radar showing player colors" msgstr "Radar showing player colours" -#: src/keybind.cpp:2726 +#: src/keybind.cpp:2727 msgid "Radar showing only objects" msgstr "Radar showing only objects" -#: src/keybind.cpp:2729 +#: src/keybind.cpp:2730 msgid "Radar blending terrain and height" msgstr "Radar blending terrain and height" -#: src/keybind.cpp:2732 +#: src/keybind.cpp:2733 msgid "Radar showing terrain" msgstr "Radar showing terrain" -#: src/keybind.cpp:2735 +#: src/keybind.cpp:2736 #, fuzzy msgid "Radar showing revealed terrain" msgstr "Radar showing terrain" -#: src/keybind.cpp:2738 +#: src/keybind.cpp:2739 msgid "Radar showing height" msgstr "Radar showing height" @@ -13826,9 +13826,9 @@ msgid "KEY MAPPING" msgstr "KEY MAPPING" #: src/keyedit.cpp:372 -#: src/multiint.cpp:662 -#: src/multiint.cpp:1072 -#: src/multiint.cpp:1478 +#: src/multiint.cpp:671 +#: src/multiint.cpp:1081 +#: src/multiint.cpp:1487 msgid "Return To Previous Screen" msgstr "Return To Previous Screen" @@ -14337,39 +14337,39 @@ msgstr "Toggle Tracking Camera" msgid "Could not save game!" msgstr "Load a saved game" -#: src/mission.cpp:2075 +#: src/mission.cpp:2041 msgid "Load Transport" msgstr "Load Transport" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 #, fuzzy msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "OBJECTIVE ACHIEVED" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED" msgstr "OBJECTIVE ACHIEVED" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 #, fuzzy msgid "OBJECTIVE FAILED--and you cheated!" msgstr "OBJECTIVE FAILED" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED" msgstr "OBJECTIVE FAILED" -#: src/mission.cpp:2493 -#: src/mission.cpp:2533 -#: src/mission.cpp:2647 +#: src/mission.cpp:2459 +#: src/mission.cpp:2499 +#: src/mission.cpp:2613 msgid "Quit To Main Menu" msgstr "Quit To Main Menu" -#: src/mission.cpp:2501 +#: src/mission.cpp:2467 msgid "Continue Game" msgstr "Continue Game" -#: src/mission.cpp:2598 +#: src/mission.cpp:2564 #, fuzzy msgid "GAME SAVED :" msgstr "GAME SAVED!" @@ -14429,355 +14429,360 @@ msgstr "%s Forms An Alliance With %s" msgid "You Discover Blueprints For %s" msgstr "You Discover Blueprints For %s" -#: src/multiint.cpp:600 +#: src/multiint.cpp:609 #: src/multilimit.cpp:190 msgid "Accept Settings" msgstr "Accept Settings" -#: src/multiint.cpp:602 -#: src/multiint.cpp:1117 +#: src/multiint.cpp:611 +#: src/multiint.cpp:1126 #, fuzzy msgid "Cancel" msgstr "Lancer" -#: src/multiint.cpp:613 +#: src/multiint.cpp:622 msgid "IP Address or Machine Name" msgstr "IP Address or Machine Name" -#: src/multiint.cpp:659 +#: src/multiint.cpp:668 msgid "CONNECTION" msgstr "CONNECTION" -#: src/multiint.cpp:664 +#: src/multiint.cpp:673 msgid "Lobby" msgstr "Lobby" -#: src/multiint.cpp:665 +#: src/multiint.cpp:674 msgid "IP" msgstr "IP" -#: src/multiint.cpp:854 +#: src/multiint.cpp:863 #, fuzzy msgid "No games are available" msgstr "New technologies are available." -#: src/multiint.cpp:857 +#: src/multiint.cpp:866 msgid "Game is full" msgstr "" -#: src/multiint.cpp:861 +#: src/multiint.cpp:870 msgid "You were kicked!" msgstr "" -#: src/multiint.cpp:864 +#: src/multiint.cpp:873 msgid "Wrong Game Version!" msgstr "" -#: src/multiint.cpp:867 +#: src/multiint.cpp:876 msgid "You have an incompatible mod." msgstr "" -#: src/multiint.cpp:871 +#: src/multiint.cpp:880 msgid "Host couldn't send file?" msgstr "" -#: src/multiint.cpp:875 +#: src/multiint.cpp:884 msgid "Incorrect Password!" msgstr "" -#: src/multiint.cpp:878 +#: src/multiint.cpp:887 msgid "Host has dropped connection!" msgstr "" -#: src/multiint.cpp:882 +#: src/multiint.cpp:891 msgid "Connection Error" msgstr "" -#: src/multiint.cpp:1012 +#: src/multiint.cpp:1021 msgid "Searching" msgstr "Searching" -#: src/multiint.cpp:1069 +#: src/multiint.cpp:1078 msgid "GAMES" msgstr "GAMES" -#: src/multiint.cpp:1077 +#: src/multiint.cpp:1086 msgid "Refresh Games List" msgstr "Refresh Games List" -#: src/multiint.cpp:1097 +#: src/multiint.cpp:1106 msgid "Enter Password:" msgstr "" -#: src/multiint.cpp:1115 +#: src/multiint.cpp:1124 msgid "OK" msgstr "" -#: src/multiint.cpp:1232 +#: src/multiint.cpp:1241 msgid "Tanks disabled!!" msgstr "" -#: src/multiint.cpp:1233 +#: src/multiint.cpp:1242 #, fuzzy msgid "Cyborgs disabled." msgstr "New Cyborg Available" -#: src/multiint.cpp:1234 +#: src/multiint.cpp:1243 msgid "VTOLs disabled." msgstr "" -#: src/multiint.cpp:1281 -#: src/multiint.cpp:1288 +#: src/multiint.cpp:1290 +#: src/multiint.cpp:1297 msgid "Select Game Name" msgstr "Select Game Name" -#: src/multiint.cpp:1281 +#: src/multiint.cpp:1290 #, fuzzy msgid "One-Player Skirmish" msgstr "One Player Skirmish" -#: src/multiint.cpp:1291 +#: src/multiint.cpp:1300 msgid "Select Map" msgstr "Select Map" -#: src/multiint.cpp:1299 +#: src/multiint.cpp:1308 msgid "Click to set Password" msgstr "" -#: src/multiint.cpp:1309 -#: src/multiint.cpp:1310 +#: src/multiint.cpp:1318 +#: src/multiint.cpp:1319 #, fuzzy msgid "Scavengers" msgstr "Scavenger" -#: src/multiint.cpp:1312 +#: src/multiint.cpp:1321 #, fuzzy msgid "No Scavengers" msgstr "Scavenger" -#: src/multiint.cpp:1342 +#: src/multiint.cpp:1351 msgid "Select Player Name" msgstr "Select Player Name" -#: src/multiint.cpp:1348 +#: src/multiint.cpp:1357 msgid "Distance Fog" msgstr "Distance Fog" -#: src/multiint.cpp:1359 +#: src/multiint.cpp:1368 #: src/multimenu.cpp:756 msgid "Alliances" msgstr "Alliances" -#: src/multiint.cpp:1362 +#: src/multiint.cpp:1371 msgid "No Alliances" msgstr "No Alliances" -#: src/multiint.cpp:1364 +#: src/multiint.cpp:1373 msgid "Allow Alliances" msgstr "Allow Alliances" -#: src/multiint.cpp:1368 +#: src/multiint.cpp:1377 msgid "Locked Teams" msgstr "Locked Teams" -#: src/multiint.cpp:1394 +#: src/multiint.cpp:1403 msgid "Low Power Levels" msgstr "Low Power Levels" -#: src/multiint.cpp:1396 +#: src/multiint.cpp:1405 msgid "Medium Power Levels" msgstr "Medium Power Levels" -#: src/multiint.cpp:1398 +#: src/multiint.cpp:1407 msgid "High Power Levels" msgstr "High Power Levels" -#: src/multiint.cpp:1430 +#: src/multiint.cpp:1439 msgid "Base" msgstr "Base" -#: src/multiint.cpp:1432 +#: src/multiint.cpp:1441 msgid "Start with No Bases" msgstr "Start with No Bases" -#: src/multiint.cpp:1434 +#: src/multiint.cpp:1443 msgid "Start with Bases" msgstr "Start with Bases" -#: src/multiint.cpp:1436 +#: src/multiint.cpp:1445 msgid "Start with Advanced Bases" msgstr "Start with Advanced Bases" -#: src/multiint.cpp:1468 +#: src/multiint.cpp:1477 msgid "Map Preview" msgstr "" -#: src/multiint.cpp:1470 +#: src/multiint.cpp:1479 msgid "Click to see Map" msgstr "" -#: src/multiint.cpp:1484 +#: src/multiint.cpp:1493 msgid "Start Hosting Game" msgstr "Start Hosting Game" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 #, fuzzy msgid "Show Structure Limits" msgstr "Set Structure Limits" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 msgid "Set Structure Limits" msgstr "Set Structure Limits" -#: src/multiint.cpp:1587 +#: src/multiint.cpp:1596 msgid "DIFFICULTY" msgstr "" -#: src/multiint.cpp:1601 +#: src/multiint.cpp:1610 msgid "Less aggressive and starts with less units" msgstr "" -#: src/multiint.cpp:1602 +#: src/multiint.cpp:1611 #, fuzzy msgid "Plays nice" msgstr "Player" -#: src/multiint.cpp:1603 +#: src/multiint.cpp:1612 msgid "No holds barred" msgstr "" -#: src/multiint.cpp:1604 +#: src/multiint.cpp:1613 msgid "Starts with advantages and gets twice as much oil from derricks" msgstr "" -#: src/multiint.cpp:1632 +#: src/multiint.cpp:1641 msgid "CHOOSE AI" msgstr "" -#: src/multiint.cpp:1648 +#: src/multiint.cpp:1657 msgid "Allow human players to join in this slot" msgstr "" -#: src/multiint.cpp:1656 +#: src/multiint.cpp:1665 msgid "Leave this slot unused" msgstr "" -#: src/multiint.cpp:1736 +#: src/multiint.cpp:1745 #, fuzzy msgid "Player colour" msgstr "Player" -#: src/multiint.cpp:2062 +#: src/multiint.cpp:2071 msgid "Team" msgstr "" -#: src/multiint.cpp:2074 +#: src/multiint.cpp:2083 #, fuzzy msgid "Kick player" msgstr "2 players" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 #, fuzzy msgid "Click to change difficulty" msgstr "Radar showing player colours" -#: src/multiint.cpp:2121 +#: src/multiint.cpp:2130 msgid "Click when ready" msgstr "" -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2134 msgid "READY?" msgstr "" -#: src/multiint.cpp:2169 +#: src/multiint.cpp:2178 msgid "PLAYERS" msgstr "PLAYERS" -#: src/multiint.cpp:2204 +#: src/multiint.cpp:2213 msgid "Click to change to this slot" msgstr "" -#: src/multiint.cpp:2232 +#: src/multiint.cpp:2241 #, fuzzy msgid "Choose Team" msgstr "Locked Teams" -#: src/multiint.cpp:2262 +#: src/multiint.cpp:2271 #, fuzzy msgid "Click to change player colour" msgstr "Radar showing player colours" -#: src/multiint.cpp:2290 +#: src/multiint.cpp:2299 #, fuzzy msgid "Click to change player position" msgstr "Guard Position" -#: src/multiint.cpp:2296 +#: src/multiint.cpp:2305 #, fuzzy msgid "Click to change AI" msgstr "Radar showing player colours" -#: src/multiint.cpp:2300 +#: src/multiint.cpp:2309 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2362 +#: src/multiint.cpp:2371 msgid "CHAT" msgstr "CHAT" -#: src/multiint.cpp:2394 +#: src/multiint.cpp:2403 msgid "All players need to have the same mods to join your game." msgstr "" -#: src/multiint.cpp:2552 +#: src/multiint.cpp:2561 #, c-format msgid "*** password [%s] is now required! ***" msgstr "" -#: src/multiint.cpp:2560 +#: src/multiint.cpp:2569 msgid "*** password is NOT required! ***" msgstr "" -#: src/multiint.cpp:2801 +#: src/multiint.cpp:2810 msgid "Sorry! Failed to host the game." msgstr "" -#: src/multiint.cpp:2922 +#: src/multiint.cpp:2931 #, fuzzy msgid "'Locked Teams' mode enabled" msgstr "Locked Teams" -#: src/multiint.cpp:3003 +#: src/multiint.cpp:3012 #, c-format msgid "The host has kicked %s from the game!" msgstr "The host has kicked %s from the game!" -#: src/multiint.cpp:3073 +#: src/multiint.cpp:3082 msgid "Host is Starting Game" msgstr "Host is Starting Game" -#: src/multiint.cpp:3639 +#: src/multiint.cpp:3648 msgid "Players" msgstr "Players" -#: src/multiint.cpp:3772 +#: src/multiint.cpp:3786 #, c-format msgid "Sending Map: %d%% " msgstr "" -#: src/multiint.cpp:3780 +#: src/multiint.cpp:3794 #, c-format msgid "Map: %d%% downloaded" msgstr "" -#: src/multiint.cpp:3803 +#: src/multiint.cpp:3820 msgid "HOST" msgstr "" +#: src/multiint.cpp:3827 +#: src/multimenu.cpp:772 +msgid "Ping" +msgstr "Ping" + #: src/multijoin.cpp:100 #: src/multijoin.cpp:101 msgid "Players Still Joining" @@ -14793,17 +14798,17 @@ msgstr "%s has Left the Game" msgid "File transfer has been aborted for %d." msgstr "" -#: src/multijoin.cpp:376 +#: src/multijoin.cpp:373 #, c-format msgid "%s (%u) has an incompatible mod, and has been kicked." msgstr "" -#: src/multijoin.cpp:415 +#: src/multijoin.cpp:412 #, c-format msgid "%s is Joining the Game" msgstr "%s is Joining the Game" -#: src/multijoin.cpp:425 +#: src/multijoin.cpp:422 #, fuzzy msgid "System message:" msgstr "System locale" @@ -14919,10 +14924,6 @@ msgstr "Kills" msgid "Units" msgstr "Unit" -#: src/multimenu.cpp:772 -msgid "Ping" -msgstr "Ping" - #: src/multimenu.cpp:776 #, fuzzy msgid "Structs" @@ -14957,84 +14958,84 @@ msgstr "Give Power To Player" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "" -#: src/multiplay.cpp:1146 +#: src/multiplay.cpp:1057 #, fuzzy msgid "(allies" msgstr "Alliances" -#: src/multiplay.cpp:1154 +#: src/multiplay.cpp:1065 msgid "(private to " msgstr "" -#: src/multiplay.cpp:1167 +#: src/multiplay.cpp:1078 msgid "[invalid]" msgstr "" -#: src/multiplay.cpp:2057 +#: src/multiplay.cpp:1942 msgid "Green" msgstr "Green" -#: src/multiplay.cpp:2058 +#: src/multiplay.cpp:1943 msgid "Orange" msgstr "Orange" -#: src/multiplay.cpp:2059 +#: src/multiplay.cpp:1944 msgid "Grey" msgstr "Grey" -#: src/multiplay.cpp:2060 +#: src/multiplay.cpp:1945 msgid "Black" msgstr "Black" -#: src/multiplay.cpp:2061 +#: src/multiplay.cpp:1946 msgid "Red" msgstr "Red" -#: src/multiplay.cpp:2062 +#: src/multiplay.cpp:1947 msgid "Blue" msgstr "Blue" -#: src/multiplay.cpp:2063 +#: src/multiplay.cpp:1948 msgid "Pink" msgstr "Pink" -#: src/multiplay.cpp:2064 +#: src/multiplay.cpp:1949 msgid "Cyan" msgstr "Cyan" -#: src/multiplay.cpp:2065 +#: src/multiplay.cpp:1950 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:2066 +#: src/multiplay.cpp:1951 msgid "Purple" msgstr "" -#: src/multiplay.cpp:2067 +#: src/multiplay.cpp:1952 msgid "White" msgstr "" -#: src/multiplay.cpp:2068 +#: src/multiplay.cpp:1953 msgid "Bright blue" msgstr "" -#: src/multiplay.cpp:2069 +#: src/multiplay.cpp:1954 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:2070 +#: src/multiplay.cpp:1955 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:2071 +#: src/multiplay.cpp:1956 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:2072 +#: src/multiplay.cpp:1957 msgid "Brown" msgstr "" -#: src/order.cpp:841 +#: src/order.cpp:800 msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "" @@ -15169,21 +15170,21 @@ msgstr "Total Game Time - %s" msgid "You cheated!" msgstr "" -#: src/scriptfuncs.cpp:3250 +#: src/scriptfuncs.cpp:3287 msgid "YOU ARE VICTORIOUS!" msgstr "" -#: src/scriptfuncs.cpp:3254 +#: src/scriptfuncs.cpp:3291 #, fuzzy msgid "YOU WERE DEFEATED!" msgstr "NEXUS DEFEATED" -#: src/scriptfuncs.cpp:9500 +#: src/scriptfuncs.cpp:9537 #, c-format msgid "Beacon received from %s!" msgstr "" -#: src/scriptfuncs.cpp:9546 +#: src/scriptfuncs.cpp:9583 #, c-format msgid "Beacon %d" msgstr "" @@ -15212,62 +15213,62 @@ msgstr "Unable to locate any Sensor Units!" msgid "Unable to locate any Commanders!" msgstr "Unable to locate any Commanders!" -#: src/structure.cpp:2615 +#: src/structure.cpp:2614 msgid "Command Control Limit Reached - Production Halted" msgstr "Command Control Limit Reached - Production Halted" -#: src/structure.cpp:5815 -#: src/structure.cpp:5840 +#: src/structure.cpp:5806 +#: src/structure.cpp:5831 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" msgstr[0] "%s - %u Unit assigned" msgstr[1] "%s - %u Units assigned" -#: src/structure.cpp:5845 -#: src/structure.cpp:5913 -#: src/structure.cpp:5929 -#: src/structure.cpp:5943 +#: src/structure.cpp:5836 +#: src/structure.cpp:5904 +#: src/structure.cpp:5920 +#: src/structure.cpp:5934 #, fuzzy, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - Damage %3.0f%%" -#: src/structure.cpp:5895 +#: src/structure.cpp:5886 #, c-format msgid "%s - Connected %u of %u" msgstr "%s - Connected %u of %u" -#: src/structure.cpp:6059 -#: src/structure.cpp:6104 +#: src/structure.cpp:6050 +#: src/structure.cpp:6095 #, c-format msgid "%s - Electronically Damaged" msgstr "%s - Electronically Damaged" -#: src/structure.cpp:6341 +#: src/structure.cpp:6332 msgid "Electronic Reward - Visibility Report" msgstr "Electronic Reward - Visibility Report" -#: src/structure.cpp:6381 +#: src/structure.cpp:6372 msgid "Factory Reward - Propulsion" msgstr "Factory Reward - Propulsion" -#: src/structure.cpp:6405 +#: src/structure.cpp:6396 msgid "Factory Reward - Body" msgstr "Factory Reward - Body" -#: src/structure.cpp:6429 +#: src/structure.cpp:6420 msgid "Factory Reward - Weapon" msgstr "Factory Reward - Weapon" -#: src/structure.cpp:6438 +#: src/structure.cpp:6429 msgid "Factory Reward - Nothing" msgstr "Factory Reward - Nothing" -#: src/structure.cpp:6466 +#: src/structure.cpp:6457 msgid "Repair Facility Award - Repair" msgstr "Repair Facility Award - Repair" -#: src/structure.cpp:6473 +#: src/structure.cpp:6464 msgid "Repair Facility Award - Nothing" msgstr "Repair Facility Award - Nothing" diff --git a/po/es.po b/po/es.po index 5c1c7b4a6..0189d3ee6 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-01-18 00:54+0100\n" +"POT-Creation-Date: 2011-02-25 23:35+0100\n" "PO-Revision-Date: 2011-01-10 15:11+0100\n" "Last-Translator: Daniel Vijande \n" "Language-Team: Spanish \n" @@ -5734,7 +5734,7 @@ msgid "New Design" msgstr "Nuevo Diseño" #: data/base/messages/strings/names.txt:15 -#: src/design.cpp:1313 +#: src/design.cpp:1275 msgid "Transport" msgstr "Transporte" @@ -12011,26 +12011,26 @@ msgid "System locale" msgstr "Idioma del sistema" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1043 +#: lib/netplay/netplay.cpp:1042 msgid "Enter password here" msgstr "Introducir contraseña aquí" -#: lib/netplay/netplay.cpp:2048 +#: lib/netplay/netplay.cpp:2060 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "¡No se pudo resolver el nombre del servidor maestro (%s)!" -#: lib/netplay/netplay.cpp:2062 +#: lib/netplay/netplay.cpp:2082 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "¡No se pudo comunicar con el servidor! ¿Está el puerto TCP %u abierto para tráfico saliente?" #: src/challenge.cpp:184 -#: src/hci.cpp:922 -#: src/hci.cpp:3390 -#: src/hci.cpp:3513 -#: src/hci.cpp:3924 -#: src/hci.cpp:4942 +#: src/hci.cpp:916 +#: src/hci.cpp:3378 +#: src/hci.cpp:3501 +#: src/hci.cpp:3912 +#: src/hci.cpp:4930 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12182,149 +12182,149 @@ msgstr "Ir directamente a pantalla de dominio" #: src/configuration.cpp:393 #: src/configuration.cpp:394 -#: src/multistat.cpp:130 +#: src/multistat.cpp:124 msgid "Player" msgstr "Jugador" -#: src/design.cpp:449 -#: src/design.cpp:469 -#: src/design.cpp:3501 +#: src/design.cpp:443 +#: src/design.cpp:455 +#: src/design.cpp:3464 msgid "New Vehicle" msgstr "Nuevo Vehículo" -#: src/design.cpp:515 +#: src/design.cpp:500 msgid "Vehicle Body" msgstr "Carrocería del Vehículo" -#: src/design.cpp:535 +#: src/design.cpp:520 msgid "Vehicle Propulsion" msgstr "Propulsión del Vehículo" -#: src/design.cpp:556 -#: src/design.cpp:579 -#: src/design.cpp:603 +#: src/design.cpp:541 +#: src/design.cpp:564 +#: src/design.cpp:588 msgid "Vehicle Turret" msgstr "Torreta del Vehículo" -#: src/design.cpp:622 +#: src/design.cpp:607 msgid "Delete Design" msgstr "Borrar Diseño" -#: src/design.cpp:673 -#: src/design.cpp:720 +#: src/design.cpp:658 +#: src/design.cpp:705 msgid "Kinetic Armour" msgstr "Blindaje Cinético" -#: src/design.cpp:682 -#: src/design.cpp:730 +#: src/design.cpp:667 +#: src/design.cpp:715 msgid "Thermal Armour" msgstr "Blindaje Térmico" -#: src/design.cpp:698 -#: src/design.cpp:750 +#: src/design.cpp:683 +#: src/design.cpp:735 msgid "Engine Output" msgstr "Potencia del motor" -#: src/design.cpp:706 -#: src/design.cpp:759 -#: src/design.cpp:1529 -#: src/design.cpp:1553 -#: src/design.cpp:1574 -#: src/design.cpp:1590 -#: src/design.cpp:1610 -#: src/design.cpp:1627 -#: src/design.cpp:1647 -#: src/design.cpp:1664 -#: src/design.cpp:1705 -#: src/design.cpp:1737 -#: src/design.cpp:1869 -#: src/design.cpp:1885 -#: src/design.cpp:1923 -#: src/design.cpp:1956 +#: src/design.cpp:691 +#: src/design.cpp:744 +#: src/design.cpp:1486 +#: src/design.cpp:1510 +#: src/design.cpp:1531 +#: src/design.cpp:1547 +#: src/design.cpp:1567 +#: src/design.cpp:1584 +#: src/design.cpp:1604 +#: src/design.cpp:1621 +#: src/design.cpp:1662 +#: src/design.cpp:1694 +#: src/design.cpp:1826 +#: src/design.cpp:1842 +#: src/design.cpp:1880 +#: src/design.cpp:1913 msgid "Weight" msgstr "Peso" -#: src/design.cpp:790 -#: src/design.cpp:808 +#: src/design.cpp:775 +#: src/design.cpp:793 msgid "Total Power Required" msgstr "Energía Total Necesaria" -#: src/design.cpp:821 -#: src/design.cpp:840 +#: src/design.cpp:806 +#: src/design.cpp:825 msgid "Total Body Points" msgstr "Puntos Estructurales Totales" -#: src/design.cpp:1027 -#: src/design.cpp:1059 +#: src/design.cpp:996 +#: src/design.cpp:1025 msgid "Power Usage" msgstr "Uso de energía" -#: src/design.cpp:1335 +#: src/design.cpp:1298 msgid "Hydra " msgstr "Hidra" -#: src/design.cpp:1509 -#: src/design.cpp:1537 +#: src/design.cpp:1466 +#: src/design.cpp:1494 msgid "Sensor Range" msgstr "Rango del Sensor" -#: src/design.cpp:1521 -#: src/design.cpp:1545 +#: src/design.cpp:1478 +#: src/design.cpp:1502 msgid "Sensor Power" msgstr "Potencia del sensor" -#: src/design.cpp:1566 -#: src/design.cpp:1582 +#: src/design.cpp:1523 +#: src/design.cpp:1539 msgid "ECM Power" msgstr "Energía ECM" -#: src/design.cpp:1602 -#: src/design.cpp:1619 -#: src/design.cpp:1639 -#: src/design.cpp:1656 +#: src/design.cpp:1559 +#: src/design.cpp:1576 +#: src/design.cpp:1596 +#: src/design.cpp:1613 msgid "Build Points" msgstr "Puntos estructurales" -#: src/design.cpp:1677 -#: src/design.cpp:1713 +#: src/design.cpp:1634 +#: src/design.cpp:1670 msgid "Range" msgstr "Rango" -#: src/design.cpp:1689 -#: src/design.cpp:1721 +#: src/design.cpp:1646 +#: src/design.cpp:1678 msgid "Damage" msgstr "Daños" -#: src/design.cpp:1697 -#: src/design.cpp:1729 +#: src/design.cpp:1654 +#: src/design.cpp:1686 msgid "Rate-of-Fire" msgstr "Cadencia de fuego" -#: src/design.cpp:1857 -#: src/design.cpp:1877 +#: src/design.cpp:1814 +#: src/design.cpp:1834 msgid "Air Speed" msgstr "Velocidad en el Aire" -#: src/design.cpp:1895 -#: src/design.cpp:1932 +#: src/design.cpp:1852 +#: src/design.cpp:1889 msgid "Road Speed" msgstr "Velocidad por carretera" -#: src/design.cpp:1905 -#: src/design.cpp:1940 +#: src/design.cpp:1862 +#: src/design.cpp:1897 msgid "Off-Road Speed" msgstr "Velocidad en campo a través" -#: src/design.cpp:1913 -#: src/design.cpp:1948 +#: src/design.cpp:1870 +#: src/design.cpp:1905 msgid "Water Speed" msgstr "Velocidad por agua" -#: src/design.cpp:2074 +#: src/design.cpp:2031 msgid "Weapons" msgstr "Armas" -#: src/design.cpp:2094 +#: src/design.cpp:2051 msgid "Systems" msgstr "Sistemas" @@ -12337,7 +12337,7 @@ msgid "Player dropped" msgstr "Jugador Desconectado" #: src/display3d.cpp:599 -#: src/multiint.cpp:2116 +#: src/multiint.cpp:2125 msgid "Waiting for other players" msgstr "Esperando a otros jugadores" @@ -12345,113 +12345,113 @@ msgstr "Esperando a otros jugadores" msgid "Out of sync" msgstr "Desincronizado" -#: src/display.cpp:1651 +#: src/display.cpp:1649 msgid "Cannot Build. Oil Resource Burning." msgstr "No se puede construir. Yacimiento de petróleo ardiendo." -#: src/display.cpp:1830 -#: src/display.cpp:2423 +#: src/display.cpp:1828 +#: src/display.cpp:2421 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - Daño %d%% - Experiencia %d, %s" -#: src/display.cpp:1846 +#: src/display.cpp:1844 #, c-format msgid "%s - Allied - Damage %d%% - Experience %d, %s" msgstr "%s Aliado - Daño %d%% - Experiencia %d, %s" -#: src/display.cpp:2044 +#: src/display.cpp:2042 msgid "Truck ordered to build Oil Derrick" msgstr "Camión enviado a construir Torre Petrolífera" -#: src/display.cpp:2045 +#: src/display.cpp:2043 msgid "2 trucks ordered to build Oil Derrick" msgstr "2 Camiones enviados a construir Torre Petrolífera" -#: src/display.cpp:2046 +#: src/display.cpp:2044 #, c-format msgid "%d trucks ordered to build Oil Derrick" msgstr "%d camiones enviados a construir Torre Petrolífera" -#: src/droid.cpp:208 +#: src/droid.cpp:211 msgid "Unit Lost!" msgstr "¡Unidad destruída!" -#: src/droid.cpp:1370 +#: src/droid.cpp:1376 msgid "Structure Restored" msgstr "Estructura Restaurada" -#: src/droid.cpp:2712 +#: src/droid.cpp:2732 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" msgstr[0] "Grupo %u seleccionado - %u Unidad" msgstr[1] "Grupo %u seleccionado - %u Unidades" -#: src/droid.cpp:2725 +#: src/droid.cpp:2745 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" msgstr[0] "%u unidad asignada al Grupo %u" msgstr[1] "%u unidades asignadas al Grupo %u" -#: src/droid.cpp:2738 +#: src/droid.cpp:2758 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" msgstr[0] "Centrado en el Grupo %u - %u Unidad" msgstr[1] "Centrado en el Grupo %u - %u Unidades" -#: src/droid.cpp:2742 +#: src/droid.cpp:2762 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" msgstr[0] "Alineando con el Grupo %u - %u Unidad" msgstr[1] "Alineando con el Grupo %u - %u Unidades" -#: src/droid.cpp:3080 +#: src/droid.cpp:3093 msgid "Rookie" msgstr "Novato" -#: src/droid.cpp:3081 +#: src/droid.cpp:3094 msgctxt "rank" msgid "Green" msgstr "Principiante" -#: src/droid.cpp:3082 +#: src/droid.cpp:3095 msgid "Trained" msgstr "Entrenado" -#: src/droid.cpp:3083 +#: src/droid.cpp:3096 msgid "Regular" msgstr "Regular" -#: src/droid.cpp:3084 +#: src/droid.cpp:3097 msgid "Professional" msgstr "Profesional" -#: src/droid.cpp:3085 +#: src/droid.cpp:3098 msgid "Veteran" msgstr "Veterano" -#: src/droid.cpp:3086 +#: src/droid.cpp:3099 msgid "Elite" msgstr "Élite" -#: src/droid.cpp:3087 +#: src/droid.cpp:3100 msgid "Special" msgstr "Especial" -#: src/droid.cpp:3088 +#: src/droid.cpp:3101 msgid "Hero" msgstr "Héroe" -#: src/droid.cpp:4110 +#: src/droid.cpp:4123 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "¡%s quiso darte un %s pero tienes demasiados!" -#: src/droid.cpp:4114 +#: src/droid.cpp:4127 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "¡Intentaste dar a %s un %s pero tiene demasiados!" @@ -12470,7 +12470,7 @@ msgid "Tutorial" msgstr "Tutorial" #: src/frontend.cpp:100 -#: src/hci.cpp:3499 +#: src/hci.cpp:3487 msgid "Options" msgstr "Opciones" @@ -12521,7 +12521,7 @@ msgid "Challenges" msgstr "Desafíos" #: src/frontend.cpp:215 -#: src/ingameop.cpp:275 +#: src/ingameop.cpp:272 msgid "Load Game" msgstr "Cargar Partida" @@ -12530,9 +12530,9 @@ msgid "SINGLE PLAYER" msgstr "UN JUGADOR" #: src/frontend.cpp:303 -#: src/ingameop.cpp:498 -#: src/mission.cpp:2527 -#: src/mission.cpp:2630 +#: src/ingameop.cpp:494 +#: src/mission.cpp:2493 +#: src/mission.cpp:2596 msgid "Load Saved Game" msgstr "Cargar Partida Guardada" @@ -12549,7 +12549,7 @@ msgid "Join Game" msgstr "Unirse a una Partida" #: src/frontend.cpp:422 -#: src/multiint.cpp:1276 +#: src/multiint.cpp:1285 msgid "OPTIONS" msgstr "OPCIONES" @@ -12566,7 +12566,7 @@ msgid "Video Options" msgstr "Opciones de Vídeo" #: src/frontend.cpp:426 -#: src/ingameop.cpp:270 +#: src/ingameop.cpp:267 msgid "Audio Options" msgstr "Opciones de Audio" @@ -12644,7 +12644,7 @@ msgid "Off" msgstr "Desactivado" #: src/frontend.cpp:523 -#: src/multiint.cpp:1345 +#: src/multiint.cpp:1354 msgid "Fog" msgstr "Niebla" @@ -12655,7 +12655,7 @@ msgstr "Neblina" #: src/frontend.cpp:530 #: src/frontend.cpp:595 -#: src/multiint.cpp:1347 +#: src/multiint.cpp:1356 msgid "Fog Of War" msgstr "Niebla de Guerra" @@ -12815,193 +12815,193 @@ msgid "GAME OPTIONS" msgstr "OPCIONES DE JUEGO" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2389 +#: src/multiint.cpp:2398 msgid "Mod: " msgstr "Mod:" -#: src/hci.cpp:1245 +#: src/hci.cpp:1237 msgid "MAP SAVED!" msgstr "¡MAPA GUARDADO!" -#: src/hci.cpp:1584 +#: src/hci.cpp:1573 #: src/loop.cpp:558 #: src/loop.cpp:574 msgid "GAME SAVED: " msgstr "PARTIDA GUARDADA:" -#: src/hci.cpp:1971 +#: src/hci.cpp:1960 msgid "Failed to create building" msgstr "Error al crear estructura" -#: src/hci.cpp:1988 +#: src/hci.cpp:1977 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new structure: %s." msgstr "El jugador %u está haciendo trampas (menú depuración) con una nueva estructura: %s." -#: src/hci.cpp:2003 +#: src/hci.cpp:1992 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new feature: %s." msgstr "El jugador %u está haciendo trampas (menú depuración) con una nueva característica: %s." -#: src/hci.cpp:2025 +#: src/hci.cpp:2014 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid: %s." msgstr "El jugador %u está haciendo trampas (menú depuración) con un nuevo androide: %s." -#: src/hci.cpp:2036 +#: src/hci.cpp:2025 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "El jugador %u está haciendo trampas (menú depuración) con un nuevo androide." -#: src/hci.cpp:3310 +#: src/hci.cpp:3298 msgid "Commanders (F6)" msgstr "Comandantes (F6)" -#: src/hci.cpp:3323 +#: src/hci.cpp:3311 msgid "Intelligence Display (F5)" msgstr "Inteligencia (F5)" -#: src/hci.cpp:3336 +#: src/hci.cpp:3324 msgid "Manufacture (F1)" msgstr "Fabricación (F1)" -#: src/hci.cpp:3349 +#: src/hci.cpp:3337 msgid "Design (F4)" msgstr "Diseño (F4)" -#: src/hci.cpp:3362 +#: src/hci.cpp:3350 msgid "Research (F2)" msgstr "Investigación (F2)" -#: src/hci.cpp:3375 +#: src/hci.cpp:3363 msgid "Build (F3)" msgstr "Construcción (F3)" -#: src/hci.cpp:3446 -#: src/multiint.cpp:1392 +#: src/hci.cpp:3434 +#: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Energía" -#: src/hci.cpp:3537 +#: src/hci.cpp:3525 msgid "Map:" msgstr "Mapa:" -#: src/hci.cpp:3550 +#: src/hci.cpp:3538 msgid "Load" msgstr "Cargar" -#: src/hci.cpp:3551 +#: src/hci.cpp:3539 msgid "Load Map File" msgstr "Cargar Mapa" -#: src/hci.cpp:3558 +#: src/hci.cpp:3546 msgid "Save" msgstr "Guardar" -#: src/hci.cpp:3559 +#: src/hci.cpp:3547 msgid "Save Map File" msgstr "Guardar Mapa" -#: src/hci.cpp:3567 +#: src/hci.cpp:3555 msgid "New" msgstr "Nuevo" -#: src/hci.cpp:3568 +#: src/hci.cpp:3556 msgid "New Blank Map" msgstr "Nuevo Mapa en Blanco" -#: src/hci.cpp:3604 +#: src/hci.cpp:3592 msgid "Tile" msgstr "casilla" -#: src/hci.cpp:3605 +#: src/hci.cpp:3593 msgid "Place tiles on map" msgstr "Colocar casillas en el mapa" -#: src/hci.cpp:3614 +#: src/hci.cpp:3602 msgid "Unit" msgstr "Unidad" -#: src/hci.cpp:3615 +#: src/hci.cpp:3603 msgid "Place Unit on map" msgstr "Colocar Unidad en el mapa" -#: src/hci.cpp:3623 +#: src/hci.cpp:3611 msgid "Struct" msgstr "Estructura" -#: src/hci.cpp:3624 +#: src/hci.cpp:3612 msgid "Place Structures on map" msgstr "Colocar Estructuras en el mapa" -#: src/hci.cpp:3632 +#: src/hci.cpp:3620 msgid "Feat" msgstr "Hazaña" -#: src/hci.cpp:3633 +#: src/hci.cpp:3621 msgid "Place Features on map" msgstr "Colocar Características en el mapa" -#: src/hci.cpp:3643 +#: src/hci.cpp:3631 msgid "Pause" msgstr "Pausa" -#: src/hci.cpp:3644 +#: src/hci.cpp:3632 msgid "Pause or unpause the game" msgstr "Pausa o despausa la partida" -#: src/hci.cpp:3658 +#: src/hci.cpp:3646 msgid "Align height of all map objects" msgstr "Anchura de alineacion de todos los objetos del mapa" -#: src/hci.cpp:3668 +#: src/hci.cpp:3656 msgid "Edit" msgstr "Editar" -#: src/hci.cpp:3669 +#: src/hci.cpp:3657 msgid "Start Edit Mode" msgstr "Iniciar modo de Edición" -#: src/hci.cpp:3683 +#: src/hci.cpp:3671 #: src/ingameop.cpp:112 -#: src/ingameop.cpp:258 -#: src/ingameop.cpp:263 +#: src/ingameop.cpp:256 +#: src/ingameop.cpp:260 msgid "Quit" msgstr "Salir" -#: src/hci.cpp:3684 +#: src/hci.cpp:3672 msgid "Exit Game" msgstr "Salir del Juego" -#: src/hci.cpp:3710 +#: src/hci.cpp:3698 msgid "Current Player:" msgstr "Jugador actual:" -#: src/hci.cpp:4001 +#: src/hci.cpp:3989 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "Barra de progreso" -#: src/hci.cpp:4867 +#: src/hci.cpp:4855 msgid "Factory Delivery Point" msgstr "Punto de Reparto de la Fábrica" -#: src/hci.cpp:4885 +#: src/hci.cpp:4873 msgid "Loop Production" msgstr "Ciclos de Producción" -#: src/hci.cpp:4965 +#: src/hci.cpp:4953 msgid "Tab Scroll left" msgstr "Tab Desplazamiento Izquierda" -#: src/hci.cpp:4980 +#: src/hci.cpp:4968 msgid "Tab Scroll right" msgstr "Tab Desplazamiento Derecha" #: src/ingameop.cpp:111 -#: src/ingameop.cpp:193 -#: src/ingameop.cpp:267 +#: src/ingameop.cpp:195 +#: src/ingameop.cpp:264 msgid "Resume Game" msgstr "Continuar Partida" @@ -13009,32 +13009,32 @@ msgstr "Continuar Partida" msgid "WARNING: You're the host. If you quit, the game ends for everyone!" msgstr "¡ATENCIÓN: Eres el anfitrión. Si te vas, el juego acaba para todos!" -#: src/ingameop.cpp:185 -#: src/ingameop.cpp:527 +#: src/ingameop.cpp:186 +#: src/ingameop.cpp:523 msgid "Tactical UI (Target Origin Icon): Show" msgstr "UI Táctica (Icono de origen de objetivo): Mostrar" -#: src/ingameop.cpp:190 -#: src/ingameop.cpp:531 +#: src/ingameop.cpp:191 +#: src/ingameop.cpp:527 msgid "Tactical UI (Target Origin Icon): Hide" msgstr "UI Táctica (Icono de origen de objetivo): Ocultar" -#: src/ingameop.cpp:277 -#: src/ingameop.cpp:502 -#: src/mission.cpp:2514 -#: src/mission.cpp:2633 +#: src/ingameop.cpp:274 +#: src/ingameop.cpp:498 +#: src/mission.cpp:2480 +#: src/mission.cpp:2599 msgid "Save Game" msgstr "Guardar Partida" -#: src/ingameop.cpp:343 +#: src/ingameop.cpp:339 msgid "Host has quit the game!" msgstr "¡El anfitrión ha abandonado la partida!" -#: src/ingameop.cpp:349 +#: src/ingameop.cpp:345 msgid "The game can't continue without the host." msgstr "La partida no puede continuar sin el anfitrión" -#: src/ingameop.cpp:355 +#: src/ingameop.cpp:351 msgid "--> QUIT <--" msgstr "--> SALIR <--" @@ -13411,52 +13411,52 @@ msgstr "Agitar pantalla cuando mueren cosas: Desactivado" msgid "Screen shake when things die: On" msgstr "Agitar pantalla cuando mueren cosas: Habilitado" -#: src/keybind.cpp:2603 -#: src/keybind.cpp:2646 +#: src/keybind.cpp:2604 +#: src/keybind.cpp:2647 msgid "Sorry, but game speed cannot be changed in multiplayer." msgstr "Lo sentimos, pero la velocidad de juego no se puede cambiar en partidas multijugador." -#: src/keybind.cpp:2624 -#: src/keybind.cpp:2667 -#: src/keybind.cpp:2689 +#: src/keybind.cpp:2625 +#: src/keybind.cpp:2668 +#: src/keybind.cpp:2690 msgid "Game Speed Reset" msgstr "Reestablecer Velocidad de Juego" -#: src/keybind.cpp:2628 +#: src/keybind.cpp:2629 #, c-format msgid "Game Speed Increased to %3.1f" msgstr "Velocidad de Juego Aumentada a %3.1f" -#: src/keybind.cpp:2671 +#: src/keybind.cpp:2672 #, c-format msgid "Game Speed Reduced to %3.1f" msgstr "Velocidad de Juego Reducida a %3.1f" -#: src/keybind.cpp:2701 +#: src/keybind.cpp:2702 msgid "Radar showing friend-foe colors" msgstr "Radar mostrando colores de amigo-enemigo" -#: src/keybind.cpp:2705 +#: src/keybind.cpp:2706 msgid "Radar showing player colors" msgstr "Radar mostrando colores de jugador" -#: src/keybind.cpp:2726 +#: src/keybind.cpp:2727 msgid "Radar showing only objects" msgstr "Radar mostrando sólo objetos" -#: src/keybind.cpp:2729 +#: src/keybind.cpp:2730 msgid "Radar blending terrain and height" msgstr "Radar mezclando terreno y alturas" -#: src/keybind.cpp:2732 +#: src/keybind.cpp:2733 msgid "Radar showing terrain" msgstr "Radar mostrando terreno" -#: src/keybind.cpp:2735 +#: src/keybind.cpp:2736 msgid "Radar showing revealed terrain" msgstr "Radar mostrando terreno" -#: src/keybind.cpp:2738 +#: src/keybind.cpp:2739 msgid "Radar showing height" msgstr "Radar mostrando alturas" @@ -13465,9 +13465,9 @@ msgid "KEY MAPPING" msgstr "MAPEO DE TECLAS" #: src/keyedit.cpp:372 -#: src/multiint.cpp:662 -#: src/multiint.cpp:1072 -#: src/multiint.cpp:1478 +#: src/multiint.cpp:671 +#: src/multiint.cpp:1081 +#: src/multiint.cpp:1487 msgid "Return To Previous Screen" msgstr "Volver a la Pantalla Anterior" @@ -13956,37 +13956,37 @@ msgstr "Alternar Cámara de Seguimiento" msgid "Could not save game!" msgstr "¡No se pudo guardar la partida!" -#: src/mission.cpp:2075 +#: src/mission.cpp:2041 msgid "Load Transport" msgstr "Cargar Transporte" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "¡OBJETIVO CUMPLIDO con trampas!" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED" msgstr "OBJETIVO CUMPLIDO" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED--and you cheated!" msgstr "OBJETIVO FALLADO-- ¡e hiciste trampas!" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED" msgstr "OBJETIVO FALLADO" -#: src/mission.cpp:2493 -#: src/mission.cpp:2533 -#: src/mission.cpp:2647 +#: src/mission.cpp:2459 +#: src/mission.cpp:2499 +#: src/mission.cpp:2613 msgid "Quit To Main Menu" msgstr "Salir al Menú Principal" -#: src/mission.cpp:2501 +#: src/mission.cpp:2467 msgid "Continue Game" msgstr "Continuar Partida" -#: src/mission.cpp:2598 +#: src/mission.cpp:2564 msgid "GAME SAVED :" msgstr "¡PARTIDA GUARDADA!" @@ -14045,342 +14045,347 @@ msgstr "%s forma una Alianza con %s" msgid "You Discover Blueprints For %s" msgstr "Descubres los planos de %s" -#: src/multiint.cpp:600 +#: src/multiint.cpp:609 #: src/multilimit.cpp:190 msgid "Accept Settings" msgstr "Aceptar Configuración" -#: src/multiint.cpp:602 -#: src/multiint.cpp:1117 +#: src/multiint.cpp:611 +#: src/multiint.cpp:1126 msgid "Cancel" msgstr "Cancelar" -#: src/multiint.cpp:613 +#: src/multiint.cpp:622 msgid "IP Address or Machine Name" msgstr "Dirección IP o Nombre de la Máquina" -#: src/multiint.cpp:659 +#: src/multiint.cpp:668 msgid "CONNECTION" msgstr "CONEXIÓN" -#: src/multiint.cpp:664 +#: src/multiint.cpp:673 msgid "Lobby" msgstr "Vestíbulo" -#: src/multiint.cpp:665 +#: src/multiint.cpp:674 msgid "IP" msgstr "IP" -#: src/multiint.cpp:854 +#: src/multiint.cpp:863 msgid "No games are available" msgstr "No hay partidas disponibles" -#: src/multiint.cpp:857 +#: src/multiint.cpp:866 msgid "Game is full" msgstr "Partida llena" -#: src/multiint.cpp:861 +#: src/multiint.cpp:870 msgid "You were kicked!" msgstr "¡Has sido expulsado!" -#: src/multiint.cpp:864 +#: src/multiint.cpp:873 msgid "Wrong Game Version!" msgstr "¡Versión del juego errónea!" -#: src/multiint.cpp:867 +#: src/multiint.cpp:876 msgid "You have an incompatible mod." msgstr "Tienes un mod incompatible" -#: src/multiint.cpp:871 +#: src/multiint.cpp:880 msgid "Host couldn't send file?" msgstr "¿El host no pudo envar archivo?" -#: src/multiint.cpp:875 +#: src/multiint.cpp:884 msgid "Incorrect Password!" msgstr "¡Contraseña incorrecta!" -#: src/multiint.cpp:878 +#: src/multiint.cpp:887 msgid "Host has dropped connection!" msgstr "¡El Host cerró la conexión!" -#: src/multiint.cpp:882 +#: src/multiint.cpp:891 msgid "Connection Error" msgstr "Error de conexión" -#: src/multiint.cpp:1012 +#: src/multiint.cpp:1021 msgid "Searching" msgstr "Buscando" -#: src/multiint.cpp:1069 +#: src/multiint.cpp:1078 msgid "GAMES" msgstr "PARTIDAS" -#: src/multiint.cpp:1077 +#: src/multiint.cpp:1086 msgid "Refresh Games List" msgstr "Actualizar Lista de Partidas" -#: src/multiint.cpp:1097 +#: src/multiint.cpp:1106 msgid "Enter Password:" msgstr "Introducir Contraseña:" -#: src/multiint.cpp:1115 +#: src/multiint.cpp:1124 msgid "OK" msgstr "OK" -#: src/multiint.cpp:1232 +#: src/multiint.cpp:1241 msgid "Tanks disabled!!" msgstr "¡¡Tanques deshabilitados!!" -#: src/multiint.cpp:1233 +#: src/multiint.cpp:1242 msgid "Cyborgs disabled." msgstr "Cyborgs deshabilitados." -#: src/multiint.cpp:1234 +#: src/multiint.cpp:1243 msgid "VTOLs disabled." msgstr "VTOLS deshabilitados." -#: src/multiint.cpp:1281 -#: src/multiint.cpp:1288 +#: src/multiint.cpp:1290 +#: src/multiint.cpp:1297 msgid "Select Game Name" msgstr "Elegir Nombre de la Partida" -#: src/multiint.cpp:1281 +#: src/multiint.cpp:1290 msgid "One-Player Skirmish" msgstr "Escaramuza Un Jugador" -#: src/multiint.cpp:1291 +#: src/multiint.cpp:1300 msgid "Select Map" msgstr "Elegir Mapa" -#: src/multiint.cpp:1299 +#: src/multiint.cpp:1308 msgid "Click to set Password" msgstr "Click para fijar contraseña" -#: src/multiint.cpp:1309 -#: src/multiint.cpp:1310 +#: src/multiint.cpp:1318 +#: src/multiint.cpp:1319 msgid "Scavengers" msgstr "Carroñeros" -#: src/multiint.cpp:1312 +#: src/multiint.cpp:1321 msgid "No Scavengers" msgstr "Sin Carroñeros" -#: src/multiint.cpp:1342 +#: src/multiint.cpp:1351 msgid "Select Player Name" msgstr "Elejir Nombre del Jugador" -#: src/multiint.cpp:1348 +#: src/multiint.cpp:1357 msgid "Distance Fog" msgstr "Niebla de Distancia" -#: src/multiint.cpp:1359 +#: src/multiint.cpp:1368 #: src/multimenu.cpp:756 msgid "Alliances" msgstr "Alianzas" -#: src/multiint.cpp:1362 +#: src/multiint.cpp:1371 msgid "No Alliances" msgstr "Sin Alianzas" -#: src/multiint.cpp:1364 +#: src/multiint.cpp:1373 msgid "Allow Alliances" msgstr "Permitir Alianzas" -#: src/multiint.cpp:1368 +#: src/multiint.cpp:1377 msgid "Locked Teams" msgstr "Equipos Fijos" -#: src/multiint.cpp:1394 +#: src/multiint.cpp:1403 msgid "Low Power Levels" msgstr "Niveles de Energía Bajos" -#: src/multiint.cpp:1396 +#: src/multiint.cpp:1405 msgid "Medium Power Levels" msgstr "Niveles de Energía Medios" -#: src/multiint.cpp:1398 +#: src/multiint.cpp:1407 msgid "High Power Levels" msgstr "Niveles de Energía Altos" -#: src/multiint.cpp:1430 +#: src/multiint.cpp:1439 msgid "Base" msgstr "Base" -#: src/multiint.cpp:1432 +#: src/multiint.cpp:1441 msgid "Start with No Bases" msgstr "Comenzar sin Bases" -#: src/multiint.cpp:1434 +#: src/multiint.cpp:1443 msgid "Start with Bases" msgstr "Comenzar con Bases" -#: src/multiint.cpp:1436 +#: src/multiint.cpp:1445 msgid "Start with Advanced Bases" msgstr "Comenzar con Bases Avanzadas" -#: src/multiint.cpp:1468 +#: src/multiint.cpp:1477 msgid "Map Preview" msgstr "Previsualizar Mapa" -#: src/multiint.cpp:1470 +#: src/multiint.cpp:1479 msgid "Click to see Map" msgstr "Click para ver Mapa" -#: src/multiint.cpp:1484 +#: src/multiint.cpp:1493 msgid "Start Hosting Game" msgstr "Comenzar Hospedando un Juego" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 msgid "Show Structure Limits" msgstr "Fijar Límites de Estructuras" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 msgid "Set Structure Limits" msgstr "Fijar Límites de Estructuras" -#: src/multiint.cpp:1587 +#: src/multiint.cpp:1596 msgid "DIFFICULTY" msgstr "" -#: src/multiint.cpp:1601 +#: src/multiint.cpp:1610 msgid "Less aggressive and starts with less units" msgstr "" -#: src/multiint.cpp:1602 +#: src/multiint.cpp:1611 #, fuzzy msgid "Plays nice" msgstr "Jugador" -#: src/multiint.cpp:1603 +#: src/multiint.cpp:1612 msgid "No holds barred" msgstr "" -#: src/multiint.cpp:1604 +#: src/multiint.cpp:1613 msgid "Starts with advantages and gets twice as much oil from derricks" msgstr "" -#: src/multiint.cpp:1632 +#: src/multiint.cpp:1641 msgid "CHOOSE AI" msgstr "" -#: src/multiint.cpp:1648 +#: src/multiint.cpp:1657 msgid "Allow human players to join in this slot" msgstr "" -#: src/multiint.cpp:1656 +#: src/multiint.cpp:1665 msgid "Leave this slot unused" msgstr "" -#: src/multiint.cpp:1736 +#: src/multiint.cpp:1745 msgid "Player colour" msgstr "Color del Jugador" -#: src/multiint.cpp:2062 +#: src/multiint.cpp:2071 msgid "Team" msgstr "Equipo" -#: src/multiint.cpp:2074 +#: src/multiint.cpp:2083 msgid "Kick player" msgstr "Expulsar jugador" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 #, fuzzy msgid "Click to change difficulty" msgstr "Click para ajustar dificultad de la IA" -#: src/multiint.cpp:2121 +#: src/multiint.cpp:2130 msgid "Click when ready" msgstr "Click cuando esté listo" -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2134 msgid "READY?" msgstr "¿LISTO?" -#: src/multiint.cpp:2169 +#: src/multiint.cpp:2178 msgid "PLAYERS" msgstr "JUGADORES" -#: src/multiint.cpp:2204 +#: src/multiint.cpp:2213 msgid "Click to change to this slot" msgstr "Click para cambiar a esta ranura." -#: src/multiint.cpp:2232 +#: src/multiint.cpp:2241 msgid "Choose Team" msgstr "Elegir equipo" -#: src/multiint.cpp:2262 +#: src/multiint.cpp:2271 msgid "Click to change player colour" msgstr "Click para cambiar el color de jugador." -#: src/multiint.cpp:2290 +#: src/multiint.cpp:2299 msgid "Click to change player position" msgstr "Click para cambiar la posición de jugador." -#: src/multiint.cpp:2296 +#: src/multiint.cpp:2305 #, fuzzy msgid "Click to change AI" msgstr "Click para cambiar a esta ranura." -#: src/multiint.cpp:2300 +#: src/multiint.cpp:2309 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2362 +#: src/multiint.cpp:2371 msgid "CHAT" msgstr "CHAT" -#: src/multiint.cpp:2394 +#: src/multiint.cpp:2403 msgid "All players need to have the same mods to join your game." msgstr "Todos los jugadores necesitan tener los mismos mods para unirse" -#: src/multiint.cpp:2552 +#: src/multiint.cpp:2561 #, c-format msgid "*** password [%s] is now required! ***" msgstr "*** ¡contraseña [%s] requerida! ***" -#: src/multiint.cpp:2560 +#: src/multiint.cpp:2569 msgid "*** password is NOT required! ***" msgstr "*** ¡contraseña no requerida! ***" -#: src/multiint.cpp:2801 +#: src/multiint.cpp:2810 msgid "Sorry! Failed to host the game." msgstr "¡Lo sentimos! No se pudo hospedar la partida" -#: src/multiint.cpp:2922 +#: src/multiint.cpp:2931 msgid "'Locked Teams' mode enabled" msgstr "Modo de Equipos Fijos Activado" -#: src/multiint.cpp:3003 +#: src/multiint.cpp:3012 #, c-format msgid "The host has kicked %s from the game!" msgstr "¡El anfitrión ha expulsado a %s de la partida!" -#: src/multiint.cpp:3073 +#: src/multiint.cpp:3082 msgid "Host is Starting Game" msgstr "Anfitrión Comenzando Partida" -#: src/multiint.cpp:3639 +#: src/multiint.cpp:3648 msgid "Players" msgstr "Jugadores" -#: src/multiint.cpp:3772 +#: src/multiint.cpp:3786 #, c-format msgid "Sending Map: %d%% " msgstr "Enviando Mapa: %d%%" -#: src/multiint.cpp:3780 +#: src/multiint.cpp:3794 #, c-format msgid "Map: %d%% downloaded" msgstr "Mapa: %d%% descargado" -#: src/multiint.cpp:3803 +#: src/multiint.cpp:3820 msgid "HOST" msgstr "ANFITRIÓN" +#: src/multiint.cpp:3827 +#: src/multimenu.cpp:772 +msgid "Ping" +msgstr "Ping" + #: src/multijoin.cpp:100 #: src/multijoin.cpp:101 msgid "Players Still Joining" @@ -14396,17 +14401,17 @@ msgstr "%s abandonó la partida" msgid "File transfer has been aborted for %d." msgstr "La transferencia de archivos ha sido abortada por %d" -#: src/multijoin.cpp:376 +#: src/multijoin.cpp:373 #, c-format msgid "%s (%u) has an incompatible mod, and has been kicked." msgstr "%s (%u) tiene un mod incompatible, y ha sido expulsado" -#: src/multijoin.cpp:415 +#: src/multijoin.cpp:412 #, c-format msgid "%s is Joining the Game" msgstr "%s se está uniendo a la partida" -#: src/multijoin.cpp:425 +#: src/multijoin.cpp:422 msgid "System message:" msgstr "Mensaje del sistema:" @@ -14515,10 +14520,6 @@ msgstr "Muertes" msgid "Units" msgstr "Unidades" -#: src/multimenu.cpp:772 -msgid "Ping" -msgstr "Ping" - #: src/multimenu.cpp:776 msgid "Structs" msgstr "Estructuras" @@ -14552,84 +14553,84 @@ msgstr "Dar Energía al Jugador" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "¡Expulsado el jugador %s, porque intentó saltar la seguridad de integridad de datos!" -#: src/multiplay.cpp:1146 +#: src/multiplay.cpp:1057 msgid "(allies" msgstr "( a aliados" -#: src/multiplay.cpp:1154 +#: src/multiplay.cpp:1065 msgid "(private to " msgstr "(privado a " -#: src/multiplay.cpp:1167 +#: src/multiplay.cpp:1078 msgid "[invalid]" msgstr "[inválido]" -#: src/multiplay.cpp:2057 +#: src/multiplay.cpp:1942 msgid "Green" msgstr "Verde" -#: src/multiplay.cpp:2058 +#: src/multiplay.cpp:1943 msgid "Orange" msgstr "Naranja" -#: src/multiplay.cpp:2059 +#: src/multiplay.cpp:1944 msgid "Grey" msgstr "Gris" -#: src/multiplay.cpp:2060 +#: src/multiplay.cpp:1945 msgid "Black" msgstr "Negro" -#: src/multiplay.cpp:2061 +#: src/multiplay.cpp:1946 msgid "Red" msgstr "Rojo" -#: src/multiplay.cpp:2062 +#: src/multiplay.cpp:1947 msgid "Blue" msgstr "Azul" -#: src/multiplay.cpp:2063 +#: src/multiplay.cpp:1948 msgid "Pink" msgstr "Rosa" -#: src/multiplay.cpp:2064 +#: src/multiplay.cpp:1949 msgid "Cyan" msgstr "Cian" -#: src/multiplay.cpp:2065 +#: src/multiplay.cpp:1950 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:2066 +#: src/multiplay.cpp:1951 msgid "Purple" msgstr "" -#: src/multiplay.cpp:2067 +#: src/multiplay.cpp:1952 msgid "White" msgstr "" -#: src/multiplay.cpp:2068 +#: src/multiplay.cpp:1953 #, fuzzy msgid "Bright blue" msgstr "Botón derecho" -#: src/multiplay.cpp:2069 +#: src/multiplay.cpp:1954 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:2070 +#: src/multiplay.cpp:1955 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:2071 +#: src/multiplay.cpp:1956 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:2072 +#: src/multiplay.cpp:1957 msgid "Brown" msgstr "" -#: src/order.cpp:841 +#: src/order.cpp:800 msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "¡No podemos hacer eso! ¡Debemos ser una unidad cyborg para usar el transporte Cyborg!" @@ -14764,20 +14765,20 @@ msgstr "Tiempo Jugado Total: %s" msgid "You cheated!" msgstr "¡Hiciste trampa!" -#: src/scriptfuncs.cpp:3250 +#: src/scriptfuncs.cpp:3287 msgid "YOU ARE VICTORIOUS!" msgstr "¡ERES EL GANADOR!" -#: src/scriptfuncs.cpp:3254 +#: src/scriptfuncs.cpp:3291 msgid "YOU WERE DEFEATED!" msgstr "¡HAS SIDO DERROTADO!" -#: src/scriptfuncs.cpp:9500 +#: src/scriptfuncs.cpp:9537 #, c-format msgid "Beacon received from %s!" msgstr "¡Baliza recibida de %s!" -#: src/scriptfuncs.cpp:9546 +#: src/scriptfuncs.cpp:9583 #, c-format msgid "Beacon %d" msgstr "Baliza %d" @@ -14806,62 +14807,62 @@ msgstr "¡Imposible localizar ninguna unidad de sensores!" msgid "Unable to locate any Commanders!" msgstr "¡Imposible localizar ningún Comandante!" -#: src/structure.cpp:2615 +#: src/structure.cpp:2614 msgid "Command Control Limit Reached - Production Halted" msgstr "Alcanzado Límite de Control de Unidades - Producción Detenida" -#: src/structure.cpp:5815 -#: src/structure.cpp:5840 +#: src/structure.cpp:5806 +#: src/structure.cpp:5831 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" msgstr[0] "%s - %u Unidad asignada" msgstr[1] "%s - %u Unidades asignadas" -#: src/structure.cpp:5845 -#: src/structure.cpp:5913 -#: src/structure.cpp:5929 -#: src/structure.cpp:5943 +#: src/structure.cpp:5836 +#: src/structure.cpp:5904 +#: src/structure.cpp:5920 +#: src/structure.cpp:5934 #, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - Daño %3.0f%%" -#: src/structure.cpp:5895 +#: src/structure.cpp:5886 #, c-format msgid "%s - Connected %u of %u" msgstr "%s - Conectado %u de %u" -#: src/structure.cpp:6059 -#: src/structure.cpp:6104 +#: src/structure.cpp:6050 +#: src/structure.cpp:6095 #, c-format msgid "%s - Electronically Damaged" msgstr "%s - Dañado Electrónicamente" -#: src/structure.cpp:6341 +#: src/structure.cpp:6332 msgid "Electronic Reward - Visibility Report" msgstr "Recompensa de Electrónica - Informe de Visibilidad" -#: src/structure.cpp:6381 +#: src/structure.cpp:6372 msgid "Factory Reward - Propulsion" msgstr "Recompensa de Fábrica - Propulsión" -#: src/structure.cpp:6405 +#: src/structure.cpp:6396 msgid "Factory Reward - Body" msgstr "Recompensa de Fábrica - Carrocería" -#: src/structure.cpp:6429 +#: src/structure.cpp:6420 msgid "Factory Reward - Weapon" msgstr "Recompensa de Fábrica - Arma" -#: src/structure.cpp:6438 +#: src/structure.cpp:6429 msgid "Factory Reward - Nothing" msgstr "Recompensa de Fábrica - Nada" -#: src/structure.cpp:6466 +#: src/structure.cpp:6457 msgid "Repair Facility Award - Repair" msgstr "Premio de Instalación de Reparación - Reparación" -#: src/structure.cpp:6473 +#: src/structure.cpp:6464 msgid "Repair Facility Award - Nothing" msgstr "Premio de Instalación de Reparación - Nada" diff --git a/po/et_EE.po b/po/et_EE.po index e73725240..c9508f51b 100644 --- a/po/et_EE.po +++ b/po/et_EE.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-01-18 00:54+0100\n" +"POT-Creation-Date: 2011-02-25 23:35+0100\n" "PO-Revision-Date: 2010-05-10 16:59+0200\n" "Last-Translator: erlando \n" "Language-Team: Estonian \n" @@ -5730,7 +5730,7 @@ msgid "New Design" msgstr "Uus Konstruktsioon" #: data/base/messages/strings/names.txt:15 -#: src/design.cpp:1313 +#: src/design.cpp:1275 msgid "Transport" msgstr "Transport" @@ -12027,26 +12027,26 @@ msgid "System locale" msgstr "Süsteemi Asukoht" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1043 +#: lib/netplay/netplay.cpp:1042 msgid "Enter password here" msgstr "Sisesta salasõna siia" -#: lib/netplay/netplay.cpp:2048 +#: lib/netplay/netplay.cpp:2060 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "Ei suuda peaserveri nime lahendada (%s)!" -#: lib/netplay/netplay.cpp:2062 +#: lib/netplay/netplay.cpp:2082 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "Ei suuda lobby serveriga suhelda! Kas port %u on väljaminevale liiklusele avatud?" #: src/challenge.cpp:184 -#: src/hci.cpp:922 -#: src/hci.cpp:3390 -#: src/hci.cpp:3513 -#: src/hci.cpp:3924 -#: src/hci.cpp:4942 +#: src/hci.cpp:916 +#: src/hci.cpp:3378 +#: src/hci.cpp:3501 +#: src/hci.cpp:3912 +#: src/hci.cpp:4930 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12198,149 +12198,149 @@ msgstr "mine otse võõrustaja aknasse" #: src/configuration.cpp:393 #: src/configuration.cpp:394 -#: src/multistat.cpp:130 +#: src/multistat.cpp:124 msgid "Player" msgstr "Mägija" -#: src/design.cpp:449 -#: src/design.cpp:469 -#: src/design.cpp:3501 +#: src/design.cpp:443 +#: src/design.cpp:455 +#: src/design.cpp:3464 msgid "New Vehicle" msgstr "Uus Sõiduk" -#: src/design.cpp:515 +#: src/design.cpp:500 msgid "Vehicle Body" msgstr "Masina Kere" -#: src/design.cpp:535 +#: src/design.cpp:520 msgid "Vehicle Propulsion" msgstr "Masina Liikumissüsteem" -#: src/design.cpp:556 -#: src/design.cpp:579 -#: src/design.cpp:603 +#: src/design.cpp:541 +#: src/design.cpp:564 +#: src/design.cpp:588 msgid "Vehicle Turret" msgstr "Masina Torn" -#: src/design.cpp:622 +#: src/design.cpp:607 msgid "Delete Design" msgstr "Kustuta Konstruktsioon" -#: src/design.cpp:673 -#: src/design.cpp:720 +#: src/design.cpp:658 +#: src/design.cpp:705 msgid "Kinetic Armour" msgstr "Kinemaatiline Soomus" -#: src/design.cpp:682 -#: src/design.cpp:730 +#: src/design.cpp:667 +#: src/design.cpp:715 msgid "Thermal Armour" msgstr "Soojussoomus" -#: src/design.cpp:698 -#: src/design.cpp:750 +#: src/design.cpp:683 +#: src/design.cpp:735 msgid "Engine Output" msgstr "Mootori Võimsus" -#: src/design.cpp:706 -#: src/design.cpp:759 -#: src/design.cpp:1529 -#: src/design.cpp:1553 -#: src/design.cpp:1574 -#: src/design.cpp:1590 -#: src/design.cpp:1610 -#: src/design.cpp:1627 -#: src/design.cpp:1647 -#: src/design.cpp:1664 -#: src/design.cpp:1705 -#: src/design.cpp:1737 -#: src/design.cpp:1869 -#: src/design.cpp:1885 -#: src/design.cpp:1923 -#: src/design.cpp:1956 +#: src/design.cpp:691 +#: src/design.cpp:744 +#: src/design.cpp:1486 +#: src/design.cpp:1510 +#: src/design.cpp:1531 +#: src/design.cpp:1547 +#: src/design.cpp:1567 +#: src/design.cpp:1584 +#: src/design.cpp:1604 +#: src/design.cpp:1621 +#: src/design.cpp:1662 +#: src/design.cpp:1694 +#: src/design.cpp:1826 +#: src/design.cpp:1842 +#: src/design.cpp:1880 +#: src/design.cpp:1913 msgid "Weight" msgstr "Kaal" -#: src/design.cpp:790 -#: src/design.cpp:808 +#: src/design.cpp:775 +#: src/design.cpp:793 msgid "Total Power Required" msgstr "Täielik Energiakulu" -#: src/design.cpp:821 -#: src/design.cpp:840 +#: src/design.cpp:806 +#: src/design.cpp:825 msgid "Total Body Points" msgstr "Kokku Kerepunkte(HP)" -#: src/design.cpp:1027 -#: src/design.cpp:1059 +#: src/design.cpp:996 +#: src/design.cpp:1025 msgid "Power Usage" msgstr "Energia Kulu" -#: src/design.cpp:1335 +#: src/design.cpp:1298 msgid "Hydra " msgstr "Hüdra" -#: src/design.cpp:1509 -#: src/design.cpp:1537 +#: src/design.cpp:1466 +#: src/design.cpp:1494 msgid "Sensor Range" msgstr "Sensori Ulatus" -#: src/design.cpp:1521 -#: src/design.cpp:1545 +#: src/design.cpp:1478 +#: src/design.cpp:1502 msgid "Sensor Power" msgstr "Sensori Tugevus" -#: src/design.cpp:1566 -#: src/design.cpp:1582 +#: src/design.cpp:1523 +#: src/design.cpp:1539 msgid "ECM Power" msgstr "ECM Tugevus" -#: src/design.cpp:1602 -#: src/design.cpp:1619 -#: src/design.cpp:1639 -#: src/design.cpp:1656 +#: src/design.cpp:1559 +#: src/design.cpp:1576 +#: src/design.cpp:1596 +#: src/design.cpp:1613 msgid "Build Points" msgstr "Ehitamispunktid" -#: src/design.cpp:1677 -#: src/design.cpp:1713 +#: src/design.cpp:1634 +#: src/design.cpp:1670 msgid "Range" msgstr "Ulatus" -#: src/design.cpp:1689 -#: src/design.cpp:1721 +#: src/design.cpp:1646 +#: src/design.cpp:1678 msgid "Damage" msgstr "Kahju" -#: src/design.cpp:1697 -#: src/design.cpp:1729 +#: src/design.cpp:1654 +#: src/design.cpp:1686 msgid "Rate-of-Fire" msgstr "Laskekiirus" -#: src/design.cpp:1857 -#: src/design.cpp:1877 +#: src/design.cpp:1814 +#: src/design.cpp:1834 msgid "Air Speed" msgstr "Kiirus Õhus" -#: src/design.cpp:1895 -#: src/design.cpp:1932 +#: src/design.cpp:1852 +#: src/design.cpp:1889 msgid "Road Speed" msgstr "Kiirus Teel" -#: src/design.cpp:1905 -#: src/design.cpp:1940 +#: src/design.cpp:1862 +#: src/design.cpp:1897 msgid "Off-Road Speed" msgstr "Kiirus Maastikul" -#: src/design.cpp:1913 -#: src/design.cpp:1948 +#: src/design.cpp:1870 +#: src/design.cpp:1905 msgid "Water Speed" msgstr "Kiirus Vees" -#: src/design.cpp:2074 +#: src/design.cpp:2031 msgid "Weapons" msgstr "Relvad" -#: src/design.cpp:2094 +#: src/design.cpp:2051 msgid "Systems" msgstr "Süsteemid" @@ -12353,7 +12353,7 @@ msgid "Player dropped" msgstr "Mängija Väjavisatud" #: src/display3d.cpp:599 -#: src/multiint.cpp:2116 +#: src/multiint.cpp:2125 msgid "Waiting for other players" msgstr "Teiste mängijate ootamine" @@ -12361,114 +12361,114 @@ msgstr "Teiste mängijate ootamine" msgid "Out of sync" msgstr "" -#: src/display.cpp:1651 +#: src/display.cpp:1649 msgid "Cannot Build. Oil Resource Burning." msgstr "EI Saa Ehitada. Naftaresurss Põleb." -#: src/display.cpp:1830 -#: src/display.cpp:2423 +#: src/display.cpp:1828 +#: src/display.cpp:2421 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - Kahju %d%% - Kogemus %d, %s" -#: src/display.cpp:1846 +#: src/display.cpp:1844 #, c-format msgid "%s - Allied - Damage %d%% - Experience %d, %s" msgstr "%s -Liitlane - Kahju %d%% - Kogemus %d, %s" -#: src/display.cpp:2044 +#: src/display.cpp:2042 msgid "Truck ordered to build Oil Derrick" msgstr "Veoautol kästi Naftapuurtorn ehitada" -#: src/display.cpp:2045 +#: src/display.cpp:2043 #, fuzzy msgid "2 trucks ordered to build Oil Derrick" msgstr "Veoautol kästi Naftapuurtorn ehitada" -#: src/display.cpp:2046 +#: src/display.cpp:2044 #, fuzzy, c-format msgid "%d trucks ordered to build Oil Derrick" msgstr "Veoautol kästi Naftapuurtorn ehitada" -#: src/droid.cpp:208 +#: src/droid.cpp:211 msgid "Unit Lost!" msgstr "Üksus Kaotatud!" -#: src/droid.cpp:1370 +#: src/droid.cpp:1376 msgid "Structure Restored" msgstr "Ehitis taastatud" -#: src/droid.cpp:2712 +#: src/droid.cpp:2732 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" msgstr[0] "Grupp %u valitud - %u Üksus" msgstr[1] "Grupp %u valitud - %u Üksust" -#: src/droid.cpp:2725 +#: src/droid.cpp:2745 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" msgstr[0] "%u üksus määratud gruppi %u" msgstr[1] "%u Üksust määratud Gruppi %u" -#: src/droid.cpp:2738 +#: src/droid.cpp:2758 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" msgstr[0] "Grupi %u Vaade - %u Üksus" msgstr[1] "Grupi %u Vaade - %u Üksust" -#: src/droid.cpp:2742 +#: src/droid.cpp:2762 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" msgstr[0] "Aligning with Group %u - %u Unit" msgstr[1] "Aligning with Group %u - %u Units" -#: src/droid.cpp:3080 +#: src/droid.cpp:3093 msgid "Rookie" msgstr "Uustulnuk" -#: src/droid.cpp:3081 +#: src/droid.cpp:3094 msgctxt "rank" msgid "Green" msgstr "Algaja" -#: src/droid.cpp:3082 +#: src/droid.cpp:3095 msgid "Trained" msgstr "Treenitud" -#: src/droid.cpp:3083 +#: src/droid.cpp:3096 msgid "Regular" msgstr "Regulaar" -#: src/droid.cpp:3084 +#: src/droid.cpp:3097 msgid "Professional" msgstr "Professionaal" -#: src/droid.cpp:3085 +#: src/droid.cpp:3098 msgid "Veteran" msgstr "Veteran" -#: src/droid.cpp:3086 +#: src/droid.cpp:3099 msgid "Elite" msgstr "Eliit" -#: src/droid.cpp:3087 +#: src/droid.cpp:3100 msgid "Special" msgstr "Eriline" -#: src/droid.cpp:3088 +#: src/droid.cpp:3101 msgid "Hero" msgstr "Kangelane" -#: src/droid.cpp:4110 +#: src/droid.cpp:4123 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "" -#: src/droid.cpp:4114 +#: src/droid.cpp:4127 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "" @@ -12487,7 +12487,7 @@ msgid "Tutorial" msgstr "Õpetus" #: src/frontend.cpp:100 -#: src/hci.cpp:3499 +#: src/hci.cpp:3487 msgid "Options" msgstr "Seaded" @@ -12538,7 +12538,7 @@ msgid "Challenges" msgstr "Väljakutse" #: src/frontend.cpp:215 -#: src/ingameop.cpp:275 +#: src/ingameop.cpp:272 msgid "Load Game" msgstr "Laadi Mäng" @@ -12547,9 +12547,9 @@ msgid "SINGLE PLAYER" msgstr "ÜKSIK MÄNG" #: src/frontend.cpp:303 -#: src/ingameop.cpp:498 -#: src/mission.cpp:2527 -#: src/mission.cpp:2630 +#: src/ingameop.cpp:494 +#: src/mission.cpp:2493 +#: src/mission.cpp:2596 msgid "Load Saved Game" msgstr "Laadi Salvestatud Mäng" @@ -12566,7 +12566,7 @@ msgid "Join Game" msgstr "Liitu Mängu" #: src/frontend.cpp:422 -#: src/multiint.cpp:1276 +#: src/multiint.cpp:1285 msgid "OPTIONS" msgstr "SEADED" @@ -12583,7 +12583,7 @@ msgid "Video Options" msgstr "Video Seaded" #: src/frontend.cpp:426 -#: src/ingameop.cpp:270 +#: src/ingameop.cpp:267 msgid "Audio Options" msgstr "Audio Seaded" @@ -12661,7 +12661,7 @@ msgid "Off" msgstr "Väljas" #: src/frontend.cpp:523 -#: src/multiint.cpp:1345 +#: src/multiint.cpp:1354 msgid "Fog" msgstr "Udu" @@ -12672,7 +12672,7 @@ msgstr "Udu" #: src/frontend.cpp:530 #: src/frontend.cpp:595 -#: src/multiint.cpp:1347 +#: src/multiint.cpp:1356 msgid "Fog Of War" msgstr "Sõjaudu" @@ -12834,200 +12834,200 @@ msgid "GAME OPTIONS" msgstr "MÄNGU SEADED" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2389 +#: src/multiint.cpp:2398 msgid "Mod: " msgstr "Mod:" -#: src/hci.cpp:1245 +#: src/hci.cpp:1237 msgid "MAP SAVED!" msgstr "KAART SALVESTATUD!" -#: src/hci.cpp:1584 +#: src/hci.cpp:1573 #: src/loop.cpp:558 #: src/loop.cpp:574 #, fuzzy msgid "GAME SAVED: " msgstr "MÄNG SALVESTATUD!" -#: src/hci.cpp:1971 +#: src/hci.cpp:1960 msgid "Failed to create building" msgstr "Failed to create building" -#: src/hci.cpp:1988 +#: src/hci.cpp:1977 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new structure: %s." msgstr "Mängija %u teeb sohki (debug menu) Talle uus ehitis: %s." -#: src/hci.cpp:2003 +#: src/hci.cpp:1992 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new feature: %s." msgstr "Mängija %u teeb sohki (debug menu) talle uus tunnus: %s." -#: src/hci.cpp:2025 +#: src/hci.cpp:2014 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid: %s." msgstr "Mängija %u teeb sohki(debug menu) talle uus droid: %s." -#: src/hci.cpp:2036 +#: src/hci.cpp:2025 #, fuzzy, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "Mängija %u teeb sohki(debug menu) talle uus droid: %s." -#: src/hci.cpp:3310 +#: src/hci.cpp:3298 msgid "Commanders (F6)" msgstr "Komandörid (F6)" -#: src/hci.cpp:3323 +#: src/hci.cpp:3311 msgid "Intelligence Display (F5)" msgstr "Intelligentsus Ekraan (F5)" -#: src/hci.cpp:3336 +#: src/hci.cpp:3324 msgid "Manufacture (F1)" msgstr "Tootmine (F1)" -#: src/hci.cpp:3349 +#: src/hci.cpp:3337 msgid "Design (F4)" msgstr "Konstrueerimine (F4)" -#: src/hci.cpp:3362 +#: src/hci.cpp:3350 msgid "Research (F2)" msgstr "Uurimine (F2)" -#: src/hci.cpp:3375 +#: src/hci.cpp:3363 msgid "Build (F3)" msgstr "Ehitamine (F3)" -#: src/hci.cpp:3446 -#: src/multiint.cpp:1392 +#: src/hci.cpp:3434 +#: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Energia" -#: src/hci.cpp:3537 +#: src/hci.cpp:3525 msgid "Map:" msgstr "" -#: src/hci.cpp:3550 +#: src/hci.cpp:3538 #, fuzzy msgid "Load" msgstr "Laadi Mäng" -#: src/hci.cpp:3551 +#: src/hci.cpp:3539 #, fuzzy msgid "Load Map File" msgstr "Laadi Mäng" -#: src/hci.cpp:3558 +#: src/hci.cpp:3546 #, fuzzy msgid "Save" msgstr "Salvesta Mäng" -#: src/hci.cpp:3559 +#: src/hci.cpp:3547 #, fuzzy msgid "Save Map File" msgstr "Salvesta Mäng" -#: src/hci.cpp:3567 +#: src/hci.cpp:3555 msgid "New" msgstr "" -#: src/hci.cpp:3568 +#: src/hci.cpp:3556 msgid "New Blank Map" msgstr "" -#: src/hci.cpp:3604 +#: src/hci.cpp:3592 msgid "Tile" msgstr "Tile" -#: src/hci.cpp:3605 +#: src/hci.cpp:3593 msgid "Place tiles on map" msgstr "Place tiles on map" -#: src/hci.cpp:3614 +#: src/hci.cpp:3602 msgid "Unit" msgstr "Üksus" -#: src/hci.cpp:3615 +#: src/hci.cpp:3603 msgid "Place Unit on map" msgstr "Paiguta kaartile üksus" -#: src/hci.cpp:3623 +#: src/hci.cpp:3611 msgid "Struct" msgstr "Ehitis" -#: src/hci.cpp:3624 +#: src/hci.cpp:3612 msgid "Place Structures on map" msgstr "Paiguta kaartile ehitis" -#: src/hci.cpp:3632 +#: src/hci.cpp:3620 msgid "Feat" msgstr "Saavutus" -#: src/hci.cpp:3633 +#: src/hci.cpp:3621 msgid "Place Features on map" msgstr "Place Features on map" -#: src/hci.cpp:3643 +#: src/hci.cpp:3631 msgid "Pause" msgstr "" -#: src/hci.cpp:3644 +#: src/hci.cpp:3632 msgid "Pause or unpause the game" msgstr "Paus või Pausi mahavõtmine" -#: src/hci.cpp:3658 +#: src/hci.cpp:3646 msgid "Align height of all map objects" msgstr "Align height of all map objects" -#: src/hci.cpp:3668 +#: src/hci.cpp:3656 msgid "Edit" msgstr "" -#: src/hci.cpp:3669 +#: src/hci.cpp:3657 #, fuzzy msgid "Start Edit Mode" msgstr "Alusta Baasideta" -#: src/hci.cpp:3683 +#: src/hci.cpp:3671 #: src/ingameop.cpp:112 -#: src/ingameop.cpp:258 -#: src/ingameop.cpp:263 +#: src/ingameop.cpp:256 +#: src/ingameop.cpp:260 msgid "Quit" msgstr "Välju" -#: src/hci.cpp:3684 +#: src/hci.cpp:3672 msgid "Exit Game" msgstr "Välju Mängust" -#: src/hci.cpp:3710 +#: src/hci.cpp:3698 #, fuzzy msgid "Current Player:" msgstr "Mitmik Mäng" -#: src/hci.cpp:4001 +#: src/hci.cpp:3989 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "Progressi Riba" -#: src/hci.cpp:4867 +#: src/hci.cpp:4855 msgid "Factory Delivery Point" msgstr "Tehase Saatmis Koht" -#: src/hci.cpp:4885 +#: src/hci.cpp:4873 msgid "Loop Production" msgstr "Tsükkel tootmine" -#: src/hci.cpp:4965 +#: src/hci.cpp:4953 msgid "Tab Scroll left" msgstr "Tab Scroll left" -#: src/hci.cpp:4980 +#: src/hci.cpp:4968 msgid "Tab Scroll right" msgstr "Tab Scroll right" #: src/ingameop.cpp:111 -#: src/ingameop.cpp:193 -#: src/ingameop.cpp:267 +#: src/ingameop.cpp:195 +#: src/ingameop.cpp:264 msgid "Resume Game" msgstr "Jätka Mängu" @@ -13035,32 +13035,32 @@ msgstr "Jätka Mängu" msgid "WARNING: You're the host. If you quit, the game ends for everyone!" msgstr "HOIATUS: sa oled võõrustaja. Kui sa lahkud, lõpeb mäng kõigi jaoks" -#: src/ingameop.cpp:185 -#: src/ingameop.cpp:527 +#: src/ingameop.cpp:186 +#: src/ingameop.cpp:523 msgid "Tactical UI (Target Origin Icon): Show" msgstr "" -#: src/ingameop.cpp:190 -#: src/ingameop.cpp:531 +#: src/ingameop.cpp:191 +#: src/ingameop.cpp:527 msgid "Tactical UI (Target Origin Icon): Hide" msgstr "" -#: src/ingameop.cpp:277 -#: src/ingameop.cpp:502 -#: src/mission.cpp:2514 -#: src/mission.cpp:2633 +#: src/ingameop.cpp:274 +#: src/ingameop.cpp:498 +#: src/mission.cpp:2480 +#: src/mission.cpp:2599 msgid "Save Game" msgstr "Salvesta Mäng" -#: src/ingameop.cpp:343 +#: src/ingameop.cpp:339 msgid "Host has quit the game!" msgstr "Võõrustaja lahkus mängust!" -#: src/ingameop.cpp:349 +#: src/ingameop.cpp:345 msgid "The game can't continue without the host." msgstr "Mäng ei saa ilma võõrustajata jätkuda." -#: src/ingameop.cpp:355 +#: src/ingameop.cpp:351 msgid "--> QUIT <--" msgstr "--> LOOBU <--" @@ -13437,52 +13437,52 @@ msgstr "Ekraani värin, kui miski sureb: Väljas" msgid "Screen shake when things die: On" msgstr "Ekraani värin, kui miski sureb: Sees" -#: src/keybind.cpp:2603 -#: src/keybind.cpp:2646 +#: src/keybind.cpp:2604 +#: src/keybind.cpp:2647 msgid "Sorry, but game speed cannot be changed in multiplayer." msgstr "Sorry, aga mängu kiirust ei saa mitmikmängus muuta." -#: src/keybind.cpp:2624 -#: src/keybind.cpp:2667 -#: src/keybind.cpp:2689 +#: src/keybind.cpp:2625 +#: src/keybind.cpp:2668 +#: src/keybind.cpp:2690 msgid "Game Speed Reset" msgstr "Mängu Kiirus Taastatud" -#: src/keybind.cpp:2628 +#: src/keybind.cpp:2629 #, c-format msgid "Game Speed Increased to %3.1f" msgstr "Mängu Kiirus Suurendatud %3.1f" -#: src/keybind.cpp:2671 +#: src/keybind.cpp:2672 #, c-format msgid "Game Speed Reduced to %3.1f" msgstr "Mängu Kiirus Vähendatud %3.1f" -#: src/keybind.cpp:2701 +#: src/keybind.cpp:2702 msgid "Radar showing friend-foe colors" msgstr "Radar showing friend-foe colours" -#: src/keybind.cpp:2705 +#: src/keybind.cpp:2706 msgid "Radar showing player colors" msgstr "Radar showing player colours" -#: src/keybind.cpp:2726 +#: src/keybind.cpp:2727 msgid "Radar showing only objects" msgstr "Radar näitab ainult objekte" -#: src/keybind.cpp:2729 +#: src/keybind.cpp:2730 msgid "Radar blending terrain and height" msgstr "Radar blending terrain and height" -#: src/keybind.cpp:2732 +#: src/keybind.cpp:2733 msgid "Radar showing terrain" msgstr "Radar näitab terraini" -#: src/keybind.cpp:2735 +#: src/keybind.cpp:2736 msgid "Radar showing revealed terrain" msgstr "Radar näitab paljastatud terraini" -#: src/keybind.cpp:2738 +#: src/keybind.cpp:2739 msgid "Radar showing height" msgstr "Radar näitab kõrgust" @@ -13491,9 +13491,9 @@ msgid "KEY MAPPING" msgstr "NUPPUDE VASTAD" #: src/keyedit.cpp:372 -#: src/multiint.cpp:662 -#: src/multiint.cpp:1072 -#: src/multiint.cpp:1478 +#: src/multiint.cpp:671 +#: src/multiint.cpp:1081 +#: src/multiint.cpp:1487 msgid "Return To Previous Screen" msgstr "Naase Eelmisele Ekraanile" @@ -14000,37 +14000,37 @@ msgstr "Toggle Tracking Camera" msgid "Could not save game!" msgstr "Ei suutnud mängu salvestada" -#: src/mission.cpp:2075 +#: src/mission.cpp:2041 msgid "Load Transport" msgstr "Laadi Transport" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "EESMÄRK SAAVUTATUD sohki tehes" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED" msgstr "EESMÄRK SAAVUTATUD" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED--and you cheated!" msgstr "EESMÄRK EBAÕNNESTUNUD--ja sa tegid sohki" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED" msgstr "EESMÄRK EBAÕNNESTUNUD" -#: src/mission.cpp:2493 -#: src/mission.cpp:2533 -#: src/mission.cpp:2647 +#: src/mission.cpp:2459 +#: src/mission.cpp:2499 +#: src/mission.cpp:2613 msgid "Quit To Main Menu" msgstr "Välju Peamenüüsse" -#: src/mission.cpp:2501 +#: src/mission.cpp:2467 msgid "Continue Game" msgstr "Jätka Mängu" -#: src/mission.cpp:2598 +#: src/mission.cpp:2564 msgid "GAME SAVED :" msgstr "MÄNG SALVESTATUD!" @@ -14089,347 +14089,352 @@ msgstr "%s Moodustab %s -ga Liitluse" msgid "You Discover Blueprints For %s" msgstr "Sa Avastasid %s joonised" -#: src/multiint.cpp:600 +#: src/multiint.cpp:609 #: src/multilimit.cpp:190 msgid "Accept Settings" msgstr "Seaded Aksepteeritud" -#: src/multiint.cpp:602 -#: src/multiint.cpp:1117 +#: src/multiint.cpp:611 +#: src/multiint.cpp:1126 msgid "Cancel" msgstr "Tühista" -#: src/multiint.cpp:613 +#: src/multiint.cpp:622 msgid "IP Address or Machine Name" msgstr "IP Address Või Masina Nimi" -#: src/multiint.cpp:659 +#: src/multiint.cpp:668 msgid "CONNECTION" msgstr "CONNECTION" -#: src/multiint.cpp:664 +#: src/multiint.cpp:673 msgid "Lobby" msgstr "Lobby" -#: src/multiint.cpp:665 +#: src/multiint.cpp:674 msgid "IP" msgstr "IP" -#: src/multiint.cpp:854 +#: src/multiint.cpp:863 msgid "No games are available" msgstr "Pole ühtki mängu." -#: src/multiint.cpp:857 +#: src/multiint.cpp:866 msgid "Game is full" msgstr "Mäng on Täis" -#: src/multiint.cpp:861 +#: src/multiint.cpp:870 msgid "You were kicked!" msgstr "Sind löödi välja" -#: src/multiint.cpp:864 +#: src/multiint.cpp:873 msgid "Wrong Game Version!" msgstr "Vale Mängu versioon" -#: src/multiint.cpp:867 +#: src/multiint.cpp:876 msgid "You have an incompatible mod." msgstr "Sul on vastuolus mod." -#: src/multiint.cpp:871 +#: src/multiint.cpp:880 msgid "Host couldn't send file?" msgstr "Võõrustaja ei suutnud faili saata?" -#: src/multiint.cpp:875 +#: src/multiint.cpp:884 msgid "Incorrect Password!" msgstr "Vale Salasõna" -#: src/multiint.cpp:878 +#: src/multiint.cpp:887 msgid "Host has dropped connection!" msgstr "Võõrustaja lõpetas ühenduse" -#: src/multiint.cpp:882 +#: src/multiint.cpp:891 msgid "Connection Error" msgstr "Ühendus Error" -#: src/multiint.cpp:1012 +#: src/multiint.cpp:1021 msgid "Searching" msgstr "Otsimine" -#: src/multiint.cpp:1069 +#: src/multiint.cpp:1078 msgid "GAMES" msgstr "MÄNGUD" -#: src/multiint.cpp:1077 +#: src/multiint.cpp:1086 msgid "Refresh Games List" msgstr "Värskenda Mängulisti" -#: src/multiint.cpp:1097 +#: src/multiint.cpp:1106 msgid "Enter Password:" msgstr "Sisesta Salasõna:" -#: src/multiint.cpp:1115 +#: src/multiint.cpp:1124 msgid "OK" msgstr "OK" -#: src/multiint.cpp:1232 +#: src/multiint.cpp:1241 msgid "Tanks disabled!!" msgstr "" -#: src/multiint.cpp:1233 +#: src/multiint.cpp:1242 #, fuzzy msgid "Cyborgs disabled." msgstr "Uus Küborg Kasutatv" -#: src/multiint.cpp:1234 +#: src/multiint.cpp:1243 msgid "VTOLs disabled." msgstr "" -#: src/multiint.cpp:1281 -#: src/multiint.cpp:1288 +#: src/multiint.cpp:1290 +#: src/multiint.cpp:1297 msgid "Select Game Name" msgstr "Sisesta Mängu Nimi" -#: src/multiint.cpp:1281 +#: src/multiint.cpp:1290 msgid "One-Player Skirmish" msgstr "Ühe Mängja Lahing" -#: src/multiint.cpp:1291 +#: src/multiint.cpp:1300 msgid "Select Map" msgstr "Vali Kaart" -#: src/multiint.cpp:1299 +#: src/multiint.cpp:1308 msgid "Click to set Password" msgstr "Vajuta, et Salasõna sisestada" -#: src/multiint.cpp:1309 -#: src/multiint.cpp:1310 +#: src/multiint.cpp:1318 +#: src/multiint.cpp:1319 msgid "Scavengers" msgstr "Mässajad" -#: src/multiint.cpp:1312 +#: src/multiint.cpp:1321 msgid "No Scavengers" msgstr "Mässajateta" -#: src/multiint.cpp:1342 +#: src/multiint.cpp:1351 msgid "Select Player Name" msgstr "Sisesta Mängija nimi" -#: src/multiint.cpp:1348 +#: src/multiint.cpp:1357 msgid "Distance Fog" msgstr "Vahemaa Udu" -#: src/multiint.cpp:1359 +#: src/multiint.cpp:1368 #: src/multimenu.cpp:756 msgid "Alliances" msgstr "Liitlus" -#: src/multiint.cpp:1362 +#: src/multiint.cpp:1371 msgid "No Alliances" msgstr "Liitluseta" -#: src/multiint.cpp:1364 +#: src/multiint.cpp:1373 msgid "Allow Alliances" msgstr "Luba Liitlus" -#: src/multiint.cpp:1368 +#: src/multiint.cpp:1377 msgid "Locked Teams" msgstr "Lukustatud Tiimid" -#: src/multiint.cpp:1394 +#: src/multiint.cpp:1403 msgid "Low Power Levels" msgstr "Madal Energia Level" -#: src/multiint.cpp:1396 +#: src/multiint.cpp:1405 msgid "Medium Power Levels" msgstr "Keskmine Energia Level" -#: src/multiint.cpp:1398 +#: src/multiint.cpp:1407 msgid "High Power Levels" msgstr "Kõrge Energia Level" -#: src/multiint.cpp:1430 +#: src/multiint.cpp:1439 msgid "Base" msgstr "Baas" -#: src/multiint.cpp:1432 +#: src/multiint.cpp:1441 msgid "Start with No Bases" msgstr "Alusta Baasideta" -#: src/multiint.cpp:1434 +#: src/multiint.cpp:1443 msgid "Start with Bases" msgstr "Alusta Baasidega" -#: src/multiint.cpp:1436 +#: src/multiint.cpp:1445 msgid "Start with Advanced Bases" msgstr "Alusta Arenenud Baasidega" -#: src/multiint.cpp:1468 +#: src/multiint.cpp:1477 msgid "Map Preview" msgstr "Kaarti Esitus" -#: src/multiint.cpp:1470 +#: src/multiint.cpp:1479 msgid "Click to see Map" msgstr "Vajuta, et Kaarti näha" -#: src/multiint.cpp:1484 +#: src/multiint.cpp:1493 msgid "Start Hosting Game" msgstr "Alusta Mängu Võõrustamist" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 msgid "Show Structure Limits" msgstr "Näita Ehitiste Limiite" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 msgid "Set Structure Limits" msgstr "Sea Ehitiste Limiidid" -#: src/multiint.cpp:1587 +#: src/multiint.cpp:1596 msgid "DIFFICULTY" msgstr "" -#: src/multiint.cpp:1601 +#: src/multiint.cpp:1610 msgid "Less aggressive and starts with less units" msgstr "" -#: src/multiint.cpp:1602 +#: src/multiint.cpp:1611 #, fuzzy msgid "Plays nice" msgstr "Mägija" -#: src/multiint.cpp:1603 +#: src/multiint.cpp:1612 msgid "No holds barred" msgstr "" -#: src/multiint.cpp:1604 +#: src/multiint.cpp:1613 msgid "Starts with advantages and gets twice as much oil from derricks" msgstr "" -#: src/multiint.cpp:1632 +#: src/multiint.cpp:1641 msgid "CHOOSE AI" msgstr "" -#: src/multiint.cpp:1648 +#: src/multiint.cpp:1657 msgid "Allow human players to join in this slot" msgstr "" -#: src/multiint.cpp:1656 +#: src/multiint.cpp:1665 msgid "Leave this slot unused" msgstr "" -#: src/multiint.cpp:1736 +#: src/multiint.cpp:1745 msgid "Player colour" msgstr "Mängija värv" -#: src/multiint.cpp:2062 +#: src/multiint.cpp:2071 msgid "Team" msgstr "Tiim" -#: src/multiint.cpp:2074 +#: src/multiint.cpp:2083 msgid "Kick player" msgstr "Löö mängija välja" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 #, fuzzy msgid "Click to change difficulty" msgstr "Vajuta, et Salasõna sisestada" -#: src/multiint.cpp:2121 +#: src/multiint.cpp:2130 msgid "Click when ready" msgstr "Vajuta kui valmis" -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2134 msgid "READY?" msgstr "VALMIS?" -#: src/multiint.cpp:2169 +#: src/multiint.cpp:2178 msgid "PLAYERS" msgstr "MÄNGIJAD" -#: src/multiint.cpp:2204 +#: src/multiint.cpp:2213 #, fuzzy msgid "Click to change to this slot" msgstr "Vajuta, et Salasõna sisestada" -#: src/multiint.cpp:2232 +#: src/multiint.cpp:2241 #, fuzzy msgid "Choose Team" msgstr "Lukustatud Tiimid" -#: src/multiint.cpp:2262 +#: src/multiint.cpp:2271 #, fuzzy msgid "Click to change player colour" msgstr "Radar showing player colours" -#: src/multiint.cpp:2290 +#: src/multiint.cpp:2299 #, fuzzy msgid "Click to change player position" msgstr "Kaitse Positsiooni" -#: src/multiint.cpp:2296 +#: src/multiint.cpp:2305 #, fuzzy msgid "Click to change AI" msgstr "Vajuta, et Salasõna sisestada" -#: src/multiint.cpp:2300 +#: src/multiint.cpp:2309 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2362 +#: src/multiint.cpp:2371 msgid "CHAT" msgstr "VESTLUS" -#: src/multiint.cpp:2394 +#: src/multiint.cpp:2403 msgid "All players need to have the same mods to join your game." msgstr "Kõigil mängijatel peab olema sama mod, et sinu mänguga liituda" -#: src/multiint.cpp:2552 +#: src/multiint.cpp:2561 #, fuzzy, c-format msgid "*** password [%s] is now required! ***" msgstr "*** salasõna on vajalik! ***" -#: src/multiint.cpp:2560 +#: src/multiint.cpp:2569 msgid "*** password is NOT required! ***" msgstr "*** salasõna pole vaja! ***" -#: src/multiint.cpp:2801 +#: src/multiint.cpp:2810 msgid "Sorry! Failed to host the game." msgstr "Kahju! Ebaõnnestusid mängu võõrustamisel." -#: src/multiint.cpp:2922 +#: src/multiint.cpp:2931 msgid "'Locked Teams' mode enabled" msgstr "Lukustatud Tiimid, mode lubatud" -#: src/multiint.cpp:3003 +#: src/multiint.cpp:3012 #, c-format msgid "The host has kicked %s from the game!" msgstr "Võõrustaja lõi %s mängust välja!" -#: src/multiint.cpp:3073 +#: src/multiint.cpp:3082 msgid "Host is Starting Game" msgstr "Võõrustaja Alustab Mängu" -#: src/multiint.cpp:3639 +#: src/multiint.cpp:3648 msgid "Players" msgstr "Mängijad" -#: src/multiint.cpp:3772 +#: src/multiint.cpp:3786 #, c-format msgid "Sending Map: %d%% " msgstr "Kaarti Saatmine: %d%%" -#: src/multiint.cpp:3780 +#: src/multiint.cpp:3794 #, c-format msgid "Map: %d%% downloaded" msgstr "Kaart: %d%% allalaaditud" -#: src/multiint.cpp:3803 +#: src/multiint.cpp:3820 msgid "HOST" msgstr "VÕÕRUSTJA" +#: src/multiint.cpp:3827 +#: src/multimenu.cpp:772 +msgid "Ping" +msgstr "Ping" + #: src/multijoin.cpp:100 #: src/multijoin.cpp:101 msgid "Players Still Joining" @@ -14445,17 +14450,17 @@ msgstr "%s Lahkus mängust" msgid "File transfer has been aborted for %d." msgstr "%d -le Failide saatmine katkestatud." -#: src/multijoin.cpp:376 +#: src/multijoin.cpp:373 #, c-format msgid "%s (%u) has an incompatible mod, and has been kicked." msgstr "Mängijal %s (%u) on vale mod ja ta löödi mängust välja" -#: src/multijoin.cpp:415 +#: src/multijoin.cpp:412 #, c-format msgid "%s is Joining the Game" msgstr "%s Liitus Mänguga" -#: src/multijoin.cpp:425 +#: src/multijoin.cpp:422 msgid "System message:" msgstr "Süsteemi sõnum:" @@ -14568,10 +14573,6 @@ msgstr "Tapmisi" msgid "Units" msgstr "Üksusi" -#: src/multimenu.cpp:772 -msgid "Ping" -msgstr "Ping" - #: src/multimenu.cpp:776 msgid "Structs" msgstr "Ehitisi" @@ -14605,83 +14606,83 @@ msgstr "Anna Mängijale Energiat" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "Mängija %s väljalöömine, sest ta proovis infokontrollist mõõda pääseda!" -#: src/multiplay.cpp:1146 +#: src/multiplay.cpp:1057 msgid "(allies" msgstr "(Liitlased" -#: src/multiplay.cpp:1154 +#: src/multiplay.cpp:1065 msgid "(private to " msgstr "(eraviisiline" -#: src/multiplay.cpp:1167 +#: src/multiplay.cpp:1078 msgid "[invalid]" msgstr "[kehtetu]" -#: src/multiplay.cpp:2057 +#: src/multiplay.cpp:1942 msgid "Green" msgstr "Roheline" -#: src/multiplay.cpp:2058 +#: src/multiplay.cpp:1943 msgid "Orange" msgstr "Oranð" -#: src/multiplay.cpp:2059 +#: src/multiplay.cpp:1944 msgid "Grey" msgstr "Hall" -#: src/multiplay.cpp:2060 +#: src/multiplay.cpp:1945 msgid "Black" msgstr "Must" -#: src/multiplay.cpp:2061 +#: src/multiplay.cpp:1946 msgid "Red" msgstr "Punane" -#: src/multiplay.cpp:2062 +#: src/multiplay.cpp:1947 msgid "Blue" msgstr "Sinine" -#: src/multiplay.cpp:2063 +#: src/multiplay.cpp:1948 msgid "Pink" msgstr "Roosa" -#: src/multiplay.cpp:2064 +#: src/multiplay.cpp:1949 msgid "Cyan" msgstr "Helesinine" -#: src/multiplay.cpp:2065 +#: src/multiplay.cpp:1950 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:2066 +#: src/multiplay.cpp:1951 msgid "Purple" msgstr "" -#: src/multiplay.cpp:2067 +#: src/multiplay.cpp:1952 msgid "White" msgstr "" -#: src/multiplay.cpp:2068 +#: src/multiplay.cpp:1953 msgid "Bright blue" msgstr "" -#: src/multiplay.cpp:2069 +#: src/multiplay.cpp:1954 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:2070 +#: src/multiplay.cpp:1955 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:2071 +#: src/multiplay.cpp:1956 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:2072 +#: src/multiplay.cpp:1957 msgid "Brown" msgstr "" -#: src/order.cpp:841 +#: src/order.cpp:800 msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "" @@ -14816,20 +14817,20 @@ msgstr "Totaalne Mänguaeg - %s" msgid "You cheated!" msgstr "Sa Tegid Sohki!" -#: src/scriptfuncs.cpp:3250 +#: src/scriptfuncs.cpp:3287 msgid "YOU ARE VICTORIOUS!" msgstr "SA OLED VÕIDUKAS" -#: src/scriptfuncs.cpp:3254 +#: src/scriptfuncs.cpp:3291 msgid "YOU WERE DEFEATED!" msgstr "SIND VÕIDETI!" -#: src/scriptfuncs.cpp:9500 +#: src/scriptfuncs.cpp:9537 #, c-format msgid "Beacon received from %s!" msgstr "Signaal saadud %s -lt!" -#: src/scriptfuncs.cpp:9546 +#: src/scriptfuncs.cpp:9583 #, c-format msgid "Beacon %d" msgstr "Signaal %d" @@ -14858,63 +14859,63 @@ msgstr "Võimetu leidma Sensorüksusi!" msgid "Unable to locate any Commanders!" msgstr "Võimetu leidma Komandöre!" -#: src/structure.cpp:2615 +#: src/structure.cpp:2614 #, fuzzy msgid "Command Control Limit Reached - Production Halted" msgstr "Kontroll Limiit Saavutatud - Tootmine Peatatud" -#: src/structure.cpp:5815 -#: src/structure.cpp:5840 +#: src/structure.cpp:5806 +#: src/structure.cpp:5831 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" msgstr[0] "%s - %u Üksus määratud" msgstr[1] "%s - %u Üksused määratud" -#: src/structure.cpp:5845 -#: src/structure.cpp:5913 -#: src/structure.cpp:5929 -#: src/structure.cpp:5943 +#: src/structure.cpp:5836 +#: src/structure.cpp:5904 +#: src/structure.cpp:5920 +#: src/structure.cpp:5934 #, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - Kahju %3.0f%%" -#: src/structure.cpp:5895 +#: src/structure.cpp:5886 #, c-format msgid "%s - Connected %u of %u" msgstr "%s - %u Ühendatud %u -st" -#: src/structure.cpp:6059 -#: src/structure.cpp:6104 +#: src/structure.cpp:6050 +#: src/structure.cpp:6095 #, c-format msgid "%s - Electronically Damaged" msgstr "%s - Elektrooniliselt Kahjustatud" -#: src/structure.cpp:6341 +#: src/structure.cpp:6332 msgid "Electronic Reward - Visibility Report" msgstr "Elektrooniline Autasu - Nägemis Raport" -#: src/structure.cpp:6381 +#: src/structure.cpp:6372 msgid "Factory Reward - Propulsion" msgstr "Tehase Auhind - Liikumissüsteem" -#: src/structure.cpp:6405 +#: src/structure.cpp:6396 msgid "Factory Reward - Body" msgstr "Tehase Autasu - Kere" -#: src/structure.cpp:6429 +#: src/structure.cpp:6420 msgid "Factory Reward - Weapon" msgstr "Tehase Autasu - Relv" -#: src/structure.cpp:6438 +#: src/structure.cpp:6429 msgid "Factory Reward - Nothing" msgstr "Tehase Autasu - Midagi" -#: src/structure.cpp:6466 +#: src/structure.cpp:6457 msgid "Repair Facility Award - Repair" msgstr "Remontimiskeskuse Autasu - Remont" -#: src/structure.cpp:6473 +#: src/structure.cpp:6464 msgid "Repair Facility Award - Nothing" msgstr "Remontimiskeskuse Autasu - Midagi" diff --git a/po/fi.po b/po/fi.po index 4c574d940..dea342207 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-01-18 00:54+0100\n" +"POT-Creation-Date: 2011-02-25 23:35+0100\n" "PO-Revision-Date: 2008-05-09 10:33+0000\n" "Last-Translator: Lartza \n" "Language-Team: Finnish \n" @@ -5730,7 +5730,7 @@ msgid "New Design" msgstr "" #: data/base/messages/strings/names.txt:15 -#: src/design.cpp:1313 +#: src/design.cpp:1275 msgid "Transport" msgstr "" @@ -12015,26 +12015,26 @@ msgid "System locale" msgstr "" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1043 +#: lib/netplay/netplay.cpp:1042 msgid "Enter password here" msgstr "" -#: lib/netplay/netplay.cpp:2048 +#: lib/netplay/netplay.cpp:2060 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "" -#: lib/netplay/netplay.cpp:2062 +#: lib/netplay/netplay.cpp:2082 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "" #: src/challenge.cpp:184 -#: src/hci.cpp:922 -#: src/hci.cpp:3390 -#: src/hci.cpp:3513 -#: src/hci.cpp:3924 -#: src/hci.cpp:4942 +#: src/hci.cpp:916 +#: src/hci.cpp:3378 +#: src/hci.cpp:3501 +#: src/hci.cpp:3912 +#: src/hci.cpp:4930 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12186,151 +12186,151 @@ msgstr "" #: src/configuration.cpp:393 #: src/configuration.cpp:394 -#: src/multistat.cpp:130 +#: src/multistat.cpp:124 msgid "Player" msgstr "Pelaaja" -#: src/design.cpp:449 -#: src/design.cpp:469 -#: src/design.cpp:3501 +#: src/design.cpp:443 +#: src/design.cpp:455 +#: src/design.cpp:3464 msgid "New Vehicle" msgstr "" -#: src/design.cpp:515 +#: src/design.cpp:500 msgid "Vehicle Body" msgstr "" -#: src/design.cpp:535 +#: src/design.cpp:520 msgid "Vehicle Propulsion" msgstr "" -#: src/design.cpp:556 -#: src/design.cpp:579 -#: src/design.cpp:603 +#: src/design.cpp:541 +#: src/design.cpp:564 +#: src/design.cpp:588 msgid "Vehicle Turret" msgstr "" -#: src/design.cpp:622 +#: src/design.cpp:607 msgid "Delete Design" msgstr "" -#: src/design.cpp:673 -#: src/design.cpp:720 +#: src/design.cpp:658 +#: src/design.cpp:705 #, fuzzy msgid "Kinetic Armour" msgstr "Kineettinen panssari" -#: src/design.cpp:682 -#: src/design.cpp:730 +#: src/design.cpp:667 +#: src/design.cpp:715 #, fuzzy msgid "Thermal Armour" msgstr "Lämpöpanssari" -#: src/design.cpp:698 -#: src/design.cpp:750 +#: src/design.cpp:683 +#: src/design.cpp:735 msgid "Engine Output" msgstr "" -#: src/design.cpp:706 -#: src/design.cpp:759 -#: src/design.cpp:1529 -#: src/design.cpp:1553 -#: src/design.cpp:1574 -#: src/design.cpp:1590 -#: src/design.cpp:1610 -#: src/design.cpp:1627 -#: src/design.cpp:1647 -#: src/design.cpp:1664 -#: src/design.cpp:1705 -#: src/design.cpp:1737 -#: src/design.cpp:1869 -#: src/design.cpp:1885 -#: src/design.cpp:1923 -#: src/design.cpp:1956 +#: src/design.cpp:691 +#: src/design.cpp:744 +#: src/design.cpp:1486 +#: src/design.cpp:1510 +#: src/design.cpp:1531 +#: src/design.cpp:1547 +#: src/design.cpp:1567 +#: src/design.cpp:1584 +#: src/design.cpp:1604 +#: src/design.cpp:1621 +#: src/design.cpp:1662 +#: src/design.cpp:1694 +#: src/design.cpp:1826 +#: src/design.cpp:1842 +#: src/design.cpp:1880 +#: src/design.cpp:1913 msgid "Weight" msgstr "Paino" -#: src/design.cpp:790 -#: src/design.cpp:808 +#: src/design.cpp:775 +#: src/design.cpp:793 msgid "Total Power Required" msgstr "" -#: src/design.cpp:821 -#: src/design.cpp:840 +#: src/design.cpp:806 +#: src/design.cpp:825 msgid "Total Body Points" msgstr "" -#: src/design.cpp:1027 -#: src/design.cpp:1059 +#: src/design.cpp:996 +#: src/design.cpp:1025 msgid "Power Usage" msgstr "" -#: src/design.cpp:1335 +#: src/design.cpp:1298 msgid "Hydra " msgstr "" -#: src/design.cpp:1509 -#: src/design.cpp:1537 +#: src/design.cpp:1466 +#: src/design.cpp:1494 msgid "Sensor Range" msgstr "" -#: src/design.cpp:1521 -#: src/design.cpp:1545 +#: src/design.cpp:1478 +#: src/design.cpp:1502 msgid "Sensor Power" msgstr "" -#: src/design.cpp:1566 -#: src/design.cpp:1582 +#: src/design.cpp:1523 +#: src/design.cpp:1539 msgid "ECM Power" msgstr "" -#: src/design.cpp:1602 -#: src/design.cpp:1619 -#: src/design.cpp:1639 -#: src/design.cpp:1656 +#: src/design.cpp:1559 +#: src/design.cpp:1576 +#: src/design.cpp:1596 +#: src/design.cpp:1613 msgid "Build Points" msgstr "" -#: src/design.cpp:1677 -#: src/design.cpp:1713 +#: src/design.cpp:1634 +#: src/design.cpp:1670 msgid "Range" msgstr "" -#: src/design.cpp:1689 -#: src/design.cpp:1721 +#: src/design.cpp:1646 +#: src/design.cpp:1678 msgid "Damage" msgstr "Vahinko" -#: src/design.cpp:1697 -#: src/design.cpp:1729 +#: src/design.cpp:1654 +#: src/design.cpp:1686 msgid "Rate-of-Fire" msgstr "" -#: src/design.cpp:1857 -#: src/design.cpp:1877 +#: src/design.cpp:1814 +#: src/design.cpp:1834 msgid "Air Speed" msgstr "" -#: src/design.cpp:1895 -#: src/design.cpp:1932 +#: src/design.cpp:1852 +#: src/design.cpp:1889 msgid "Road Speed" msgstr "" -#: src/design.cpp:1905 -#: src/design.cpp:1940 +#: src/design.cpp:1862 +#: src/design.cpp:1897 msgid "Off-Road Speed" msgstr "" -#: src/design.cpp:1913 -#: src/design.cpp:1948 +#: src/design.cpp:1870 +#: src/design.cpp:1905 msgid "Water Speed" msgstr "" -#: src/design.cpp:2074 +#: src/design.cpp:2031 msgid "Weapons" msgstr "" -#: src/design.cpp:2094 +#: src/design.cpp:2051 msgid "Systems" msgstr "" @@ -12345,7 +12345,7 @@ msgid "Player dropped" msgstr "Pelaaja" #: src/display3d.cpp:599 -#: src/multiint.cpp:2116 +#: src/multiint.cpp:2125 msgid "Waiting for other players" msgstr "" @@ -12353,116 +12353,116 @@ msgstr "" msgid "Out of sync" msgstr "" -#: src/display.cpp:1651 +#: src/display.cpp:1649 msgid "Cannot Build. Oil Resource Burning." msgstr "" -#: src/display.cpp:1830 -#: src/display.cpp:2423 +#: src/display.cpp:1828 +#: src/display.cpp:2421 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - Vahinko %d%% - Kokemus %d, %s" -#: src/display.cpp:1846 +#: src/display.cpp:1844 #, fuzzy, c-format msgid "%s - Allied - Damage %d%% - Experience %d, %s" msgstr "%s - Vahinko %d%% - Kokemus %d, %s" -#: src/display.cpp:2044 +#: src/display.cpp:2042 msgid "Truck ordered to build Oil Derrick" msgstr "" -#: src/display.cpp:2045 +#: src/display.cpp:2043 msgid "2 trucks ordered to build Oil Derrick" msgstr "" -#: src/display.cpp:2046 +#: src/display.cpp:2044 #, c-format msgid "%d trucks ordered to build Oil Derrick" msgstr "" -#: src/droid.cpp:208 +#: src/droid.cpp:211 msgid "Unit Lost!" msgstr "" -#: src/droid.cpp:1370 +#: src/droid.cpp:1376 msgid "Structure Restored" msgstr "" -#: src/droid.cpp:2712 +#: src/droid.cpp:2732 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:2725 +#: src/droid.cpp:2745 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:2738 +#: src/droid.cpp:2758 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:2742 +#: src/droid.cpp:2762 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:3080 +#: src/droid.cpp:3093 msgid "Rookie" msgstr "" -#: src/droid.cpp:3081 +#: src/droid.cpp:3094 msgctxt "rank" msgid "Green" msgstr "" -#: src/droid.cpp:3082 +#: src/droid.cpp:3095 msgid "Trained" msgstr "" -#: src/droid.cpp:3083 +#: src/droid.cpp:3096 msgid "Regular" msgstr "" -#: src/droid.cpp:3084 +#: src/droid.cpp:3097 #, fuzzy msgid "Professional" msgstr "Ammattilainen" -#: src/droid.cpp:3085 +#: src/droid.cpp:3098 #, fuzzy msgid "Veteran" msgstr "Veteraani" -#: src/droid.cpp:3086 +#: src/droid.cpp:3099 #, fuzzy msgid "Elite" msgstr "Eliitti" -#: src/droid.cpp:3087 +#: src/droid.cpp:3100 msgid "Special" msgstr "" -#: src/droid.cpp:3088 +#: src/droid.cpp:3101 msgid "Hero" msgstr "Sankari" -#: src/droid.cpp:4110 +#: src/droid.cpp:4123 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "" -#: src/droid.cpp:4114 +#: src/droid.cpp:4127 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "" @@ -12483,7 +12483,7 @@ msgid "Tutorial" msgstr "" #: src/frontend.cpp:100 -#: src/hci.cpp:3499 +#: src/hci.cpp:3487 msgid "Options" msgstr "Asetukset" @@ -12534,7 +12534,7 @@ msgid "Challenges" msgstr "" #: src/frontend.cpp:215 -#: src/ingameop.cpp:275 +#: src/ingameop.cpp:272 msgid "Load Game" msgstr "Lataa peli" @@ -12543,9 +12543,9 @@ msgid "SINGLE PLAYER" msgstr "YKSINPELI" #: src/frontend.cpp:303 -#: src/ingameop.cpp:498 -#: src/mission.cpp:2527 -#: src/mission.cpp:2630 +#: src/ingameop.cpp:494 +#: src/mission.cpp:2493 +#: src/mission.cpp:2596 msgid "Load Saved Game" msgstr "Lataa tallennettu peli" @@ -12562,7 +12562,7 @@ msgid "Join Game" msgstr "Liity peliin" #: src/frontend.cpp:422 -#: src/multiint.cpp:1276 +#: src/multiint.cpp:1285 msgid "OPTIONS" msgstr "ASETUKSET" @@ -12580,7 +12580,7 @@ msgid "Video Options" msgstr "Peliasetukset" #: src/frontend.cpp:426 -#: src/ingameop.cpp:270 +#: src/ingameop.cpp:267 msgid "Audio Options" msgstr "" @@ -12659,7 +12659,7 @@ msgid "Off" msgstr "Pois päältä" #: src/frontend.cpp:523 -#: src/multiint.cpp:1345 +#: src/multiint.cpp:1354 msgid "Fog" msgstr "Sumu" @@ -12670,7 +12670,7 @@ msgstr "" #: src/frontend.cpp:530 #: src/frontend.cpp:595 -#: src/multiint.cpp:1347 +#: src/multiint.cpp:1356 msgid "Fog Of War" msgstr "" @@ -12836,203 +12836,203 @@ msgid "GAME OPTIONS" msgstr "PELIASETUKSET" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2389 +#: src/multiint.cpp:2398 msgid "Mod: " msgstr "" -#: src/hci.cpp:1245 +#: src/hci.cpp:1237 #, fuzzy msgid "MAP SAVED!" msgstr "Peli tallennettu" -#: src/hci.cpp:1584 +#: src/hci.cpp:1573 #: src/loop.cpp:558 #: src/loop.cpp:574 #, fuzzy msgid "GAME SAVED: " msgstr "Peli tallennettu" -#: src/hci.cpp:1971 +#: src/hci.cpp:1960 msgid "Failed to create building" msgstr "" -#: src/hci.cpp:1988 +#: src/hci.cpp:1977 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new structure: %s." msgstr "" -#: src/hci.cpp:2003 +#: src/hci.cpp:1992 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new feature: %s." msgstr "" -#: src/hci.cpp:2025 +#: src/hci.cpp:2014 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid: %s." msgstr "" -#: src/hci.cpp:2036 +#: src/hci.cpp:2025 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "" -#: src/hci.cpp:3310 +#: src/hci.cpp:3298 msgid "Commanders (F6)" msgstr "Komentajat (F6)" -#: src/hci.cpp:3323 +#: src/hci.cpp:3311 msgid "Intelligence Display (F5)" msgstr "" -#: src/hci.cpp:3336 +#: src/hci.cpp:3324 msgid "Manufacture (F1)" msgstr "Valmista (F1)" -#: src/hci.cpp:3349 +#: src/hci.cpp:3337 msgid "Design (F4)" msgstr "Suunnittele (F4)" -#: src/hci.cpp:3362 +#: src/hci.cpp:3350 msgid "Research (F2)" msgstr "Tutki (F2)" -#: src/hci.cpp:3375 +#: src/hci.cpp:3363 msgid "Build (F3)" msgstr "Rakenna (F3)" -#: src/hci.cpp:3446 -#: src/multiint.cpp:1392 +#: src/hci.cpp:3434 +#: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "" -#: src/hci.cpp:3537 +#: src/hci.cpp:3525 msgid "Map:" msgstr "" -#: src/hci.cpp:3550 +#: src/hci.cpp:3538 #, fuzzy msgid "Load" msgstr "Lataa peli" -#: src/hci.cpp:3551 +#: src/hci.cpp:3539 #, fuzzy msgid "Load Map File" msgstr "Lataa peli" -#: src/hci.cpp:3558 +#: src/hci.cpp:3546 #, fuzzy msgid "Save" msgstr "Tallenna peli" -#: src/hci.cpp:3559 +#: src/hci.cpp:3547 #, fuzzy msgid "Save Map File" msgstr "Tallenna peli" -#: src/hci.cpp:3567 +#: src/hci.cpp:3555 msgid "New" msgstr "" -#: src/hci.cpp:3568 +#: src/hci.cpp:3556 msgid "New Blank Map" msgstr "" -#: src/hci.cpp:3604 +#: src/hci.cpp:3592 msgid "Tile" msgstr "" -#: src/hci.cpp:3605 +#: src/hci.cpp:3593 msgid "Place tiles on map" msgstr "" -#: src/hci.cpp:3614 +#: src/hci.cpp:3602 #, fuzzy msgid "Unit" msgstr "Yksikkö" -#: src/hci.cpp:3615 +#: src/hci.cpp:3603 msgid "Place Unit on map" msgstr "" -#: src/hci.cpp:3623 +#: src/hci.cpp:3611 msgid "Struct" msgstr "" -#: src/hci.cpp:3624 +#: src/hci.cpp:3612 #, fuzzy msgid "Place Structures on map" msgstr "Vihollisrakennukset: %u" -#: src/hci.cpp:3632 +#: src/hci.cpp:3620 msgid "Feat" msgstr "" -#: src/hci.cpp:3633 +#: src/hci.cpp:3621 msgid "Place Features on map" msgstr "" -#: src/hci.cpp:3643 +#: src/hci.cpp:3631 msgid "Pause" msgstr "" -#: src/hci.cpp:3644 +#: src/hci.cpp:3632 msgid "Pause or unpause the game" msgstr "" -#: src/hci.cpp:3658 +#: src/hci.cpp:3646 msgid "Align height of all map objects" msgstr "" -#: src/hci.cpp:3668 +#: src/hci.cpp:3656 msgid "Edit" msgstr "" -#: src/hci.cpp:3669 +#: src/hci.cpp:3657 #, fuzzy msgid "Start Edit Mode" msgstr "Aloita ilman tukikohtaa" -#: src/hci.cpp:3683 +#: src/hci.cpp:3671 #: src/ingameop.cpp:112 -#: src/ingameop.cpp:258 -#: src/ingameop.cpp:263 +#: src/ingameop.cpp:256 +#: src/ingameop.cpp:260 msgid "Quit" msgstr "Lopeta" -#: src/hci.cpp:3684 +#: src/hci.cpp:3672 msgid "Exit Game" msgstr "Poistu pelistä" -#: src/hci.cpp:3710 +#: src/hci.cpp:3698 #, fuzzy msgid "Current Player:" msgstr "Moninpelikampanja" -#: src/hci.cpp:4001 +#: src/hci.cpp:3989 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "Edistymispalkki" -#: src/hci.cpp:4867 +#: src/hci.cpp:4855 msgid "Factory Delivery Point" msgstr "" -#: src/hci.cpp:4885 +#: src/hci.cpp:4873 msgid "Loop Production" msgstr "Jatkuva tuotanto" -#: src/hci.cpp:4965 +#: src/hci.cpp:4953 msgid "Tab Scroll left" msgstr "" -#: src/hci.cpp:4980 +#: src/hci.cpp:4968 msgid "Tab Scroll right" msgstr "" #: src/ingameop.cpp:111 -#: src/ingameop.cpp:193 -#: src/ingameop.cpp:267 +#: src/ingameop.cpp:195 +#: src/ingameop.cpp:264 msgid "Resume Game" msgstr "" @@ -13040,32 +13040,32 @@ msgstr "" msgid "WARNING: You're the host. If you quit, the game ends for everyone!" msgstr "" -#: src/ingameop.cpp:185 -#: src/ingameop.cpp:527 +#: src/ingameop.cpp:186 +#: src/ingameop.cpp:523 msgid "Tactical UI (Target Origin Icon): Show" msgstr "" -#: src/ingameop.cpp:190 -#: src/ingameop.cpp:531 +#: src/ingameop.cpp:191 +#: src/ingameop.cpp:527 msgid "Tactical UI (Target Origin Icon): Hide" msgstr "" -#: src/ingameop.cpp:277 -#: src/ingameop.cpp:502 -#: src/mission.cpp:2514 -#: src/mission.cpp:2633 +#: src/ingameop.cpp:274 +#: src/ingameop.cpp:498 +#: src/mission.cpp:2480 +#: src/mission.cpp:2599 msgid "Save Game" msgstr "Tallenna peli" -#: src/ingameop.cpp:343 +#: src/ingameop.cpp:339 msgid "Host has quit the game!" msgstr "" -#: src/ingameop.cpp:349 +#: src/ingameop.cpp:345 msgid "The game can't continue without the host." msgstr "" -#: src/ingameop.cpp:355 +#: src/ingameop.cpp:351 msgid "--> QUIT <--" msgstr "" @@ -13441,52 +13441,52 @@ msgstr "" msgid "Screen shake when things die: On" msgstr "" -#: src/keybind.cpp:2603 -#: src/keybind.cpp:2646 +#: src/keybind.cpp:2604 +#: src/keybind.cpp:2647 msgid "Sorry, but game speed cannot be changed in multiplayer." msgstr "" -#: src/keybind.cpp:2624 -#: src/keybind.cpp:2667 -#: src/keybind.cpp:2689 +#: src/keybind.cpp:2625 +#: src/keybind.cpp:2668 +#: src/keybind.cpp:2690 msgid "Game Speed Reset" msgstr "" -#: src/keybind.cpp:2628 +#: src/keybind.cpp:2629 #, c-format msgid "Game Speed Increased to %3.1f" msgstr "" -#: src/keybind.cpp:2671 +#: src/keybind.cpp:2672 #, c-format msgid "Game Speed Reduced to %3.1f" msgstr "" -#: src/keybind.cpp:2701 +#: src/keybind.cpp:2702 msgid "Radar showing friend-foe colors" msgstr "" -#: src/keybind.cpp:2705 +#: src/keybind.cpp:2706 msgid "Radar showing player colors" msgstr "" -#: src/keybind.cpp:2726 +#: src/keybind.cpp:2727 msgid "Radar showing only objects" msgstr "" -#: src/keybind.cpp:2729 +#: src/keybind.cpp:2730 msgid "Radar blending terrain and height" msgstr "" -#: src/keybind.cpp:2732 +#: src/keybind.cpp:2733 msgid "Radar showing terrain" msgstr "" -#: src/keybind.cpp:2735 +#: src/keybind.cpp:2736 msgid "Radar showing revealed terrain" msgstr "" -#: src/keybind.cpp:2738 +#: src/keybind.cpp:2739 msgid "Radar showing height" msgstr "" @@ -13495,9 +13495,9 @@ msgid "KEY MAPPING" msgstr "" #: src/keyedit.cpp:372 -#: src/multiint.cpp:662 -#: src/multiint.cpp:1072 -#: src/multiint.cpp:1478 +#: src/multiint.cpp:671 +#: src/multiint.cpp:1081 +#: src/multiint.cpp:1487 msgid "Return To Previous Screen" msgstr "" @@ -13987,37 +13987,37 @@ msgstr "" msgid "Could not save game!" msgstr "Lataa tallennettu peli" -#: src/mission.cpp:2075 +#: src/mission.cpp:2041 msgid "Load Transport" msgstr "Lastaa kuljetus" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED" msgstr "" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED--and you cheated!" msgstr "" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED" msgstr "" -#: src/mission.cpp:2493 -#: src/mission.cpp:2533 -#: src/mission.cpp:2647 +#: src/mission.cpp:2459 +#: src/mission.cpp:2499 +#: src/mission.cpp:2613 msgid "Quit To Main Menu" msgstr "Poistu päävalikkoon" -#: src/mission.cpp:2501 +#: src/mission.cpp:2467 msgid "Continue Game" msgstr "Jatka peliä" -#: src/mission.cpp:2598 +#: src/mission.cpp:2564 #, fuzzy msgid "GAME SAVED :" msgstr "Peli tallennettu" @@ -14077,348 +14077,353 @@ msgstr "" msgid "You Discover Blueprints For %s" msgstr "" -#: src/multiint.cpp:600 +#: src/multiint.cpp:609 #: src/multilimit.cpp:190 msgid "Accept Settings" msgstr "Hyväksy asetukset" -#: src/multiint.cpp:602 -#: src/multiint.cpp:1117 +#: src/multiint.cpp:611 +#: src/multiint.cpp:1126 #, fuzzy msgid "Cancel" msgstr "Syaani" -#: src/multiint.cpp:613 +#: src/multiint.cpp:622 msgid "IP Address or Machine Name" msgstr "" -#: src/multiint.cpp:659 +#: src/multiint.cpp:668 msgid "CONNECTION" msgstr "YHTEYS" -#: src/multiint.cpp:664 +#: src/multiint.cpp:673 msgid "Lobby" msgstr "Aula" -#: src/multiint.cpp:665 +#: src/multiint.cpp:674 msgid "IP" msgstr "" -#: src/multiint.cpp:854 +#: src/multiint.cpp:863 msgid "No games are available" msgstr "" -#: src/multiint.cpp:857 +#: src/multiint.cpp:866 msgid "Game is full" msgstr "" -#: src/multiint.cpp:861 +#: src/multiint.cpp:870 msgid "You were kicked!" msgstr "" -#: src/multiint.cpp:864 +#: src/multiint.cpp:873 msgid "Wrong Game Version!" msgstr "" -#: src/multiint.cpp:867 +#: src/multiint.cpp:876 msgid "You have an incompatible mod." msgstr "" -#: src/multiint.cpp:871 +#: src/multiint.cpp:880 msgid "Host couldn't send file?" msgstr "" -#: src/multiint.cpp:875 +#: src/multiint.cpp:884 msgid "Incorrect Password!" msgstr "" -#: src/multiint.cpp:878 +#: src/multiint.cpp:887 msgid "Host has dropped connection!" msgstr "" -#: src/multiint.cpp:882 +#: src/multiint.cpp:891 msgid "Connection Error" msgstr "" -#: src/multiint.cpp:1012 +#: src/multiint.cpp:1021 msgid "Searching" msgstr "Etsitään" -#: src/multiint.cpp:1069 +#: src/multiint.cpp:1078 msgid "GAMES" msgstr "" -#: src/multiint.cpp:1077 +#: src/multiint.cpp:1086 msgid "Refresh Games List" msgstr "" -#: src/multiint.cpp:1097 +#: src/multiint.cpp:1106 msgid "Enter Password:" msgstr "" -#: src/multiint.cpp:1115 +#: src/multiint.cpp:1124 msgid "OK" msgstr "" -#: src/multiint.cpp:1232 +#: src/multiint.cpp:1241 msgid "Tanks disabled!!" msgstr "" -#: src/multiint.cpp:1233 +#: src/multiint.cpp:1242 msgid "Cyborgs disabled." msgstr "" -#: src/multiint.cpp:1234 +#: src/multiint.cpp:1243 msgid "VTOLs disabled." msgstr "" -#: src/multiint.cpp:1281 -#: src/multiint.cpp:1288 +#: src/multiint.cpp:1290 +#: src/multiint.cpp:1297 msgid "Select Game Name" msgstr "" -#: src/multiint.cpp:1281 +#: src/multiint.cpp:1290 msgid "One-Player Skirmish" msgstr "" -#: src/multiint.cpp:1291 +#: src/multiint.cpp:1300 msgid "Select Map" msgstr "Valitse kartta" -#: src/multiint.cpp:1299 +#: src/multiint.cpp:1308 msgid "Click to set Password" msgstr "" -#: src/multiint.cpp:1309 -#: src/multiint.cpp:1310 +#: src/multiint.cpp:1318 +#: src/multiint.cpp:1319 msgid "Scavengers" msgstr "" -#: src/multiint.cpp:1312 +#: src/multiint.cpp:1321 msgid "No Scavengers" msgstr "" -#: src/multiint.cpp:1342 +#: src/multiint.cpp:1351 #, fuzzy msgid "Select Player Name" msgstr "Valitse pelaajan nimi" -#: src/multiint.cpp:1348 +#: src/multiint.cpp:1357 msgid "Distance Fog" msgstr "" -#: src/multiint.cpp:1359 +#: src/multiint.cpp:1368 #: src/multimenu.cpp:756 msgid "Alliances" msgstr "Liittoumat" -#: src/multiint.cpp:1362 +#: src/multiint.cpp:1371 msgid "No Alliances" msgstr "Ei liittoumia" -#: src/multiint.cpp:1364 +#: src/multiint.cpp:1373 msgid "Allow Alliances" msgstr "Salli liittoumat" -#: src/multiint.cpp:1368 +#: src/multiint.cpp:1377 msgid "Locked Teams" msgstr "" -#: src/multiint.cpp:1394 +#: src/multiint.cpp:1403 msgid "Low Power Levels" msgstr "" -#: src/multiint.cpp:1396 +#: src/multiint.cpp:1405 msgid "Medium Power Levels" msgstr "" -#: src/multiint.cpp:1398 +#: src/multiint.cpp:1407 msgid "High Power Levels" msgstr "" -#: src/multiint.cpp:1430 +#: src/multiint.cpp:1439 msgid "Base" msgstr "Tukikohta" -#: src/multiint.cpp:1432 +#: src/multiint.cpp:1441 msgid "Start with No Bases" msgstr "Aloita ilman tukikohtaa" -#: src/multiint.cpp:1434 +#: src/multiint.cpp:1443 msgid "Start with Bases" msgstr "" -#: src/multiint.cpp:1436 +#: src/multiint.cpp:1445 msgid "Start with Advanced Bases" msgstr "" -#: src/multiint.cpp:1468 +#: src/multiint.cpp:1477 msgid "Map Preview" msgstr "" -#: src/multiint.cpp:1470 +#: src/multiint.cpp:1479 msgid "Click to see Map" msgstr "" -#: src/multiint.cpp:1484 +#: src/multiint.cpp:1493 msgid "Start Hosting Game" msgstr "" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 #, fuzzy msgid "Show Structure Limits" msgstr "Omat rakennukset: %u" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 msgid "Set Structure Limits" msgstr "" -#: src/multiint.cpp:1587 +#: src/multiint.cpp:1596 msgid "DIFFICULTY" msgstr "" -#: src/multiint.cpp:1601 +#: src/multiint.cpp:1610 msgid "Less aggressive and starts with less units" msgstr "" -#: src/multiint.cpp:1602 +#: src/multiint.cpp:1611 #, fuzzy msgid "Plays nice" msgstr "Pelaaja" -#: src/multiint.cpp:1603 +#: src/multiint.cpp:1612 msgid "No holds barred" msgstr "" -#: src/multiint.cpp:1604 +#: src/multiint.cpp:1613 msgid "Starts with advantages and gets twice as much oil from derricks" msgstr "" -#: src/multiint.cpp:1632 +#: src/multiint.cpp:1641 msgid "CHOOSE AI" msgstr "" -#: src/multiint.cpp:1648 +#: src/multiint.cpp:1657 msgid "Allow human players to join in this slot" msgstr "" -#: src/multiint.cpp:1656 +#: src/multiint.cpp:1665 msgid "Leave this slot unused" msgstr "" -#: src/multiint.cpp:1736 +#: src/multiint.cpp:1745 #, fuzzy msgid "Player colour" msgstr "Pelaaja" -#: src/multiint.cpp:2062 +#: src/multiint.cpp:2071 msgid "Team" msgstr "" -#: src/multiint.cpp:2074 +#: src/multiint.cpp:2083 #, fuzzy msgid "Kick player" msgstr "Moninpelikampanja" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 #, fuzzy msgid "Click to change difficulty" msgstr "Pelaaja" -#: src/multiint.cpp:2121 +#: src/multiint.cpp:2130 msgid "Click when ready" msgstr "" -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2134 msgid "READY?" msgstr "" -#: src/multiint.cpp:2169 +#: src/multiint.cpp:2178 msgid "PLAYERS" msgstr "PELAAJAT" -#: src/multiint.cpp:2204 +#: src/multiint.cpp:2213 msgid "Click to change to this slot" msgstr "" -#: src/multiint.cpp:2232 +#: src/multiint.cpp:2241 msgid "Choose Team" msgstr "" -#: src/multiint.cpp:2262 +#: src/multiint.cpp:2271 msgid "Click to change player colour" msgstr "" -#: src/multiint.cpp:2290 +#: src/multiint.cpp:2299 #, fuzzy msgid "Click to change player position" msgstr "Pelaaja" -#: src/multiint.cpp:2296 +#: src/multiint.cpp:2305 #, fuzzy msgid "Click to change AI" msgstr "Pelaaja" -#: src/multiint.cpp:2300 +#: src/multiint.cpp:2309 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2362 +#: src/multiint.cpp:2371 msgid "CHAT" msgstr "" -#: src/multiint.cpp:2394 +#: src/multiint.cpp:2403 msgid "All players need to have the same mods to join your game." msgstr "" -#: src/multiint.cpp:2552 +#: src/multiint.cpp:2561 #, c-format msgid "*** password [%s] is now required! ***" msgstr "" -#: src/multiint.cpp:2560 +#: src/multiint.cpp:2569 msgid "*** password is NOT required! ***" msgstr "" -#: src/multiint.cpp:2801 +#: src/multiint.cpp:2810 msgid "Sorry! Failed to host the game." msgstr "" -#: src/multiint.cpp:2922 +#: src/multiint.cpp:2931 msgid "'Locked Teams' mode enabled" msgstr "" -#: src/multiint.cpp:3003 +#: src/multiint.cpp:3012 #, c-format msgid "The host has kicked %s from the game!" msgstr "" -#: src/multiint.cpp:3073 +#: src/multiint.cpp:3082 msgid "Host is Starting Game" msgstr "" -#: src/multiint.cpp:3639 +#: src/multiint.cpp:3648 msgid "Players" msgstr "Pelaajat" -#: src/multiint.cpp:3772 +#: src/multiint.cpp:3786 #, c-format msgid "Sending Map: %d%% " msgstr "" -#: src/multiint.cpp:3780 +#: src/multiint.cpp:3794 #, c-format msgid "Map: %d%% downloaded" msgstr "" -#: src/multiint.cpp:3803 +#: src/multiint.cpp:3820 msgid "HOST" msgstr "" +#: src/multiint.cpp:3827 +#: src/multimenu.cpp:772 +msgid "Ping" +msgstr "" + #: src/multijoin.cpp:100 #: src/multijoin.cpp:101 msgid "Players Still Joining" @@ -14434,17 +14439,17 @@ msgstr "" msgid "File transfer has been aborted for %d." msgstr "" -#: src/multijoin.cpp:376 +#: src/multijoin.cpp:373 #, c-format msgid "%s (%u) has an incompatible mod, and has been kicked." msgstr "" -#: src/multijoin.cpp:415 +#: src/multijoin.cpp:412 #, c-format msgid "%s is Joining the Game" msgstr "" -#: src/multijoin.cpp:425 +#: src/multijoin.cpp:422 msgid "System message:" msgstr "" @@ -14558,10 +14563,6 @@ msgstr "" msgid "Units" msgstr "Yksikkö" -#: src/multimenu.cpp:772 -msgid "Ping" -msgstr "" - #: src/multimenu.cpp:776 msgid "Structs" msgstr "" @@ -14595,84 +14596,84 @@ msgstr "" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "" -#: src/multiplay.cpp:1146 +#: src/multiplay.cpp:1057 #, fuzzy msgid "(allies" msgstr "Liittoumat" -#: src/multiplay.cpp:1154 +#: src/multiplay.cpp:1065 msgid "(private to " msgstr "" -#: src/multiplay.cpp:1167 +#: src/multiplay.cpp:1078 msgid "[invalid]" msgstr "" -#: src/multiplay.cpp:2057 +#: src/multiplay.cpp:1942 msgid "Green" msgstr "Vihreä" -#: src/multiplay.cpp:2058 +#: src/multiplay.cpp:1943 msgid "Orange" msgstr "Oranssi" -#: src/multiplay.cpp:2059 +#: src/multiplay.cpp:1944 msgid "Grey" msgstr "Harmaa" -#: src/multiplay.cpp:2060 +#: src/multiplay.cpp:1945 msgid "Black" msgstr "Musta" -#: src/multiplay.cpp:2061 +#: src/multiplay.cpp:1946 msgid "Red" msgstr "Punainen" -#: src/multiplay.cpp:2062 +#: src/multiplay.cpp:1947 msgid "Blue" msgstr "Sininen" -#: src/multiplay.cpp:2063 +#: src/multiplay.cpp:1948 msgid "Pink" msgstr "Pinkki" -#: src/multiplay.cpp:2064 +#: src/multiplay.cpp:1949 msgid "Cyan" msgstr "Syaani" -#: src/multiplay.cpp:2065 +#: src/multiplay.cpp:1950 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:2066 +#: src/multiplay.cpp:1951 msgid "Purple" msgstr "" -#: src/multiplay.cpp:2067 +#: src/multiplay.cpp:1952 msgid "White" msgstr "" -#: src/multiplay.cpp:2068 +#: src/multiplay.cpp:1953 msgid "Bright blue" msgstr "" -#: src/multiplay.cpp:2069 +#: src/multiplay.cpp:1954 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:2070 +#: src/multiplay.cpp:1955 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:2071 +#: src/multiplay.cpp:1956 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:2072 +#: src/multiplay.cpp:1957 msgid "Brown" msgstr "" -#: src/order.cpp:841 +#: src/order.cpp:800 msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "" @@ -14807,20 +14808,20 @@ msgstr "" msgid "You cheated!" msgstr "" -#: src/scriptfuncs.cpp:3250 +#: src/scriptfuncs.cpp:3287 msgid "YOU ARE VICTORIOUS!" msgstr "" -#: src/scriptfuncs.cpp:3254 +#: src/scriptfuncs.cpp:3291 msgid "YOU WERE DEFEATED!" msgstr "" -#: src/scriptfuncs.cpp:9500 +#: src/scriptfuncs.cpp:9537 #, c-format msgid "Beacon received from %s!" msgstr "" -#: src/scriptfuncs.cpp:9546 +#: src/scriptfuncs.cpp:9583 #, c-format msgid "Beacon %d" msgstr "" @@ -14849,62 +14850,62 @@ msgstr "" msgid "Unable to locate any Commanders!" msgstr "" -#: src/structure.cpp:2615 +#: src/structure.cpp:2614 msgid "Command Control Limit Reached - Production Halted" msgstr "" -#: src/structure.cpp:5815 -#: src/structure.cpp:5840 +#: src/structure.cpp:5806 +#: src/structure.cpp:5831 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" msgstr[0] "" msgstr[1] "" -#: src/structure.cpp:5845 -#: src/structure.cpp:5913 -#: src/structure.cpp:5929 -#: src/structure.cpp:5943 +#: src/structure.cpp:5836 +#: src/structure.cpp:5904 +#: src/structure.cpp:5920 +#: src/structure.cpp:5934 #, c-format msgid "%s - Damage %3.0f%%" msgstr "" -#: src/structure.cpp:5895 +#: src/structure.cpp:5886 #, c-format msgid "%s - Connected %u of %u" msgstr "" -#: src/structure.cpp:6059 -#: src/structure.cpp:6104 +#: src/structure.cpp:6050 +#: src/structure.cpp:6095 #, c-format msgid "%s - Electronically Damaged" msgstr "" -#: src/structure.cpp:6341 +#: src/structure.cpp:6332 msgid "Electronic Reward - Visibility Report" msgstr "" -#: src/structure.cpp:6381 +#: src/structure.cpp:6372 msgid "Factory Reward - Propulsion" msgstr "" -#: src/structure.cpp:6405 +#: src/structure.cpp:6396 msgid "Factory Reward - Body" msgstr "" -#: src/structure.cpp:6429 +#: src/structure.cpp:6420 msgid "Factory Reward - Weapon" msgstr "" -#: src/structure.cpp:6438 +#: src/structure.cpp:6429 msgid "Factory Reward - Nothing" msgstr "" -#: src/structure.cpp:6466 +#: src/structure.cpp:6457 msgid "Repair Facility Award - Repair" msgstr "" -#: src/structure.cpp:6473 +#: src/structure.cpp:6464 msgid "Repair Facility Award - Nothing" msgstr "" diff --git a/po/fr.po b/po/fr.po index d87bcdcc7..7258178ad 100644 --- a/po/fr.po +++ b/po/fr.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-02-25 00:09+0100\n" +"POT-Creation-Date: 2011-02-25 23:35+0100\n" "PO-Revision-Date: 2010-04-21 08:32-0500\n" "Last-Translator: Gilles J. Séguin \n" "Language-Team: French \n" @@ -12144,11 +12144,11 @@ msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing msgstr "Impossible de communiquer avec le serveur maître ! Le port TCP %u est-il ouvert en sortie ?" #: src/challenge.cpp:184 -#: src/hci.cpp:914 -#: src/hci.cpp:3376 -#: src/hci.cpp:3499 -#: src/hci.cpp:3910 -#: src/hci.cpp:4928 +#: src/hci.cpp:916 +#: src/hci.cpp:3378 +#: src/hci.cpp:3501 +#: src/hci.cpp:3912 +#: src/hci.cpp:4930 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12300,7 +12300,7 @@ msgstr "aller directement à l'écran de l'hôte" #: src/configuration.cpp:393 #: src/configuration.cpp:394 -#: src/multistat.cpp:130 +#: src/multistat.cpp:124 msgid "Player" msgstr "Joueur" @@ -12589,7 +12589,7 @@ msgid "Tutorial" msgstr "Tutoriel" #: src/frontend.cpp:100 -#: src/hci.cpp:3485 +#: src/hci.cpp:3487 msgid "Options" msgstr "Options" @@ -12650,8 +12650,8 @@ msgstr "UN JOUEUR" #: src/frontend.cpp:303 #: src/ingameop.cpp:494 -#: src/mission.cpp:2527 -#: src/mission.cpp:2630 +#: src/mission.cpp:2493 +#: src/mission.cpp:2596 msgid "Load Saved Game" msgstr "Charger une partie Enregistrée" @@ -12943,190 +12943,190 @@ msgstr "OPTIONS" msgid "Mod: " msgstr "Mod: " -#: src/hci.cpp:1235 +#: src/hci.cpp:1237 msgid "MAP SAVED!" msgstr "Carte SAUVEGARDÉE!" -#: src/hci.cpp:1571 +#: src/hci.cpp:1573 #: src/loop.cpp:558 #: src/loop.cpp:574 #, fuzzy msgid "GAME SAVED: " msgstr "PARTIE SAUVEGARDÉE!" -#: src/hci.cpp:1958 +#: src/hci.cpp:1960 msgid "Failed to create building" msgstr "Échec de la création du bâtiment" -#: src/hci.cpp:1975 +#: src/hci.cpp:1977 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new structure: %s." msgstr "Le joueur %u Triche (Il se sert du debug menu pour se construire un nouveau bâtiment: %s.)" -#: src/hci.cpp:1990 +#: src/hci.cpp:1992 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new feature: %s." msgstr "Le joueur %u Triche (Il se sert du debug menu pour s'obtenir une nouvelle technologie: %s.)" -#: src/hci.cpp:2012 +#: src/hci.cpp:2014 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid: %s." msgstr "Le joueur %u Triche (Il se sert du debug menu pour se faire une nouvelle unitée: %s.)" -#: src/hci.cpp:2023 +#: src/hci.cpp:2025 #, fuzzy, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "Le joueur %u Triche (Il se sert du debug menu pour se faire une nouvelle unitée: %s.)" -#: src/hci.cpp:3296 +#: src/hci.cpp:3298 msgid "Commanders (F6)" msgstr "Commandants (F6)" -#: src/hci.cpp:3309 +#: src/hci.cpp:3311 msgid "Intelligence Display (F5)" msgstr "Panneau d'Informations (F5)" -#: src/hci.cpp:3322 +#: src/hci.cpp:3324 msgid "Manufacture (F1)" msgstr "Assemblage (F1)" -#: src/hci.cpp:3335 +#: src/hci.cpp:3337 msgid "Design (F4)" msgstr "Conception (F4)" -#: src/hci.cpp:3348 +#: src/hci.cpp:3350 msgid "Research (F2)" msgstr "Recherche (F2)" -#: src/hci.cpp:3361 +#: src/hci.cpp:3363 msgid "Build (F3)" msgstr "Construction (F3)" -#: src/hci.cpp:3432 +#: src/hci.cpp:3434 #: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Énergie" -#: src/hci.cpp:3523 +#: src/hci.cpp:3525 msgid "Map:" msgstr "" -#: src/hci.cpp:3536 +#: src/hci.cpp:3538 #, fuzzy msgid "Load" msgstr "Charger une Partie" -#: src/hci.cpp:3537 +#: src/hci.cpp:3539 #, fuzzy msgid "Load Map File" msgstr "Charger une Partie" -#: src/hci.cpp:3544 +#: src/hci.cpp:3546 #, fuzzy msgid "Save" msgstr "Sauvegarder" -#: src/hci.cpp:3545 +#: src/hci.cpp:3547 #, fuzzy msgid "Save Map File" msgstr "Sauvegarder" -#: src/hci.cpp:3553 +#: src/hci.cpp:3555 msgid "New" msgstr "" -#: src/hci.cpp:3554 +#: src/hci.cpp:3556 msgid "New Blank Map" msgstr "" -#: src/hci.cpp:3590 +#: src/hci.cpp:3592 msgid "Tile" msgstr "Tuile" -#: src/hci.cpp:3591 +#: src/hci.cpp:3593 msgid "Place tiles on map" msgstr "Placer des tuiles sur la carte" -#: src/hci.cpp:3600 +#: src/hci.cpp:3602 msgid "Unit" msgstr "Unité" -#: src/hci.cpp:3601 +#: src/hci.cpp:3603 msgid "Place Unit on map" msgstr "Placer des Unités sur la carte" -#: src/hci.cpp:3609 +#: src/hci.cpp:3611 msgid "Struct" msgstr "Structure" -#: src/hci.cpp:3610 +#: src/hci.cpp:3612 msgid "Place Structures on map" msgstr "Placer des Bâtiments sur la carte" -#: src/hci.cpp:3618 +#: src/hci.cpp:3620 msgid "Feat" msgstr "Fonction" -#: src/hci.cpp:3619 +#: src/hci.cpp:3621 msgid "Place Features on map" msgstr "Placer les éléments sur la carte" -#: src/hci.cpp:3629 +#: src/hci.cpp:3631 msgid "Pause" msgstr "Pause" -#: src/hci.cpp:3630 +#: src/hci.cpp:3632 msgid "Pause or unpause the game" msgstr "Mettre en pause ou enlever la pause" -#: src/hci.cpp:3644 +#: src/hci.cpp:3646 msgid "Align height of all map objects" msgstr "Align height of all map objects" -#: src/hci.cpp:3654 +#: src/hci.cpp:3656 msgid "Edit" msgstr "Édit" -#: src/hci.cpp:3655 +#: src/hci.cpp:3657 #, fuzzy msgid "Start Edit Mode" msgstr "Commencer sans Base" -#: src/hci.cpp:3669 +#: src/hci.cpp:3671 #: src/ingameop.cpp:112 #: src/ingameop.cpp:256 #: src/ingameop.cpp:260 msgid "Quit" msgstr "Quitter" -#: src/hci.cpp:3670 +#: src/hci.cpp:3672 msgid "Exit Game" msgstr "Quitter" -#: src/hci.cpp:3696 +#: src/hci.cpp:3698 #, fuzzy msgid "Current Player:" msgstr "Multi-joueurs" -#: src/hci.cpp:3987 +#: src/hci.cpp:3989 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "Barre de Progression" -#: src/hci.cpp:4853 +#: src/hci.cpp:4855 msgid "Factory Delivery Point" msgstr "Point de Livraison" -#: src/hci.cpp:4871 +#: src/hci.cpp:4873 msgid "Loop Production" msgstr "Production en boucle" -#: src/hci.cpp:4951 +#: src/hci.cpp:4953 msgid "Tab Scroll left" msgstr "Défilement à Gauche" -#: src/hci.cpp:4966 +#: src/hci.cpp:4968 msgid "Tab Scroll right" msgstr "Défilement à droite" @@ -13152,8 +13152,8 @@ msgstr "" #: src/ingameop.cpp:274 #: src/ingameop.cpp:498 -#: src/mission.cpp:2514 -#: src/mission.cpp:2633 +#: src/mission.cpp:2480 +#: src/mission.cpp:2599 msgid "Save Game" msgstr "Sauvegarder" @@ -14115,37 +14115,37 @@ msgstr "Basculer la Caméra Traqueuse" msgid "Could not save game!" msgstr "Ne peut sauver une partie!" -#: src/mission.cpp:2075 +#: src/mission.cpp:2041 msgid "Load Transport" msgstr "Charger le Transporteur" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "MISSION ACCOMPLIE en trichant" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED" msgstr "MISSION ACCOMPLIE" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED--and you cheated!" msgstr "ÉCHEC DE LA MISSION--et vous avez triché" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED" msgstr "ÉCHEC DE LA MISSION" -#: src/mission.cpp:2493 -#: src/mission.cpp:2533 -#: src/mission.cpp:2647 +#: src/mission.cpp:2459 +#: src/mission.cpp:2499 +#: src/mission.cpp:2613 msgid "Quit To Main Menu" msgstr "Retour au Menu Principal" -#: src/mission.cpp:2501 +#: src/mission.cpp:2467 msgid "Continue Game" msgstr "Continuer" -#: src/mission.cpp:2598 +#: src/mission.cpp:2564 #, fuzzy msgid "GAME SAVED :" msgstr "PARTIE SAUVEGARDÉE!" @@ -14545,10 +14545,15 @@ msgstr "Carte envoyé: %d%% " msgid "Map: %d%% downloaded" msgstr "Carte: %d%% téléchargé" -#: src/multiint.cpp:3822 +#: src/multiint.cpp:3820 msgid "HOST" msgstr "HOTE" +#: src/multiint.cpp:3827 +#: src/multimenu.cpp:772 +msgid "Ping" +msgstr "Ping" + #: src/multijoin.cpp:100 #: src/multijoin.cpp:101 msgid "Players Still Joining" @@ -14687,10 +14692,6 @@ msgstr "Tués" msgid "Units" msgstr "Unités" -#: src/multimenu.cpp:772 -msgid "Ping" -msgstr "Ping" - #: src/multimenu.cpp:776 msgid "Structs" msgstr "Structure" diff --git a/po/fy.po b/po/fy.po index f66ff3a16..eddfa26e7 100644 --- a/po/fy.po +++ b/po/fy.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-01-18 00:54+0100\n" +"POT-Creation-Date: 2011-02-25 23:35+0100\n" "PO-Revision-Date: 2008-04-21 08:59+0000\n" "Last-Translator: Wander Nauta \n" "Language-Team: Frisian \n" @@ -5730,7 +5730,7 @@ msgid "New Design" msgstr "" #: data/base/messages/strings/names.txt:15 -#: src/design.cpp:1313 +#: src/design.cpp:1275 msgid "Transport" msgstr "" @@ -12011,26 +12011,26 @@ msgid "System locale" msgstr "Systeemlocale" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1043 +#: lib/netplay/netplay.cpp:1042 msgid "Enter password here" msgstr "" -#: lib/netplay/netplay.cpp:2048 +#: lib/netplay/netplay.cpp:2060 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "" -#: lib/netplay/netplay.cpp:2062 +#: lib/netplay/netplay.cpp:2082 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "" #: src/challenge.cpp:184 -#: src/hci.cpp:922 -#: src/hci.cpp:3390 -#: src/hci.cpp:3513 -#: src/hci.cpp:3924 -#: src/hci.cpp:4942 +#: src/hci.cpp:916 +#: src/hci.cpp:3378 +#: src/hci.cpp:3501 +#: src/hci.cpp:3912 +#: src/hci.cpp:4930 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12182,149 +12182,149 @@ msgstr "" #: src/configuration.cpp:393 #: src/configuration.cpp:394 -#: src/multistat.cpp:130 +#: src/multistat.cpp:124 msgid "Player" msgstr "Spiler" -#: src/design.cpp:449 -#: src/design.cpp:469 -#: src/design.cpp:3501 +#: src/design.cpp:443 +#: src/design.cpp:455 +#: src/design.cpp:3464 msgid "New Vehicle" msgstr "" -#: src/design.cpp:515 +#: src/design.cpp:500 msgid "Vehicle Body" msgstr "" -#: src/design.cpp:535 +#: src/design.cpp:520 msgid "Vehicle Propulsion" msgstr "" -#: src/design.cpp:556 -#: src/design.cpp:579 -#: src/design.cpp:603 +#: src/design.cpp:541 +#: src/design.cpp:564 +#: src/design.cpp:588 msgid "Vehicle Turret" msgstr "" -#: src/design.cpp:622 +#: src/design.cpp:607 msgid "Delete Design" msgstr "" -#: src/design.cpp:673 -#: src/design.cpp:720 +#: src/design.cpp:658 +#: src/design.cpp:705 msgid "Kinetic Armour" msgstr "" -#: src/design.cpp:682 -#: src/design.cpp:730 +#: src/design.cpp:667 +#: src/design.cpp:715 msgid "Thermal Armour" msgstr "" -#: src/design.cpp:698 -#: src/design.cpp:750 +#: src/design.cpp:683 +#: src/design.cpp:735 msgid "Engine Output" msgstr "" -#: src/design.cpp:706 -#: src/design.cpp:759 -#: src/design.cpp:1529 -#: src/design.cpp:1553 -#: src/design.cpp:1574 -#: src/design.cpp:1590 -#: src/design.cpp:1610 -#: src/design.cpp:1627 -#: src/design.cpp:1647 -#: src/design.cpp:1664 -#: src/design.cpp:1705 -#: src/design.cpp:1737 -#: src/design.cpp:1869 -#: src/design.cpp:1885 -#: src/design.cpp:1923 -#: src/design.cpp:1956 +#: src/design.cpp:691 +#: src/design.cpp:744 +#: src/design.cpp:1486 +#: src/design.cpp:1510 +#: src/design.cpp:1531 +#: src/design.cpp:1547 +#: src/design.cpp:1567 +#: src/design.cpp:1584 +#: src/design.cpp:1604 +#: src/design.cpp:1621 +#: src/design.cpp:1662 +#: src/design.cpp:1694 +#: src/design.cpp:1826 +#: src/design.cpp:1842 +#: src/design.cpp:1880 +#: src/design.cpp:1913 msgid "Weight" msgstr "" -#: src/design.cpp:790 -#: src/design.cpp:808 +#: src/design.cpp:775 +#: src/design.cpp:793 msgid "Total Power Required" msgstr "" -#: src/design.cpp:821 -#: src/design.cpp:840 +#: src/design.cpp:806 +#: src/design.cpp:825 msgid "Total Body Points" msgstr "" -#: src/design.cpp:1027 -#: src/design.cpp:1059 +#: src/design.cpp:996 +#: src/design.cpp:1025 msgid "Power Usage" msgstr "" -#: src/design.cpp:1335 +#: src/design.cpp:1298 msgid "Hydra " msgstr "" -#: src/design.cpp:1509 -#: src/design.cpp:1537 +#: src/design.cpp:1466 +#: src/design.cpp:1494 msgid "Sensor Range" msgstr "" -#: src/design.cpp:1521 -#: src/design.cpp:1545 +#: src/design.cpp:1478 +#: src/design.cpp:1502 msgid "Sensor Power" msgstr "" -#: src/design.cpp:1566 -#: src/design.cpp:1582 +#: src/design.cpp:1523 +#: src/design.cpp:1539 msgid "ECM Power" msgstr "" -#: src/design.cpp:1602 -#: src/design.cpp:1619 -#: src/design.cpp:1639 -#: src/design.cpp:1656 +#: src/design.cpp:1559 +#: src/design.cpp:1576 +#: src/design.cpp:1596 +#: src/design.cpp:1613 msgid "Build Points" msgstr "" -#: src/design.cpp:1677 -#: src/design.cpp:1713 +#: src/design.cpp:1634 +#: src/design.cpp:1670 msgid "Range" msgstr "" -#: src/design.cpp:1689 -#: src/design.cpp:1721 +#: src/design.cpp:1646 +#: src/design.cpp:1678 msgid "Damage" msgstr "" -#: src/design.cpp:1697 -#: src/design.cpp:1729 +#: src/design.cpp:1654 +#: src/design.cpp:1686 msgid "Rate-of-Fire" msgstr "" -#: src/design.cpp:1857 -#: src/design.cpp:1877 +#: src/design.cpp:1814 +#: src/design.cpp:1834 msgid "Air Speed" msgstr "" -#: src/design.cpp:1895 -#: src/design.cpp:1932 +#: src/design.cpp:1852 +#: src/design.cpp:1889 msgid "Road Speed" msgstr "" -#: src/design.cpp:1905 -#: src/design.cpp:1940 +#: src/design.cpp:1862 +#: src/design.cpp:1897 msgid "Off-Road Speed" msgstr "" -#: src/design.cpp:1913 -#: src/design.cpp:1948 +#: src/design.cpp:1870 +#: src/design.cpp:1905 msgid "Water Speed" msgstr "" -#: src/design.cpp:2074 +#: src/design.cpp:2031 msgid "Weapons" msgstr "" -#: src/design.cpp:2094 +#: src/design.cpp:2051 msgid "Systems" msgstr "" @@ -12339,7 +12339,7 @@ msgid "Player dropped" msgstr "Spiler" #: src/display3d.cpp:599 -#: src/multiint.cpp:2116 +#: src/multiint.cpp:2125 msgid "Waiting for other players" msgstr "" @@ -12347,114 +12347,114 @@ msgstr "" msgid "Out of sync" msgstr "" -#: src/display.cpp:1651 +#: src/display.cpp:1649 msgid "Cannot Build. Oil Resource Burning." msgstr "Kin net bouwe. Oaljebron is oan it brânen." -#: src/display.cpp:1830 -#: src/display.cpp:2423 +#: src/display.cpp:1828 +#: src/display.cpp:2421 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - Skea %d%% - Erfaring %d, %s" -#: src/display.cpp:1846 +#: src/display.cpp:1844 #, fuzzy, c-format msgid "%s - Allied - Damage %d%% - Experience %d, %s" msgstr "%s - Skea %d%% - Erfaring %d, %s" -#: src/display.cpp:2044 +#: src/display.cpp:2042 msgid "Truck ordered to build Oil Derrick" msgstr "Frachtauto kommandeare omt in Oaljepunt te bouwen" -#: src/display.cpp:2045 +#: src/display.cpp:2043 #, fuzzy msgid "2 trucks ordered to build Oil Derrick" msgstr "Frachtauto kommandeare omt in Oaljepunt te bouwen" -#: src/display.cpp:2046 +#: src/display.cpp:2044 #, fuzzy, c-format msgid "%d trucks ordered to build Oil Derrick" msgstr "Frachtauto kommandeare omt in Oaljepunt te bouwen" -#: src/droid.cpp:208 +#: src/droid.cpp:211 msgid "Unit Lost!" msgstr "Ienheid Ferlen!" -#: src/droid.cpp:1370 +#: src/droid.cpp:1376 msgid "Structure Restored" msgstr "Struktuur Hersteld" -#: src/droid.cpp:2712 +#: src/droid.cpp:2732 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" msgstr[0] "Groep %u selekteard - %u Ienheid" msgstr[1] "Groep %u selekteard - %u Ienheden" -#: src/droid.cpp:2725 +#: src/droid.cpp:2745 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" msgstr[0] "%u ienheid tafoege oan Groep %u" msgstr[1] "%u ienheden tafoege oan Groep %u" -#: src/droid.cpp:2738 +#: src/droid.cpp:2758 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" msgstr[0] "Sentreard op Groep %u - %u Ienheid" msgstr[1] "Sentreard op Groep %u - %u Ienheden" -#: src/droid.cpp:2742 +#: src/droid.cpp:2762 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:3080 +#: src/droid.cpp:3093 msgid "Rookie" msgstr "Kabouter" -#: src/droid.cpp:3081 +#: src/droid.cpp:3094 msgctxt "rank" msgid "Green" msgstr "Begjinner" -#: src/droid.cpp:3082 +#: src/droid.cpp:3095 msgid "Trained" msgstr "Traint" -#: src/droid.cpp:3083 +#: src/droid.cpp:3096 msgid "Regular" msgstr "Normaal" -#: src/droid.cpp:3084 +#: src/droid.cpp:3097 msgid "Professional" msgstr "Professioneel" -#: src/droid.cpp:3085 +#: src/droid.cpp:3098 msgid "Veteran" msgstr "Feteraan" -#: src/droid.cpp:3086 +#: src/droid.cpp:3099 msgid "Elite" msgstr "Elite" -#: src/droid.cpp:3087 +#: src/droid.cpp:3100 msgid "Special" msgstr "Spesjaal" -#: src/droid.cpp:3088 +#: src/droid.cpp:3101 msgid "Hero" msgstr "Held" -#: src/droid.cpp:4110 +#: src/droid.cpp:4123 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "" -#: src/droid.cpp:4114 +#: src/droid.cpp:4127 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "" @@ -12475,7 +12475,7 @@ msgid "Tutorial" msgstr "" #: src/frontend.cpp:100 -#: src/hci.cpp:3499 +#: src/hci.cpp:3487 msgid "Options" msgstr "" @@ -12527,7 +12527,7 @@ msgid "Challenges" msgstr "" #: src/frontend.cpp:215 -#: src/ingameop.cpp:275 +#: src/ingameop.cpp:272 msgid "Load Game" msgstr "" @@ -12536,9 +12536,9 @@ msgid "SINGLE PLAYER" msgstr "" #: src/frontend.cpp:303 -#: src/ingameop.cpp:498 -#: src/mission.cpp:2527 -#: src/mission.cpp:2630 +#: src/ingameop.cpp:494 +#: src/mission.cpp:2493 +#: src/mission.cpp:2596 msgid "Load Saved Game" msgstr "Opslein Spul Lade" @@ -12555,7 +12555,7 @@ msgid "Join Game" msgstr "" #: src/frontend.cpp:422 -#: src/multiint.cpp:1276 +#: src/multiint.cpp:1285 msgid "OPTIONS" msgstr "YNSTELLINGS" @@ -12572,7 +12572,7 @@ msgid "Video Options" msgstr "" #: src/frontend.cpp:426 -#: src/ingameop.cpp:270 +#: src/ingameop.cpp:267 msgid "Audio Options" msgstr "" @@ -12650,7 +12650,7 @@ msgid "Off" msgstr "" #: src/frontend.cpp:523 -#: src/multiint.cpp:1345 +#: src/multiint.cpp:1354 msgid "Fog" msgstr "Dize" @@ -12661,7 +12661,7 @@ msgstr "" #: src/frontend.cpp:530 #: src/frontend.cpp:595 -#: src/multiint.cpp:1347 +#: src/multiint.cpp:1356 msgid "Fog Of War" msgstr "Kriigsdize" @@ -12826,201 +12826,201 @@ msgid "GAME OPTIONS" msgstr "" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2389 +#: src/multiint.cpp:2398 msgid "Mod: " msgstr "" -#: src/hci.cpp:1245 +#: src/hci.cpp:1237 #, fuzzy msgid "MAP SAVED!" msgstr "SPUL OPSLEIN!" -#: src/hci.cpp:1584 +#: src/hci.cpp:1573 #: src/loop.cpp:558 #: src/loop.cpp:574 #, fuzzy msgid "GAME SAVED: " msgstr "SPUL OPSLEIN!" -#: src/hci.cpp:1971 +#: src/hci.cpp:1960 msgid "Failed to create building" msgstr "" -#: src/hci.cpp:1988 +#: src/hci.cpp:1977 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new structure: %s." msgstr "Spiler %u is oan it fals spyljen (debugmenu)! Him of sij krijt in nij gebou: %s." -#: src/hci.cpp:2003 +#: src/hci.cpp:1992 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new feature: %s." msgstr "Spiler %u is oan it fals spyljen (debugmenu)! Him of sij krijt in nije funskje: %s." -#: src/hci.cpp:2025 +#: src/hci.cpp:2014 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid: %s." msgstr "Spiler %u is oan it fals spyljen (debugmenu)! Him of sij krijt in nije robot: %s." -#: src/hci.cpp:2036 +#: src/hci.cpp:2025 #, fuzzy, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "Spiler %u is oan it fals spyljen (debugmenu)! Him of sij krijt in nije robot: %s." -#: src/hci.cpp:3310 +#: src/hci.cpp:3298 msgid "Commanders (F6)" msgstr "Kommandanten (F6)" -#: src/hci.cpp:3323 +#: src/hci.cpp:3311 msgid "Intelligence Display (F5)" msgstr "Intelligensjeskerm (F5)" -#: src/hci.cpp:3336 +#: src/hci.cpp:3324 msgid "Manufacture (F1)" msgstr "Meitsje (F1)" -#: src/hci.cpp:3349 +#: src/hci.cpp:3337 msgid "Design (F4)" msgstr "Ontwerpe (F4)" -#: src/hci.cpp:3362 +#: src/hci.cpp:3350 msgid "Research (F2)" msgstr "Ûndersyk (F2)" -#: src/hci.cpp:3375 +#: src/hci.cpp:3363 msgid "Build (F3)" msgstr "Bouwe (F3)" -#: src/hci.cpp:3446 -#: src/multiint.cpp:1392 +#: src/hci.cpp:3434 +#: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Krêft" -#: src/hci.cpp:3537 +#: src/hci.cpp:3525 msgid "Map:" msgstr "" -#: src/hci.cpp:3550 +#: src/hci.cpp:3538 msgid "Load" msgstr "" -#: src/hci.cpp:3551 +#: src/hci.cpp:3539 msgid "Load Map File" msgstr "" -#: src/hci.cpp:3558 +#: src/hci.cpp:3546 #, fuzzy msgid "Save" msgstr "Spul Opslaan" -#: src/hci.cpp:3559 +#: src/hci.cpp:3547 #, fuzzy msgid "Save Map File" msgstr "Spul Opslaan" -#: src/hci.cpp:3567 +#: src/hci.cpp:3555 msgid "New" msgstr "" -#: src/hci.cpp:3568 +#: src/hci.cpp:3556 msgid "New Blank Map" msgstr "" -#: src/hci.cpp:3604 +#: src/hci.cpp:3592 msgid "Tile" msgstr "" -#: src/hci.cpp:3605 +#: src/hci.cpp:3593 msgid "Place tiles on map" msgstr "" -#: src/hci.cpp:3614 +#: src/hci.cpp:3602 msgid "Unit" msgstr "Ienheid" -#: src/hci.cpp:3615 +#: src/hci.cpp:3603 msgid "Place Unit on map" msgstr "" -#: src/hci.cpp:3623 +#: src/hci.cpp:3611 msgid "Struct" msgstr "Strukt" -#: src/hci.cpp:3624 +#: src/hci.cpp:3612 #, fuzzy msgid "Place Structures on map" msgstr "Struktuurlimyten ynstelle" -#: src/hci.cpp:3632 +#: src/hci.cpp:3620 msgid "Feat" msgstr "Funk" -#: src/hci.cpp:3633 +#: src/hci.cpp:3621 msgid "Place Features on map" msgstr "" -#: src/hci.cpp:3643 +#: src/hci.cpp:3631 msgid "Pause" msgstr "" -#: src/hci.cpp:3644 +#: src/hci.cpp:3632 #, fuzzy msgid "Pause or unpause the game" msgstr "De tsjinner hat it spul ferlitten!" -#: src/hci.cpp:3658 +#: src/hci.cpp:3646 msgid "Align height of all map objects" msgstr "" -#: src/hci.cpp:3668 +#: src/hci.cpp:3656 msgid "Edit" msgstr "" -#: src/hci.cpp:3669 +#: src/hci.cpp:3657 #, fuzzy msgid "Start Edit Mode" msgstr "Begjinne mei gjin basis" -#: src/hci.cpp:3683 +#: src/hci.cpp:3671 #: src/ingameop.cpp:112 -#: src/ingameop.cpp:258 -#: src/ingameop.cpp:263 +#: src/ingameop.cpp:256 +#: src/ingameop.cpp:260 msgid "Quit" msgstr "Ofslute" -#: src/hci.cpp:3684 +#: src/hci.cpp:3672 msgid "Exit Game" msgstr "Spul ferlitte" -#: src/hci.cpp:3710 +#: src/hci.cpp:3698 #, fuzzy msgid "Current Player:" msgstr "Spiler" -#: src/hci.cpp:4001 +#: src/hci.cpp:3989 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "Foartgongsbalke" -#: src/hci.cpp:4867 +#: src/hci.cpp:4855 msgid "Factory Delivery Point" msgstr "Fabrykôfleverpunt" -#: src/hci.cpp:4885 +#: src/hci.cpp:4873 msgid "Loop Production" msgstr "Sirkelproduksje" -#: src/hci.cpp:4965 +#: src/hci.cpp:4953 msgid "Tab Scroll left" msgstr "Tab links" -#: src/hci.cpp:4980 +#: src/hci.cpp:4968 msgid "Tab Scroll right" msgstr "Tab rjochts" #: src/ingameop.cpp:111 -#: src/ingameop.cpp:193 -#: src/ingameop.cpp:267 +#: src/ingameop.cpp:195 +#: src/ingameop.cpp:264 msgid "Resume Game" msgstr "" @@ -13028,33 +13028,33 @@ msgstr "" msgid "WARNING: You're the host. If you quit, the game ends for everyone!" msgstr "" -#: src/ingameop.cpp:185 -#: src/ingameop.cpp:527 +#: src/ingameop.cpp:186 +#: src/ingameop.cpp:523 msgid "Tactical UI (Target Origin Icon): Show" msgstr "" -#: src/ingameop.cpp:190 -#: src/ingameop.cpp:531 +#: src/ingameop.cpp:191 +#: src/ingameop.cpp:527 msgid "Tactical UI (Target Origin Icon): Hide" msgstr "" -#: src/ingameop.cpp:277 -#: src/ingameop.cpp:502 -#: src/mission.cpp:2514 -#: src/mission.cpp:2633 +#: src/ingameop.cpp:274 +#: src/ingameop.cpp:498 +#: src/mission.cpp:2480 +#: src/mission.cpp:2599 msgid "Save Game" msgstr "Spul Opslaan" -#: src/ingameop.cpp:343 +#: src/ingameop.cpp:339 #, fuzzy msgid "Host has quit the game!" msgstr "De tsjinner hat it spul ferlitten!" -#: src/ingameop.cpp:349 +#: src/ingameop.cpp:345 msgid "The game can't continue without the host." msgstr "" -#: src/ingameop.cpp:355 +#: src/ingameop.cpp:351 msgid "--> QUIT <--" msgstr "" @@ -13433,54 +13433,54 @@ msgstr "" msgid "Screen shake when things die: On" msgstr "" -#: src/keybind.cpp:2603 -#: src/keybind.cpp:2646 +#: src/keybind.cpp:2604 +#: src/keybind.cpp:2647 #, fuzzy msgid "Sorry, but game speed cannot be changed in multiplayer." msgstr "Sorry, do kinst net fals spylje yn multiplayerspullen." -#: src/keybind.cpp:2624 -#: src/keybind.cpp:2667 -#: src/keybind.cpp:2689 +#: src/keybind.cpp:2625 +#: src/keybind.cpp:2668 +#: src/keybind.cpp:2690 msgid "Game Speed Reset" msgstr "Spulsnelheid opnij ynsteld" -#: src/keybind.cpp:2628 +#: src/keybind.cpp:2629 #, c-format msgid "Game Speed Increased to %3.1f" msgstr "Spulsnelheid ferheege nei %3.1f" -#: src/keybind.cpp:2671 +#: src/keybind.cpp:2672 #, c-format msgid "Game Speed Reduced to %3.1f" msgstr "Spulsnelheid ferleege nei %3.1f" -#: src/keybind.cpp:2701 +#: src/keybind.cpp:2702 msgid "Radar showing friend-foe colors" msgstr "Radar lit freon-fijânkleuren sjen" -#: src/keybind.cpp:2705 +#: src/keybind.cpp:2706 msgid "Radar showing player colors" msgstr "Radar lit spilerkleuren sjen" -#: src/keybind.cpp:2726 +#: src/keybind.cpp:2727 msgid "Radar showing only objects" msgstr "Radar lit allinnich objekten sjen" -#: src/keybind.cpp:2729 +#: src/keybind.cpp:2730 msgid "Radar blending terrain and height" msgstr "Radar lit terrein en hichte sjen" -#: src/keybind.cpp:2732 +#: src/keybind.cpp:2733 msgid "Radar showing terrain" msgstr "Radar lit terrein sjen" -#: src/keybind.cpp:2735 +#: src/keybind.cpp:2736 #, fuzzy msgid "Radar showing revealed terrain" msgstr "Radar lit terrein sjen" -#: src/keybind.cpp:2738 +#: src/keybind.cpp:2739 msgid "Radar showing height" msgstr "Radar lit hichte sjen" @@ -13489,9 +13489,9 @@ msgid "KEY MAPPING" msgstr "KEY MAPPING" #: src/keyedit.cpp:372 -#: src/multiint.cpp:662 -#: src/multiint.cpp:1072 -#: src/multiint.cpp:1478 +#: src/multiint.cpp:671 +#: src/multiint.cpp:1081 +#: src/multiint.cpp:1487 msgid "Return To Previous Screen" msgstr "Werom Nei Foarige Skerm" @@ -13981,39 +13981,39 @@ msgstr "" msgid "Could not save game!" msgstr "" -#: src/mission.cpp:2075 +#: src/mission.cpp:2041 msgid "Load Transport" msgstr "Transport lade" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 #, fuzzy msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "DOEL HELLE" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED" msgstr "DOEL HELLE" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 #, fuzzy msgid "OBJECTIVE FAILED--and you cheated!" msgstr "DOEL MISLUKT" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED" msgstr "DOEL MISLUKT" -#: src/mission.cpp:2493 -#: src/mission.cpp:2533 -#: src/mission.cpp:2647 +#: src/mission.cpp:2459 +#: src/mission.cpp:2499 +#: src/mission.cpp:2613 msgid "Quit To Main Menu" msgstr "Ferlitte Nei Haadmenu" -#: src/mission.cpp:2501 +#: src/mission.cpp:2467 msgid "Continue Game" msgstr "Fjirder Mei Spul" -#: src/mission.cpp:2598 +#: src/mission.cpp:2564 #, fuzzy msgid "GAME SAVED :" msgstr "SPUL OPSLEIN!" @@ -14073,351 +14073,356 @@ msgstr "%s Foarmet In Freonskip Mei %s" msgid "You Discover Blueprints For %s" msgstr "Do Fynst Blaudrukken Foar %s" -#: src/multiint.cpp:600 +#: src/multiint.cpp:609 #: src/multilimit.cpp:190 msgid "Accept Settings" msgstr "Ynstellings akspeteare" -#: src/multiint.cpp:602 -#: src/multiint.cpp:1117 +#: src/multiint.cpp:611 +#: src/multiint.cpp:1126 #, fuzzy msgid "Cancel" msgstr "Lochtblau" -#: src/multiint.cpp:613 +#: src/multiint.cpp:622 msgid "IP Address or Machine Name" msgstr "IP-adres as Machinenamme" -#: src/multiint.cpp:659 +#: src/multiint.cpp:668 msgid "CONNECTION" msgstr "FERBINING" -#: src/multiint.cpp:664 +#: src/multiint.cpp:673 msgid "Lobby" msgstr "Lobby" -#: src/multiint.cpp:665 +#: src/multiint.cpp:674 msgid "IP" msgstr "IP" -#: src/multiint.cpp:854 +#: src/multiint.cpp:863 #, fuzzy msgid "No games are available" msgstr "Alle items binne beskikber makke" -#: src/multiint.cpp:857 +#: src/multiint.cpp:866 msgid "Game is full" msgstr "" -#: src/multiint.cpp:861 +#: src/multiint.cpp:870 msgid "You were kicked!" msgstr "" -#: src/multiint.cpp:864 +#: src/multiint.cpp:873 msgid "Wrong Game Version!" msgstr "" -#: src/multiint.cpp:867 +#: src/multiint.cpp:876 msgid "You have an incompatible mod." msgstr "" -#: src/multiint.cpp:871 +#: src/multiint.cpp:880 msgid "Host couldn't send file?" msgstr "" -#: src/multiint.cpp:875 +#: src/multiint.cpp:884 msgid "Incorrect Password!" msgstr "" -#: src/multiint.cpp:878 +#: src/multiint.cpp:887 msgid "Host has dropped connection!" msgstr "" -#: src/multiint.cpp:882 +#: src/multiint.cpp:891 msgid "Connection Error" msgstr "" -#: src/multiint.cpp:1012 +#: src/multiint.cpp:1021 msgid "Searching" msgstr "Siekjen" -#: src/multiint.cpp:1069 +#: src/multiint.cpp:1078 msgid "GAMES" msgstr "SPULLEN" -#: src/multiint.cpp:1077 +#: src/multiint.cpp:1086 msgid "Refresh Games List" msgstr "Spullist fernije" -#: src/multiint.cpp:1097 +#: src/multiint.cpp:1106 msgid "Enter Password:" msgstr "" -#: src/multiint.cpp:1115 +#: src/multiint.cpp:1124 msgid "OK" msgstr "" -#: src/multiint.cpp:1232 +#: src/multiint.cpp:1241 msgid "Tanks disabled!!" msgstr "" -#: src/multiint.cpp:1233 +#: src/multiint.cpp:1242 msgid "Cyborgs disabled." msgstr "" -#: src/multiint.cpp:1234 +#: src/multiint.cpp:1243 msgid "VTOLs disabled." msgstr "" -#: src/multiint.cpp:1281 -#: src/multiint.cpp:1288 +#: src/multiint.cpp:1290 +#: src/multiint.cpp:1297 msgid "Select Game Name" msgstr "Spulnamme Selekteare" -#: src/multiint.cpp:1281 +#: src/multiint.cpp:1290 msgid "One-Player Skirmish" msgstr "" -#: src/multiint.cpp:1291 +#: src/multiint.cpp:1300 msgid "Select Map" msgstr "Omjouwing Selekteare" -#: src/multiint.cpp:1299 +#: src/multiint.cpp:1308 msgid "Click to set Password" msgstr "" -#: src/multiint.cpp:1309 -#: src/multiint.cpp:1310 +#: src/multiint.cpp:1318 +#: src/multiint.cpp:1319 msgid "Scavengers" msgstr "" -#: src/multiint.cpp:1312 +#: src/multiint.cpp:1321 msgid "No Scavengers" msgstr "" -#: src/multiint.cpp:1342 +#: src/multiint.cpp:1351 msgid "Select Player Name" msgstr "Spilernamme Selekteare" -#: src/multiint.cpp:1348 +#: src/multiint.cpp:1357 msgid "Distance Fog" msgstr "Ôfstansdize" -#: src/multiint.cpp:1359 +#: src/multiint.cpp:1368 #: src/multimenu.cpp:756 msgid "Alliances" msgstr "Freonskippen" -#: src/multiint.cpp:1362 +#: src/multiint.cpp:1371 msgid "No Alliances" msgstr "Gjin Freonskippen" -#: src/multiint.cpp:1364 +#: src/multiint.cpp:1373 msgid "Allow Alliances" msgstr "Freonskippen Tastean" -#: src/multiint.cpp:1368 +#: src/multiint.cpp:1377 msgid "Locked Teams" msgstr "Teams fêststelle" -#: src/multiint.cpp:1394 +#: src/multiint.cpp:1403 msgid "Low Power Levels" msgstr "Lege krêftniveaus" -#: src/multiint.cpp:1396 +#: src/multiint.cpp:1405 msgid "Medium Power Levels" msgstr "Normale krêftniveaus" -#: src/multiint.cpp:1398 +#: src/multiint.cpp:1407 msgid "High Power Levels" msgstr "Hege krêftniveaus" -#: src/multiint.cpp:1430 +#: src/multiint.cpp:1439 msgid "Base" msgstr "Basis" -#: src/multiint.cpp:1432 +#: src/multiint.cpp:1441 msgid "Start with No Bases" msgstr "Begjinne mei gjin basis" -#: src/multiint.cpp:1434 +#: src/multiint.cpp:1443 msgid "Start with Bases" msgstr "Begjinne mei basis" -#: src/multiint.cpp:1436 +#: src/multiint.cpp:1445 msgid "Start with Advanced Bases" msgstr "Begjinne mei avanseare basis" -#: src/multiint.cpp:1468 +#: src/multiint.cpp:1477 msgid "Map Preview" msgstr "" -#: src/multiint.cpp:1470 +#: src/multiint.cpp:1479 msgid "Click to see Map" msgstr "" -#: src/multiint.cpp:1484 +#: src/multiint.cpp:1493 msgid "Start Hosting Game" msgstr "Tsjinnen Spul Starte" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 #, fuzzy msgid "Show Structure Limits" msgstr "Struktuurlimyten ynstelle" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 msgid "Set Structure Limits" msgstr "Struktuurlimyten ynstelle" -#: src/multiint.cpp:1587 +#: src/multiint.cpp:1596 msgid "DIFFICULTY" msgstr "" -#: src/multiint.cpp:1601 +#: src/multiint.cpp:1610 msgid "Less aggressive and starts with less units" msgstr "" -#: src/multiint.cpp:1602 +#: src/multiint.cpp:1611 #, fuzzy msgid "Plays nice" msgstr "Spiler" -#: src/multiint.cpp:1603 +#: src/multiint.cpp:1612 msgid "No holds barred" msgstr "" -#: src/multiint.cpp:1604 +#: src/multiint.cpp:1613 msgid "Starts with advantages and gets twice as much oil from derricks" msgstr "" -#: src/multiint.cpp:1632 +#: src/multiint.cpp:1641 msgid "CHOOSE AI" msgstr "" -#: src/multiint.cpp:1648 +#: src/multiint.cpp:1657 msgid "Allow human players to join in this slot" msgstr "" -#: src/multiint.cpp:1656 +#: src/multiint.cpp:1665 msgid "Leave this slot unused" msgstr "" -#: src/multiint.cpp:1736 +#: src/multiint.cpp:1745 #, fuzzy msgid "Player colour" msgstr "Spiler" -#: src/multiint.cpp:2062 +#: src/multiint.cpp:2071 msgid "Team" msgstr "" -#: src/multiint.cpp:2074 +#: src/multiint.cpp:2083 #, fuzzy msgid "Kick player" msgstr "Spiler" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 #, fuzzy msgid "Click to change difficulty" msgstr "Radar lit spilerkleuren sjen" -#: src/multiint.cpp:2121 +#: src/multiint.cpp:2130 msgid "Click when ready" msgstr "" -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2134 msgid "READY?" msgstr "" -#: src/multiint.cpp:2169 +#: src/multiint.cpp:2178 msgid "PLAYERS" msgstr "SPILERS" -#: src/multiint.cpp:2204 +#: src/multiint.cpp:2213 msgid "Click to change to this slot" msgstr "" -#: src/multiint.cpp:2232 +#: src/multiint.cpp:2241 #, fuzzy msgid "Choose Team" msgstr "Teams fêststelle" -#: src/multiint.cpp:2262 +#: src/multiint.cpp:2271 #, fuzzy msgid "Click to change player colour" msgstr "Radar lit spilerkleuren sjen" -#: src/multiint.cpp:2290 +#: src/multiint.cpp:2299 #, fuzzy msgid "Click to change player position" msgstr "Spiler" -#: src/multiint.cpp:2296 +#: src/multiint.cpp:2305 #, fuzzy msgid "Click to change AI" msgstr "Radar lit spilerkleuren sjen" -#: src/multiint.cpp:2300 +#: src/multiint.cpp:2309 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2362 +#: src/multiint.cpp:2371 msgid "CHAT" msgstr "CHAT" -#: src/multiint.cpp:2394 +#: src/multiint.cpp:2403 msgid "All players need to have the same mods to join your game." msgstr "" -#: src/multiint.cpp:2552 +#: src/multiint.cpp:2561 #, c-format msgid "*** password [%s] is now required! ***" msgstr "" -#: src/multiint.cpp:2560 +#: src/multiint.cpp:2569 msgid "*** password is NOT required! ***" msgstr "" -#: src/multiint.cpp:2801 +#: src/multiint.cpp:2810 msgid "Sorry! Failed to host the game." msgstr "" -#: src/multiint.cpp:2922 +#: src/multiint.cpp:2931 #, fuzzy msgid "'Locked Teams' mode enabled" msgstr "Teams fêststelle" -#: src/multiint.cpp:3003 +#: src/multiint.cpp:3012 #, c-format msgid "The host has kicked %s from the game!" msgstr "De tsjinner hat %s fan it spul skopt!" -#: src/multiint.cpp:3073 +#: src/multiint.cpp:3082 msgid "Host is Starting Game" msgstr "Tsjinner is spul oan it starten" -#: src/multiint.cpp:3639 +#: src/multiint.cpp:3648 msgid "Players" msgstr "Spilers" -#: src/multiint.cpp:3772 +#: src/multiint.cpp:3786 #, c-format msgid "Sending Map: %d%% " msgstr "" -#: src/multiint.cpp:3780 +#: src/multiint.cpp:3794 #, c-format msgid "Map: %d%% downloaded" msgstr "" -#: src/multiint.cpp:3803 +#: src/multiint.cpp:3820 msgid "HOST" msgstr "" +#: src/multiint.cpp:3827 +#: src/multimenu.cpp:772 +msgid "Ping" +msgstr "" + #: src/multijoin.cpp:100 #: src/multijoin.cpp:101 msgid "Players Still Joining" @@ -14433,17 +14438,17 @@ msgstr "" msgid "File transfer has been aborted for %d." msgstr "" -#: src/multijoin.cpp:376 +#: src/multijoin.cpp:373 #, c-format msgid "%s (%u) has an incompatible mod, and has been kicked." msgstr "" -#: src/multijoin.cpp:415 +#: src/multijoin.cpp:412 #, c-format msgid "%s is Joining the Game" msgstr "" -#: src/multijoin.cpp:425 +#: src/multijoin.cpp:422 #, fuzzy msgid "System message:" msgstr "Systeemlocale" @@ -14559,10 +14564,6 @@ msgstr "" msgid "Units" msgstr "Ienheid" -#: src/multimenu.cpp:772 -msgid "Ping" -msgstr "" - #: src/multimenu.cpp:776 #, fuzzy msgid "Structs" @@ -14597,84 +14598,84 @@ msgstr "" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "" -#: src/multiplay.cpp:1146 +#: src/multiplay.cpp:1057 #, fuzzy msgid "(allies" msgstr "Freonskippen" -#: src/multiplay.cpp:1154 +#: src/multiplay.cpp:1065 msgid "(private to " msgstr "" -#: src/multiplay.cpp:1167 +#: src/multiplay.cpp:1078 msgid "[invalid]" msgstr "" -#: src/multiplay.cpp:2057 +#: src/multiplay.cpp:1942 msgid "Green" msgstr "Grien" -#: src/multiplay.cpp:2058 +#: src/multiplay.cpp:1943 msgid "Orange" msgstr "Oranje" -#: src/multiplay.cpp:2059 +#: src/multiplay.cpp:1944 msgid "Grey" msgstr "Griis" -#: src/multiplay.cpp:2060 +#: src/multiplay.cpp:1945 msgid "Black" msgstr "Swart" -#: src/multiplay.cpp:2061 +#: src/multiplay.cpp:1946 msgid "Red" msgstr "Read" -#: src/multiplay.cpp:2062 +#: src/multiplay.cpp:1947 msgid "Blue" msgstr "Blau" -#: src/multiplay.cpp:2063 +#: src/multiplay.cpp:1948 msgid "Pink" msgstr "Roze" -#: src/multiplay.cpp:2064 +#: src/multiplay.cpp:1949 msgid "Cyan" msgstr "Lochtblau" -#: src/multiplay.cpp:2065 +#: src/multiplay.cpp:1950 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:2066 +#: src/multiplay.cpp:1951 msgid "Purple" msgstr "" -#: src/multiplay.cpp:2067 +#: src/multiplay.cpp:1952 msgid "White" msgstr "" -#: src/multiplay.cpp:2068 +#: src/multiplay.cpp:1953 msgid "Bright blue" msgstr "" -#: src/multiplay.cpp:2069 +#: src/multiplay.cpp:1954 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:2070 +#: src/multiplay.cpp:1955 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:2071 +#: src/multiplay.cpp:1956 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:2072 +#: src/multiplay.cpp:1957 msgid "Brown" msgstr "" -#: src/order.cpp:841 +#: src/order.cpp:800 msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "" @@ -14809,20 +14810,20 @@ msgstr "" msgid "You cheated!" msgstr "" -#: src/scriptfuncs.cpp:3250 +#: src/scriptfuncs.cpp:3287 msgid "YOU ARE VICTORIOUS!" msgstr "" -#: src/scriptfuncs.cpp:3254 +#: src/scriptfuncs.cpp:3291 msgid "YOU WERE DEFEATED!" msgstr "" -#: src/scriptfuncs.cpp:9500 +#: src/scriptfuncs.cpp:9537 #, c-format msgid "Beacon received from %s!" msgstr "" -#: src/scriptfuncs.cpp:9546 +#: src/scriptfuncs.cpp:9583 #, c-format msgid "Beacon %d" msgstr "" @@ -14851,62 +14852,62 @@ msgstr "Koe gjin Sensorienheden fine!" msgid "Unable to locate any Commanders!" msgstr "Koe gjin Kommandanten fine!" -#: src/structure.cpp:2615 +#: src/structure.cpp:2614 msgid "Command Control Limit Reached - Production Halted" msgstr "Kommandolimyt helle - Produksje stopt" -#: src/structure.cpp:5815 -#: src/structure.cpp:5840 +#: src/structure.cpp:5806 +#: src/structure.cpp:5831 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" msgstr[0] "%s - %u Ienheid tawezen" msgstr[1] "%s - %u Ienheden tawezen" -#: src/structure.cpp:5845 -#: src/structure.cpp:5913 -#: src/structure.cpp:5929 -#: src/structure.cpp:5943 +#: src/structure.cpp:5836 +#: src/structure.cpp:5904 +#: src/structure.cpp:5920 +#: src/structure.cpp:5934 #, fuzzy, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - Skea %3.0f%%" -#: src/structure.cpp:5895 +#: src/structure.cpp:5886 #, c-format msgid "%s - Connected %u of %u" msgstr "%s - %u fan %u ferbûn" -#: src/structure.cpp:6059 -#: src/structure.cpp:6104 +#: src/structure.cpp:6050 +#: src/structure.cpp:6095 #, c-format msgid "%s - Electronically Damaged" msgstr "%s - Elektronysk skea tabrocht" -#: src/structure.cpp:6341 +#: src/structure.cpp:6332 msgid "Electronic Reward - Visibility Report" msgstr "Elektronyske priis - Sichtberhydsrapport" -#: src/structure.cpp:6381 +#: src/structure.cpp:6372 msgid "Factory Reward - Propulsion" msgstr "Fabrykspriis - Oandriuwing" -#: src/structure.cpp:6405 +#: src/structure.cpp:6396 msgid "Factory Reward - Body" msgstr "Fabrykspriis - Lichem" -#: src/structure.cpp:6429 +#: src/structure.cpp:6420 msgid "Factory Reward - Weapon" msgstr "Fabrykspriis - Wapen" -#: src/structure.cpp:6438 +#: src/structure.cpp:6429 msgid "Factory Reward - Nothing" msgstr "Fabrykspriis - Niks" -#: src/structure.cpp:6466 +#: src/structure.cpp:6457 msgid "Repair Facility Award - Repair" msgstr "Reparaasjefasiliteit Priis - Reparaasje" -#: src/structure.cpp:6473 +#: src/structure.cpp:6464 msgid "Repair Facility Award - Nothing" msgstr "Reparaasjefasiliteit Priis - Niks" diff --git a/po/ga.po b/po/ga.po index 98ebe7762..a4f073708 100644 --- a/po/ga.po +++ b/po/ga.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-01-18 00:54+0100\n" +"POT-Creation-Date: 2011-02-25 23:35+0100\n" "PO-Revision-Date: 2008-05-08 17:14+0000\n" "Last-Translator: Seanan \n" "Language-Team: Irish \n" @@ -5730,7 +5730,7 @@ msgid "New Design" msgstr "" #: data/base/messages/strings/names.txt:15 -#: src/design.cpp:1313 +#: src/design.cpp:1275 msgid "Transport" msgstr "" @@ -12009,26 +12009,26 @@ msgid "System locale" msgstr "" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1043 +#: lib/netplay/netplay.cpp:1042 msgid "Enter password here" msgstr "" -#: lib/netplay/netplay.cpp:2048 +#: lib/netplay/netplay.cpp:2060 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "" -#: lib/netplay/netplay.cpp:2062 +#: lib/netplay/netplay.cpp:2082 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "" #: src/challenge.cpp:184 -#: src/hci.cpp:922 -#: src/hci.cpp:3390 -#: src/hci.cpp:3513 -#: src/hci.cpp:3924 -#: src/hci.cpp:4942 +#: src/hci.cpp:916 +#: src/hci.cpp:3378 +#: src/hci.cpp:3501 +#: src/hci.cpp:3912 +#: src/hci.cpp:4930 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12180,149 +12180,149 @@ msgstr "" #: src/configuration.cpp:393 #: src/configuration.cpp:394 -#: src/multistat.cpp:130 +#: src/multistat.cpp:124 msgid "Player" msgstr "Imreoir" -#: src/design.cpp:449 -#: src/design.cpp:469 -#: src/design.cpp:3501 +#: src/design.cpp:443 +#: src/design.cpp:455 +#: src/design.cpp:3464 msgid "New Vehicle" msgstr "" -#: src/design.cpp:515 +#: src/design.cpp:500 msgid "Vehicle Body" msgstr "" -#: src/design.cpp:535 +#: src/design.cpp:520 msgid "Vehicle Propulsion" msgstr "" -#: src/design.cpp:556 -#: src/design.cpp:579 -#: src/design.cpp:603 +#: src/design.cpp:541 +#: src/design.cpp:564 +#: src/design.cpp:588 msgid "Vehicle Turret" msgstr "" -#: src/design.cpp:622 +#: src/design.cpp:607 msgid "Delete Design" msgstr "" -#: src/design.cpp:673 -#: src/design.cpp:720 +#: src/design.cpp:658 +#: src/design.cpp:705 msgid "Kinetic Armour" msgstr "" -#: src/design.cpp:682 -#: src/design.cpp:730 +#: src/design.cpp:667 +#: src/design.cpp:715 msgid "Thermal Armour" msgstr "" -#: src/design.cpp:698 -#: src/design.cpp:750 +#: src/design.cpp:683 +#: src/design.cpp:735 msgid "Engine Output" msgstr "" -#: src/design.cpp:706 -#: src/design.cpp:759 -#: src/design.cpp:1529 -#: src/design.cpp:1553 -#: src/design.cpp:1574 -#: src/design.cpp:1590 -#: src/design.cpp:1610 -#: src/design.cpp:1627 -#: src/design.cpp:1647 -#: src/design.cpp:1664 -#: src/design.cpp:1705 -#: src/design.cpp:1737 -#: src/design.cpp:1869 -#: src/design.cpp:1885 -#: src/design.cpp:1923 -#: src/design.cpp:1956 +#: src/design.cpp:691 +#: src/design.cpp:744 +#: src/design.cpp:1486 +#: src/design.cpp:1510 +#: src/design.cpp:1531 +#: src/design.cpp:1547 +#: src/design.cpp:1567 +#: src/design.cpp:1584 +#: src/design.cpp:1604 +#: src/design.cpp:1621 +#: src/design.cpp:1662 +#: src/design.cpp:1694 +#: src/design.cpp:1826 +#: src/design.cpp:1842 +#: src/design.cpp:1880 +#: src/design.cpp:1913 msgid "Weight" msgstr "" -#: src/design.cpp:790 -#: src/design.cpp:808 +#: src/design.cpp:775 +#: src/design.cpp:793 msgid "Total Power Required" msgstr "" -#: src/design.cpp:821 -#: src/design.cpp:840 +#: src/design.cpp:806 +#: src/design.cpp:825 msgid "Total Body Points" msgstr "" -#: src/design.cpp:1027 -#: src/design.cpp:1059 +#: src/design.cpp:996 +#: src/design.cpp:1025 msgid "Power Usage" msgstr "" -#: src/design.cpp:1335 +#: src/design.cpp:1298 msgid "Hydra " msgstr "" -#: src/design.cpp:1509 -#: src/design.cpp:1537 +#: src/design.cpp:1466 +#: src/design.cpp:1494 msgid "Sensor Range" msgstr "" -#: src/design.cpp:1521 -#: src/design.cpp:1545 +#: src/design.cpp:1478 +#: src/design.cpp:1502 msgid "Sensor Power" msgstr "" -#: src/design.cpp:1566 -#: src/design.cpp:1582 +#: src/design.cpp:1523 +#: src/design.cpp:1539 msgid "ECM Power" msgstr "" -#: src/design.cpp:1602 -#: src/design.cpp:1619 -#: src/design.cpp:1639 -#: src/design.cpp:1656 +#: src/design.cpp:1559 +#: src/design.cpp:1576 +#: src/design.cpp:1596 +#: src/design.cpp:1613 msgid "Build Points" msgstr "" -#: src/design.cpp:1677 -#: src/design.cpp:1713 +#: src/design.cpp:1634 +#: src/design.cpp:1670 msgid "Range" msgstr "" -#: src/design.cpp:1689 -#: src/design.cpp:1721 +#: src/design.cpp:1646 +#: src/design.cpp:1678 msgid "Damage" msgstr "" -#: src/design.cpp:1697 -#: src/design.cpp:1729 +#: src/design.cpp:1654 +#: src/design.cpp:1686 msgid "Rate-of-Fire" msgstr "" -#: src/design.cpp:1857 -#: src/design.cpp:1877 +#: src/design.cpp:1814 +#: src/design.cpp:1834 msgid "Air Speed" msgstr "" -#: src/design.cpp:1895 -#: src/design.cpp:1932 +#: src/design.cpp:1852 +#: src/design.cpp:1889 msgid "Road Speed" msgstr "" -#: src/design.cpp:1905 -#: src/design.cpp:1940 +#: src/design.cpp:1862 +#: src/design.cpp:1897 msgid "Off-Road Speed" msgstr "" -#: src/design.cpp:1913 -#: src/design.cpp:1948 +#: src/design.cpp:1870 +#: src/design.cpp:1905 msgid "Water Speed" msgstr "" -#: src/design.cpp:2074 +#: src/design.cpp:2031 msgid "Weapons" msgstr "" -#: src/design.cpp:2094 +#: src/design.cpp:2051 msgid "Systems" msgstr "" @@ -12337,7 +12337,7 @@ msgid "Player dropped" msgstr "Imreoir" #: src/display3d.cpp:599 -#: src/multiint.cpp:2116 +#: src/multiint.cpp:2125 msgid "Waiting for other players" msgstr "" @@ -12345,113 +12345,113 @@ msgstr "" msgid "Out of sync" msgstr "" -#: src/display.cpp:1651 +#: src/display.cpp:1649 msgid "Cannot Build. Oil Resource Burning." msgstr "" -#: src/display.cpp:1830 -#: src/display.cpp:2423 +#: src/display.cpp:1828 +#: src/display.cpp:2421 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - Dochar %d%% - Taithí %d, %s" -#: src/display.cpp:1846 +#: src/display.cpp:1844 #, fuzzy, c-format msgid "%s - Allied - Damage %d%% - Experience %d, %s" msgstr "%s - Dochar %d%% - Taithí %d, %s" -#: src/display.cpp:2044 +#: src/display.cpp:2042 msgid "Truck ordered to build Oil Derrick" msgstr "" -#: src/display.cpp:2045 +#: src/display.cpp:2043 msgid "2 trucks ordered to build Oil Derrick" msgstr "" -#: src/display.cpp:2046 +#: src/display.cpp:2044 #, c-format msgid "%d trucks ordered to build Oil Derrick" msgstr "" -#: src/droid.cpp:208 +#: src/droid.cpp:211 msgid "Unit Lost!" msgstr "Chaill an t-Aonad!" -#: src/droid.cpp:1370 +#: src/droid.cpp:1376 msgid "Structure Restored" msgstr "" -#: src/droid.cpp:2712 +#: src/droid.cpp:2732 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:2725 +#: src/droid.cpp:2745 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:2738 +#: src/droid.cpp:2758 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:2742 +#: src/droid.cpp:2762 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:3080 +#: src/droid.cpp:3093 msgid "Rookie" msgstr "Glasearcach" -#: src/droid.cpp:3081 +#: src/droid.cpp:3094 msgctxt "rank" msgid "Green" msgstr "Glasearcach" -#: src/droid.cpp:3082 +#: src/droid.cpp:3095 msgid "Trained" msgstr "Oilte" -#: src/droid.cpp:3083 +#: src/droid.cpp:3096 msgid "Regular" msgstr "Gnáth" -#: src/droid.cpp:3084 +#: src/droid.cpp:3097 msgid "Professional" msgstr "Gairmiúil" -#: src/droid.cpp:3085 +#: src/droid.cpp:3098 msgid "Veteran" msgstr "Seansaighdiúir" -#: src/droid.cpp:3086 +#: src/droid.cpp:3099 msgid "Elite" msgstr "Tofa" -#: src/droid.cpp:3087 +#: src/droid.cpp:3100 msgid "Special" msgstr "Sain" -#: src/droid.cpp:3088 +#: src/droid.cpp:3101 msgid "Hero" msgstr "Laoch" -#: src/droid.cpp:4110 +#: src/droid.cpp:4123 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "" -#: src/droid.cpp:4114 +#: src/droid.cpp:4127 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "" @@ -12472,7 +12472,7 @@ msgid "Tutorial" msgstr "" #: src/frontend.cpp:100 -#: src/hci.cpp:3499 +#: src/hci.cpp:3487 msgid "Options" msgstr "" @@ -12524,7 +12524,7 @@ msgid "Challenges" msgstr "" #: src/frontend.cpp:215 -#: src/ingameop.cpp:275 +#: src/ingameop.cpp:272 msgid "Load Game" msgstr "" @@ -12533,9 +12533,9 @@ msgid "SINGLE PLAYER" msgstr "" #: src/frontend.cpp:303 -#: src/ingameop.cpp:498 -#: src/mission.cpp:2527 -#: src/mission.cpp:2630 +#: src/ingameop.cpp:494 +#: src/mission.cpp:2493 +#: src/mission.cpp:2596 msgid "Load Saved Game" msgstr "" @@ -12552,7 +12552,7 @@ msgid "Join Game" msgstr "" #: src/frontend.cpp:422 -#: src/multiint.cpp:1276 +#: src/multiint.cpp:1285 msgid "OPTIONS" msgstr "ROGHANNA" @@ -12569,7 +12569,7 @@ msgid "Video Options" msgstr "" #: src/frontend.cpp:426 -#: src/ingameop.cpp:270 +#: src/ingameop.cpp:267 msgid "Audio Options" msgstr "" @@ -12647,7 +12647,7 @@ msgid "Off" msgstr "" #: src/frontend.cpp:523 -#: src/multiint.cpp:1345 +#: src/multiint.cpp:1354 msgid "Fog" msgstr "Ceo" @@ -12658,7 +12658,7 @@ msgstr "" #: src/frontend.cpp:530 #: src/frontend.cpp:595 -#: src/multiint.cpp:1347 +#: src/multiint.cpp:1356 msgid "Fog Of War" msgstr "" @@ -12823,196 +12823,196 @@ msgid "GAME OPTIONS" msgstr "" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2389 +#: src/multiint.cpp:2398 msgid "Mod: " msgstr "" -#: src/hci.cpp:1245 +#: src/hci.cpp:1237 msgid "MAP SAVED!" msgstr "" -#: src/hci.cpp:1584 +#: src/hci.cpp:1573 #: src/loop.cpp:558 #: src/loop.cpp:574 msgid "GAME SAVED: " msgstr "" -#: src/hci.cpp:1971 +#: src/hci.cpp:1960 msgid "Failed to create building" msgstr "" -#: src/hci.cpp:1988 +#: src/hci.cpp:1977 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new structure: %s." msgstr "" -#: src/hci.cpp:2003 +#: src/hci.cpp:1992 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new feature: %s." msgstr "" -#: src/hci.cpp:2025 +#: src/hci.cpp:2014 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid: %s." msgstr "" -#: src/hci.cpp:2036 +#: src/hci.cpp:2025 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "" -#: src/hci.cpp:3310 +#: src/hci.cpp:3298 msgid "Commanders (F6)" msgstr "Ceannasaithe (F6)" -#: src/hci.cpp:3323 +#: src/hci.cpp:3311 msgid "Intelligence Display (F5)" msgstr "" -#: src/hci.cpp:3336 +#: src/hci.cpp:3324 msgid "Manufacture (F1)" msgstr "" -#: src/hci.cpp:3349 +#: src/hci.cpp:3337 msgid "Design (F4)" msgstr "Dearadh (F4)" -#: src/hci.cpp:3362 +#: src/hci.cpp:3350 msgid "Research (F2)" msgstr "Taighde (F2)" -#: src/hci.cpp:3375 +#: src/hci.cpp:3363 msgid "Build (F3)" msgstr "Tógáil (F3)" -#: src/hci.cpp:3446 -#: src/multiint.cpp:1392 +#: src/hci.cpp:3434 +#: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Cumhacht" -#: src/hci.cpp:3537 +#: src/hci.cpp:3525 msgid "Map:" msgstr "" -#: src/hci.cpp:3550 +#: src/hci.cpp:3538 msgid "Load" msgstr "" -#: src/hci.cpp:3551 +#: src/hci.cpp:3539 msgid "Load Map File" msgstr "" -#: src/hci.cpp:3558 +#: src/hci.cpp:3546 msgid "Save" msgstr "" -#: src/hci.cpp:3559 +#: src/hci.cpp:3547 msgid "Save Map File" msgstr "" -#: src/hci.cpp:3567 +#: src/hci.cpp:3555 msgid "New" msgstr "" -#: src/hci.cpp:3568 +#: src/hci.cpp:3556 msgid "New Blank Map" msgstr "" -#: src/hci.cpp:3604 +#: src/hci.cpp:3592 msgid "Tile" msgstr "" -#: src/hci.cpp:3605 +#: src/hci.cpp:3593 msgid "Place tiles on map" msgstr "" -#: src/hci.cpp:3614 +#: src/hci.cpp:3602 msgid "Unit" msgstr "Aonad" -#: src/hci.cpp:3615 +#: src/hci.cpp:3603 msgid "Place Unit on map" msgstr "" -#: src/hci.cpp:3623 +#: src/hci.cpp:3611 msgid "Struct" msgstr "" -#: src/hci.cpp:3624 +#: src/hci.cpp:3612 msgid "Place Structures on map" msgstr "" -#: src/hci.cpp:3632 +#: src/hci.cpp:3620 msgid "Feat" msgstr "Éacht" -#: src/hci.cpp:3633 +#: src/hci.cpp:3621 msgid "Place Features on map" msgstr "" -#: src/hci.cpp:3643 +#: src/hci.cpp:3631 msgid "Pause" msgstr "" -#: src/hci.cpp:3644 +#: src/hci.cpp:3632 #, fuzzy msgid "Pause or unpause the game" msgstr "D'fhág an tíosach an cluiche!" -#: src/hci.cpp:3658 +#: src/hci.cpp:3646 msgid "Align height of all map objects" msgstr "" -#: src/hci.cpp:3668 +#: src/hci.cpp:3656 msgid "Edit" msgstr "" -#: src/hci.cpp:3669 +#: src/hci.cpp:3657 #, fuzzy msgid "Start Edit Mode" msgstr "Tosaigh Gan Bunáiteanna" -#: src/hci.cpp:3683 +#: src/hci.cpp:3671 #: src/ingameop.cpp:112 -#: src/ingameop.cpp:258 -#: src/ingameop.cpp:263 +#: src/ingameop.cpp:256 +#: src/ingameop.cpp:260 msgid "Quit" msgstr "Scoir" -#: src/hci.cpp:3684 +#: src/hci.cpp:3672 msgid "Exit Game" msgstr "Scoir ón Cluiche" -#: src/hci.cpp:3710 +#: src/hci.cpp:3698 #, fuzzy msgid "Current Player:" msgstr "Imreoir" -#: src/hci.cpp:4001 +#: src/hci.cpp:3989 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "Barra Dul Chun Cinn" -#: src/hci.cpp:4867 +#: src/hci.cpp:4855 msgid "Factory Delivery Point" msgstr "" -#: src/hci.cpp:4885 +#: src/hci.cpp:4873 msgid "Loop Production" msgstr "" -#: src/hci.cpp:4965 +#: src/hci.cpp:4953 msgid "Tab Scroll left" msgstr "" -#: src/hci.cpp:4980 +#: src/hci.cpp:4968 msgid "Tab Scroll right" msgstr "" #: src/ingameop.cpp:111 -#: src/ingameop.cpp:193 -#: src/ingameop.cpp:267 +#: src/ingameop.cpp:195 +#: src/ingameop.cpp:264 msgid "Resume Game" msgstr "" @@ -13020,33 +13020,33 @@ msgstr "" msgid "WARNING: You're the host. If you quit, the game ends for everyone!" msgstr "" -#: src/ingameop.cpp:185 -#: src/ingameop.cpp:527 +#: src/ingameop.cpp:186 +#: src/ingameop.cpp:523 msgid "Tactical UI (Target Origin Icon): Show" msgstr "" -#: src/ingameop.cpp:190 -#: src/ingameop.cpp:531 +#: src/ingameop.cpp:191 +#: src/ingameop.cpp:527 msgid "Tactical UI (Target Origin Icon): Hide" msgstr "" -#: src/ingameop.cpp:277 -#: src/ingameop.cpp:502 -#: src/mission.cpp:2514 -#: src/mission.cpp:2633 +#: src/ingameop.cpp:274 +#: src/ingameop.cpp:498 +#: src/mission.cpp:2480 +#: src/mission.cpp:2599 msgid "Save Game" msgstr "" -#: src/ingameop.cpp:343 +#: src/ingameop.cpp:339 #, fuzzy msgid "Host has quit the game!" msgstr "D'fhág an tíosach an cluiche!" -#: src/ingameop.cpp:349 +#: src/ingameop.cpp:345 msgid "The game can't continue without the host." msgstr "" -#: src/ingameop.cpp:355 +#: src/ingameop.cpp:351 msgid "--> QUIT <--" msgstr "" @@ -13423,52 +13423,52 @@ msgstr "" msgid "Screen shake when things die: On" msgstr "" -#: src/keybind.cpp:2603 -#: src/keybind.cpp:2646 +#: src/keybind.cpp:2604 +#: src/keybind.cpp:2647 msgid "Sorry, but game speed cannot be changed in multiplayer." msgstr "" -#: src/keybind.cpp:2624 -#: src/keybind.cpp:2667 -#: src/keybind.cpp:2689 +#: src/keybind.cpp:2625 +#: src/keybind.cpp:2668 +#: src/keybind.cpp:2690 msgid "Game Speed Reset" msgstr "" -#: src/keybind.cpp:2628 +#: src/keybind.cpp:2629 #, c-format msgid "Game Speed Increased to %3.1f" msgstr "" -#: src/keybind.cpp:2671 +#: src/keybind.cpp:2672 #, c-format msgid "Game Speed Reduced to %3.1f" msgstr "" -#: src/keybind.cpp:2701 +#: src/keybind.cpp:2702 msgid "Radar showing friend-foe colors" msgstr "" -#: src/keybind.cpp:2705 +#: src/keybind.cpp:2706 msgid "Radar showing player colors" msgstr "" -#: src/keybind.cpp:2726 +#: src/keybind.cpp:2727 msgid "Radar showing only objects" msgstr "" -#: src/keybind.cpp:2729 +#: src/keybind.cpp:2730 msgid "Radar blending terrain and height" msgstr "" -#: src/keybind.cpp:2732 +#: src/keybind.cpp:2733 msgid "Radar showing terrain" msgstr "" -#: src/keybind.cpp:2735 +#: src/keybind.cpp:2736 msgid "Radar showing revealed terrain" msgstr "" -#: src/keybind.cpp:2738 +#: src/keybind.cpp:2739 msgid "Radar showing height" msgstr "" @@ -13477,9 +13477,9 @@ msgid "KEY MAPPING" msgstr "" #: src/keyedit.cpp:372 -#: src/multiint.cpp:662 -#: src/multiint.cpp:1072 -#: src/multiint.cpp:1478 +#: src/multiint.cpp:671 +#: src/multiint.cpp:1081 +#: src/multiint.cpp:1487 msgid "Return To Previous Screen" msgstr "Fill Chuig An Scáileán Roimhe" @@ -13968,37 +13968,37 @@ msgstr "" msgid "Could not save game!" msgstr "" -#: src/mission.cpp:2075 +#: src/mission.cpp:2041 msgid "Load Transport" msgstr "" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED" msgstr "" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED--and you cheated!" msgstr "" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED" msgstr "" -#: src/mission.cpp:2493 -#: src/mission.cpp:2533 -#: src/mission.cpp:2647 +#: src/mission.cpp:2459 +#: src/mission.cpp:2499 +#: src/mission.cpp:2613 msgid "Quit To Main Menu" msgstr "Fill Chuig An Príomh Roghchlár" -#: src/mission.cpp:2501 +#: src/mission.cpp:2467 msgid "Continue Game" msgstr "Lean Leis an Cluiche" -#: src/mission.cpp:2598 +#: src/mission.cpp:2564 msgid "GAME SAVED :" msgstr "" @@ -14057,346 +14057,351 @@ msgstr "" msgid "You Discover Blueprints For %s" msgstr "" -#: src/multiint.cpp:600 +#: src/multiint.cpp:609 #: src/multilimit.cpp:190 msgid "Accept Settings" msgstr "Glac Leis Na Socruithe" -#: src/multiint.cpp:602 -#: src/multiint.cpp:1117 +#: src/multiint.cpp:611 +#: src/multiint.cpp:1126 #, fuzzy msgid "Cancel" msgstr "Cian" -#: src/multiint.cpp:613 +#: src/multiint.cpp:622 msgid "IP Address or Machine Name" msgstr "" -#: src/multiint.cpp:659 +#: src/multiint.cpp:668 msgid "CONNECTION" msgstr "NASC" -#: src/multiint.cpp:664 +#: src/multiint.cpp:673 msgid "Lobby" msgstr "Brústocaireacht" -#: src/multiint.cpp:665 +#: src/multiint.cpp:674 msgid "IP" msgstr "IP" -#: src/multiint.cpp:854 +#: src/multiint.cpp:863 msgid "No games are available" msgstr "" -#: src/multiint.cpp:857 +#: src/multiint.cpp:866 msgid "Game is full" msgstr "" -#: src/multiint.cpp:861 +#: src/multiint.cpp:870 msgid "You were kicked!" msgstr "" -#: src/multiint.cpp:864 +#: src/multiint.cpp:873 msgid "Wrong Game Version!" msgstr "" -#: src/multiint.cpp:867 +#: src/multiint.cpp:876 msgid "You have an incompatible mod." msgstr "" -#: src/multiint.cpp:871 +#: src/multiint.cpp:880 msgid "Host couldn't send file?" msgstr "" -#: src/multiint.cpp:875 +#: src/multiint.cpp:884 msgid "Incorrect Password!" msgstr "" -#: src/multiint.cpp:878 +#: src/multiint.cpp:887 msgid "Host has dropped connection!" msgstr "" -#: src/multiint.cpp:882 +#: src/multiint.cpp:891 msgid "Connection Error" msgstr "" -#: src/multiint.cpp:1012 +#: src/multiint.cpp:1021 msgid "Searching" msgstr "Á Chuardach" -#: src/multiint.cpp:1069 +#: src/multiint.cpp:1078 msgid "GAMES" msgstr "CLUICHÍ" -#: src/multiint.cpp:1077 +#: src/multiint.cpp:1086 msgid "Refresh Games List" msgstr "" -#: src/multiint.cpp:1097 +#: src/multiint.cpp:1106 msgid "Enter Password:" msgstr "" -#: src/multiint.cpp:1115 +#: src/multiint.cpp:1124 msgid "OK" msgstr "" -#: src/multiint.cpp:1232 +#: src/multiint.cpp:1241 msgid "Tanks disabled!!" msgstr "" -#: src/multiint.cpp:1233 +#: src/multiint.cpp:1242 msgid "Cyborgs disabled." msgstr "" -#: src/multiint.cpp:1234 +#: src/multiint.cpp:1243 msgid "VTOLs disabled." msgstr "" -#: src/multiint.cpp:1281 -#: src/multiint.cpp:1288 +#: src/multiint.cpp:1290 +#: src/multiint.cpp:1297 msgid "Select Game Name" msgstr "Roghnaigh Ainm don Cluiche" -#: src/multiint.cpp:1281 +#: src/multiint.cpp:1290 msgid "One-Player Skirmish" msgstr "" -#: src/multiint.cpp:1291 +#: src/multiint.cpp:1300 msgid "Select Map" msgstr "Roghnaigh Léarscáil" -#: src/multiint.cpp:1299 +#: src/multiint.cpp:1308 msgid "Click to set Password" msgstr "" -#: src/multiint.cpp:1309 -#: src/multiint.cpp:1310 +#: src/multiint.cpp:1318 +#: src/multiint.cpp:1319 msgid "Scavengers" msgstr "" -#: src/multiint.cpp:1312 +#: src/multiint.cpp:1321 msgid "No Scavengers" msgstr "" -#: src/multiint.cpp:1342 +#: src/multiint.cpp:1351 msgid "Select Player Name" msgstr "Roghnaigh Ainm Imreora" -#: src/multiint.cpp:1348 +#: src/multiint.cpp:1357 msgid "Distance Fog" msgstr "" -#: src/multiint.cpp:1359 +#: src/multiint.cpp:1368 #: src/multimenu.cpp:756 msgid "Alliances" msgstr "Comhbhánna" -#: src/multiint.cpp:1362 +#: src/multiint.cpp:1371 msgid "No Alliances" msgstr "Gan Comhbhánna" -#: src/multiint.cpp:1364 +#: src/multiint.cpp:1373 msgid "Allow Alliances" msgstr "Ceadaigh Comhbhánna" -#: src/multiint.cpp:1368 +#: src/multiint.cpp:1377 msgid "Locked Teams" msgstr "" -#: src/multiint.cpp:1394 +#: src/multiint.cpp:1403 msgid "Low Power Levels" msgstr "" -#: src/multiint.cpp:1396 +#: src/multiint.cpp:1405 msgid "Medium Power Levels" msgstr "" -#: src/multiint.cpp:1398 +#: src/multiint.cpp:1407 msgid "High Power Levels" msgstr "" -#: src/multiint.cpp:1430 +#: src/multiint.cpp:1439 msgid "Base" msgstr "Bunáit" -#: src/multiint.cpp:1432 +#: src/multiint.cpp:1441 msgid "Start with No Bases" msgstr "Tosaigh Gan Bunáiteanna" -#: src/multiint.cpp:1434 +#: src/multiint.cpp:1443 msgid "Start with Bases" msgstr "Tosaigh le Bunáiteanna" -#: src/multiint.cpp:1436 +#: src/multiint.cpp:1445 msgid "Start with Advanced Bases" msgstr "" -#: src/multiint.cpp:1468 +#: src/multiint.cpp:1477 msgid "Map Preview" msgstr "" -#: src/multiint.cpp:1470 +#: src/multiint.cpp:1479 msgid "Click to see Map" msgstr "" -#: src/multiint.cpp:1484 +#: src/multiint.cpp:1493 msgid "Start Hosting Game" msgstr "" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 msgid "Show Structure Limits" msgstr "" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 msgid "Set Structure Limits" msgstr "" -#: src/multiint.cpp:1587 +#: src/multiint.cpp:1596 msgid "DIFFICULTY" msgstr "" -#: src/multiint.cpp:1601 +#: src/multiint.cpp:1610 msgid "Less aggressive and starts with less units" msgstr "" -#: src/multiint.cpp:1602 +#: src/multiint.cpp:1611 #, fuzzy msgid "Plays nice" msgstr "Imreoir" -#: src/multiint.cpp:1603 +#: src/multiint.cpp:1612 msgid "No holds barred" msgstr "" -#: src/multiint.cpp:1604 +#: src/multiint.cpp:1613 msgid "Starts with advantages and gets twice as much oil from derricks" msgstr "" -#: src/multiint.cpp:1632 +#: src/multiint.cpp:1641 msgid "CHOOSE AI" msgstr "" -#: src/multiint.cpp:1648 +#: src/multiint.cpp:1657 msgid "Allow human players to join in this slot" msgstr "" -#: src/multiint.cpp:1656 +#: src/multiint.cpp:1665 msgid "Leave this slot unused" msgstr "" -#: src/multiint.cpp:1736 +#: src/multiint.cpp:1745 #, fuzzy msgid "Player colour" msgstr "Imreoir" -#: src/multiint.cpp:2062 +#: src/multiint.cpp:2071 msgid "Team" msgstr "" -#: src/multiint.cpp:2074 +#: src/multiint.cpp:2083 #, fuzzy msgid "Kick player" msgstr "Imreoir" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 #, fuzzy msgid "Click to change difficulty" msgstr "Imreoir" -#: src/multiint.cpp:2121 +#: src/multiint.cpp:2130 msgid "Click when ready" msgstr "" -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2134 msgid "READY?" msgstr "" -#: src/multiint.cpp:2169 +#: src/multiint.cpp:2178 msgid "PLAYERS" msgstr "IMREOIRÍ" -#: src/multiint.cpp:2204 +#: src/multiint.cpp:2213 msgid "Click to change to this slot" msgstr "" -#: src/multiint.cpp:2232 +#: src/multiint.cpp:2241 msgid "Choose Team" msgstr "" -#: src/multiint.cpp:2262 +#: src/multiint.cpp:2271 msgid "Click to change player colour" msgstr "" -#: src/multiint.cpp:2290 +#: src/multiint.cpp:2299 #, fuzzy msgid "Click to change player position" msgstr "Imreoir" -#: src/multiint.cpp:2296 +#: src/multiint.cpp:2305 #, fuzzy msgid "Click to change AI" msgstr "Imreoir" -#: src/multiint.cpp:2300 +#: src/multiint.cpp:2309 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2362 +#: src/multiint.cpp:2371 msgid "CHAT" msgstr "DÉAN COMHRÁ" -#: src/multiint.cpp:2394 +#: src/multiint.cpp:2403 msgid "All players need to have the same mods to join your game." msgstr "" -#: src/multiint.cpp:2552 +#: src/multiint.cpp:2561 #, c-format msgid "*** password [%s] is now required! ***" msgstr "" -#: src/multiint.cpp:2560 +#: src/multiint.cpp:2569 msgid "*** password is NOT required! ***" msgstr "" -#: src/multiint.cpp:2801 +#: src/multiint.cpp:2810 msgid "Sorry! Failed to host the game." msgstr "" -#: src/multiint.cpp:2922 +#: src/multiint.cpp:2931 msgid "'Locked Teams' mode enabled" msgstr "" -#: src/multiint.cpp:3003 +#: src/multiint.cpp:3012 #, c-format msgid "The host has kicked %s from the game!" msgstr "" -#: src/multiint.cpp:3073 +#: src/multiint.cpp:3082 msgid "Host is Starting Game" msgstr "" -#: src/multiint.cpp:3639 +#: src/multiint.cpp:3648 msgid "Players" msgstr "Imreoirí" -#: src/multiint.cpp:3772 +#: src/multiint.cpp:3786 #, c-format msgid "Sending Map: %d%% " msgstr "" -#: src/multiint.cpp:3780 +#: src/multiint.cpp:3794 #, c-format msgid "Map: %d%% downloaded" msgstr "" -#: src/multiint.cpp:3803 +#: src/multiint.cpp:3820 msgid "HOST" msgstr "" +#: src/multiint.cpp:3827 +#: src/multimenu.cpp:772 +msgid "Ping" +msgstr "" + #: src/multijoin.cpp:100 #: src/multijoin.cpp:101 msgid "Players Still Joining" @@ -14412,17 +14417,17 @@ msgstr "" msgid "File transfer has been aborted for %d." msgstr "" -#: src/multijoin.cpp:376 +#: src/multijoin.cpp:373 #, c-format msgid "%s (%u) has an incompatible mod, and has been kicked." msgstr "" -#: src/multijoin.cpp:415 +#: src/multijoin.cpp:412 #, c-format msgid "%s is Joining the Game" msgstr "" -#: src/multijoin.cpp:425 +#: src/multijoin.cpp:422 msgid "System message:" msgstr "" @@ -14537,10 +14542,6 @@ msgstr "" msgid "Units" msgstr "Aonad" -#: src/multimenu.cpp:772 -msgid "Ping" -msgstr "" - #: src/multimenu.cpp:776 msgid "Structs" msgstr "" @@ -14574,84 +14575,84 @@ msgstr "" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "" -#: src/multiplay.cpp:1146 +#: src/multiplay.cpp:1057 #, fuzzy msgid "(allies" msgstr "Comhbhánna" -#: src/multiplay.cpp:1154 +#: src/multiplay.cpp:1065 msgid "(private to " msgstr "" -#: src/multiplay.cpp:1167 +#: src/multiplay.cpp:1078 msgid "[invalid]" msgstr "" -#: src/multiplay.cpp:2057 +#: src/multiplay.cpp:1942 msgid "Green" msgstr "Uaine" -#: src/multiplay.cpp:2058 +#: src/multiplay.cpp:1943 msgid "Orange" msgstr "Flannbhuí" -#: src/multiplay.cpp:2059 +#: src/multiplay.cpp:1944 msgid "Grey" msgstr "Liath" -#: src/multiplay.cpp:2060 +#: src/multiplay.cpp:1945 msgid "Black" msgstr "Dubh" -#: src/multiplay.cpp:2061 +#: src/multiplay.cpp:1946 msgid "Red" msgstr "Dearg" -#: src/multiplay.cpp:2062 +#: src/multiplay.cpp:1947 msgid "Blue" msgstr "Gorm" -#: src/multiplay.cpp:2063 +#: src/multiplay.cpp:1948 msgid "Pink" msgstr "Bándearg" -#: src/multiplay.cpp:2064 +#: src/multiplay.cpp:1949 msgid "Cyan" msgstr "Cian" -#: src/multiplay.cpp:2065 +#: src/multiplay.cpp:1950 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:2066 +#: src/multiplay.cpp:1951 msgid "Purple" msgstr "" -#: src/multiplay.cpp:2067 +#: src/multiplay.cpp:1952 msgid "White" msgstr "" -#: src/multiplay.cpp:2068 +#: src/multiplay.cpp:1953 msgid "Bright blue" msgstr "" -#: src/multiplay.cpp:2069 +#: src/multiplay.cpp:1954 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:2070 +#: src/multiplay.cpp:1955 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:2071 +#: src/multiplay.cpp:1956 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:2072 +#: src/multiplay.cpp:1957 msgid "Brown" msgstr "" -#: src/order.cpp:841 +#: src/order.cpp:800 msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "" @@ -14786,20 +14787,20 @@ msgstr "" msgid "You cheated!" msgstr "" -#: src/scriptfuncs.cpp:3250 +#: src/scriptfuncs.cpp:3287 msgid "YOU ARE VICTORIOUS!" msgstr "" -#: src/scriptfuncs.cpp:3254 +#: src/scriptfuncs.cpp:3291 msgid "YOU WERE DEFEATED!" msgstr "" -#: src/scriptfuncs.cpp:9500 +#: src/scriptfuncs.cpp:9537 #, c-format msgid "Beacon received from %s!" msgstr "" -#: src/scriptfuncs.cpp:9546 +#: src/scriptfuncs.cpp:9583 #, c-format msgid "Beacon %d" msgstr "" @@ -14828,62 +14829,62 @@ msgstr "" msgid "Unable to locate any Commanders!" msgstr "" -#: src/structure.cpp:2615 +#: src/structure.cpp:2614 msgid "Command Control Limit Reached - Production Halted" msgstr "" -#: src/structure.cpp:5815 -#: src/structure.cpp:5840 +#: src/structure.cpp:5806 +#: src/structure.cpp:5831 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" msgstr[0] "" msgstr[1] "" -#: src/structure.cpp:5845 -#: src/structure.cpp:5913 -#: src/structure.cpp:5929 -#: src/structure.cpp:5943 +#: src/structure.cpp:5836 +#: src/structure.cpp:5904 +#: src/structure.cpp:5920 +#: src/structure.cpp:5934 #, c-format msgid "%s - Damage %3.0f%%" msgstr "" -#: src/structure.cpp:5895 +#: src/structure.cpp:5886 #, c-format msgid "%s - Connected %u of %u" msgstr "" -#: src/structure.cpp:6059 -#: src/structure.cpp:6104 +#: src/structure.cpp:6050 +#: src/structure.cpp:6095 #, c-format msgid "%s - Electronically Damaged" msgstr "" -#: src/structure.cpp:6341 +#: src/structure.cpp:6332 msgid "Electronic Reward - Visibility Report" msgstr "" -#: src/structure.cpp:6381 +#: src/structure.cpp:6372 msgid "Factory Reward - Propulsion" msgstr "" -#: src/structure.cpp:6405 +#: src/structure.cpp:6396 msgid "Factory Reward - Body" msgstr "" -#: src/structure.cpp:6429 +#: src/structure.cpp:6420 msgid "Factory Reward - Weapon" msgstr "" -#: src/structure.cpp:6438 +#: src/structure.cpp:6429 msgid "Factory Reward - Nothing" msgstr "" -#: src/structure.cpp:6466 +#: src/structure.cpp:6457 msgid "Repair Facility Award - Repair" msgstr "" -#: src/structure.cpp:6473 +#: src/structure.cpp:6464 msgid "Repair Facility Award - Nothing" msgstr "" diff --git a/po/hr.po b/po/hr.po index 318f50e1c..7089785c8 100644 --- a/po/hr.po +++ b/po/hr.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: WZ2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-01-18 00:54+0100\n" +"POT-Creation-Date: 2011-02-25 23:35+0100\n" "PO-Revision-Date: \n" "Last-Translator: metalwarrior95 \n" "Language-Team: \n" @@ -5722,7 +5722,7 @@ msgid "New Design" msgstr "Novi dizajn" #: data/base/messages/strings/names.txt:15 -#: src/design.cpp:1313 +#: src/design.cpp:1275 msgid "Transport" msgstr "Transport" @@ -12038,26 +12038,26 @@ msgid "System locale" msgstr "Lokalni" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1043 +#: lib/netplay/netplay.cpp:1042 msgid "Enter password here" msgstr "Upišite sišfru ovdje" -#: lib/netplay/netplay.cpp:2048 +#: lib/netplay/netplay.cpp:2060 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "" -#: lib/netplay/netplay.cpp:2062 +#: lib/netplay/netplay.cpp:2082 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "" #: src/challenge.cpp:184 -#: src/hci.cpp:922 -#: src/hci.cpp:3390 -#: src/hci.cpp:3513 -#: src/hci.cpp:3924 -#: src/hci.cpp:4942 +#: src/hci.cpp:916 +#: src/hci.cpp:3378 +#: src/hci.cpp:3501 +#: src/hci.cpp:3912 +#: src/hci.cpp:4930 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12209,149 +12209,149 @@ msgstr "" #: src/configuration.cpp:393 #: src/configuration.cpp:394 -#: src/multistat.cpp:130 +#: src/multistat.cpp:124 msgid "Player" msgstr "Igrač" -#: src/design.cpp:449 -#: src/design.cpp:469 -#: src/design.cpp:3501 +#: src/design.cpp:443 +#: src/design.cpp:455 +#: src/design.cpp:3464 msgid "New Vehicle" msgstr "Novo Vozilo" -#: src/design.cpp:515 +#: src/design.cpp:500 msgid "Vehicle Body" msgstr "Tijelo Vozila" -#: src/design.cpp:535 +#: src/design.cpp:520 msgid "Vehicle Propulsion" msgstr "Pogon Vozila" -#: src/design.cpp:556 -#: src/design.cpp:579 -#: src/design.cpp:603 +#: src/design.cpp:541 +#: src/design.cpp:564 +#: src/design.cpp:588 msgid "Vehicle Turret" msgstr "Kupola Vozila" -#: src/design.cpp:622 +#: src/design.cpp:607 msgid "Delete Design" msgstr "Izbriši dizajn" -#: src/design.cpp:673 -#: src/design.cpp:720 +#: src/design.cpp:658 +#: src/design.cpp:705 msgid "Kinetic Armour" msgstr "Kinetički Oklop" -#: src/design.cpp:682 -#: src/design.cpp:730 +#: src/design.cpp:667 +#: src/design.cpp:715 msgid "Thermal Armour" msgstr "Toplinski Oklop" -#: src/design.cpp:698 -#: src/design.cpp:750 +#: src/design.cpp:683 +#: src/design.cpp:735 msgid "Engine Output" msgstr "Snaga motora" -#: src/design.cpp:706 -#: src/design.cpp:759 -#: src/design.cpp:1529 -#: src/design.cpp:1553 -#: src/design.cpp:1574 -#: src/design.cpp:1590 -#: src/design.cpp:1610 -#: src/design.cpp:1627 -#: src/design.cpp:1647 -#: src/design.cpp:1664 -#: src/design.cpp:1705 -#: src/design.cpp:1737 -#: src/design.cpp:1869 -#: src/design.cpp:1885 -#: src/design.cpp:1923 -#: src/design.cpp:1956 +#: src/design.cpp:691 +#: src/design.cpp:744 +#: src/design.cpp:1486 +#: src/design.cpp:1510 +#: src/design.cpp:1531 +#: src/design.cpp:1547 +#: src/design.cpp:1567 +#: src/design.cpp:1584 +#: src/design.cpp:1604 +#: src/design.cpp:1621 +#: src/design.cpp:1662 +#: src/design.cpp:1694 +#: src/design.cpp:1826 +#: src/design.cpp:1842 +#: src/design.cpp:1880 +#: src/design.cpp:1913 msgid "Weight" msgstr "Težina" -#: src/design.cpp:790 -#: src/design.cpp:808 +#: src/design.cpp:775 +#: src/design.cpp:793 msgid "Total Power Required" msgstr "Potpuna Potreba Energije" -#: src/design.cpp:821 -#: src/design.cpp:840 +#: src/design.cpp:806 +#: src/design.cpp:825 msgid "Total Body Points" msgstr "Potpuni Bodovi Tijela" -#: src/design.cpp:1027 -#: src/design.cpp:1059 +#: src/design.cpp:996 +#: src/design.cpp:1025 msgid "Power Usage" msgstr "Potrošnja Energije" -#: src/design.cpp:1335 +#: src/design.cpp:1298 msgid "Hydra " msgstr "Hidra " -#: src/design.cpp:1509 -#: src/design.cpp:1537 +#: src/design.cpp:1466 +#: src/design.cpp:1494 msgid "Sensor Range" msgstr "Senzorov Doseg" -#: src/design.cpp:1521 -#: src/design.cpp:1545 +#: src/design.cpp:1478 +#: src/design.cpp:1502 msgid "Sensor Power" msgstr "Senzor Snaga" -#: src/design.cpp:1566 -#: src/design.cpp:1582 +#: src/design.cpp:1523 +#: src/design.cpp:1539 msgid "ECM Power" msgstr "ECM Snaga" -#: src/design.cpp:1602 -#: src/design.cpp:1619 -#: src/design.cpp:1639 -#: src/design.cpp:1656 +#: src/design.cpp:1559 +#: src/design.cpp:1576 +#: src/design.cpp:1596 +#: src/design.cpp:1613 msgid "Build Points" msgstr "Bodovi za Gradnju" -#: src/design.cpp:1677 -#: src/design.cpp:1713 +#: src/design.cpp:1634 +#: src/design.cpp:1670 msgid "Range" msgstr "Doseg" -#: src/design.cpp:1689 -#: src/design.cpp:1721 +#: src/design.cpp:1646 +#: src/design.cpp:1678 msgid "Damage" msgstr "Štete" -#: src/design.cpp:1697 -#: src/design.cpp:1729 +#: src/design.cpp:1654 +#: src/design.cpp:1686 msgid "Rate-of-Fire" msgstr "Stopa Pucanja" -#: src/design.cpp:1857 -#: src/design.cpp:1877 +#: src/design.cpp:1814 +#: src/design.cpp:1834 msgid "Air Speed" msgstr "Brzina na Zraku" -#: src/design.cpp:1895 -#: src/design.cpp:1932 +#: src/design.cpp:1852 +#: src/design.cpp:1889 msgid "Road Speed" msgstr "Brzina na Cesti" -#: src/design.cpp:1905 -#: src/design.cpp:1940 +#: src/design.cpp:1862 +#: src/design.cpp:1897 msgid "Off-Road Speed" msgstr "Brzina izvan Ceste" -#: src/design.cpp:1913 -#: src/design.cpp:1948 +#: src/design.cpp:1870 +#: src/design.cpp:1905 msgid "Water Speed" msgstr "Brzina na Vodi" -#: src/design.cpp:2074 +#: src/design.cpp:2031 msgid "Weapons" msgstr "Oružja" -#: src/design.cpp:2094 +#: src/design.cpp:2051 msgid "Systems" msgstr "Sistemi" @@ -12364,7 +12364,7 @@ msgid "Player dropped" msgstr "Igrač Pao" #: src/display3d.cpp:599 -#: src/multiint.cpp:2116 +#: src/multiint.cpp:2125 msgid "Waiting for other players" msgstr "Čekanje na ostale igrače" @@ -12372,114 +12372,114 @@ msgstr "Čekanje na ostale igrače" msgid "Out of sync" msgstr "" -#: src/display.cpp:1651 +#: src/display.cpp:1649 msgid "Cannot Build. Oil Resource Burning." msgstr "Nedopušteno Građenje. Izvor Nafte Gori!" -#: src/display.cpp:1830 -#: src/display.cpp:2423 +#: src/display.cpp:1828 +#: src/display.cpp:2421 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "" -#: src/display.cpp:1846 +#: src/display.cpp:1844 #, c-format msgid "%s - Allied - Damage %d%% - Experience %d, %s" msgstr "" -#: src/display.cpp:2044 +#: src/display.cpp:2042 msgid "Truck ordered to build Oil Derrick" msgstr "Kamionu naređeno da sagradi pumpu za naftu" -#: src/display.cpp:2045 +#: src/display.cpp:2043 #, fuzzy msgid "2 trucks ordered to build Oil Derrick" msgstr "Kamionu naređeno da sagradi pumpu za naftu" -#: src/display.cpp:2046 +#: src/display.cpp:2044 #, fuzzy, c-format msgid "%d trucks ordered to build Oil Derrick" msgstr "Kamionu naređeno da sagradi pumpu za naftu" -#: src/droid.cpp:208 +#: src/droid.cpp:211 msgid "Unit Lost!" msgstr "Jedinica Izgubljena!" -#: src/droid.cpp:1370 +#: src/droid.cpp:1376 msgid "Structure Restored" msgstr "Građevina Restaurirana" -#: src/droid.cpp:2712 +#: src/droid.cpp:2732 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:2725 +#: src/droid.cpp:2745 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:2738 +#: src/droid.cpp:2758 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:2742 +#: src/droid.cpp:2762 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:3080 +#: src/droid.cpp:3093 msgid "Rookie" msgstr "Novak" -#: src/droid.cpp:3081 +#: src/droid.cpp:3094 msgctxt "rank" msgid "Green" msgstr "" -#: src/droid.cpp:3082 +#: src/droid.cpp:3095 msgid "Trained" msgstr "Treniran" -#: src/droid.cpp:3083 +#: src/droid.cpp:3096 msgid "Regular" msgstr "Normalan" -#: src/droid.cpp:3084 +#: src/droid.cpp:3097 msgid "Professional" msgstr "Profesionalac" -#: src/droid.cpp:3085 +#: src/droid.cpp:3098 msgid "Veteran" msgstr "Veteran" -#: src/droid.cpp:3086 +#: src/droid.cpp:3099 msgid "Elite" msgstr "Elita" -#: src/droid.cpp:3087 +#: src/droid.cpp:3100 msgid "Special" msgstr "Specijal" -#: src/droid.cpp:3088 +#: src/droid.cpp:3101 msgid "Hero" msgstr "Junak" -#: src/droid.cpp:4110 +#: src/droid.cpp:4123 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "" -#: src/droid.cpp:4114 +#: src/droid.cpp:4127 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "" @@ -12498,7 +12498,7 @@ msgid "Tutorial" msgstr "Vježbe" #: src/frontend.cpp:100 -#: src/hci.cpp:3499 +#: src/hci.cpp:3487 msgid "Options" msgstr "Opcije" @@ -12549,7 +12549,7 @@ msgid "Challenges" msgstr "Izazovi" #: src/frontend.cpp:215 -#: src/ingameop.cpp:275 +#: src/ingameop.cpp:272 msgid "Load Game" msgstr "Učitaj Igru" @@ -12558,9 +12558,9 @@ msgid "SINGLE PLAYER" msgstr "JEDAN IGRAČ" #: src/frontend.cpp:303 -#: src/ingameop.cpp:498 -#: src/mission.cpp:2527 -#: src/mission.cpp:2630 +#: src/ingameop.cpp:494 +#: src/mission.cpp:2493 +#: src/mission.cpp:2596 msgid "Load Saved Game" msgstr "Učitaj Sačuvanu Igru" @@ -12577,7 +12577,7 @@ msgid "Join Game" msgstr "Pridruži se Igri" #: src/frontend.cpp:422 -#: src/multiint.cpp:1276 +#: src/multiint.cpp:1285 msgid "OPTIONS" msgstr "POSTAVKE" @@ -12594,7 +12594,7 @@ msgid "Video Options" msgstr "Video opcije" #: src/frontend.cpp:426 -#: src/ingameop.cpp:270 +#: src/ingameop.cpp:267 msgid "Audio Options" msgstr "Audio opcije" @@ -12672,7 +12672,7 @@ msgid "Off" msgstr "Isključeno" #: src/frontend.cpp:523 -#: src/multiint.cpp:1345 +#: src/multiint.cpp:1354 msgid "Fog" msgstr "Magla" @@ -12683,7 +12683,7 @@ msgstr "Misterija" #: src/frontend.cpp:530 #: src/frontend.cpp:595 -#: src/multiint.cpp:1347 +#: src/multiint.cpp:1356 msgid "Fog Of War" msgstr "Magla Rata" @@ -12845,200 +12845,200 @@ msgid "GAME OPTIONS" msgstr "OPCIJE IGRE" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2389 +#: src/multiint.cpp:2398 msgid "Mod: " msgstr "Modifikacija:" -#: src/hci.cpp:1245 +#: src/hci.cpp:1237 msgid "MAP SAVED!" msgstr "KARTA SPREMLJENA!" -#: src/hci.cpp:1584 +#: src/hci.cpp:1573 #: src/loop.cpp:558 #: src/loop.cpp:574 #, fuzzy msgid "GAME SAVED: " msgstr "Igra spremljena:" -#: src/hci.cpp:1971 +#: src/hci.cpp:1960 msgid "Failed to create building" msgstr "Nije moguće napraviti građevinu" -#: src/hci.cpp:1988 +#: src/hci.cpp:1977 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new structure: %s." msgstr "Igrač %u vara, postavio si je : %s" -#: src/hci.cpp:2003 +#: src/hci.cpp:1992 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new feature: %s." msgstr "Igrač %u vara, postavio si je : %s" -#: src/hci.cpp:2025 +#: src/hci.cpp:2014 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid: %s." msgstr "Igrač %u vara, postavio si je : %s" -#: src/hci.cpp:2036 +#: src/hci.cpp:2025 #, fuzzy, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "Igrač %u vara, postavio si je : %s" -#: src/hci.cpp:3310 +#: src/hci.cpp:3298 msgid "Commanders (F6)" msgstr "Kapetani (F6)" -#: src/hci.cpp:3323 +#: src/hci.cpp:3311 msgid "Intelligence Display (F5)" msgstr "Viječanje (F5)" -#: src/hci.cpp:3336 +#: src/hci.cpp:3324 msgid "Manufacture (F1)" msgstr "Proizvedi (F1)" -#: src/hci.cpp:3349 +#: src/hci.cpp:3337 msgid "Design (F4)" msgstr "Dizajniraj (F4)" -#: src/hci.cpp:3362 +#: src/hci.cpp:3350 msgid "Research (F2)" msgstr "Istražuj (F2)" -#: src/hci.cpp:3375 +#: src/hci.cpp:3363 msgid "Build (F3)" msgstr "Gradi (F3)" -#: src/hci.cpp:3446 -#: src/multiint.cpp:1392 +#: src/hci.cpp:3434 +#: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Resursi" -#: src/hci.cpp:3537 +#: src/hci.cpp:3525 msgid "Map:" msgstr "" -#: src/hci.cpp:3550 +#: src/hci.cpp:3538 #, fuzzy msgid "Load" msgstr "Učitaj Igru" -#: src/hci.cpp:3551 +#: src/hci.cpp:3539 #, fuzzy msgid "Load Map File" msgstr "Učitaj Igru" -#: src/hci.cpp:3558 +#: src/hci.cpp:3546 #, fuzzy msgid "Save" msgstr "Spermi igru" -#: src/hci.cpp:3559 +#: src/hci.cpp:3547 #, fuzzy msgid "Save Map File" msgstr "Spermi igru" -#: src/hci.cpp:3567 +#: src/hci.cpp:3555 msgid "New" msgstr "" -#: src/hci.cpp:3568 +#: src/hci.cpp:3556 msgid "New Blank Map" msgstr "" -#: src/hci.cpp:3604 +#: src/hci.cpp:3592 msgid "Tile" msgstr "Kvadratić" -#: src/hci.cpp:3605 +#: src/hci.cpp:3593 msgid "Place tiles on map" msgstr "Postavi teksture na kartu" -#: src/hci.cpp:3614 +#: src/hci.cpp:3602 msgid "Unit" msgstr "Jedinica" -#: src/hci.cpp:3615 +#: src/hci.cpp:3603 msgid "Place Unit on map" msgstr "Postavi jedinice na kartu" -#: src/hci.cpp:3623 +#: src/hci.cpp:3611 msgid "Struct" msgstr "Građevina" -#: src/hci.cpp:3624 +#: src/hci.cpp:3612 msgid "Place Structures on map" msgstr "Postavi građevine na kartu" -#: src/hci.cpp:3632 +#: src/hci.cpp:3620 msgid "Feat" msgstr "Pogodnosti" -#: src/hci.cpp:3633 +#: src/hci.cpp:3621 msgid "Place Features on map" msgstr "Postavi pogodnost na kartu" -#: src/hci.cpp:3643 +#: src/hci.cpp:3631 msgid "Pause" msgstr "" -#: src/hci.cpp:3644 +#: src/hci.cpp:3632 msgid "Pause or unpause the game" msgstr "Pauziraj igru" -#: src/hci.cpp:3658 +#: src/hci.cpp:3646 msgid "Align height of all map objects" msgstr "Podesi visinu svih objekata na karti" -#: src/hci.cpp:3668 +#: src/hci.cpp:3656 msgid "Edit" msgstr "" -#: src/hci.cpp:3669 +#: src/hci.cpp:3657 #, fuzzy msgid "Start Edit Mode" msgstr "Započni bez baza" -#: src/hci.cpp:3683 +#: src/hci.cpp:3671 #: src/ingameop.cpp:112 -#: src/ingameop.cpp:258 -#: src/ingameop.cpp:263 +#: src/ingameop.cpp:256 +#: src/ingameop.cpp:260 msgid "Quit" msgstr "Izađi" -#: src/hci.cpp:3684 +#: src/hci.cpp:3672 msgid "Exit Game" msgstr "Izađi iz igre" -#: src/hci.cpp:3710 +#: src/hci.cpp:3698 #, fuzzy msgid "Current Player:" msgstr "Više Igrača" -#: src/hci.cpp:4001 +#: src/hci.cpp:3989 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "Procesna trakica" -#: src/hci.cpp:4867 +#: src/hci.cpp:4855 msgid "Factory Delivery Point" msgstr "Dostavna točka Tvornice" -#: src/hci.cpp:4885 +#: src/hci.cpp:4873 msgid "Loop Production" msgstr "Ponovi proizvodnju" -#: src/hci.cpp:4965 +#: src/hci.cpp:4953 msgid "Tab Scroll left" msgstr "Tablica zakreni lijevo" -#: src/hci.cpp:4980 +#: src/hci.cpp:4968 msgid "Tab Scroll right" msgstr "Tablica zakreni desno" #: src/ingameop.cpp:111 -#: src/ingameop.cpp:193 -#: src/ingameop.cpp:267 +#: src/ingameop.cpp:195 +#: src/ingameop.cpp:264 msgid "Resume Game" msgstr "Nastavi igru" @@ -13046,32 +13046,32 @@ msgstr "Nastavi igru" msgid "WARNING: You're the host. If you quit, the game ends for everyone!" msgstr "UPOZORENJE: Ti si host. Ako izađeš, igra završava za sve!" -#: src/ingameop.cpp:185 -#: src/ingameop.cpp:527 +#: src/ingameop.cpp:186 +#: src/ingameop.cpp:523 msgid "Tactical UI (Target Origin Icon): Show" msgstr "" -#: src/ingameop.cpp:190 -#: src/ingameop.cpp:531 +#: src/ingameop.cpp:191 +#: src/ingameop.cpp:527 msgid "Tactical UI (Target Origin Icon): Hide" msgstr "" -#: src/ingameop.cpp:277 -#: src/ingameop.cpp:502 -#: src/mission.cpp:2514 -#: src/mission.cpp:2633 +#: src/ingameop.cpp:274 +#: src/ingameop.cpp:498 +#: src/mission.cpp:2480 +#: src/mission.cpp:2599 msgid "Save Game" msgstr "Spermi igru" -#: src/ingameop.cpp:343 +#: src/ingameop.cpp:339 msgid "Host has quit the game!" msgstr "Host je prekinuo igru!" -#: src/ingameop.cpp:349 +#: src/ingameop.cpp:345 msgid "The game can't continue without the host." msgstr "Igra se ne može nastaviti ako nema hosta." -#: src/ingameop.cpp:355 +#: src/ingameop.cpp:351 msgid "--> QUIT <--" msgstr "---> IZLAZ <---" @@ -13447,52 +13447,52 @@ msgstr "Potres kada se objekti unište: NE" msgid "Screen shake when things die: On" msgstr "Potres kada se objekti unište: DA" -#: src/keybind.cpp:2603 -#: src/keybind.cpp:2646 +#: src/keybind.cpp:2604 +#: src/keybind.cpp:2647 msgid "Sorry, but game speed cannot be changed in multiplayer." msgstr "Brzina igre ne može biti promjenjena u internetskoj igri." -#: src/keybind.cpp:2624 -#: src/keybind.cpp:2667 -#: src/keybind.cpp:2689 +#: src/keybind.cpp:2625 +#: src/keybind.cpp:2668 +#: src/keybind.cpp:2690 msgid "Game Speed Reset" msgstr "Brzina igre resetirana" -#: src/keybind.cpp:2628 +#: src/keybind.cpp:2629 #, c-format msgid "Game Speed Increased to %3.1f" msgstr "Brzin povečana na %3.1f" -#: src/keybind.cpp:2671 +#: src/keybind.cpp:2672 #, c-format msgid "Game Speed Reduced to %3.1f" msgstr "Brzina smanjena na %3.1f" -#: src/keybind.cpp:2701 +#: src/keybind.cpp:2702 msgid "Radar showing friend-foe colors" msgstr "Karta prikazuje savezničke boje" -#: src/keybind.cpp:2705 +#: src/keybind.cpp:2706 msgid "Radar showing player colors" msgstr "Karta prikazuje boje igrača" -#: src/keybind.cpp:2726 +#: src/keybind.cpp:2727 msgid "Radar showing only objects" msgstr "Karta prikazuje samo objekte" -#: src/keybind.cpp:2729 +#: src/keybind.cpp:2730 msgid "Radar blending terrain and height" msgstr "Karta prikazuje visine i teren" -#: src/keybind.cpp:2732 +#: src/keybind.cpp:2733 msgid "Radar showing terrain" msgstr "Karta prikazuje teren" -#: src/keybind.cpp:2735 +#: src/keybind.cpp:2736 msgid "Radar showing revealed terrain" msgstr "Karta prikazuje otkrivena područja" -#: src/keybind.cpp:2738 +#: src/keybind.cpp:2739 msgid "Radar showing height" msgstr "Karta prikazuje visine" @@ -13501,9 +13501,9 @@ msgid "KEY MAPPING" msgstr "Tipkovničke kratice" #: src/keyedit.cpp:372 -#: src/multiint.cpp:662 -#: src/multiint.cpp:1072 -#: src/multiint.cpp:1478 +#: src/multiint.cpp:671 +#: src/multiint.cpp:1081 +#: src/multiint.cpp:1487 msgid "Return To Previous Screen" msgstr "Nazad" @@ -14009,37 +14009,37 @@ msgstr "Pračenje" msgid "Could not save game!" msgstr "Igra se ne može spremiti" -#: src/mission.cpp:2075 +#: src/mission.cpp:2041 msgid "Load Transport" msgstr "Ukrcaj na transport" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "POBJEDIO SI!!! - jer si koristio sifre." -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED" msgstr "POBJEDIO SI!!!" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED--and you cheated!" msgstr "Koristio si šifre - ali si ipak IZGUBIO!!!" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED" msgstr "IZGUBIO SI!!!" -#: src/mission.cpp:2493 -#: src/mission.cpp:2533 -#: src/mission.cpp:2647 +#: src/mission.cpp:2459 +#: src/mission.cpp:2499 +#: src/mission.cpp:2613 msgid "Quit To Main Menu" msgstr "Izađi na glavni meni" -#: src/mission.cpp:2501 +#: src/mission.cpp:2467 msgid "Continue Game" msgstr "Nastavi igru" -#: src/mission.cpp:2598 +#: src/mission.cpp:2564 msgid "GAME SAVED :" msgstr "Igra spremljena:" @@ -14098,347 +14098,352 @@ msgstr "%s sklapa savez s %s" msgid "You Discover Blueprints For %s" msgstr "Našao si nacrte za %s" -#: src/multiint.cpp:600 +#: src/multiint.cpp:609 #: src/multilimit.cpp:190 msgid "Accept Settings" msgstr "Prihvati postavke" -#: src/multiint.cpp:602 -#: src/multiint.cpp:1117 +#: src/multiint.cpp:611 +#: src/multiint.cpp:1126 msgid "Cancel" msgstr "Poništi" -#: src/multiint.cpp:613 +#: src/multiint.cpp:622 msgid "IP Address or Machine Name" msgstr "IP" -#: src/multiint.cpp:659 +#: src/multiint.cpp:668 msgid "CONNECTION" msgstr "VEZA" -#: src/multiint.cpp:664 +#: src/multiint.cpp:673 msgid "Lobby" msgstr "Predvorje" -#: src/multiint.cpp:665 +#: src/multiint.cpp:674 msgid "IP" msgstr "IP" -#: src/multiint.cpp:854 +#: src/multiint.cpp:863 msgid "No games are available" msgstr "Nema dostupnih igara." -#: src/multiint.cpp:857 +#: src/multiint.cpp:866 msgid "Game is full" msgstr "Igra je popunjena!" -#: src/multiint.cpp:861 +#: src/multiint.cpp:870 msgid "You were kicked!" msgstr "Izbačen si!" -#: src/multiint.cpp:864 +#: src/multiint.cpp:873 msgid "Wrong Game Version!" msgstr "Kriva verzija igre!" -#: src/multiint.cpp:867 +#: src/multiint.cpp:876 msgid "You have an incompatible mod." msgstr "Imaš nedozvoljeni mod." -#: src/multiint.cpp:871 +#: src/multiint.cpp:880 msgid "Host couldn't send file?" msgstr "Host ne može poslati datoteku." -#: src/multiint.cpp:875 +#: src/multiint.cpp:884 msgid "Incorrect Password!" msgstr "Netočna lozinka." -#: src/multiint.cpp:878 +#: src/multiint.cpp:887 msgid "Host has dropped connection!" msgstr "Host je prekinuo igru." -#: src/multiint.cpp:882 +#: src/multiint.cpp:891 msgid "Connection Error" msgstr "Greška u povezivanju" -#: src/multiint.cpp:1012 +#: src/multiint.cpp:1021 msgid "Searching" msgstr "Traženje" -#: src/multiint.cpp:1069 +#: src/multiint.cpp:1078 msgid "GAMES" msgstr "Igre" -#: src/multiint.cpp:1077 +#: src/multiint.cpp:1086 msgid "Refresh Games List" msgstr "Osvježi popis igara" -#: src/multiint.cpp:1097 +#: src/multiint.cpp:1106 msgid "Enter Password:" msgstr "Unesi lozinku:" -#: src/multiint.cpp:1115 +#: src/multiint.cpp:1124 msgid "OK" msgstr "OK" -#: src/multiint.cpp:1232 +#: src/multiint.cpp:1241 msgid "Tanks disabled!!" msgstr "" -#: src/multiint.cpp:1233 +#: src/multiint.cpp:1242 #, fuzzy msgid "Cyborgs disabled." msgstr "Novi Kiborgi su dostupni" -#: src/multiint.cpp:1234 +#: src/multiint.cpp:1243 msgid "VTOLs disabled." msgstr "" -#: src/multiint.cpp:1281 -#: src/multiint.cpp:1288 +#: src/multiint.cpp:1290 +#: src/multiint.cpp:1297 msgid "Select Game Name" msgstr "Odaberi naziv igre" -#: src/multiint.cpp:1281 +#: src/multiint.cpp:1290 msgid "One-Player Skirmish" msgstr "Okršaj za 1 igrača" -#: src/multiint.cpp:1291 +#: src/multiint.cpp:1300 msgid "Select Map" msgstr "Odaberi kartu" -#: src/multiint.cpp:1299 +#: src/multiint.cpp:1308 msgid "Click to set Password" msgstr "Odaberi lozinku" -#: src/multiint.cpp:1309 -#: src/multiint.cpp:1310 +#: src/multiint.cpp:1318 +#: src/multiint.cpp:1319 msgid "Scavengers" msgstr "Sa stanovnicima" -#: src/multiint.cpp:1312 +#: src/multiint.cpp:1321 msgid "No Scavengers" msgstr "Bez stanovnika" -#: src/multiint.cpp:1342 +#: src/multiint.cpp:1351 msgid "Select Player Name" msgstr "Odaberi ime igrača" -#: src/multiint.cpp:1348 +#: src/multiint.cpp:1357 msgid "Distance Fog" msgstr "Magla udaljenosti" -#: src/multiint.cpp:1359 +#: src/multiint.cpp:1368 #: src/multimenu.cpp:756 msgid "Alliances" msgstr "Savezi" -#: src/multiint.cpp:1362 +#: src/multiint.cpp:1371 msgid "No Alliances" msgstr "Opći rat" -#: src/multiint.cpp:1364 +#: src/multiint.cpp:1373 msgid "Allow Alliances" msgstr "Slobodno" -#: src/multiint.cpp:1368 +#: src/multiint.cpp:1377 msgid "Locked Teams" msgstr "Timovi" -#: src/multiint.cpp:1394 +#: src/multiint.cpp:1403 msgid "Low Power Levels" msgstr "Niska razina resursa" -#: src/multiint.cpp:1396 +#: src/multiint.cpp:1405 msgid "Medium Power Levels" msgstr "Srednja razina resursa" -#: src/multiint.cpp:1398 +#: src/multiint.cpp:1407 msgid "High Power Levels" msgstr "Visoka razina resursa" -#: src/multiint.cpp:1430 +#: src/multiint.cpp:1439 msgid "Base" msgstr "Baza" -#: src/multiint.cpp:1432 +#: src/multiint.cpp:1441 msgid "Start with No Bases" msgstr "Započni bez baza" -#: src/multiint.cpp:1434 +#: src/multiint.cpp:1443 msgid "Start with Bases" msgstr "Započni sa bazama" -#: src/multiint.cpp:1436 +#: src/multiint.cpp:1445 msgid "Start with Advanced Bases" msgstr "Započni sa naprednim bazama" -#: src/multiint.cpp:1468 +#: src/multiint.cpp:1477 msgid "Map Preview" msgstr "Predprikaz karte" -#: src/multiint.cpp:1470 +#: src/multiint.cpp:1479 msgid "Click to see Map" msgstr "Klikni za predprikaz karte" -#: src/multiint.cpp:1484 +#: src/multiint.cpp:1493 msgid "Start Hosting Game" msgstr "Započni hostanje igre" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 msgid "Show Structure Limits" msgstr "Pokaži limite" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 msgid "Set Structure Limits" msgstr "Postavi limite" -#: src/multiint.cpp:1587 +#: src/multiint.cpp:1596 msgid "DIFFICULTY" msgstr "" -#: src/multiint.cpp:1601 +#: src/multiint.cpp:1610 msgid "Less aggressive and starts with less units" msgstr "" -#: src/multiint.cpp:1602 +#: src/multiint.cpp:1611 #, fuzzy msgid "Plays nice" msgstr "Igrač" -#: src/multiint.cpp:1603 +#: src/multiint.cpp:1612 msgid "No holds barred" msgstr "" -#: src/multiint.cpp:1604 +#: src/multiint.cpp:1613 msgid "Starts with advantages and gets twice as much oil from derricks" msgstr "" -#: src/multiint.cpp:1632 +#: src/multiint.cpp:1641 msgid "CHOOSE AI" msgstr "" -#: src/multiint.cpp:1648 +#: src/multiint.cpp:1657 msgid "Allow human players to join in this slot" msgstr "" -#: src/multiint.cpp:1656 +#: src/multiint.cpp:1665 msgid "Leave this slot unused" msgstr "" -#: src/multiint.cpp:1736 +#: src/multiint.cpp:1745 msgid "Player colour" msgstr "Boja igrača" -#: src/multiint.cpp:2062 +#: src/multiint.cpp:2071 msgid "Team" msgstr "Savez" -#: src/multiint.cpp:2074 +#: src/multiint.cpp:2083 msgid "Kick player" msgstr "Izbaci igrača" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 #, fuzzy msgid "Click to change difficulty" msgstr "Odaberi lozinku" -#: src/multiint.cpp:2121 +#: src/multiint.cpp:2130 msgid "Click when ready" msgstr "Označi kada si spreman" -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2134 msgid "READY?" msgstr "SPREMAN?" -#: src/multiint.cpp:2169 +#: src/multiint.cpp:2178 msgid "PLAYERS" msgstr "Igrači" -#: src/multiint.cpp:2204 +#: src/multiint.cpp:2213 #, fuzzy msgid "Click to change to this slot" msgstr "Odaberi lozinku" -#: src/multiint.cpp:2232 +#: src/multiint.cpp:2241 #, fuzzy msgid "Choose Team" msgstr "Timovi" -#: src/multiint.cpp:2262 +#: src/multiint.cpp:2271 #, fuzzy msgid "Click to change player colour" msgstr "Karta prikazuje boje igrača" -#: src/multiint.cpp:2290 +#: src/multiint.cpp:2299 #, fuzzy msgid "Click to change player position" msgstr "Obrambeni položaj" -#: src/multiint.cpp:2296 +#: src/multiint.cpp:2305 #, fuzzy msgid "Click to change AI" msgstr "Odaberi lozinku" -#: src/multiint.cpp:2300 +#: src/multiint.cpp:2309 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2362 +#: src/multiint.cpp:2371 msgid "CHAT" msgstr "Čavrljanje" -#: src/multiint.cpp:2394 +#: src/multiint.cpp:2403 msgid "All players need to have the same mods to join your game." msgstr "Svi igrači moraju imati iste modove." -#: src/multiint.cpp:2552 +#: src/multiint.cpp:2561 #, fuzzy, c-format msgid "*** password [%s] is now required! ***" msgstr "Lozinka je potrebna." -#: src/multiint.cpp:2560 +#: src/multiint.cpp:2569 msgid "*** password is NOT required! ***" msgstr "Lozinka nije potrebna." -#: src/multiint.cpp:2801 +#: src/multiint.cpp:2810 msgid "Sorry! Failed to host the game." msgstr "Ne možeš hostati igru." -#: src/multiint.cpp:2922 +#: src/multiint.cpp:2931 msgid "'Locked Teams' mode enabled" msgstr "Model saveza: Timovi" -#: src/multiint.cpp:3003 +#: src/multiint.cpp:3012 #, c-format msgid "The host has kicked %s from the game!" msgstr "Host je izbacio %s iz igre." -#: src/multiint.cpp:3073 +#: src/multiint.cpp:3082 msgid "Host is Starting Game" msgstr "Host započinje igru" -#: src/multiint.cpp:3639 +#: src/multiint.cpp:3648 msgid "Players" msgstr "Igrači" -#: src/multiint.cpp:3772 +#: src/multiint.cpp:3786 #, c-format msgid "Sending Map: %d%% " msgstr "Slanje karte: %d%%" -#: src/multiint.cpp:3780 +#: src/multiint.cpp:3794 #, c-format msgid "Map: %d%% downloaded" msgstr "Karta: %d%% downloadana" -#: src/multiint.cpp:3803 +#: src/multiint.cpp:3820 msgid "HOST" msgstr "HOST" +#: src/multiint.cpp:3827 +#: src/multimenu.cpp:772 +msgid "Ping" +msgstr "Ping" + #: src/multijoin.cpp:100 #: src/multijoin.cpp:101 msgid "Players Still Joining" @@ -14454,17 +14459,17 @@ msgstr "%s je izašao iz igre" msgid "File transfer has been aborted for %d." msgstr "Slanje podaaka je zaustavljeno za %d." -#: src/multijoin.cpp:376 +#: src/multijoin.cpp:373 #, c-format msgid "%s (%u) has an incompatible mod, and has been kicked." msgstr "%s (%u) ima nedopušten mod i izbačen je." -#: src/multijoin.cpp:415 +#: src/multijoin.cpp:412 #, c-format msgid "%s is Joining the Game" msgstr "%s se pridužio igri." -#: src/multijoin.cpp:425 +#: src/multijoin.cpp:422 msgid "System message:" msgstr "Poruka servera:" @@ -14577,10 +14582,6 @@ msgstr "Uništenja" msgid "Units" msgstr "Jedinica" -#: src/multimenu.cpp:772 -msgid "Ping" -msgstr "Ping" - #: src/multimenu.cpp:776 msgid "Structs" msgstr "Strukture" @@ -14614,83 +14615,83 @@ msgstr "Pošalji resurse igraču" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "Izbacivanje igrača %s jer se podaci ne podudaraju" -#: src/multiplay.cpp:1146 +#: src/multiplay.cpp:1057 msgid "(allies" msgstr "(saveznika" -#: src/multiplay.cpp:1154 +#: src/multiplay.cpp:1065 msgid "(private to " msgstr "(samo za" -#: src/multiplay.cpp:1167 +#: src/multiplay.cpp:1078 msgid "[invalid]" msgstr "[nedostupno]" -#: src/multiplay.cpp:2057 +#: src/multiplay.cpp:1942 msgid "Green" msgstr "Zeleni" -#: src/multiplay.cpp:2058 +#: src/multiplay.cpp:1943 msgid "Orange" msgstr "Narančasti" -#: src/multiplay.cpp:2059 +#: src/multiplay.cpp:1944 msgid "Grey" msgstr "Sivi" -#: src/multiplay.cpp:2060 +#: src/multiplay.cpp:1945 msgid "Black" msgstr "Crni" -#: src/multiplay.cpp:2061 +#: src/multiplay.cpp:1946 msgid "Red" msgstr "Crveni" -#: src/multiplay.cpp:2062 +#: src/multiplay.cpp:1947 msgid "Blue" msgstr "Plavi" -#: src/multiplay.cpp:2063 +#: src/multiplay.cpp:1948 msgid "Pink" msgstr "Ljubičasta" -#: src/multiplay.cpp:2064 +#: src/multiplay.cpp:1949 msgid "Cyan" msgstr "Cijan" -#: src/multiplay.cpp:2065 +#: src/multiplay.cpp:1950 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:2066 +#: src/multiplay.cpp:1951 msgid "Purple" msgstr "" -#: src/multiplay.cpp:2067 +#: src/multiplay.cpp:1952 msgid "White" msgstr "" -#: src/multiplay.cpp:2068 +#: src/multiplay.cpp:1953 msgid "Bright blue" msgstr "" -#: src/multiplay.cpp:2069 +#: src/multiplay.cpp:1954 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:2070 +#: src/multiplay.cpp:1955 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:2071 +#: src/multiplay.cpp:1956 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:2072 +#: src/multiplay.cpp:1957 msgid "Brown" msgstr "" -#: src/order.cpp:841 +#: src/order.cpp:800 msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "" @@ -14825,20 +14826,20 @@ msgstr "Trajanje igre - %s" msgid "You cheated!" msgstr "Koristio si šifre!!!" -#: src/scriptfuncs.cpp:3250 +#: src/scriptfuncs.cpp:3287 msgid "YOU ARE VICTORIOUS!" msgstr "POBJEDIO SI!!!" -#: src/scriptfuncs.cpp:3254 +#: src/scriptfuncs.cpp:3291 msgid "YOU WERE DEFEATED!" msgstr "IZGUBIO SI!!!" -#: src/scriptfuncs.cpp:9500 +#: src/scriptfuncs.cpp:9537 #, c-format msgid "Beacon received from %s!" msgstr "%s je postavio zastavicu." -#: src/scriptfuncs.cpp:9546 +#: src/scriptfuncs.cpp:9583 #, c-format msgid "Beacon %d" msgstr "Zastavica %d" @@ -14867,63 +14868,63 @@ msgstr "Nemaš ni jedan mobilni radar." msgid "Unable to locate any Commanders!" msgstr "Nemaš ni jednog kapetana." -#: src/structure.cpp:2615 +#: src/structure.cpp:2614 #, fuzzy msgid "Command Control Limit Reached - Production Halted" msgstr "Limit prijeđen - Proizvodnja prekinuta" -#: src/structure.cpp:5815 -#: src/structure.cpp:5840 +#: src/structure.cpp:5806 +#: src/structure.cpp:5831 #, fuzzy, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" msgstr[0] "%s - %u jedinica dodjeljena" msgstr[1] "%s - %u jedinica dodjeljena" -#: src/structure.cpp:5845 -#: src/structure.cpp:5913 -#: src/structure.cpp:5929 -#: src/structure.cpp:5943 +#: src/structure.cpp:5836 +#: src/structure.cpp:5904 +#: src/structure.cpp:5920 +#: src/structure.cpp:5934 #, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - Oštečen %3.0f%%" -#: src/structure.cpp:5895 +#: src/structure.cpp:5886 #, c-format msgid "%s - Connected %u of %u" msgstr "%s - Povezan s %u od %u" -#: src/structure.cpp:6059 -#: src/structure.cpp:6104 +#: src/structure.cpp:6050 +#: src/structure.cpp:6095 #, c-format msgid "%s - Electronically Damaged" msgstr "%s - Hakirano" -#: src/structure.cpp:6341 +#: src/structure.cpp:6332 msgid "Electronic Reward - Visibility Report" msgstr "Nagrada hakirane građevine - Vizualno izvješče" -#: src/structure.cpp:6381 +#: src/structure.cpp:6372 msgid "Factory Reward - Propulsion" msgstr "Nagrada hakirane Tvornice - Vozni sustav" -#: src/structure.cpp:6405 +#: src/structure.cpp:6396 msgid "Factory Reward - Body" msgstr "Nagrada hakirane Tvornice - Trup" -#: src/structure.cpp:6429 +#: src/structure.cpp:6420 msgid "Factory Reward - Weapon" msgstr "Nagrada hakirane Tvornice - Oružje" -#: src/structure.cpp:6438 +#: src/structure.cpp:6429 msgid "Factory Reward - Nothing" msgstr "Nagrada hakirane Tvornice - Ništa" -#: src/structure.cpp:6466 +#: src/structure.cpp:6457 msgid "Repair Facility Award - Repair" msgstr "Nagrada hakiranog Servisa - Poravak" -#: src/structure.cpp:6473 +#: src/structure.cpp:6464 msgid "Repair Facility Award - Nothing" msgstr "Nagrada hakiranog Servisa - Ništa" diff --git a/po/it.po b/po/it.po index 8e2fe09fe..9e7554c7c 100644 --- a/po/it.po +++ b/po/it.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-01-18 00:54+0100\n" +"POT-Creation-Date: 2011-02-25 23:35+0100\n" "PO-Revision-Date: 2010-12-14 22:19+0100\n" "Last-Translator: Cristian Odorico \n" "Language-Team: Italian \n" @@ -5736,7 +5736,7 @@ msgid "New Design" msgstr "Nuovo Progetto" #: data/base/messages/strings/names.txt:15 -#: src/design.cpp:1313 +#: src/design.cpp:1275 msgid "Transport" msgstr "Trasporto" @@ -12014,26 +12014,26 @@ msgid "System locale" msgstr "System locale" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1043 +#: lib/netplay/netplay.cpp:1042 msgid "Enter password here" msgstr "Inserisci qua la password" -#: lib/netplay/netplay.cpp:2048 +#: lib/netplay/netplay.cpp:2060 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "Non posso decidere il nome del server master (%s)!" -#: lib/netplay/netplay.cpp:2062 +#: lib/netplay/netplay.cpp:2082 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "Non posso comunicare con il server della Lobby! La porta TCP %u è aperta?" #: src/challenge.cpp:184 -#: src/hci.cpp:922 -#: src/hci.cpp:3390 -#: src/hci.cpp:3513 -#: src/hci.cpp:3924 -#: src/hci.cpp:4942 +#: src/hci.cpp:916 +#: src/hci.cpp:3378 +#: src/hci.cpp:3501 +#: src/hci.cpp:3912 +#: src/hci.cpp:4930 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12185,149 +12185,149 @@ msgstr "Vai direttamente alla schermata host" #: src/configuration.cpp:393 #: src/configuration.cpp:394 -#: src/multistat.cpp:130 +#: src/multistat.cpp:124 msgid "Player" msgstr "Giocatore" -#: src/design.cpp:449 -#: src/design.cpp:469 -#: src/design.cpp:3501 +#: src/design.cpp:443 +#: src/design.cpp:455 +#: src/design.cpp:3464 msgid "New Vehicle" msgstr "Nuovo veicolo" -#: src/design.cpp:515 +#: src/design.cpp:500 msgid "Vehicle Body" msgstr "Corpo del Veicolo" -#: src/design.cpp:535 +#: src/design.cpp:520 msgid "Vehicle Propulsion" msgstr "Propilsione del Veicolo" -#: src/design.cpp:556 -#: src/design.cpp:579 -#: src/design.cpp:603 +#: src/design.cpp:541 +#: src/design.cpp:564 +#: src/design.cpp:588 msgid "Vehicle Turret" msgstr "Torretta del Veicolo" -#: src/design.cpp:622 +#: src/design.cpp:607 msgid "Delete Design" msgstr "Cancella il Progetto" -#: src/design.cpp:673 -#: src/design.cpp:720 +#: src/design.cpp:658 +#: src/design.cpp:705 msgid "Kinetic Armour" msgstr "Armatura Cinetica" -#: src/design.cpp:682 -#: src/design.cpp:730 +#: src/design.cpp:667 +#: src/design.cpp:715 msgid "Thermal Armour" msgstr "Armatura Termica" -#: src/design.cpp:698 -#: src/design.cpp:750 +#: src/design.cpp:683 +#: src/design.cpp:735 msgid "Engine Output" msgstr "Potenza del Motore" -#: src/design.cpp:706 -#: src/design.cpp:759 -#: src/design.cpp:1529 -#: src/design.cpp:1553 -#: src/design.cpp:1574 -#: src/design.cpp:1590 -#: src/design.cpp:1610 -#: src/design.cpp:1627 -#: src/design.cpp:1647 -#: src/design.cpp:1664 -#: src/design.cpp:1705 -#: src/design.cpp:1737 -#: src/design.cpp:1869 -#: src/design.cpp:1885 -#: src/design.cpp:1923 -#: src/design.cpp:1956 +#: src/design.cpp:691 +#: src/design.cpp:744 +#: src/design.cpp:1486 +#: src/design.cpp:1510 +#: src/design.cpp:1531 +#: src/design.cpp:1547 +#: src/design.cpp:1567 +#: src/design.cpp:1584 +#: src/design.cpp:1604 +#: src/design.cpp:1621 +#: src/design.cpp:1662 +#: src/design.cpp:1694 +#: src/design.cpp:1826 +#: src/design.cpp:1842 +#: src/design.cpp:1880 +#: src/design.cpp:1913 msgid "Weight" msgstr "Peso" -#: src/design.cpp:790 -#: src/design.cpp:808 +#: src/design.cpp:775 +#: src/design.cpp:793 msgid "Total Power Required" msgstr "Energia totale necessaria" -#: src/design.cpp:821 -#: src/design.cpp:840 +#: src/design.cpp:806 +#: src/design.cpp:825 msgid "Total Body Points" msgstr "Punti Vita totali" -#: src/design.cpp:1027 -#: src/design.cpp:1059 +#: src/design.cpp:996 +#: src/design.cpp:1025 msgid "Power Usage" msgstr "Utilizzo d'Energia" -#: src/design.cpp:1335 +#: src/design.cpp:1298 msgid "Hydra " msgstr "Hydra" -#: src/design.cpp:1509 -#: src/design.cpp:1537 +#: src/design.cpp:1466 +#: src/design.cpp:1494 msgid "Sensor Range" msgstr "Raggio dei Sensori" -#: src/design.cpp:1521 -#: src/design.cpp:1545 +#: src/design.cpp:1478 +#: src/design.cpp:1502 msgid "Sensor Power" msgstr "Potenza dei Sensori" -#: src/design.cpp:1566 -#: src/design.cpp:1582 +#: src/design.cpp:1523 +#: src/design.cpp:1539 msgid "ECM Power" msgstr "Potenza dell'ECM" -#: src/design.cpp:1602 -#: src/design.cpp:1619 -#: src/design.cpp:1639 -#: src/design.cpp:1656 +#: src/design.cpp:1559 +#: src/design.cpp:1576 +#: src/design.cpp:1596 +#: src/design.cpp:1613 msgid "Build Points" msgstr "Punti di Costruzione" -#: src/design.cpp:1677 -#: src/design.cpp:1713 +#: src/design.cpp:1634 +#: src/design.cpp:1670 msgid "Range" msgstr "Raggio" -#: src/design.cpp:1689 -#: src/design.cpp:1721 +#: src/design.cpp:1646 +#: src/design.cpp:1678 msgid "Damage" msgstr "Danno" -#: src/design.cpp:1697 -#: src/design.cpp:1729 +#: src/design.cpp:1654 +#: src/design.cpp:1686 msgid "Rate-of-Fire" msgstr "Rateo di Fuoco" -#: src/design.cpp:1857 -#: src/design.cpp:1877 +#: src/design.cpp:1814 +#: src/design.cpp:1834 msgid "Air Speed" msgstr "Velocità in Aria" -#: src/design.cpp:1895 -#: src/design.cpp:1932 +#: src/design.cpp:1852 +#: src/design.cpp:1889 msgid "Road Speed" msgstr "Velocità sulla Strada" -#: src/design.cpp:1905 -#: src/design.cpp:1940 +#: src/design.cpp:1862 +#: src/design.cpp:1897 msgid "Off-Road Speed" msgstr "Velocità Fuoristrada" -#: src/design.cpp:1913 -#: src/design.cpp:1948 +#: src/design.cpp:1870 +#: src/design.cpp:1905 msgid "Water Speed" msgstr "Velocità sull'Acqua" -#: src/design.cpp:2074 +#: src/design.cpp:2031 msgid "Weapons" msgstr "Armi" -#: src/design.cpp:2094 +#: src/design.cpp:2051 msgid "Systems" msgstr "Sistemi" @@ -12340,7 +12340,7 @@ msgid "Player dropped" msgstr "Giocatore" #: src/display3d.cpp:599 -#: src/multiint.cpp:2116 +#: src/multiint.cpp:2125 msgid "Waiting for other players" msgstr "In attesa degli altri giocatori" @@ -12348,113 +12348,113 @@ msgstr "In attesa degli altri giocatori" msgid "Out of sync" msgstr "Fuori sincronia" -#: src/display.cpp:1651 +#: src/display.cpp:1649 msgid "Cannot Build. Oil Resource Burning." msgstr "Impossibile costruire. Risorsa d'olio in fiamme." -#: src/display.cpp:1830 -#: src/display.cpp:2423 +#: src/display.cpp:1828 +#: src/display.cpp:2421 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - Danno %d%% - Esperienza %d, %s" -#: src/display.cpp:1846 +#: src/display.cpp:1844 #, c-format msgid "%s - Allied - Damage %d%% - Experience %d, %s" msgstr "%s - Alleato - Danno %d%% - Esperienza %d, %s" -#: src/display.cpp:2044 +#: src/display.cpp:2042 msgid "Truck ordered to build Oil Derrick" msgstr "Camion incaricato di costruire un Traliccio Petrolifero" -#: src/display.cpp:2045 +#: src/display.cpp:2043 msgid "2 trucks ordered to build Oil Derrick" msgstr "2 camion incaricati di costruire un Traliccio Petrolifero" -#: src/display.cpp:2046 +#: src/display.cpp:2044 #, c-format msgid "%d trucks ordered to build Oil Derrick" msgstr "%d camion incaricati di costruire un Traliccio Petrolifero" -#: src/droid.cpp:208 +#: src/droid.cpp:211 msgid "Unit Lost!" msgstr "Unità Persa!" -#: src/droid.cpp:1370 +#: src/droid.cpp:1376 msgid "Structure Restored" msgstr "Struttura Riparata" -#: src/droid.cpp:2712 +#: src/droid.cpp:2732 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" msgstr[0] "Gruppo %u selezionato - %u Unità" msgstr[1] "Gruppo %u selezionato - %u Unità" -#: src/droid.cpp:2725 +#: src/droid.cpp:2745 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" msgstr[0] "%u unità assegnata al Gruppo %u" msgstr[1] "%u unità assegnata al Gruppo %u" -#: src/droid.cpp:2738 +#: src/droid.cpp:2758 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" msgstr[0] "Visuale Centrata sul Gruppo %u - %u Unit" msgstr[1] "Visuale Centrata sul gruppo %u - %u Unità" -#: src/droid.cpp:2742 +#: src/droid.cpp:2762 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" msgstr[0] "Visuale affiancata al Gruppo %u - %u Unità" msgstr[1] "Visuale affiancata al Gruppo %u - %u Unità" -#: src/droid.cpp:3080 +#: src/droid.cpp:3093 msgid "Rookie" msgstr "Coscritta" -#: src/droid.cpp:3081 +#: src/droid.cpp:3094 msgctxt "rank" msgid "Green" msgstr "Inesperta" -#: src/droid.cpp:3082 +#: src/droid.cpp:3095 msgid "Trained" msgstr "Addestrata" -#: src/droid.cpp:3083 +#: src/droid.cpp:3096 msgid "Regular" msgstr "Normale" -#: src/droid.cpp:3084 +#: src/droid.cpp:3097 msgid "Professional" msgstr "Professionale" -#: src/droid.cpp:3085 +#: src/droid.cpp:3098 msgid "Veteran" msgstr "Veterana" -#: src/droid.cpp:3086 +#: src/droid.cpp:3099 msgid "Elite" msgstr "Elite" -#: src/droid.cpp:3087 +#: src/droid.cpp:3100 msgid "Special" msgstr "Speciale" -#: src/droid.cpp:3088 +#: src/droid.cpp:3101 msgid "Hero" msgstr "Eroe" -#: src/droid.cpp:4110 +#: src/droid.cpp:4123 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "%s avrebbe voluto darti un %s ma ne hai troppi!" -#: src/droid.cpp:4114 +#: src/droid.cpp:4127 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "Volevi dare a %s un %s ma ne hanno troppi!" @@ -12473,7 +12473,7 @@ msgid "Tutorial" msgstr "Tutorial" #: src/frontend.cpp:100 -#: src/hci.cpp:3499 +#: src/hci.cpp:3487 msgid "Options" msgstr "Opzioni" @@ -12524,7 +12524,7 @@ msgid "Challenges" msgstr "Sfide" #: src/frontend.cpp:215 -#: src/ingameop.cpp:275 +#: src/ingameop.cpp:272 msgid "Load Game" msgstr "Carica Partita" @@ -12533,9 +12533,9 @@ msgid "SINGLE PLAYER" msgstr "GIOCATORE SINGOLO" #: src/frontend.cpp:303 -#: src/ingameop.cpp:498 -#: src/mission.cpp:2527 -#: src/mission.cpp:2630 +#: src/ingameop.cpp:494 +#: src/mission.cpp:2493 +#: src/mission.cpp:2596 msgid "Load Saved Game" msgstr "Carica Partita" @@ -12552,7 +12552,7 @@ msgid "Join Game" msgstr "Unisciti a una partita" #: src/frontend.cpp:422 -#: src/multiint.cpp:1276 +#: src/multiint.cpp:1285 msgid "OPTIONS" msgstr "OPZIONI" @@ -12569,7 +12569,7 @@ msgid "Video Options" msgstr "Opzioni video." #: src/frontend.cpp:426 -#: src/ingameop.cpp:270 +#: src/ingameop.cpp:267 msgid "Audio Options" msgstr "Opzioni Audio" @@ -12647,7 +12647,7 @@ msgid "Off" msgstr "Off" #: src/frontend.cpp:523 -#: src/multiint.cpp:1345 +#: src/multiint.cpp:1354 msgid "Fog" msgstr "Nebbia" @@ -12658,7 +12658,7 @@ msgstr "Nebbia" #: src/frontend.cpp:530 #: src/frontend.cpp:595 -#: src/multiint.cpp:1347 +#: src/multiint.cpp:1356 msgid "Fog Of War" msgstr "Nebbia di Guerra" @@ -12820,193 +12820,193 @@ msgid "GAME OPTIONS" msgstr "OPZIONI DI GIOCO" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2389 +#: src/multiint.cpp:2398 msgid "Mod: " msgstr "Mod:" -#: src/hci.cpp:1245 +#: src/hci.cpp:1237 msgid "MAP SAVED!" msgstr "MAPPA SALVATA!" -#: src/hci.cpp:1584 +#: src/hci.cpp:1573 #: src/loop.cpp:558 #: src/loop.cpp:574 msgid "GAME SAVED: " msgstr "PARTITA SALVATA:" -#: src/hci.cpp:1971 +#: src/hci.cpp:1960 msgid "Failed to create building" msgstr "Costruzione fallita" -#: src/hci.cpp:1988 +#: src/hci.cpp:1977 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new structure: %s." msgstr "Il giocatore %u sta ottenendo una nuova struttura per mezzo di trucchi (debug menu) : %s." -#: src/hci.cpp:2003 +#: src/hci.cpp:1992 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new feature: %s." msgstr "Il giocatore %u sta ottenendo una nuova caratteristica per mezzo di trucchi (debug menu) : %s." -#: src/hci.cpp:2025 +#: src/hci.cpp:2014 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid: %s." msgstr "Il giocatore %u sta ottenendo una nuova unità per mezzo di trucchi (debug menu) : %s." -#: src/hci.cpp:2036 +#: src/hci.cpp:2025 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "Il giocatore %u sta ottenendo una nuova unità per mezzo di trucchi (debug menu)." -#: src/hci.cpp:3310 +#: src/hci.cpp:3298 msgid "Commanders (F6)" msgstr "Comandanti (F6)" -#: src/hci.cpp:3323 +#: src/hci.cpp:3311 msgid "Intelligence Display (F5)" msgstr "Intelligence (F5)" -#: src/hci.cpp:3336 +#: src/hci.cpp:3324 msgid "Manufacture (F1)" msgstr "Produzione (F1)" -#: src/hci.cpp:3349 +#: src/hci.cpp:3337 msgid "Design (F4)" msgstr "Progettazione (F4)" -#: src/hci.cpp:3362 +#: src/hci.cpp:3350 msgid "Research (F2)" msgstr "Ricerca (F2)" -#: src/hci.cpp:3375 +#: src/hci.cpp:3363 msgid "Build (F3)" msgstr "Costruzione (F3)" -#: src/hci.cpp:3446 -#: src/multiint.cpp:1392 +#: src/hci.cpp:3434 +#: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Energia" -#: src/hci.cpp:3537 +#: src/hci.cpp:3525 msgid "Map:" msgstr "Mappa:" -#: src/hci.cpp:3550 +#: src/hci.cpp:3538 msgid "Load" msgstr "Carica" -#: src/hci.cpp:3551 +#: src/hci.cpp:3539 msgid "Load Map File" msgstr "Carica File Mappa" -#: src/hci.cpp:3558 +#: src/hci.cpp:3546 msgid "Save" msgstr "Salva" -#: src/hci.cpp:3559 +#: src/hci.cpp:3547 msgid "Save Map File" msgstr "Salva File Mappa" -#: src/hci.cpp:3567 +#: src/hci.cpp:3555 msgid "New" msgstr "Nuovo" -#: src/hci.cpp:3568 +#: src/hci.cpp:3556 msgid "New Blank Map" msgstr "Nuova mappa vuota" -#: src/hci.cpp:3604 +#: src/hci.cpp:3592 msgid "Tile" msgstr "Texture" -#: src/hci.cpp:3605 +#: src/hci.cpp:3593 msgid "Place tiles on map" msgstr "Piazza texture sulla mappa" -#: src/hci.cpp:3614 +#: src/hci.cpp:3602 msgid "Unit" msgstr "Unità" -#: src/hci.cpp:3615 +#: src/hci.cpp:3603 msgid "Place Unit on map" msgstr "Piazza un' Unità sulla mappa" -#: src/hci.cpp:3623 +#: src/hci.cpp:3611 msgid "Struct" msgstr "Struttura" -#: src/hci.cpp:3624 +#: src/hci.cpp:3612 msgid "Place Structures on map" msgstr "Piazza Strutture sulla mappa" -#: src/hci.cpp:3632 +#: src/hci.cpp:3620 msgid "Feat" msgstr "Caratteristica" -#: src/hci.cpp:3633 +#: src/hci.cpp:3621 msgid "Place Features on map" msgstr "Piazza Oggetti sulla mappa" -#: src/hci.cpp:3643 +#: src/hci.cpp:3631 msgid "Pause" msgstr "Pausa" -#: src/hci.cpp:3644 +#: src/hci.cpp:3632 msgid "Pause or unpause the game" msgstr "Metti in pausa o riprendi la partita" -#: src/hci.cpp:3658 +#: src/hci.cpp:3646 msgid "Align height of all map objects" msgstr "Allinea le altezze di tutti gli oggetti della mappa" -#: src/hci.cpp:3668 +#: src/hci.cpp:3656 msgid "Edit" msgstr "Edita" -#: src/hci.cpp:3669 +#: src/hci.cpp:3657 msgid "Start Edit Mode" msgstr "Inizia Modalità Edit" -#: src/hci.cpp:3683 +#: src/hci.cpp:3671 #: src/ingameop.cpp:112 -#: src/ingameop.cpp:258 -#: src/ingameop.cpp:263 +#: src/ingameop.cpp:256 +#: src/ingameop.cpp:260 msgid "Quit" msgstr "Abbandona" -#: src/hci.cpp:3684 +#: src/hci.cpp:3672 msgid "Exit Game" msgstr "Esci dal Gioco" -#: src/hci.cpp:3710 +#: src/hci.cpp:3698 msgid "Current Player:" msgstr "Player Attuale:" -#: src/hci.cpp:4001 +#: src/hci.cpp:3989 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "Barra del Progresso" -#: src/hci.cpp:4867 +#: src/hci.cpp:4855 msgid "Factory Delivery Point" msgstr "Punto di Raduno della Fabbrica" -#: src/hci.cpp:4885 +#: src/hci.cpp:4873 msgid "Loop Production" msgstr "Produzione Ciclica" -#: src/hci.cpp:4965 +#: src/hci.cpp:4953 msgid "Tab Scroll left" msgstr "Scorri tabella a Sinistra" -#: src/hci.cpp:4980 +#: src/hci.cpp:4968 msgid "Tab Scroll right" msgstr "Scorri tabella a Destra" #: src/ingameop.cpp:111 -#: src/ingameop.cpp:193 -#: src/ingameop.cpp:267 +#: src/ingameop.cpp:195 +#: src/ingameop.cpp:264 msgid "Resume Game" msgstr "Riprendi la partita" @@ -13014,32 +13014,32 @@ msgstr "Riprendi la partita" msgid "WARNING: You're the host. If you quit, the game ends for everyone!" msgstr "ATTENZIONE: Sei l'host. Se tu abbandoni, la partita termina per tutti!" -#: src/ingameop.cpp:185 -#: src/ingameop.cpp:527 +#: src/ingameop.cpp:186 +#: src/ingameop.cpp:523 msgid "Tactical UI (Target Origin Icon): Show" msgstr "UI Tattica (Icona dell'Origine del bersaglio): Visualizza" -#: src/ingameop.cpp:190 -#: src/ingameop.cpp:531 +#: src/ingameop.cpp:191 +#: src/ingameop.cpp:527 msgid "Tactical UI (Target Origin Icon): Hide" msgstr "UI Tattica (Icona dell'Origine del bersaglio): Nascondi" -#: src/ingameop.cpp:277 -#: src/ingameop.cpp:502 -#: src/mission.cpp:2514 -#: src/mission.cpp:2633 +#: src/ingameop.cpp:274 +#: src/ingameop.cpp:498 +#: src/mission.cpp:2480 +#: src/mission.cpp:2599 msgid "Save Game" msgstr "Salva Partita" -#: src/ingameop.cpp:343 +#: src/ingameop.cpp:339 msgid "Host has quit the game!" msgstr "L'host ha abbandonato la partita!" -#: src/ingameop.cpp:349 +#: src/ingameop.cpp:345 msgid "The game can't continue without the host." msgstr "Il gioco non può continuare senza l'host." -#: src/ingameop.cpp:355 +#: src/ingameop.cpp:351 msgid "--> QUIT <--" msgstr "--> ABBANDONA <--" @@ -13416,52 +13416,52 @@ msgstr "Scuoti lo schermo quando gli oggetti esplodono: Off" msgid "Screen shake when things die: On" msgstr "Scuoti lo schermo quando gli oggetti esplodono: On" -#: src/keybind.cpp:2603 -#: src/keybind.cpp:2646 +#: src/keybind.cpp:2604 +#: src/keybind.cpp:2647 msgid "Sorry, but game speed cannot be changed in multiplayer." msgstr "Spiacente, ma la velocità del gioco non può essere cambiata in multiplayer." -#: src/keybind.cpp:2624 -#: src/keybind.cpp:2667 -#: src/keybind.cpp:2689 +#: src/keybind.cpp:2625 +#: src/keybind.cpp:2668 +#: src/keybind.cpp:2690 msgid "Game Speed Reset" msgstr "Velocità di Gioco Reimpostata" -#: src/keybind.cpp:2628 +#: src/keybind.cpp:2629 #, c-format msgid "Game Speed Increased to %3.1f" msgstr "Velocità di Gioco Aumentata a %3.1f" -#: src/keybind.cpp:2671 +#: src/keybind.cpp:2672 #, c-format msgid "Game Speed Reduced to %3.1f" msgstr "Velocità di Gioco Ridotta a %3.1f" -#: src/keybind.cpp:2701 +#: src/keybind.cpp:2702 msgid "Radar showing friend-foe colors" msgstr "Il radar mostra i colori Amici-Nemici" -#: src/keybind.cpp:2705 +#: src/keybind.cpp:2706 msgid "Radar showing player colors" msgstr "Il radar mostra il colore dei giocatori" -#: src/keybind.cpp:2726 +#: src/keybind.cpp:2727 msgid "Radar showing only objects" msgstr "Il radar mostra solo oggetti" -#: src/keybind.cpp:2729 +#: src/keybind.cpp:2730 msgid "Radar blending terrain and height" msgstr "Radar visualizzante terreno e altitudine" -#: src/keybind.cpp:2732 +#: src/keybind.cpp:2733 msgid "Radar showing terrain" msgstr "Il radar mostra il terreno" -#: src/keybind.cpp:2735 +#: src/keybind.cpp:2736 msgid "Radar showing revealed terrain" msgstr "Il radar mostra il terreno scoperto" -#: src/keybind.cpp:2738 +#: src/keybind.cpp:2739 msgid "Radar showing height" msgstr "Il radar mostra l'altitudine" @@ -13470,9 +13470,9 @@ msgid "KEY MAPPING" msgstr "ASSEGNAZIONE TASTI" #: src/keyedit.cpp:372 -#: src/multiint.cpp:662 -#: src/multiint.cpp:1072 -#: src/multiint.cpp:1478 +#: src/multiint.cpp:671 +#: src/multiint.cpp:1081 +#: src/multiint.cpp:1487 msgid "Return To Previous Screen" msgstr "Ritorna alla Schermata Precedente" @@ -13961,37 +13961,37 @@ msgstr "Attiva o disattiva la Modalità di Guida" msgid "Could not save game!" msgstr "Non posso salvare la partita!" -#: src/mission.cpp:2075 +#: src/mission.cpp:2041 msgid "Load Transport" msgstr "Carica il trasporto" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "OBIETTIVO RAGGIUNTO barando!" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED" msgstr "OBIETTIVO RAGGIUNTO" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED--and you cheated!" msgstr "MISSIONE FALLITA e hai barato!" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED" msgstr "MISSIONE FALLITA" -#: src/mission.cpp:2493 -#: src/mission.cpp:2533 -#: src/mission.cpp:2647 +#: src/mission.cpp:2459 +#: src/mission.cpp:2499 +#: src/mission.cpp:2613 msgid "Quit To Main Menu" msgstr "Esci al Menu Principale" -#: src/mission.cpp:2501 +#: src/mission.cpp:2467 msgid "Continue Game" msgstr "Continua la Partita" -#: src/mission.cpp:2598 +#: src/mission.cpp:2564 msgid "GAME SAVED :" msgstr "PARTITA SALVATA!" @@ -14050,345 +14050,350 @@ msgstr "%s forma un'alleanza con %s" msgid "You Discover Blueprints For %s" msgstr "Hai scoperto i progetti per %s" -#: src/multiint.cpp:600 +#: src/multiint.cpp:609 #: src/multilimit.cpp:190 msgid "Accept Settings" msgstr "Accetta le Impostazioni" -#: src/multiint.cpp:602 -#: src/multiint.cpp:1117 +#: src/multiint.cpp:611 +#: src/multiint.cpp:1126 msgid "Cancel" msgstr "Cancella" -#: src/multiint.cpp:613 +#: src/multiint.cpp:622 msgid "IP Address or Machine Name" msgstr "Indirizzo IP o Nome Computer" -#: src/multiint.cpp:659 +#: src/multiint.cpp:668 msgid "CONNECTION" msgstr "CONNESSIONE" -#: src/multiint.cpp:664 +#: src/multiint.cpp:673 msgid "Lobby" msgstr "Lobby" -#: src/multiint.cpp:665 +#: src/multiint.cpp:674 msgid "IP" msgstr "IP" -#: src/multiint.cpp:854 +#: src/multiint.cpp:863 msgid "No games are available" msgstr "Non ci sono partite disponibili." -#: src/multiint.cpp:857 +#: src/multiint.cpp:866 msgid "Game is full" msgstr "La partita è piena" -#: src/multiint.cpp:861 +#: src/multiint.cpp:870 msgid "You were kicked!" msgstr "Sei stato kickato!" -#: src/multiint.cpp:864 +#: src/multiint.cpp:873 msgid "Wrong Game Version!" msgstr "Versione del Gioco sbagliata!" -#: src/multiint.cpp:867 +#: src/multiint.cpp:876 msgid "You have an incompatible mod." msgstr "Hai un mod incompatibile." -#: src/multiint.cpp:871 +#: src/multiint.cpp:880 msgid "Host couldn't send file?" msgstr "L'Host non può mandare il file?" -#: src/multiint.cpp:875 +#: src/multiint.cpp:884 msgid "Incorrect Password!" msgstr "Password non corretta!" -#: src/multiint.cpp:878 +#: src/multiint.cpp:887 msgid "Host has dropped connection!" msgstr "L'host ha terminato la connessione!" -#: src/multiint.cpp:882 +#: src/multiint.cpp:891 msgid "Connection Error" msgstr "Errore di connessione" -#: src/multiint.cpp:1012 +#: src/multiint.cpp:1021 msgid "Searching" msgstr "Ricerca in corso..." -#: src/multiint.cpp:1069 +#: src/multiint.cpp:1078 msgid "GAMES" msgstr "PARTITE" -#: src/multiint.cpp:1077 +#: src/multiint.cpp:1086 msgid "Refresh Games List" msgstr "Aggiorna la Lista Partite" -#: src/multiint.cpp:1097 +#: src/multiint.cpp:1106 msgid "Enter Password:" msgstr "Inserisci la password:" -#: src/multiint.cpp:1115 +#: src/multiint.cpp:1124 msgid "OK" msgstr "OK" -#: src/multiint.cpp:1232 +#: src/multiint.cpp:1241 msgid "Tanks disabled!!" msgstr "Carri disabilitati!!" -#: src/multiint.cpp:1233 +#: src/multiint.cpp:1242 msgid "Cyborgs disabled." msgstr "Cyborg disabilitati." -#: src/multiint.cpp:1234 +#: src/multiint.cpp:1243 msgid "VTOLs disabled." msgstr "VTOL disabilitati." -#: src/multiint.cpp:1281 -#: src/multiint.cpp:1288 +#: src/multiint.cpp:1290 +#: src/multiint.cpp:1297 msgid "Select Game Name" msgstr "Seleziona il Nome della Partita" -#: src/multiint.cpp:1281 +#: src/multiint.cpp:1290 msgid "One-Player Skirmish" msgstr "Schermaglia a Un Giocatore" -#: src/multiint.cpp:1291 +#: src/multiint.cpp:1300 msgid "Select Map" msgstr "Seleziona la Mappa" -#: src/multiint.cpp:1299 +#: src/multiint.cpp:1308 msgid "Click to set Password" msgstr "Clicca per settare la Password" -#: src/multiint.cpp:1309 -#: src/multiint.cpp:1310 +#: src/multiint.cpp:1318 +#: src/multiint.cpp:1319 msgid "Scavengers" msgstr "Sciacalli" -#: src/multiint.cpp:1312 +#: src/multiint.cpp:1321 msgid "No Scavengers" msgstr "No Sciacalli" -#: src/multiint.cpp:1342 +#: src/multiint.cpp:1351 msgid "Select Player Name" msgstr "Seleziona il Nome del Giocatore" -#: src/multiint.cpp:1348 +#: src/multiint.cpp:1357 msgid "Distance Fog" msgstr "Nebbia sulla Distanza" -#: src/multiint.cpp:1359 +#: src/multiint.cpp:1368 #: src/multimenu.cpp:756 msgid "Alliances" msgstr "Alleanze" -#: src/multiint.cpp:1362 +#: src/multiint.cpp:1371 msgid "No Alliances" msgstr "Nessuna Alleanza" -#: src/multiint.cpp:1364 +#: src/multiint.cpp:1373 msgid "Allow Alliances" msgstr "Concedi Alleanze" -#: src/multiint.cpp:1368 +#: src/multiint.cpp:1377 msgid "Locked Teams" msgstr "Squadre Bloccate" -#: src/multiint.cpp:1394 +#: src/multiint.cpp:1403 msgid "Low Power Levels" msgstr "Livelli Energetici Bassi" -#: src/multiint.cpp:1396 +#: src/multiint.cpp:1405 msgid "Medium Power Levels" msgstr "Livelli Energetici Medi" -#: src/multiint.cpp:1398 +#: src/multiint.cpp:1407 msgid "High Power Levels" msgstr "Livelli Energetici Alti" -#: src/multiint.cpp:1430 +#: src/multiint.cpp:1439 msgid "Base" msgstr "Base" -#: src/multiint.cpp:1432 +#: src/multiint.cpp:1441 msgid "Start with No Bases" msgstr "Inizia senza Basi" -#: src/multiint.cpp:1434 +#: src/multiint.cpp:1443 msgid "Start with Bases" msgstr "Inizia con Basi" -#: src/multiint.cpp:1436 +#: src/multiint.cpp:1445 msgid "Start with Advanced Bases" msgstr "Inizia con Basi Avanzate" -#: src/multiint.cpp:1468 +#: src/multiint.cpp:1477 msgid "Map Preview" msgstr "Anteprima mappa" -#: src/multiint.cpp:1470 +#: src/multiint.cpp:1479 msgid "Click to see Map" msgstr "Clicca per visualizzare la mappa" -#: src/multiint.cpp:1484 +#: src/multiint.cpp:1493 msgid "Start Hosting Game" msgstr "Inizia ad ospitare la Partita" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 msgid "Show Structure Limits" msgstr "Mostra i limiti di strutture" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 msgid "Set Structure Limits" msgstr "Imposta i limiti di strutture" -#: src/multiint.cpp:1587 +#: src/multiint.cpp:1596 msgid "DIFFICULTY" msgstr "" -#: src/multiint.cpp:1601 +#: src/multiint.cpp:1610 msgid "Less aggressive and starts with less units" msgstr "" -#: src/multiint.cpp:1602 +#: src/multiint.cpp:1611 #, fuzzy msgid "Plays nice" msgstr "Giocatore" -#: src/multiint.cpp:1603 +#: src/multiint.cpp:1612 msgid "No holds barred" msgstr "" -#: src/multiint.cpp:1604 +#: src/multiint.cpp:1613 msgid "Starts with advantages and gets twice as much oil from derricks" msgstr "" -#: src/multiint.cpp:1632 +#: src/multiint.cpp:1641 msgid "CHOOSE AI" msgstr "" -#: src/multiint.cpp:1648 +#: src/multiint.cpp:1657 msgid "Allow human players to join in this slot" msgstr "" -#: src/multiint.cpp:1656 +#: src/multiint.cpp:1665 msgid "Leave this slot unused" msgstr "" -#: src/multiint.cpp:1736 +#: src/multiint.cpp:1745 msgid "Player colour" msgstr "Colore Giocatore" -#: src/multiint.cpp:2062 +#: src/multiint.cpp:2071 msgid "Team" msgstr "Squadra" -#: src/multiint.cpp:2074 +#: src/multiint.cpp:2083 msgid "Kick player" msgstr "Espelli giocatore" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 #, fuzzy msgid "Click to change difficulty" msgstr "Clicca per modificare la difficoltà dell'AI" -#: src/multiint.cpp:2121 +#: src/multiint.cpp:2130 msgid "Click when ready" msgstr "Clicca quando sei pronto" -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2134 msgid "READY?" msgstr "PRONTO?" -#: src/multiint.cpp:2169 +#: src/multiint.cpp:2178 msgid "PLAYERS" msgstr "GIOCATORI" -#: src/multiint.cpp:2204 +#: src/multiint.cpp:2213 #, fuzzy msgid "Click to change to this slot" msgstr "Clicca per cambiare le impostazione del giocatore" -#: src/multiint.cpp:2232 +#: src/multiint.cpp:2241 msgid "Choose Team" msgstr "Scegli la squadra" -#: src/multiint.cpp:2262 +#: src/multiint.cpp:2271 #, fuzzy msgid "Click to change player colour" msgstr "Clicca per cambiare le impostazione del giocatore" -#: src/multiint.cpp:2290 +#: src/multiint.cpp:2299 #, fuzzy msgid "Click to change player position" msgstr "Clicca per cambiare le impostazione del giocatore" -#: src/multiint.cpp:2296 +#: src/multiint.cpp:2305 #, fuzzy msgid "Click to change AI" msgstr "Clicca per cambiare le impostazione del giocatore" -#: src/multiint.cpp:2300 +#: src/multiint.cpp:2309 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2362 +#: src/multiint.cpp:2371 msgid "CHAT" msgstr "CHAT" -#: src/multiint.cpp:2394 +#: src/multiint.cpp:2403 msgid "All players need to have the same mods to join your game." msgstr "Tutti i giocatori devono avere gli stessi mod per entrare nella tua partita." -#: src/multiint.cpp:2552 +#: src/multiint.cpp:2561 #, c-format msgid "*** password [%s] is now required! ***" msgstr "***La password [%s] ora è richiesta! ***" -#: src/multiint.cpp:2560 +#: src/multiint.cpp:2569 msgid "*** password is NOT required! ***" msgstr "*** La password non è richiesta! ***" -#: src/multiint.cpp:2801 +#: src/multiint.cpp:2810 msgid "Sorry! Failed to host the game." msgstr "Spiacente! Host della partita fallito." -#: src/multiint.cpp:2922 +#: src/multiint.cpp:2931 msgid "'Locked Teams' mode enabled" msgstr "Squadre Bloccate" -#: src/multiint.cpp:3003 +#: src/multiint.cpp:3012 #, c-format msgid "The host has kicked %s from the game!" msgstr "L'host ha espulso %s dalla partita!" -#: src/multiint.cpp:3073 +#: src/multiint.cpp:3082 msgid "Host is Starting Game" msgstr "L'host sta avviando la partita" -#: src/multiint.cpp:3639 +#: src/multiint.cpp:3648 msgid "Players" msgstr "Giocatori" -#: src/multiint.cpp:3772 +#: src/multiint.cpp:3786 #, c-format msgid "Sending Map: %d%% " msgstr "Invio mappa: %d%%" -#: src/multiint.cpp:3780 +#: src/multiint.cpp:3794 #, c-format msgid "Map: %d%% downloaded" msgstr "Mappa: %d%% scaricata" -#: src/multiint.cpp:3803 +#: src/multiint.cpp:3820 msgid "HOST" msgstr "HOST" +#: src/multiint.cpp:3827 +#: src/multimenu.cpp:772 +msgid "Ping" +msgstr "Ping" + #: src/multijoin.cpp:100 #: src/multijoin.cpp:101 msgid "Players Still Joining" @@ -14404,17 +14409,17 @@ msgstr "%s ha abbandonato la partita" msgid "File transfer has been aborted for %d." msgstr "Il trasferimento del file è stato annullato per %d" -#: src/multijoin.cpp:376 +#: src/multijoin.cpp:373 #, c-format msgid "%s (%u) has an incompatible mod, and has been kicked." msgstr "%s (%u) ha un mod incompatibile, ed è stato espulso." -#: src/multijoin.cpp:415 +#: src/multijoin.cpp:412 #, c-format msgid "%s is Joining the Game" msgstr "%s si sta unendo alla partita" -#: src/multijoin.cpp:425 +#: src/multijoin.cpp:422 msgid "System message:" msgstr "Messaggio di Sistema" @@ -14523,10 +14528,6 @@ msgstr "Uccisioni" msgid "Units" msgstr "Unità" -#: src/multimenu.cpp:772 -msgid "Ping" -msgstr "Ping" - #: src/multimenu.cpp:776 msgid "Structs" msgstr "Strutture" @@ -14560,84 +14561,84 @@ msgstr "Invia Energia al Giocatore" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "Il giocatore %s sarà kickato perchè hanno cercato di bypassare il controllo dell'integrità dei dati!" -#: src/multiplay.cpp:1146 +#: src/multiplay.cpp:1057 msgid "(allies" msgstr "(alleati" -#: src/multiplay.cpp:1154 +#: src/multiplay.cpp:1065 msgid "(private to " msgstr "(privato a" -#: src/multiplay.cpp:1167 +#: src/multiplay.cpp:1078 msgid "[invalid]" msgstr "[invalido]" -#: src/multiplay.cpp:2057 +#: src/multiplay.cpp:1942 msgid "Green" msgstr "Verde" -#: src/multiplay.cpp:2058 +#: src/multiplay.cpp:1943 msgid "Orange" msgstr "Arancione" -#: src/multiplay.cpp:2059 +#: src/multiplay.cpp:1944 msgid "Grey" msgstr "Grigio" -#: src/multiplay.cpp:2060 +#: src/multiplay.cpp:1945 msgid "Black" msgstr "Nero" -#: src/multiplay.cpp:2061 +#: src/multiplay.cpp:1946 msgid "Red" msgstr "Rosso" -#: src/multiplay.cpp:2062 +#: src/multiplay.cpp:1947 msgid "Blue" msgstr "Blu" -#: src/multiplay.cpp:2063 +#: src/multiplay.cpp:1948 msgid "Pink" msgstr "Rosa" -#: src/multiplay.cpp:2064 +#: src/multiplay.cpp:1949 msgid "Cyan" msgstr "Azzurro" -#: src/multiplay.cpp:2065 +#: src/multiplay.cpp:1950 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:2066 +#: src/multiplay.cpp:1951 msgid "Purple" msgstr "" -#: src/multiplay.cpp:2067 +#: src/multiplay.cpp:1952 msgid "White" msgstr "" -#: src/multiplay.cpp:2068 +#: src/multiplay.cpp:1953 #, fuzzy msgid "Bright blue" msgstr "Pulsante destro" -#: src/multiplay.cpp:2069 +#: src/multiplay.cpp:1954 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:2070 +#: src/multiplay.cpp:1955 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:2071 +#: src/multiplay.cpp:1956 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:2072 +#: src/multiplay.cpp:1957 msgid "Brown" msgstr "" -#: src/order.cpp:841 +#: src/order.cpp:800 msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "Non possiamo farlo! Dobbiamo essere un'unità Cyborg per usare un trasporto Cyborg!" @@ -14772,20 +14773,20 @@ msgstr "Tempo di Gioco Totale - %s" msgid "You cheated!" msgstr "Hai barato!" -#: src/scriptfuncs.cpp:3250 +#: src/scriptfuncs.cpp:3287 msgid "YOU ARE VICTORIOUS!" msgstr "VITTORIA!" -#: src/scriptfuncs.cpp:3254 +#: src/scriptfuncs.cpp:3291 msgid "YOU WERE DEFEATED!" msgstr "SEI STATO SCONFITTO" -#: src/scriptfuncs.cpp:9500 +#: src/scriptfuncs.cpp:9537 #, c-format msgid "Beacon received from %s!" msgstr "Segnale ricevuto da %s" -#: src/scriptfuncs.cpp:9546 +#: src/scriptfuncs.cpp:9583 #, c-format msgid "Beacon %d" msgstr "Segnale %d" @@ -14814,63 +14815,63 @@ msgstr "Impossibile localizzare alcuna Unità Sensoria!" msgid "Unable to locate any Commanders!" msgstr "Impossibile localizzare alcun Comandante!" -#: src/structure.cpp:2615 +#: src/structure.cpp:2614 #, fuzzy msgid "Command Control Limit Reached - Production Halted" msgstr "Limite di Controllo Raggiunto - Produzione Arrestata" -#: src/structure.cpp:5815 -#: src/structure.cpp:5840 +#: src/structure.cpp:5806 +#: src/structure.cpp:5831 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" msgstr[0] "%s - %u Unità Assegnata" msgstr[1] "%s - %u Unità Assegnate" -#: src/structure.cpp:5845 -#: src/structure.cpp:5913 -#: src/structure.cpp:5929 -#: src/structure.cpp:5943 +#: src/structure.cpp:5836 +#: src/structure.cpp:5904 +#: src/structure.cpp:5920 +#: src/structure.cpp:5934 #, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - Danno %3.0f%%" -#: src/structure.cpp:5895 +#: src/structure.cpp:5886 #, c-format msgid "%s - Connected %u of %u" msgstr "%s - Collegati %u di %u" -#: src/structure.cpp:6059 -#: src/structure.cpp:6104 +#: src/structure.cpp:6050 +#: src/structure.cpp:6095 #, c-format msgid "%s - Electronically Damaged" msgstr "%s - Danneggiato Elettronicamente" -#: src/structure.cpp:6341 +#: src/structure.cpp:6332 msgid "Electronic Reward - Visibility Report" msgstr "Premio Elettronico - Rapporto di Visibilità" -#: src/structure.cpp:6381 +#: src/structure.cpp:6372 msgid "Factory Reward - Propulsion" msgstr "Premio della Fabbrica - Propulsione" -#: src/structure.cpp:6405 +#: src/structure.cpp:6396 msgid "Factory Reward - Body" msgstr "Premio della Fabbrica - Corpo" -#: src/structure.cpp:6429 +#: src/structure.cpp:6420 msgid "Factory Reward - Weapon" msgstr "Premio della Fabbrica - Arma" -#: src/structure.cpp:6438 +#: src/structure.cpp:6429 msgid "Factory Reward - Nothing" msgstr "Premio della Fabbrica - Niente" -#: src/structure.cpp:6466 +#: src/structure.cpp:6457 msgid "Repair Facility Award - Repair" msgstr "Premio della Struttura di Riparazione - Ripara" -#: src/structure.cpp:6473 +#: src/structure.cpp:6464 msgid "Repair Facility Award - Nothing" msgstr "Premio della Struttura di Riparazione - Niente" diff --git a/po/ko.po b/po/ko.po index 351158f54..1771344be 100644 --- a/po/ko.po +++ b/po/ko.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100 2.3_branch\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-01-18 00:54+0100\n" +"POT-Creation-Date: 2011-02-25 23:35+0100\n" "PO-Revision-Date: 2010-11-23 21:01+0900\n" "Last-Translator: Joshua Shin \n" "Language-Team: Korean Translation Team \n" @@ -5749,7 +5749,7 @@ msgid "New Design" msgstr "새 디자인" #: data/base/messages/strings/names.txt:15 -#: src/design.cpp:1313 +#: src/design.cpp:1275 msgid "Transport" msgstr "수송선" @@ -12058,26 +12058,26 @@ msgid "System locale" msgstr "사용자 시스템 언어" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1043 +#: lib/netplay/netplay.cpp:1042 msgid "Enter password here" msgstr "여기에 비밀번호를 입력하십시오" -#: lib/netplay/netplay.cpp:2048 +#: lib/netplay/netplay.cpp:2060 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "마스터서버 이름을 확인할 수 없습니다 (%s)!" -#: lib/netplay/netplay.cpp:2062 +#: lib/netplay/netplay.cpp:2082 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "로비 서버와 통신할 수 없습니다! TCP 포트 %u 가 보내는 트래픽에 대해 열려 있습니까?" #: src/challenge.cpp:184 -#: src/hci.cpp:922 -#: src/hci.cpp:3390 -#: src/hci.cpp:3513 -#: src/hci.cpp:3924 -#: src/hci.cpp:4942 +#: src/hci.cpp:916 +#: src/hci.cpp:3378 +#: src/hci.cpp:3501 +#: src/hci.cpp:3912 +#: src/hci.cpp:4930 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12229,154 +12229,154 @@ msgstr "호스트 화면으로 바로 가기" #: src/configuration.cpp:393 #: src/configuration.cpp:394 -#: src/multistat.cpp:130 +#: src/multistat.cpp:124 msgid "Player" msgstr "플레이어" -#: src/design.cpp:449 -#: src/design.cpp:469 -#: src/design.cpp:3501 +#: src/design.cpp:443 +#: src/design.cpp:455 +#: src/design.cpp:3464 msgid "New Vehicle" msgstr "새 차량" -#: src/design.cpp:515 +#: src/design.cpp:500 msgid "Vehicle Body" msgstr "차량 몸체" -#: src/design.cpp:535 +#: src/design.cpp:520 msgid "Vehicle Propulsion" msgstr "차량 추진력" -#: src/design.cpp:556 -#: src/design.cpp:579 -#: src/design.cpp:603 +#: src/design.cpp:541 +#: src/design.cpp:564 +#: src/design.cpp:588 msgid "Vehicle Turret" msgstr "차량 터릿" -#: src/design.cpp:622 +#: src/design.cpp:607 msgid "Delete Design" msgstr "디자인 없애기" -#: src/design.cpp:673 -#: src/design.cpp:720 +#: src/design.cpp:658 +#: src/design.cpp:705 msgid "Kinetic Armour" msgstr "장갑" -#: src/design.cpp:682 -#: src/design.cpp:730 +#: src/design.cpp:667 +#: src/design.cpp:715 msgid "Thermal Armour" msgstr "내열성 장갑" -#: src/design.cpp:698 -#: src/design.cpp:750 +#: src/design.cpp:683 +#: src/design.cpp:735 msgid "Engine Output" msgstr "엔진 출력" -#: src/design.cpp:706 -#: src/design.cpp:759 -#: src/design.cpp:1529 -#: src/design.cpp:1553 -#: src/design.cpp:1574 -#: src/design.cpp:1590 -#: src/design.cpp:1610 -#: src/design.cpp:1627 -#: src/design.cpp:1647 -#: src/design.cpp:1664 -#: src/design.cpp:1705 -#: src/design.cpp:1737 -#: src/design.cpp:1869 -#: src/design.cpp:1885 -#: src/design.cpp:1923 -#: src/design.cpp:1956 +#: src/design.cpp:691 +#: src/design.cpp:744 +#: src/design.cpp:1486 +#: src/design.cpp:1510 +#: src/design.cpp:1531 +#: src/design.cpp:1547 +#: src/design.cpp:1567 +#: src/design.cpp:1584 +#: src/design.cpp:1604 +#: src/design.cpp:1621 +#: src/design.cpp:1662 +#: src/design.cpp:1694 +#: src/design.cpp:1826 +#: src/design.cpp:1842 +#: src/design.cpp:1880 +#: src/design.cpp:1913 msgid "Weight" msgstr "무게" -#: src/design.cpp:790 -#: src/design.cpp:808 +#: src/design.cpp:775 +#: src/design.cpp:793 msgid "Total Power Required" msgstr "총 필요 전력" -#: src/design.cpp:821 -#: src/design.cpp:840 +#: src/design.cpp:806 +#: src/design.cpp:825 msgid "Total Body Points" msgstr "총 보디포인트" -#: src/design.cpp:1027 -#: src/design.cpp:1059 +#: src/design.cpp:996 +#: src/design.cpp:1025 msgid "Power Usage" msgstr "전력 소비" -#: src/design.cpp:1335 +#: src/design.cpp:1298 msgid "Hydra " msgstr "히드라(Hydra)" -#: src/design.cpp:1509 -#: src/design.cpp:1537 +#: src/design.cpp:1466 +#: src/design.cpp:1494 msgid "Sensor Range" msgstr "센서 범위" -#: src/design.cpp:1521 -#: src/design.cpp:1545 +#: src/design.cpp:1478 +#: src/design.cpp:1502 msgid "Sensor Power" msgstr "센서 전력" # The strength of the ECM. # ECM stands for "electronic counter measure", it is a turret that decreases the sensor range of sensors near it. -#: src/design.cpp:1566 -#: src/design.cpp:1582 +#: src/design.cpp:1523 +#: src/design.cpp:1539 msgid "ECM Power" msgstr "ECM 강도" # Build Points # Points used to determine how long something takes to build. # For building structures, for instance, the time is calculated as the build points of the structure divided by the build points of the truck. -#: src/design.cpp:1602 -#: src/design.cpp:1619 -#: src/design.cpp:1639 -#: src/design.cpp:1656 +#: src/design.cpp:1559 +#: src/design.cpp:1576 +#: src/design.cpp:1596 +#: src/design.cpp:1613 msgid "Build Points" msgstr "건설(빌드) 포인트" -#: src/design.cpp:1677 -#: src/design.cpp:1713 +#: src/design.cpp:1634 +#: src/design.cpp:1670 msgid "Range" msgstr "범위" -#: src/design.cpp:1689 -#: src/design.cpp:1721 +#: src/design.cpp:1646 +#: src/design.cpp:1678 msgid "Damage" msgstr "파괴력" -#: src/design.cpp:1697 -#: src/design.cpp:1729 +#: src/design.cpp:1654 +#: src/design.cpp:1686 msgid "Rate-of-Fire" msgstr "연사 속도" -#: src/design.cpp:1857 -#: src/design.cpp:1877 +#: src/design.cpp:1814 +#: src/design.cpp:1834 msgid "Air Speed" msgstr "비행 속도" -#: src/design.cpp:1895 -#: src/design.cpp:1932 +#: src/design.cpp:1852 +#: src/design.cpp:1889 msgid "Road Speed" msgstr "도로상 속도" -#: src/design.cpp:1905 -#: src/design.cpp:1940 +#: src/design.cpp:1862 +#: src/design.cpp:1897 msgid "Off-Road Speed" msgstr "비포장 도로상 속도" -#: src/design.cpp:1913 -#: src/design.cpp:1948 +#: src/design.cpp:1870 +#: src/design.cpp:1905 msgid "Water Speed" msgstr "수상 속도" -#: src/design.cpp:2074 +#: src/design.cpp:2031 msgid "Weapons" msgstr "무기" -#: src/design.cpp:2094 +#: src/design.cpp:2051 msgid "Systems" msgstr "시스템" @@ -12390,7 +12390,7 @@ msgid "Player dropped" msgstr "플레이어가 인터넷 연결 문제 또는 게임 버그 때문에 퇴장하였습니다" #: src/display3d.cpp:599 -#: src/multiint.cpp:2116 +#: src/multiint.cpp:2125 msgid "Waiting for other players" msgstr "다른 플레이어를 더 기다리고 있습니다" @@ -12398,114 +12398,114 @@ msgstr "다른 플레이어를 더 기다리고 있습니다" msgid "Out of sync" msgstr "" -#: src/display.cpp:1651 +#: src/display.cpp:1649 msgid "Cannot Build. Oil Resource Burning." msgstr "건설이 불가능합니다. 석유 자원이 타고 있습니다" -#: src/display.cpp:1830 -#: src/display.cpp:2423 +#: src/display.cpp:1828 +#: src/display.cpp:2421 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - 데미지 %d%% - 경험치 %d, %s" -#: src/display.cpp:1846 +#: src/display.cpp:1844 #, c-format msgid "%s - Allied - Damage %d%% - Experience %d, %s" msgstr "%s - 동맹군 - 데미지 %d%% - 경험치 %d, %s" -#: src/display.cpp:2044 +#: src/display.cpp:2042 msgid "Truck ordered to build Oil Derrick" msgstr "트럭이 유정탑을 건설하라는 명령을 받았습니다" -#: src/display.cpp:2045 +#: src/display.cpp:2043 #, fuzzy msgid "2 trucks ordered to build Oil Derrick" msgstr "트럭이 유정탑을 건설하라는 명령을 받았습니다" -#: src/display.cpp:2046 +#: src/display.cpp:2044 #, fuzzy, c-format msgid "%d trucks ordered to build Oil Derrick" msgstr "트럭이 유정탑을 건설하라는 명령을 받았습니다" -#: src/droid.cpp:208 +#: src/droid.cpp:211 msgid "Unit Lost!" msgstr "유닛을 잃었습니다!" -#: src/droid.cpp:1370 +#: src/droid.cpp:1376 msgid "Structure Restored" msgstr "구조물이 복구되었습니다" # ask about form 0, 1, 2, etc -#: src/droid.cpp:2712 +#: src/droid.cpp:2732 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" msgstr[0] "부대 %u가(이) 선택되었습니다 - 유닛 %u개" -#: src/droid.cpp:2725 +#: src/droid.cpp:2745 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" msgstr[0] "유닛 %u개가 부대 %u에 할당되었습니다" -#: src/droid.cpp:2738 +#: src/droid.cpp:2758 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" msgstr[0] "부대 %u를(을) 중심으로 - 유닛 %u개" -#: src/droid.cpp:2742 +#: src/droid.cpp:2762 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" msgstr[0] "부대 %u와(과) 정렬하였습니다 - 유닛 %u개" -#: src/droid.cpp:3080 +#: src/droid.cpp:3093 msgid "Rookie" msgstr "루키" -#: src/droid.cpp:3081 +#: src/droid.cpp:3094 msgctxt "rank" msgid "Green" msgstr "그린" # finished training, # is now intern -#: src/droid.cpp:3082 +#: src/droid.cpp:3095 msgid "Trained" msgstr "견습병" # 정규 사병 = regular soldier -#: src/droid.cpp:3083 +#: src/droid.cpp:3096 msgid "Regular" msgstr "정규병" -#: src/droid.cpp:3084 +#: src/droid.cpp:3097 msgid "Professional" msgstr "프로페셔널" -#: src/droid.cpp:3085 +#: src/droid.cpp:3098 msgid "Veteran" msgstr "베테랑" -#: src/droid.cpp:3086 +#: src/droid.cpp:3099 msgid "Elite" msgstr "엘리트" -#: src/droid.cpp:3087 +#: src/droid.cpp:3100 msgid "Special" msgstr "스페셜" -#: src/droid.cpp:3088 +#: src/droid.cpp:3101 msgid "Hero" msgstr "히어로" -#: src/droid.cpp:4110 +#: src/droid.cpp:4123 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "%s가 당신에게 %s를(을) 주고 싶어하지만 이미 수가 너무 많습니다!" -#: src/droid.cpp:4114 +#: src/droid.cpp:4127 #, fuzzy, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "%s가 당신에게 %s를(을) 주고 싶어하지만 이미 수가 너무 많습니다!" @@ -12524,7 +12524,7 @@ msgid "Tutorial" msgstr "튜토리얼" #: src/frontend.cpp:100 -#: src/hci.cpp:3499 +#: src/hci.cpp:3487 msgid "Options" msgstr "옵션" @@ -12575,7 +12575,7 @@ msgid "Challenges" msgstr "챌런지(도전)" #: src/frontend.cpp:215 -#: src/ingameop.cpp:275 +#: src/ingameop.cpp:272 msgid "Load Game" msgstr "게임 로드" @@ -12584,9 +12584,9 @@ msgid "SINGLE PLAYER" msgstr "싱글 플레이어" #: src/frontend.cpp:303 -#: src/ingameop.cpp:498 -#: src/mission.cpp:2527 -#: src/mission.cpp:2630 +#: src/ingameop.cpp:494 +#: src/mission.cpp:2493 +#: src/mission.cpp:2596 msgid "Load Saved Game" msgstr "저장된 게임 로드하기" @@ -12603,7 +12603,7 @@ msgid "Join Game" msgstr "네트워크 게임 참여하기" #: src/frontend.cpp:422 -#: src/multiint.cpp:1276 +#: src/multiint.cpp:1285 msgid "OPTIONS" msgstr "옵션" @@ -12620,7 +12620,7 @@ msgid "Video Options" msgstr "비디오 옵션" #: src/frontend.cpp:426 -#: src/ingameop.cpp:270 +#: src/ingameop.cpp:267 msgid "Audio Options" msgstr "오디오 옵션" @@ -12698,7 +12698,7 @@ msgid "Off" msgstr "꺼짐" #: src/frontend.cpp:523 -#: src/multiint.cpp:1345 +#: src/multiint.cpp:1354 msgid "Fog" msgstr "안개" @@ -12709,7 +12709,7 @@ msgstr "흐림(Mist)" #: src/frontend.cpp:530 #: src/frontend.cpp:595 -#: src/multiint.cpp:1347 +#: src/multiint.cpp:1356 msgid "Fog Of War" msgstr "전쟁의 안개" @@ -12872,194 +12872,194 @@ msgid "GAME OPTIONS" msgstr "게임 옵션" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2389 +#: src/multiint.cpp:2398 msgid "Mod: " msgstr "Mod (Modification):" -#: src/hci.cpp:1245 +#: src/hci.cpp:1237 msgid "MAP SAVED!" msgstr "맵이 저장되었습니다!" -#: src/hci.cpp:1584 +#: src/hci.cpp:1573 #: src/loop.cpp:558 #: src/loop.cpp:574 #, fuzzy msgid "GAME SAVED: " msgstr "게임이 저장되었습니다 : " -#: src/hci.cpp:1971 +#: src/hci.cpp:1960 msgid "Failed to create building" msgstr "건물을 만들지 못했습니다" -#: src/hci.cpp:1988 +#: src/hci.cpp:1977 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new structure: %s." msgstr "플레이어 %u 가 치트(디버그 메뉴)를 사용해 새로운 구조물을 지었습니다: %s." -#: src/hci.cpp:2003 +#: src/hci.cpp:1992 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new feature: %s." msgstr "플레이어 %u 가 치트(디버그 메뉴)를 사용해 새로운 물체를 배치하였습니다: %s." -#: src/hci.cpp:2025 +#: src/hci.cpp:2014 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid: %s." msgstr "플레이어 %u 가 치트(디버그 메뉴)를 사용해 새로운 병사를 만들었습니다: %s." -#: src/hci.cpp:2036 +#: src/hci.cpp:2025 #, fuzzy, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "플레이어 %u 가 치트(디버그 메뉴)를 사용해 새로운 병사를 만들었습니다: %s." -#: src/hci.cpp:3310 +#: src/hci.cpp:3298 msgid "Commanders (F6)" msgstr "사령관 (F6)" -#: src/hci.cpp:3323 +#: src/hci.cpp:3311 msgid "Intelligence Display (F5)" msgstr "보도 디스플레이 (F5)" -#: src/hci.cpp:3336 +#: src/hci.cpp:3324 msgid "Manufacture (F1)" msgstr "생산 (F1)" -#: src/hci.cpp:3349 +#: src/hci.cpp:3337 msgid "Design (F4)" msgstr "디자인 (F4)" -#: src/hci.cpp:3362 +#: src/hci.cpp:3350 msgid "Research (F2)" msgstr "연구 (F2)" -#: src/hci.cpp:3375 +#: src/hci.cpp:3363 msgid "Build (F3)" msgstr "건축 (F3)" -#: src/hci.cpp:3446 -#: src/multiint.cpp:1392 +#: src/hci.cpp:3434 +#: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "전력" -#: src/hci.cpp:3537 +#: src/hci.cpp:3525 msgid "Map:" msgstr "맵: " -#: src/hci.cpp:3550 +#: src/hci.cpp:3538 msgid "Load" msgstr "로드" -#: src/hci.cpp:3551 +#: src/hci.cpp:3539 msgid "Load Map File" msgstr "맵 파일 로드" -#: src/hci.cpp:3558 +#: src/hci.cpp:3546 msgid "Save" msgstr "저장" -#: src/hci.cpp:3559 +#: src/hci.cpp:3547 msgid "Save Map File" msgstr "맵 파일 저장" -#: src/hci.cpp:3567 +#: src/hci.cpp:3555 msgid "New" msgstr "새로 (New)" -#: src/hci.cpp:3568 +#: src/hci.cpp:3556 msgid "New Blank Map" msgstr "새로운 빈 맵" -#: src/hci.cpp:3604 +#: src/hci.cpp:3592 msgid "Tile" msgstr "타일" -#: src/hci.cpp:3605 +#: src/hci.cpp:3593 msgid "Place tiles on map" msgstr "게임 맵에서 타일을 놓기" -#: src/hci.cpp:3614 +#: src/hci.cpp:3602 msgid "Unit" msgstr "유닛" -#: src/hci.cpp:3615 +#: src/hci.cpp:3603 msgid "Place Unit on map" msgstr "게임 맵 안에 유닛 배치하기" -#: src/hci.cpp:3623 +#: src/hci.cpp:3611 msgid "Struct" msgstr "구조물" -#: src/hci.cpp:3624 +#: src/hci.cpp:3612 msgid "Place Structures on map" msgstr "게임 맵에서 구조물을 놓기" -#: src/hci.cpp:3632 +#: src/hci.cpp:3620 msgid "Feat" msgstr "물체" -#: src/hci.cpp:3633 +#: src/hci.cpp:3621 msgid "Place Features on map" msgstr "물체(Feature)를 맵위에 배치하기" -#: src/hci.cpp:3643 +#: src/hci.cpp:3631 msgid "Pause" msgstr "일시 정지" -#: src/hci.cpp:3644 +#: src/hci.cpp:3632 msgid "Pause or unpause the game" msgstr "게임을 일시 중지하거나 일시중지를 해제합니다" -#: src/hci.cpp:3658 +#: src/hci.cpp:3646 msgid "Align height of all map objects" msgstr "모든 맵 개체의 높이를 정렬하기 " -#: src/hci.cpp:3668 +#: src/hci.cpp:3656 msgid "Edit" msgstr "편집" -#: src/hci.cpp:3669 +#: src/hci.cpp:3657 msgid "Start Edit Mode" msgstr "편집 모드 시작하기" -#: src/hci.cpp:3683 +#: src/hci.cpp:3671 #: src/ingameop.cpp:112 -#: src/ingameop.cpp:258 -#: src/ingameop.cpp:263 +#: src/ingameop.cpp:256 +#: src/ingameop.cpp:260 msgid "Quit" msgstr "종료" -#: src/hci.cpp:3684 +#: src/hci.cpp:3672 msgid "Exit Game" msgstr "게임 종료" -#: src/hci.cpp:3710 +#: src/hci.cpp:3698 msgid "Current Player:" msgstr "현재 플레이어: " -#: src/hci.cpp:4001 +#: src/hci.cpp:3989 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "진행률 표시줄" -#: src/hci.cpp:4867 +#: src/hci.cpp:4855 msgid "Factory Delivery Point" msgstr "공장 배달 지점" -#: src/hci.cpp:4885 +#: src/hci.cpp:4873 msgid "Loop Production" msgstr "반복 생산" -#: src/hci.cpp:4965 +#: src/hci.cpp:4953 msgid "Tab Scroll left" msgstr "왼쪽으로 탭 스크롤" -#: src/hci.cpp:4980 +#: src/hci.cpp:4968 msgid "Tab Scroll right" msgstr "오른쪽으로 탭 스크롤" #: src/ingameop.cpp:111 -#: src/ingameop.cpp:193 -#: src/ingameop.cpp:267 +#: src/ingameop.cpp:195 +#: src/ingameop.cpp:264 msgid "Resume Game" msgstr "일시 중지 해제" @@ -13067,32 +13067,32 @@ msgstr "일시 중지 해제" msgid "WARNING: You're the host. If you quit, the game ends for everyone!" msgstr "경고: 당신이 호스트입니다. 당신이 게임을 퇴장하면, 게임이 모두 종료됩니다!" -#: src/ingameop.cpp:185 -#: src/ingameop.cpp:527 +#: src/ingameop.cpp:186 +#: src/ingameop.cpp:523 msgid "Tactical UI (Target Origin Icon): Show" msgstr "" -#: src/ingameop.cpp:190 -#: src/ingameop.cpp:531 +#: src/ingameop.cpp:191 +#: src/ingameop.cpp:527 msgid "Tactical UI (Target Origin Icon): Hide" msgstr "" -#: src/ingameop.cpp:277 -#: src/ingameop.cpp:502 -#: src/mission.cpp:2514 -#: src/mission.cpp:2633 +#: src/ingameop.cpp:274 +#: src/ingameop.cpp:498 +#: src/mission.cpp:2480 +#: src/mission.cpp:2599 msgid "Save Game" msgstr "게임 저장" -#: src/ingameop.cpp:343 +#: src/ingameop.cpp:339 msgid "Host has quit the game!" msgstr "호스트(Host)가 게임을 종료하였습니다!" -#: src/ingameop.cpp:349 +#: src/ingameop.cpp:345 msgid "The game can't continue without the host." msgstr "이 게임은 호스트 없이 계속할 수 없습니다." -#: src/ingameop.cpp:355 +#: src/ingameop.cpp:351 msgid "--> QUIT <--" msgstr "--> 종료 <--" @@ -13474,53 +13474,53 @@ msgstr "무엇이 죽을 때 화면 흔들림: 꺼짐" msgid "Screen shake when things die: On" msgstr "무엇이 죽을 때 화면 흔들림: 켜짐" -#: src/keybind.cpp:2603 -#: src/keybind.cpp:2646 +#: src/keybind.cpp:2604 +#: src/keybind.cpp:2647 msgid "Sorry, but game speed cannot be changed in multiplayer." msgstr "죄송합니다, 멀티플레이어 게임에서는 게임 속도를 바꿀 수 없습니다." -#: src/keybind.cpp:2624 -#: src/keybind.cpp:2667 -#: src/keybind.cpp:2689 +#: src/keybind.cpp:2625 +#: src/keybind.cpp:2668 +#: src/keybind.cpp:2690 msgid "Game Speed Reset" msgstr "게임 속도 리셋" -#: src/keybind.cpp:2628 +#: src/keybind.cpp:2629 #, c-format msgid "Game Speed Increased to %3.1f" msgstr "%3.1f 로 게임 속도가 증가되었습니다" -#: src/keybind.cpp:2671 +#: src/keybind.cpp:2672 #, c-format msgid "Game Speed Reduced to %3.1f" msgstr "%3.1f 로 게임 속도가 감소되었습니다" # 아군/적군 -#: src/keybind.cpp:2701 +#: src/keybind.cpp:2702 msgid "Radar showing friend-foe colors" msgstr "레이더에 아군-적군 색깔이 나옵니다" -#: src/keybind.cpp:2705 +#: src/keybind.cpp:2706 msgid "Radar showing player colors" msgstr "레이더에 플레이어들의 색깔이 나옵니다" -#: src/keybind.cpp:2726 +#: src/keybind.cpp:2727 msgid "Radar showing only objects" msgstr "레이더에 물체만 나옵니다" -#: src/keybind.cpp:2729 +#: src/keybind.cpp:2730 msgid "Radar blending terrain and height" msgstr "레이더에 지형과 고도가 혼합되 나옵니다" -#: src/keybind.cpp:2732 +#: src/keybind.cpp:2733 msgid "Radar showing terrain" msgstr "레이더에 지형이 나옵니다" -#: src/keybind.cpp:2735 +#: src/keybind.cpp:2736 msgid "Radar showing revealed terrain" msgstr "드러난 지형이 레이더에 나옵니다" -#: src/keybind.cpp:2738 +#: src/keybind.cpp:2739 msgid "Radar showing height" msgstr "레이더에 고도가 나옵니다" @@ -13529,9 +13529,9 @@ msgid "KEY MAPPING" msgstr "키보드 매핑" #: src/keyedit.cpp:372 -#: src/multiint.cpp:662 -#: src/multiint.cpp:1072 -#: src/multiint.cpp:1478 +#: src/multiint.cpp:671 +#: src/multiint.cpp:1081 +#: src/multiint.cpp:1487 msgid "Return To Previous Screen" msgstr "이전 화면으로 돌아가기" @@ -14022,37 +14022,37 @@ msgstr "유닛 운전 모드 켜짐/꺼짐" msgid "Could not save game!" msgstr "게임을 저장할 수 없습니다!" -#: src/mission.cpp:2075 +#: src/mission.cpp:2041 msgid "Load Transport" msgstr "수송선에 싣기" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "목표 달성 (치팅했습니다!)" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED" msgstr "목표 달성" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED--and you cheated!" msgstr "목표 달성 실패--그리고 치트를 사용했습니다!" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED" msgstr "목표 달성 실패" -#: src/mission.cpp:2493 -#: src/mission.cpp:2533 -#: src/mission.cpp:2647 +#: src/mission.cpp:2459 +#: src/mission.cpp:2499 +#: src/mission.cpp:2613 msgid "Quit To Main Menu" msgstr "메인 메뉴로 종료하기" -#: src/mission.cpp:2501 +#: src/mission.cpp:2467 msgid "Continue Game" msgstr "게임 계속하기" -#: src/mission.cpp:2598 +#: src/mission.cpp:2564 msgid "GAME SAVED :" msgstr "게임이 저장되었습니다 : " @@ -14111,345 +14111,350 @@ msgstr "%s가 %s와(과) 동맹을 맺었습니다" msgid "You Discover Blueprints For %s" msgstr "당신이 %s의 청사진을 발견하였습니다" -#: src/multiint.cpp:600 +#: src/multiint.cpp:609 #: src/multilimit.cpp:190 msgid "Accept Settings" msgstr "설정 적용" -#: src/multiint.cpp:602 -#: src/multiint.cpp:1117 +#: src/multiint.cpp:611 +#: src/multiint.cpp:1126 msgid "Cancel" msgstr "취소" -#: src/multiint.cpp:613 +#: src/multiint.cpp:622 msgid "IP Address or Machine Name" msgstr "IP 주소 또는 컴퓨터 이름" -#: src/multiint.cpp:659 +#: src/multiint.cpp:668 msgid "CONNECTION" msgstr "연결" -#: src/multiint.cpp:664 +#: src/multiint.cpp:673 msgid "Lobby" msgstr "로비" -#: src/multiint.cpp:665 +#: src/multiint.cpp:674 msgid "IP" msgstr "IP" -#: src/multiint.cpp:854 +#: src/multiint.cpp:863 msgid "No games are available" msgstr "참여 가능한 게임이 없습니다" -#: src/multiint.cpp:857 +#: src/multiint.cpp:866 msgid "Game is full" msgstr "게임이 만원입니다" -#: src/multiint.cpp:861 +#: src/multiint.cpp:870 msgid "You were kicked!" msgstr "당신이 퇴장당하였습니다!" -#: src/multiint.cpp:864 +#: src/multiint.cpp:873 msgid "Wrong Game Version!" msgstr "잘못된 게임 버젼입니다!" -#: src/multiint.cpp:867 +#: src/multiint.cpp:876 msgid "You have an incompatible mod." msgstr "당신은 호환되지 않는 mod를 사용 중입니다." -#: src/multiint.cpp:871 +#: src/multiint.cpp:880 msgid "Host couldn't send file?" msgstr "호스트가 파일을 보내지 못했습니다." -#: src/multiint.cpp:875 +#: src/multiint.cpp:884 msgid "Incorrect Password!" msgstr "비밀번호가 틀립니다!" -#: src/multiint.cpp:878 +#: src/multiint.cpp:887 msgid "Host has dropped connection!" msgstr "호스트의 연결이 끊어졌습니다!" -#: src/multiint.cpp:882 +#: src/multiint.cpp:891 msgid "Connection Error" msgstr "연결 에러(Error)" -#: src/multiint.cpp:1012 +#: src/multiint.cpp:1021 msgid "Searching" msgstr "찾는 중" -#: src/multiint.cpp:1069 +#: src/multiint.cpp:1078 msgid "GAMES" msgstr "게임" -#: src/multiint.cpp:1077 +#: src/multiint.cpp:1086 msgid "Refresh Games List" msgstr "게임 목록 새로고침" -#: src/multiint.cpp:1097 +#: src/multiint.cpp:1106 msgid "Enter Password:" msgstr "비밀번호를 입력하십시오:" -#: src/multiint.cpp:1115 +#: src/multiint.cpp:1124 msgid "OK" msgstr "확인" -#: src/multiint.cpp:1232 +#: src/multiint.cpp:1241 msgid "Tanks disabled!!" msgstr "탱크가 비활성화되었습니다!!" -#: src/multiint.cpp:1233 +#: src/multiint.cpp:1242 msgid "Cyborgs disabled." msgstr "사이보그가 비활성화되었습니다." -#: src/multiint.cpp:1234 +#: src/multiint.cpp:1243 msgid "VTOLs disabled." msgstr "VTOL이 비활성화되었습니다." -#: src/multiint.cpp:1281 -#: src/multiint.cpp:1288 +#: src/multiint.cpp:1290 +#: src/multiint.cpp:1297 msgid "Select Game Name" msgstr "게임 이름 선택" -#: src/multiint.cpp:1281 +#: src/multiint.cpp:1290 msgid "One-Player Skirmish" msgstr "싱글플레이어 스커미쉬" -#: src/multiint.cpp:1291 +#: src/multiint.cpp:1300 msgid "Select Map" msgstr "맵 선택" -#: src/multiint.cpp:1299 +#: src/multiint.cpp:1308 msgid "Click to set Password" msgstr "클릭하여 비밀번호를 설정하십시오" -#: src/multiint.cpp:1309 -#: src/multiint.cpp:1310 +#: src/multiint.cpp:1318 +#: src/multiint.cpp:1319 msgid "Scavengers" msgstr "스캐빈저" -#: src/multiint.cpp:1312 +#: src/multiint.cpp:1321 msgid "No Scavengers" msgstr "스캐빈저 없음" -#: src/multiint.cpp:1342 +#: src/multiint.cpp:1351 msgid "Select Player Name" msgstr "플레이어 이름 선택" -#: src/multiint.cpp:1348 +#: src/multiint.cpp:1357 msgid "Distance Fog" msgstr "디스턴스(거리) 안개" -#: src/multiint.cpp:1359 +#: src/multiint.cpp:1368 #: src/multimenu.cpp:756 msgid "Alliances" msgstr "동맹" -#: src/multiint.cpp:1362 +#: src/multiint.cpp:1371 msgid "No Alliances" msgstr "동맹 없음" -#: src/multiint.cpp:1364 +#: src/multiint.cpp:1373 msgid "Allow Alliances" msgstr "동맹 있음" -#: src/multiint.cpp:1368 +#: src/multiint.cpp:1377 msgid "Locked Teams" msgstr "팀 잠금" -#: src/multiint.cpp:1394 +#: src/multiint.cpp:1403 msgid "Low Power Levels" msgstr "낮은 전력 수준" -#: src/multiint.cpp:1396 +#: src/multiint.cpp:1405 msgid "Medium Power Levels" msgstr "중급 전력 수준" -#: src/multiint.cpp:1398 +#: src/multiint.cpp:1407 msgid "High Power Levels" msgstr "높은 전력 수준" -#: src/multiint.cpp:1430 +#: src/multiint.cpp:1439 msgid "Base" msgstr "기지" -#: src/multiint.cpp:1432 +#: src/multiint.cpp:1441 msgid "Start with No Bases" msgstr "기지 없이 시작하기" -#: src/multiint.cpp:1434 +#: src/multiint.cpp:1443 msgid "Start with Bases" msgstr "기지를 갖추고 시작하기" -#: src/multiint.cpp:1436 +#: src/multiint.cpp:1445 msgid "Start with Advanced Bases" msgstr "고급 기지를 갖추고 시작하기" -#: src/multiint.cpp:1468 +#: src/multiint.cpp:1477 msgid "Map Preview" msgstr "맵 미리보기" -#: src/multiint.cpp:1470 +#: src/multiint.cpp:1479 msgid "Click to see Map" msgstr "맵을 보려면 클릭하십시오" -#: src/multiint.cpp:1484 +#: src/multiint.cpp:1493 msgid "Start Hosting Game" msgstr "게임 호스팅을 시작하기" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 msgid "Show Structure Limits" msgstr "구조물 제한 보기" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 msgid "Set Structure Limits" msgstr "구조물 제한 설정하기" -#: src/multiint.cpp:1587 +#: src/multiint.cpp:1596 msgid "DIFFICULTY" msgstr "" -#: src/multiint.cpp:1601 +#: src/multiint.cpp:1610 msgid "Less aggressive and starts with less units" msgstr "" -#: src/multiint.cpp:1602 +#: src/multiint.cpp:1611 #, fuzzy msgid "Plays nice" msgstr "플레이어" -#: src/multiint.cpp:1603 +#: src/multiint.cpp:1612 msgid "No holds barred" msgstr "" -#: src/multiint.cpp:1604 +#: src/multiint.cpp:1613 msgid "Starts with advantages and gets twice as much oil from derricks" msgstr "" -#: src/multiint.cpp:1632 +#: src/multiint.cpp:1641 msgid "CHOOSE AI" msgstr "" -#: src/multiint.cpp:1648 +#: src/multiint.cpp:1657 msgid "Allow human players to join in this slot" msgstr "" -#: src/multiint.cpp:1656 +#: src/multiint.cpp:1665 msgid "Leave this slot unused" msgstr "" -#: src/multiint.cpp:1736 +#: src/multiint.cpp:1745 msgid "Player colour" msgstr "플레이어 색" -#: src/multiint.cpp:2062 +#: src/multiint.cpp:2071 msgid "Team" msgstr "팀" -#: src/multiint.cpp:2074 +#: src/multiint.cpp:2083 msgid "Kick player" msgstr "플레이어 퇴장시키기" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 #, fuzzy msgid "Click to change difficulty" msgstr "인공 지능 난이도를 변경하려면 클릭하십시오" -#: src/multiint.cpp:2121 +#: src/multiint.cpp:2130 msgid "Click when ready" msgstr "준비되었을 때 클릭하십시오" -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2134 msgid "READY?" msgstr "시작" -#: src/multiint.cpp:2169 +#: src/multiint.cpp:2178 msgid "PLAYERS" msgstr "플레이어" -#: src/multiint.cpp:2204 +#: src/multiint.cpp:2213 #, fuzzy msgid "Click to change to this slot" msgstr "사용자 설정을 변경하려면 클릭하십시오" -#: src/multiint.cpp:2232 +#: src/multiint.cpp:2241 msgid "Choose Team" msgstr "팀 선택" -#: src/multiint.cpp:2262 +#: src/multiint.cpp:2271 #, fuzzy msgid "Click to change player colour" msgstr "사용자 설정을 변경하려면 클릭하십시오" -#: src/multiint.cpp:2290 +#: src/multiint.cpp:2299 #, fuzzy msgid "Click to change player position" msgstr "사용자 설정을 변경하려면 클릭하십시오" -#: src/multiint.cpp:2296 +#: src/multiint.cpp:2305 #, fuzzy msgid "Click to change AI" msgstr "사용자 설정을 변경하려면 클릭하십시오" -#: src/multiint.cpp:2300 +#: src/multiint.cpp:2309 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2362 +#: src/multiint.cpp:2371 msgid "CHAT" msgstr "채팅" -#: src/multiint.cpp:2394 +#: src/multiint.cpp:2403 msgid "All players need to have the same mods to join your game." msgstr "모든 플레이어는 당신과 같은 mod를 사용해야만 게임에 참여할 수 있습니다" -#: src/multiint.cpp:2552 +#: src/multiint.cpp:2561 #, c-format msgid "*** password [%s] is now required! ***" msgstr "*** 이제 비밀번호 [%s] 가 요구됩니다! ***" -#: src/multiint.cpp:2560 +#: src/multiint.cpp:2569 msgid "*** password is NOT required! ***" msgstr "*** 비밀번호가 요구되지 않습니다! ***" -#: src/multiint.cpp:2801 +#: src/multiint.cpp:2810 msgid "Sorry! Failed to host the game." msgstr "죄송합니다! 게임 호스팅이 실패하였습니다" -#: src/multiint.cpp:2922 +#: src/multiint.cpp:2931 msgid "'Locked Teams' mode enabled" msgstr "'팀 잠금' 모드가 켜졌습니다" -#: src/multiint.cpp:3003 +#: src/multiint.cpp:3012 #, c-format msgid "The host has kicked %s from the game!" msgstr "호스트가 %s를 게임에서 퇴장시켰습니다!" -#: src/multiint.cpp:3073 +#: src/multiint.cpp:3082 msgid "Host is Starting Game" msgstr "호스트가 게임을 시작하고 있습니다" -#: src/multiint.cpp:3639 +#: src/multiint.cpp:3648 msgid "Players" msgstr "플레이어" -#: src/multiint.cpp:3772 +#: src/multiint.cpp:3786 #, c-format msgid "Sending Map: %d%% " msgstr "맵을 보내는 중: %d%% " -#: src/multiint.cpp:3780 +#: src/multiint.cpp:3794 #, c-format msgid "Map: %d%% downloaded" msgstr "맵: %d%% 다운로드 완료" -#: src/multiint.cpp:3803 +#: src/multiint.cpp:3820 msgid "HOST" msgstr "호스트" +#: src/multiint.cpp:3827 +#: src/multimenu.cpp:772 +msgid "Ping" +msgstr "핑(Ping)" + #: src/multijoin.cpp:100 #: src/multijoin.cpp:101 msgid "Players Still Joining" @@ -14465,17 +14470,17 @@ msgstr "%s가 게임을 퇴장하였습니다" msgid "File transfer has been aborted for %d." msgstr "%d에게 파일 전송이 취소되었습니다" -#: src/multijoin.cpp:376 +#: src/multijoin.cpp:373 #, c-format msgid "%s (%u) has an incompatible mod, and has been kicked." msgstr "%s (%u)는 호환되지 않는 mod를 사용 중이며, 게임에서 퇴장당하였습니다." -#: src/multijoin.cpp:415 +#: src/multijoin.cpp:412 #, c-format msgid "%s is Joining the Game" msgstr "%s가 게임에 참여하였습니다" -#: src/multijoin.cpp:425 +#: src/multijoin.cpp:422 msgid "System message:" msgstr "시스템 메시지:" @@ -14588,10 +14593,6 @@ msgstr "킬(Kills)" msgid "Units" msgstr "유닛" -#: src/multimenu.cpp:772 -msgid "Ping" -msgstr "핑(Ping)" - #: src/multimenu.cpp:776 msgid "Structs" msgstr "구조물" @@ -14625,84 +14626,84 @@ msgstr "플레이어에게 전력 제공하기" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "데이터 무결성 시험을 건너뛰려 했기 때문에 %s가 퇴장당하였습니다!" -#: src/multiplay.cpp:1146 +#: src/multiplay.cpp:1057 msgid "(allies" msgstr "(동맹팀" -#: src/multiplay.cpp:1154 +#: src/multiplay.cpp:1065 msgid "(private to " msgstr "(개인적입니다 " -#: src/multiplay.cpp:1167 +#: src/multiplay.cpp:1078 msgid "[invalid]" msgstr "[인식 불가능]" -#: src/multiplay.cpp:2057 +#: src/multiplay.cpp:1942 msgid "Green" msgstr "녹색" -#: src/multiplay.cpp:2058 +#: src/multiplay.cpp:1943 msgid "Orange" msgstr "주황색" -#: src/multiplay.cpp:2059 +#: src/multiplay.cpp:1944 msgid "Grey" msgstr "회색" -#: src/multiplay.cpp:2060 +#: src/multiplay.cpp:1945 msgid "Black" msgstr "검정색" -#: src/multiplay.cpp:2061 +#: src/multiplay.cpp:1946 msgid "Red" msgstr "빨강색" -#: src/multiplay.cpp:2062 +#: src/multiplay.cpp:1947 msgid "Blue" msgstr "파랑색" -#: src/multiplay.cpp:2063 +#: src/multiplay.cpp:1948 msgid "Pink" msgstr "핑크색" -#: src/multiplay.cpp:2064 +#: src/multiplay.cpp:1949 msgid "Cyan" msgstr "청록색" -#: src/multiplay.cpp:2065 +#: src/multiplay.cpp:1950 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:2066 +#: src/multiplay.cpp:1951 msgid "Purple" msgstr "" -#: src/multiplay.cpp:2067 +#: src/multiplay.cpp:1952 msgid "White" msgstr "" -#: src/multiplay.cpp:2068 +#: src/multiplay.cpp:1953 #, fuzzy msgid "Bright blue" msgstr "마우스 오른쪽 버튼" -#: src/multiplay.cpp:2069 +#: src/multiplay.cpp:1954 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:2070 +#: src/multiplay.cpp:1955 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:2071 +#: src/multiplay.cpp:1956 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:2072 +#: src/multiplay.cpp:1957 msgid "Brown" msgstr "" -#: src/order.cpp:841 +#: src/order.cpp:800 msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "" @@ -14837,20 +14838,20 @@ msgstr "총 게임 시간소요 - %s" msgid "You cheated!" msgstr "당신이 치트했습니다!" -#: src/scriptfuncs.cpp:3250 +#: src/scriptfuncs.cpp:3287 msgid "YOU ARE VICTORIOUS!" msgstr "당신이 승리했습니다!" -#: src/scriptfuncs.cpp:3254 +#: src/scriptfuncs.cpp:3291 msgid "YOU WERE DEFEATED!" msgstr "당신이 패배했습니다!" -#: src/scriptfuncs.cpp:9500 +#: src/scriptfuncs.cpp:9537 #, c-format msgid "Beacon received from %s!" msgstr "%s이 표지를 보냈습니다!" -#: src/scriptfuncs.cpp:9546 +#: src/scriptfuncs.cpp:9583 #, c-format msgid "Beacon %d" msgstr "표지 %d" @@ -14878,62 +14879,62 @@ msgstr "센서 유닛을 찾을 수 없습니다!" msgid "Unable to locate any Commanders!" msgstr "사령관을 찾을 수 없습니다!" -#: src/structure.cpp:2615 +#: src/structure.cpp:2614 #, fuzzy msgid "Command Control Limit Reached - Production Halted" msgstr "제어 한계에 도달하였습니다 - 생산이 중단되었습니다" -#: src/structure.cpp:5815 -#: src/structure.cpp:5840 +#: src/structure.cpp:5806 +#: src/structure.cpp:5831 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" msgstr[0] "%s - 유닛 %u개 할당되었습니다" -#: src/structure.cpp:5845 -#: src/structure.cpp:5913 -#: src/structure.cpp:5929 -#: src/structure.cpp:5943 +#: src/structure.cpp:5836 +#: src/structure.cpp:5904 +#: src/structure.cpp:5920 +#: src/structure.cpp:5934 #, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - 데미지 %3.0f%%" -#: src/structure.cpp:5895 +#: src/structure.cpp:5886 #, c-format msgid "%s - Connected %u of %u" msgstr "%s - %u개 연결 되었습니다 (전체 %u개)" -#: src/structure.cpp:6059 -#: src/structure.cpp:6104 +#: src/structure.cpp:6050 +#: src/structure.cpp:6095 #, c-format msgid "%s - Electronically Damaged" msgstr "%s - 전자적으로 손상됨" -#: src/structure.cpp:6341 +#: src/structure.cpp:6332 msgid "Electronic Reward - Visibility Report" msgstr "전자적 보상 - 시계보고" -#: src/structure.cpp:6381 +#: src/structure.cpp:6372 msgid "Factory Reward - Propulsion" msgstr "공장 보상 - 추진력" -#: src/structure.cpp:6405 +#: src/structure.cpp:6396 msgid "Factory Reward - Body" msgstr "공장 보상 - 차체" -#: src/structure.cpp:6429 +#: src/structure.cpp:6420 msgid "Factory Reward - Weapon" msgstr "공장 보상 - 무기" -#: src/structure.cpp:6438 +#: src/structure.cpp:6429 msgid "Factory Reward - Nothing" msgstr "공장 보상 - 없음" -#: src/structure.cpp:6466 +#: src/structure.cpp:6457 msgid "Repair Facility Award - Repair" msgstr "수리 시설 상 - 수리" -#: src/structure.cpp:6473 +#: src/structure.cpp:6464 msgid "Repair Facility Award - Nothing" msgstr "수리 시설 상 - 없음" diff --git a/po/la.po b/po/la.po index 6124f9843..0d2cfeb5c 100644 --- a/po/la.po +++ b/po/la.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-01-18 00:54+0100\n" +"POT-Creation-Date: 2011-02-25 23:35+0100\n" "PO-Revision-Date: 2008-05-09 16:39+0000\n" "Last-Translator: Giel van Schijndel \n" "Language-Team: Latin\n" @@ -5731,7 +5731,7 @@ msgid "New Design" msgstr "" #: data/base/messages/strings/names.txt:15 -#: src/design.cpp:1313 +#: src/design.cpp:1275 msgid "Transport" msgstr "" @@ -12037,26 +12037,26 @@ msgid "System locale" msgstr "" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1043 +#: lib/netplay/netplay.cpp:1042 msgid "Enter password here" msgstr "" -#: lib/netplay/netplay.cpp:2048 +#: lib/netplay/netplay.cpp:2060 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "" -#: lib/netplay/netplay.cpp:2062 +#: lib/netplay/netplay.cpp:2082 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "" #: src/challenge.cpp:184 -#: src/hci.cpp:922 -#: src/hci.cpp:3390 -#: src/hci.cpp:3513 -#: src/hci.cpp:3924 -#: src/hci.cpp:4942 +#: src/hci.cpp:916 +#: src/hci.cpp:3378 +#: src/hci.cpp:3501 +#: src/hci.cpp:3912 +#: src/hci.cpp:4930 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12208,149 +12208,149 @@ msgstr "" #: src/configuration.cpp:393 #: src/configuration.cpp:394 -#: src/multistat.cpp:130 +#: src/multistat.cpp:124 msgid "Player" msgstr "" -#: src/design.cpp:449 -#: src/design.cpp:469 -#: src/design.cpp:3501 +#: src/design.cpp:443 +#: src/design.cpp:455 +#: src/design.cpp:3464 msgid "New Vehicle" msgstr "" -#: src/design.cpp:515 +#: src/design.cpp:500 msgid "Vehicle Body" msgstr "" -#: src/design.cpp:535 +#: src/design.cpp:520 msgid "Vehicle Propulsion" msgstr "" -#: src/design.cpp:556 -#: src/design.cpp:579 -#: src/design.cpp:603 +#: src/design.cpp:541 +#: src/design.cpp:564 +#: src/design.cpp:588 msgid "Vehicle Turret" msgstr "" -#: src/design.cpp:622 +#: src/design.cpp:607 msgid "Delete Design" msgstr "" -#: src/design.cpp:673 -#: src/design.cpp:720 +#: src/design.cpp:658 +#: src/design.cpp:705 msgid "Kinetic Armour" msgstr "" -#: src/design.cpp:682 -#: src/design.cpp:730 +#: src/design.cpp:667 +#: src/design.cpp:715 msgid "Thermal Armour" msgstr "" -#: src/design.cpp:698 -#: src/design.cpp:750 +#: src/design.cpp:683 +#: src/design.cpp:735 msgid "Engine Output" msgstr "" -#: src/design.cpp:706 -#: src/design.cpp:759 -#: src/design.cpp:1529 -#: src/design.cpp:1553 -#: src/design.cpp:1574 -#: src/design.cpp:1590 -#: src/design.cpp:1610 -#: src/design.cpp:1627 -#: src/design.cpp:1647 -#: src/design.cpp:1664 -#: src/design.cpp:1705 -#: src/design.cpp:1737 -#: src/design.cpp:1869 -#: src/design.cpp:1885 -#: src/design.cpp:1923 -#: src/design.cpp:1956 +#: src/design.cpp:691 +#: src/design.cpp:744 +#: src/design.cpp:1486 +#: src/design.cpp:1510 +#: src/design.cpp:1531 +#: src/design.cpp:1547 +#: src/design.cpp:1567 +#: src/design.cpp:1584 +#: src/design.cpp:1604 +#: src/design.cpp:1621 +#: src/design.cpp:1662 +#: src/design.cpp:1694 +#: src/design.cpp:1826 +#: src/design.cpp:1842 +#: src/design.cpp:1880 +#: src/design.cpp:1913 msgid "Weight" msgstr "" -#: src/design.cpp:790 -#: src/design.cpp:808 +#: src/design.cpp:775 +#: src/design.cpp:793 msgid "Total Power Required" msgstr "" -#: src/design.cpp:821 -#: src/design.cpp:840 +#: src/design.cpp:806 +#: src/design.cpp:825 msgid "Total Body Points" msgstr "" -#: src/design.cpp:1027 -#: src/design.cpp:1059 +#: src/design.cpp:996 +#: src/design.cpp:1025 msgid "Power Usage" msgstr "" -#: src/design.cpp:1335 +#: src/design.cpp:1298 msgid "Hydra " msgstr "" -#: src/design.cpp:1509 -#: src/design.cpp:1537 +#: src/design.cpp:1466 +#: src/design.cpp:1494 msgid "Sensor Range" msgstr "" -#: src/design.cpp:1521 -#: src/design.cpp:1545 +#: src/design.cpp:1478 +#: src/design.cpp:1502 msgid "Sensor Power" msgstr "" -#: src/design.cpp:1566 -#: src/design.cpp:1582 +#: src/design.cpp:1523 +#: src/design.cpp:1539 msgid "ECM Power" msgstr "" -#: src/design.cpp:1602 -#: src/design.cpp:1619 -#: src/design.cpp:1639 -#: src/design.cpp:1656 +#: src/design.cpp:1559 +#: src/design.cpp:1576 +#: src/design.cpp:1596 +#: src/design.cpp:1613 msgid "Build Points" msgstr "" -#: src/design.cpp:1677 -#: src/design.cpp:1713 +#: src/design.cpp:1634 +#: src/design.cpp:1670 msgid "Range" msgstr "" -#: src/design.cpp:1689 -#: src/design.cpp:1721 +#: src/design.cpp:1646 +#: src/design.cpp:1678 msgid "Damage" msgstr "" -#: src/design.cpp:1697 -#: src/design.cpp:1729 +#: src/design.cpp:1654 +#: src/design.cpp:1686 msgid "Rate-of-Fire" msgstr "" -#: src/design.cpp:1857 -#: src/design.cpp:1877 +#: src/design.cpp:1814 +#: src/design.cpp:1834 msgid "Air Speed" msgstr "" -#: src/design.cpp:1895 -#: src/design.cpp:1932 +#: src/design.cpp:1852 +#: src/design.cpp:1889 msgid "Road Speed" msgstr "" -#: src/design.cpp:1905 -#: src/design.cpp:1940 +#: src/design.cpp:1862 +#: src/design.cpp:1897 msgid "Off-Road Speed" msgstr "" -#: src/design.cpp:1913 -#: src/design.cpp:1948 +#: src/design.cpp:1870 +#: src/design.cpp:1905 msgid "Water Speed" msgstr "" -#: src/design.cpp:2074 +#: src/design.cpp:2031 msgid "Weapons" msgstr "Armorum" -#: src/design.cpp:2094 +#: src/design.cpp:2051 msgid "Systems" msgstr "" @@ -12363,7 +12363,7 @@ msgid "Player dropped" msgstr "" #: src/display3d.cpp:599 -#: src/multiint.cpp:2116 +#: src/multiint.cpp:2125 msgid "Waiting for other players" msgstr "" @@ -12371,116 +12371,116 @@ msgstr "" msgid "Out of sync" msgstr "" -#: src/display.cpp:1651 +#: src/display.cpp:1649 msgid "Cannot Build. Oil Resource Burning." msgstr "" -#: src/display.cpp:1830 -#: src/display.cpp:2423 +#: src/display.cpp:1828 +#: src/display.cpp:2421 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "" -#: src/display.cpp:1846 +#: src/display.cpp:1844 #, c-format msgid "%s - Allied - Damage %d%% - Experience %d, %s" msgstr "" -#: src/display.cpp:2044 +#: src/display.cpp:2042 msgid "Truck ordered to build Oil Derrick" msgstr "" -#: src/display.cpp:2045 +#: src/display.cpp:2043 msgid "2 trucks ordered to build Oil Derrick" msgstr "" -#: src/display.cpp:2046 +#: src/display.cpp:2044 #, c-format msgid "%d trucks ordered to build Oil Derrick" msgstr "" -#: src/droid.cpp:208 +#: src/droid.cpp:211 msgid "Unit Lost!" msgstr "" -#: src/droid.cpp:1370 +#: src/droid.cpp:1376 msgid "Structure Restored" msgstr "" -#: src/droid.cpp:2712 +#: src/droid.cpp:2732 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:2725 +#: src/droid.cpp:2745 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:2738 +#: src/droid.cpp:2758 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:2742 +#: src/droid.cpp:2762 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:3080 +#: src/droid.cpp:3093 msgid "Rookie" msgstr "" -#: src/droid.cpp:3081 +#: src/droid.cpp:3094 msgctxt "rank" msgid "Green" msgstr "" -#: src/droid.cpp:3082 +#: src/droid.cpp:3095 #, fuzzy msgid "Trained" msgstr "Exercitum" -#: src/droid.cpp:3083 +#: src/droid.cpp:3096 msgid "Regular" msgstr "" -#: src/droid.cpp:3084 +#: src/droid.cpp:3097 msgid "Professional" msgstr "" -#: src/droid.cpp:3085 +#: src/droid.cpp:3098 #, fuzzy msgid "Veteran" msgstr "Veteranum" -#: src/droid.cpp:3086 +#: src/droid.cpp:3099 msgid "Elite" msgstr "" -#: src/droid.cpp:3087 +#: src/droid.cpp:3100 msgid "Special" msgstr "" -#: src/droid.cpp:3088 +#: src/droid.cpp:3101 #, fuzzy msgid "Hero" msgstr "Heros" -#: src/droid.cpp:4110 +#: src/droid.cpp:4123 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "" -#: src/droid.cpp:4114 +#: src/droid.cpp:4127 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "" @@ -12499,7 +12499,7 @@ msgid "Tutorial" msgstr "" #: src/frontend.cpp:100 -#: src/hci.cpp:3499 +#: src/hci.cpp:3487 msgid "Options" msgstr "" @@ -12550,7 +12550,7 @@ msgid "Challenges" msgstr "" #: src/frontend.cpp:215 -#: src/ingameop.cpp:275 +#: src/ingameop.cpp:272 msgid "Load Game" msgstr "" @@ -12559,9 +12559,9 @@ msgid "SINGLE PLAYER" msgstr "" #: src/frontend.cpp:303 -#: src/ingameop.cpp:498 -#: src/mission.cpp:2527 -#: src/mission.cpp:2630 +#: src/ingameop.cpp:494 +#: src/mission.cpp:2493 +#: src/mission.cpp:2596 msgid "Load Saved Game" msgstr "" @@ -12578,7 +12578,7 @@ msgid "Join Game" msgstr "" #: src/frontend.cpp:422 -#: src/multiint.cpp:1276 +#: src/multiint.cpp:1285 msgid "OPTIONS" msgstr "" @@ -12595,7 +12595,7 @@ msgid "Video Options" msgstr "" #: src/frontend.cpp:426 -#: src/ingameop.cpp:270 +#: src/ingameop.cpp:267 msgid "Audio Options" msgstr "" @@ -12673,7 +12673,7 @@ msgid "Off" msgstr "" #: src/frontend.cpp:523 -#: src/multiint.cpp:1345 +#: src/multiint.cpp:1354 msgid "Fog" msgstr "" @@ -12684,7 +12684,7 @@ msgstr "" #: src/frontend.cpp:530 #: src/frontend.cpp:595 -#: src/multiint.cpp:1347 +#: src/multiint.cpp:1356 msgid "Fog Of War" msgstr "" @@ -12844,197 +12844,197 @@ msgid "GAME OPTIONS" msgstr "" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2389 +#: src/multiint.cpp:2398 msgid "Mod: " msgstr "" -#: src/hci.cpp:1245 +#: src/hci.cpp:1237 msgid "MAP SAVED!" msgstr "" -#: src/hci.cpp:1584 +#: src/hci.cpp:1573 #: src/loop.cpp:558 #: src/loop.cpp:574 msgid "GAME SAVED: " msgstr "" -#: src/hci.cpp:1971 +#: src/hci.cpp:1960 msgid "Failed to create building" msgstr "" -#: src/hci.cpp:1988 +#: src/hci.cpp:1977 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new structure: %s." msgstr "" -#: src/hci.cpp:2003 +#: src/hci.cpp:1992 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new feature: %s." msgstr "" -#: src/hci.cpp:2025 +#: src/hci.cpp:2014 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid: %s." msgstr "" -#: src/hci.cpp:2036 +#: src/hci.cpp:2025 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "" -#: src/hci.cpp:3310 +#: src/hci.cpp:3298 msgid "Commanders (F6)" msgstr "" -#: src/hci.cpp:3323 +#: src/hci.cpp:3311 msgid "Intelligence Display (F5)" msgstr "" -#: src/hci.cpp:3336 +#: src/hci.cpp:3324 msgid "Manufacture (F1)" msgstr "" -#: src/hci.cpp:3349 +#: src/hci.cpp:3337 msgid "Design (F4)" msgstr "" -#: src/hci.cpp:3362 +#: src/hci.cpp:3350 #, fuzzy msgid "Research (F2)" msgstr "Invenio" -#: src/hci.cpp:3375 +#: src/hci.cpp:3363 #, fuzzy msgid "Build (F3)" msgstr "Construo" -#: src/hci.cpp:3446 -#: src/multiint.cpp:1392 +#: src/hci.cpp:3434 +#: src/multiint.cpp:1401 #: src/multimenu.cpp:763 #, fuzzy msgid "Power" msgstr "Vigor" -#: src/hci.cpp:3537 +#: src/hci.cpp:3525 msgid "Map:" msgstr "" -#: src/hci.cpp:3550 +#: src/hci.cpp:3538 msgid "Load" msgstr "" -#: src/hci.cpp:3551 +#: src/hci.cpp:3539 msgid "Load Map File" msgstr "" -#: src/hci.cpp:3558 +#: src/hci.cpp:3546 msgid "Save" msgstr "" -#: src/hci.cpp:3559 +#: src/hci.cpp:3547 msgid "Save Map File" msgstr "" -#: src/hci.cpp:3567 +#: src/hci.cpp:3555 msgid "New" msgstr "" -#: src/hci.cpp:3568 +#: src/hci.cpp:3556 msgid "New Blank Map" msgstr "" -#: src/hci.cpp:3604 +#: src/hci.cpp:3592 #, fuzzy msgid "Tile" msgstr "Exercitum" -#: src/hci.cpp:3605 +#: src/hci.cpp:3593 msgid "Place tiles on map" msgstr "" -#: src/hci.cpp:3614 +#: src/hci.cpp:3602 msgid "Unit" msgstr "" -#: src/hci.cpp:3615 +#: src/hci.cpp:3603 msgid "Place Unit on map" msgstr "" -#: src/hci.cpp:3623 +#: src/hci.cpp:3611 msgid "Struct" msgstr "" -#: src/hci.cpp:3624 +#: src/hci.cpp:3612 msgid "Place Structures on map" msgstr "" -#: src/hci.cpp:3632 +#: src/hci.cpp:3620 msgid "Feat" msgstr "" -#: src/hci.cpp:3633 +#: src/hci.cpp:3621 msgid "Place Features on map" msgstr "" -#: src/hci.cpp:3643 +#: src/hci.cpp:3631 msgid "Pause" msgstr "" -#: src/hci.cpp:3644 +#: src/hci.cpp:3632 msgid "Pause or unpause the game" msgstr "" -#: src/hci.cpp:3658 +#: src/hci.cpp:3646 msgid "Align height of all map objects" msgstr "" -#: src/hci.cpp:3668 +#: src/hci.cpp:3656 msgid "Edit" msgstr "" -#: src/hci.cpp:3669 +#: src/hci.cpp:3657 msgid "Start Edit Mode" msgstr "" -#: src/hci.cpp:3683 +#: src/hci.cpp:3671 #: src/ingameop.cpp:112 -#: src/ingameop.cpp:258 -#: src/ingameop.cpp:263 +#: src/ingameop.cpp:256 +#: src/ingameop.cpp:260 msgid "Quit" msgstr "" -#: src/hci.cpp:3684 +#: src/hci.cpp:3672 msgid "Exit Game" msgstr "" -#: src/hci.cpp:3710 +#: src/hci.cpp:3698 msgid "Current Player:" msgstr "" -#: src/hci.cpp:4001 +#: src/hci.cpp:3989 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "" -#: src/hci.cpp:4867 +#: src/hci.cpp:4855 msgid "Factory Delivery Point" msgstr "" -#: src/hci.cpp:4885 +#: src/hci.cpp:4873 msgid "Loop Production" msgstr "" -#: src/hci.cpp:4965 +#: src/hci.cpp:4953 msgid "Tab Scroll left" msgstr "" -#: src/hci.cpp:4980 +#: src/hci.cpp:4968 msgid "Tab Scroll right" msgstr "" #: src/ingameop.cpp:111 -#: src/ingameop.cpp:193 -#: src/ingameop.cpp:267 +#: src/ingameop.cpp:195 +#: src/ingameop.cpp:264 msgid "Resume Game" msgstr "" @@ -13042,32 +13042,32 @@ msgstr "" msgid "WARNING: You're the host. If you quit, the game ends for everyone!" msgstr "" -#: src/ingameop.cpp:185 -#: src/ingameop.cpp:527 +#: src/ingameop.cpp:186 +#: src/ingameop.cpp:523 msgid "Tactical UI (Target Origin Icon): Show" msgstr "" -#: src/ingameop.cpp:190 -#: src/ingameop.cpp:531 +#: src/ingameop.cpp:191 +#: src/ingameop.cpp:527 msgid "Tactical UI (Target Origin Icon): Hide" msgstr "" -#: src/ingameop.cpp:277 -#: src/ingameop.cpp:502 -#: src/mission.cpp:2514 -#: src/mission.cpp:2633 +#: src/ingameop.cpp:274 +#: src/ingameop.cpp:498 +#: src/mission.cpp:2480 +#: src/mission.cpp:2599 msgid "Save Game" msgstr "" -#: src/ingameop.cpp:343 +#: src/ingameop.cpp:339 msgid "Host has quit the game!" msgstr "" -#: src/ingameop.cpp:349 +#: src/ingameop.cpp:345 msgid "The game can't continue without the host." msgstr "" -#: src/ingameop.cpp:355 +#: src/ingameop.cpp:351 msgid "--> QUIT <--" msgstr "" @@ -13444,52 +13444,52 @@ msgstr "" msgid "Screen shake when things die: On" msgstr "" -#: src/keybind.cpp:2603 -#: src/keybind.cpp:2646 +#: src/keybind.cpp:2604 +#: src/keybind.cpp:2647 msgid "Sorry, but game speed cannot be changed in multiplayer." msgstr "" -#: src/keybind.cpp:2624 -#: src/keybind.cpp:2667 -#: src/keybind.cpp:2689 +#: src/keybind.cpp:2625 +#: src/keybind.cpp:2668 +#: src/keybind.cpp:2690 msgid "Game Speed Reset" msgstr "" -#: src/keybind.cpp:2628 +#: src/keybind.cpp:2629 #, c-format msgid "Game Speed Increased to %3.1f" msgstr "" -#: src/keybind.cpp:2671 +#: src/keybind.cpp:2672 #, c-format msgid "Game Speed Reduced to %3.1f" msgstr "" -#: src/keybind.cpp:2701 +#: src/keybind.cpp:2702 msgid "Radar showing friend-foe colors" msgstr "" -#: src/keybind.cpp:2705 +#: src/keybind.cpp:2706 msgid "Radar showing player colors" msgstr "" -#: src/keybind.cpp:2726 +#: src/keybind.cpp:2727 msgid "Radar showing only objects" msgstr "" -#: src/keybind.cpp:2729 +#: src/keybind.cpp:2730 msgid "Radar blending terrain and height" msgstr "" -#: src/keybind.cpp:2732 +#: src/keybind.cpp:2733 msgid "Radar showing terrain" msgstr "" -#: src/keybind.cpp:2735 +#: src/keybind.cpp:2736 msgid "Radar showing revealed terrain" msgstr "" -#: src/keybind.cpp:2738 +#: src/keybind.cpp:2739 msgid "Radar showing height" msgstr "" @@ -13498,9 +13498,9 @@ msgid "KEY MAPPING" msgstr "" #: src/keyedit.cpp:372 -#: src/multiint.cpp:662 -#: src/multiint.cpp:1072 -#: src/multiint.cpp:1478 +#: src/multiint.cpp:671 +#: src/multiint.cpp:1081 +#: src/multiint.cpp:1487 msgid "Return To Previous Screen" msgstr "" @@ -13991,37 +13991,37 @@ msgstr "" msgid "Could not save game!" msgstr "" -#: src/mission.cpp:2075 +#: src/mission.cpp:2041 msgid "Load Transport" msgstr "" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED" msgstr "" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED--and you cheated!" msgstr "" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED" msgstr "" -#: src/mission.cpp:2493 -#: src/mission.cpp:2533 -#: src/mission.cpp:2647 +#: src/mission.cpp:2459 +#: src/mission.cpp:2499 +#: src/mission.cpp:2613 msgid "Quit To Main Menu" msgstr "" -#: src/mission.cpp:2501 +#: src/mission.cpp:2467 msgid "Continue Game" msgstr "" -#: src/mission.cpp:2598 +#: src/mission.cpp:2564 msgid "GAME SAVED :" msgstr "" @@ -14080,339 +14080,344 @@ msgstr "" msgid "You Discover Blueprints For %s" msgstr "" -#: src/multiint.cpp:600 +#: src/multiint.cpp:609 #: src/multilimit.cpp:190 msgid "Accept Settings" msgstr "" -#: src/multiint.cpp:602 -#: src/multiint.cpp:1117 +#: src/multiint.cpp:611 +#: src/multiint.cpp:1126 msgid "Cancel" msgstr "" -#: src/multiint.cpp:613 +#: src/multiint.cpp:622 msgid "IP Address or Machine Name" msgstr "" -#: src/multiint.cpp:659 +#: src/multiint.cpp:668 msgid "CONNECTION" msgstr "" -#: src/multiint.cpp:664 +#: src/multiint.cpp:673 msgid "Lobby" msgstr "" -#: src/multiint.cpp:665 +#: src/multiint.cpp:674 msgid "IP" msgstr "" -#: src/multiint.cpp:854 +#: src/multiint.cpp:863 msgid "No games are available" msgstr "" -#: src/multiint.cpp:857 +#: src/multiint.cpp:866 msgid "Game is full" msgstr "" -#: src/multiint.cpp:861 +#: src/multiint.cpp:870 msgid "You were kicked!" msgstr "" -#: src/multiint.cpp:864 +#: src/multiint.cpp:873 msgid "Wrong Game Version!" msgstr "" -#: src/multiint.cpp:867 +#: src/multiint.cpp:876 msgid "You have an incompatible mod." msgstr "" -#: src/multiint.cpp:871 +#: src/multiint.cpp:880 msgid "Host couldn't send file?" msgstr "" -#: src/multiint.cpp:875 +#: src/multiint.cpp:884 msgid "Incorrect Password!" msgstr "" -#: src/multiint.cpp:878 +#: src/multiint.cpp:887 msgid "Host has dropped connection!" msgstr "" -#: src/multiint.cpp:882 +#: src/multiint.cpp:891 msgid "Connection Error" msgstr "" -#: src/multiint.cpp:1012 +#: src/multiint.cpp:1021 msgid "Searching" msgstr "" -#: src/multiint.cpp:1069 +#: src/multiint.cpp:1078 msgid "GAMES" msgstr "" -#: src/multiint.cpp:1077 +#: src/multiint.cpp:1086 msgid "Refresh Games List" msgstr "" -#: src/multiint.cpp:1097 +#: src/multiint.cpp:1106 msgid "Enter Password:" msgstr "" -#: src/multiint.cpp:1115 +#: src/multiint.cpp:1124 msgid "OK" msgstr "" -#: src/multiint.cpp:1232 +#: src/multiint.cpp:1241 msgid "Tanks disabled!!" msgstr "" -#: src/multiint.cpp:1233 +#: src/multiint.cpp:1242 msgid "Cyborgs disabled." msgstr "" -#: src/multiint.cpp:1234 +#: src/multiint.cpp:1243 msgid "VTOLs disabled." msgstr "" -#: src/multiint.cpp:1281 -#: src/multiint.cpp:1288 +#: src/multiint.cpp:1290 +#: src/multiint.cpp:1297 msgid "Select Game Name" msgstr "" -#: src/multiint.cpp:1281 +#: src/multiint.cpp:1290 msgid "One-Player Skirmish" msgstr "" -#: src/multiint.cpp:1291 +#: src/multiint.cpp:1300 msgid "Select Map" msgstr "" -#: src/multiint.cpp:1299 +#: src/multiint.cpp:1308 msgid "Click to set Password" msgstr "" -#: src/multiint.cpp:1309 -#: src/multiint.cpp:1310 +#: src/multiint.cpp:1318 +#: src/multiint.cpp:1319 msgid "Scavengers" msgstr "" -#: src/multiint.cpp:1312 +#: src/multiint.cpp:1321 msgid "No Scavengers" msgstr "" -#: src/multiint.cpp:1342 +#: src/multiint.cpp:1351 msgid "Select Player Name" msgstr "" -#: src/multiint.cpp:1348 +#: src/multiint.cpp:1357 msgid "Distance Fog" msgstr "" -#: src/multiint.cpp:1359 +#: src/multiint.cpp:1368 #: src/multimenu.cpp:756 msgid "Alliances" msgstr "" -#: src/multiint.cpp:1362 +#: src/multiint.cpp:1371 msgid "No Alliances" msgstr "" -#: src/multiint.cpp:1364 +#: src/multiint.cpp:1373 msgid "Allow Alliances" msgstr "" -#: src/multiint.cpp:1368 +#: src/multiint.cpp:1377 msgid "Locked Teams" msgstr "" -#: src/multiint.cpp:1394 +#: src/multiint.cpp:1403 msgid "Low Power Levels" msgstr "" -#: src/multiint.cpp:1396 +#: src/multiint.cpp:1405 msgid "Medium Power Levels" msgstr "" -#: src/multiint.cpp:1398 +#: src/multiint.cpp:1407 msgid "High Power Levels" msgstr "" -#: src/multiint.cpp:1430 +#: src/multiint.cpp:1439 msgid "Base" msgstr "" -#: src/multiint.cpp:1432 +#: src/multiint.cpp:1441 msgid "Start with No Bases" msgstr "" -#: src/multiint.cpp:1434 +#: src/multiint.cpp:1443 msgid "Start with Bases" msgstr "" -#: src/multiint.cpp:1436 +#: src/multiint.cpp:1445 msgid "Start with Advanced Bases" msgstr "" -#: src/multiint.cpp:1468 +#: src/multiint.cpp:1477 msgid "Map Preview" msgstr "" -#: src/multiint.cpp:1470 +#: src/multiint.cpp:1479 msgid "Click to see Map" msgstr "" -#: src/multiint.cpp:1484 +#: src/multiint.cpp:1493 msgid "Start Hosting Game" msgstr "" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 msgid "Show Structure Limits" msgstr "" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 msgid "Set Structure Limits" msgstr "" -#: src/multiint.cpp:1587 +#: src/multiint.cpp:1596 msgid "DIFFICULTY" msgstr "" -#: src/multiint.cpp:1601 +#: src/multiint.cpp:1610 msgid "Less aggressive and starts with less units" msgstr "" -#: src/multiint.cpp:1602 +#: src/multiint.cpp:1611 msgid "Plays nice" msgstr "" -#: src/multiint.cpp:1603 +#: src/multiint.cpp:1612 msgid "No holds barred" msgstr "" -#: src/multiint.cpp:1604 +#: src/multiint.cpp:1613 msgid "Starts with advantages and gets twice as much oil from derricks" msgstr "" -#: src/multiint.cpp:1632 +#: src/multiint.cpp:1641 msgid "CHOOSE AI" msgstr "" -#: src/multiint.cpp:1648 +#: src/multiint.cpp:1657 msgid "Allow human players to join in this slot" msgstr "" -#: src/multiint.cpp:1656 +#: src/multiint.cpp:1665 msgid "Leave this slot unused" msgstr "" -#: src/multiint.cpp:1736 +#: src/multiint.cpp:1745 msgid "Player colour" msgstr "" -#: src/multiint.cpp:2062 +#: src/multiint.cpp:2071 msgid "Team" msgstr "" -#: src/multiint.cpp:2074 +#: src/multiint.cpp:2083 msgid "Kick player" msgstr "" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 msgid "Click to change difficulty" msgstr "" -#: src/multiint.cpp:2121 +#: src/multiint.cpp:2130 msgid "Click when ready" msgstr "" -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2134 msgid "READY?" msgstr "" -#: src/multiint.cpp:2169 +#: src/multiint.cpp:2178 msgid "PLAYERS" msgstr "" -#: src/multiint.cpp:2204 +#: src/multiint.cpp:2213 msgid "Click to change to this slot" msgstr "" -#: src/multiint.cpp:2232 +#: src/multiint.cpp:2241 msgid "Choose Team" msgstr "" -#: src/multiint.cpp:2262 +#: src/multiint.cpp:2271 msgid "Click to change player colour" msgstr "" -#: src/multiint.cpp:2290 +#: src/multiint.cpp:2299 msgid "Click to change player position" msgstr "" -#: src/multiint.cpp:2296 +#: src/multiint.cpp:2305 msgid "Click to change AI" msgstr "" -#: src/multiint.cpp:2300 +#: src/multiint.cpp:2309 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2362 +#: src/multiint.cpp:2371 msgid "CHAT" msgstr "" -#: src/multiint.cpp:2394 +#: src/multiint.cpp:2403 msgid "All players need to have the same mods to join your game." msgstr "" -#: src/multiint.cpp:2552 +#: src/multiint.cpp:2561 #, c-format msgid "*** password [%s] is now required! ***" msgstr "" -#: src/multiint.cpp:2560 +#: src/multiint.cpp:2569 msgid "*** password is NOT required! ***" msgstr "" -#: src/multiint.cpp:2801 +#: src/multiint.cpp:2810 msgid "Sorry! Failed to host the game." msgstr "" -#: src/multiint.cpp:2922 +#: src/multiint.cpp:2931 msgid "'Locked Teams' mode enabled" msgstr "" -#: src/multiint.cpp:3003 +#: src/multiint.cpp:3012 #, c-format msgid "The host has kicked %s from the game!" msgstr "" -#: src/multiint.cpp:3073 +#: src/multiint.cpp:3082 msgid "Host is Starting Game" msgstr "" -#: src/multiint.cpp:3639 +#: src/multiint.cpp:3648 msgid "Players" msgstr "" -#: src/multiint.cpp:3772 +#: src/multiint.cpp:3786 #, c-format msgid "Sending Map: %d%% " msgstr "" -#: src/multiint.cpp:3780 +#: src/multiint.cpp:3794 #, c-format msgid "Map: %d%% downloaded" msgstr "" -#: src/multiint.cpp:3803 +#: src/multiint.cpp:3820 msgid "HOST" msgstr "" +#: src/multiint.cpp:3827 +#: src/multimenu.cpp:772 +msgid "Ping" +msgstr "" + #: src/multijoin.cpp:100 #: src/multijoin.cpp:101 msgid "Players Still Joining" @@ -14428,17 +14433,17 @@ msgstr "" msgid "File transfer has been aborted for %d." msgstr "" -#: src/multijoin.cpp:376 +#: src/multijoin.cpp:373 #, c-format msgid "%s (%u) has an incompatible mod, and has been kicked." msgstr "" -#: src/multijoin.cpp:415 +#: src/multijoin.cpp:412 #, c-format msgid "%s is Joining the Game" msgstr "" -#: src/multijoin.cpp:425 +#: src/multijoin.cpp:422 msgid "System message:" msgstr "" @@ -14539,10 +14544,6 @@ msgstr "" msgid "Units" msgstr "" -#: src/multimenu.cpp:772 -msgid "Ping" -msgstr "" - #: src/multimenu.cpp:776 msgid "Structs" msgstr "" @@ -14576,85 +14577,85 @@ msgstr "" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "" -#: src/multiplay.cpp:1146 +#: src/multiplay.cpp:1057 msgid "(allies" msgstr "" -#: src/multiplay.cpp:1154 +#: src/multiplay.cpp:1065 msgid "(private to " msgstr "" -#: src/multiplay.cpp:1167 +#: src/multiplay.cpp:1078 msgid "[invalid]" msgstr "" -#: src/multiplay.cpp:2057 +#: src/multiplay.cpp:1942 #, fuzzy msgid "Green" msgstr "Viridum" -#: src/multiplay.cpp:2058 +#: src/multiplay.cpp:1943 msgid "Orange" msgstr "" -#: src/multiplay.cpp:2059 +#: src/multiplay.cpp:1944 msgid "Grey" msgstr "Canum" -#: src/multiplay.cpp:2060 +#: src/multiplay.cpp:1945 msgid "Black" msgstr "Nĭgrum" -#: src/multiplay.cpp:2061 +#: src/multiplay.cpp:1946 #, fuzzy msgid "Red" msgstr "Rubrum" -#: src/multiplay.cpp:2062 +#: src/multiplay.cpp:1947 msgid "Blue" msgstr "" -#: src/multiplay.cpp:2063 +#: src/multiplay.cpp:1948 msgid "Pink" msgstr "" -#: src/multiplay.cpp:2064 +#: src/multiplay.cpp:1949 msgid "Cyan" msgstr "" -#: src/multiplay.cpp:2065 +#: src/multiplay.cpp:1950 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:2066 +#: src/multiplay.cpp:1951 msgid "Purple" msgstr "" -#: src/multiplay.cpp:2067 +#: src/multiplay.cpp:1952 msgid "White" msgstr "" -#: src/multiplay.cpp:2068 +#: src/multiplay.cpp:1953 msgid "Bright blue" msgstr "" -#: src/multiplay.cpp:2069 +#: src/multiplay.cpp:1954 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:2070 +#: src/multiplay.cpp:1955 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:2071 +#: src/multiplay.cpp:1956 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:2072 +#: src/multiplay.cpp:1957 msgid "Brown" msgstr "" -#: src/order.cpp:841 +#: src/order.cpp:800 msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "" @@ -14789,20 +14790,20 @@ msgstr "" msgid "You cheated!" msgstr "" -#: src/scriptfuncs.cpp:3250 +#: src/scriptfuncs.cpp:3287 msgid "YOU ARE VICTORIOUS!" msgstr "" -#: src/scriptfuncs.cpp:3254 +#: src/scriptfuncs.cpp:3291 msgid "YOU WERE DEFEATED!" msgstr "" -#: src/scriptfuncs.cpp:9500 +#: src/scriptfuncs.cpp:9537 #, c-format msgid "Beacon received from %s!" msgstr "" -#: src/scriptfuncs.cpp:9546 +#: src/scriptfuncs.cpp:9583 #, c-format msgid "Beacon %d" msgstr "" @@ -14831,62 +14832,62 @@ msgstr "" msgid "Unable to locate any Commanders!" msgstr "" -#: src/structure.cpp:2615 +#: src/structure.cpp:2614 msgid "Command Control Limit Reached - Production Halted" msgstr "" -#: src/structure.cpp:5815 -#: src/structure.cpp:5840 +#: src/structure.cpp:5806 +#: src/structure.cpp:5831 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" msgstr[0] "" msgstr[1] "" -#: src/structure.cpp:5845 -#: src/structure.cpp:5913 -#: src/structure.cpp:5929 -#: src/structure.cpp:5943 +#: src/structure.cpp:5836 +#: src/structure.cpp:5904 +#: src/structure.cpp:5920 +#: src/structure.cpp:5934 #, c-format msgid "%s - Damage %3.0f%%" msgstr "" -#: src/structure.cpp:5895 +#: src/structure.cpp:5886 #, c-format msgid "%s - Connected %u of %u" msgstr "" -#: src/structure.cpp:6059 -#: src/structure.cpp:6104 +#: src/structure.cpp:6050 +#: src/structure.cpp:6095 #, c-format msgid "%s - Electronically Damaged" msgstr "" -#: src/structure.cpp:6341 +#: src/structure.cpp:6332 msgid "Electronic Reward - Visibility Report" msgstr "" -#: src/structure.cpp:6381 +#: src/structure.cpp:6372 msgid "Factory Reward - Propulsion" msgstr "" -#: src/structure.cpp:6405 +#: src/structure.cpp:6396 msgid "Factory Reward - Body" msgstr "" -#: src/structure.cpp:6429 +#: src/structure.cpp:6420 msgid "Factory Reward - Weapon" msgstr "" -#: src/structure.cpp:6438 +#: src/structure.cpp:6429 msgid "Factory Reward - Nothing" msgstr "" -#: src/structure.cpp:6466 +#: src/structure.cpp:6457 msgid "Repair Facility Award - Repair" msgstr "" -#: src/structure.cpp:6473 +#: src/structure.cpp:6464 msgid "Repair Facility Award - Nothing" msgstr "" diff --git a/po/lt.po b/po/lt.po index 178632ead..0124020b9 100644 --- a/po/lt.po +++ b/po/lt.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-01-18 00:54+0100\n" +"POT-Creation-Date: 2011-02-25 23:35+0100\n" "PO-Revision-Date: 2008-05-09 16:42+0000\n" "Last-Translator: Roman \n" "Language-Team: Lithuanian \n" @@ -5730,7 +5730,7 @@ msgid "New Design" msgstr "" #: data/base/messages/strings/names.txt:15 -#: src/design.cpp:1313 +#: src/design.cpp:1275 msgid "Transport" msgstr "" @@ -12011,26 +12011,26 @@ msgid "System locale" msgstr "Vietinė sistema" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1043 +#: lib/netplay/netplay.cpp:1042 msgid "Enter password here" msgstr "" -#: lib/netplay/netplay.cpp:2048 +#: lib/netplay/netplay.cpp:2060 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "" -#: lib/netplay/netplay.cpp:2062 +#: lib/netplay/netplay.cpp:2082 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "" #: src/challenge.cpp:184 -#: src/hci.cpp:922 -#: src/hci.cpp:3390 -#: src/hci.cpp:3513 -#: src/hci.cpp:3924 -#: src/hci.cpp:4942 +#: src/hci.cpp:916 +#: src/hci.cpp:3378 +#: src/hci.cpp:3501 +#: src/hci.cpp:3912 +#: src/hci.cpp:4930 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12182,149 +12182,149 @@ msgstr "" #: src/configuration.cpp:393 #: src/configuration.cpp:394 -#: src/multistat.cpp:130 +#: src/multistat.cpp:124 msgid "Player" msgstr "Žaidėjas" -#: src/design.cpp:449 -#: src/design.cpp:469 -#: src/design.cpp:3501 +#: src/design.cpp:443 +#: src/design.cpp:455 +#: src/design.cpp:3464 msgid "New Vehicle" msgstr "" -#: src/design.cpp:515 +#: src/design.cpp:500 msgid "Vehicle Body" msgstr "" -#: src/design.cpp:535 +#: src/design.cpp:520 msgid "Vehicle Propulsion" msgstr "" -#: src/design.cpp:556 -#: src/design.cpp:579 -#: src/design.cpp:603 +#: src/design.cpp:541 +#: src/design.cpp:564 +#: src/design.cpp:588 msgid "Vehicle Turret" msgstr "" -#: src/design.cpp:622 +#: src/design.cpp:607 msgid "Delete Design" msgstr "" -#: src/design.cpp:673 -#: src/design.cpp:720 +#: src/design.cpp:658 +#: src/design.cpp:705 msgid "Kinetic Armour" msgstr "" -#: src/design.cpp:682 -#: src/design.cpp:730 +#: src/design.cpp:667 +#: src/design.cpp:715 msgid "Thermal Armour" msgstr "" -#: src/design.cpp:698 -#: src/design.cpp:750 +#: src/design.cpp:683 +#: src/design.cpp:735 msgid "Engine Output" msgstr "" -#: src/design.cpp:706 -#: src/design.cpp:759 -#: src/design.cpp:1529 -#: src/design.cpp:1553 -#: src/design.cpp:1574 -#: src/design.cpp:1590 -#: src/design.cpp:1610 -#: src/design.cpp:1627 -#: src/design.cpp:1647 -#: src/design.cpp:1664 -#: src/design.cpp:1705 -#: src/design.cpp:1737 -#: src/design.cpp:1869 -#: src/design.cpp:1885 -#: src/design.cpp:1923 -#: src/design.cpp:1956 +#: src/design.cpp:691 +#: src/design.cpp:744 +#: src/design.cpp:1486 +#: src/design.cpp:1510 +#: src/design.cpp:1531 +#: src/design.cpp:1547 +#: src/design.cpp:1567 +#: src/design.cpp:1584 +#: src/design.cpp:1604 +#: src/design.cpp:1621 +#: src/design.cpp:1662 +#: src/design.cpp:1694 +#: src/design.cpp:1826 +#: src/design.cpp:1842 +#: src/design.cpp:1880 +#: src/design.cpp:1913 msgid "Weight" msgstr "" -#: src/design.cpp:790 -#: src/design.cpp:808 +#: src/design.cpp:775 +#: src/design.cpp:793 msgid "Total Power Required" msgstr "" -#: src/design.cpp:821 -#: src/design.cpp:840 +#: src/design.cpp:806 +#: src/design.cpp:825 msgid "Total Body Points" msgstr "" -#: src/design.cpp:1027 -#: src/design.cpp:1059 +#: src/design.cpp:996 +#: src/design.cpp:1025 msgid "Power Usage" msgstr "" -#: src/design.cpp:1335 +#: src/design.cpp:1298 msgid "Hydra " msgstr "" -#: src/design.cpp:1509 -#: src/design.cpp:1537 +#: src/design.cpp:1466 +#: src/design.cpp:1494 msgid "Sensor Range" msgstr "" -#: src/design.cpp:1521 -#: src/design.cpp:1545 +#: src/design.cpp:1478 +#: src/design.cpp:1502 msgid "Sensor Power" msgstr "" -#: src/design.cpp:1566 -#: src/design.cpp:1582 +#: src/design.cpp:1523 +#: src/design.cpp:1539 msgid "ECM Power" msgstr "" -#: src/design.cpp:1602 -#: src/design.cpp:1619 -#: src/design.cpp:1639 -#: src/design.cpp:1656 +#: src/design.cpp:1559 +#: src/design.cpp:1576 +#: src/design.cpp:1596 +#: src/design.cpp:1613 msgid "Build Points" msgstr "" -#: src/design.cpp:1677 -#: src/design.cpp:1713 +#: src/design.cpp:1634 +#: src/design.cpp:1670 msgid "Range" msgstr "" -#: src/design.cpp:1689 -#: src/design.cpp:1721 +#: src/design.cpp:1646 +#: src/design.cpp:1678 msgid "Damage" msgstr "" -#: src/design.cpp:1697 -#: src/design.cpp:1729 +#: src/design.cpp:1654 +#: src/design.cpp:1686 msgid "Rate-of-Fire" msgstr "" -#: src/design.cpp:1857 -#: src/design.cpp:1877 +#: src/design.cpp:1814 +#: src/design.cpp:1834 msgid "Air Speed" msgstr "" -#: src/design.cpp:1895 -#: src/design.cpp:1932 +#: src/design.cpp:1852 +#: src/design.cpp:1889 msgid "Road Speed" msgstr "" -#: src/design.cpp:1905 -#: src/design.cpp:1940 +#: src/design.cpp:1862 +#: src/design.cpp:1897 msgid "Off-Road Speed" msgstr "" -#: src/design.cpp:1913 -#: src/design.cpp:1948 +#: src/design.cpp:1870 +#: src/design.cpp:1905 msgid "Water Speed" msgstr "" -#: src/design.cpp:2074 +#: src/design.cpp:2031 msgid "Weapons" msgstr "" -#: src/design.cpp:2094 +#: src/design.cpp:2051 msgid "Systems" msgstr "" @@ -12339,7 +12339,7 @@ msgid "Player dropped" msgstr "Žaidėjas" #: src/display3d.cpp:599 -#: src/multiint.cpp:2116 +#: src/multiint.cpp:2125 msgid "Waiting for other players" msgstr "" @@ -12347,44 +12347,44 @@ msgstr "" msgid "Out of sync" msgstr "" -#: src/display.cpp:1651 +#: src/display.cpp:1649 msgid "Cannot Build. Oil Resource Burning." msgstr "Negalima statyti. Naftos telkinys dega." -#: src/display.cpp:1830 -#: src/display.cpp:2423 +#: src/display.cpp:1828 +#: src/display.cpp:2421 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - Žala %d%% - Patirtis %d, %s" -#: src/display.cpp:1846 +#: src/display.cpp:1844 #, fuzzy, c-format msgid "%s - Allied - Damage %d%% - Experience %d, %s" msgstr "%s - Žala %d%% - Patirtis %d, %s" -#: src/display.cpp:2044 +#: src/display.cpp:2042 msgid "Truck ordered to build Oil Derrick" msgstr "Sunkvežimiui įsakyta sukonstruoti naftos platformą" -#: src/display.cpp:2045 +#: src/display.cpp:2043 #, fuzzy msgid "2 trucks ordered to build Oil Derrick" msgstr "Sunkvežimiui įsakyta sukonstruoti naftos platformą" -#: src/display.cpp:2046 +#: src/display.cpp:2044 #, fuzzy, c-format msgid "%d trucks ordered to build Oil Derrick" msgstr "Sunkvežimiui įsakyta sukonstruoti naftos platformą" -#: src/droid.cpp:208 +#: src/droid.cpp:211 msgid "Unit Lost!" msgstr "Prarastas karinis vienetas!" -#: src/droid.cpp:1370 +#: src/droid.cpp:1376 msgid "Structure Restored" msgstr "Pastatas atkurtas" -#: src/droid.cpp:2712 +#: src/droid.cpp:2732 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" @@ -12392,7 +12392,7 @@ msgstr[0] "Grupė %u priskirtas - %u Kovinis vienetas" msgstr[1] "Grupė %u priskirti - %u Koviniai vienetai" msgstr[2] "Grupė %u priskirti - %u Koviniai vienetai" -#: src/droid.cpp:2725 +#: src/droid.cpp:2745 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" @@ -12400,63 +12400,63 @@ msgstr[0] "%u kovinis vienetas priskirtas Grupei %u" msgstr[1] "%u Koviniai vienetai priskirti Grupei %u" msgstr[2] "%u Koviniai vienetai priskirti Grupei %u" -#: src/droid.cpp:2738 +#: src/droid.cpp:2758 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:2742 +#: src/droid.cpp:2762 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:3080 +#: src/droid.cpp:3093 msgid "Rookie" msgstr "" -#: src/droid.cpp:3081 +#: src/droid.cpp:3094 msgctxt "rank" msgid "Green" msgstr "" -#: src/droid.cpp:3082 +#: src/droid.cpp:3095 msgid "Trained" msgstr "" -#: src/droid.cpp:3083 +#: src/droid.cpp:3096 msgid "Regular" msgstr "" -#: src/droid.cpp:3084 +#: src/droid.cpp:3097 msgid "Professional" msgstr "" -#: src/droid.cpp:3085 +#: src/droid.cpp:3098 msgid "Veteran" msgstr "" -#: src/droid.cpp:3086 +#: src/droid.cpp:3099 msgid "Elite" msgstr "" -#: src/droid.cpp:3087 +#: src/droid.cpp:3100 msgid "Special" msgstr "" -#: src/droid.cpp:3088 +#: src/droid.cpp:3101 msgid "Hero" msgstr "" -#: src/droid.cpp:4110 +#: src/droid.cpp:4123 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "" -#: src/droid.cpp:4114 +#: src/droid.cpp:4127 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "" @@ -12477,7 +12477,7 @@ msgid "Tutorial" msgstr "" #: src/frontend.cpp:100 -#: src/hci.cpp:3499 +#: src/hci.cpp:3487 msgid "Options" msgstr "" @@ -12528,7 +12528,7 @@ msgid "Challenges" msgstr "" #: src/frontend.cpp:215 -#: src/ingameop.cpp:275 +#: src/ingameop.cpp:272 msgid "Load Game" msgstr "" @@ -12537,9 +12537,9 @@ msgid "SINGLE PLAYER" msgstr "" #: src/frontend.cpp:303 -#: src/ingameop.cpp:498 -#: src/mission.cpp:2527 -#: src/mission.cpp:2630 +#: src/ingameop.cpp:494 +#: src/mission.cpp:2493 +#: src/mission.cpp:2596 msgid "Load Saved Game" msgstr "Pakrauti išsaugotą žaidimą" @@ -12556,7 +12556,7 @@ msgid "Join Game" msgstr "" #: src/frontend.cpp:422 -#: src/multiint.cpp:1276 +#: src/multiint.cpp:1285 msgid "OPTIONS" msgstr "" @@ -12573,7 +12573,7 @@ msgid "Video Options" msgstr "" #: src/frontend.cpp:426 -#: src/ingameop.cpp:270 +#: src/ingameop.cpp:267 msgid "Audio Options" msgstr "" @@ -12651,7 +12651,7 @@ msgid "Off" msgstr "" #: src/frontend.cpp:523 -#: src/multiint.cpp:1345 +#: src/multiint.cpp:1354 msgid "Fog" msgstr "" @@ -12662,7 +12662,7 @@ msgstr "" #: src/frontend.cpp:530 #: src/frontend.cpp:595 -#: src/multiint.cpp:1347 +#: src/multiint.cpp:1356 msgid "Fog Of War" msgstr "" @@ -12823,199 +12823,199 @@ msgid "GAME OPTIONS" msgstr "" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2389 +#: src/multiint.cpp:2398 msgid "Mod: " msgstr "" -#: src/hci.cpp:1245 +#: src/hci.cpp:1237 #, fuzzy msgid "MAP SAVED!" msgstr "Žaidimas išsaugotas" -#: src/hci.cpp:1584 +#: src/hci.cpp:1573 #: src/loop.cpp:558 #: src/loop.cpp:574 #, fuzzy msgid "GAME SAVED: " msgstr "Žaidimas išsaugotas" -#: src/hci.cpp:1971 +#: src/hci.cpp:1960 msgid "Failed to create building" msgstr "" -#: src/hci.cpp:1988 +#: src/hci.cpp:1977 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new structure: %s." msgstr "Žaidėjas %u sukčiauja (debug meniu) jam/jai naujas pastatas: %s." -#: src/hci.cpp:2003 +#: src/hci.cpp:1992 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new feature: %s." msgstr "Žaidėjas %u sukčiauja (debug meniu) jam/jai naujos galimybės: %s." -#: src/hci.cpp:2025 +#: src/hci.cpp:2014 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid: %s." msgstr "Žaidėjas %u sukčiauja (debug meniu) jam/jai naujas droidas: %s." -#: src/hci.cpp:2036 +#: src/hci.cpp:2025 #, fuzzy, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "Žaidėjas %u sukčiauja (debug meniu) jam/jai naujas droidas: %s." -#: src/hci.cpp:3310 +#: src/hci.cpp:3298 msgid "Commanders (F6)" msgstr "Kapitonas (F6)" -#: src/hci.cpp:3323 +#: src/hci.cpp:3311 msgid "Intelligence Display (F5)" msgstr "Valdymo skydas (F5)" -#: src/hci.cpp:3336 +#: src/hci.cpp:3324 msgid "Manufacture (F1)" msgstr "Pastatai (F1)" -#: src/hci.cpp:3349 +#: src/hci.cpp:3337 msgid "Design (F4)" msgstr "Kūrimas (F4)" -#: src/hci.cpp:3362 +#: src/hci.cpp:3350 msgid "Research (F2)" msgstr "Išradimas (F2)" -#: src/hci.cpp:3375 +#: src/hci.cpp:3363 msgid "Build (F3)" msgstr "Pastatyti (F3)" -#: src/hci.cpp:3446 -#: src/multiint.cpp:1392 +#: src/hci.cpp:3434 +#: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Energija" -#: src/hci.cpp:3537 +#: src/hci.cpp:3525 msgid "Map:" msgstr "" -#: src/hci.cpp:3550 +#: src/hci.cpp:3538 msgid "Load" msgstr "" -#: src/hci.cpp:3551 +#: src/hci.cpp:3539 msgid "Load Map File" msgstr "" -#: src/hci.cpp:3558 +#: src/hci.cpp:3546 #, fuzzy msgid "Save" msgstr "Išsaugoti žaidimą" -#: src/hci.cpp:3559 +#: src/hci.cpp:3547 #, fuzzy msgid "Save Map File" msgstr "Išsaugoti žaidimą" -#: src/hci.cpp:3567 +#: src/hci.cpp:3555 msgid "New" msgstr "" -#: src/hci.cpp:3568 +#: src/hci.cpp:3556 msgid "New Blank Map" msgstr "" -#: src/hci.cpp:3604 +#: src/hci.cpp:3592 msgid "Tile" msgstr "" -#: src/hci.cpp:3605 +#: src/hci.cpp:3593 msgid "Place tiles on map" msgstr "" -#: src/hci.cpp:3614 +#: src/hci.cpp:3602 msgid "Unit" msgstr "Karinis vienetas" -#: src/hci.cpp:3615 +#: src/hci.cpp:3603 msgid "Place Unit on map" msgstr "" -#: src/hci.cpp:3623 +#: src/hci.cpp:3611 msgid "Struct" msgstr "Statyti" -#: src/hci.cpp:3624 +#: src/hci.cpp:3612 msgid "Place Structures on map" msgstr "" -#: src/hci.cpp:3632 +#: src/hci.cpp:3620 msgid "Feat" msgstr "Naujovė" -#: src/hci.cpp:3633 +#: src/hci.cpp:3621 msgid "Place Features on map" msgstr "" -#: src/hci.cpp:3643 +#: src/hci.cpp:3631 msgid "Pause" msgstr "" -#: src/hci.cpp:3644 +#: src/hci.cpp:3632 #, fuzzy msgid "Pause or unpause the game" msgstr "Hostas paliko žaidimą" -#: src/hci.cpp:3658 +#: src/hci.cpp:3646 msgid "Align height of all map objects" msgstr "" -#: src/hci.cpp:3668 +#: src/hci.cpp:3656 msgid "Edit" msgstr "" -#: src/hci.cpp:3669 +#: src/hci.cpp:3657 msgid "Start Edit Mode" msgstr "" -#: src/hci.cpp:3683 +#: src/hci.cpp:3671 #: src/ingameop.cpp:112 -#: src/ingameop.cpp:258 -#: src/ingameop.cpp:263 +#: src/ingameop.cpp:256 +#: src/ingameop.cpp:260 msgid "Quit" msgstr "Išeiti" -#: src/hci.cpp:3684 +#: src/hci.cpp:3672 msgid "Exit Game" msgstr "Išeiti iš žaidimo" -#: src/hci.cpp:3710 +#: src/hci.cpp:3698 #, fuzzy msgid "Current Player:" msgstr "Žaidėjas" -#: src/hci.cpp:4001 +#: src/hci.cpp:3989 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "Eigos juosta" -#: src/hci.cpp:4867 +#: src/hci.cpp:4855 msgid "Factory Delivery Point" msgstr "Gamyklinis išeities taškas" -#: src/hci.cpp:4885 +#: src/hci.cpp:4873 msgid "Loop Production" msgstr "Nesibaigianti gamyba" -#: src/hci.cpp:4965 +#: src/hci.cpp:4953 msgid "Tab Scroll left" msgstr "Pasukti į kairę" -#: src/hci.cpp:4980 +#: src/hci.cpp:4968 msgid "Tab Scroll right" msgstr "Pasukti į dešinę" #: src/ingameop.cpp:111 -#: src/ingameop.cpp:193 -#: src/ingameop.cpp:267 +#: src/ingameop.cpp:195 +#: src/ingameop.cpp:264 msgid "Resume Game" msgstr "" @@ -13023,33 +13023,33 @@ msgstr "" msgid "WARNING: You're the host. If you quit, the game ends for everyone!" msgstr "" -#: src/ingameop.cpp:185 -#: src/ingameop.cpp:527 +#: src/ingameop.cpp:186 +#: src/ingameop.cpp:523 msgid "Tactical UI (Target Origin Icon): Show" msgstr "" -#: src/ingameop.cpp:190 -#: src/ingameop.cpp:531 +#: src/ingameop.cpp:191 +#: src/ingameop.cpp:527 msgid "Tactical UI (Target Origin Icon): Hide" msgstr "" -#: src/ingameop.cpp:277 -#: src/ingameop.cpp:502 -#: src/mission.cpp:2514 -#: src/mission.cpp:2633 +#: src/ingameop.cpp:274 +#: src/ingameop.cpp:498 +#: src/mission.cpp:2480 +#: src/mission.cpp:2599 msgid "Save Game" msgstr "Išsaugoti žaidimą" -#: src/ingameop.cpp:343 +#: src/ingameop.cpp:339 #, fuzzy msgid "Host has quit the game!" msgstr "Hostas paliko žaidimą" -#: src/ingameop.cpp:349 +#: src/ingameop.cpp:345 msgid "The game can't continue without the host." msgstr "" -#: src/ingameop.cpp:355 +#: src/ingameop.cpp:351 msgid "--> QUIT <--" msgstr "" @@ -13425,52 +13425,52 @@ msgstr "" msgid "Screen shake when things die: On" msgstr "" -#: src/keybind.cpp:2603 -#: src/keybind.cpp:2646 +#: src/keybind.cpp:2604 +#: src/keybind.cpp:2647 msgid "Sorry, but game speed cannot be changed in multiplayer." msgstr "" -#: src/keybind.cpp:2624 -#: src/keybind.cpp:2667 -#: src/keybind.cpp:2689 +#: src/keybind.cpp:2625 +#: src/keybind.cpp:2668 +#: src/keybind.cpp:2690 msgid "Game Speed Reset" msgstr "" -#: src/keybind.cpp:2628 +#: src/keybind.cpp:2629 #, c-format msgid "Game Speed Increased to %3.1f" msgstr "" -#: src/keybind.cpp:2671 +#: src/keybind.cpp:2672 #, c-format msgid "Game Speed Reduced to %3.1f" msgstr "" -#: src/keybind.cpp:2701 +#: src/keybind.cpp:2702 msgid "Radar showing friend-foe colors" msgstr "" -#: src/keybind.cpp:2705 +#: src/keybind.cpp:2706 msgid "Radar showing player colors" msgstr "" -#: src/keybind.cpp:2726 +#: src/keybind.cpp:2727 msgid "Radar showing only objects" msgstr "" -#: src/keybind.cpp:2729 +#: src/keybind.cpp:2730 msgid "Radar blending terrain and height" msgstr "" -#: src/keybind.cpp:2732 +#: src/keybind.cpp:2733 msgid "Radar showing terrain" msgstr "" -#: src/keybind.cpp:2735 +#: src/keybind.cpp:2736 msgid "Radar showing revealed terrain" msgstr "" -#: src/keybind.cpp:2738 +#: src/keybind.cpp:2739 msgid "Radar showing height" msgstr "" @@ -13479,9 +13479,9 @@ msgid "KEY MAPPING" msgstr "" #: src/keyedit.cpp:372 -#: src/multiint.cpp:662 -#: src/multiint.cpp:1072 -#: src/multiint.cpp:1478 +#: src/multiint.cpp:671 +#: src/multiint.cpp:1081 +#: src/multiint.cpp:1487 msgid "Return To Previous Screen" msgstr "" @@ -13970,39 +13970,39 @@ msgstr "" msgid "Could not save game!" msgstr "" -#: src/mission.cpp:2075 +#: src/mission.cpp:2041 msgid "Load Transport" msgstr "Pakrauti transportą" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 #, fuzzy msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "Užduotis atlikta" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED" msgstr "Užduotis atlikta" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 #, fuzzy msgid "OBJECTIVE FAILED--and you cheated!" msgstr "Užduotis neatlikta" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED" msgstr "Užduotis neatlikta" -#: src/mission.cpp:2493 -#: src/mission.cpp:2533 -#: src/mission.cpp:2647 +#: src/mission.cpp:2459 +#: src/mission.cpp:2499 +#: src/mission.cpp:2613 msgid "Quit To Main Menu" msgstr "Išeiti į pagrindinį meniu" -#: src/mission.cpp:2501 +#: src/mission.cpp:2467 msgid "Continue Game" msgstr "Tęsti žaidimą" -#: src/mission.cpp:2598 +#: src/mission.cpp:2564 #, fuzzy msgid "GAME SAVED :" msgstr "Žaidimas išsaugotas" @@ -14062,346 +14062,351 @@ msgstr "%s sukuria sąjungą su %s" msgid "You Discover Blueprints For %s" msgstr "Tu išradai mėlynus pėdsakus skirtus %s" -#: src/multiint.cpp:600 +#: src/multiint.cpp:609 #: src/multilimit.cpp:190 msgid "Accept Settings" msgstr "" -#: src/multiint.cpp:602 -#: src/multiint.cpp:1117 +#: src/multiint.cpp:611 +#: src/multiint.cpp:1126 #, fuzzy msgid "Cancel" msgstr "Žydra" -#: src/multiint.cpp:613 +#: src/multiint.cpp:622 msgid "IP Address or Machine Name" msgstr "" -#: src/multiint.cpp:659 +#: src/multiint.cpp:668 msgid "CONNECTION" msgstr "" -#: src/multiint.cpp:664 +#: src/multiint.cpp:673 msgid "Lobby" msgstr "" -#: src/multiint.cpp:665 +#: src/multiint.cpp:674 msgid "IP" msgstr "" -#: src/multiint.cpp:854 +#: src/multiint.cpp:863 msgid "No games are available" msgstr "" -#: src/multiint.cpp:857 +#: src/multiint.cpp:866 msgid "Game is full" msgstr "" -#: src/multiint.cpp:861 +#: src/multiint.cpp:870 msgid "You were kicked!" msgstr "" -#: src/multiint.cpp:864 +#: src/multiint.cpp:873 msgid "Wrong Game Version!" msgstr "" -#: src/multiint.cpp:867 +#: src/multiint.cpp:876 msgid "You have an incompatible mod." msgstr "" -#: src/multiint.cpp:871 +#: src/multiint.cpp:880 msgid "Host couldn't send file?" msgstr "" -#: src/multiint.cpp:875 +#: src/multiint.cpp:884 msgid "Incorrect Password!" msgstr "" -#: src/multiint.cpp:878 +#: src/multiint.cpp:887 msgid "Host has dropped connection!" msgstr "" -#: src/multiint.cpp:882 +#: src/multiint.cpp:891 msgid "Connection Error" msgstr "" -#: src/multiint.cpp:1012 +#: src/multiint.cpp:1021 msgid "Searching" msgstr "" -#: src/multiint.cpp:1069 +#: src/multiint.cpp:1078 msgid "GAMES" msgstr "" -#: src/multiint.cpp:1077 +#: src/multiint.cpp:1086 msgid "Refresh Games List" msgstr "" -#: src/multiint.cpp:1097 +#: src/multiint.cpp:1106 msgid "Enter Password:" msgstr "" -#: src/multiint.cpp:1115 +#: src/multiint.cpp:1124 msgid "OK" msgstr "" -#: src/multiint.cpp:1232 +#: src/multiint.cpp:1241 msgid "Tanks disabled!!" msgstr "" -#: src/multiint.cpp:1233 +#: src/multiint.cpp:1242 msgid "Cyborgs disabled." msgstr "" -#: src/multiint.cpp:1234 +#: src/multiint.cpp:1243 msgid "VTOLs disabled." msgstr "" -#: src/multiint.cpp:1281 -#: src/multiint.cpp:1288 +#: src/multiint.cpp:1290 +#: src/multiint.cpp:1297 msgid "Select Game Name" msgstr "" -#: src/multiint.cpp:1281 +#: src/multiint.cpp:1290 msgid "One-Player Skirmish" msgstr "" -#: src/multiint.cpp:1291 +#: src/multiint.cpp:1300 msgid "Select Map" msgstr "" -#: src/multiint.cpp:1299 +#: src/multiint.cpp:1308 msgid "Click to set Password" msgstr "" -#: src/multiint.cpp:1309 -#: src/multiint.cpp:1310 +#: src/multiint.cpp:1318 +#: src/multiint.cpp:1319 msgid "Scavengers" msgstr "" -#: src/multiint.cpp:1312 +#: src/multiint.cpp:1321 msgid "No Scavengers" msgstr "" -#: src/multiint.cpp:1342 +#: src/multiint.cpp:1351 msgid "Select Player Name" msgstr "" -#: src/multiint.cpp:1348 +#: src/multiint.cpp:1357 msgid "Distance Fog" msgstr "" -#: src/multiint.cpp:1359 +#: src/multiint.cpp:1368 #: src/multimenu.cpp:756 msgid "Alliances" msgstr "" -#: src/multiint.cpp:1362 +#: src/multiint.cpp:1371 msgid "No Alliances" msgstr "" -#: src/multiint.cpp:1364 +#: src/multiint.cpp:1373 msgid "Allow Alliances" msgstr "" -#: src/multiint.cpp:1368 +#: src/multiint.cpp:1377 msgid "Locked Teams" msgstr "" -#: src/multiint.cpp:1394 +#: src/multiint.cpp:1403 msgid "Low Power Levels" msgstr "" -#: src/multiint.cpp:1396 +#: src/multiint.cpp:1405 msgid "Medium Power Levels" msgstr "" -#: src/multiint.cpp:1398 +#: src/multiint.cpp:1407 msgid "High Power Levels" msgstr "" -#: src/multiint.cpp:1430 +#: src/multiint.cpp:1439 msgid "Base" msgstr "" -#: src/multiint.cpp:1432 +#: src/multiint.cpp:1441 msgid "Start with No Bases" msgstr "" -#: src/multiint.cpp:1434 +#: src/multiint.cpp:1443 msgid "Start with Bases" msgstr "" -#: src/multiint.cpp:1436 +#: src/multiint.cpp:1445 msgid "Start with Advanced Bases" msgstr "" -#: src/multiint.cpp:1468 +#: src/multiint.cpp:1477 msgid "Map Preview" msgstr "" -#: src/multiint.cpp:1470 +#: src/multiint.cpp:1479 msgid "Click to see Map" msgstr "" -#: src/multiint.cpp:1484 +#: src/multiint.cpp:1493 msgid "Start Hosting Game" msgstr "" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 msgid "Show Structure Limits" msgstr "" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 msgid "Set Structure Limits" msgstr "" -#: src/multiint.cpp:1587 +#: src/multiint.cpp:1596 msgid "DIFFICULTY" msgstr "" -#: src/multiint.cpp:1601 +#: src/multiint.cpp:1610 msgid "Less aggressive and starts with less units" msgstr "" -#: src/multiint.cpp:1602 +#: src/multiint.cpp:1611 #, fuzzy msgid "Plays nice" msgstr "Žaidėjas" -#: src/multiint.cpp:1603 +#: src/multiint.cpp:1612 msgid "No holds barred" msgstr "" -#: src/multiint.cpp:1604 +#: src/multiint.cpp:1613 msgid "Starts with advantages and gets twice as much oil from derricks" msgstr "" -#: src/multiint.cpp:1632 +#: src/multiint.cpp:1641 msgid "CHOOSE AI" msgstr "" -#: src/multiint.cpp:1648 +#: src/multiint.cpp:1657 msgid "Allow human players to join in this slot" msgstr "" -#: src/multiint.cpp:1656 +#: src/multiint.cpp:1665 msgid "Leave this slot unused" msgstr "" -#: src/multiint.cpp:1736 +#: src/multiint.cpp:1745 #, fuzzy msgid "Player colour" msgstr "Žaidėjas" -#: src/multiint.cpp:2062 +#: src/multiint.cpp:2071 msgid "Team" msgstr "" -#: src/multiint.cpp:2074 +#: src/multiint.cpp:2083 #, fuzzy msgid "Kick player" msgstr "Žaidėjas" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 #, fuzzy msgid "Click to change difficulty" msgstr "Žaidėjas" -#: src/multiint.cpp:2121 +#: src/multiint.cpp:2130 msgid "Click when ready" msgstr "" -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2134 msgid "READY?" msgstr "" -#: src/multiint.cpp:2169 +#: src/multiint.cpp:2178 msgid "PLAYERS" msgstr "" -#: src/multiint.cpp:2204 +#: src/multiint.cpp:2213 msgid "Click to change to this slot" msgstr "" -#: src/multiint.cpp:2232 +#: src/multiint.cpp:2241 msgid "Choose Team" msgstr "" -#: src/multiint.cpp:2262 +#: src/multiint.cpp:2271 msgid "Click to change player colour" msgstr "" -#: src/multiint.cpp:2290 +#: src/multiint.cpp:2299 #, fuzzy msgid "Click to change player position" msgstr "Žaidėjas" -#: src/multiint.cpp:2296 +#: src/multiint.cpp:2305 #, fuzzy msgid "Click to change AI" msgstr "Žaidėjas" -#: src/multiint.cpp:2300 +#: src/multiint.cpp:2309 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2362 +#: src/multiint.cpp:2371 msgid "CHAT" msgstr "" -#: src/multiint.cpp:2394 +#: src/multiint.cpp:2403 msgid "All players need to have the same mods to join your game." msgstr "" -#: src/multiint.cpp:2552 +#: src/multiint.cpp:2561 #, c-format msgid "*** password [%s] is now required! ***" msgstr "" -#: src/multiint.cpp:2560 +#: src/multiint.cpp:2569 msgid "*** password is NOT required! ***" msgstr "" -#: src/multiint.cpp:2801 +#: src/multiint.cpp:2810 msgid "Sorry! Failed to host the game." msgstr "" -#: src/multiint.cpp:2922 +#: src/multiint.cpp:2931 msgid "'Locked Teams' mode enabled" msgstr "" -#: src/multiint.cpp:3003 +#: src/multiint.cpp:3012 #, c-format msgid "The host has kicked %s from the game!" msgstr "" -#: src/multiint.cpp:3073 +#: src/multiint.cpp:3082 msgid "Host is Starting Game" msgstr "" -#: src/multiint.cpp:3639 +#: src/multiint.cpp:3648 msgid "Players" msgstr "" -#: src/multiint.cpp:3772 +#: src/multiint.cpp:3786 #, c-format msgid "Sending Map: %d%% " msgstr "" -#: src/multiint.cpp:3780 +#: src/multiint.cpp:3794 #, c-format msgid "Map: %d%% downloaded" msgstr "" -#: src/multiint.cpp:3803 +#: src/multiint.cpp:3820 msgid "HOST" msgstr "" +#: src/multiint.cpp:3827 +#: src/multimenu.cpp:772 +msgid "Ping" +msgstr "" + #: src/multijoin.cpp:100 #: src/multijoin.cpp:101 msgid "Players Still Joining" @@ -14417,17 +14422,17 @@ msgstr "" msgid "File transfer has been aborted for %d." msgstr "" -#: src/multijoin.cpp:376 +#: src/multijoin.cpp:373 #, c-format msgid "%s (%u) has an incompatible mod, and has been kicked." msgstr "" -#: src/multijoin.cpp:415 +#: src/multijoin.cpp:412 #, c-format msgid "%s is Joining the Game" msgstr "" -#: src/multijoin.cpp:425 +#: src/multijoin.cpp:422 #, fuzzy msgid "System message:" msgstr "Vietinė sistema" @@ -14542,10 +14547,6 @@ msgstr "" msgid "Units" msgstr "Karinis vienetas" -#: src/multimenu.cpp:772 -msgid "Ping" -msgstr "" - #: src/multimenu.cpp:776 #, fuzzy msgid "Structs" @@ -14580,83 +14581,83 @@ msgstr "" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "" -#: src/multiplay.cpp:1146 +#: src/multiplay.cpp:1057 msgid "(allies" msgstr "" -#: src/multiplay.cpp:1154 +#: src/multiplay.cpp:1065 msgid "(private to " msgstr "" -#: src/multiplay.cpp:1167 +#: src/multiplay.cpp:1078 msgid "[invalid]" msgstr "" -#: src/multiplay.cpp:2057 +#: src/multiplay.cpp:1942 msgid "Green" msgstr "Žalia" -#: src/multiplay.cpp:2058 +#: src/multiplay.cpp:1943 msgid "Orange" msgstr "Oranžinė" -#: src/multiplay.cpp:2059 +#: src/multiplay.cpp:1944 msgid "Grey" msgstr "Pilka" -#: src/multiplay.cpp:2060 +#: src/multiplay.cpp:1945 msgid "Black" msgstr "Juoda" -#: src/multiplay.cpp:2061 +#: src/multiplay.cpp:1946 msgid "Red" msgstr "Raudona" -#: src/multiplay.cpp:2062 +#: src/multiplay.cpp:1947 msgid "Blue" msgstr "Mėlyna" -#: src/multiplay.cpp:2063 +#: src/multiplay.cpp:1948 msgid "Pink" msgstr "Rožinė" -#: src/multiplay.cpp:2064 +#: src/multiplay.cpp:1949 msgid "Cyan" msgstr "Žydra" -#: src/multiplay.cpp:2065 +#: src/multiplay.cpp:1950 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:2066 +#: src/multiplay.cpp:1951 msgid "Purple" msgstr "" -#: src/multiplay.cpp:2067 +#: src/multiplay.cpp:1952 msgid "White" msgstr "" -#: src/multiplay.cpp:2068 +#: src/multiplay.cpp:1953 msgid "Bright blue" msgstr "" -#: src/multiplay.cpp:2069 +#: src/multiplay.cpp:1954 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:2070 +#: src/multiplay.cpp:1955 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:2071 +#: src/multiplay.cpp:1956 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:2072 +#: src/multiplay.cpp:1957 msgid "Brown" msgstr "" -#: src/order.cpp:841 +#: src/order.cpp:800 msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "" @@ -14791,20 +14792,20 @@ msgstr "" msgid "You cheated!" msgstr "" -#: src/scriptfuncs.cpp:3250 +#: src/scriptfuncs.cpp:3287 msgid "YOU ARE VICTORIOUS!" msgstr "" -#: src/scriptfuncs.cpp:3254 +#: src/scriptfuncs.cpp:3291 msgid "YOU WERE DEFEATED!" msgstr "" -#: src/scriptfuncs.cpp:9500 +#: src/scriptfuncs.cpp:9537 #, c-format msgid "Beacon received from %s!" msgstr "" -#: src/scriptfuncs.cpp:9546 +#: src/scriptfuncs.cpp:9583 #, c-format msgid "Beacon %d" msgstr "" @@ -14833,62 +14834,62 @@ msgstr "" msgid "Unable to locate any Commanders!" msgstr "" -#: src/structure.cpp:2615 +#: src/structure.cpp:2614 msgid "Command Control Limit Reached - Production Halted" msgstr "" -#: src/structure.cpp:5815 -#: src/structure.cpp:5840 +#: src/structure.cpp:5806 +#: src/structure.cpp:5831 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" msgstr[0] "" msgstr[1] "" -#: src/structure.cpp:5845 -#: src/structure.cpp:5913 -#: src/structure.cpp:5929 -#: src/structure.cpp:5943 +#: src/structure.cpp:5836 +#: src/structure.cpp:5904 +#: src/structure.cpp:5920 +#: src/structure.cpp:5934 #, c-format msgid "%s - Damage %3.0f%%" msgstr "" -#: src/structure.cpp:5895 +#: src/structure.cpp:5886 #, c-format msgid "%s - Connected %u of %u" msgstr "" -#: src/structure.cpp:6059 -#: src/structure.cpp:6104 +#: src/structure.cpp:6050 +#: src/structure.cpp:6095 #, c-format msgid "%s - Electronically Damaged" msgstr "" -#: src/structure.cpp:6341 +#: src/structure.cpp:6332 msgid "Electronic Reward - Visibility Report" msgstr "" -#: src/structure.cpp:6381 +#: src/structure.cpp:6372 msgid "Factory Reward - Propulsion" msgstr "" -#: src/structure.cpp:6405 +#: src/structure.cpp:6396 msgid "Factory Reward - Body" msgstr "" -#: src/structure.cpp:6429 +#: src/structure.cpp:6420 msgid "Factory Reward - Weapon" msgstr "" -#: src/structure.cpp:6438 +#: src/structure.cpp:6429 msgid "Factory Reward - Nothing" msgstr "" -#: src/structure.cpp:6466 +#: src/structure.cpp:6457 msgid "Repair Facility Award - Repair" msgstr "" -#: src/structure.cpp:6473 +#: src/structure.cpp:6464 msgid "Repair Facility Award - Nothing" msgstr "" diff --git a/po/nb.po b/po/nb.po index bd2fc76ba..2f93474d8 100644 --- a/po/nb.po +++ b/po/nb.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-01-18 00:54+0100\n" +"POT-Creation-Date: 2011-02-25 23:35+0100\n" "PO-Revision-Date: 2008-05-09 16:54+0000\n" "Last-Translator: Olav Andreas Lindekleiv \n" "Language-Team: none\n" @@ -5746,7 +5746,7 @@ msgid "New Design" msgstr "" #: data/base/messages/strings/names.txt:15 -#: src/design.cpp:1313 +#: src/design.cpp:1275 msgid "Transport" msgstr "" @@ -12041,26 +12041,26 @@ msgid "System locale" msgstr "Systemspråk" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1043 +#: lib/netplay/netplay.cpp:1042 msgid "Enter password here" msgstr "" -#: lib/netplay/netplay.cpp:2048 +#: lib/netplay/netplay.cpp:2060 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "" -#: lib/netplay/netplay.cpp:2062 +#: lib/netplay/netplay.cpp:2082 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "" #: src/challenge.cpp:184 -#: src/hci.cpp:922 -#: src/hci.cpp:3390 -#: src/hci.cpp:3513 -#: src/hci.cpp:3924 -#: src/hci.cpp:4942 +#: src/hci.cpp:916 +#: src/hci.cpp:3378 +#: src/hci.cpp:3501 +#: src/hci.cpp:3912 +#: src/hci.cpp:4930 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12215,149 +12215,149 @@ msgstr "" #: src/configuration.cpp:393 #: src/configuration.cpp:394 -#: src/multistat.cpp:130 +#: src/multistat.cpp:124 msgid "Player" msgstr "Spiller" -#: src/design.cpp:449 -#: src/design.cpp:469 -#: src/design.cpp:3501 +#: src/design.cpp:443 +#: src/design.cpp:455 +#: src/design.cpp:3464 msgid "New Vehicle" msgstr "" -#: src/design.cpp:515 +#: src/design.cpp:500 msgid "Vehicle Body" msgstr "" -#: src/design.cpp:535 +#: src/design.cpp:520 msgid "Vehicle Propulsion" msgstr "" -#: src/design.cpp:556 -#: src/design.cpp:579 -#: src/design.cpp:603 +#: src/design.cpp:541 +#: src/design.cpp:564 +#: src/design.cpp:588 msgid "Vehicle Turret" msgstr "" -#: src/design.cpp:622 +#: src/design.cpp:607 msgid "Delete Design" msgstr "" -#: src/design.cpp:673 -#: src/design.cpp:720 +#: src/design.cpp:658 +#: src/design.cpp:705 msgid "Kinetic Armour" msgstr "" -#: src/design.cpp:682 -#: src/design.cpp:730 +#: src/design.cpp:667 +#: src/design.cpp:715 msgid "Thermal Armour" msgstr "" -#: src/design.cpp:698 -#: src/design.cpp:750 +#: src/design.cpp:683 +#: src/design.cpp:735 msgid "Engine Output" msgstr "" -#: src/design.cpp:706 -#: src/design.cpp:759 -#: src/design.cpp:1529 -#: src/design.cpp:1553 -#: src/design.cpp:1574 -#: src/design.cpp:1590 -#: src/design.cpp:1610 -#: src/design.cpp:1627 -#: src/design.cpp:1647 -#: src/design.cpp:1664 -#: src/design.cpp:1705 -#: src/design.cpp:1737 -#: src/design.cpp:1869 -#: src/design.cpp:1885 -#: src/design.cpp:1923 -#: src/design.cpp:1956 +#: src/design.cpp:691 +#: src/design.cpp:744 +#: src/design.cpp:1486 +#: src/design.cpp:1510 +#: src/design.cpp:1531 +#: src/design.cpp:1547 +#: src/design.cpp:1567 +#: src/design.cpp:1584 +#: src/design.cpp:1604 +#: src/design.cpp:1621 +#: src/design.cpp:1662 +#: src/design.cpp:1694 +#: src/design.cpp:1826 +#: src/design.cpp:1842 +#: src/design.cpp:1880 +#: src/design.cpp:1913 msgid "Weight" msgstr "Vekt" -#: src/design.cpp:790 -#: src/design.cpp:808 +#: src/design.cpp:775 +#: src/design.cpp:793 msgid "Total Power Required" msgstr "" -#: src/design.cpp:821 -#: src/design.cpp:840 +#: src/design.cpp:806 +#: src/design.cpp:825 msgid "Total Body Points" msgstr "" -#: src/design.cpp:1027 -#: src/design.cpp:1059 +#: src/design.cpp:996 +#: src/design.cpp:1025 msgid "Power Usage" msgstr "" -#: src/design.cpp:1335 +#: src/design.cpp:1298 msgid "Hydra " msgstr "" -#: src/design.cpp:1509 -#: src/design.cpp:1537 +#: src/design.cpp:1466 +#: src/design.cpp:1494 msgid "Sensor Range" msgstr "Sensorradius" -#: src/design.cpp:1521 -#: src/design.cpp:1545 +#: src/design.cpp:1478 +#: src/design.cpp:1502 msgid "Sensor Power" msgstr "Sensorkraft" -#: src/design.cpp:1566 -#: src/design.cpp:1582 +#: src/design.cpp:1523 +#: src/design.cpp:1539 msgid "ECM Power" msgstr "" -#: src/design.cpp:1602 -#: src/design.cpp:1619 -#: src/design.cpp:1639 -#: src/design.cpp:1656 +#: src/design.cpp:1559 +#: src/design.cpp:1576 +#: src/design.cpp:1596 +#: src/design.cpp:1613 msgid "Build Points" msgstr "" -#: src/design.cpp:1677 -#: src/design.cpp:1713 +#: src/design.cpp:1634 +#: src/design.cpp:1670 msgid "Range" msgstr "Rekkevidde" -#: src/design.cpp:1689 -#: src/design.cpp:1721 +#: src/design.cpp:1646 +#: src/design.cpp:1678 msgid "Damage" msgstr "" -#: src/design.cpp:1697 -#: src/design.cpp:1729 +#: src/design.cpp:1654 +#: src/design.cpp:1686 msgid "Rate-of-Fire" msgstr "" -#: src/design.cpp:1857 -#: src/design.cpp:1877 +#: src/design.cpp:1814 +#: src/design.cpp:1834 msgid "Air Speed" msgstr "" -#: src/design.cpp:1895 -#: src/design.cpp:1932 +#: src/design.cpp:1852 +#: src/design.cpp:1889 msgid "Road Speed" msgstr "" -#: src/design.cpp:1905 -#: src/design.cpp:1940 +#: src/design.cpp:1862 +#: src/design.cpp:1897 msgid "Off-Road Speed" msgstr "" -#: src/design.cpp:1913 -#: src/design.cpp:1948 +#: src/design.cpp:1870 +#: src/design.cpp:1905 msgid "Water Speed" msgstr "" -#: src/design.cpp:2074 +#: src/design.cpp:2031 msgid "Weapons" msgstr "" -#: src/design.cpp:2094 +#: src/design.cpp:2051 msgid "Systems" msgstr "" @@ -12372,7 +12372,7 @@ msgid "Player dropped" msgstr "Spiller" #: src/display3d.cpp:599 -#: src/multiint.cpp:2116 +#: src/multiint.cpp:2125 msgid "Waiting for other players" msgstr "" @@ -12380,113 +12380,113 @@ msgstr "" msgid "Out of sync" msgstr "" -#: src/display.cpp:1651 +#: src/display.cpp:1649 msgid "Cannot Build. Oil Resource Burning." msgstr "Kan ikke bygge her. Oljeressurs brenner." -#: src/display.cpp:1830 -#: src/display.cpp:2423 +#: src/display.cpp:1828 +#: src/display.cpp:2421 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "" -#: src/display.cpp:1846 +#: src/display.cpp:1844 #, c-format msgid "%s - Allied - Damage %d%% - Experience %d, %s" msgstr "" -#: src/display.cpp:2044 +#: src/display.cpp:2042 msgid "Truck ordered to build Oil Derrick" msgstr "" -#: src/display.cpp:2045 +#: src/display.cpp:2043 msgid "2 trucks ordered to build Oil Derrick" msgstr "" -#: src/display.cpp:2046 +#: src/display.cpp:2044 #, c-format msgid "%d trucks ordered to build Oil Derrick" msgstr "" -#: src/droid.cpp:208 +#: src/droid.cpp:211 msgid "Unit Lost!" msgstr "Enhet Tapt!" -#: src/droid.cpp:1370 +#: src/droid.cpp:1376 msgid "Structure Restored" msgstr "" -#: src/droid.cpp:2712 +#: src/droid.cpp:2732 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:2725 +#: src/droid.cpp:2745 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:2738 +#: src/droid.cpp:2758 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:2742 +#: src/droid.cpp:2762 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:3080 +#: src/droid.cpp:3093 msgid "Rookie" msgstr "Nybegynner" -#: src/droid.cpp:3081 +#: src/droid.cpp:3094 msgctxt "rank" msgid "Green" msgstr "Grønn" -#: src/droid.cpp:3082 +#: src/droid.cpp:3095 msgid "Trained" msgstr "Trent" -#: src/droid.cpp:3083 +#: src/droid.cpp:3096 msgid "Regular" msgstr "Vanlig" -#: src/droid.cpp:3084 +#: src/droid.cpp:3097 msgid "Professional" msgstr "Profesjonell" -#: src/droid.cpp:3085 +#: src/droid.cpp:3098 msgid "Veteran" msgstr "Veteran" -#: src/droid.cpp:3086 +#: src/droid.cpp:3099 msgid "Elite" msgstr "Elite" -#: src/droid.cpp:3087 +#: src/droid.cpp:3100 msgid "Special" msgstr "Spesiell" -#: src/droid.cpp:3088 +#: src/droid.cpp:3101 msgid "Hero" msgstr "Helt" -#: src/droid.cpp:4110 +#: src/droid.cpp:4123 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "" -#: src/droid.cpp:4114 +#: src/droid.cpp:4127 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "" @@ -12507,7 +12507,7 @@ msgid "Tutorial" msgstr "Introduksjon" #: src/frontend.cpp:100 -#: src/hci.cpp:3499 +#: src/hci.cpp:3487 msgid "Options" msgstr "Alternativer" @@ -12559,7 +12559,7 @@ msgid "Challenges" msgstr "" #: src/frontend.cpp:215 -#: src/ingameop.cpp:275 +#: src/ingameop.cpp:272 msgid "Load Game" msgstr "Last Spill" @@ -12568,9 +12568,9 @@ msgid "SINGLE PLAYER" msgstr "SOLOSPILL" #: src/frontend.cpp:303 -#: src/ingameop.cpp:498 -#: src/mission.cpp:2527 -#: src/mission.cpp:2630 +#: src/ingameop.cpp:494 +#: src/mission.cpp:2493 +#: src/mission.cpp:2596 msgid "Load Saved Game" msgstr "Last inn spill" @@ -12587,7 +12587,7 @@ msgid "Join Game" msgstr "Bli med i spill" #: src/frontend.cpp:422 -#: src/multiint.cpp:1276 +#: src/multiint.cpp:1285 msgid "OPTIONS" msgstr "ALTERNATIVER" @@ -12605,7 +12605,7 @@ msgid "Video Options" msgstr "Lydalternativer" #: src/frontend.cpp:426 -#: src/ingameop.cpp:270 +#: src/ingameop.cpp:267 msgid "Audio Options" msgstr "Lydalternativer" @@ -12684,7 +12684,7 @@ msgid "Off" msgstr "Av" #: src/frontend.cpp:523 -#: src/multiint.cpp:1345 +#: src/multiint.cpp:1354 msgid "Fog" msgstr "Tåke" @@ -12695,7 +12695,7 @@ msgstr "" #: src/frontend.cpp:530 #: src/frontend.cpp:595 -#: src/multiint.cpp:1347 +#: src/multiint.cpp:1356 msgid "Fog Of War" msgstr "Krigståke" @@ -12862,210 +12862,210 @@ msgid "GAME OPTIONS" msgstr "SPILLALTERNATIVER" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2389 +#: src/multiint.cpp:2398 msgid "Mod: " msgstr "" -#: src/hci.cpp:1245 +#: src/hci.cpp:1237 #, fuzzy msgid "MAP SAVED!" msgstr "SPILL LAGRET!" -#: src/hci.cpp:1584 +#: src/hci.cpp:1573 #: src/loop.cpp:558 #: src/loop.cpp:574 #, fuzzy msgid "GAME SAVED: " msgstr "SPILL LAGRET!" -#: src/hci.cpp:1971 +#: src/hci.cpp:1960 msgid "Failed to create building" msgstr "" -#: src/hci.cpp:1988 +#: src/hci.cpp:1977 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new structure: %s." msgstr "" -#: src/hci.cpp:2003 +#: src/hci.cpp:1992 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new feature: %s." msgstr "" -#: src/hci.cpp:2025 +#: src/hci.cpp:2014 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid: %s." msgstr "" -#: src/hci.cpp:2036 +#: src/hci.cpp:2025 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "" -#: src/hci.cpp:3310 +#: src/hci.cpp:3298 msgid "Commanders (F6)" msgstr "" -#: src/hci.cpp:3323 +#: src/hci.cpp:3311 msgid "Intelligence Display (F5)" msgstr "" -#: src/hci.cpp:3336 +#: src/hci.cpp:3324 msgid "Manufacture (F1)" msgstr "Produksjon (F1)" -#: src/hci.cpp:3349 +#: src/hci.cpp:3337 #, fuzzy msgid "Design (F4)" msgstr "Design (F4)" -#: src/hci.cpp:3362 +#: src/hci.cpp:3350 #, fuzzy msgid "Research (F2)" msgstr "Forskning (F2)" -#: src/hci.cpp:3375 +#: src/hci.cpp:3363 #, fuzzy msgid "Build (F3)" msgstr "Bygg (F3)" -#: src/hci.cpp:3446 -#: src/multiint.cpp:1392 +#: src/hci.cpp:3434 +#: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Energi" -#: src/hci.cpp:3537 +#: src/hci.cpp:3525 msgid "Map:" msgstr "" -#: src/hci.cpp:3550 +#: src/hci.cpp:3538 #, fuzzy msgid "Load" msgstr "Last Spill" -#: src/hci.cpp:3551 +#: src/hci.cpp:3539 #, fuzzy msgid "Load Map File" msgstr "Last Spill" -#: src/hci.cpp:3558 +#: src/hci.cpp:3546 #, fuzzy msgid "Save" msgstr "Lagre spill" -#: src/hci.cpp:3559 +#: src/hci.cpp:3547 #, fuzzy msgid "Save Map File" msgstr "Lagre spill" -#: src/hci.cpp:3567 +#: src/hci.cpp:3555 msgid "New" msgstr "" -#: src/hci.cpp:3568 +#: src/hci.cpp:3556 msgid "New Blank Map" msgstr "" -#: src/hci.cpp:3604 +#: src/hci.cpp:3592 msgid "Tile" msgstr "" -#: src/hci.cpp:3605 +#: src/hci.cpp:3593 #, fuzzy msgid "Place tiles on map" msgstr "Sett strukturbegrensninger" -#: src/hci.cpp:3614 +#: src/hci.cpp:3602 msgid "Unit" msgstr "Enhet" -#: src/hci.cpp:3615 +#: src/hci.cpp:3603 #, fuzzy msgid "Place Unit on map" msgstr "Sett strukturbegrensninger" -#: src/hci.cpp:3623 +#: src/hci.cpp:3611 msgid "Struct" msgstr "" -#: src/hci.cpp:3624 +#: src/hci.cpp:3612 #, fuzzy msgid "Place Structures on map" msgstr "Sett strukturbegrensninger" -#: src/hci.cpp:3632 +#: src/hci.cpp:3620 msgid "Feat" msgstr "" -#: src/hci.cpp:3633 +#: src/hci.cpp:3621 #, fuzzy msgid "Place Features on map" msgstr "Sett strukturbegrensninger" -#: src/hci.cpp:3643 +#: src/hci.cpp:3631 msgid "Pause" msgstr "" -#: src/hci.cpp:3644 +#: src/hci.cpp:3632 #, fuzzy msgid "Pause or unpause the game" msgstr "Verten har forlatt spillet!" -#: src/hci.cpp:3658 +#: src/hci.cpp:3646 msgid "Align height of all map objects" msgstr "" -#: src/hci.cpp:3668 +#: src/hci.cpp:3656 msgid "Edit" msgstr "" -#: src/hci.cpp:3669 +#: src/hci.cpp:3657 #, fuzzy msgid "Start Edit Mode" msgstr "Start uten baser" -#: src/hci.cpp:3683 +#: src/hci.cpp:3671 #: src/ingameop.cpp:112 -#: src/ingameop.cpp:258 -#: src/ingameop.cpp:263 +#: src/ingameop.cpp:256 +#: src/ingameop.cpp:260 #, fuzzy msgid "Quit" msgstr "Avslutt" -#: src/hci.cpp:3684 +#: src/hci.cpp:3672 msgid "Exit Game" msgstr "Avslutt Spill" -#: src/hci.cpp:3710 +#: src/hci.cpp:3698 #, fuzzy msgid "Current Player:" msgstr "Samspill" -#: src/hci.cpp:4001 +#: src/hci.cpp:3989 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "Framdriftslinje" -#: src/hci.cpp:4867 +#: src/hci.cpp:4855 msgid "Factory Delivery Point" msgstr "Leveringsmål for fabrikk" -#: src/hci.cpp:4885 +#: src/hci.cpp:4873 msgid "Loop Production" msgstr "" -#: src/hci.cpp:4965 +#: src/hci.cpp:4953 msgid "Tab Scroll left" msgstr "" -#: src/hci.cpp:4980 +#: src/hci.cpp:4968 msgid "Tab Scroll right" msgstr "" #: src/ingameop.cpp:111 -#: src/ingameop.cpp:193 -#: src/ingameop.cpp:267 +#: src/ingameop.cpp:195 +#: src/ingameop.cpp:264 #, fuzzy msgid "Resume Game" msgstr "Nullstill hastighet" @@ -13074,33 +13074,33 @@ msgstr "Nullstill hastighet" msgid "WARNING: You're the host. If you quit, the game ends for everyone!" msgstr "" -#: src/ingameop.cpp:185 -#: src/ingameop.cpp:527 +#: src/ingameop.cpp:186 +#: src/ingameop.cpp:523 msgid "Tactical UI (Target Origin Icon): Show" msgstr "" -#: src/ingameop.cpp:190 -#: src/ingameop.cpp:531 +#: src/ingameop.cpp:191 +#: src/ingameop.cpp:527 msgid "Tactical UI (Target Origin Icon): Hide" msgstr "" -#: src/ingameop.cpp:277 -#: src/ingameop.cpp:502 -#: src/mission.cpp:2514 -#: src/mission.cpp:2633 +#: src/ingameop.cpp:274 +#: src/ingameop.cpp:498 +#: src/mission.cpp:2480 +#: src/mission.cpp:2599 msgid "Save Game" msgstr "Lagre spill" -#: src/ingameop.cpp:343 +#: src/ingameop.cpp:339 #, fuzzy msgid "Host has quit the game!" msgstr "Verten har forlatt spillet!" -#: src/ingameop.cpp:349 +#: src/ingameop.cpp:345 msgid "The game can't continue without the host." msgstr "" -#: src/ingameop.cpp:355 +#: src/ingameop.cpp:351 msgid "--> QUIT <--" msgstr "" @@ -13478,54 +13478,54 @@ msgstr "" msgid "Screen shake when things die: On" msgstr "" -#: src/keybind.cpp:2603 -#: src/keybind.cpp:2646 +#: src/keybind.cpp:2604 +#: src/keybind.cpp:2647 #, fuzzy msgid "Sorry, but game speed cannot be changed in multiplayer." msgstr "Beklager, den juksekoden er slått av i flerspiller-modus." -#: src/keybind.cpp:2624 -#: src/keybind.cpp:2667 -#: src/keybind.cpp:2689 +#: src/keybind.cpp:2625 +#: src/keybind.cpp:2668 +#: src/keybind.cpp:2690 msgid "Game Speed Reset" msgstr "" -#: src/keybind.cpp:2628 +#: src/keybind.cpp:2629 #, c-format msgid "Game Speed Increased to %3.1f" msgstr "Spillfart øker til %3.1f" -#: src/keybind.cpp:2671 +#: src/keybind.cpp:2672 #, c-format msgid "Game Speed Reduced to %3.1f" msgstr "Spillfart reduseres til %3.1f" -#: src/keybind.cpp:2701 +#: src/keybind.cpp:2702 msgid "Radar showing friend-foe colors" msgstr "" -#: src/keybind.cpp:2705 +#: src/keybind.cpp:2706 msgid "Radar showing player colors" msgstr "Radar viser spillernes farger" -#: src/keybind.cpp:2726 +#: src/keybind.cpp:2727 msgid "Radar showing only objects" msgstr "Radar viser kun gjenstander" -#: src/keybind.cpp:2729 +#: src/keybind.cpp:2730 msgid "Radar blending terrain and height" msgstr "" -#: src/keybind.cpp:2732 +#: src/keybind.cpp:2733 msgid "Radar showing terrain" msgstr "Radar viser terreng" -#: src/keybind.cpp:2735 +#: src/keybind.cpp:2736 #, fuzzy msgid "Radar showing revealed terrain" msgstr "Radar viser terreng" -#: src/keybind.cpp:2738 +#: src/keybind.cpp:2739 msgid "Radar showing height" msgstr "Radar viser høyde" @@ -13534,9 +13534,9 @@ msgid "KEY MAPPING" msgstr "" #: src/keyedit.cpp:372 -#: src/multiint.cpp:662 -#: src/multiint.cpp:1072 -#: src/multiint.cpp:1478 +#: src/multiint.cpp:671 +#: src/multiint.cpp:1081 +#: src/multiint.cpp:1487 msgid "Return To Previous Screen" msgstr "" @@ -14033,37 +14033,37 @@ msgstr "" msgid "Could not save game!" msgstr "Last Spill" -#: src/mission.cpp:2075 +#: src/mission.cpp:2041 msgid "Load Transport" msgstr "" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED" msgstr "" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED--and you cheated!" msgstr "" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED" msgstr "" -#: src/mission.cpp:2493 -#: src/mission.cpp:2533 -#: src/mission.cpp:2647 +#: src/mission.cpp:2459 +#: src/mission.cpp:2499 +#: src/mission.cpp:2613 msgid "Quit To Main Menu" msgstr "Tilbake til hovedmeny" -#: src/mission.cpp:2501 +#: src/mission.cpp:2467 msgid "Continue Game" msgstr "Fortsett spill" -#: src/mission.cpp:2598 +#: src/mission.cpp:2564 #, fuzzy msgid "GAME SAVED :" msgstr "SPILL LAGRET!" @@ -14123,354 +14123,359 @@ msgstr "%s går inn i alianse med %s" msgid "You Discover Blueprints For %s" msgstr "" -#: src/multiint.cpp:600 +#: src/multiint.cpp:609 #: src/multilimit.cpp:190 msgid "Accept Settings" msgstr "Aksepter instillinger" -#: src/multiint.cpp:602 -#: src/multiint.cpp:1117 +#: src/multiint.cpp:611 +#: src/multiint.cpp:1126 #, fuzzy msgid "Cancel" msgstr "Cyanblå" -#: src/multiint.cpp:613 +#: src/multiint.cpp:622 msgid "IP Address or Machine Name" msgstr "IP-adresse eller maskinnavn" -#: src/multiint.cpp:659 +#: src/multiint.cpp:668 msgid "CONNECTION" msgstr "TILKOBLING" -#: src/multiint.cpp:664 +#: src/multiint.cpp:673 msgid "Lobby" msgstr "Entré" -#: src/multiint.cpp:665 +#: src/multiint.cpp:674 msgid "IP" msgstr "IP" -#: src/multiint.cpp:854 +#: src/multiint.cpp:863 #, fuzzy msgid "No games are available" msgstr "Alle gjenstander er nå tilgjengelige" -#: src/multiint.cpp:857 +#: src/multiint.cpp:866 msgid "Game is full" msgstr "" -#: src/multiint.cpp:861 +#: src/multiint.cpp:870 msgid "You were kicked!" msgstr "" -#: src/multiint.cpp:864 +#: src/multiint.cpp:873 msgid "Wrong Game Version!" msgstr "" -#: src/multiint.cpp:867 +#: src/multiint.cpp:876 msgid "You have an incompatible mod." msgstr "" -#: src/multiint.cpp:871 +#: src/multiint.cpp:880 msgid "Host couldn't send file?" msgstr "" -#: src/multiint.cpp:875 +#: src/multiint.cpp:884 msgid "Incorrect Password!" msgstr "" -#: src/multiint.cpp:878 +#: src/multiint.cpp:887 msgid "Host has dropped connection!" msgstr "" -#: src/multiint.cpp:882 +#: src/multiint.cpp:891 msgid "Connection Error" msgstr "" -#: src/multiint.cpp:1012 +#: src/multiint.cpp:1021 msgid "Searching" msgstr "Søker" -#: src/multiint.cpp:1069 +#: src/multiint.cpp:1078 msgid "GAMES" msgstr "SPILL" -#: src/multiint.cpp:1077 +#: src/multiint.cpp:1086 msgid "Refresh Games List" msgstr "Oppdater Spilliste" -#: src/multiint.cpp:1097 +#: src/multiint.cpp:1106 #, fuzzy msgid "Enter Password:" msgstr "Trykk for å se kartet" -#: src/multiint.cpp:1115 +#: src/multiint.cpp:1124 msgid "OK" msgstr "" -#: src/multiint.cpp:1232 +#: src/multiint.cpp:1241 msgid "Tanks disabled!!" msgstr "" -#: src/multiint.cpp:1233 +#: src/multiint.cpp:1242 msgid "Cyborgs disabled." msgstr "" -#: src/multiint.cpp:1234 +#: src/multiint.cpp:1243 msgid "VTOLs disabled." msgstr "" -#: src/multiint.cpp:1281 -#: src/multiint.cpp:1288 +#: src/multiint.cpp:1290 +#: src/multiint.cpp:1297 msgid "Select Game Name" msgstr "Velg spillnavn" -#: src/multiint.cpp:1281 +#: src/multiint.cpp:1290 msgid "One-Player Skirmish" msgstr "" -#: src/multiint.cpp:1291 +#: src/multiint.cpp:1300 msgid "Select Map" msgstr "Velg kart" -#: src/multiint.cpp:1299 +#: src/multiint.cpp:1308 #, fuzzy msgid "Click to set Password" msgstr "Trykk for å se kartet" -#: src/multiint.cpp:1309 -#: src/multiint.cpp:1310 +#: src/multiint.cpp:1318 +#: src/multiint.cpp:1319 msgid "Scavengers" msgstr "" -#: src/multiint.cpp:1312 +#: src/multiint.cpp:1321 msgid "No Scavengers" msgstr "" -#: src/multiint.cpp:1342 +#: src/multiint.cpp:1351 msgid "Select Player Name" msgstr "Velg spillernavn" -#: src/multiint.cpp:1348 +#: src/multiint.cpp:1357 msgid "Distance Fog" msgstr "" -#: src/multiint.cpp:1359 +#: src/multiint.cpp:1368 #: src/multimenu.cpp:756 msgid "Alliances" msgstr "Allianser" -#: src/multiint.cpp:1362 +#: src/multiint.cpp:1371 msgid "No Alliances" msgstr "Ingen allianser" -#: src/multiint.cpp:1364 +#: src/multiint.cpp:1373 msgid "Allow Alliances" msgstr "Aktiver allianser" -#: src/multiint.cpp:1368 +#: src/multiint.cpp:1377 msgid "Locked Teams" msgstr "Låste lag" -#: src/multiint.cpp:1394 +#: src/multiint.cpp:1403 msgid "Low Power Levels" msgstr "Lavt energinivå" -#: src/multiint.cpp:1396 +#: src/multiint.cpp:1405 msgid "Medium Power Levels" msgstr "Middels energinivå" -#: src/multiint.cpp:1398 +#: src/multiint.cpp:1407 msgid "High Power Levels" msgstr "Høyt energinivå" -#: src/multiint.cpp:1430 +#: src/multiint.cpp:1439 msgid "Base" msgstr "Base" -#: src/multiint.cpp:1432 +#: src/multiint.cpp:1441 msgid "Start with No Bases" msgstr "Start uten baser" -#: src/multiint.cpp:1434 +#: src/multiint.cpp:1443 msgid "Start with Bases" msgstr "Start med baser" -#: src/multiint.cpp:1436 +#: src/multiint.cpp:1445 msgid "Start with Advanced Bases" msgstr "Start med avanserte baser" -#: src/multiint.cpp:1468 +#: src/multiint.cpp:1477 msgid "Map Preview" msgstr "Forhåndsvisning av kart" -#: src/multiint.cpp:1470 +#: src/multiint.cpp:1479 msgid "Click to see Map" msgstr "Trykk for å se kartet" -#: src/multiint.cpp:1484 +#: src/multiint.cpp:1493 msgid "Start Hosting Game" msgstr "" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 #, fuzzy msgid "Show Structure Limits" msgstr "Sett strukturbegrensninger" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 msgid "Set Structure Limits" msgstr "Sett strukturbegrensninger" -#: src/multiint.cpp:1587 +#: src/multiint.cpp:1596 msgid "DIFFICULTY" msgstr "" -#: src/multiint.cpp:1601 +#: src/multiint.cpp:1610 msgid "Less aggressive and starts with less units" msgstr "" -#: src/multiint.cpp:1602 +#: src/multiint.cpp:1611 #, fuzzy msgid "Plays nice" msgstr "Spiller" -#: src/multiint.cpp:1603 +#: src/multiint.cpp:1612 msgid "No holds barred" msgstr "" -#: src/multiint.cpp:1604 +#: src/multiint.cpp:1613 msgid "Starts with advantages and gets twice as much oil from derricks" msgstr "" -#: src/multiint.cpp:1632 +#: src/multiint.cpp:1641 msgid "CHOOSE AI" msgstr "" -#: src/multiint.cpp:1648 +#: src/multiint.cpp:1657 msgid "Allow human players to join in this slot" msgstr "" -#: src/multiint.cpp:1656 +#: src/multiint.cpp:1665 msgid "Leave this slot unused" msgstr "" -#: src/multiint.cpp:1736 +#: src/multiint.cpp:1745 #, fuzzy msgid "Player colour" msgstr "Spiller" -#: src/multiint.cpp:2062 +#: src/multiint.cpp:2071 msgid "Team" msgstr "" -#: src/multiint.cpp:2074 +#: src/multiint.cpp:2083 #, fuzzy msgid "Kick player" msgstr "Samspill" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 #, fuzzy msgid "Click to change difficulty" msgstr "Trykk for å se kartet" -#: src/multiint.cpp:2121 +#: src/multiint.cpp:2130 msgid "Click when ready" msgstr "" -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2134 msgid "READY?" msgstr "" -#: src/multiint.cpp:2169 +#: src/multiint.cpp:2178 msgid "PLAYERS" msgstr "SPILLERE" -#: src/multiint.cpp:2204 +#: src/multiint.cpp:2213 #, fuzzy msgid "Click to change to this slot" msgstr "Trykk for å se kartet" -#: src/multiint.cpp:2232 +#: src/multiint.cpp:2241 #, fuzzy msgid "Choose Team" msgstr "Låste lag" -#: src/multiint.cpp:2262 +#: src/multiint.cpp:2271 #, fuzzy msgid "Click to change player colour" msgstr "Radar viser spillernes farger" -#: src/multiint.cpp:2290 +#: src/multiint.cpp:2299 #, fuzzy msgid "Click to change player position" msgstr "Spiller" -#: src/multiint.cpp:2296 +#: src/multiint.cpp:2305 #, fuzzy msgid "Click to change AI" msgstr "Trykk for å se kartet" -#: src/multiint.cpp:2300 +#: src/multiint.cpp:2309 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2362 +#: src/multiint.cpp:2371 msgid "CHAT" msgstr "PRAT" -#: src/multiint.cpp:2394 +#: src/multiint.cpp:2403 msgid "All players need to have the same mods to join your game." msgstr "" -#: src/multiint.cpp:2552 +#: src/multiint.cpp:2561 #, c-format msgid "*** password [%s] is now required! ***" msgstr "" -#: src/multiint.cpp:2560 +#: src/multiint.cpp:2569 msgid "*** password is NOT required! ***" msgstr "" -#: src/multiint.cpp:2801 +#: src/multiint.cpp:2810 msgid "Sorry! Failed to host the game." msgstr "" -#: src/multiint.cpp:2922 +#: src/multiint.cpp:2931 #, fuzzy msgid "'Locked Teams' mode enabled" msgstr "Låste lag" -#: src/multiint.cpp:3003 +#: src/multiint.cpp:3012 #, c-format msgid "The host has kicked %s from the game!" msgstr "Verten har kastet ut %s fra spillet!" -#: src/multiint.cpp:3073 +#: src/multiint.cpp:3082 msgid "Host is Starting Game" msgstr "Vert starter spill" -#: src/multiint.cpp:3639 +#: src/multiint.cpp:3648 msgid "Players" msgstr "Spillere" -#: src/multiint.cpp:3772 +#: src/multiint.cpp:3786 #, c-format msgid "Sending Map: %d%% " msgstr "" -#: src/multiint.cpp:3780 +#: src/multiint.cpp:3794 #, c-format msgid "Map: %d%% downloaded" msgstr "" -#: src/multiint.cpp:3803 +#: src/multiint.cpp:3820 msgid "HOST" msgstr "" +#: src/multiint.cpp:3827 +#: src/multimenu.cpp:772 +msgid "Ping" +msgstr "" + #: src/multijoin.cpp:100 #: src/multijoin.cpp:101 msgid "Players Still Joining" @@ -14486,17 +14491,17 @@ msgstr "%s har forlatt spillet" msgid "File transfer has been aborted for %d." msgstr "" -#: src/multijoin.cpp:376 +#: src/multijoin.cpp:373 #, c-format msgid "%s (%u) has an incompatible mod, and has been kicked." msgstr "" -#: src/multijoin.cpp:415 +#: src/multijoin.cpp:412 #, c-format msgid "%s is Joining the Game" msgstr "%s hopper inn på spillet" -#: src/multijoin.cpp:425 +#: src/multijoin.cpp:422 #, fuzzy msgid "System message:" msgstr "Systemspråk" @@ -14611,10 +14616,6 @@ msgstr "" msgid "Units" msgstr "Enhet" -#: src/multimenu.cpp:772 -msgid "Ping" -msgstr "" - #: src/multimenu.cpp:776 msgid "Structs" msgstr "" @@ -14648,84 +14649,84 @@ msgstr "" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "" -#: src/multiplay.cpp:1146 +#: src/multiplay.cpp:1057 #, fuzzy msgid "(allies" msgstr "Allianser" -#: src/multiplay.cpp:1154 +#: src/multiplay.cpp:1065 msgid "(private to " msgstr "" -#: src/multiplay.cpp:1167 +#: src/multiplay.cpp:1078 msgid "[invalid]" msgstr "" -#: src/multiplay.cpp:2057 +#: src/multiplay.cpp:1942 msgid "Green" msgstr "Grønn" -#: src/multiplay.cpp:2058 +#: src/multiplay.cpp:1943 msgid "Orange" msgstr "Oransje" -#: src/multiplay.cpp:2059 +#: src/multiplay.cpp:1944 msgid "Grey" msgstr "Grå" -#: src/multiplay.cpp:2060 +#: src/multiplay.cpp:1945 msgid "Black" msgstr "Svart" -#: src/multiplay.cpp:2061 +#: src/multiplay.cpp:1946 msgid "Red" msgstr "Rød" -#: src/multiplay.cpp:2062 +#: src/multiplay.cpp:1947 msgid "Blue" msgstr "Blå" -#: src/multiplay.cpp:2063 +#: src/multiplay.cpp:1948 msgid "Pink" msgstr "Rosa" -#: src/multiplay.cpp:2064 +#: src/multiplay.cpp:1949 msgid "Cyan" msgstr "Cyanblå" -#: src/multiplay.cpp:2065 +#: src/multiplay.cpp:1950 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:2066 +#: src/multiplay.cpp:1951 msgid "Purple" msgstr "" -#: src/multiplay.cpp:2067 +#: src/multiplay.cpp:1952 msgid "White" msgstr "" -#: src/multiplay.cpp:2068 +#: src/multiplay.cpp:1953 msgid "Bright blue" msgstr "" -#: src/multiplay.cpp:2069 +#: src/multiplay.cpp:1954 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:2070 +#: src/multiplay.cpp:1955 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:2071 +#: src/multiplay.cpp:1956 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:2072 +#: src/multiplay.cpp:1957 msgid "Brown" msgstr "" -#: src/order.cpp:841 +#: src/order.cpp:800 msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "" @@ -14860,20 +14861,20 @@ msgstr "" msgid "You cheated!" msgstr "" -#: src/scriptfuncs.cpp:3250 +#: src/scriptfuncs.cpp:3287 msgid "YOU ARE VICTORIOUS!" msgstr "DU HAR VUNNET!" -#: src/scriptfuncs.cpp:3254 +#: src/scriptfuncs.cpp:3291 msgid "YOU WERE DEFEATED!" msgstr "DU HAR TAPT!" -#: src/scriptfuncs.cpp:9500 +#: src/scriptfuncs.cpp:9537 #, c-format msgid "Beacon received from %s!" msgstr "" -#: src/scriptfuncs.cpp:9546 +#: src/scriptfuncs.cpp:9583 #, c-format msgid "Beacon %d" msgstr "" @@ -14902,62 +14903,62 @@ msgstr "" msgid "Unable to locate any Commanders!" msgstr "" -#: src/structure.cpp:2615 +#: src/structure.cpp:2614 msgid "Command Control Limit Reached - Production Halted" msgstr "" -#: src/structure.cpp:5815 -#: src/structure.cpp:5840 +#: src/structure.cpp:5806 +#: src/structure.cpp:5831 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" msgstr[0] "" msgstr[1] "" -#: src/structure.cpp:5845 -#: src/structure.cpp:5913 -#: src/structure.cpp:5929 -#: src/structure.cpp:5943 +#: src/structure.cpp:5836 +#: src/structure.cpp:5904 +#: src/structure.cpp:5920 +#: src/structure.cpp:5934 #, fuzzy, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - Skade %3.0f%%" -#: src/structure.cpp:5895 +#: src/structure.cpp:5886 #, c-format msgid "%s - Connected %u of %u" msgstr "%s - Forbundet med %u av %u mulige" -#: src/structure.cpp:6059 -#: src/structure.cpp:6104 +#: src/structure.cpp:6050 +#: src/structure.cpp:6095 #, c-format msgid "%s - Electronically Damaged" msgstr "%s - Elektrisk skadet" -#: src/structure.cpp:6341 +#: src/structure.cpp:6332 msgid "Electronic Reward - Visibility Report" msgstr "" -#: src/structure.cpp:6381 +#: src/structure.cpp:6372 msgid "Factory Reward - Propulsion" msgstr "" -#: src/structure.cpp:6405 +#: src/structure.cpp:6396 msgid "Factory Reward - Body" msgstr "" -#: src/structure.cpp:6429 +#: src/structure.cpp:6420 msgid "Factory Reward - Weapon" msgstr "" -#: src/structure.cpp:6438 +#: src/structure.cpp:6429 msgid "Factory Reward - Nothing" msgstr "" -#: src/structure.cpp:6466 +#: src/structure.cpp:6457 msgid "Repair Facility Award - Repair" msgstr "" -#: src/structure.cpp:6473 +#: src/structure.cpp:6464 msgid "Repair Facility Award - Nothing" msgstr "" diff --git a/po/nl.po b/po/nl.po index c1a172715..114a0e38a 100644 --- a/po/nl.po +++ b/po/nl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-01-18 00:54+0100\n" +"POT-Creation-Date: 2011-02-25 23:35+0100\n" "PO-Revision-Date: 2009-10-31 12:10+0100\n" "Last-Translator: \n" "Language-Team: Dutch \n" @@ -5731,7 +5731,7 @@ msgid "New Design" msgstr "Nieuw ontwerp" #: data/base/messages/strings/names.txt:15 -#: src/design.cpp:1313 +#: src/design.cpp:1275 msgid "Transport" msgstr "Vervoer" @@ -12221,27 +12221,27 @@ msgid "System locale" msgstr "Systeemtaal" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1043 +#: lib/netplay/netplay.cpp:1042 #, fuzzy msgid "Enter password here" msgstr "Vul eerst het wachtwoord in" -#: lib/netplay/netplay.cpp:2048 +#: lib/netplay/netplay.cpp:2060 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "" -#: lib/netplay/netplay.cpp:2062 +#: lib/netplay/netplay.cpp:2082 #, fuzzy, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "Kan niet communiceren met de lobby server! is TCP port 9990 open?" #: src/challenge.cpp:184 -#: src/hci.cpp:922 -#: src/hci.cpp:3390 -#: src/hci.cpp:3513 -#: src/hci.cpp:3924 -#: src/hci.cpp:4942 +#: src/hci.cpp:916 +#: src/hci.cpp:3378 +#: src/hci.cpp:3501 +#: src/hci.cpp:3912 +#: src/hci.cpp:4930 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12394,149 +12394,149 @@ msgstr "Ga direct naar het gastheer scherm" #: src/configuration.cpp:393 #: src/configuration.cpp:394 -#: src/multistat.cpp:130 +#: src/multistat.cpp:124 msgid "Player" msgstr "Speler" -#: src/design.cpp:449 -#: src/design.cpp:469 -#: src/design.cpp:3501 +#: src/design.cpp:443 +#: src/design.cpp:455 +#: src/design.cpp:3464 msgid "New Vehicle" msgstr "Nieuw voertuig" -#: src/design.cpp:515 +#: src/design.cpp:500 msgid "Vehicle Body" msgstr "Carrosserie" -#: src/design.cpp:535 +#: src/design.cpp:520 msgid "Vehicle Propulsion" msgstr "Voertuigaandrijving" -#: src/design.cpp:556 -#: src/design.cpp:579 -#: src/design.cpp:603 +#: src/design.cpp:541 +#: src/design.cpp:564 +#: src/design.cpp:588 msgid "Vehicle Turret" msgstr "Geschutskoepel" -#: src/design.cpp:622 +#: src/design.cpp:607 msgid "Delete Design" msgstr "Verwijder ontwerp" -#: src/design.cpp:673 -#: src/design.cpp:720 +#: src/design.cpp:658 +#: src/design.cpp:705 msgid "Kinetic Armour" msgstr "Kinetisch pantser" -#: src/design.cpp:682 -#: src/design.cpp:730 +#: src/design.cpp:667 +#: src/design.cpp:715 msgid "Thermal Armour" msgstr "Hitteschild" -#: src/design.cpp:698 -#: src/design.cpp:750 +#: src/design.cpp:683 +#: src/design.cpp:735 msgid "Engine Output" msgstr "Motoruitvoer" -#: src/design.cpp:706 -#: src/design.cpp:759 -#: src/design.cpp:1529 -#: src/design.cpp:1553 -#: src/design.cpp:1574 -#: src/design.cpp:1590 -#: src/design.cpp:1610 -#: src/design.cpp:1627 -#: src/design.cpp:1647 -#: src/design.cpp:1664 -#: src/design.cpp:1705 -#: src/design.cpp:1737 -#: src/design.cpp:1869 -#: src/design.cpp:1885 -#: src/design.cpp:1923 -#: src/design.cpp:1956 +#: src/design.cpp:691 +#: src/design.cpp:744 +#: src/design.cpp:1486 +#: src/design.cpp:1510 +#: src/design.cpp:1531 +#: src/design.cpp:1547 +#: src/design.cpp:1567 +#: src/design.cpp:1584 +#: src/design.cpp:1604 +#: src/design.cpp:1621 +#: src/design.cpp:1662 +#: src/design.cpp:1694 +#: src/design.cpp:1826 +#: src/design.cpp:1842 +#: src/design.cpp:1880 +#: src/design.cpp:1913 msgid "Weight" msgstr "Gewicht" -#: src/design.cpp:790 -#: src/design.cpp:808 +#: src/design.cpp:775 +#: src/design.cpp:793 msgid "Total Power Required" msgstr "Totale energie nodig" -#: src/design.cpp:821 -#: src/design.cpp:840 +#: src/design.cpp:806 +#: src/design.cpp:825 msgid "Total Body Points" msgstr "Totale carrosseriepunten" -#: src/design.cpp:1027 -#: src/design.cpp:1059 +#: src/design.cpp:996 +#: src/design.cpp:1025 msgid "Power Usage" msgstr "Energieverbruik" -#: src/design.cpp:1335 +#: src/design.cpp:1298 msgid "Hydra " msgstr "" -#: src/design.cpp:1509 -#: src/design.cpp:1537 +#: src/design.cpp:1466 +#: src/design.cpp:1494 msgid "Sensor Range" msgstr "Sensorbereik" -#: src/design.cpp:1521 -#: src/design.cpp:1545 +#: src/design.cpp:1478 +#: src/design.cpp:1502 msgid "Sensor Power" msgstr "Sensorvermogen" -#: src/design.cpp:1566 -#: src/design.cpp:1582 +#: src/design.cpp:1523 +#: src/design.cpp:1539 msgid "ECM Power" msgstr "ECM-energie" -#: src/design.cpp:1602 -#: src/design.cpp:1619 -#: src/design.cpp:1639 -#: src/design.cpp:1656 +#: src/design.cpp:1559 +#: src/design.cpp:1576 +#: src/design.cpp:1596 +#: src/design.cpp:1613 msgid "Build Points" msgstr "Bouw-punten" -#: src/design.cpp:1677 -#: src/design.cpp:1713 +#: src/design.cpp:1634 +#: src/design.cpp:1670 msgid "Range" msgstr "Bereik" -#: src/design.cpp:1689 -#: src/design.cpp:1721 +#: src/design.cpp:1646 +#: src/design.cpp:1678 msgid "Damage" msgstr "Schade" -#: src/design.cpp:1697 -#: src/design.cpp:1729 +#: src/design.cpp:1654 +#: src/design.cpp:1686 msgid "Rate-of-Fire" msgstr "Vuursnelheid" -#: src/design.cpp:1857 -#: src/design.cpp:1877 +#: src/design.cpp:1814 +#: src/design.cpp:1834 msgid "Air Speed" msgstr "Luchtsnelheid" -#: src/design.cpp:1895 -#: src/design.cpp:1932 +#: src/design.cpp:1852 +#: src/design.cpp:1889 msgid "Road Speed" msgstr "Wegsnelheid" -#: src/design.cpp:1905 -#: src/design.cpp:1940 +#: src/design.cpp:1862 +#: src/design.cpp:1897 msgid "Off-Road Speed" msgstr "Snelheid buiten de weg" -#: src/design.cpp:1913 -#: src/design.cpp:1948 +#: src/design.cpp:1870 +#: src/design.cpp:1905 msgid "Water Speed" msgstr "Watersnelheid" -#: src/design.cpp:2074 +#: src/design.cpp:2031 msgid "Weapons" msgstr "Wapens" -#: src/design.cpp:2094 +#: src/design.cpp:2051 msgid "Systems" msgstr "Systemen" @@ -12549,7 +12549,7 @@ msgid "Player dropped" msgstr "Speler gevallen" #: src/display3d.cpp:599 -#: src/multiint.cpp:2116 +#: src/multiint.cpp:2125 msgid "Waiting for other players" msgstr "Op andere spelers wachten" @@ -12557,114 +12557,114 @@ msgstr "Op andere spelers wachten" msgid "Out of sync" msgstr "" -#: src/display.cpp:1651 +#: src/display.cpp:1649 msgid "Cannot Build. Oil Resource Burning." msgstr "Kan niet bouwen. De oliebron staat in brand." -#: src/display.cpp:1830 -#: src/display.cpp:2423 +#: src/display.cpp:1828 +#: src/display.cpp:2421 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - Schade %d%% - Ervaring %d, %s" -#: src/display.cpp:1846 +#: src/display.cpp:1844 #, fuzzy, c-format msgid "%s - Allied - Damage %d%% - Experience %d, %s" msgstr "%s - Schade %d%% - Ervaring %d, %s" -#: src/display.cpp:2044 +#: src/display.cpp:2042 msgid "Truck ordered to build Oil Derrick" msgstr "Vrachtwagen bevel gegeven om jaknikker te bouwen." -#: src/display.cpp:2045 +#: src/display.cpp:2043 #, fuzzy msgid "2 trucks ordered to build Oil Derrick" msgstr "Vrachtwagen bevel gegeven om jaknikker te bouwen." -#: src/display.cpp:2046 +#: src/display.cpp:2044 #, fuzzy, c-format msgid "%d trucks ordered to build Oil Derrick" msgstr "Vrachtwagen bevel gegeven om jaknikker te bouwen." -#: src/droid.cpp:208 +#: src/droid.cpp:211 msgid "Unit Lost!" msgstr "Eenheid verloren!" -#: src/droid.cpp:1370 +#: src/droid.cpp:1376 msgid "Structure Restored" msgstr "Gebouw hersteld" -#: src/droid.cpp:2712 +#: src/droid.cpp:2732 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" msgstr[0] "Groep %u geselecteerd - %u eenheid" msgstr[1] "Groep %u geselecteerd - %u eenheden" -#: src/droid.cpp:2725 +#: src/droid.cpp:2745 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" msgstr[0] "%u eenheid aan groep %u toegewezen" msgstr[1] "%u eenheden aan groep %u toegewezen" -#: src/droid.cpp:2738 +#: src/droid.cpp:2758 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" msgstr[0] "Gecentreerd op groep %u - %u eenheid" msgstr[1] "Gecentreerd op groep %u - %u eenheden" -#: src/droid.cpp:2742 +#: src/droid.cpp:2762 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:3080 +#: src/droid.cpp:3093 msgid "Rookie" msgstr "Rekruut" -#: src/droid.cpp:3081 +#: src/droid.cpp:3094 msgctxt "rank" msgid "Green" msgstr "Groen" -#: src/droid.cpp:3082 +#: src/droid.cpp:3095 msgid "Trained" msgstr "Geoefend" -#: src/droid.cpp:3083 +#: src/droid.cpp:3096 msgid "Regular" msgstr "Beroeps" -#: src/droid.cpp:3084 +#: src/droid.cpp:3097 msgid "Professional" msgstr "Professioneel" -#: src/droid.cpp:3085 +#: src/droid.cpp:3098 msgid "Veteran" msgstr "Veteraan" -#: src/droid.cpp:3086 +#: src/droid.cpp:3099 msgid "Elite" msgstr "Elite" -#: src/droid.cpp:3087 +#: src/droid.cpp:3100 msgid "Special" msgstr "Speciaal" -#: src/droid.cpp:3088 +#: src/droid.cpp:3101 msgid "Hero" msgstr "Held" -#: src/droid.cpp:4110 +#: src/droid.cpp:4123 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "" -#: src/droid.cpp:4114 +#: src/droid.cpp:4127 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "" @@ -12683,7 +12683,7 @@ msgid "Tutorial" msgstr "Oefenpotje" #: src/frontend.cpp:100 -#: src/hci.cpp:3499 +#: src/hci.cpp:3487 msgid "Options" msgstr "Instellingen" @@ -12734,7 +12734,7 @@ msgid "Challenges" msgstr "" #: src/frontend.cpp:215 -#: src/ingameop.cpp:275 +#: src/ingameop.cpp:272 msgid "Load Game" msgstr "Spel laden" @@ -12743,9 +12743,9 @@ msgid "SINGLE PLAYER" msgstr "EEN SPELER" #: src/frontend.cpp:303 -#: src/ingameop.cpp:498 -#: src/mission.cpp:2527 -#: src/mission.cpp:2630 +#: src/ingameop.cpp:494 +#: src/mission.cpp:2493 +#: src/mission.cpp:2596 msgid "Load Saved Game" msgstr "Opgeslagen spel laden" @@ -12762,7 +12762,7 @@ msgid "Join Game" msgstr "Deelnemen aan spel" #: src/frontend.cpp:422 -#: src/multiint.cpp:1276 +#: src/multiint.cpp:1285 msgid "OPTIONS" msgstr "OPTIES" @@ -12779,7 +12779,7 @@ msgid "Video Options" msgstr "Video-instellingen" #: src/frontend.cpp:426 -#: src/ingameop.cpp:270 +#: src/ingameop.cpp:267 msgid "Audio Options" msgstr "Geluidsinstellingen" @@ -12857,7 +12857,7 @@ msgid "Off" msgstr "Uit" #: src/frontend.cpp:523 -#: src/multiint.cpp:1345 +#: src/multiint.cpp:1354 msgid "Fog" msgstr "Mist" @@ -12868,7 +12868,7 @@ msgstr "Nevel" #: src/frontend.cpp:530 #: src/frontend.cpp:595 -#: src/multiint.cpp:1347 +#: src/multiint.cpp:1356 msgid "Fog Of War" msgstr "Oorlogsmist" @@ -13036,200 +13036,200 @@ msgid "GAME OPTIONS" msgstr "SPELINSTELLINGEN" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2389 +#: src/multiint.cpp:2398 msgid "Mod: " msgstr "" -#: src/hci.cpp:1245 +#: src/hci.cpp:1237 msgid "MAP SAVED!" msgstr "MAP OPGESLAGEN!" -#: src/hci.cpp:1584 +#: src/hci.cpp:1573 #: src/loop.cpp:558 #: src/loop.cpp:574 #, fuzzy msgid "GAME SAVED: " msgstr "SPEL OPGESLAGEN!" -#: src/hci.cpp:1971 +#: src/hci.cpp:1960 msgid "Failed to create building" msgstr "Gebouw neerzetten mislukt" -#: src/hci.cpp:1988 +#: src/hci.cpp:1977 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new structure: %s." msgstr "Speler %u heeft zichzelf met cheats (debugmenu) een nieuw gebouw gegeven: %s." -#: src/hci.cpp:2003 +#: src/hci.cpp:1992 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new feature: %s." msgstr "Speler %u heeft zichzelf met cheats (debugmenu) een nieuw voorwerp gegeven: %s." -#: src/hci.cpp:2025 +#: src/hci.cpp:2014 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid: %s." msgstr "Speler %u heeft zichzelf met cheats (debugmenu) een nieuw eenheid gegeven: %s." -#: src/hci.cpp:2036 +#: src/hci.cpp:2025 #, fuzzy, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "Speler %u heeft zichzelf met cheats (debugmenu) een nieuw eenheid gegeven: %s." -#: src/hci.cpp:3310 +#: src/hci.cpp:3298 msgid "Commanders (F6)" msgstr "Commandanten (F6)" -#: src/hci.cpp:3323 +#: src/hci.cpp:3311 msgid "Intelligence Display (F5)" msgstr "Inlichtingen (F5)" -#: src/hci.cpp:3336 +#: src/hci.cpp:3324 msgid "Manufacture (F1)" msgstr "Produceer (F1)" -#: src/hci.cpp:3349 +#: src/hci.cpp:3337 msgid "Design (F4)" msgstr "Ontwerp (F4)" -#: src/hci.cpp:3362 +#: src/hci.cpp:3350 msgid "Research (F2)" msgstr "Onderzoek (F2)" -#: src/hci.cpp:3375 +#: src/hci.cpp:3363 msgid "Build (F3)" msgstr "Bouw (F3)" -#: src/hci.cpp:3446 -#: src/multiint.cpp:1392 +#: src/hci.cpp:3434 +#: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Energie" -#: src/hci.cpp:3537 +#: src/hci.cpp:3525 msgid "Map:" msgstr "" -#: src/hci.cpp:3550 +#: src/hci.cpp:3538 #, fuzzy msgid "Load" msgstr "Spel laden" -#: src/hci.cpp:3551 +#: src/hci.cpp:3539 #, fuzzy msgid "Load Map File" msgstr "Spel laden" -#: src/hci.cpp:3558 +#: src/hci.cpp:3546 #, fuzzy msgid "Save" msgstr "Spel opslaan" -#: src/hci.cpp:3559 +#: src/hci.cpp:3547 #, fuzzy msgid "Save Map File" msgstr "Spel opslaan" -#: src/hci.cpp:3567 +#: src/hci.cpp:3555 msgid "New" msgstr "" -#: src/hci.cpp:3568 +#: src/hci.cpp:3556 msgid "New Blank Map" msgstr "" -#: src/hci.cpp:3604 +#: src/hci.cpp:3592 msgid "Tile" msgstr "Tegel" -#: src/hci.cpp:3605 +#: src/hci.cpp:3593 msgid "Place tiles on map" msgstr "Tegels op kaart plaatsen" -#: src/hci.cpp:3614 +#: src/hci.cpp:3602 msgid "Unit" msgstr "Eenheid" -#: src/hci.cpp:3615 +#: src/hci.cpp:3603 msgid "Place Unit on map" msgstr "Eenheid op kaart plaatsen" -#: src/hci.cpp:3623 +#: src/hci.cpp:3611 msgid "Struct" msgstr "Gebouw" -#: src/hci.cpp:3624 +#: src/hci.cpp:3612 msgid "Place Structures on map" msgstr "Gebouwen op kaart plaatsen" -#: src/hci.cpp:3632 +#: src/hci.cpp:3620 msgid "Feat" msgstr "Kenm." -#: src/hci.cpp:3633 +#: src/hci.cpp:3621 msgid "Place Features on map" msgstr "Kenmerken op kaart plaatsen" -#: src/hci.cpp:3643 +#: src/hci.cpp:3631 msgid "Pause" msgstr "" -#: src/hci.cpp:3644 +#: src/hci.cpp:3632 msgid "Pause or unpause the game" msgstr "Spel pauzeren of verdergaan" -#: src/hci.cpp:3658 +#: src/hci.cpp:3646 msgid "Align height of all map objects" msgstr "Hoogte van alle kaartobjecten uitlijnen" -#: src/hci.cpp:3668 +#: src/hci.cpp:3656 msgid "Edit" msgstr "" -#: src/hci.cpp:3669 +#: src/hci.cpp:3657 #, fuzzy msgid "Start Edit Mode" msgstr "Start zonder basis" -#: src/hci.cpp:3683 +#: src/hci.cpp:3671 #: src/ingameop.cpp:112 -#: src/ingameop.cpp:258 -#: src/ingameop.cpp:263 +#: src/ingameop.cpp:256 +#: src/ingameop.cpp:260 msgid "Quit" msgstr "Afsluiten" -#: src/hci.cpp:3684 +#: src/hci.cpp:3672 msgid "Exit Game" msgstr "Spel verlaten" -#: src/hci.cpp:3710 +#: src/hci.cpp:3698 #, fuzzy msgid "Current Player:" msgstr "Meerdere spelers" -#: src/hci.cpp:4001 +#: src/hci.cpp:3989 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "Voortgangsbalk" -#: src/hci.cpp:4867 +#: src/hci.cpp:4855 msgid "Factory Delivery Point" msgstr "Fabrieksafleverpunt" -#: src/hci.cpp:4885 +#: src/hci.cpp:4873 msgid "Loop Production" msgstr "Productie herhalen" -#: src/hci.cpp:4965 +#: src/hci.cpp:4953 msgid "Tab Scroll left" msgstr "" -#: src/hci.cpp:4980 +#: src/hci.cpp:4968 msgid "Tab Scroll right" msgstr "" #: src/ingameop.cpp:111 -#: src/ingameop.cpp:193 -#: src/ingameop.cpp:267 +#: src/ingameop.cpp:195 +#: src/ingameop.cpp:264 msgid "Resume Game" msgstr "Spel hervatten" @@ -13237,33 +13237,33 @@ msgstr "Spel hervatten" msgid "WARNING: You're the host. If you quit, the game ends for everyone!" msgstr "" -#: src/ingameop.cpp:185 -#: src/ingameop.cpp:527 +#: src/ingameop.cpp:186 +#: src/ingameop.cpp:523 msgid "Tactical UI (Target Origin Icon): Show" msgstr "" -#: src/ingameop.cpp:190 -#: src/ingameop.cpp:531 +#: src/ingameop.cpp:191 +#: src/ingameop.cpp:527 msgid "Tactical UI (Target Origin Icon): Hide" msgstr "" -#: src/ingameop.cpp:277 -#: src/ingameop.cpp:502 -#: src/mission.cpp:2514 -#: src/mission.cpp:2633 +#: src/ingameop.cpp:274 +#: src/ingameop.cpp:498 +#: src/mission.cpp:2480 +#: src/mission.cpp:2599 msgid "Save Game" msgstr "Spel opslaan" -#: src/ingameop.cpp:343 +#: src/ingameop.cpp:339 #, fuzzy msgid "Host has quit the game!" msgstr "De gastheer heeft het spel verlaten!" -#: src/ingameop.cpp:349 +#: src/ingameop.cpp:345 msgid "The game can't continue without the host." msgstr "" -#: src/ingameop.cpp:355 +#: src/ingameop.cpp:351 msgid "--> QUIT <--" msgstr "" @@ -13642,54 +13642,54 @@ msgstr "" msgid "Screen shake when things die: On" msgstr "" -#: src/keybind.cpp:2603 -#: src/keybind.cpp:2646 +#: src/keybind.cpp:2604 +#: src/keybind.cpp:2647 #, fuzzy msgid "Sorry, but game speed cannot be changed in multiplayer." msgstr "Het spijt me, maar vals spelen mag niet in spelletjes met meerdere spelers." -#: src/keybind.cpp:2624 -#: src/keybind.cpp:2667 -#: src/keybind.cpp:2689 +#: src/keybind.cpp:2625 +#: src/keybind.cpp:2668 +#: src/keybind.cpp:2690 msgid "Game Speed Reset" msgstr "Speelsnelheid herstellen" -#: src/keybind.cpp:2628 +#: src/keybind.cpp:2629 #, c-format msgid "Game Speed Increased to %3.1f" msgstr "Speelsnelheid toegenomen tot %3.1f" -#: src/keybind.cpp:2671 +#: src/keybind.cpp:2672 #, c-format msgid "Game Speed Reduced to %3.1f" msgstr "Speelsnelheid verminderd tot %3.1f" -#: src/keybind.cpp:2701 +#: src/keybind.cpp:2702 msgid "Radar showing friend-foe colors" msgstr "Radar toont vriend-en-vijand-kleuren" -#: src/keybind.cpp:2705 +#: src/keybind.cpp:2706 msgid "Radar showing player colors" msgstr "Radar toont spelerskleuren" -#: src/keybind.cpp:2726 +#: src/keybind.cpp:2727 msgid "Radar showing only objects" msgstr "Radar toont enkel objecten" -#: src/keybind.cpp:2729 +#: src/keybind.cpp:2730 msgid "Radar blending terrain and height" msgstr "Radar toon terrein en hoogte" -#: src/keybind.cpp:2732 +#: src/keybind.cpp:2733 msgid "Radar showing terrain" msgstr "Radar toont terrein" -#: src/keybind.cpp:2735 +#: src/keybind.cpp:2736 #, fuzzy msgid "Radar showing revealed terrain" msgstr "Radar toont terrein" -#: src/keybind.cpp:2738 +#: src/keybind.cpp:2739 msgid "Radar showing height" msgstr "Radar toont hoogte" @@ -13698,9 +13698,9 @@ msgid "KEY MAPPING" msgstr "" #: src/keyedit.cpp:372 -#: src/multiint.cpp:662 -#: src/multiint.cpp:1072 -#: src/multiint.cpp:1478 +#: src/multiint.cpp:671 +#: src/multiint.cpp:1081 +#: src/multiint.cpp:1487 msgid "Return To Previous Screen" msgstr "Terug naar vorig scherm" @@ -14208,37 +14208,37 @@ msgstr "Camera volgen" msgid "Could not save game!" msgstr "Kon het spel NIET opslaan!" -#: src/mission.cpp:2075 +#: src/mission.cpp:2041 msgid "Load Transport" msgstr "Vervoer inladen" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "DOEL BEHAALD door vals spelen!" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED" msgstr "DOEL BEHAALD" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED--and you cheated!" msgstr "DOEL MISLUKT-- en je hebt valsgespeeld!" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED" msgstr "DOEL MISLUKT" -#: src/mission.cpp:2493 -#: src/mission.cpp:2533 -#: src/mission.cpp:2647 +#: src/mission.cpp:2459 +#: src/mission.cpp:2499 +#: src/mission.cpp:2613 msgid "Quit To Main Menu" msgstr "Afsluiten naar hoofdmenu" -#: src/mission.cpp:2501 +#: src/mission.cpp:2467 msgid "Continue Game" msgstr "Spel vervolgen" -#: src/mission.cpp:2598 +#: src/mission.cpp:2564 #, fuzzy msgid "GAME SAVED :" msgstr "SPEL OPGESLAGEN!" @@ -14298,356 +14298,361 @@ msgstr "%s vormt een bondgenootschap met %s" msgid "You Discover Blueprints For %s" msgstr "Je ontdekt blauwdrukken voor %s" -#: src/multiint.cpp:600 +#: src/multiint.cpp:609 #: src/multilimit.cpp:190 msgid "Accept Settings" msgstr "Accepteer instellingen" -#: src/multiint.cpp:602 -#: src/multiint.cpp:1117 +#: src/multiint.cpp:611 +#: src/multiint.cpp:1126 #, fuzzy msgid "Cancel" msgstr "Lansier" -#: src/multiint.cpp:613 +#: src/multiint.cpp:622 msgid "IP Address or Machine Name" msgstr "IP-adres of computernaam" -#: src/multiint.cpp:659 +#: src/multiint.cpp:668 msgid "CONNECTION" msgstr "VERBINDING" -#: src/multiint.cpp:664 +#: src/multiint.cpp:673 msgid "Lobby" msgstr "Lobby" -#: src/multiint.cpp:665 +#: src/multiint.cpp:674 msgid "IP" msgstr "IP" -#: src/multiint.cpp:854 +#: src/multiint.cpp:863 #, fuzzy msgid "No games are available" msgstr "Nieuwe technologieën zijn beschikbaar" -#: src/multiint.cpp:857 +#: src/multiint.cpp:866 msgid "Game is full" msgstr "Spel is vol" -#: src/multiint.cpp:861 +#: src/multiint.cpp:870 msgid "You were kicked!" msgstr "jij bent eruit geschopt!" -#: src/multiint.cpp:864 +#: src/multiint.cpp:873 msgid "Wrong Game Version!" msgstr "Verkeerde spel versie!" -#: src/multiint.cpp:867 +#: src/multiint.cpp:876 msgid "You have an incompatible mod." msgstr "" -#: src/multiint.cpp:871 +#: src/multiint.cpp:880 msgid "Host couldn't send file?" msgstr "" -#: src/multiint.cpp:875 +#: src/multiint.cpp:884 msgid "Incorrect Password!" msgstr "Incorrect wachtwoord!" -#: src/multiint.cpp:878 +#: src/multiint.cpp:887 msgid "Host has dropped connection!" msgstr "Gastheer heeft de connectie verbroken!" -#: src/multiint.cpp:882 +#: src/multiint.cpp:891 msgid "Connection Error" msgstr "Connectie fout" -#: src/multiint.cpp:1012 +#: src/multiint.cpp:1021 msgid "Searching" msgstr "Zoeken" -#: src/multiint.cpp:1069 +#: src/multiint.cpp:1078 msgid "GAMES" msgstr "SPELLEN" -#: src/multiint.cpp:1077 +#: src/multiint.cpp:1086 msgid "Refresh Games List" msgstr "Ververs lijst met spellen" -#: src/multiint.cpp:1097 +#: src/multiint.cpp:1106 #, fuzzy msgid "Enter Password:" msgstr "Vul eerst het wachtwoord in" -#: src/multiint.cpp:1115 +#: src/multiint.cpp:1124 msgid "OK" msgstr "" -#: src/multiint.cpp:1232 +#: src/multiint.cpp:1241 msgid "Tanks disabled!!" msgstr "" -#: src/multiint.cpp:1233 +#: src/multiint.cpp:1242 #, fuzzy msgid "Cyborgs disabled." msgstr "Nieuwe cyborg beschikbaar" -#: src/multiint.cpp:1234 +#: src/multiint.cpp:1243 msgid "VTOLs disabled." msgstr "" -#: src/multiint.cpp:1281 -#: src/multiint.cpp:1288 +#: src/multiint.cpp:1290 +#: src/multiint.cpp:1297 msgid "Select Game Name" msgstr "Kies spelnaam" -#: src/multiint.cpp:1281 +#: src/multiint.cpp:1290 #, fuzzy msgid "One-Player Skirmish" msgstr "Schermutseling voor 1 speler" -#: src/multiint.cpp:1291 +#: src/multiint.cpp:1300 msgid "Select Map" msgstr "Kies kaart" -#: src/multiint.cpp:1299 +#: src/multiint.cpp:1308 msgid "Click to set Password" msgstr "Klik om wachtwoord intevullen" -#: src/multiint.cpp:1309 -#: src/multiint.cpp:1310 +#: src/multiint.cpp:1318 +#: src/multiint.cpp:1319 #, fuzzy msgid "Scavengers" msgstr "Aaseter" -#: src/multiint.cpp:1312 +#: src/multiint.cpp:1321 #, fuzzy msgid "No Scavengers" msgstr "Aaseter" -#: src/multiint.cpp:1342 +#: src/multiint.cpp:1351 msgid "Select Player Name" msgstr "Kies spelernaam" -#: src/multiint.cpp:1348 +#: src/multiint.cpp:1357 msgid "Distance Fog" msgstr "Afstandsmist" -#: src/multiint.cpp:1359 +#: src/multiint.cpp:1368 #: src/multimenu.cpp:756 msgid "Alliances" msgstr "Bondgenootschappen toestaan" -#: src/multiint.cpp:1362 +#: src/multiint.cpp:1371 msgid "No Alliances" msgstr "Geen bondgenootschappen toestaan" -#: src/multiint.cpp:1364 +#: src/multiint.cpp:1373 msgid "Allow Alliances" msgstr "Bondgenootschappen toestaan" -#: src/multiint.cpp:1368 +#: src/multiint.cpp:1377 msgid "Locked Teams" msgstr "Vergrendelde ploegen" -#: src/multiint.cpp:1394 +#: src/multiint.cpp:1403 msgid "Low Power Levels" msgstr "Lage energieniveaus" -#: src/multiint.cpp:1396 +#: src/multiint.cpp:1405 msgid "Medium Power Levels" msgstr "Normale energieniveaus" -#: src/multiint.cpp:1398 +#: src/multiint.cpp:1407 msgid "High Power Levels" msgstr "Hoge energieniveaus" -#: src/multiint.cpp:1430 +#: src/multiint.cpp:1439 msgid "Base" msgstr "Basis" -#: src/multiint.cpp:1432 +#: src/multiint.cpp:1441 msgid "Start with No Bases" msgstr "Start zonder basis" -#: src/multiint.cpp:1434 +#: src/multiint.cpp:1443 msgid "Start with Bases" msgstr "Start met basis" -#: src/multiint.cpp:1436 +#: src/multiint.cpp:1445 msgid "Start with Advanced Bases" msgstr "Start met gevanceerde basis" -#: src/multiint.cpp:1468 +#: src/multiint.cpp:1477 msgid "Map Preview" msgstr "Kaartvoorbeeld" -#: src/multiint.cpp:1470 +#: src/multiint.cpp:1479 msgid "Click to see Map" msgstr "Klik om kaart te zien" -#: src/multiint.cpp:1484 +#: src/multiint.cpp:1493 msgid "Start Hosting Game" msgstr "Optreden als gastheer" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 #, fuzzy msgid "Show Structure Limits" msgstr "Gebouwlimiet instellen" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 msgid "Set Structure Limits" msgstr "Gebouwlimiet instellen" -#: src/multiint.cpp:1587 +#: src/multiint.cpp:1596 msgid "DIFFICULTY" msgstr "" -#: src/multiint.cpp:1601 +#: src/multiint.cpp:1610 msgid "Less aggressive and starts with less units" msgstr "" -#: src/multiint.cpp:1602 +#: src/multiint.cpp:1611 #, fuzzy msgid "Plays nice" msgstr "Speler" -#: src/multiint.cpp:1603 +#: src/multiint.cpp:1612 msgid "No holds barred" msgstr "" -#: src/multiint.cpp:1604 +#: src/multiint.cpp:1613 msgid "Starts with advantages and gets twice as much oil from derricks" msgstr "" -#: src/multiint.cpp:1632 +#: src/multiint.cpp:1641 msgid "CHOOSE AI" msgstr "" -#: src/multiint.cpp:1648 +#: src/multiint.cpp:1657 msgid "Allow human players to join in this slot" msgstr "" -#: src/multiint.cpp:1656 +#: src/multiint.cpp:1665 msgid "Leave this slot unused" msgstr "" -#: src/multiint.cpp:1736 +#: src/multiint.cpp:1745 #, fuzzy msgid "Player colour" msgstr "Speler verliet het spel" -#: src/multiint.cpp:2062 +#: src/multiint.cpp:2071 msgid "Team" msgstr "Ploeg" -#: src/multiint.cpp:2074 +#: src/multiint.cpp:2083 #, fuzzy msgid "Kick player" msgstr "2 spelers" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 #, fuzzy msgid "Click to change difficulty" msgstr "Klik om wachtwoord intevullen" -#: src/multiint.cpp:2121 +#: src/multiint.cpp:2130 msgid "Click when ready" msgstr "Klik zodra klaar" -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2134 msgid "READY?" msgstr "" -#: src/multiint.cpp:2169 +#: src/multiint.cpp:2178 msgid "PLAYERS" msgstr "SPELERS" -#: src/multiint.cpp:2204 +#: src/multiint.cpp:2213 #, fuzzy msgid "Click to change to this slot" msgstr "Klik om wachtwoord intevullen" -#: src/multiint.cpp:2232 +#: src/multiint.cpp:2241 #, fuzzy msgid "Choose Team" msgstr "Vergrendelde ploegen" -#: src/multiint.cpp:2262 +#: src/multiint.cpp:2271 #, fuzzy msgid "Click to change player colour" msgstr "Radar toont spelerskleuren" -#: src/multiint.cpp:2290 +#: src/multiint.cpp:2299 #, fuzzy msgid "Click to change player position" msgstr "Bewaak positie" -#: src/multiint.cpp:2296 +#: src/multiint.cpp:2305 #, fuzzy msgid "Click to change AI" msgstr "Klik om wachtwoord intevullen" -#: src/multiint.cpp:2300 +#: src/multiint.cpp:2309 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2362 +#: src/multiint.cpp:2371 msgid "CHAT" msgstr "BABBEL" -#: src/multiint.cpp:2394 +#: src/multiint.cpp:2403 msgid "All players need to have the same mods to join your game." msgstr "" -#: src/multiint.cpp:2552 +#: src/multiint.cpp:2561 #, fuzzy, c-format msgid "*** password [%s] is now required! ***" msgstr "*** wachtwoord is NU nodig! ***" -#: src/multiint.cpp:2560 +#: src/multiint.cpp:2569 msgid "*** password is NOT required! ***" msgstr "*** Er is GEEN wachtwoord nodig! ***" -#: src/multiint.cpp:2801 +#: src/multiint.cpp:2810 msgid "Sorry! Failed to host the game." msgstr "" -#: src/multiint.cpp:2922 +#: src/multiint.cpp:2931 msgid "'Locked Teams' mode enabled" msgstr "Vergrendelde ploegen" -#: src/multiint.cpp:3003 +#: src/multiint.cpp:3012 #, c-format msgid "The host has kicked %s from the game!" msgstr "De gastheer heeft %s uit het spel verwijderd!" -#: src/multiint.cpp:3073 +#: src/multiint.cpp:3082 msgid "Host is Starting Game" msgstr "Gastheer start spel" -#: src/multiint.cpp:3639 +#: src/multiint.cpp:3648 msgid "Players" msgstr "Spelers" -#: src/multiint.cpp:3772 +#: src/multiint.cpp:3786 #, c-format msgid "Sending Map: %d%% " msgstr "" -#: src/multiint.cpp:3780 +#: src/multiint.cpp:3794 #, c-format msgid "Map: %d%% downloaded" msgstr "" -#: src/multiint.cpp:3803 +#: src/multiint.cpp:3820 msgid "HOST" msgstr "" +#: src/multiint.cpp:3827 +#: src/multimenu.cpp:772 +msgid "Ping" +msgstr "Ping" + #: src/multijoin.cpp:100 #: src/multijoin.cpp:101 msgid "Players Still Joining" @@ -14663,17 +14668,17 @@ msgstr "%s heeft het spel verlaten" msgid "File transfer has been aborted for %d." msgstr "" -#: src/multijoin.cpp:376 +#: src/multijoin.cpp:373 #, c-format msgid "%s (%u) has an incompatible mod, and has been kicked." msgstr "" -#: src/multijoin.cpp:415 +#: src/multijoin.cpp:412 #, c-format msgid "%s is Joining the Game" msgstr "%s neemt deel aan het spel" -#: src/multijoin.cpp:425 +#: src/multijoin.cpp:422 msgid "System message:" msgstr "Systeem bericht:" @@ -14787,10 +14792,6 @@ msgstr "Doden" msgid "Units" msgstr "Eenheden" -#: src/multimenu.cpp:772 -msgid "Ping" -msgstr "Ping" - #: src/multimenu.cpp:776 msgid "Structs" msgstr "Gebouwen" @@ -14824,84 +14825,84 @@ msgstr "Geef energie aan speler" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "" -#: src/multiplay.cpp:1146 +#: src/multiplay.cpp:1057 #, fuzzy msgid "(allies" msgstr "Bondgenootschappen toestaan" -#: src/multiplay.cpp:1154 +#: src/multiplay.cpp:1065 msgid "(private to " msgstr "" -#: src/multiplay.cpp:1167 +#: src/multiplay.cpp:1078 msgid "[invalid]" msgstr "" -#: src/multiplay.cpp:2057 +#: src/multiplay.cpp:1942 msgid "Green" msgstr "Groen" -#: src/multiplay.cpp:2058 +#: src/multiplay.cpp:1943 msgid "Orange" msgstr "Oranje" -#: src/multiplay.cpp:2059 +#: src/multiplay.cpp:1944 msgid "Grey" msgstr "Grijs" -#: src/multiplay.cpp:2060 +#: src/multiplay.cpp:1945 msgid "Black" msgstr "Zwart" -#: src/multiplay.cpp:2061 +#: src/multiplay.cpp:1946 msgid "Red" msgstr "Rood" -#: src/multiplay.cpp:2062 +#: src/multiplay.cpp:1947 msgid "Blue" msgstr "Blauw" -#: src/multiplay.cpp:2063 +#: src/multiplay.cpp:1948 msgid "Pink" msgstr "Roze" -#: src/multiplay.cpp:2064 +#: src/multiplay.cpp:1949 msgid "Cyan" msgstr "Cyaan" -#: src/multiplay.cpp:2065 +#: src/multiplay.cpp:1950 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:2066 +#: src/multiplay.cpp:1951 msgid "Purple" msgstr "" -#: src/multiplay.cpp:2067 +#: src/multiplay.cpp:1952 msgid "White" msgstr "" -#: src/multiplay.cpp:2068 +#: src/multiplay.cpp:1953 msgid "Bright blue" msgstr "" -#: src/multiplay.cpp:2069 +#: src/multiplay.cpp:1954 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:2070 +#: src/multiplay.cpp:1955 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:2071 +#: src/multiplay.cpp:1956 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:2072 +#: src/multiplay.cpp:1957 msgid "Brown" msgstr "" -#: src/order.cpp:841 +#: src/order.cpp:800 msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "" @@ -15036,20 +15037,20 @@ msgstr "Totale speeltijd - %s" msgid "You cheated!" msgstr "Je hebt valsgespeeld!" -#: src/scriptfuncs.cpp:3250 +#: src/scriptfuncs.cpp:3287 msgid "YOU ARE VICTORIOUS!" msgstr "JE HEBT GEWONNEN!" -#: src/scriptfuncs.cpp:3254 +#: src/scriptfuncs.cpp:3291 msgid "YOU WERE DEFEATED!" msgstr "JE BENT VERSLAGEN!" -#: src/scriptfuncs.cpp:9500 +#: src/scriptfuncs.cpp:9537 #, c-format msgid "Beacon received from %s!" msgstr "Baken ontvangen van %s!" -#: src/scriptfuncs.cpp:9546 +#: src/scriptfuncs.cpp:9583 #, c-format msgid "Beacon %d" msgstr "Baken %d" @@ -15078,63 +15079,63 @@ msgstr "Kon geen sensoreenheden vinden!" msgid "Unable to locate any Commanders!" msgstr "Kon geen commandanten vinden!" -#: src/structure.cpp:2615 +#: src/structure.cpp:2614 #, fuzzy msgid "Command Control Limit Reached - Production Halted" msgstr "Commando controlelimiet bereikt - Productie gestopt" -#: src/structure.cpp:5815 -#: src/structure.cpp:5840 +#: src/structure.cpp:5806 +#: src/structure.cpp:5831 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" msgstr[0] "%s - %u Eenheid toegewezen" msgstr[1] "%s - %u Eenheden toegewezen" -#: src/structure.cpp:5845 -#: src/structure.cpp:5913 -#: src/structure.cpp:5929 -#: src/structure.cpp:5943 +#: src/structure.cpp:5836 +#: src/structure.cpp:5904 +#: src/structure.cpp:5920 +#: src/structure.cpp:5934 #, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - Schade %3.0f%%" -#: src/structure.cpp:5895 +#: src/structure.cpp:5886 #, c-format msgid "%s - Connected %u of %u" msgstr "%s - Verbonden met %u van %u" -#: src/structure.cpp:6059 -#: src/structure.cpp:6104 +#: src/structure.cpp:6050 +#: src/structure.cpp:6095 #, c-format msgid "%s - Electronically Damaged" msgstr "%s - Elektronisch beschadigd" -#: src/structure.cpp:6341 +#: src/structure.cpp:6332 msgid "Electronic Reward - Visibility Report" msgstr "Elektronische onderscheiding - Zichtbaarheidsverslag" -#: src/structure.cpp:6381 +#: src/structure.cpp:6372 msgid "Factory Reward - Propulsion" msgstr "Fabrieksonderscheiding - Aandrijving" -#: src/structure.cpp:6405 +#: src/structure.cpp:6396 msgid "Factory Reward - Body" msgstr "Fabrieksonderscheiding - Carrosserie" -#: src/structure.cpp:6429 +#: src/structure.cpp:6420 msgid "Factory Reward - Weapon" msgstr "Fabrieksonderscheiding - Wapen" -#: src/structure.cpp:6438 +#: src/structure.cpp:6429 msgid "Factory Reward - Nothing" msgstr "Fabrieksonderscheiding - Niets" -#: src/structure.cpp:6466 +#: src/structure.cpp:6457 msgid "Repair Facility Award - Repair" msgstr "Reparatie-onderscheiding - Reparatie" -#: src/structure.cpp:6473 +#: src/structure.cpp:6464 msgid "Repair Facility Award - Nothing" msgstr "Reparatie-onderscheiding - Niets" diff --git a/po/pl.po b/po/pl.po index 925efe7ba..ad79cb44b 100644 --- a/po/pl.po +++ b/po/pl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-01-18 00:54+0100\n" +"POT-Creation-Date: 2011-02-25 23:35+0100\n" "PO-Revision-Date: 2010-12-11 17:00+0100\n" "Last-Translator: Michał D. aka Emdek \n" "Language-Team: Polish \n" @@ -5732,7 +5732,7 @@ msgid "New Design" msgstr "Nowy projekt" #: data/base/messages/strings/names.txt:15 -#: src/design.cpp:1313 +#: src/design.cpp:1275 msgid "Transport" msgstr "Transportowiec" @@ -12023,26 +12023,26 @@ msgid "System locale" msgstr "Język systemu" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1043 +#: lib/netplay/netplay.cpp:1042 msgid "Enter password here" msgstr "Wpisz hasło tutaj" -#: lib/netplay/netplay.cpp:2048 +#: lib/netplay/netplay.cpp:2060 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "Nie można rozwinąć nazwy głównego serwera (%s)!" -#: lib/netplay/netplay.cpp:2062 +#: lib/netplay/netplay.cpp:2082 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "Nie można skomunikować się z serwerem lobby! Czy port %u TCP jest otwarty dla ruchu wychodzącego?" #: src/challenge.cpp:184 -#: src/hci.cpp:922 -#: src/hci.cpp:3390 -#: src/hci.cpp:3513 -#: src/hci.cpp:3924 -#: src/hci.cpp:4942 +#: src/hci.cpp:916 +#: src/hci.cpp:3378 +#: src/hci.cpp:3501 +#: src/hci.cpp:3912 +#: src/hci.cpp:4930 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12194,149 +12194,149 @@ msgstr "Idź od razu na ekran hosta" #: src/configuration.cpp:393 #: src/configuration.cpp:394 -#: src/multistat.cpp:130 +#: src/multistat.cpp:124 msgid "Player" msgstr "Gracz" -#: src/design.cpp:449 -#: src/design.cpp:469 -#: src/design.cpp:3501 +#: src/design.cpp:443 +#: src/design.cpp:455 +#: src/design.cpp:3464 msgid "New Vehicle" msgstr "Nowy pojazd" -#: src/design.cpp:515 +#: src/design.cpp:500 msgid "Vehicle Body" msgstr "Kadłub pojazdu" -#: src/design.cpp:535 +#: src/design.cpp:520 msgid "Vehicle Propulsion" msgstr "Napęd pojazdu" -#: src/design.cpp:556 -#: src/design.cpp:579 -#: src/design.cpp:603 +#: src/design.cpp:541 +#: src/design.cpp:564 +#: src/design.cpp:588 msgid "Vehicle Turret" msgstr "Wieżyczka pojazdu" -#: src/design.cpp:622 +#: src/design.cpp:607 msgid "Delete Design" msgstr "Usuń projekt" -#: src/design.cpp:673 -#: src/design.cpp:720 +#: src/design.cpp:658 +#: src/design.cpp:705 msgid "Kinetic Armour" msgstr "Pancerz kinetyczny" -#: src/design.cpp:682 -#: src/design.cpp:730 +#: src/design.cpp:667 +#: src/design.cpp:715 msgid "Thermal Armour" msgstr "Pancerz termiczny" -#: src/design.cpp:698 -#: src/design.cpp:750 +#: src/design.cpp:683 +#: src/design.cpp:735 msgid "Engine Output" msgstr "Moc silnika" -#: src/design.cpp:706 -#: src/design.cpp:759 -#: src/design.cpp:1529 -#: src/design.cpp:1553 -#: src/design.cpp:1574 -#: src/design.cpp:1590 -#: src/design.cpp:1610 -#: src/design.cpp:1627 -#: src/design.cpp:1647 -#: src/design.cpp:1664 -#: src/design.cpp:1705 -#: src/design.cpp:1737 -#: src/design.cpp:1869 -#: src/design.cpp:1885 -#: src/design.cpp:1923 -#: src/design.cpp:1956 +#: src/design.cpp:691 +#: src/design.cpp:744 +#: src/design.cpp:1486 +#: src/design.cpp:1510 +#: src/design.cpp:1531 +#: src/design.cpp:1547 +#: src/design.cpp:1567 +#: src/design.cpp:1584 +#: src/design.cpp:1604 +#: src/design.cpp:1621 +#: src/design.cpp:1662 +#: src/design.cpp:1694 +#: src/design.cpp:1826 +#: src/design.cpp:1842 +#: src/design.cpp:1880 +#: src/design.cpp:1913 msgid "Weight" msgstr "Waga" -#: src/design.cpp:790 -#: src/design.cpp:808 +#: src/design.cpp:775 +#: src/design.cpp:793 msgid "Total Power Required" msgstr "Łączna wymagana energia" -#: src/design.cpp:821 -#: src/design.cpp:840 +#: src/design.cpp:806 +#: src/design.cpp:825 msgid "Total Body Points" msgstr "Łączne punkty zdrowia" -#: src/design.cpp:1027 -#: src/design.cpp:1059 +#: src/design.cpp:996 +#: src/design.cpp:1025 msgid "Power Usage" msgstr "Zużycie energii" -#: src/design.cpp:1335 +#: src/design.cpp:1298 msgid "Hydra " msgstr "Hydra" -#: src/design.cpp:1509 -#: src/design.cpp:1537 +#: src/design.cpp:1466 +#: src/design.cpp:1494 msgid "Sensor Range" msgstr "Zasięg radaru" -#: src/design.cpp:1521 -#: src/design.cpp:1545 +#: src/design.cpp:1478 +#: src/design.cpp:1502 msgid "Sensor Power" msgstr "Moc radaru" -#: src/design.cpp:1566 -#: src/design.cpp:1582 +#: src/design.cpp:1523 +#: src/design.cpp:1539 msgid "ECM Power" msgstr "Moc ECM" -#: src/design.cpp:1602 -#: src/design.cpp:1619 -#: src/design.cpp:1639 -#: src/design.cpp:1656 +#: src/design.cpp:1559 +#: src/design.cpp:1576 +#: src/design.cpp:1596 +#: src/design.cpp:1613 msgid "Build Points" msgstr "Prędkość budowania" -#: src/design.cpp:1677 -#: src/design.cpp:1713 +#: src/design.cpp:1634 +#: src/design.cpp:1670 msgid "Range" msgstr "Zasięg" -#: src/design.cpp:1689 -#: src/design.cpp:1721 +#: src/design.cpp:1646 +#: src/design.cpp:1678 msgid "Damage" msgstr "Obrażenia" -#: src/design.cpp:1697 -#: src/design.cpp:1729 +#: src/design.cpp:1654 +#: src/design.cpp:1686 msgid "Rate-of-Fire" msgstr "Szybkostrzelność" -#: src/design.cpp:1857 -#: src/design.cpp:1877 +#: src/design.cpp:1814 +#: src/design.cpp:1834 msgid "Air Speed" msgstr "Prędkość w powietrzu" -#: src/design.cpp:1895 -#: src/design.cpp:1932 +#: src/design.cpp:1852 +#: src/design.cpp:1889 msgid "Road Speed" msgstr "Prędkość na drogach" -#: src/design.cpp:1905 -#: src/design.cpp:1940 +#: src/design.cpp:1862 +#: src/design.cpp:1897 msgid "Off-Road Speed" msgstr "Prędkość na bezdrożach" -#: src/design.cpp:1913 -#: src/design.cpp:1948 +#: src/design.cpp:1870 +#: src/design.cpp:1905 msgid "Water Speed" msgstr "Prędkość na wodzie" -#: src/design.cpp:2074 +#: src/design.cpp:2031 msgid "Weapons" msgstr "Bronie" -#: src/design.cpp:2094 +#: src/design.cpp:2051 msgid "Systems" msgstr "Systemy" @@ -12349,7 +12349,7 @@ msgid "Player dropped" msgstr "Gracz odrzucony" #: src/display3d.cpp:599 -#: src/multiint.cpp:2116 +#: src/multiint.cpp:2125 msgid "Waiting for other players" msgstr "Oczekiwanie na graczy" @@ -12357,44 +12357,44 @@ msgstr "Oczekiwanie na graczy" msgid "Out of sync" msgstr "" -#: src/display.cpp:1651 +#: src/display.cpp:1649 msgid "Cannot Build. Oil Resource Burning." msgstr "Nie można budować. Płonie ropa." -#: src/display.cpp:1830 -#: src/display.cpp:2423 +#: src/display.cpp:1828 +#: src/display.cpp:2421 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - Obrażenia %d%% - Doświadczenie %d, %s" -#: src/display.cpp:1846 +#: src/display.cpp:1844 #, c-format msgid "%s - Allied - Damage %d%% - Experience %d, %s" msgstr "%s - Sojusznik - Obrażenia %d%% - Doświadczenie %d, %s" -#: src/display.cpp:2044 +#: src/display.cpp:2042 msgid "Truck ordered to build Oil Derrick" msgstr "Rozkazano ciężarówce zbudować platformę wydobywczą" -#: src/display.cpp:2045 +#: src/display.cpp:2043 #, fuzzy msgid "2 trucks ordered to build Oil Derrick" msgstr "Rozkazano ciężarówce zbudować platformę wydobywczą" -#: src/display.cpp:2046 +#: src/display.cpp:2044 #, fuzzy, c-format msgid "%d trucks ordered to build Oil Derrick" msgstr "Rozkazano ciężarówce zbudować platformę wydobywczą" -#: src/droid.cpp:208 +#: src/droid.cpp:211 msgid "Unit Lost!" msgstr "Jednostka utracona!" -#: src/droid.cpp:1370 +#: src/droid.cpp:1376 msgid "Structure Restored" msgstr "Struktura odbudowana" -#: src/droid.cpp:2712 +#: src/droid.cpp:2732 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" @@ -12402,7 +12402,7 @@ msgstr[0] "Wybrana grupa %u - %u jednostka" msgstr[1] "Wybrana grupa %u - %u jednostki" msgstr[2] "Wybrana grupa %u - %u jednostek" -#: src/droid.cpp:2725 +#: src/droid.cpp:2745 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" @@ -12410,7 +12410,7 @@ msgstr[0] "%u jednostka przypisana do Grupy %u" msgstr[1] "%u jednostki przypisane do Grupy %u" msgstr[2] "%u jednostek przypisano do Grupy %u" -#: src/droid.cpp:2738 +#: src/droid.cpp:2758 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" @@ -12418,7 +12418,7 @@ msgstr[0] "Wyśrodkowano na grupie %u - %u jednostka" msgstr[1] "Wyśrodkowano na grupie %u - %u jednostki" msgstr[2] "Wyśrodkowano na grupie %u - %u jednostek" -#: src/droid.cpp:2742 +#: src/droid.cpp:2762 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" @@ -12427,49 +12427,49 @@ msgstr[1] "Wyrównanie z grupą %u - %u jednostki" msgstr[2] "Wyrównanie z grupą %u - %u jednostek" # I had really trouble with this one. This word has no meaning in Polish so I decided to translate it as 'Newbe' -#: src/droid.cpp:3080 +#: src/droid.cpp:3093 msgid "Rookie" msgstr "Nowicjusz" -#: src/droid.cpp:3081 +#: src/droid.cpp:3094 msgctxt "rank" msgid "Green" msgstr "Zielony" -#: src/droid.cpp:3082 +#: src/droid.cpp:3095 msgid "Trained" msgstr "Wyszkolony" -#: src/droid.cpp:3083 +#: src/droid.cpp:3096 msgid "Regular" msgstr "Zawodowy" -#: src/droid.cpp:3084 +#: src/droid.cpp:3097 msgid "Professional" msgstr "Profesjonalny" -#: src/droid.cpp:3085 +#: src/droid.cpp:3098 msgid "Veteran" msgstr "Weteran" -#: src/droid.cpp:3086 +#: src/droid.cpp:3099 msgid "Elite" msgstr "Elita" -#: src/droid.cpp:3087 +#: src/droid.cpp:3100 msgid "Special" msgstr "Specjalny" -#: src/droid.cpp:3088 +#: src/droid.cpp:3101 msgid "Hero" msgstr "Bohater" -#: src/droid.cpp:4110 +#: src/droid.cpp:4123 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "%s chciał dać ci %s ale masz już ich zbyt wiele!" -#: src/droid.cpp:4114 +#: src/droid.cpp:4127 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "Chciałeś dać %s %s ale ma ich już ich zbyt wiele!" @@ -12488,7 +12488,7 @@ msgid "Tutorial" msgstr "Szkolenie" #: src/frontend.cpp:100 -#: src/hci.cpp:3499 +#: src/hci.cpp:3487 msgid "Options" msgstr "Opcje" @@ -12539,7 +12539,7 @@ msgid "Challenges" msgstr "Wyzwania" #: src/frontend.cpp:215 -#: src/ingameop.cpp:275 +#: src/ingameop.cpp:272 msgid "Load Game" msgstr "Załaduj grę" @@ -12548,9 +12548,9 @@ msgid "SINGLE PLAYER" msgstr "JEDEN GRACZ" #: src/frontend.cpp:303 -#: src/ingameop.cpp:498 -#: src/mission.cpp:2527 -#: src/mission.cpp:2630 +#: src/ingameop.cpp:494 +#: src/mission.cpp:2493 +#: src/mission.cpp:2596 msgid "Load Saved Game" msgstr "Załaduj zapisany stan gry" @@ -12567,7 +12567,7 @@ msgid "Join Game" msgstr "Dołącz do gry" #: src/frontend.cpp:422 -#: src/multiint.cpp:1276 +#: src/multiint.cpp:1285 msgid "OPTIONS" msgstr "OPCJE" @@ -12584,7 +12584,7 @@ msgid "Video Options" msgstr "Ustawienia obrazu" #: src/frontend.cpp:426 -#: src/ingameop.cpp:270 +#: src/ingameop.cpp:267 msgid "Audio Options" msgstr "Ustawienia dźwięku" @@ -12662,7 +12662,7 @@ msgid "Off" msgstr "Wyłącz" #: src/frontend.cpp:523 -#: src/multiint.cpp:1345 +#: src/multiint.cpp:1354 msgid "Fog" msgstr "Mgła" @@ -12673,7 +12673,7 @@ msgstr "Mgiełka" #: src/frontend.cpp:530 #: src/frontend.cpp:595 -#: src/multiint.cpp:1347 +#: src/multiint.cpp:1356 msgid "Fog Of War" msgstr "Mgła wojny" @@ -12835,194 +12835,194 @@ msgid "GAME OPTIONS" msgstr "USTAWIENIA GRY" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2389 +#: src/multiint.cpp:2398 msgid "Mod: " msgstr "Mod: " -#: src/hci.cpp:1245 +#: src/hci.cpp:1237 msgid "MAP SAVED!" msgstr "MAPA ZAPISANA!" -#: src/hci.cpp:1584 +#: src/hci.cpp:1573 #: src/loop.cpp:558 #: src/loop.cpp:574 #, fuzzy msgid "GAME SAVED: " msgstr "GRA ZAPISANA :" -#: src/hci.cpp:1971 +#: src/hci.cpp:1960 msgid "Failed to create building" msgstr "Nie udało się utworzyć budynku" -#: src/hci.cpp:1988 +#: src/hci.cpp:1977 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new structure: %s." msgstr "Gracz %u oszukuje (menu odpluskwiania) by zdobyć nową strukturę: %s." -#: src/hci.cpp:2003 +#: src/hci.cpp:1992 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new feature: %s." msgstr "Gracz %u oszukuje (menu odpluskwiania) by zdobyć nowy obiekt: %s." -#: src/hci.cpp:2025 +#: src/hci.cpp:2014 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid: %s." msgstr "Gracz %u oszukuje (menu odpluskwiania) by zdobyć nową jednostkę: %s." -#: src/hci.cpp:2036 +#: src/hci.cpp:2025 #, fuzzy, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "Gracz %u oszukuje (menu odpluskwiania) by zdobyć nową jednostkę: %s." -#: src/hci.cpp:3310 +#: src/hci.cpp:3298 msgid "Commanders (F6)" msgstr "Dowódcy (F6)" -#: src/hci.cpp:3323 +#: src/hci.cpp:3311 msgid "Intelligence Display (F5)" msgstr "Dane wywiadu (F5)" -#: src/hci.cpp:3336 +#: src/hci.cpp:3324 msgid "Manufacture (F1)" msgstr "Produkcja (F1)" -#: src/hci.cpp:3349 +#: src/hci.cpp:3337 msgid "Design (F4)" msgstr "Projekt (F4)" -#: src/hci.cpp:3362 +#: src/hci.cpp:3350 msgid "Research (F2)" msgstr "Badania (F2)" -#: src/hci.cpp:3375 +#: src/hci.cpp:3363 msgid "Build (F3)" msgstr "Buduj (F3)" -#: src/hci.cpp:3446 -#: src/multiint.cpp:1392 +#: src/hci.cpp:3434 +#: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Energia" -#: src/hci.cpp:3537 +#: src/hci.cpp:3525 msgid "Map:" msgstr "Mapa:" -#: src/hci.cpp:3550 +#: src/hci.cpp:3538 msgid "Load" msgstr "Załaduj" -#: src/hci.cpp:3551 +#: src/hci.cpp:3539 msgid "Load Map File" msgstr "Załaduj plik mapy" -#: src/hci.cpp:3558 +#: src/hci.cpp:3546 msgid "Save" msgstr "Zapisz" -#: src/hci.cpp:3559 +#: src/hci.cpp:3547 msgid "Save Map File" msgstr "Zapisz plik mapy" -#: src/hci.cpp:3567 +#: src/hci.cpp:3555 msgid "New" msgstr "Nowa" -#: src/hci.cpp:3568 +#: src/hci.cpp:3556 msgid "New Blank Map" msgstr "Nowa mapa" -#: src/hci.cpp:3604 +#: src/hci.cpp:3592 msgid "Tile" msgstr "Kafel" -#: src/hci.cpp:3605 +#: src/hci.cpp:3593 msgid "Place tiles on map" msgstr "Umieść kafel na mapie" -#: src/hci.cpp:3614 +#: src/hci.cpp:3602 msgid "Unit" msgstr "Jednostka" -#: src/hci.cpp:3615 +#: src/hci.cpp:3603 msgid "Place Unit on map" msgstr "Umieść jednostkę na mapie" -#: src/hci.cpp:3623 +#: src/hci.cpp:3611 msgid "Struct" msgstr "Struktura" -#: src/hci.cpp:3624 +#: src/hci.cpp:3612 msgid "Place Structures on map" msgstr "Umieść struktury na mapie" -#: src/hci.cpp:3632 +#: src/hci.cpp:3620 msgid "Feat" msgstr "Obiekt" -#: src/hci.cpp:3633 +#: src/hci.cpp:3621 msgid "Place Features on map" msgstr "Umieść obiekty specjalne na mapie" -#: src/hci.cpp:3643 +#: src/hci.cpp:3631 msgid "Pause" msgstr "Pauza" -#: src/hci.cpp:3644 +#: src/hci.cpp:3632 msgid "Pause or unpause the game" msgstr "Spauzuj lub wznów grę" -#: src/hci.cpp:3658 +#: src/hci.cpp:3646 msgid "Align height of all map objects" msgstr "Wyrównaj wysokość wszystkich obiektów mapy" -#: src/hci.cpp:3668 +#: src/hci.cpp:3656 msgid "Edit" msgstr "Edytuj" -#: src/hci.cpp:3669 +#: src/hci.cpp:3657 msgid "Start Edit Mode" msgstr "Rozpocznij tryb edycji" -#: src/hci.cpp:3683 +#: src/hci.cpp:3671 #: src/ingameop.cpp:112 -#: src/ingameop.cpp:258 -#: src/ingameop.cpp:263 +#: src/ingameop.cpp:256 +#: src/ingameop.cpp:260 msgid "Quit" msgstr "Wyjdź" -#: src/hci.cpp:3684 +#: src/hci.cpp:3672 msgid "Exit Game" msgstr "Zakończ grę" -#: src/hci.cpp:3710 +#: src/hci.cpp:3698 msgid "Current Player:" msgstr "Aktualny gracz:" -#: src/hci.cpp:4001 +#: src/hci.cpp:3989 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "Pasek postępu" -#: src/hci.cpp:4867 +#: src/hci.cpp:4855 msgid "Factory Delivery Point" msgstr "Punkt dostaw fabryki" -#: src/hci.cpp:4885 +#: src/hci.cpp:4873 msgid "Loop Production" msgstr "Cykl produkcji" -#: src/hci.cpp:4965 +#: src/hci.cpp:4953 msgid "Tab Scroll left" msgstr "Przewiń zakładki w lewo" -#: src/hci.cpp:4980 +#: src/hci.cpp:4968 msgid "Tab Scroll right" msgstr "Przewiń zakładki w prawo" #: src/ingameop.cpp:111 -#: src/ingameop.cpp:193 -#: src/ingameop.cpp:267 +#: src/ingameop.cpp:195 +#: src/ingameop.cpp:264 msgid "Resume Game" msgstr "Kontynuuj grę" @@ -13030,32 +13030,32 @@ msgstr "Kontynuuj grę" msgid "WARNING: You're the host. If you quit, the game ends for everyone!" msgstr "OSTRZEŻENIE: jesteś hostem. Gdy wyjdziesz, gra zostaje zakończona dla wszystkich!" -#: src/ingameop.cpp:185 -#: src/ingameop.cpp:527 +#: src/ingameop.cpp:186 +#: src/ingameop.cpp:523 msgid "Tactical UI (Target Origin Icon): Show" msgstr "" -#: src/ingameop.cpp:190 -#: src/ingameop.cpp:531 +#: src/ingameop.cpp:191 +#: src/ingameop.cpp:527 msgid "Tactical UI (Target Origin Icon): Hide" msgstr "" -#: src/ingameop.cpp:277 -#: src/ingameop.cpp:502 -#: src/mission.cpp:2514 -#: src/mission.cpp:2633 +#: src/ingameop.cpp:274 +#: src/ingameop.cpp:498 +#: src/mission.cpp:2480 +#: src/mission.cpp:2599 msgid "Save Game" msgstr "Zapisz grę" -#: src/ingameop.cpp:343 +#: src/ingameop.cpp:339 msgid "Host has quit the game!" msgstr "Host opuścił grę!" -#: src/ingameop.cpp:349 +#: src/ingameop.cpp:345 msgid "The game can't continue without the host." msgstr "Gra nie może być kontynuowana bez hosta." -#: src/ingameop.cpp:355 +#: src/ingameop.cpp:351 msgid "--> QUIT <--" msgstr "--> WYJŚCIE <--" @@ -13434,52 +13434,52 @@ msgstr "Wstrząsy ekranu gdy coś ginie: Wyłączone" msgid "Screen shake when things die: On" msgstr "Wstrząsy ekranu gdy coś ginie: Włączone" -#: src/keybind.cpp:2603 -#: src/keybind.cpp:2646 +#: src/keybind.cpp:2604 +#: src/keybind.cpp:2647 msgid "Sorry, but game speed cannot be changed in multiplayer." msgstr "Przepraszamy, prędkość gry nie może zostać zmieniona w grze wieloosobowej." -#: src/keybind.cpp:2624 -#: src/keybind.cpp:2667 -#: src/keybind.cpp:2689 +#: src/keybind.cpp:2625 +#: src/keybind.cpp:2668 +#: src/keybind.cpp:2690 msgid "Game Speed Reset" msgstr "Przywróć normalną prędkość gry" -#: src/keybind.cpp:2628 +#: src/keybind.cpp:2629 #, c-format msgid "Game Speed Increased to %3.1f" msgstr "Prędkość gry zwiększona do %3.1f" -#: src/keybind.cpp:2671 +#: src/keybind.cpp:2672 #, c-format msgid "Game Speed Reduced to %3.1f" msgstr "Prędkość gry zmniejszona do %3.1f" -#: src/keybind.cpp:2701 +#: src/keybind.cpp:2702 msgid "Radar showing friend-foe colors" msgstr "Radar pokazuje kolory przyjaciel-wróg" -#: src/keybind.cpp:2705 +#: src/keybind.cpp:2706 msgid "Radar showing player colors" msgstr "Radar pokazuje kolory graczy" -#: src/keybind.cpp:2726 +#: src/keybind.cpp:2727 msgid "Radar showing only objects" msgstr "Radar pokazuje tylko obiekty" -#: src/keybind.cpp:2729 +#: src/keybind.cpp:2730 msgid "Radar blending terrain and height" msgstr "Radar pokazuje teren i wysokość" -#: src/keybind.cpp:2732 +#: src/keybind.cpp:2733 msgid "Radar showing terrain" msgstr "Radar pokazuje teren" -#: src/keybind.cpp:2735 +#: src/keybind.cpp:2736 msgid "Radar showing revealed terrain" msgstr "Radar pokazuje ujawniony teren" -#: src/keybind.cpp:2738 +#: src/keybind.cpp:2739 msgid "Radar showing height" msgstr "Radar pokazuje wysokość" @@ -13488,9 +13488,9 @@ msgid "KEY MAPPING" msgstr "SKRÓTY KLAWISZOWE" #: src/keyedit.cpp:372 -#: src/multiint.cpp:662 -#: src/multiint.cpp:1072 -#: src/multiint.cpp:1478 +#: src/multiint.cpp:671 +#: src/multiint.cpp:1081 +#: src/multiint.cpp:1487 msgid "Return To Previous Screen" msgstr "Wstecz" @@ -13979,37 +13979,37 @@ msgstr "Przełącz tryb kierowania " msgid "Could not save game!" msgstr "Niemożna zapisać gry!" -#: src/mission.cpp:2075 +#: src/mission.cpp:2041 msgid "Load Transport" msgstr "Ładuj transport" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "CEL OSIĄGNIĘTY przez oszukiwanie!" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED" msgstr "CEL OSIĄGNIĘTY" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED--and you cheated!" msgstr "CEL NIE OSIĄGNIĘTY--chociaż oszukiwałeś!" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED" msgstr "CEL NIE OSIĄGNIĘTY" -#: src/mission.cpp:2493 -#: src/mission.cpp:2533 -#: src/mission.cpp:2647 +#: src/mission.cpp:2459 +#: src/mission.cpp:2499 +#: src/mission.cpp:2613 msgid "Quit To Main Menu" msgstr "Wyjdź do menu głównego" -#: src/mission.cpp:2501 +#: src/mission.cpp:2467 msgid "Continue Game" msgstr "Kontynuuj grę" -#: src/mission.cpp:2598 +#: src/mission.cpp:2564 msgid "GAME SAVED :" msgstr "GRA ZAPISANA :" @@ -14068,345 +14068,350 @@ msgstr "%s tworzy sojusz z %s" msgid "You Discover Blueprints For %s" msgstr "Odkrywasz plany: %s" -#: src/multiint.cpp:600 +#: src/multiint.cpp:609 #: src/multilimit.cpp:190 msgid "Accept Settings" msgstr "Zapisz ustawienia" -#: src/multiint.cpp:602 -#: src/multiint.cpp:1117 +#: src/multiint.cpp:611 +#: src/multiint.cpp:1126 msgid "Cancel" msgstr "Anuluj" -#: src/multiint.cpp:613 +#: src/multiint.cpp:622 msgid "IP Address or Machine Name" msgstr "Adres IP lub nazwa komputera" -#: src/multiint.cpp:659 +#: src/multiint.cpp:668 msgid "CONNECTION" msgstr "POŁĄCZENIE" -#: src/multiint.cpp:664 +#: src/multiint.cpp:673 msgid "Lobby" msgstr "Lobby" -#: src/multiint.cpp:665 +#: src/multiint.cpp:674 msgid "IP" msgstr "IP" -#: src/multiint.cpp:854 +#: src/multiint.cpp:863 msgid "No games are available" msgstr "Brak dostępnych gier" -#: src/multiint.cpp:857 +#: src/multiint.cpp:866 msgid "Game is full" msgstr "Brak miejsc" -#: src/multiint.cpp:861 +#: src/multiint.cpp:870 msgid "You were kicked!" msgstr "Zostałeś wyrzucony!" -#: src/multiint.cpp:864 +#: src/multiint.cpp:873 msgid "Wrong Game Version!" msgstr "Niewłaściwa wersja gry!" -#: src/multiint.cpp:867 +#: src/multiint.cpp:876 msgid "You have an incompatible mod." msgstr "Masz niekompatybilny mod." -#: src/multiint.cpp:871 +#: src/multiint.cpp:880 msgid "Host couldn't send file?" msgstr "Host nie mógł przesłać pliku?" -#: src/multiint.cpp:875 +#: src/multiint.cpp:884 msgid "Incorrect Password!" msgstr "Niewłaściwe hasło!" -#: src/multiint.cpp:878 +#: src/multiint.cpp:887 msgid "Host has dropped connection!" msgstr "Host zerwał połączenie!" -#: src/multiint.cpp:882 +#: src/multiint.cpp:891 msgid "Connection Error" msgstr "Błąd połączenia" -#: src/multiint.cpp:1012 +#: src/multiint.cpp:1021 msgid "Searching" msgstr "Wyszukiwanie" -#: src/multiint.cpp:1069 +#: src/multiint.cpp:1078 msgid "GAMES" msgstr "GRY" -#: src/multiint.cpp:1077 +#: src/multiint.cpp:1086 msgid "Refresh Games List" msgstr "Odśwież listę gier" -#: src/multiint.cpp:1097 +#: src/multiint.cpp:1106 msgid "Enter Password:" msgstr "Wpisz hasło:" -#: src/multiint.cpp:1115 +#: src/multiint.cpp:1124 msgid "OK" msgstr "OK" -#: src/multiint.cpp:1232 +#: src/multiint.cpp:1241 msgid "Tanks disabled!!" msgstr "Czołgi wyłączone!!" -#: src/multiint.cpp:1233 +#: src/multiint.cpp:1242 msgid "Cyborgs disabled." msgstr "Cyborgi wyłączone." -#: src/multiint.cpp:1234 +#: src/multiint.cpp:1243 msgid "VTOLs disabled." msgstr "Jednostki VTOL wyłączone." -#: src/multiint.cpp:1281 -#: src/multiint.cpp:1288 +#: src/multiint.cpp:1290 +#: src/multiint.cpp:1297 msgid "Select Game Name" msgstr "Wybierz nazwę gry" -#: src/multiint.cpp:1281 +#: src/multiint.cpp:1290 msgid "One-Player Skirmish" msgstr "Potyczka" -#: src/multiint.cpp:1291 +#: src/multiint.cpp:1300 msgid "Select Map" msgstr "Wybór mapy" -#: src/multiint.cpp:1299 +#: src/multiint.cpp:1308 msgid "Click to set Password" msgstr "Kliknij by ustawić hasło" -#: src/multiint.cpp:1309 -#: src/multiint.cpp:1310 +#: src/multiint.cpp:1318 +#: src/multiint.cpp:1319 msgid "Scavengers" msgstr "Śmieciarze" -#: src/multiint.cpp:1312 +#: src/multiint.cpp:1321 msgid "No Scavengers" msgstr "Brak Śmieciarzy" -#: src/multiint.cpp:1342 +#: src/multiint.cpp:1351 msgid "Select Player Name" msgstr "Wybierz nazwę gracza" -#: src/multiint.cpp:1348 +#: src/multiint.cpp:1357 msgid "Distance Fog" msgstr "Mgła dystansowa" -#: src/multiint.cpp:1359 +#: src/multiint.cpp:1368 #: src/multimenu.cpp:756 msgid "Alliances" msgstr "Sojusze" -#: src/multiint.cpp:1362 +#: src/multiint.cpp:1371 msgid "No Alliances" msgstr "Brak sojuszy" -#: src/multiint.cpp:1364 +#: src/multiint.cpp:1373 msgid "Allow Alliances" msgstr "Pozwól na sojusze" -#: src/multiint.cpp:1368 +#: src/multiint.cpp:1377 msgid "Locked Teams" msgstr "Zablokowane drużyny" -#: src/multiint.cpp:1394 +#: src/multiint.cpp:1403 msgid "Low Power Levels" msgstr "Niskie poziomy energii" -#: src/multiint.cpp:1396 +#: src/multiint.cpp:1405 msgid "Medium Power Levels" msgstr "Średnie poziomy energii" -#: src/multiint.cpp:1398 +#: src/multiint.cpp:1407 msgid "High Power Levels" msgstr "Wysokie poziomy energii" -#: src/multiint.cpp:1430 +#: src/multiint.cpp:1439 msgid "Base" msgstr "Baza" -#: src/multiint.cpp:1432 +#: src/multiint.cpp:1441 msgid "Start with No Bases" msgstr "Rozpocznij bez baz" -#: src/multiint.cpp:1434 +#: src/multiint.cpp:1443 msgid "Start with Bases" msgstr "Rozpocznij z bazami" -#: src/multiint.cpp:1436 +#: src/multiint.cpp:1445 msgid "Start with Advanced Bases" msgstr "Rozpocznij z zaawansowanymi bazami" -#: src/multiint.cpp:1468 +#: src/multiint.cpp:1477 msgid "Map Preview" msgstr "Podgląd mapy" -#: src/multiint.cpp:1470 +#: src/multiint.cpp:1479 msgid "Click to see Map" msgstr "Kliknij by obejrzeć mapę" -#: src/multiint.cpp:1484 +#: src/multiint.cpp:1493 msgid "Start Hosting Game" msgstr "Rozpocznij grę jako Host" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 msgid "Show Structure Limits" msgstr "Pokaż limit struktur" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 msgid "Set Structure Limits" msgstr "Ustaw limit struktur" -#: src/multiint.cpp:1587 +#: src/multiint.cpp:1596 msgid "DIFFICULTY" msgstr "" -#: src/multiint.cpp:1601 +#: src/multiint.cpp:1610 msgid "Less aggressive and starts with less units" msgstr "" -#: src/multiint.cpp:1602 +#: src/multiint.cpp:1611 #, fuzzy msgid "Plays nice" msgstr "Gracz" -#: src/multiint.cpp:1603 +#: src/multiint.cpp:1612 msgid "No holds barred" msgstr "" -#: src/multiint.cpp:1604 +#: src/multiint.cpp:1613 msgid "Starts with advantages and gets twice as much oil from derricks" msgstr "" -#: src/multiint.cpp:1632 +#: src/multiint.cpp:1641 msgid "CHOOSE AI" msgstr "" -#: src/multiint.cpp:1648 +#: src/multiint.cpp:1657 msgid "Allow human players to join in this slot" msgstr "" -#: src/multiint.cpp:1656 +#: src/multiint.cpp:1665 msgid "Leave this slot unused" msgstr "" -#: src/multiint.cpp:1736 +#: src/multiint.cpp:1745 msgid "Player colour" msgstr "Kolor gracza" -#: src/multiint.cpp:2062 +#: src/multiint.cpp:2071 msgid "Team" msgstr "Drużyna" -#: src/multiint.cpp:2074 +#: src/multiint.cpp:2083 msgid "Kick player" msgstr "Wyrzuć gracza" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 #, fuzzy msgid "Click to change difficulty" msgstr "Kliknij aby dostosować poziom sztucznej inteligencji" -#: src/multiint.cpp:2121 +#: src/multiint.cpp:2130 msgid "Click when ready" msgstr "Kliknij kiedy jesteś gotowy" -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2134 msgid "READY?" msgstr "GOTOWY?" -#: src/multiint.cpp:2169 +#: src/multiint.cpp:2178 msgid "PLAYERS" msgstr "GRACZE" -#: src/multiint.cpp:2204 +#: src/multiint.cpp:2213 #, fuzzy msgid "Click to change to this slot" msgstr "Kliknij aby zmienić ustawienia gracza" -#: src/multiint.cpp:2232 +#: src/multiint.cpp:2241 msgid "Choose Team" msgstr "Wybierz drużynę" -#: src/multiint.cpp:2262 +#: src/multiint.cpp:2271 #, fuzzy msgid "Click to change player colour" msgstr "Kliknij aby zmienić ustawienia gracza" -#: src/multiint.cpp:2290 +#: src/multiint.cpp:2299 #, fuzzy msgid "Click to change player position" msgstr "Kliknij aby zmienić ustawienia gracza" -#: src/multiint.cpp:2296 +#: src/multiint.cpp:2305 #, fuzzy msgid "Click to change AI" msgstr "Kliknij aby zmienić ustawienia gracza" -#: src/multiint.cpp:2300 +#: src/multiint.cpp:2309 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2362 +#: src/multiint.cpp:2371 msgid "CHAT" msgstr "CHAT" -#: src/multiint.cpp:2394 +#: src/multiint.cpp:2403 msgid "All players need to have the same mods to join your game." msgstr "Wszyscy gracze muszą mieć takie same mody aby przyłączyć się do twojej gry." -#: src/multiint.cpp:2552 +#: src/multiint.cpp:2561 #, c-format msgid "*** password [%s] is now required! ***" msgstr "*** hasło [%s] jest teraz wymagane! ***" -#: src/multiint.cpp:2560 +#: src/multiint.cpp:2569 msgid "*** password is NOT required! ***" msgstr "*** hasło jest teraz niewymagane! ***" -#: src/multiint.cpp:2801 +#: src/multiint.cpp:2810 msgid "Sorry! Failed to host the game." msgstr "Przepraszamy! Nie udało się utworzyć serwera gry." -#: src/multiint.cpp:2922 +#: src/multiint.cpp:2931 msgid "'Locked Teams' mode enabled" msgstr "Włączono 'zablokowane drużyny'" -#: src/multiint.cpp:3003 +#: src/multiint.cpp:3012 #, c-format msgid "The host has kicked %s from the game!" msgstr "Host wyrzucił %s z gry!" -#: src/multiint.cpp:3073 +#: src/multiint.cpp:3082 msgid "Host is Starting Game" msgstr "Host rozpoczyna grę" -#: src/multiint.cpp:3639 +#: src/multiint.cpp:3648 msgid "Players" msgstr "Gracze" -#: src/multiint.cpp:3772 +#: src/multiint.cpp:3786 #, c-format msgid "Sending Map: %d%% " msgstr "Przesyłanie mapy: %d%%" -#: src/multiint.cpp:3780 +#: src/multiint.cpp:3794 #, c-format msgid "Map: %d%% downloaded" msgstr "Mapa: %d%% pobrane" -#: src/multiint.cpp:3803 +#: src/multiint.cpp:3820 msgid "HOST" msgstr "HOST" +#: src/multiint.cpp:3827 +#: src/multimenu.cpp:772 +msgid "Ping" +msgstr "Ping" + #: src/multijoin.cpp:100 #: src/multijoin.cpp:101 msgid "Players Still Joining" @@ -14422,17 +14427,17 @@ msgstr "%s opuścił grę" msgid "File transfer has been aborted for %d." msgstr "Transfer pliku został anulowany dla %d." -#: src/multijoin.cpp:376 +#: src/multijoin.cpp:373 #, c-format msgid "%s (%u) has an incompatible mod, and has been kicked." msgstr "%s (%u) ma niekompatybilny mod i został wyrzucony." -#: src/multijoin.cpp:415 +#: src/multijoin.cpp:412 #, c-format msgid "%s is Joining the Game" msgstr "%s dołącza do gry" -#: src/multijoin.cpp:425 +#: src/multijoin.cpp:422 msgid "System message:" msgstr "Wiadomość systemowa:" @@ -14541,10 +14546,6 @@ msgstr "Zabójstwa" msgid "Units" msgstr "Jednostki" -#: src/multimenu.cpp:772 -msgid "Ping" -msgstr "Ping" - #: src/multimenu.cpp:776 msgid "Structs" msgstr "Konstrukcje" @@ -14578,84 +14579,84 @@ msgstr "Przesyła energię graczowi" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "Gracz %s wyrzucony z powodu próby pominięcia sprawdzenia integralności danych!" -#: src/multiplay.cpp:1146 +#: src/multiplay.cpp:1057 msgid "(allies" msgstr "(sojusznicy" -#: src/multiplay.cpp:1154 +#: src/multiplay.cpp:1065 msgid "(private to " msgstr "(prywatny dla" -#: src/multiplay.cpp:1167 +#: src/multiplay.cpp:1078 msgid "[invalid]" msgstr "[nieprawidłowy]" -#: src/multiplay.cpp:2057 +#: src/multiplay.cpp:1942 msgid "Green" msgstr "Zielony" -#: src/multiplay.cpp:2058 +#: src/multiplay.cpp:1943 msgid "Orange" msgstr "Pomarańczowy" -#: src/multiplay.cpp:2059 +#: src/multiplay.cpp:1944 msgid "Grey" msgstr "Szary" -#: src/multiplay.cpp:2060 +#: src/multiplay.cpp:1945 msgid "Black" msgstr "Czarny" -#: src/multiplay.cpp:2061 +#: src/multiplay.cpp:1946 msgid "Red" msgstr "Czerwony" -#: src/multiplay.cpp:2062 +#: src/multiplay.cpp:1947 msgid "Blue" msgstr "Niebieski" -#: src/multiplay.cpp:2063 +#: src/multiplay.cpp:1948 msgid "Pink" msgstr "Różowy" -#: src/multiplay.cpp:2064 +#: src/multiplay.cpp:1949 msgid "Cyan" msgstr "Turkusowy" -#: src/multiplay.cpp:2065 +#: src/multiplay.cpp:1950 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:2066 +#: src/multiplay.cpp:1951 msgid "Purple" msgstr "" -#: src/multiplay.cpp:2067 +#: src/multiplay.cpp:1952 msgid "White" msgstr "" -#: src/multiplay.cpp:2068 +#: src/multiplay.cpp:1953 #, fuzzy msgid "Bright blue" msgstr "Prawy przycisk" -#: src/multiplay.cpp:2069 +#: src/multiplay.cpp:1954 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:2070 +#: src/multiplay.cpp:1955 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:2071 +#: src/multiplay.cpp:1956 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:2072 +#: src/multiplay.cpp:1957 msgid "Brown" msgstr "" -#: src/order.cpp:841 +#: src/order.cpp:800 msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "Nie możemy tego zrobić! Tylko cyborgi mogą korzystać Transportowca cyborgów!" @@ -14790,20 +14791,20 @@ msgstr "Całkowity czas gry - %s" msgid "You cheated!" msgstr "Oszukiwałeś!" -#: src/scriptfuncs.cpp:3250 +#: src/scriptfuncs.cpp:3287 msgid "YOU ARE VICTORIOUS!" msgstr "ZWYCIĘŻYŁEŚ!" -#: src/scriptfuncs.cpp:3254 +#: src/scriptfuncs.cpp:3291 msgid "YOU WERE DEFEATED!" msgstr "ZOSTAŁEŚ POKONANY!" -#: src/scriptfuncs.cpp:9500 +#: src/scriptfuncs.cpp:9537 #, c-format msgid "Beacon received from %s!" msgstr "Sygnał otrzymany od %s!" -#: src/scriptfuncs.cpp:9546 +#: src/scriptfuncs.cpp:9583 #, c-format msgid "Beacon %d" msgstr "Sygnał %d" @@ -14833,13 +14834,13 @@ msgstr "Niemożna odnaleźć jednostek z radarami!" msgid "Unable to locate any Commanders!" msgstr "Niemożna odnaleźć dowódców!" -#: src/structure.cpp:2615 +#: src/structure.cpp:2614 #, fuzzy msgid "Command Control Limit Reached - Production Halted" msgstr "Limit kontrolny osiągnięty - produkcja wstrzymana" -#: src/structure.cpp:5815 -#: src/structure.cpp:5840 +#: src/structure.cpp:5806 +#: src/structure.cpp:5831 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" @@ -14847,51 +14848,51 @@ msgstr[0] "%s - %u Jednostka przydzielona" msgstr[1] "%s - %u Jednostki przydzielone" msgstr[2] "%s - %u Jednostek przydzielonych" -#: src/structure.cpp:5845 -#: src/structure.cpp:5913 -#: src/structure.cpp:5929 -#: src/structure.cpp:5943 +#: src/structure.cpp:5836 +#: src/structure.cpp:5904 +#: src/structure.cpp:5920 +#: src/structure.cpp:5934 #, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - Uszkodzenia %3.0f%%" -#: src/structure.cpp:5895 +#: src/structure.cpp:5886 #, c-format msgid "%s - Connected %u of %u" msgstr "%s - Połączony %u z %u" -#: src/structure.cpp:6059 -#: src/structure.cpp:6104 +#: src/structure.cpp:6050 +#: src/structure.cpp:6095 #, c-format msgid "%s - Electronically Damaged" msgstr "%s - Uszkodzony elektronicznie" # This maybe sound weird, but I translated this as 'stolen technology' -#: src/structure.cpp:6341 +#: src/structure.cpp:6332 msgid "Electronic Reward - Visibility Report" msgstr "Technologia skradziona - raport widoczności" -#: src/structure.cpp:6381 +#: src/structure.cpp:6372 msgid "Factory Reward - Propulsion" msgstr "Technologia skradziona - Napęd" -#: src/structure.cpp:6405 +#: src/structure.cpp:6396 msgid "Factory Reward - Body" msgstr "Technologia skradziona - Kadłub" -#: src/structure.cpp:6429 +#: src/structure.cpp:6420 msgid "Factory Reward - Weapon" msgstr "Technologia skradziona - Broń" -#: src/structure.cpp:6438 +#: src/structure.cpp:6429 msgid "Factory Reward - Nothing" msgstr "Technologia skradziona - Brak" -#: src/structure.cpp:6466 +#: src/structure.cpp:6457 msgid "Repair Facility Award - Repair" msgstr "Technologia skradziona - Naprawa" -#: src/structure.cpp:6473 +#: src/structure.cpp:6464 msgid "Repair Facility Award - Nothing" msgstr "Technologia skradziona - Brak" diff --git a/po/pt.po b/po/pt.po index 9434740d5..a4dfaa4d2 100644 --- a/po/pt.po +++ b/po/pt.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-02-25 00:09+0100\n" +"POT-Creation-Date: 2011-02-25 23:35+0100\n" "PO-Revision-Date: 2011-02-16 12:57-0300\n" "Last-Translator: Artur Filipe \n" "Language-Team: Portugese \n" @@ -12186,11 +12186,11 @@ msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing msgstr "Não foi possível comunicar com o servidor de lobby! A porta TCP %u está aberta para tráfego outgoing?" #: src/challenge.cpp:184 -#: src/hci.cpp:914 -#: src/hci.cpp:3376 -#: src/hci.cpp:3499 -#: src/hci.cpp:3910 -#: src/hci.cpp:4928 +#: src/hci.cpp:916 +#: src/hci.cpp:3378 +#: src/hci.cpp:3501 +#: src/hci.cpp:3912 +#: src/hci.cpp:4930 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12343,7 +12343,7 @@ msgstr "ir directamente para o ecrã de anfitrião" #: src/configuration.cpp:393 #: src/configuration.cpp:394 -#: src/multistat.cpp:130 +#: src/multistat.cpp:124 msgid "Player" msgstr "Jogador" @@ -12633,7 +12633,7 @@ msgid "Tutorial" msgstr "Tutorial" #: src/frontend.cpp:100 -#: src/hci.cpp:3485 +#: src/hci.cpp:3487 msgid "Options" msgstr "Opções" @@ -12695,8 +12695,8 @@ msgstr "UM JOGADOR" #: src/frontend.cpp:303 #: src/ingameop.cpp:494 -#: src/mission.cpp:2527 -#: src/mission.cpp:2630 +#: src/mission.cpp:2493 +#: src/mission.cpp:2596 msgid "Load Saved Game" msgstr "Carregar Jogo Gravado" @@ -12990,190 +12990,190 @@ msgstr "OPÇÕES DE JOGO" msgid "Mod: " msgstr "" -#: src/hci.cpp:1235 +#: src/hci.cpp:1237 msgid "MAP SAVED!" msgstr "MAPA GRAVADO!" -#: src/hci.cpp:1571 +#: src/hci.cpp:1573 #: src/loop.cpp:558 #: src/loop.cpp:574 msgid "GAME SAVED: " msgstr "JOGO GRAVADO!" -#: src/hci.cpp:1958 +#: src/hci.cpp:1960 msgid "Failed to create building" msgstr "Não foi possível criar o edifício" -#: src/hci.cpp:1975 +#: src/hci.cpp:1977 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new structure: %s." msgstr "Jogador %u está a fazer batota (menu debug) para obter uma nova estrutura %s." -#: src/hci.cpp:1990 +#: src/hci.cpp:1992 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new feature: %s." msgstr "Jogador %u está a fazer batota (menu debug) para obter uma nova característica %s." -#: src/hci.cpp:2012 +#: src/hci.cpp:2014 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid: %s." msgstr "Jogador %u está a fazer batota (menu debug) para obter um novo droid %s." -#: src/hci.cpp:2023 +#: src/hci.cpp:2025 #, fuzzy, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "Jogador %u está a fazer batota (menu debug) para obter um novo droid %s." -#: src/hci.cpp:3296 +#: src/hci.cpp:3298 msgid "Commanders (F6)" msgstr "Comandantes (F6)" -#: src/hci.cpp:3309 +#: src/hci.cpp:3311 msgid "Intelligence Display (F5)" msgstr "Ecrã de Informação" -#: src/hci.cpp:3322 +#: src/hci.cpp:3324 msgid "Manufacture (F1)" msgstr "Produção (F1)" -#: src/hci.cpp:3335 +#: src/hci.cpp:3337 msgid "Design (F4)" msgstr "Desenho (F4)" -#: src/hci.cpp:3348 +#: src/hci.cpp:3350 msgid "Research (F2)" msgstr "Investigação (F2)" -#: src/hci.cpp:3361 +#: src/hci.cpp:3363 msgid "Build (F3)" msgstr "Construir (F3)" -#: src/hci.cpp:3432 +#: src/hci.cpp:3434 #: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Energia" -#: src/hci.cpp:3523 +#: src/hci.cpp:3525 msgid "Map:" msgstr "" -#: src/hci.cpp:3536 +#: src/hci.cpp:3538 #, fuzzy msgid "Load" msgstr "Carregar Jogo" -#: src/hci.cpp:3537 +#: src/hci.cpp:3539 #, fuzzy msgid "Load Map File" msgstr "Carregar Jogo" -#: src/hci.cpp:3544 +#: src/hci.cpp:3546 #, fuzzy msgid "Save" msgstr "Gravar Jogo" -#: src/hci.cpp:3545 +#: src/hci.cpp:3547 #, fuzzy msgid "Save Map File" msgstr "Gravar Jogo" -#: src/hci.cpp:3553 +#: src/hci.cpp:3555 msgid "New" msgstr "" -#: src/hci.cpp:3554 +#: src/hci.cpp:3556 msgid "New Blank Map" msgstr "" -#: src/hci.cpp:3590 +#: src/hci.cpp:3592 msgid "Tile" msgstr "Mosaico" -#: src/hci.cpp:3591 +#: src/hci.cpp:3593 msgid "Place tiles on map" msgstr "Coloca mosaicos no mapa" -#: src/hci.cpp:3600 +#: src/hci.cpp:3602 msgid "Unit" msgstr "Unidade" -#: src/hci.cpp:3601 +#: src/hci.cpp:3603 msgid "Place Unit on map" msgstr "Colocar Unidade no mapa" -#: src/hci.cpp:3609 +#: src/hci.cpp:3611 msgid "Struct" msgstr "Estrutura" -#: src/hci.cpp:3610 +#: src/hci.cpp:3612 msgid "Place Structures on map" msgstr "Colocar Estruturas no mapa" -#: src/hci.cpp:3618 +#: src/hci.cpp:3620 msgid "Feat" msgstr "Característica" -#: src/hci.cpp:3619 +#: src/hci.cpp:3621 #, fuzzy msgid "Place Features on map" msgstr "Colocar ?recursos/características? no mapa" -#: src/hci.cpp:3629 +#: src/hci.cpp:3631 msgid "Pause" msgstr "" -#: src/hci.cpp:3630 +#: src/hci.cpp:3632 msgid "Pause or unpause the game" msgstr "Pausa ou retira de pausa o jogo" -#: src/hci.cpp:3644 +#: src/hci.cpp:3646 msgid "Align height of all map objects" msgstr "Alinhar altura de todos os objectos do mapa" -#: src/hci.cpp:3654 +#: src/hci.cpp:3656 msgid "Edit" msgstr "" -#: src/hci.cpp:3655 +#: src/hci.cpp:3657 #, fuzzy msgid "Start Edit Mode" msgstr "Começar sem Bases" -#: src/hci.cpp:3669 +#: src/hci.cpp:3671 #: src/ingameop.cpp:112 #: src/ingameop.cpp:256 #: src/ingameop.cpp:260 msgid "Quit" msgstr "Sair" -#: src/hci.cpp:3670 +#: src/hci.cpp:3672 msgid "Exit Game" msgstr "Sair do Jogo" -#: src/hci.cpp:3696 +#: src/hci.cpp:3698 #, fuzzy msgid "Current Player:" msgstr "Multijogador" -#: src/hci.cpp:3987 +#: src/hci.cpp:3989 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "Barra de Progresso" -#: src/hci.cpp:4853 +#: src/hci.cpp:4855 msgid "Factory Delivery Point" msgstr "Ponto de Destino da Fábrica" -#: src/hci.cpp:4871 +#: src/hci.cpp:4873 msgid "Loop Production" msgstr "Produção Pontínua" -#: src/hci.cpp:4951 +#: src/hci.cpp:4953 msgid "Tab Scroll left" msgstr "Tab Scroll esquerda" -#: src/hci.cpp:4966 +#: src/hci.cpp:4968 msgid "Tab Scroll right" msgstr "Tab Scroll direita" @@ -13199,8 +13199,8 @@ msgstr "" #: src/ingameop.cpp:274 #: src/ingameop.cpp:498 -#: src/mission.cpp:2514 -#: src/mission.cpp:2633 +#: src/mission.cpp:2480 +#: src/mission.cpp:2599 msgid "Save Game" msgstr "Gravar Jogo" @@ -14156,37 +14156,37 @@ msgstr "Activar/Desactivar câmara de localização" msgid "Could not save game!" msgstr "O jogo não pôde ser gravado" -#: src/mission.cpp:2075 +#: src/mission.cpp:2041 msgid "Load Transport" msgstr "Carregar Transporte" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "OBJECTIVO ALCANÇADO por batotice" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED" msgstr "OBJECTIVO ALCANÇADO" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED--and you cheated!" msgstr "OBJECTIVO FALHADO-- e fizeste batotice!" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED" msgstr "OBJECTIVO FALHADO" -#: src/mission.cpp:2493 -#: src/mission.cpp:2533 -#: src/mission.cpp:2647 +#: src/mission.cpp:2459 +#: src/mission.cpp:2499 +#: src/mission.cpp:2613 msgid "Quit To Main Menu" msgstr "Sair para o Menu Principal" -#: src/mission.cpp:2501 +#: src/mission.cpp:2467 msgid "Continue Game" msgstr "Continuar Jogo" -#: src/mission.cpp:2598 +#: src/mission.cpp:2564 msgid "GAME SAVED :" msgstr "JOGO GRAVADO :" @@ -14586,10 +14586,15 @@ msgstr "" msgid "Map: %d%% downloaded" msgstr "" -#: src/multiint.cpp:3822 +#: src/multiint.cpp:3820 msgid "HOST" msgstr "" +#: src/multiint.cpp:3827 +#: src/multimenu.cpp:772 +msgid "Ping" +msgstr "Ping" + #: src/multijoin.cpp:100 #: src/multijoin.cpp:101 msgid "Players Still Joining" @@ -14729,10 +14734,6 @@ msgstr "Mortes" msgid "Units" msgstr "Unidades" -#: src/multimenu.cpp:772 -msgid "Ping" -msgstr "Ping" - #: src/multimenu.cpp:776 #, fuzzy msgid "Structs" diff --git a/po/pt_BR.po b/po/pt_BR.po index 00e25f837..aa243d4d7 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-02-25 00:09+0100\n" +"POT-Creation-Date: 2011-02-25 23:35+0100\n" "PO-Revision-Date: 2011-02-16 12:57-0300\n" "Last-Translator: Artur Filipe \n" "Language-Team: Brazilian Portugese \n" @@ -12019,11 +12019,11 @@ msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing msgstr "Não foi possível communicar com o servidor de lobby! A porta TCP %u está aberta para tráfego saindo?" #: src/challenge.cpp:184 -#: src/hci.cpp:914 -#: src/hci.cpp:3376 -#: src/hci.cpp:3499 -#: src/hci.cpp:3910 -#: src/hci.cpp:4928 +#: src/hci.cpp:916 +#: src/hci.cpp:3378 +#: src/hci.cpp:3501 +#: src/hci.cpp:3912 +#: src/hci.cpp:4930 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12175,7 +12175,7 @@ msgstr "ir diretamente à tela de hospedeiro" #: src/configuration.cpp:393 #: src/configuration.cpp:394 -#: src/multistat.cpp:130 +#: src/multistat.cpp:124 msgid "Player" msgstr "Jogador" @@ -12463,7 +12463,7 @@ msgid "Tutorial" msgstr "Aprendendo a Jogar" #: src/frontend.cpp:100 -#: src/hci.cpp:3485 +#: src/hci.cpp:3487 msgid "Options" msgstr "Opções" @@ -12524,8 +12524,8 @@ msgstr "UM JOGADOR" #: src/frontend.cpp:303 #: src/ingameop.cpp:494 -#: src/mission.cpp:2527 -#: src/mission.cpp:2630 +#: src/mission.cpp:2493 +#: src/mission.cpp:2596 msgid "Load Saved Game" msgstr "Carregar Jogo Salvo" @@ -12814,183 +12814,183 @@ msgstr "OPÇÕES DE JOGO" msgid "Mod: " msgstr "Mod:" -#: src/hci.cpp:1235 +#: src/hci.cpp:1237 msgid "MAP SAVED!" msgstr "MAPA SALVO!" -#: src/hci.cpp:1571 +#: src/hci.cpp:1573 #: src/loop.cpp:558 #: src/loop.cpp:574 msgid "GAME SAVED: " msgstr "JOGO SALVO:" -#: src/hci.cpp:1958 +#: src/hci.cpp:1960 msgid "Failed to create building" msgstr "Impossível criar edifício" -#: src/hci.cpp:1975 +#: src/hci.cpp:1977 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new structure: %s." msgstr "Jogador %u trapaceia (menu debug) a ele mesmo uma nova estrutura: %s." -#: src/hci.cpp:1990 +#: src/hci.cpp:1992 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new feature: %s." msgstr "Jogador %u trapaceia (menu debug) a ele mesmo um novo artefato: %s." -#: src/hci.cpp:2012 +#: src/hci.cpp:2014 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid: %s." msgstr "Jogador %u trapaceia (menu debug) a ele mesmo uma nova droide: %s." -#: src/hci.cpp:2023 +#: src/hci.cpp:2025 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "Jogador %u está trapaceando (debug menu)! Ele/ela ganhou um novo droide." -#: src/hci.cpp:3296 +#: src/hci.cpp:3298 msgid "Commanders (F6)" msgstr "Comandos (F6)" -#: src/hci.cpp:3309 +#: src/hci.cpp:3311 msgid "Intelligence Display (F5)" msgstr "Mostrar Inteligência (F5)" -#: src/hci.cpp:3322 +#: src/hci.cpp:3324 msgid "Manufacture (F1)" msgstr "Desenvolvedor (F1)" -#: src/hci.cpp:3335 +#: src/hci.cpp:3337 msgid "Design (F4)" msgstr "Padrão (F4)" -#: src/hci.cpp:3348 +#: src/hci.cpp:3350 msgid "Research (F2)" msgstr "Pesquisa (F2)" -#: src/hci.cpp:3361 +#: src/hci.cpp:3363 msgid "Build (F3)" msgstr "Construir (F3)" -#: src/hci.cpp:3432 +#: src/hci.cpp:3434 #: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Energia" -#: src/hci.cpp:3523 +#: src/hci.cpp:3525 msgid "Map:" msgstr "Mapa:" -#: src/hci.cpp:3536 +#: src/hci.cpp:3538 msgid "Load" msgstr "Carregar" -#: src/hci.cpp:3537 +#: src/hci.cpp:3539 msgid "Load Map File" msgstr "Carregar Mapa" -#: src/hci.cpp:3544 +#: src/hci.cpp:3546 msgid "Save" msgstr "Salvar" -#: src/hci.cpp:3545 +#: src/hci.cpp:3547 msgid "Save Map File" msgstr "Salvar Mapa" -#: src/hci.cpp:3553 +#: src/hci.cpp:3555 msgid "New" msgstr "Novo" -#: src/hci.cpp:3554 +#: src/hci.cpp:3556 msgid "New Blank Map" msgstr "Novo Mapa Vazio" -#: src/hci.cpp:3590 +#: src/hci.cpp:3592 msgid "Tile" msgstr "Espaço" -#: src/hci.cpp:3591 +#: src/hci.cpp:3593 msgid "Place tiles on map" msgstr "Colocar Espaços no mapa" -#: src/hci.cpp:3600 +#: src/hci.cpp:3602 msgid "Unit" msgstr "Unidade" -#: src/hci.cpp:3601 +#: src/hci.cpp:3603 msgid "Place Unit on map" msgstr "Colocar Unidade no mapa" -#: src/hci.cpp:3609 +#: src/hci.cpp:3611 msgid "Struct" msgstr "Estrutura" -#: src/hci.cpp:3610 +#: src/hci.cpp:3612 msgid "Place Structures on map" msgstr "Colocar estruturas no mapa" -#: src/hci.cpp:3618 +#: src/hci.cpp:3620 msgid "Feat" msgstr "Feito" -#: src/hci.cpp:3619 +#: src/hci.cpp:3621 msgid "Place Features on map" msgstr "Colocar Artefatos no mapa" -#: src/hci.cpp:3629 +#: src/hci.cpp:3631 msgid "Pause" msgstr "Pausa" -#: src/hci.cpp:3630 +#: src/hci.cpp:3632 msgid "Pause or unpause the game" msgstr "Pausar ou resumir o jogo" -#: src/hci.cpp:3644 +#: src/hci.cpp:3646 msgid "Align height of all map objects" msgstr "Alinhar a altitude dos objetos e do mapa" -#: src/hci.cpp:3654 +#: src/hci.cpp:3656 msgid "Edit" msgstr "Editar" -#: src/hci.cpp:3655 +#: src/hci.cpp:3657 msgid "Start Edit Mode" msgstr "Modo Editar Início" -#: src/hci.cpp:3669 +#: src/hci.cpp:3671 #: src/ingameop.cpp:112 #: src/ingameop.cpp:256 #: src/ingameop.cpp:260 msgid "Quit" msgstr "Sair" -#: src/hci.cpp:3670 +#: src/hci.cpp:3672 msgid "Exit Game" msgstr "Sair do Jogo" -#: src/hci.cpp:3696 +#: src/hci.cpp:3698 msgid "Current Player:" msgstr "Jogador Atual:" -#: src/hci.cpp:3987 +#: src/hci.cpp:3989 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "Barra de Progresso" -#: src/hci.cpp:4853 +#: src/hci.cpp:4855 msgid "Factory Delivery Point" msgstr "Ponto de Entrega da Fábrica" -#: src/hci.cpp:4871 +#: src/hci.cpp:4873 msgid "Loop Production" msgstr "Repetir Produção" -#: src/hci.cpp:4951 +#: src/hci.cpp:4953 msgid "Tab Scroll left" msgstr "Tab mover para esquerda" -#: src/hci.cpp:4966 +#: src/hci.cpp:4968 msgid "Tab Scroll right" msgstr "Tab mover para direita" @@ -13016,8 +13016,8 @@ msgstr "Interface de Usuário Tática (Icone de Origem do Alvo): Esconder" #: src/ingameop.cpp:274 #: src/ingameop.cpp:498 -#: src/mission.cpp:2514 -#: src/mission.cpp:2633 +#: src/mission.cpp:2480 +#: src/mission.cpp:2599 msgid "Save Game" msgstr "Salvar" @@ -13951,37 +13951,37 @@ msgstr "Liga/Desliga Modo Dirigir" msgid "Could not save game!" msgstr "Impossível salvar o jogo!" -#: src/mission.cpp:2075 +#: src/mission.cpp:2041 msgid "Load Transport" msgstr "Carregar Transportes" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "OBJETIVO ARQUIVADO por trapaça!" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED" msgstr "OBJETIVO ARQUIVADO" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED--and you cheated!" msgstr "FALHA NO OBJETIVO--e você trapaçeou!" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED" msgstr "FALHA NO OBJETIVO" -#: src/mission.cpp:2493 -#: src/mission.cpp:2533 -#: src/mission.cpp:2647 +#: src/mission.cpp:2459 +#: src/mission.cpp:2499 +#: src/mission.cpp:2613 msgid "Quit To Main Menu" msgstr "Sair para o Menu Principal" -#: src/mission.cpp:2501 +#: src/mission.cpp:2467 msgid "Continue Game" msgstr "Continuar o Jogo" -#: src/mission.cpp:2598 +#: src/mission.cpp:2564 msgid "GAME SAVED :" msgstr "JOGO SALVO :" @@ -14375,10 +14375,15 @@ msgstr "Enviando mapa: %d%%" msgid "Map: %d%% downloaded" msgstr "Mapa: %d%% baixado" -#: src/multiint.cpp:3822 +#: src/multiint.cpp:3820 msgid "HOST" msgstr "HOSPEDEIRO" +#: src/multiint.cpp:3827 +#: src/multimenu.cpp:772 +msgid "Ping" +msgstr "Ping" + #: src/multijoin.cpp:100 #: src/multijoin.cpp:101 msgid "Players Still Joining" @@ -14513,10 +14518,6 @@ msgstr "Mortes" msgid "Units" msgstr "Unidades" -#: src/multimenu.cpp:772 -msgid "Ping" -msgstr "Ping" - #: src/multimenu.cpp:776 msgid "Structs" msgstr "Estruturas" diff --git a/po/ro.po b/po/ro.po index a0b74afd3..7e880849e 100644 --- a/po/ro.po +++ b/po/ro.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-01-18 00:54+0100\n" +"POT-Creation-Date: 2011-02-25 23:35+0100\n" "PO-Revision-Date: 2010-10-24 13:31+0200\n" "Last-Translator: Adrian Mos \n" "Language-Team: Romanian \n" @@ -5730,7 +5730,7 @@ msgid "New Design" msgstr "Schemă nouă" #: data/base/messages/strings/names.txt:15 -#: src/design.cpp:1313 +#: src/design.cpp:1275 msgid "Transport" msgstr "Transportor" @@ -12011,26 +12011,26 @@ msgid "System locale" msgstr "Limba sistemului" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1043 +#: lib/netplay/netplay.cpp:1042 msgid "Enter password here" msgstr "Introdu parola aici" -#: lib/netplay/netplay.cpp:2048 +#: lib/netplay/netplay.cpp:2060 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "" -#: lib/netplay/netplay.cpp:2062 +#: lib/netplay/netplay.cpp:2082 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "" #: src/challenge.cpp:184 -#: src/hci.cpp:922 -#: src/hci.cpp:3390 -#: src/hci.cpp:3513 -#: src/hci.cpp:3924 -#: src/hci.cpp:4942 +#: src/hci.cpp:916 +#: src/hci.cpp:3378 +#: src/hci.cpp:3501 +#: src/hci.cpp:3912 +#: src/hci.cpp:4930 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12182,149 +12182,149 @@ msgstr "" #: src/configuration.cpp:393 #: src/configuration.cpp:394 -#: src/multistat.cpp:130 +#: src/multistat.cpp:124 msgid "Player" msgstr "Jucător" -#: src/design.cpp:449 -#: src/design.cpp:469 -#: src/design.cpp:3501 +#: src/design.cpp:443 +#: src/design.cpp:455 +#: src/design.cpp:3464 msgid "New Vehicle" msgstr "Vehicul nou" -#: src/design.cpp:515 +#: src/design.cpp:500 msgid "Vehicle Body" msgstr "Șasiul vehiculului" -#: src/design.cpp:535 +#: src/design.cpp:520 msgid "Vehicle Propulsion" msgstr "Propulsia vehiculului" -#: src/design.cpp:556 -#: src/design.cpp:579 -#: src/design.cpp:603 +#: src/design.cpp:541 +#: src/design.cpp:564 +#: src/design.cpp:588 msgid "Vehicle Turret" msgstr "Turela vehiculului" -#: src/design.cpp:622 +#: src/design.cpp:607 msgid "Delete Design" msgstr "Șterge schema" -#: src/design.cpp:673 -#: src/design.cpp:720 +#: src/design.cpp:658 +#: src/design.cpp:705 msgid "Kinetic Armour" msgstr "Armură cinetică" -#: src/design.cpp:682 -#: src/design.cpp:730 +#: src/design.cpp:667 +#: src/design.cpp:715 msgid "Thermal Armour" msgstr "Armură termală" -#: src/design.cpp:698 -#: src/design.cpp:750 +#: src/design.cpp:683 +#: src/design.cpp:735 msgid "Engine Output" msgstr "Puterea motorului" -#: src/design.cpp:706 -#: src/design.cpp:759 -#: src/design.cpp:1529 -#: src/design.cpp:1553 -#: src/design.cpp:1574 -#: src/design.cpp:1590 -#: src/design.cpp:1610 -#: src/design.cpp:1627 -#: src/design.cpp:1647 -#: src/design.cpp:1664 -#: src/design.cpp:1705 -#: src/design.cpp:1737 -#: src/design.cpp:1869 -#: src/design.cpp:1885 -#: src/design.cpp:1923 -#: src/design.cpp:1956 +#: src/design.cpp:691 +#: src/design.cpp:744 +#: src/design.cpp:1486 +#: src/design.cpp:1510 +#: src/design.cpp:1531 +#: src/design.cpp:1547 +#: src/design.cpp:1567 +#: src/design.cpp:1584 +#: src/design.cpp:1604 +#: src/design.cpp:1621 +#: src/design.cpp:1662 +#: src/design.cpp:1694 +#: src/design.cpp:1826 +#: src/design.cpp:1842 +#: src/design.cpp:1880 +#: src/design.cpp:1913 msgid "Weight" msgstr "Masă" -#: src/design.cpp:790 -#: src/design.cpp:808 +#: src/design.cpp:775 +#: src/design.cpp:793 msgid "Total Power Required" msgstr "Energie necesară" -#: src/design.cpp:821 -#: src/design.cpp:840 +#: src/design.cpp:806 +#: src/design.cpp:825 msgid "Total Body Points" msgstr "Rezistență totală a șasiului" -#: src/design.cpp:1027 -#: src/design.cpp:1059 +#: src/design.cpp:996 +#: src/design.cpp:1025 msgid "Power Usage" msgstr "Consum energetic" -#: src/design.cpp:1335 +#: src/design.cpp:1298 msgid "Hydra " msgstr "Hidră" -#: src/design.cpp:1509 -#: src/design.cpp:1537 +#: src/design.cpp:1466 +#: src/design.cpp:1494 msgid "Sensor Range" msgstr "Raza senzorului" -#: src/design.cpp:1521 -#: src/design.cpp:1545 +#: src/design.cpp:1478 +#: src/design.cpp:1502 msgid "Sensor Power" msgstr "Puterea senzorului" -#: src/design.cpp:1566 -#: src/design.cpp:1582 +#: src/design.cpp:1523 +#: src/design.cpp:1539 msgid "ECM Power" msgstr "Puterea ECM" -#: src/design.cpp:1602 -#: src/design.cpp:1619 -#: src/design.cpp:1639 -#: src/design.cpp:1656 +#: src/design.cpp:1559 +#: src/design.cpp:1576 +#: src/design.cpp:1596 +#: src/design.cpp:1613 msgid "Build Points" msgstr "" -#: src/design.cpp:1677 -#: src/design.cpp:1713 +#: src/design.cpp:1634 +#: src/design.cpp:1670 msgid "Range" msgstr "Rază" -#: src/design.cpp:1689 -#: src/design.cpp:1721 +#: src/design.cpp:1646 +#: src/design.cpp:1678 msgid "Damage" msgstr "Putere de foc" -#: src/design.cpp:1697 -#: src/design.cpp:1729 +#: src/design.cpp:1654 +#: src/design.cpp:1686 msgid "Rate-of-Fire" msgstr "Rată de foc" -#: src/design.cpp:1857 -#: src/design.cpp:1877 +#: src/design.cpp:1814 +#: src/design.cpp:1834 msgid "Air Speed" msgstr "Viteza aeriană" -#: src/design.cpp:1895 -#: src/design.cpp:1932 +#: src/design.cpp:1852 +#: src/design.cpp:1889 msgid "Road Speed" msgstr "Viteza pe șosea" -#: src/design.cpp:1905 -#: src/design.cpp:1940 +#: src/design.cpp:1862 +#: src/design.cpp:1897 msgid "Off-Road Speed" msgstr "Viteza pe teren accidentat" -#: src/design.cpp:1913 -#: src/design.cpp:1948 +#: src/design.cpp:1870 +#: src/design.cpp:1905 msgid "Water Speed" msgstr "Viteza pe apă" -#: src/design.cpp:2074 +#: src/design.cpp:2031 msgid "Weapons" msgstr "Arme" -#: src/design.cpp:2094 +#: src/design.cpp:2051 msgid "Systems" msgstr "Sisteme" @@ -12337,7 +12337,7 @@ msgid "Player dropped" msgstr "Jucătorul s-a deconectat" #: src/display3d.cpp:599 -#: src/multiint.cpp:2116 +#: src/multiint.cpp:2125 msgid "Waiting for other players" msgstr "Așteptare pentru alți jucători" @@ -12345,114 +12345,114 @@ msgstr "Așteptare pentru alți jucători" msgid "Out of sync" msgstr "" -#: src/display.cpp:1651 +#: src/display.cpp:1649 msgid "Cannot Build. Oil Resource Burning." msgstr "Nu se poate construi. Puțul de petrol e în flăcări." -#: src/display.cpp:1830 -#: src/display.cpp:2423 +#: src/display.cpp:1828 +#: src/display.cpp:2421 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - Avarii %d%% - Experiență %d, %s" -#: src/display.cpp:1846 +#: src/display.cpp:1844 #, c-format msgid "%s - Allied - Damage %d%% - Experience %d, %s" msgstr "%s - Aliat - Avarii %d%% - Experiență %d, %s" -#: src/display.cpp:2044 +#: src/display.cpp:2042 msgid "Truck ordered to build Oil Derrick" msgstr "Dat ordin constructorului să construiască o pompă de petrol" -#: src/display.cpp:2045 +#: src/display.cpp:2043 #, fuzzy msgid "2 trucks ordered to build Oil Derrick" msgstr "Dat ordin constructorului să construiască o pompă de petrol" -#: src/display.cpp:2046 +#: src/display.cpp:2044 #, fuzzy, c-format msgid "%d trucks ordered to build Oil Derrick" msgstr "Dat ordin constructorului să construiască o pompă de petrol" -#: src/droid.cpp:208 +#: src/droid.cpp:211 msgid "Unit Lost!" msgstr "Unitate pierdută!" -#: src/droid.cpp:1370 +#: src/droid.cpp:1376 msgid "Structure Restored" msgstr "Clădire reconstruită" -#: src/droid.cpp:2712 +#: src/droid.cpp:2732 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:2725 +#: src/droid.cpp:2745 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:2738 +#: src/droid.cpp:2758 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:2742 +#: src/droid.cpp:2762 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:3080 +#: src/droid.cpp:3093 msgid "Rookie" msgstr "Recrut" -#: src/droid.cpp:3081 +#: src/droid.cpp:3094 msgctxt "rank" msgid "Green" msgstr "Soldat" -#: src/droid.cpp:3082 +#: src/droid.cpp:3095 msgid "Trained" msgstr "Antrenat" -#: src/droid.cpp:3083 +#: src/droid.cpp:3096 msgid "Regular" msgstr "Armată regulată" -#: src/droid.cpp:3084 +#: src/droid.cpp:3097 msgid "Professional" msgstr "Profesionist" -#: src/droid.cpp:3085 +#: src/droid.cpp:3098 msgid "Veteran" msgstr "Veteran" -#: src/droid.cpp:3086 +#: src/droid.cpp:3099 msgid "Elite" msgstr "Elită" -#: src/droid.cpp:3087 +#: src/droid.cpp:3100 msgid "Special" msgstr "Special" -#: src/droid.cpp:3088 +#: src/droid.cpp:3101 msgid "Hero" msgstr "Erou" -#: src/droid.cpp:4110 +#: src/droid.cpp:4123 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "" -#: src/droid.cpp:4114 +#: src/droid.cpp:4127 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "" @@ -12471,7 +12471,7 @@ msgid "Tutorial" msgstr "Tutorial" #: src/frontend.cpp:100 -#: src/hci.cpp:3499 +#: src/hci.cpp:3487 msgid "Options" msgstr "Opțiuni" @@ -12522,7 +12522,7 @@ msgid "Challenges" msgstr "" #: src/frontend.cpp:215 -#: src/ingameop.cpp:275 +#: src/ingameop.cpp:272 msgid "Load Game" msgstr "Încarcă joc" @@ -12531,9 +12531,9 @@ msgid "SINGLE PLAYER" msgstr "JOC INDIVIDUAL" #: src/frontend.cpp:303 -#: src/ingameop.cpp:498 -#: src/mission.cpp:2527 -#: src/mission.cpp:2630 +#: src/ingameop.cpp:494 +#: src/mission.cpp:2493 +#: src/mission.cpp:2596 msgid "Load Saved Game" msgstr "Încarcă joc salvat" @@ -12550,7 +12550,7 @@ msgid "Join Game" msgstr "Alătură-te unui joc" #: src/frontend.cpp:422 -#: src/multiint.cpp:1276 +#: src/multiint.cpp:1285 msgid "OPTIONS" msgstr "OPȚIUNI" @@ -12567,7 +12567,7 @@ msgid "Video Options" msgstr "Opțiuni video" #: src/frontend.cpp:426 -#: src/ingameop.cpp:270 +#: src/ingameop.cpp:267 msgid "Audio Options" msgstr "Opțiuni audio" @@ -12645,7 +12645,7 @@ msgid "Off" msgstr "Dezactivat" #: src/frontend.cpp:523 -#: src/multiint.cpp:1345 +#: src/multiint.cpp:1354 msgid "Fog" msgstr "Ceață" @@ -12656,7 +12656,7 @@ msgstr "Negură" #: src/frontend.cpp:530 #: src/frontend.cpp:595 -#: src/multiint.cpp:1347 +#: src/multiint.cpp:1356 msgid "Fog Of War" msgstr "Ceața bătăliei" @@ -12818,194 +12818,194 @@ msgid "GAME OPTIONS" msgstr "OPȚIUNI DE JOC" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2389 +#: src/multiint.cpp:2398 msgid "Mod: " msgstr "Modificare:" -#: src/hci.cpp:1245 +#: src/hci.cpp:1237 msgid "MAP SAVED!" msgstr "HARTĂ SALVATĂ!" -#: src/hci.cpp:1584 +#: src/hci.cpp:1573 #: src/loop.cpp:558 #: src/loop.cpp:574 #, fuzzy msgid "GAME SAVED: " msgstr "JOC SALVAT :" -#: src/hci.cpp:1971 +#: src/hci.cpp:1960 msgid "Failed to create building" msgstr "" -#: src/hci.cpp:1988 +#: src/hci.cpp:1977 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new structure: %s." msgstr "" -#: src/hci.cpp:2003 +#: src/hci.cpp:1992 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new feature: %s." msgstr "" -#: src/hci.cpp:2025 +#: src/hci.cpp:2014 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid: %s." msgstr "" -#: src/hci.cpp:2036 +#: src/hci.cpp:2025 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "" -#: src/hci.cpp:3310 +#: src/hci.cpp:3298 msgid "Commanders (F6)" msgstr "Comandanți (F6)" -#: src/hci.cpp:3323 +#: src/hci.cpp:3311 msgid "Intelligence Display (F5)" msgstr "Informații (F5)" -#: src/hci.cpp:3336 +#: src/hci.cpp:3324 msgid "Manufacture (F1)" msgstr "Producție (F1)" -#: src/hci.cpp:3349 +#: src/hci.cpp:3337 msgid "Design (F4)" msgstr "Scheme (F4)" -#: src/hci.cpp:3362 +#: src/hci.cpp:3350 msgid "Research (F2)" msgstr "Cercetare (F2)" -#: src/hci.cpp:3375 +#: src/hci.cpp:3363 msgid "Build (F3)" msgstr "Construcție (F3)" -#: src/hci.cpp:3446 -#: src/multiint.cpp:1392 +#: src/hci.cpp:3434 +#: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Energie" -#: src/hci.cpp:3537 +#: src/hci.cpp:3525 msgid "Map:" msgstr "Hartă:" -#: src/hci.cpp:3550 +#: src/hci.cpp:3538 msgid "Load" msgstr "Încarcă" -#: src/hci.cpp:3551 +#: src/hci.cpp:3539 msgid "Load Map File" msgstr "Încarcă fișierul hărții" -#: src/hci.cpp:3558 +#: src/hci.cpp:3546 msgid "Save" msgstr "Salvează" -#: src/hci.cpp:3559 +#: src/hci.cpp:3547 msgid "Save Map File" msgstr "Salvează fișierul hărții" -#: src/hci.cpp:3567 +#: src/hci.cpp:3555 msgid "New" msgstr "Nou" -#: src/hci.cpp:3568 +#: src/hci.cpp:3556 msgid "New Blank Map" msgstr "Nouă hartă goală" -#: src/hci.cpp:3604 +#: src/hci.cpp:3592 msgid "Tile" msgstr "Titlu" -#: src/hci.cpp:3605 +#: src/hci.cpp:3593 msgid "Place tiles on map" msgstr "" -#: src/hci.cpp:3614 +#: src/hci.cpp:3602 msgid "Unit" msgstr "" -#: src/hci.cpp:3615 +#: src/hci.cpp:3603 msgid "Place Unit on map" msgstr "" -#: src/hci.cpp:3623 +#: src/hci.cpp:3611 msgid "Struct" msgstr "" -#: src/hci.cpp:3624 +#: src/hci.cpp:3612 msgid "Place Structures on map" msgstr "" -#: src/hci.cpp:3632 +#: src/hci.cpp:3620 msgid "Feat" msgstr "" -#: src/hci.cpp:3633 +#: src/hci.cpp:3621 msgid "Place Features on map" msgstr "" -#: src/hci.cpp:3643 +#: src/hci.cpp:3631 msgid "Pause" msgstr "Pauză" -#: src/hci.cpp:3644 +#: src/hci.cpp:3632 msgid "Pause or unpause the game" msgstr "Pauză sau Continuare a Jocului" -#: src/hci.cpp:3658 +#: src/hci.cpp:3646 msgid "Align height of all map objects" msgstr "" -#: src/hci.cpp:3668 +#: src/hci.cpp:3656 msgid "Edit" msgstr "" -#: src/hci.cpp:3669 +#: src/hci.cpp:3657 msgid "Start Edit Mode" msgstr "" -#: src/hci.cpp:3683 +#: src/hci.cpp:3671 #: src/ingameop.cpp:112 -#: src/ingameop.cpp:258 -#: src/ingameop.cpp:263 +#: src/ingameop.cpp:256 +#: src/ingameop.cpp:260 msgid "Quit" msgstr "Ieșire" -#: src/hci.cpp:3684 +#: src/hci.cpp:3672 msgid "Exit Game" msgstr "Ieșire din joc" -#: src/hci.cpp:3710 +#: src/hci.cpp:3698 msgid "Current Player:" msgstr "Jucătorul Curent:" -#: src/hci.cpp:4001 +#: src/hci.cpp:3989 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "" -#: src/hci.cpp:4867 +#: src/hci.cpp:4855 msgid "Factory Delivery Point" msgstr "" -#: src/hci.cpp:4885 +#: src/hci.cpp:4873 msgid "Loop Production" msgstr "" -#: src/hci.cpp:4965 +#: src/hci.cpp:4953 msgid "Tab Scroll left" msgstr "" -#: src/hci.cpp:4980 +#: src/hci.cpp:4968 msgid "Tab Scroll right" msgstr "" #: src/ingameop.cpp:111 -#: src/ingameop.cpp:193 -#: src/ingameop.cpp:267 +#: src/ingameop.cpp:195 +#: src/ingameop.cpp:264 msgid "Resume Game" msgstr "" @@ -13013,32 +13013,32 @@ msgstr "" msgid "WARNING: You're the host. If you quit, the game ends for everyone!" msgstr "" -#: src/ingameop.cpp:185 -#: src/ingameop.cpp:527 +#: src/ingameop.cpp:186 +#: src/ingameop.cpp:523 msgid "Tactical UI (Target Origin Icon): Show" msgstr "" -#: src/ingameop.cpp:190 -#: src/ingameop.cpp:531 +#: src/ingameop.cpp:191 +#: src/ingameop.cpp:527 msgid "Tactical UI (Target Origin Icon): Hide" msgstr "" -#: src/ingameop.cpp:277 -#: src/ingameop.cpp:502 -#: src/mission.cpp:2514 -#: src/mission.cpp:2633 +#: src/ingameop.cpp:274 +#: src/ingameop.cpp:498 +#: src/mission.cpp:2480 +#: src/mission.cpp:2599 msgid "Save Game" msgstr "" -#: src/ingameop.cpp:343 +#: src/ingameop.cpp:339 msgid "Host has quit the game!" msgstr "Gazda a ieșit din joc!" -#: src/ingameop.cpp:349 +#: src/ingameop.cpp:345 msgid "The game can't continue without the host." msgstr "" -#: src/ingameop.cpp:355 +#: src/ingameop.cpp:351 msgid "--> QUIT <--" msgstr "" @@ -13413,52 +13413,52 @@ msgstr "" msgid "Screen shake when things die: On" msgstr "" -#: src/keybind.cpp:2603 -#: src/keybind.cpp:2646 +#: src/keybind.cpp:2604 +#: src/keybind.cpp:2647 msgid "Sorry, but game speed cannot be changed in multiplayer." msgstr "" -#: src/keybind.cpp:2624 -#: src/keybind.cpp:2667 -#: src/keybind.cpp:2689 +#: src/keybind.cpp:2625 +#: src/keybind.cpp:2668 +#: src/keybind.cpp:2690 msgid "Game Speed Reset" msgstr "" -#: src/keybind.cpp:2628 +#: src/keybind.cpp:2629 #, c-format msgid "Game Speed Increased to %3.1f" msgstr "" -#: src/keybind.cpp:2671 +#: src/keybind.cpp:2672 #, c-format msgid "Game Speed Reduced to %3.1f" msgstr "" -#: src/keybind.cpp:2701 +#: src/keybind.cpp:2702 msgid "Radar showing friend-foe colors" msgstr "" -#: src/keybind.cpp:2705 +#: src/keybind.cpp:2706 msgid "Radar showing player colors" msgstr "" -#: src/keybind.cpp:2726 +#: src/keybind.cpp:2727 msgid "Radar showing only objects" msgstr "" -#: src/keybind.cpp:2729 +#: src/keybind.cpp:2730 msgid "Radar blending terrain and height" msgstr "" -#: src/keybind.cpp:2732 +#: src/keybind.cpp:2733 msgid "Radar showing terrain" msgstr "" -#: src/keybind.cpp:2735 +#: src/keybind.cpp:2736 msgid "Radar showing revealed terrain" msgstr "" -#: src/keybind.cpp:2738 +#: src/keybind.cpp:2739 msgid "Radar showing height" msgstr "" @@ -13467,9 +13467,9 @@ msgid "KEY MAPPING" msgstr "" #: src/keyedit.cpp:372 -#: src/multiint.cpp:662 -#: src/multiint.cpp:1072 -#: src/multiint.cpp:1478 +#: src/multiint.cpp:671 +#: src/multiint.cpp:1081 +#: src/multiint.cpp:1487 msgid "Return To Previous Screen" msgstr "" @@ -13962,37 +13962,37 @@ msgstr "" msgid "Could not save game!" msgstr "Nu s-a putut salva jocul!" -#: src/mission.cpp:2075 +#: src/mission.cpp:2041 msgid "Load Transport" msgstr "Încarcă Transportorul" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "OBIECTIV ATINS prin trișare" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED" msgstr "OBIECTIV ATINS" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED--and you cheated!" msgstr "OBIECTIV EȘUAT--și ai trișat!" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED" msgstr "OBIECTIV EȘUAT" -#: src/mission.cpp:2493 -#: src/mission.cpp:2533 -#: src/mission.cpp:2647 +#: src/mission.cpp:2459 +#: src/mission.cpp:2499 +#: src/mission.cpp:2613 msgid "Quit To Main Menu" msgstr "Ieșire în meniul principal" -#: src/mission.cpp:2501 +#: src/mission.cpp:2467 msgid "Continue Game" msgstr "Continuă Jocul" -#: src/mission.cpp:2598 +#: src/mission.cpp:2564 msgid "GAME SAVED :" msgstr "JOC SALVAT :" @@ -14051,345 +14051,350 @@ msgstr "%s a format o alianță cu %s" msgid "You Discover Blueprints For %s" msgstr "Ai descoperit scheme pentru %s" -#: src/multiint.cpp:600 +#: src/multiint.cpp:609 #: src/multilimit.cpp:190 msgid "Accept Settings" msgstr "Acceptă Setările" -#: src/multiint.cpp:602 -#: src/multiint.cpp:1117 +#: src/multiint.cpp:611 +#: src/multiint.cpp:1126 msgid "Cancel" msgstr "Anulare" -#: src/multiint.cpp:613 +#: src/multiint.cpp:622 msgid "IP Address or Machine Name" msgstr "Adresă IP sau numele calculatorului" -#: src/multiint.cpp:659 +#: src/multiint.cpp:668 msgid "CONNECTION" msgstr "CONEXIUNE" -#: src/multiint.cpp:664 +#: src/multiint.cpp:673 msgid "Lobby" msgstr "Arenă" -#: src/multiint.cpp:665 +#: src/multiint.cpp:674 msgid "IP" msgstr "IP" -#: src/multiint.cpp:854 +#: src/multiint.cpp:863 msgid "No games are available" msgstr "Nici un joc disponibil" -#: src/multiint.cpp:857 +#: src/multiint.cpp:866 msgid "Game is full" msgstr "Jocul este plin" -#: src/multiint.cpp:861 +#: src/multiint.cpp:870 msgid "You were kicked!" msgstr "Ai fost eliminat!" -#: src/multiint.cpp:864 +#: src/multiint.cpp:873 msgid "Wrong Game Version!" msgstr "Versiune de joc greșită!" -#: src/multiint.cpp:867 +#: src/multiint.cpp:876 msgid "You have an incompatible mod." msgstr "Ai o modificare incomkpatibilă." -#: src/multiint.cpp:871 +#: src/multiint.cpp:880 msgid "Host couldn't send file?" msgstr "Gazda nu a putut transmite fișierul?" -#: src/multiint.cpp:875 +#: src/multiint.cpp:884 msgid "Incorrect Password!" msgstr "Parolă incorectă!" -#: src/multiint.cpp:878 +#: src/multiint.cpp:887 msgid "Host has dropped connection!" msgstr "Gazda a întrerupt conexiunea!" -#: src/multiint.cpp:882 +#: src/multiint.cpp:891 msgid "Connection Error" msgstr "Eroare de conexiune" -#: src/multiint.cpp:1012 +#: src/multiint.cpp:1021 msgid "Searching" msgstr "Căutare" -#: src/multiint.cpp:1069 +#: src/multiint.cpp:1078 msgid "GAMES" msgstr "JOCURI" -#: src/multiint.cpp:1077 +#: src/multiint.cpp:1086 msgid "Refresh Games List" msgstr "Reîmprospătează lista de jocuri" -#: src/multiint.cpp:1097 +#: src/multiint.cpp:1106 msgid "Enter Password:" msgstr "Introdu parola:" -#: src/multiint.cpp:1115 +#: src/multiint.cpp:1124 msgid "OK" msgstr "Acceptă" -#: src/multiint.cpp:1232 +#: src/multiint.cpp:1241 msgid "Tanks disabled!!" msgstr "Tancurile dezactivate!!" -#: src/multiint.cpp:1233 +#: src/multiint.cpp:1242 msgid "Cyborgs disabled." msgstr "Cyborgii dezactivați." -#: src/multiint.cpp:1234 +#: src/multiint.cpp:1243 msgid "VTOLs disabled." msgstr "DAV-urile dezactivate." -#: src/multiint.cpp:1281 -#: src/multiint.cpp:1288 +#: src/multiint.cpp:1290 +#: src/multiint.cpp:1297 msgid "Select Game Name" msgstr "Selectează numele jocului" -#: src/multiint.cpp:1281 +#: src/multiint.cpp:1290 msgid "One-Player Skirmish" msgstr "Luptă individuală" -#: src/multiint.cpp:1291 +#: src/multiint.cpp:1300 msgid "Select Map" msgstr "Alege harta" -#: src/multiint.cpp:1299 +#: src/multiint.cpp:1308 msgid "Click to set Password" msgstr "Click pentru a seta o parolă" -#: src/multiint.cpp:1309 -#: src/multiint.cpp:1310 +#: src/multiint.cpp:1318 +#: src/multiint.cpp:1319 msgid "Scavengers" msgstr "Bandiți" -#: src/multiint.cpp:1312 +#: src/multiint.cpp:1321 msgid "No Scavengers" msgstr "Fără bandiți" -#: src/multiint.cpp:1342 +#: src/multiint.cpp:1351 msgid "Select Player Name" msgstr "Selectează numele jucătorului" -#: src/multiint.cpp:1348 +#: src/multiint.cpp:1357 msgid "Distance Fog" msgstr "Ceață la distanță" -#: src/multiint.cpp:1359 +#: src/multiint.cpp:1368 #: src/multimenu.cpp:756 msgid "Alliances" msgstr "Alianțe" -#: src/multiint.cpp:1362 +#: src/multiint.cpp:1371 msgid "No Alliances" msgstr "Fără alianțe" -#: src/multiint.cpp:1364 +#: src/multiint.cpp:1373 msgid "Allow Alliances" msgstr "Permite alianțele" -#: src/multiint.cpp:1368 +#: src/multiint.cpp:1377 msgid "Locked Teams" msgstr "Echipe blocate" -#: src/multiint.cpp:1394 +#: src/multiint.cpp:1403 msgid "Low Power Levels" msgstr "Nivel mic de energie" -#: src/multiint.cpp:1396 +#: src/multiint.cpp:1405 msgid "Medium Power Levels" msgstr "Nivel mediu de energie" -#: src/multiint.cpp:1398 +#: src/multiint.cpp:1407 msgid "High Power Levels" msgstr "Nivel mare de energie" -#: src/multiint.cpp:1430 +#: src/multiint.cpp:1439 msgid "Base" msgstr "Bază" -#: src/multiint.cpp:1432 +#: src/multiint.cpp:1441 msgid "Start with No Bases" msgstr "Pornire fără baze" -#: src/multiint.cpp:1434 +#: src/multiint.cpp:1443 msgid "Start with Bases" msgstr "Pornire cu baze" -#: src/multiint.cpp:1436 +#: src/multiint.cpp:1445 msgid "Start with Advanced Bases" msgstr "Pornire cu baze avansate" -#: src/multiint.cpp:1468 +#: src/multiint.cpp:1477 msgid "Map Preview" msgstr "Vizionare Hartă" -#: src/multiint.cpp:1470 +#: src/multiint.cpp:1479 msgid "Click to see Map" msgstr "Click pentru a vedea Harta" -#: src/multiint.cpp:1484 +#: src/multiint.cpp:1493 msgid "Start Hosting Game" msgstr "Începe găzduirea jocului" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 msgid "Show Structure Limits" msgstr "Arată limitele pentru clădiri" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 msgid "Set Structure Limits" msgstr "Setează limitele pentru clădiri" -#: src/multiint.cpp:1587 +#: src/multiint.cpp:1596 msgid "DIFFICULTY" msgstr "" -#: src/multiint.cpp:1601 +#: src/multiint.cpp:1610 msgid "Less aggressive and starts with less units" msgstr "" -#: src/multiint.cpp:1602 +#: src/multiint.cpp:1611 #, fuzzy msgid "Plays nice" msgstr "Jucător" -#: src/multiint.cpp:1603 +#: src/multiint.cpp:1612 msgid "No holds barred" msgstr "" -#: src/multiint.cpp:1604 +#: src/multiint.cpp:1613 msgid "Starts with advantages and gets twice as much oil from derricks" msgstr "" -#: src/multiint.cpp:1632 +#: src/multiint.cpp:1641 msgid "CHOOSE AI" msgstr "" -#: src/multiint.cpp:1648 +#: src/multiint.cpp:1657 msgid "Allow human players to join in this slot" msgstr "" -#: src/multiint.cpp:1656 +#: src/multiint.cpp:1665 msgid "Leave this slot unused" msgstr "" -#: src/multiint.cpp:1736 +#: src/multiint.cpp:1745 msgid "Player colour" msgstr "Culoarea jucătorului" -#: src/multiint.cpp:2062 +#: src/multiint.cpp:2071 msgid "Team" msgstr "Echipă" -#: src/multiint.cpp:2074 +#: src/multiint.cpp:2083 msgid "Kick player" msgstr "Eliminare jucător" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 #, fuzzy msgid "Click to change difficulty" msgstr "Click pentru a ajusta dificultatea IA" -#: src/multiint.cpp:2121 +#: src/multiint.cpp:2130 msgid "Click when ready" msgstr "Click când ești pregătit" -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2134 msgid "READY?" msgstr "PREGĂTIT?" -#: src/multiint.cpp:2169 +#: src/multiint.cpp:2178 msgid "PLAYERS" msgstr "JUCĂTORI" -#: src/multiint.cpp:2204 +#: src/multiint.cpp:2213 #, fuzzy msgid "Click to change to this slot" msgstr "Click pentru a schimba setările jucătorului" -#: src/multiint.cpp:2232 +#: src/multiint.cpp:2241 msgid "Choose Team" msgstr "Alege Echipa" -#: src/multiint.cpp:2262 +#: src/multiint.cpp:2271 #, fuzzy msgid "Click to change player colour" msgstr "Click pentru a schimba setările jucătorului" -#: src/multiint.cpp:2290 +#: src/multiint.cpp:2299 #, fuzzy msgid "Click to change player position" msgstr "Click pentru a schimba setările jucătorului" -#: src/multiint.cpp:2296 +#: src/multiint.cpp:2305 #, fuzzy msgid "Click to change AI" msgstr "Click pentru a schimba setările jucătorului" -#: src/multiint.cpp:2300 +#: src/multiint.cpp:2309 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2362 +#: src/multiint.cpp:2371 msgid "CHAT" msgstr "CONVERSAȚIE" -#: src/multiint.cpp:2394 +#: src/multiint.cpp:2403 msgid "All players need to have the same mods to join your game." msgstr "Toți jucătorii trebuie să aibă aceleași modificări pentru a putea juca." -#: src/multiint.cpp:2552 +#: src/multiint.cpp:2561 #, c-format msgid "*** password [%s] is now required! ***" msgstr "*** parola [%s] este de acum necesară! ***" -#: src/multiint.cpp:2560 +#: src/multiint.cpp:2569 msgid "*** password is NOT required! ***" msgstr "*** parola NU este necesară! ***" -#: src/multiint.cpp:2801 +#: src/multiint.cpp:2810 msgid "Sorry! Failed to host the game." msgstr "Scuze! Jocul nu s-a putut găzdui." -#: src/multiint.cpp:2922 +#: src/multiint.cpp:2931 msgid "'Locked Teams' mode enabled" msgstr "Modul „Echipe Blocate” activat" -#: src/multiint.cpp:3003 +#: src/multiint.cpp:3012 #, c-format msgid "The host has kicked %s from the game!" msgstr "Gazda l-a eliminat pe %s din joc!" -#: src/multiint.cpp:3073 +#: src/multiint.cpp:3082 msgid "Host is Starting Game" msgstr "Gazda Începe Jocul" -#: src/multiint.cpp:3639 +#: src/multiint.cpp:3648 msgid "Players" msgstr "Jucători" -#: src/multiint.cpp:3772 +#: src/multiint.cpp:3786 #, c-format msgid "Sending Map: %d%% " msgstr "Trimitere de hartă: %d%%" -#: src/multiint.cpp:3780 +#: src/multiint.cpp:3794 #, c-format msgid "Map: %d%% downloaded" msgstr "Harta: %d%% descărcată" -#: src/multiint.cpp:3803 +#: src/multiint.cpp:3820 msgid "HOST" msgstr "GAZDĂ" +#: src/multiint.cpp:3827 +#: src/multimenu.cpp:772 +msgid "Ping" +msgstr "Ping" + #: src/multijoin.cpp:100 #: src/multijoin.cpp:101 msgid "Players Still Joining" @@ -14405,17 +14410,17 @@ msgstr "%s a părăsit jocul" msgid "File transfer has been aborted for %d." msgstr "Transfer de fișiere anulat pentru %d." -#: src/multijoin.cpp:376 +#: src/multijoin.cpp:373 #, c-format msgid "%s (%u) has an incompatible mod, and has been kicked." msgstr "%s (%u) are o modificare incompatibilă și a fost eliminat." -#: src/multijoin.cpp:415 +#: src/multijoin.cpp:412 #, c-format msgid "%s is Joining the Game" msgstr "%s se alătură jocului" -#: src/multijoin.cpp:425 +#: src/multijoin.cpp:422 msgid "System message:" msgstr "Mesaj de sistem:" @@ -14528,10 +14533,6 @@ msgstr "Victime" msgid "Units" msgstr "Unități" -#: src/multimenu.cpp:772 -msgid "Ping" -msgstr "Ping" - #: src/multimenu.cpp:776 msgid "Structs" msgstr "Clădiri" @@ -14565,84 +14566,84 @@ msgstr "Dă energie jucătorului" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "Eliminat jucătorul %s, deoarece a încercat să înșele verificarea de integritate a datelor!" -#: src/multiplay.cpp:1146 +#: src/multiplay.cpp:1057 msgid "(allies" msgstr "(aliați" -#: src/multiplay.cpp:1154 +#: src/multiplay.cpp:1065 msgid "(private to " msgstr "(privat către " -#: src/multiplay.cpp:1167 +#: src/multiplay.cpp:1078 msgid "[invalid]" msgstr "[invalid]" -#: src/multiplay.cpp:2057 +#: src/multiplay.cpp:1942 msgid "Green" msgstr "Verde" -#: src/multiplay.cpp:2058 +#: src/multiplay.cpp:1943 msgid "Orange" msgstr "Portocaliu" -#: src/multiplay.cpp:2059 +#: src/multiplay.cpp:1944 msgid "Grey" msgstr "Gri" -#: src/multiplay.cpp:2060 +#: src/multiplay.cpp:1945 msgid "Black" msgstr "Negru" -#: src/multiplay.cpp:2061 +#: src/multiplay.cpp:1946 msgid "Red" msgstr "Roşu" -#: src/multiplay.cpp:2062 +#: src/multiplay.cpp:1947 msgid "Blue" msgstr "Albastru" -#: src/multiplay.cpp:2063 +#: src/multiplay.cpp:1948 msgid "Pink" msgstr "Roz" -#: src/multiplay.cpp:2064 +#: src/multiplay.cpp:1949 msgid "Cyan" msgstr "Azuriu" -#: src/multiplay.cpp:2065 +#: src/multiplay.cpp:1950 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:2066 +#: src/multiplay.cpp:1951 msgid "Purple" msgstr "" -#: src/multiplay.cpp:2067 +#: src/multiplay.cpp:1952 msgid "White" msgstr "" -#: src/multiplay.cpp:2068 +#: src/multiplay.cpp:1953 #, fuzzy msgid "Bright blue" msgstr "Butonul din dreapta" -#: src/multiplay.cpp:2069 +#: src/multiplay.cpp:1954 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:2070 +#: src/multiplay.cpp:1955 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:2071 +#: src/multiplay.cpp:1956 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:2072 +#: src/multiplay.cpp:1957 msgid "Brown" msgstr "" -#: src/order.cpp:841 +#: src/order.cpp:800 msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "" @@ -14777,20 +14778,20 @@ msgstr "Timp total de joc - %s" msgid "You cheated!" msgstr "Ai trișat!" -#: src/scriptfuncs.cpp:3250 +#: src/scriptfuncs.cpp:3287 msgid "YOU ARE VICTORIOUS!" msgstr "AI OBȚINUT VICTORIA!" -#: src/scriptfuncs.cpp:3254 +#: src/scriptfuncs.cpp:3291 msgid "YOU WERE DEFEATED!" msgstr "AI FOST ÎNFRÂNT!" -#: src/scriptfuncs.cpp:9500 +#: src/scriptfuncs.cpp:9537 #, c-format msgid "Beacon received from %s!" msgstr "Baliză recepționată de la %s!" -#: src/scriptfuncs.cpp:9546 +#: src/scriptfuncs.cpp:9583 #, c-format msgid "Beacon %d" msgstr "Baliză %d" @@ -14820,13 +14821,13 @@ msgstr "Imposibil de localizat Senzori!" msgid "Unable to locate any Commanders!" msgstr "Imposibil de localizat Comandanți!" -#: src/structure.cpp:2615 +#: src/structure.cpp:2614 #, fuzzy msgid "Command Control Limit Reached - Production Halted" msgstr "Limita de control atinsă - Producția oprită" -#: src/structure.cpp:5815 -#: src/structure.cpp:5840 +#: src/structure.cpp:5806 +#: src/structure.cpp:5831 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" @@ -14834,50 +14835,50 @@ msgstr[0] "%s - %u unitate asociată" msgstr[1] "%s - %u unități asociate" msgstr[2] "%s - %u unități asociate" -#: src/structure.cpp:5845 -#: src/structure.cpp:5913 -#: src/structure.cpp:5929 -#: src/structure.cpp:5943 +#: src/structure.cpp:5836 +#: src/structure.cpp:5904 +#: src/structure.cpp:5920 +#: src/structure.cpp:5934 #, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - Avarii %3.0f%%" -#: src/structure.cpp:5895 +#: src/structure.cpp:5886 #, c-format msgid "%s - Connected %u of %u" msgstr "%s - Conectate %u din %u" -#: src/structure.cpp:6059 -#: src/structure.cpp:6104 +#: src/structure.cpp:6050 +#: src/structure.cpp:6095 #, c-format msgid "%s - Electronically Damaged" msgstr "%s - Avariat electronic" -#: src/structure.cpp:6341 +#: src/structure.cpp:6332 msgid "Electronic Reward - Visibility Report" msgstr "Răsplată Electronică - Raport de Vizibilitate" -#: src/structure.cpp:6381 +#: src/structure.cpp:6372 msgid "Factory Reward - Propulsion" msgstr "Răsplată de Fabrică - Propulsie" -#: src/structure.cpp:6405 +#: src/structure.cpp:6396 msgid "Factory Reward - Body" msgstr "Răsplată de Fabrică - Șasiu" -#: src/structure.cpp:6429 +#: src/structure.cpp:6420 msgid "Factory Reward - Weapon" msgstr "Răsplată de Fabrică - Armă" -#: src/structure.cpp:6438 +#: src/structure.cpp:6429 msgid "Factory Reward - Nothing" msgstr "Răsplată de Fabrică - Nimic" -#: src/structure.cpp:6466 +#: src/structure.cpp:6457 msgid "Repair Facility Award - Repair" msgstr "Răsplată de Reparații - Reparație" -#: src/structure.cpp:6473 +#: src/structure.cpp:6464 msgid "Repair Facility Award - Nothing" msgstr "Răsplată de Reparații - Nimic" diff --git a/po/ru.po b/po/ru.po index 924ea6f60..e9109c169 100644 --- a/po/ru.po +++ b/po/ru.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-01-18 00:54+0100\n" +"POT-Creation-Date: 2011-02-25 23:35+0100\n" "PO-Revision-Date: 2011-01-15 09:57+0300\n" "Last-Translator: \n" "Language-Team: Russian <>\n" @@ -5735,7 +5735,7 @@ msgid "New Design" msgstr "Новый дизайн" #: data/base/messages/strings/names.txt:15 -#: src/design.cpp:1313 +#: src/design.cpp:1275 msgid "Transport" msgstr "Транспорт" @@ -12013,26 +12013,26 @@ msgid "System locale" msgstr "Системная локализация" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1043 +#: lib/netplay/netplay.cpp:1042 msgid "Enter password here" msgstr "Введите пароль" -#: lib/netplay/netplay.cpp:2048 +#: lib/netplay/netplay.cpp:2060 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "Не могу получить имя основного сервера (%s)!" -#: lib/netplay/netplay.cpp:2062 +#: lib/netplay/netplay.cpp:2082 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "Не удалось соединиться с лобби-сервером. проверьте, открыт-ли TCP-порт %u для исходящего траффика." #: src/challenge.cpp:184 -#: src/hci.cpp:922 -#: src/hci.cpp:3390 -#: src/hci.cpp:3513 -#: src/hci.cpp:3924 -#: src/hci.cpp:4942 +#: src/hci.cpp:916 +#: src/hci.cpp:3378 +#: src/hci.cpp:3501 +#: src/hci.cpp:3912 +#: src/hci.cpp:4930 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12184,149 +12184,149 @@ msgstr "прямо на экран хоста" #: src/configuration.cpp:393 #: src/configuration.cpp:394 -#: src/multistat.cpp:130 +#: src/multistat.cpp:124 msgid "Player" msgstr "Игрок" -#: src/design.cpp:449 -#: src/design.cpp:469 -#: src/design.cpp:3501 +#: src/design.cpp:443 +#: src/design.cpp:455 +#: src/design.cpp:3464 msgid "New Vehicle" msgstr "Новая машина" -#: src/design.cpp:515 +#: src/design.cpp:500 msgid "Vehicle Body" msgstr "Корпус машины" -#: src/design.cpp:535 +#: src/design.cpp:520 msgid "Vehicle Propulsion" msgstr "Движитель машины" -#: src/design.cpp:556 -#: src/design.cpp:579 -#: src/design.cpp:603 +#: src/design.cpp:541 +#: src/design.cpp:564 +#: src/design.cpp:588 msgid "Vehicle Turret" msgstr "Башня машины" -#: src/design.cpp:622 +#: src/design.cpp:607 msgid "Delete Design" msgstr "Удалить проект" -#: src/design.cpp:673 -#: src/design.cpp:720 +#: src/design.cpp:658 +#: src/design.cpp:705 msgid "Kinetic Armour" msgstr "Кинетическая броня" -#: src/design.cpp:682 -#: src/design.cpp:730 +#: src/design.cpp:667 +#: src/design.cpp:715 msgid "Thermal Armour" msgstr "Термальная броня" -#: src/design.cpp:698 -#: src/design.cpp:750 +#: src/design.cpp:683 +#: src/design.cpp:735 msgid "Engine Output" msgstr "Мощность двигателя" -#: src/design.cpp:706 -#: src/design.cpp:759 -#: src/design.cpp:1529 -#: src/design.cpp:1553 -#: src/design.cpp:1574 -#: src/design.cpp:1590 -#: src/design.cpp:1610 -#: src/design.cpp:1627 -#: src/design.cpp:1647 -#: src/design.cpp:1664 -#: src/design.cpp:1705 -#: src/design.cpp:1737 -#: src/design.cpp:1869 -#: src/design.cpp:1885 -#: src/design.cpp:1923 -#: src/design.cpp:1956 +#: src/design.cpp:691 +#: src/design.cpp:744 +#: src/design.cpp:1486 +#: src/design.cpp:1510 +#: src/design.cpp:1531 +#: src/design.cpp:1547 +#: src/design.cpp:1567 +#: src/design.cpp:1584 +#: src/design.cpp:1604 +#: src/design.cpp:1621 +#: src/design.cpp:1662 +#: src/design.cpp:1694 +#: src/design.cpp:1826 +#: src/design.cpp:1842 +#: src/design.cpp:1880 +#: src/design.cpp:1913 msgid "Weight" msgstr "Масса" -#: src/design.cpp:790 -#: src/design.cpp:808 +#: src/design.cpp:775 +#: src/design.cpp:793 msgid "Total Power Required" msgstr "Всего требуется энергии" -#: src/design.cpp:821 -#: src/design.cpp:840 +#: src/design.cpp:806 +#: src/design.cpp:825 msgid "Total Body Points" msgstr "Общее бронирование корпуса" -#: src/design.cpp:1027 -#: src/design.cpp:1059 +#: src/design.cpp:996 +#: src/design.cpp:1025 msgid "Power Usage" msgstr "Использование энергии" -#: src/design.cpp:1335 +#: src/design.cpp:1298 msgid "Hydra " msgstr "Гидра" -#: src/design.cpp:1509 -#: src/design.cpp:1537 +#: src/design.cpp:1466 +#: src/design.cpp:1494 msgid "Sensor Range" msgstr "Дальность сенсора" -#: src/design.cpp:1521 -#: src/design.cpp:1545 +#: src/design.cpp:1478 +#: src/design.cpp:1502 msgid "Sensor Power" msgstr "Мощность сенсора" -#: src/design.cpp:1566 -#: src/design.cpp:1582 +#: src/design.cpp:1523 +#: src/design.cpp:1539 msgid "ECM Power" msgstr "ЕМ Мощность" -#: src/design.cpp:1602 -#: src/design.cpp:1619 -#: src/design.cpp:1639 -#: src/design.cpp:1656 +#: src/design.cpp:1559 +#: src/design.cpp:1576 +#: src/design.cpp:1596 +#: src/design.cpp:1613 msgid "Build Points" msgstr "Бронирование" -#: src/design.cpp:1677 -#: src/design.cpp:1713 +#: src/design.cpp:1634 +#: src/design.cpp:1670 msgid "Range" msgstr "Дальность" -#: src/design.cpp:1689 -#: src/design.cpp:1721 +#: src/design.cpp:1646 +#: src/design.cpp:1678 msgid "Damage" msgstr "Урон" -#: src/design.cpp:1697 -#: src/design.cpp:1729 +#: src/design.cpp:1654 +#: src/design.cpp:1686 msgid "Rate-of-Fire" msgstr "Скорострельность" -#: src/design.cpp:1857 -#: src/design.cpp:1877 +#: src/design.cpp:1814 +#: src/design.cpp:1834 msgid "Air Speed" msgstr "Скорость в воздухе" -#: src/design.cpp:1895 -#: src/design.cpp:1932 +#: src/design.cpp:1852 +#: src/design.cpp:1889 msgid "Road Speed" msgstr "Скорость по дороге" -#: src/design.cpp:1905 -#: src/design.cpp:1940 +#: src/design.cpp:1862 +#: src/design.cpp:1897 msgid "Off-Road Speed" msgstr "Скорость по бездорожью" -#: src/design.cpp:1913 -#: src/design.cpp:1948 +#: src/design.cpp:1870 +#: src/design.cpp:1905 msgid "Water Speed" msgstr "Скорость по воде" -#: src/design.cpp:2074 +#: src/design.cpp:2031 msgid "Weapons" msgstr "Вооружение" -#: src/design.cpp:2094 +#: src/design.cpp:2051 msgid "Systems" msgstr "Системы" @@ -12339,7 +12339,7 @@ msgid "Player dropped" msgstr "Игрок исчез" #: src/display3d.cpp:599 -#: src/multiint.cpp:2116 +#: src/multiint.cpp:2125 msgid "Waiting for other players" msgstr "Ожидание других игроков" @@ -12347,44 +12347,44 @@ msgstr "Ожидание других игроков" msgid "Out of sync" msgstr "" -#: src/display.cpp:1651 +#: src/display.cpp:1649 msgid "Cannot Build. Oil Resource Burning." msgstr "Строительство невозможно. Горит нефть." -#: src/display.cpp:1830 -#: src/display.cpp:2423 +#: src/display.cpp:1828 +#: src/display.cpp:2421 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - повреждение %d%% - опыт %d, %s" -#: src/display.cpp:1846 +#: src/display.cpp:1844 #, c-format msgid "%s - Allied - Damage %d%% - Experience %d, %s" msgstr "%s - союзник %d%% - опыт %d, %s" -#: src/display.cpp:2044 +#: src/display.cpp:2042 msgid "Truck ordered to build Oil Derrick" msgstr "Грузовику приказано строить нефтевышку" -#: src/display.cpp:2045 +#: src/display.cpp:2043 #, fuzzy msgid "2 trucks ordered to build Oil Derrick" msgstr "Грузовику приказано строить нефтевышку" -#: src/display.cpp:2046 +#: src/display.cpp:2044 #, fuzzy, c-format msgid "%d trucks ordered to build Oil Derrick" msgstr "Грузовику приказано строить нефтевышку" -#: src/droid.cpp:208 +#: src/droid.cpp:211 msgid "Unit Lost!" msgstr "Юнит потерян!" -#: src/droid.cpp:1370 +#: src/droid.cpp:1376 msgid "Structure Restored" msgstr "Постройка восстановлена" -#: src/droid.cpp:2712 +#: src/droid.cpp:2732 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" @@ -12392,7 +12392,7 @@ msgstr[0] "Выбрана группа %u - %u юнит" msgstr[1] "Выбрана группа %u - %u юнита" msgstr[2] "Выбрана группа %u - %u юнитов" -#: src/droid.cpp:2725 +#: src/droid.cpp:2745 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" @@ -12400,7 +12400,7 @@ msgstr[0] "%u юнит назначен группе %u" msgstr[1] "%u юнита назначено группе %u" msgstr[2] "%u юнитов назначено группе %u" -#: src/droid.cpp:2738 +#: src/droid.cpp:2758 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" @@ -12408,7 +12408,7 @@ msgstr[0] "Фокус на группе %u - %u юнит" msgstr[1] "Фокус на группе %u - %u юнита" msgstr[2] "Фокус на группе %u - %u юнитов" -#: src/droid.cpp:2742 +#: src/droid.cpp:2762 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" @@ -12416,49 +12416,49 @@ msgstr[0] "Соединить с группой %u - %u юнит" msgstr[1] "Соединить с группой %u - %u юнита" msgstr[2] "Соединить с группой %u - %u юнитов" -#: src/droid.cpp:3080 +#: src/droid.cpp:3093 msgid "Rookie" msgstr "Новобранец" -#: src/droid.cpp:3081 +#: src/droid.cpp:3094 msgctxt "rank" msgid "Green" msgstr "Молодой" -#: src/droid.cpp:3082 +#: src/droid.cpp:3095 msgid "Trained" msgstr "Тренированный" -#: src/droid.cpp:3083 +#: src/droid.cpp:3096 msgid "Regular" msgstr "Опытный" -#: src/droid.cpp:3084 +#: src/droid.cpp:3097 msgid "Professional" msgstr "Профессионал" -#: src/droid.cpp:3085 +#: src/droid.cpp:3098 msgid "Veteran" msgstr "Ветеран" -#: src/droid.cpp:3086 +#: src/droid.cpp:3099 msgid "Elite" msgstr "Элита" -#: src/droid.cpp:3087 +#: src/droid.cpp:3100 msgid "Special" msgstr "Специалист" -#: src/droid.cpp:3088 +#: src/droid.cpp:3101 msgid "Hero" msgstr "Герой" -#: src/droid.cpp:4110 +#: src/droid.cpp:4123 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "%s хочет дать вам %s но у вас их слишком много" -#: src/droid.cpp:4114 +#: src/droid.cpp:4127 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "Вы хотите дать %s %s но у их их слишком много" @@ -12477,7 +12477,7 @@ msgid "Tutorial" msgstr "Обучение" #: src/frontend.cpp:100 -#: src/hci.cpp:3499 +#: src/hci.cpp:3487 msgid "Options" msgstr "Параметры" @@ -12528,7 +12528,7 @@ msgid "Challenges" msgstr "Вызов на поединок" #: src/frontend.cpp:215 -#: src/ingameop.cpp:275 +#: src/ingameop.cpp:272 msgid "Load Game" msgstr "Загрузить игру" @@ -12537,9 +12537,9 @@ msgid "SINGLE PLAYER" msgstr "ОДИНОЧНАЯ ИГРА" #: src/frontend.cpp:303 -#: src/ingameop.cpp:498 -#: src/mission.cpp:2527 -#: src/mission.cpp:2630 +#: src/ingameop.cpp:494 +#: src/mission.cpp:2493 +#: src/mission.cpp:2596 msgid "Load Saved Game" msgstr "Загрузить Игру" @@ -12556,7 +12556,7 @@ msgid "Join Game" msgstr "Присоединиться" #: src/frontend.cpp:422 -#: src/multiint.cpp:1276 +#: src/multiint.cpp:1285 msgid "OPTIONS" msgstr "ПАРАМЕТРЫ" @@ -12573,7 +12573,7 @@ msgid "Video Options" msgstr "Настройки видео" #: src/frontend.cpp:426 -#: src/ingameop.cpp:270 +#: src/ingameop.cpp:267 msgid "Audio Options" msgstr "Настройки звука" @@ -12651,7 +12651,7 @@ msgid "Off" msgstr "Выкл." #: src/frontend.cpp:523 -#: src/multiint.cpp:1345 +#: src/multiint.cpp:1354 msgid "Fog" msgstr "Туман" @@ -12662,7 +12662,7 @@ msgstr "Мгла" #: src/frontend.cpp:530 #: src/frontend.cpp:595 -#: src/multiint.cpp:1347 +#: src/multiint.cpp:1356 msgid "Fog Of War" msgstr "Туман войны" @@ -12824,194 +12824,194 @@ msgid "GAME OPTIONS" msgstr "НАСТРОЙКИ ИГРЫ" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2389 +#: src/multiint.cpp:2398 msgid "Mod: " msgstr "Мод:" -#: src/hci.cpp:1245 +#: src/hci.cpp:1237 msgid "MAP SAVED!" msgstr "КАРТА СОХРАНЕНА!" -#: src/hci.cpp:1584 +#: src/hci.cpp:1573 #: src/loop.cpp:558 #: src/loop.cpp:574 #, fuzzy msgid "GAME SAVED: " msgstr "ИГРА СОХРАНЕНА:" -#: src/hci.cpp:1971 +#: src/hci.cpp:1960 msgid "Failed to create building" msgstr "Невозможно создать постройку" -#: src/hci.cpp:1988 +#: src/hci.cpp:1977 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new structure: %s." msgstr "Игрок %u начитерил себе новую постройку: %s." -#: src/hci.cpp:2003 +#: src/hci.cpp:1992 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new feature: %s." msgstr "Игрок %u начитерил себе новый особый элемент: %s." -#: src/hci.cpp:2025 +#: src/hci.cpp:2014 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid: %s." msgstr "Игрок %u начитерил себе нового дроида: %s." -#: src/hci.cpp:2036 +#: src/hci.cpp:2025 #, fuzzy, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "Игрок %u начитерил себе нового дроида: %s." -#: src/hci.cpp:3310 +#: src/hci.cpp:3298 msgid "Commanders (F6)" msgstr "Командиры (F6)" -#: src/hci.cpp:3323 +#: src/hci.cpp:3311 msgid "Intelligence Display (F5)" msgstr "Дисплей разведки (F5)" -#: src/hci.cpp:3336 +#: src/hci.cpp:3324 msgid "Manufacture (F1)" msgstr "Производство (F1)" -#: src/hci.cpp:3349 +#: src/hci.cpp:3337 msgid "Design (F4)" msgstr "Дизайн (F4)" -#: src/hci.cpp:3362 +#: src/hci.cpp:3350 msgid "Research (F2)" msgstr "Исследования (F2)" -#: src/hci.cpp:3375 +#: src/hci.cpp:3363 msgid "Build (F3)" msgstr "Строить (F3)" -#: src/hci.cpp:3446 -#: src/multiint.cpp:1392 +#: src/hci.cpp:3434 +#: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Энергия" -#: src/hci.cpp:3537 +#: src/hci.cpp:3525 msgid "Map:" msgstr "Карта:" -#: src/hci.cpp:3550 +#: src/hci.cpp:3538 msgid "Load" msgstr "Загрузить " -#: src/hci.cpp:3551 +#: src/hci.cpp:3539 msgid "Load Map File" msgstr "Загрузить карту." -#: src/hci.cpp:3558 +#: src/hci.cpp:3546 msgid "Save" msgstr "Сохранить " -#: src/hci.cpp:3559 +#: src/hci.cpp:3547 msgid "Save Map File" msgstr "Сохранить карту." -#: src/hci.cpp:3567 +#: src/hci.cpp:3555 msgid "New" msgstr "Новый" -#: src/hci.cpp:3568 +#: src/hci.cpp:3556 msgid "New Blank Map" msgstr "Новая пустая карта." -#: src/hci.cpp:3604 +#: src/hci.cpp:3592 msgid "Tile" msgstr "Плитка" -#: src/hci.cpp:3605 +#: src/hci.cpp:3593 msgid "Place tiles on map" msgstr "Поместить эемент изображения на карту" -#: src/hci.cpp:3614 +#: src/hci.cpp:3602 msgid "Unit" msgstr "Юнит" -#: src/hci.cpp:3615 +#: src/hci.cpp:3603 msgid "Place Unit on map" msgstr "Поместить юнита на карту" -#: src/hci.cpp:3623 +#: src/hci.cpp:3611 msgid "Struct" msgstr "Постройки" -#: src/hci.cpp:3624 +#: src/hci.cpp:3612 msgid "Place Structures on map" msgstr "Расположить постройки на карте" -#: src/hci.cpp:3632 +#: src/hci.cpp:3620 msgid "Feat" msgstr "Разное" -#: src/hci.cpp:3633 +#: src/hci.cpp:3621 msgid "Place Features on map" msgstr "Поместить особый элемент на карту" -#: src/hci.cpp:3643 +#: src/hci.cpp:3631 msgid "Pause" msgstr "Пауза" -#: src/hci.cpp:3644 +#: src/hci.cpp:3632 msgid "Pause or unpause the game" msgstr "Пауза или продолжить игру" -#: src/hci.cpp:3658 +#: src/hci.cpp:3646 msgid "Align height of all map objects" msgstr "Выровнять высоту всех объектов на карте" -#: src/hci.cpp:3668 +#: src/hci.cpp:3656 msgid "Edit" msgstr "Редактировать" -#: src/hci.cpp:3669 +#: src/hci.cpp:3657 msgid "Start Edit Mode" msgstr "Включить режим редактирования" -#: src/hci.cpp:3683 +#: src/hci.cpp:3671 #: src/ingameop.cpp:112 -#: src/ingameop.cpp:258 -#: src/ingameop.cpp:263 +#: src/ingameop.cpp:256 +#: src/ingameop.cpp:260 msgid "Quit" msgstr "Выход" -#: src/hci.cpp:3684 +#: src/hci.cpp:3672 msgid "Exit Game" msgstr "Выйти из игры" -#: src/hci.cpp:3710 +#: src/hci.cpp:3698 msgid "Current Player:" msgstr "Текущий игрок" -#: src/hci.cpp:4001 +#: src/hci.cpp:3989 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "Панель прогресса" -#: src/hci.cpp:4867 +#: src/hci.cpp:4855 msgid "Factory Delivery Point" msgstr "Точка прибытия с фабрики" -#: src/hci.cpp:4885 +#: src/hci.cpp:4873 msgid "Loop Production" msgstr "Повторное производство" -#: src/hci.cpp:4965 +#: src/hci.cpp:4953 msgid "Tab Scroll left" msgstr "Таб скрол налево" -#: src/hci.cpp:4980 +#: src/hci.cpp:4968 msgid "Tab Scroll right" msgstr "Таб скрол на право" #: src/ingameop.cpp:111 -#: src/ingameop.cpp:193 -#: src/ingameop.cpp:267 +#: src/ingameop.cpp:195 +#: src/ingameop.cpp:264 msgid "Resume Game" msgstr "Продолжить игру" @@ -13019,32 +13019,32 @@ msgstr "Продолжить игру" msgid "WARNING: You're the host. If you quit, the game ends for everyone!" msgstr "Внимание: Вы владелец этой игры. Если вы выйдете из игры, то она закончится для всех!" -#: src/ingameop.cpp:185 -#: src/ingameop.cpp:527 +#: src/ingameop.cpp:186 +#: src/ingameop.cpp:523 msgid "Tactical UI (Target Origin Icon): Show" msgstr "" -#: src/ingameop.cpp:190 -#: src/ingameop.cpp:531 +#: src/ingameop.cpp:191 +#: src/ingameop.cpp:527 msgid "Tactical UI (Target Origin Icon): Hide" msgstr "" -#: src/ingameop.cpp:277 -#: src/ingameop.cpp:502 -#: src/mission.cpp:2514 -#: src/mission.cpp:2633 +#: src/ingameop.cpp:274 +#: src/ingameop.cpp:498 +#: src/mission.cpp:2480 +#: src/mission.cpp:2599 msgid "Save Game" msgstr "Сохранить игру" -#: src/ingameop.cpp:343 +#: src/ingameop.cpp:339 msgid "Host has quit the game!" msgstr "Хост покинул игру!" -#: src/ingameop.cpp:349 +#: src/ingameop.cpp:345 msgid "The game can't continue without the host." msgstr "Игра не может продолжаться без хоста." -#: src/ingameop.cpp:355 +#: src/ingameop.cpp:351 msgid "--> QUIT <--" msgstr "--> ВЫХОД <--" @@ -13421,52 +13421,52 @@ msgstr "Тряска экрана при взрыве: выкл" msgid "Screen shake when things die: On" msgstr "Тряска экрана при взрыве: вкл" -#: src/keybind.cpp:2603 -#: src/keybind.cpp:2646 +#: src/keybind.cpp:2604 +#: src/keybind.cpp:2647 msgid "Sorry, but game speed cannot be changed in multiplayer." msgstr "Извините, скорость игры не меняется в мультиплеере." -#: src/keybind.cpp:2624 -#: src/keybind.cpp:2667 -#: src/keybind.cpp:2689 +#: src/keybind.cpp:2625 +#: src/keybind.cpp:2668 +#: src/keybind.cpp:2690 msgid "Game Speed Reset" msgstr "Скорость Игры Сброшена" -#: src/keybind.cpp:2628 +#: src/keybind.cpp:2629 #, c-format msgid "Game Speed Increased to %3.1f" msgstr "Скорость игры увеличена в %3.1f" -#: src/keybind.cpp:2671 +#: src/keybind.cpp:2672 #, c-format msgid "Game Speed Reduced to %3.1f" msgstr "Скорость игры уменьшена в %3.1f" -#: src/keybind.cpp:2701 +#: src/keybind.cpp:2702 msgid "Radar showing friend-foe colors" msgstr "Радар отображает цвета свой-чужой" -#: src/keybind.cpp:2705 +#: src/keybind.cpp:2706 msgid "Radar showing player colors" msgstr "Радар отображает цвета игрока" -#: src/keybind.cpp:2726 +#: src/keybind.cpp:2727 msgid "Radar showing only objects" msgstr "Радар отображает только объекты" -#: src/keybind.cpp:2729 +#: src/keybind.cpp:2730 msgid "Radar blending terrain and height" msgstr "Радар не различает ландшафт и рельеф" -#: src/keybind.cpp:2732 +#: src/keybind.cpp:2733 msgid "Radar showing terrain" msgstr "Радар отображает поверхность" -#: src/keybind.cpp:2735 +#: src/keybind.cpp:2736 msgid "Radar showing revealed terrain" msgstr "Радар отображает поверхность" -#: src/keybind.cpp:2738 +#: src/keybind.cpp:2739 msgid "Radar showing height" msgstr "Радар показывает рельеф" @@ -13475,9 +13475,9 @@ msgid "KEY MAPPING" msgstr "РАСКЛАДКА КЛАВИАТУРЫ" #: src/keyedit.cpp:372 -#: src/multiint.cpp:662 -#: src/multiint.cpp:1072 -#: src/multiint.cpp:1478 +#: src/multiint.cpp:671 +#: src/multiint.cpp:1081 +#: src/multiint.cpp:1487 msgid "Return To Previous Screen" msgstr "Назад" @@ -13966,37 +13966,37 @@ msgstr "Переключение на режим вождения." msgid "Could not save game!" msgstr "Не удалось сохранить игру!" -#: src/mission.cpp:2075 +#: src/mission.cpp:2041 msgid "Load Transport" msgstr "Загрузить Транспорт" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "ЗАДАНИЕ ВЫПОЛНЕНО с читами!" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED" msgstr "ЗАДАНИЕ ВЫПОЛНЕНО" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED--and you cheated!" msgstr "ЗАДАНИЕ ПРОВАЛЕНО - и читы вам не помогли!" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED" msgstr "ЗАДАНИЕ ПРОВАЛЕНО" -#: src/mission.cpp:2493 -#: src/mission.cpp:2533 -#: src/mission.cpp:2647 +#: src/mission.cpp:2459 +#: src/mission.cpp:2499 +#: src/mission.cpp:2613 msgid "Quit To Main Menu" msgstr "Выйти в главное меню" -#: src/mission.cpp:2501 +#: src/mission.cpp:2467 msgid "Continue Game" msgstr "Продолжить игру" -#: src/mission.cpp:2598 +#: src/mission.cpp:2564 msgid "GAME SAVED :" msgstr "ИГРА СОХРАНЕНА:" @@ -14055,345 +14055,350 @@ msgstr "%s вступил в союз с %s" msgid "You Discover Blueprints For %s" msgstr "Вы открыли чертежи: %s" -#: src/multiint.cpp:600 +#: src/multiint.cpp:609 #: src/multilimit.cpp:190 msgid "Accept Settings" msgstr "Принять настройки" -#: src/multiint.cpp:602 -#: src/multiint.cpp:1117 +#: src/multiint.cpp:611 +#: src/multiint.cpp:1126 msgid "Cancel" msgstr "Отмена" -#: src/multiint.cpp:613 +#: src/multiint.cpp:622 msgid "IP Address or Machine Name" msgstr "IP-адрес или имя компьютера" -#: src/multiint.cpp:659 +#: src/multiint.cpp:668 msgid "CONNECTION" msgstr "СОЕДИНЕНИЕ" -#: src/multiint.cpp:664 +#: src/multiint.cpp:673 msgid "Lobby" msgstr "Холл" -#: src/multiint.cpp:665 +#: src/multiint.cpp:674 msgid "IP" msgstr "IP" -#: src/multiint.cpp:854 +#: src/multiint.cpp:863 msgid "No games are available" msgstr "Нет доступных игр" -#: src/multiint.cpp:857 +#: src/multiint.cpp:866 msgid "Game is full" msgstr "Игра заполнена" -#: src/multiint.cpp:861 +#: src/multiint.cpp:870 msgid "You were kicked!" msgstr "Вас выкинули!" -#: src/multiint.cpp:864 +#: src/multiint.cpp:873 msgid "Wrong Game Version!" msgstr "Неверная версия игры!" -#: src/multiint.cpp:867 +#: src/multiint.cpp:876 msgid "You have an incompatible mod." msgstr "Несовместимый мод" -#: src/multiint.cpp:871 +#: src/multiint.cpp:880 msgid "Host couldn't send file?" msgstr "Хост не может отправить файл?" -#: src/multiint.cpp:875 +#: src/multiint.cpp:884 msgid "Incorrect Password!" msgstr "Неверный пароль!" -#: src/multiint.cpp:878 +#: src/multiint.cpp:887 msgid "Host has dropped connection!" msgstr "Хост разорвал соединение!" -#: src/multiint.cpp:882 +#: src/multiint.cpp:891 msgid "Connection Error" msgstr "Ошибка соединения" -#: src/multiint.cpp:1012 +#: src/multiint.cpp:1021 msgid "Searching" msgstr "Поиск" -#: src/multiint.cpp:1069 +#: src/multiint.cpp:1078 msgid "GAMES" msgstr "ИГРЫ" -#: src/multiint.cpp:1077 +#: src/multiint.cpp:1086 msgid "Refresh Games List" msgstr "Обновить список игр" -#: src/multiint.cpp:1097 +#: src/multiint.cpp:1106 msgid "Enter Password:" msgstr "Введите пароль:" -#: src/multiint.cpp:1115 +#: src/multiint.cpp:1124 msgid "OK" msgstr "ОК" -#: src/multiint.cpp:1232 +#: src/multiint.cpp:1241 msgid "Tanks disabled!!" msgstr "Танки отключены!!" -#: src/multiint.cpp:1233 +#: src/multiint.cpp:1242 msgid "Cyborgs disabled." msgstr "Киборги отключены." -#: src/multiint.cpp:1234 +#: src/multiint.cpp:1243 msgid "VTOLs disabled." msgstr "Самолеты отключены." -#: src/multiint.cpp:1281 -#: src/multiint.cpp:1288 +#: src/multiint.cpp:1290 +#: src/multiint.cpp:1297 msgid "Select Game Name" msgstr "Выбрать название игры" -#: src/multiint.cpp:1281 +#: src/multiint.cpp:1290 msgid "One-Player Skirmish" msgstr "Сражение" -#: src/multiint.cpp:1291 +#: src/multiint.cpp:1300 msgid "Select Map" msgstr "Выбрать карту" -#: src/multiint.cpp:1299 +#: src/multiint.cpp:1308 msgid "Click to set Password" msgstr "Щелкни чтобы задать пароль" -#: src/multiint.cpp:1309 -#: src/multiint.cpp:1310 +#: src/multiint.cpp:1318 +#: src/multiint.cpp:1319 msgid "Scavengers" msgstr "Мусорщики" -#: src/multiint.cpp:1312 +#: src/multiint.cpp:1321 msgid "No Scavengers" msgstr "Нет Мусорщиков" -#: src/multiint.cpp:1342 +#: src/multiint.cpp:1351 msgid "Select Player Name" msgstr "Выбор Имя Игрока" -#: src/multiint.cpp:1348 +#: src/multiint.cpp:1357 msgid "Distance Fog" msgstr "Туман на растоянии" -#: src/multiint.cpp:1359 +#: src/multiint.cpp:1368 #: src/multimenu.cpp:756 msgid "Alliances" msgstr "Союзники" -#: src/multiint.cpp:1362 +#: src/multiint.cpp:1371 msgid "No Alliances" msgstr "Без Союзов" -#: src/multiint.cpp:1364 +#: src/multiint.cpp:1373 msgid "Allow Alliances" msgstr "Позволить Союзы" -#: src/multiint.cpp:1368 +#: src/multiint.cpp:1377 msgid "Locked Teams" msgstr "Закрытые Команды" -#: src/multiint.cpp:1394 +#: src/multiint.cpp:1403 msgid "Low Power Levels" msgstr "Низкий уровень энергии" -#: src/multiint.cpp:1396 +#: src/multiint.cpp:1405 msgid "Medium Power Levels" msgstr "Средний уровень энергии" -#: src/multiint.cpp:1398 +#: src/multiint.cpp:1407 msgid "High Power Levels" msgstr "Высокий уровень энергии" -#: src/multiint.cpp:1430 +#: src/multiint.cpp:1439 msgid "Base" msgstr "База" -#: src/multiint.cpp:1432 +#: src/multiint.cpp:1441 msgid "Start with No Bases" msgstr "Начать без Базы" -#: src/multiint.cpp:1434 +#: src/multiint.cpp:1443 msgid "Start with Bases" msgstr "Начать с Базой" -#: src/multiint.cpp:1436 +#: src/multiint.cpp:1445 msgid "Start with Advanced Bases" msgstr "Начать с Продвинутой Базой" -#: src/multiint.cpp:1468 +#: src/multiint.cpp:1477 msgid "Map Preview" msgstr "Просмотр карты" -#: src/multiint.cpp:1470 +#: src/multiint.cpp:1479 msgid "Click to see Map" msgstr "щелкни чтобы посмотреть карту" -#: src/multiint.cpp:1484 +#: src/multiint.cpp:1493 msgid "Start Hosting Game" msgstr "Начать хостинг игры" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 msgid "Show Structure Limits" msgstr "Показать лимиты сооружений" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 msgid "Set Structure Limits" msgstr "Установить лимиты сооружений" -#: src/multiint.cpp:1587 +#: src/multiint.cpp:1596 msgid "DIFFICULTY" msgstr "" -#: src/multiint.cpp:1601 +#: src/multiint.cpp:1610 msgid "Less aggressive and starts with less units" msgstr "" -#: src/multiint.cpp:1602 +#: src/multiint.cpp:1611 #, fuzzy msgid "Plays nice" msgstr "Игрок" -#: src/multiint.cpp:1603 +#: src/multiint.cpp:1612 msgid "No holds barred" msgstr "" -#: src/multiint.cpp:1604 +#: src/multiint.cpp:1613 msgid "Starts with advantages and gets twice as much oil from derricks" msgstr "" -#: src/multiint.cpp:1632 +#: src/multiint.cpp:1641 msgid "CHOOSE AI" msgstr "" -#: src/multiint.cpp:1648 +#: src/multiint.cpp:1657 msgid "Allow human players to join in this slot" msgstr "" -#: src/multiint.cpp:1656 +#: src/multiint.cpp:1665 msgid "Leave this slot unused" msgstr "" -#: src/multiint.cpp:1736 +#: src/multiint.cpp:1745 msgid "Player colour" msgstr "Цвет игрока" -#: src/multiint.cpp:2062 +#: src/multiint.cpp:2071 msgid "Team" msgstr "Команда" -#: src/multiint.cpp:2074 +#: src/multiint.cpp:2083 msgid "Kick player" msgstr "Выкинуть игрока" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 #, fuzzy msgid "Click to change difficulty" msgstr "Нажмите, чтобы изменить сложность AI." -#: src/multiint.cpp:2121 +#: src/multiint.cpp:2130 msgid "Click when ready" msgstr "Щелкни когда будешь готов" -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2134 msgid "READY?" msgstr "ГОТОВ?" -#: src/multiint.cpp:2169 +#: src/multiint.cpp:2178 msgid "PLAYERS" msgstr "ИГРОКИ" -#: src/multiint.cpp:2204 +#: src/multiint.cpp:2213 #, fuzzy msgid "Click to change to this slot" msgstr "Нажмите, чтобы изменить настройки игрока." -#: src/multiint.cpp:2232 +#: src/multiint.cpp:2241 msgid "Choose Team" msgstr "Выбрать команду." -#: src/multiint.cpp:2262 +#: src/multiint.cpp:2271 #, fuzzy msgid "Click to change player colour" msgstr "Нажмите, чтобы изменить настройки игрока." -#: src/multiint.cpp:2290 +#: src/multiint.cpp:2299 #, fuzzy msgid "Click to change player position" msgstr "Нажмите, чтобы изменить настройки игрока." -#: src/multiint.cpp:2296 +#: src/multiint.cpp:2305 #, fuzzy msgid "Click to change AI" msgstr "Нажмите, чтобы изменить настройки игрока." -#: src/multiint.cpp:2300 +#: src/multiint.cpp:2309 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2362 +#: src/multiint.cpp:2371 msgid "CHAT" msgstr "ЧАТ" -#: src/multiint.cpp:2394 +#: src/multiint.cpp:2403 msgid "All players need to have the same mods to join your game." msgstr "Всем игрокам нужен такой же мод, что и у вас." -#: src/multiint.cpp:2552 +#: src/multiint.cpp:2561 #, fuzzy, c-format msgid "*** password [%s] is now required! ***" msgstr "Требуется пароль! [%s]" -#: src/multiint.cpp:2560 +#: src/multiint.cpp:2569 msgid "*** password is NOT required! ***" msgstr "*** пароль не требуется! ***" -#: src/multiint.cpp:2801 +#: src/multiint.cpp:2810 msgid "Sorry! Failed to host the game." msgstr "Извините! Не удалось создать игру." -#: src/multiint.cpp:2922 +#: src/multiint.cpp:2931 msgid "'Locked Teams' mode enabled" msgstr "Закрытые Команды" -#: src/multiint.cpp:3003 +#: src/multiint.cpp:3012 #, c-format msgid "The host has kicked %s from the game!" msgstr "Хост выкинул %s из игры!" -#: src/multiint.cpp:3073 +#: src/multiint.cpp:3082 msgid "Host is Starting Game" msgstr "Хост стартует" -#: src/multiint.cpp:3639 +#: src/multiint.cpp:3648 msgid "Players" msgstr "Игроки" -#: src/multiint.cpp:3772 +#: src/multiint.cpp:3786 #, c-format msgid "Sending Map: %d%% " msgstr "Отправка карты: %d%%" -#: src/multiint.cpp:3780 +#: src/multiint.cpp:3794 #, c-format msgid "Map: %d%% downloaded" msgstr "карта: %d%% загружена" -#: src/multiint.cpp:3803 +#: src/multiint.cpp:3820 msgid "HOST" msgstr "ХОСТ" +#: src/multiint.cpp:3827 +#: src/multimenu.cpp:772 +msgid "Ping" +msgstr "Пинг" + #: src/multijoin.cpp:100 #: src/multijoin.cpp:101 msgid "Players Still Joining" @@ -14409,17 +14414,17 @@ msgstr "%s покинул игру" msgid "File transfer has been aborted for %d." msgstr "Передача файла была прервана на %d%%" -#: src/multijoin.cpp:376 +#: src/multijoin.cpp:373 #, c-format msgid "%s (%u) has an incompatible mod, and has been kicked." msgstr "%s (%u) имеет несовместимый мод и отключен." -#: src/multijoin.cpp:415 +#: src/multijoin.cpp:412 #, c-format msgid "%s is Joining the Game" msgstr "%s присоединился к игре" -#: src/multijoin.cpp:425 +#: src/multijoin.cpp:422 msgid "System message:" msgstr "Системное сообщение" @@ -14528,10 +14533,6 @@ msgstr "Убил" msgid "Units" msgstr "Юниты" -#: src/multimenu.cpp:772 -msgid "Ping" -msgstr "Пинг" - #: src/multimenu.cpp:776 msgid "Structs" msgstr "Потери сооружений" @@ -14565,83 +14566,83 @@ msgstr "Передать энергию игроку" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "Кик игрока %s за попытку обойти проверку внутренних данных" -#: src/multiplay.cpp:1146 +#: src/multiplay.cpp:1057 msgid "(allies" msgstr "(союзники" -#: src/multiplay.cpp:1154 +#: src/multiplay.cpp:1065 msgid "(private to " msgstr "(приват" -#: src/multiplay.cpp:1167 +#: src/multiplay.cpp:1078 msgid "[invalid]" msgstr "[неверно]" -#: src/multiplay.cpp:2057 +#: src/multiplay.cpp:1942 msgid "Green" msgstr "Зелёный" -#: src/multiplay.cpp:2058 +#: src/multiplay.cpp:1943 msgid "Orange" msgstr "Оранжевый" -#: src/multiplay.cpp:2059 +#: src/multiplay.cpp:1944 msgid "Grey" msgstr "Серый" -#: src/multiplay.cpp:2060 +#: src/multiplay.cpp:1945 msgid "Black" msgstr "Чёрный" -#: src/multiplay.cpp:2061 +#: src/multiplay.cpp:1946 msgid "Red" msgstr "Красный" -#: src/multiplay.cpp:2062 +#: src/multiplay.cpp:1947 msgid "Blue" msgstr "Синий" -#: src/multiplay.cpp:2063 +#: src/multiplay.cpp:1948 msgid "Pink" msgstr "Розовый" -#: src/multiplay.cpp:2064 +#: src/multiplay.cpp:1949 msgid "Cyan" msgstr "Голубой" -#: src/multiplay.cpp:2065 +#: src/multiplay.cpp:1950 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:2066 +#: src/multiplay.cpp:1951 msgid "Purple" msgstr "" -#: src/multiplay.cpp:2067 +#: src/multiplay.cpp:1952 msgid "White" msgstr "" -#: src/multiplay.cpp:2068 +#: src/multiplay.cpp:1953 msgid "Bright blue" msgstr "" -#: src/multiplay.cpp:2069 +#: src/multiplay.cpp:1954 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:2070 +#: src/multiplay.cpp:1955 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:2071 +#: src/multiplay.cpp:1956 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:2072 +#: src/multiplay.cpp:1957 msgid "Brown" msgstr "" -#: src/order.cpp:841 +#: src/order.cpp:800 msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "Мы не киборги, чтобы использовать Транспорт киборгов." @@ -14776,20 +14777,20 @@ msgstr "Общее время игры: %s" msgid "You cheated!" msgstr "Ты читер!" -#: src/scriptfuncs.cpp:3250 +#: src/scriptfuncs.cpp:3287 msgid "YOU ARE VICTORIOUS!" msgstr "ПОБЕДА!" -#: src/scriptfuncs.cpp:3254 +#: src/scriptfuncs.cpp:3291 msgid "YOU WERE DEFEATED!" msgstr "ВЫ ПРОИГРАЛИ!" -#: src/scriptfuncs.cpp:9500 +#: src/scriptfuncs.cpp:9537 #, c-format msgid "Beacon received from %s!" msgstr "Маяк получен от %s!" -#: src/scriptfuncs.cpp:9546 +#: src/scriptfuncs.cpp:9583 #, c-format msgid "Beacon %d" msgstr "Маяк %d" @@ -14819,13 +14820,13 @@ msgstr "Не найдено ни одного сенсорного юнита!" msgid "Unable to locate any Commanders!" msgstr "Не найдено ни одного командира!" -#: src/structure.cpp:2615 +#: src/structure.cpp:2614 #, fuzzy msgid "Command Control Limit Reached - Production Halted" msgstr "Достигнут Предел - Производство Остановлено" -#: src/structure.cpp:5815 -#: src/structure.cpp:5840 +#: src/structure.cpp:5806 +#: src/structure.cpp:5831 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" @@ -14833,50 +14834,50 @@ msgstr[0] "%s - %u Юнит назначен" msgstr[1] "%s - %u Юнитов назначено" msgstr[2] "%s - %u Юнита назначено" -#: src/structure.cpp:5845 -#: src/structure.cpp:5913 -#: src/structure.cpp:5929 -#: src/structure.cpp:5943 +#: src/structure.cpp:5836 +#: src/structure.cpp:5904 +#: src/structure.cpp:5920 +#: src/structure.cpp:5934 #, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - повреждение %3.0f%%" -#: src/structure.cpp:5895 +#: src/structure.cpp:5886 #, c-format msgid "%s - Connected %u of %u" msgstr "%s - подключено %u из %u" -#: src/structure.cpp:6059 -#: src/structure.cpp:6104 +#: src/structure.cpp:6050 +#: src/structure.cpp:6095 #, c-format msgid "%s - Electronically Damaged" msgstr "%s - Электронные повреждения" -#: src/structure.cpp:6341 +#: src/structure.cpp:6332 msgid "Electronic Reward - Visibility Report" msgstr "награда - доклад о местоположении" -#: src/structure.cpp:6381 +#: src/structure.cpp:6372 msgid "Factory Reward - Propulsion" msgstr "награда завода - движитель" -#: src/structure.cpp:6405 +#: src/structure.cpp:6396 msgid "Factory Reward - Body" msgstr "награда завода - рама" -#: src/structure.cpp:6429 +#: src/structure.cpp:6420 msgid "Factory Reward - Weapon" msgstr "награда завода - оружие" -#: src/structure.cpp:6438 +#: src/structure.cpp:6429 msgid "Factory Reward - Nothing" msgstr "награда завода - ничего" -#: src/structure.cpp:6466 +#: src/structure.cpp:6457 msgid "Repair Facility Award - Repair" msgstr "награда мастерской - ремонт" -#: src/structure.cpp:6473 +#: src/structure.cpp:6464 msgid "Repair Facility Award - Nothing" msgstr "награда мастерской - ничего" diff --git a/po/sk.po b/po/sk.po index a630fa135..c401fbd8b 100644 --- a/po/sk.po +++ b/po/sk.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100 2.3.2\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-01-18 00:54+0100\n" +"POT-Creation-Date: 2011-02-25 23:35+0100\n" "PO-Revision-Date: 2010-07-30 08:44+0100\n" "Last-Translator: Marian Zsemlye \n" "Language-Team: Koapa - Marian Zsemlye \n" @@ -5733,7 +5733,7 @@ msgid "New Design" msgstr "" #: data/base/messages/strings/names.txt:15 -#: src/design.cpp:1313 +#: src/design.cpp:1275 msgid "Transport" msgstr "" @@ -12015,26 +12015,26 @@ msgid "System locale" msgstr "Systémové údaje" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1043 +#: lib/netplay/netplay.cpp:1042 msgid "Enter password here" msgstr "" -#: lib/netplay/netplay.cpp:2048 +#: lib/netplay/netplay.cpp:2060 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "" -#: lib/netplay/netplay.cpp:2062 +#: lib/netplay/netplay.cpp:2082 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "" #: src/challenge.cpp:184 -#: src/hci.cpp:922 -#: src/hci.cpp:3390 -#: src/hci.cpp:3513 -#: src/hci.cpp:3924 -#: src/hci.cpp:4942 +#: src/hci.cpp:916 +#: src/hci.cpp:3378 +#: src/hci.cpp:3501 +#: src/hci.cpp:3912 +#: src/hci.cpp:4930 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12186,149 +12186,149 @@ msgstr "" #: src/configuration.cpp:393 #: src/configuration.cpp:394 -#: src/multistat.cpp:130 +#: src/multistat.cpp:124 msgid "Player" msgstr "Hráč" -#: src/design.cpp:449 -#: src/design.cpp:469 -#: src/design.cpp:3501 +#: src/design.cpp:443 +#: src/design.cpp:455 +#: src/design.cpp:3464 msgid "New Vehicle" msgstr "Nové vozidlo" -#: src/design.cpp:515 +#: src/design.cpp:500 msgid "Vehicle Body" msgstr "Telo vozidla" -#: src/design.cpp:535 +#: src/design.cpp:520 msgid "Vehicle Propulsion" msgstr "Pohon vozidla" -#: src/design.cpp:556 -#: src/design.cpp:579 -#: src/design.cpp:603 +#: src/design.cpp:541 +#: src/design.cpp:564 +#: src/design.cpp:588 msgid "Vehicle Turret" msgstr "Veža vozidla" -#: src/design.cpp:622 +#: src/design.cpp:607 msgid "Delete Design" msgstr "Zmazať návrh" -#: src/design.cpp:673 -#: src/design.cpp:720 +#: src/design.cpp:658 +#: src/design.cpp:705 msgid "Kinetic Armour" msgstr "Pohybové brnenie" -#: src/design.cpp:682 -#: src/design.cpp:730 +#: src/design.cpp:667 +#: src/design.cpp:715 msgid "Thermal Armour" msgstr "Tepelné brnenie" -#: src/design.cpp:698 -#: src/design.cpp:750 +#: src/design.cpp:683 +#: src/design.cpp:735 msgid "Engine Output" msgstr "Exhaláty" -#: src/design.cpp:706 -#: src/design.cpp:759 -#: src/design.cpp:1529 -#: src/design.cpp:1553 -#: src/design.cpp:1574 -#: src/design.cpp:1590 -#: src/design.cpp:1610 -#: src/design.cpp:1627 -#: src/design.cpp:1647 -#: src/design.cpp:1664 -#: src/design.cpp:1705 -#: src/design.cpp:1737 -#: src/design.cpp:1869 -#: src/design.cpp:1885 -#: src/design.cpp:1923 -#: src/design.cpp:1956 +#: src/design.cpp:691 +#: src/design.cpp:744 +#: src/design.cpp:1486 +#: src/design.cpp:1510 +#: src/design.cpp:1531 +#: src/design.cpp:1547 +#: src/design.cpp:1567 +#: src/design.cpp:1584 +#: src/design.cpp:1604 +#: src/design.cpp:1621 +#: src/design.cpp:1662 +#: src/design.cpp:1694 +#: src/design.cpp:1826 +#: src/design.cpp:1842 +#: src/design.cpp:1880 +#: src/design.cpp:1913 msgid "Weight" msgstr "Hmotnosť" -#: src/design.cpp:790 -#: src/design.cpp:808 +#: src/design.cpp:775 +#: src/design.cpp:793 msgid "Total Power Required" msgstr "Celkovo požadovaná energia" -#: src/design.cpp:821 -#: src/design.cpp:840 +#: src/design.cpp:806 +#: src/design.cpp:825 msgid "Total Body Points" msgstr "" -#: src/design.cpp:1027 -#: src/design.cpp:1059 +#: src/design.cpp:996 +#: src/design.cpp:1025 msgid "Power Usage" msgstr "Spotreba energie" -#: src/design.cpp:1335 +#: src/design.cpp:1298 msgid "Hydra " msgstr "" -#: src/design.cpp:1509 -#: src/design.cpp:1537 +#: src/design.cpp:1466 +#: src/design.cpp:1494 msgid "Sensor Range" msgstr "Dosah snímačov" -#: src/design.cpp:1521 -#: src/design.cpp:1545 +#: src/design.cpp:1478 +#: src/design.cpp:1502 msgid "Sensor Power" msgstr "" -#: src/design.cpp:1566 -#: src/design.cpp:1582 +#: src/design.cpp:1523 +#: src/design.cpp:1539 msgid "ECM Power" msgstr "" -#: src/design.cpp:1602 -#: src/design.cpp:1619 -#: src/design.cpp:1639 -#: src/design.cpp:1656 +#: src/design.cpp:1559 +#: src/design.cpp:1576 +#: src/design.cpp:1596 +#: src/design.cpp:1613 msgid "Build Points" msgstr "" -#: src/design.cpp:1677 -#: src/design.cpp:1713 +#: src/design.cpp:1634 +#: src/design.cpp:1670 msgid "Range" msgstr "Dosah" -#: src/design.cpp:1689 -#: src/design.cpp:1721 +#: src/design.cpp:1646 +#: src/design.cpp:1678 msgid "Damage" msgstr "Poškodenie" -#: src/design.cpp:1697 -#: src/design.cpp:1729 +#: src/design.cpp:1654 +#: src/design.cpp:1686 msgid "Rate-of-Fire" msgstr "" -#: src/design.cpp:1857 -#: src/design.cpp:1877 +#: src/design.cpp:1814 +#: src/design.cpp:1834 msgid "Air Speed" msgstr "Rýchlosť letu" -#: src/design.cpp:1895 -#: src/design.cpp:1932 +#: src/design.cpp:1852 +#: src/design.cpp:1889 msgid "Road Speed" msgstr "Rýchlosť na ceste" -#: src/design.cpp:1905 -#: src/design.cpp:1940 +#: src/design.cpp:1862 +#: src/design.cpp:1897 msgid "Off-Road Speed" msgstr "Rýchlosť na pevnine" -#: src/design.cpp:1913 -#: src/design.cpp:1948 +#: src/design.cpp:1870 +#: src/design.cpp:1905 msgid "Water Speed" msgstr "Rýchlosť po vode" -#: src/design.cpp:2074 +#: src/design.cpp:2031 msgid "Weapons" msgstr "Zbrane" -#: src/design.cpp:2094 +#: src/design.cpp:2051 msgid "Systems" msgstr "" @@ -12341,7 +12341,7 @@ msgid "Player dropped" msgstr "Hráč spadol" #: src/display3d.cpp:599 -#: src/multiint.cpp:2116 +#: src/multiint.cpp:2125 msgid "Waiting for other players" msgstr "" @@ -12349,44 +12349,44 @@ msgstr "" msgid "Out of sync" msgstr "" -#: src/display.cpp:1651 +#: src/display.cpp:1649 msgid "Cannot Build. Oil Resource Burning." msgstr "Nemožno stavať. Ropný vrt horí." -#: src/display.cpp:1830 -#: src/display.cpp:2423 +#: src/display.cpp:1828 +#: src/display.cpp:2421 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - Poškodenie %d%% - Zkúsenosti %d, %s" -#: src/display.cpp:1846 +#: src/display.cpp:1844 #, c-format msgid "%s - Allied - Damage %d%% - Experience %d, %s" msgstr "%s - Spojenec - Poškoenie %d%% - Zkúsenosti %d, %s" -#: src/display.cpp:2044 +#: src/display.cpp:2042 msgid "Truck ordered to build Oil Derrick" msgstr "Vozidlo poverené stavbou ropnej veže" -#: src/display.cpp:2045 +#: src/display.cpp:2043 #, fuzzy msgid "2 trucks ordered to build Oil Derrick" msgstr "Vozidlo poverené stavbou ropnej veže" -#: src/display.cpp:2046 +#: src/display.cpp:2044 #, fuzzy, c-format msgid "%d trucks ordered to build Oil Derrick" msgstr "Vozidlo poverené stavbou ropnej veže" -#: src/droid.cpp:208 +#: src/droid.cpp:211 msgid "Unit Lost!" msgstr "Jednotka stratená!" -#: src/droid.cpp:1370 +#: src/droid.cpp:1376 msgid "Structure Restored" msgstr "Budova obnovená" -#: src/droid.cpp:2712 +#: src/droid.cpp:2732 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" @@ -12394,7 +12394,7 @@ msgstr[0] "Skupina %u vybraná - %u jednotka" msgstr[1] "Skupina %u vybraná - %u jednotky" msgstr[2] "Skupina %u vybraná - %u jednotiek" -#: src/droid.cpp:2725 +#: src/droid.cpp:2745 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" @@ -12402,7 +12402,7 @@ msgstr[0] "%u jednotka pripojená ku skupine %u" msgstr[1] "%u jednotky pripojené ku skupine %u" msgstr[2] "%u jednotiek pripojených ku skupine %u" -#: src/droid.cpp:2738 +#: src/droid.cpp:2758 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" @@ -12410,7 +12410,7 @@ msgstr[0] "Zamerané na skupinu %u - %u jednotka" msgstr[1] "Zamerané na skupinu %u - %u jednotky" msgstr[2] "Zamerané na skupinu %u - %u jednotiek" -#: src/droid.cpp:2742 +#: src/droid.cpp:2762 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" @@ -12418,49 +12418,49 @@ msgstr[0] "Vyrovananý so skupinou %u - %u jednotka" msgstr[1] "Vyrovnané so skupinou %u - %u jednotky" msgstr[2] "Vyrovnaných so skupinou %u - %u jednotiek" -#: src/droid.cpp:3080 +#: src/droid.cpp:3093 msgid "Rookie" msgstr "Nováčik" -#: src/droid.cpp:3081 +#: src/droid.cpp:3094 msgctxt "rank" msgid "Green" msgstr "Zelenáč" -#: src/droid.cpp:3082 +#: src/droid.cpp:3095 msgid "Trained" msgstr "Trénovaný" -#: src/droid.cpp:3083 +#: src/droid.cpp:3096 msgid "Regular" msgstr "Bežný" -#: src/droid.cpp:3084 +#: src/droid.cpp:3097 msgid "Professional" msgstr "Profesionál" -#: src/droid.cpp:3085 +#: src/droid.cpp:3098 msgid "Veteran" msgstr "Veterán" -#: src/droid.cpp:3086 +#: src/droid.cpp:3099 msgid "Elite" msgstr "Elita" -#: src/droid.cpp:3087 +#: src/droid.cpp:3100 msgid "Special" msgstr "Špecialista" -#: src/droid.cpp:3088 +#: src/droid.cpp:3101 msgid "Hero" msgstr "Hrdina" -#: src/droid.cpp:4110 +#: src/droid.cpp:4123 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "" -#: src/droid.cpp:4114 +#: src/droid.cpp:4127 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "" @@ -12479,7 +12479,7 @@ msgid "Tutorial" msgstr "Výcvik" #: src/frontend.cpp:100 -#: src/hci.cpp:3499 +#: src/hci.cpp:3487 msgid "Options" msgstr "Nastavenia" @@ -12530,7 +12530,7 @@ msgid "Challenges" msgstr "" #: src/frontend.cpp:215 -#: src/ingameop.cpp:275 +#: src/ingameop.cpp:272 msgid "Load Game" msgstr "Nahraj Hru" @@ -12539,9 +12539,9 @@ msgid "SINGLE PLAYER" msgstr "HRA JEDNÉHO HRÁČA" #: src/frontend.cpp:303 -#: src/ingameop.cpp:498 -#: src/mission.cpp:2527 -#: src/mission.cpp:2630 +#: src/ingameop.cpp:494 +#: src/mission.cpp:2493 +#: src/mission.cpp:2596 msgid "Load Saved Game" msgstr "Nahrať uloženú hru" @@ -12558,7 +12558,7 @@ msgid "Join Game" msgstr "Pripojiť sa ku hre" #: src/frontend.cpp:422 -#: src/multiint.cpp:1276 +#: src/multiint.cpp:1285 msgid "OPTIONS" msgstr "NASTAVENIA" @@ -12575,7 +12575,7 @@ msgid "Video Options" msgstr "Nastavenia videa" #: src/frontend.cpp:426 -#: src/ingameop.cpp:270 +#: src/ingameop.cpp:267 msgid "Audio Options" msgstr "Zvukové nastavanie" @@ -12653,7 +12653,7 @@ msgid "Off" msgstr "Vypnuté" #: src/frontend.cpp:523 -#: src/multiint.cpp:1345 +#: src/multiint.cpp:1354 msgid "Fog" msgstr "Hmla" @@ -12664,7 +12664,7 @@ msgstr "Hmla" #: src/frontend.cpp:530 #: src/frontend.cpp:595 -#: src/multiint.cpp:1347 +#: src/multiint.cpp:1356 msgid "Fog Of War" msgstr "Vojnová hmla" @@ -12824,200 +12824,200 @@ msgid "GAME OPTIONS" msgstr "NASTAVENIA HRY" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2389 +#: src/multiint.cpp:2398 msgid "Mod: " msgstr "" -#: src/hci.cpp:1245 +#: src/hci.cpp:1237 msgid "MAP SAVED!" msgstr "MAPA ULOŽENÁ!" -#: src/hci.cpp:1584 +#: src/hci.cpp:1573 #: src/loop.cpp:558 #: src/loop.cpp:574 #, fuzzy msgid "GAME SAVED: " msgstr "HRA ULOŽENÁ!" -#: src/hci.cpp:1971 +#: src/hci.cpp:1960 msgid "Failed to create building" msgstr "" -#: src/hci.cpp:1988 +#: src/hci.cpp:1977 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new structure: %s." msgstr "Hráč %u podvádza (ladiace menu) novou budovou: %s" -#: src/hci.cpp:2003 +#: src/hci.cpp:1992 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new feature: %s." msgstr "" -#: src/hci.cpp:2025 +#: src/hci.cpp:2014 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid: %s." msgstr "" -#: src/hci.cpp:2036 +#: src/hci.cpp:2025 #, fuzzy, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "Hráč %u podvádza (ladiace menu) novou budovou: %s" -#: src/hci.cpp:3310 +#: src/hci.cpp:3298 msgid "Commanders (F6)" msgstr "Velitelia (F6)" -#: src/hci.cpp:3323 +#: src/hci.cpp:3311 msgid "Intelligence Display (F5)" msgstr "Spravodajské okno (F5)" -#: src/hci.cpp:3336 +#: src/hci.cpp:3324 msgid "Manufacture (F1)" msgstr "Výroba (F1)" -#: src/hci.cpp:3349 +#: src/hci.cpp:3337 msgid "Design (F4)" msgstr "Konštrukcia (F4)" -#: src/hci.cpp:3362 +#: src/hci.cpp:3350 msgid "Research (F2)" msgstr "Výzkum (F2)" -#: src/hci.cpp:3375 +#: src/hci.cpp:3363 msgid "Build (F3)" msgstr "Stavba (F3)" -#: src/hci.cpp:3446 -#: src/multiint.cpp:1392 +#: src/hci.cpp:3434 +#: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Energia" -#: src/hci.cpp:3537 +#: src/hci.cpp:3525 msgid "Map:" msgstr "" -#: src/hci.cpp:3550 +#: src/hci.cpp:3538 #, fuzzy msgid "Load" msgstr "Nahraj Hru" -#: src/hci.cpp:3551 +#: src/hci.cpp:3539 #, fuzzy msgid "Load Map File" msgstr "Nahraj Hru" -#: src/hci.cpp:3558 +#: src/hci.cpp:3546 #, fuzzy msgid "Save" msgstr "Uložiť hru" -#: src/hci.cpp:3559 +#: src/hci.cpp:3547 #, fuzzy msgid "Save Map File" msgstr "Uložiť hru" -#: src/hci.cpp:3567 +#: src/hci.cpp:3555 msgid "New" msgstr "" -#: src/hci.cpp:3568 +#: src/hci.cpp:3556 msgid "New Blank Map" msgstr "" -#: src/hci.cpp:3604 +#: src/hci.cpp:3592 msgid "Tile" msgstr "dlaždica" -#: src/hci.cpp:3605 +#: src/hci.cpp:3593 msgid "Place tiles on map" msgstr "Umiestni dlaždice na mapu" -#: src/hci.cpp:3614 +#: src/hci.cpp:3602 msgid "Unit" msgstr "Jednotka" -#: src/hci.cpp:3615 +#: src/hci.cpp:3603 msgid "Place Unit on map" msgstr "Umiestni na mapu jednotky" -#: src/hci.cpp:3623 +#: src/hci.cpp:3611 msgid "Struct" msgstr "Stavba" -#: src/hci.cpp:3624 +#: src/hci.cpp:3612 msgid "Place Structures on map" msgstr "Umiestni na mapu budovy" -#: src/hci.cpp:3632 +#: src/hci.cpp:3620 msgid "Feat" msgstr "" -#: src/hci.cpp:3633 +#: src/hci.cpp:3621 msgid "Place Features on map" msgstr "Umiestni na mapu črty" -#: src/hci.cpp:3643 +#: src/hci.cpp:3631 msgid "Pause" msgstr "" -#: src/hci.cpp:3644 +#: src/hci.cpp:3632 msgid "Pause or unpause the game" msgstr "Pauzni alebo odpauzni hru" -#: src/hci.cpp:3658 +#: src/hci.cpp:3646 msgid "Align height of all map objects" msgstr "" -#: src/hci.cpp:3668 +#: src/hci.cpp:3656 msgid "Edit" msgstr "" -#: src/hci.cpp:3669 +#: src/hci.cpp:3657 #, fuzzy msgid "Start Edit Mode" msgstr "Začni bez základní" -#: src/hci.cpp:3683 +#: src/hci.cpp:3671 #: src/ingameop.cpp:112 -#: src/ingameop.cpp:258 -#: src/ingameop.cpp:263 +#: src/ingameop.cpp:256 +#: src/ingameop.cpp:260 msgid "Quit" msgstr "Ukončiť" -#: src/hci.cpp:3684 +#: src/hci.cpp:3672 msgid "Exit Game" msgstr "Ukončiť hru" -#: src/hci.cpp:3710 +#: src/hci.cpp:3698 #, fuzzy msgid "Current Player:" msgstr "Hra viacerých hráčov" -#: src/hci.cpp:4001 +#: src/hci.cpp:3989 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "Panel priebehu" -#: src/hci.cpp:4867 +#: src/hci.cpp:4855 msgid "Factory Delivery Point" msgstr "" -#: src/hci.cpp:4885 +#: src/hci.cpp:4873 msgid "Loop Production" msgstr "Opakovať výrobu" -#: src/hci.cpp:4965 +#: src/hci.cpp:4953 msgid "Tab Scroll left" msgstr "" -#: src/hci.cpp:4980 +#: src/hci.cpp:4968 msgid "Tab Scroll right" msgstr "" #: src/ingameop.cpp:111 -#: src/ingameop.cpp:193 -#: src/ingameop.cpp:267 +#: src/ingameop.cpp:195 +#: src/ingameop.cpp:264 msgid "Resume Game" msgstr "Pokračovať v hre" @@ -13025,32 +13025,32 @@ msgstr "Pokračovať v hre" msgid "WARNING: You're the host. If you quit, the game ends for everyone!" msgstr "" -#: src/ingameop.cpp:185 -#: src/ingameop.cpp:527 +#: src/ingameop.cpp:186 +#: src/ingameop.cpp:523 msgid "Tactical UI (Target Origin Icon): Show" msgstr "" -#: src/ingameop.cpp:190 -#: src/ingameop.cpp:531 +#: src/ingameop.cpp:191 +#: src/ingameop.cpp:527 msgid "Tactical UI (Target Origin Icon): Hide" msgstr "" -#: src/ingameop.cpp:277 -#: src/ingameop.cpp:502 -#: src/mission.cpp:2514 -#: src/mission.cpp:2633 +#: src/ingameop.cpp:274 +#: src/ingameop.cpp:498 +#: src/mission.cpp:2480 +#: src/mission.cpp:2599 msgid "Save Game" msgstr "Uložiť hru" -#: src/ingameop.cpp:343 +#: src/ingameop.cpp:339 msgid "Host has quit the game!" msgstr "Hostiteľ ukončil hru!" -#: src/ingameop.cpp:349 +#: src/ingameop.cpp:345 msgid "The game can't continue without the host." msgstr "" -#: src/ingameop.cpp:355 +#: src/ingameop.cpp:351 msgid "--> QUIT <--" msgstr "--> KONIEC <--" @@ -13426,52 +13426,52 @@ msgstr "" msgid "Screen shake when things die: On" msgstr "" -#: src/keybind.cpp:2603 -#: src/keybind.cpp:2646 +#: src/keybind.cpp:2604 +#: src/keybind.cpp:2647 msgid "Sorry, but game speed cannot be changed in multiplayer." msgstr "Prepáčte, ale hra nemôže byť zmenená v móde viacerých hráčov." -#: src/keybind.cpp:2624 -#: src/keybind.cpp:2667 -#: src/keybind.cpp:2689 +#: src/keybind.cpp:2625 +#: src/keybind.cpp:2668 +#: src/keybind.cpp:2690 msgid "Game Speed Reset" msgstr "Reset rýchlosti hry" -#: src/keybind.cpp:2628 +#: src/keybind.cpp:2629 #, c-format msgid "Game Speed Increased to %3.1f" msgstr "Rychlosť hry zvýšená na %3.1f" -#: src/keybind.cpp:2671 +#: src/keybind.cpp:2672 #, c-format msgid "Game Speed Reduced to %3.1f" msgstr "Rychlosť hry znížená na %3.1f" -#: src/keybind.cpp:2701 +#: src/keybind.cpp:2702 msgid "Radar showing friend-foe colors" msgstr "" -#: src/keybind.cpp:2705 +#: src/keybind.cpp:2706 msgid "Radar showing player colors" msgstr "Radar ukazuje farby hráčov" -#: src/keybind.cpp:2726 +#: src/keybind.cpp:2727 msgid "Radar showing only objects" msgstr "Radar ukazuje iba objekty" -#: src/keybind.cpp:2729 +#: src/keybind.cpp:2730 msgid "Radar blending terrain and height" msgstr "" -#: src/keybind.cpp:2732 +#: src/keybind.cpp:2733 msgid "Radar showing terrain" msgstr "Radar ukazuje terén" -#: src/keybind.cpp:2735 +#: src/keybind.cpp:2736 msgid "Radar showing revealed terrain" msgstr "Radar ukazuje odkrytý terén" -#: src/keybind.cpp:2738 +#: src/keybind.cpp:2739 msgid "Radar showing height" msgstr "Radar ukazuje výšku" @@ -13480,9 +13480,9 @@ msgid "KEY MAPPING" msgstr "MAPOVANIE KLÁVES" #: src/keyedit.cpp:372 -#: src/multiint.cpp:662 -#: src/multiint.cpp:1072 -#: src/multiint.cpp:1478 +#: src/multiint.cpp:671 +#: src/multiint.cpp:1081 +#: src/multiint.cpp:1487 msgid "Return To Previous Screen" msgstr "Návrat na predchádzajúcu obrazovku" @@ -13978,37 +13978,37 @@ msgstr "" msgid "Could not save game!" msgstr "Nemožno uložiť hru!" -#: src/mission.cpp:2075 +#: src/mission.cpp:2041 msgid "Load Transport" msgstr "Naložit transport" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "CIEL SPLNENÝ podvádzaním!" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED" msgstr "CIEĽ BOL SPLNENÝ" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED--and you cheated!" msgstr "CIEL NESPLNENÝ-a podvádzal si!" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED" msgstr "CIEĽ NEBOL SPLNENÝ" -#: src/mission.cpp:2493 -#: src/mission.cpp:2533 -#: src/mission.cpp:2647 +#: src/mission.cpp:2459 +#: src/mission.cpp:2499 +#: src/mission.cpp:2613 msgid "Quit To Main Menu" msgstr "Skončiť do hlavého menu" -#: src/mission.cpp:2501 +#: src/mission.cpp:2467 msgid "Continue Game" msgstr "Pokračovat v hre" -#: src/mission.cpp:2598 +#: src/mission.cpp:2564 msgid "GAME SAVED :" msgstr "HRA ULOŽENÁ!" @@ -14067,346 +14067,351 @@ msgstr "%s uzavrel spojenectvo s %s" msgid "You Discover Blueprints For %s" msgstr "Našiel si plány na %s" -#: src/multiint.cpp:600 +#: src/multiint.cpp:609 #: src/multilimit.cpp:190 msgid "Accept Settings" msgstr "Potvrď nastavenia" -#: src/multiint.cpp:602 -#: src/multiint.cpp:1117 +#: src/multiint.cpp:611 +#: src/multiint.cpp:1126 msgid "Cancel" msgstr "Zrušiť" -#: src/multiint.cpp:613 +#: src/multiint.cpp:622 msgid "IP Address or Machine Name" msgstr "IP adresa alebo meno stroja" -#: src/multiint.cpp:659 +#: src/multiint.cpp:668 msgid "CONNECTION" msgstr "SPOJENIE" -#: src/multiint.cpp:664 +#: src/multiint.cpp:673 msgid "Lobby" msgstr "Lobby" -#: src/multiint.cpp:665 +#: src/multiint.cpp:674 msgid "IP" msgstr "IP" -#: src/multiint.cpp:854 +#: src/multiint.cpp:863 msgid "No games are available" msgstr "Žiadne hry k dispozícii" -#: src/multiint.cpp:857 +#: src/multiint.cpp:866 msgid "Game is full" msgstr "" -#: src/multiint.cpp:861 +#: src/multiint.cpp:870 msgid "You were kicked!" msgstr "" -#: src/multiint.cpp:864 +#: src/multiint.cpp:873 msgid "Wrong Game Version!" msgstr "" -#: src/multiint.cpp:867 +#: src/multiint.cpp:876 msgid "You have an incompatible mod." msgstr "" -#: src/multiint.cpp:871 +#: src/multiint.cpp:880 msgid "Host couldn't send file?" msgstr "" -#: src/multiint.cpp:875 +#: src/multiint.cpp:884 msgid "Incorrect Password!" msgstr "" -#: src/multiint.cpp:878 +#: src/multiint.cpp:887 msgid "Host has dropped connection!" msgstr "" -#: src/multiint.cpp:882 +#: src/multiint.cpp:891 msgid "Connection Error" msgstr "" -#: src/multiint.cpp:1012 +#: src/multiint.cpp:1021 msgid "Searching" msgstr "Hľadám" -#: src/multiint.cpp:1069 +#: src/multiint.cpp:1078 msgid "GAMES" msgstr "HRY" -#: src/multiint.cpp:1077 +#: src/multiint.cpp:1086 msgid "Refresh Games List" msgstr "Aktualizuj zoznam hier" -#: src/multiint.cpp:1097 +#: src/multiint.cpp:1106 msgid "Enter Password:" msgstr "" -#: src/multiint.cpp:1115 +#: src/multiint.cpp:1124 msgid "OK" msgstr "" -#: src/multiint.cpp:1232 +#: src/multiint.cpp:1241 msgid "Tanks disabled!!" msgstr "" -#: src/multiint.cpp:1233 +#: src/multiint.cpp:1242 #, fuzzy msgid "Cyborgs disabled." msgstr "Dostupný novy kyborg" -#: src/multiint.cpp:1234 +#: src/multiint.cpp:1243 msgid "VTOLs disabled." msgstr "" -#: src/multiint.cpp:1281 -#: src/multiint.cpp:1288 +#: src/multiint.cpp:1290 +#: src/multiint.cpp:1297 msgid "Select Game Name" msgstr "Vyber meno hry" -#: src/multiint.cpp:1281 +#: src/multiint.cpp:1290 msgid "One-Player Skirmish" msgstr "" -#: src/multiint.cpp:1291 +#: src/multiint.cpp:1300 msgid "Select Map" msgstr "Vyber Mapu" -#: src/multiint.cpp:1299 +#: src/multiint.cpp:1308 msgid "Click to set Password" msgstr "" -#: src/multiint.cpp:1309 -#: src/multiint.cpp:1310 +#: src/multiint.cpp:1318 +#: src/multiint.cpp:1319 msgid "Scavengers" msgstr "" -#: src/multiint.cpp:1312 +#: src/multiint.cpp:1321 msgid "No Scavengers" msgstr "" -#: src/multiint.cpp:1342 +#: src/multiint.cpp:1351 msgid "Select Player Name" msgstr "Vyber meno hráča" -#: src/multiint.cpp:1348 +#: src/multiint.cpp:1357 msgid "Distance Fog" msgstr "Vzdialenostná hmla" -#: src/multiint.cpp:1359 +#: src/multiint.cpp:1368 #: src/multimenu.cpp:756 msgid "Alliances" msgstr "Spojenectvá" -#: src/multiint.cpp:1362 +#: src/multiint.cpp:1371 msgid "No Alliances" msgstr "Bez spojenectiev" -#: src/multiint.cpp:1364 +#: src/multiint.cpp:1373 msgid "Allow Alliances" msgstr "Povoľ spojenectvá" -#: src/multiint.cpp:1368 +#: src/multiint.cpp:1377 msgid "Locked Teams" msgstr "Pevné týmy" -#: src/multiint.cpp:1394 +#: src/multiint.cpp:1403 msgid "Low Power Levels" msgstr "Nízke energetické úrovne" -#: src/multiint.cpp:1396 +#: src/multiint.cpp:1405 msgid "Medium Power Levels" msgstr "Stredné energetické úrovne" -#: src/multiint.cpp:1398 +#: src/multiint.cpp:1407 msgid "High Power Levels" msgstr "Vysoké energetické úrovne" -#: src/multiint.cpp:1430 +#: src/multiint.cpp:1439 msgid "Base" msgstr "Základňa" -#: src/multiint.cpp:1432 +#: src/multiint.cpp:1441 msgid "Start with No Bases" msgstr "Začni bez základní" -#: src/multiint.cpp:1434 +#: src/multiint.cpp:1443 msgid "Start with Bases" msgstr "Začni so základňami" -#: src/multiint.cpp:1436 +#: src/multiint.cpp:1445 msgid "Start with Advanced Bases" msgstr "Začni s rozvinutými základňami" -#: src/multiint.cpp:1468 +#: src/multiint.cpp:1477 msgid "Map Preview" msgstr "" -#: src/multiint.cpp:1470 +#: src/multiint.cpp:1479 msgid "Click to see Map" msgstr "" -#: src/multiint.cpp:1484 +#: src/multiint.cpp:1493 msgid "Start Hosting Game" msgstr "Začni hosťovať hru" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 msgid "Show Structure Limits" msgstr "Zobraz limity budovy" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 msgid "Set Structure Limits" msgstr "Nastavenie limitu budov" -#: src/multiint.cpp:1587 +#: src/multiint.cpp:1596 msgid "DIFFICULTY" msgstr "" -#: src/multiint.cpp:1601 +#: src/multiint.cpp:1610 msgid "Less aggressive and starts with less units" msgstr "" -#: src/multiint.cpp:1602 +#: src/multiint.cpp:1611 #, fuzzy msgid "Plays nice" msgstr "Hráč" -#: src/multiint.cpp:1603 +#: src/multiint.cpp:1612 msgid "No holds barred" msgstr "" -#: src/multiint.cpp:1604 +#: src/multiint.cpp:1613 msgid "Starts with advantages and gets twice as much oil from derricks" msgstr "" -#: src/multiint.cpp:1632 +#: src/multiint.cpp:1641 msgid "CHOOSE AI" msgstr "" -#: src/multiint.cpp:1648 +#: src/multiint.cpp:1657 msgid "Allow human players to join in this slot" msgstr "" -#: src/multiint.cpp:1656 +#: src/multiint.cpp:1665 msgid "Leave this slot unused" msgstr "" -#: src/multiint.cpp:1736 +#: src/multiint.cpp:1745 msgid "Player colour" msgstr "Farba hráča" -#: src/multiint.cpp:2062 +#: src/multiint.cpp:2071 msgid "Team" msgstr "" -#: src/multiint.cpp:2074 +#: src/multiint.cpp:2083 msgid "Kick player" msgstr "Protihráč" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 #, fuzzy msgid "Click to change difficulty" msgstr "Radar ukazuje farby hráčov" -#: src/multiint.cpp:2121 +#: src/multiint.cpp:2130 msgid "Click when ready" msgstr "" -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2134 msgid "READY?" msgstr "" -#: src/multiint.cpp:2169 +#: src/multiint.cpp:2178 msgid "PLAYERS" msgstr "HRÁČI" -#: src/multiint.cpp:2204 +#: src/multiint.cpp:2213 msgid "Click to change to this slot" msgstr "" -#: src/multiint.cpp:2232 +#: src/multiint.cpp:2241 #, fuzzy msgid "Choose Team" msgstr "Pevné týmy" -#: src/multiint.cpp:2262 +#: src/multiint.cpp:2271 #, fuzzy msgid "Click to change player colour" msgstr "Radar ukazuje farby hráčov" -#: src/multiint.cpp:2290 +#: src/multiint.cpp:2299 #, fuzzy msgid "Click to change player position" msgstr "Bráň pozíciu" -#: src/multiint.cpp:2296 +#: src/multiint.cpp:2305 #, fuzzy msgid "Click to change AI" msgstr "Radar ukazuje farby hráčov" -#: src/multiint.cpp:2300 +#: src/multiint.cpp:2309 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2362 +#: src/multiint.cpp:2371 msgid "CHAT" msgstr "CHAT" -#: src/multiint.cpp:2394 +#: src/multiint.cpp:2403 msgid "All players need to have the same mods to join your game." msgstr "" -#: src/multiint.cpp:2552 +#: src/multiint.cpp:2561 #, c-format msgid "*** password [%s] is now required! ***" msgstr "" -#: src/multiint.cpp:2560 +#: src/multiint.cpp:2569 msgid "*** password is NOT required! ***" msgstr "" -#: src/multiint.cpp:2801 +#: src/multiint.cpp:2810 msgid "Sorry! Failed to host the game." msgstr "" -#: src/multiint.cpp:2922 +#: src/multiint.cpp:2931 msgid "'Locked Teams' mode enabled" msgstr "Zapnutý mód 'Pevných týmov'" -#: src/multiint.cpp:3003 +#: src/multiint.cpp:3012 #, c-format msgid "The host has kicked %s from the game!" msgstr "Hostiteľ vyhodil %s z hry!" -#: src/multiint.cpp:3073 +#: src/multiint.cpp:3082 msgid "Host is Starting Game" msgstr "Hostiteľ začíná hru" -#: src/multiint.cpp:3639 +#: src/multiint.cpp:3648 msgid "Players" msgstr "Hráči" -#: src/multiint.cpp:3772 +#: src/multiint.cpp:3786 #, c-format msgid "Sending Map: %d%% " msgstr "" -#: src/multiint.cpp:3780 +#: src/multiint.cpp:3794 #, c-format msgid "Map: %d%% downloaded" msgstr "" -#: src/multiint.cpp:3803 +#: src/multiint.cpp:3820 msgid "HOST" msgstr "" +#: src/multiint.cpp:3827 +#: src/multimenu.cpp:772 +msgid "Ping" +msgstr "" + #: src/multijoin.cpp:100 #: src/multijoin.cpp:101 msgid "Players Still Joining" @@ -14422,17 +14427,17 @@ msgstr "" msgid "File transfer has been aborted for %d." msgstr "" -#: src/multijoin.cpp:376 +#: src/multijoin.cpp:373 #, c-format msgid "%s (%u) has an incompatible mod, and has been kicked." msgstr "" -#: src/multijoin.cpp:415 +#: src/multijoin.cpp:412 #, c-format msgid "%s is Joining the Game" msgstr "" -#: src/multijoin.cpp:425 +#: src/multijoin.cpp:422 msgid "System message:" msgstr "Systémová správa:" @@ -14545,10 +14550,6 @@ msgstr "" msgid "Units" msgstr "Jednotky" -#: src/multimenu.cpp:772 -msgid "Ping" -msgstr "" - #: src/multimenu.cpp:776 msgid "Structs" msgstr "Stavby" @@ -14582,83 +14583,83 @@ msgstr "" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "" -#: src/multiplay.cpp:1146 +#: src/multiplay.cpp:1057 msgid "(allies" msgstr "(spojenectvo" -#: src/multiplay.cpp:1154 +#: src/multiplay.cpp:1065 msgid "(private to " msgstr "" -#: src/multiplay.cpp:1167 +#: src/multiplay.cpp:1078 msgid "[invalid]" msgstr "[chybné]" -#: src/multiplay.cpp:2057 +#: src/multiplay.cpp:1942 msgid "Green" msgstr "Zelená" -#: src/multiplay.cpp:2058 +#: src/multiplay.cpp:1943 msgid "Orange" msgstr "Oranžová" -#: src/multiplay.cpp:2059 +#: src/multiplay.cpp:1944 msgid "Grey" msgstr "Šedá" -#: src/multiplay.cpp:2060 +#: src/multiplay.cpp:1945 msgid "Black" msgstr "Čierna" -#: src/multiplay.cpp:2061 +#: src/multiplay.cpp:1946 msgid "Red" msgstr "Červená" -#: src/multiplay.cpp:2062 +#: src/multiplay.cpp:1947 msgid "Blue" msgstr "Modrá" -#: src/multiplay.cpp:2063 +#: src/multiplay.cpp:1948 msgid "Pink" msgstr "Ružová" -#: src/multiplay.cpp:2064 +#: src/multiplay.cpp:1949 msgid "Cyan" msgstr "Azurová" -#: src/multiplay.cpp:2065 +#: src/multiplay.cpp:1950 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:2066 +#: src/multiplay.cpp:1951 msgid "Purple" msgstr "" -#: src/multiplay.cpp:2067 +#: src/multiplay.cpp:1952 msgid "White" msgstr "" -#: src/multiplay.cpp:2068 +#: src/multiplay.cpp:1953 msgid "Bright blue" msgstr "" -#: src/multiplay.cpp:2069 +#: src/multiplay.cpp:1954 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:2070 +#: src/multiplay.cpp:1955 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:2071 +#: src/multiplay.cpp:1956 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:2072 +#: src/multiplay.cpp:1957 msgid "Brown" msgstr "" -#: src/order.cpp:841 +#: src/order.cpp:800 msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "" @@ -14793,20 +14794,20 @@ msgstr "Celkový čas hry - %s" msgid "You cheated!" msgstr "Podvádzali ste!" -#: src/scriptfuncs.cpp:3250 +#: src/scriptfuncs.cpp:3287 msgid "YOU ARE VICTORIOUS!" msgstr "STE VÝŤAZ!" -#: src/scriptfuncs.cpp:3254 +#: src/scriptfuncs.cpp:3291 msgid "YOU WERE DEFEATED!" msgstr "BOLI STE PORAZENÝ!" -#: src/scriptfuncs.cpp:9500 +#: src/scriptfuncs.cpp:9537 #, c-format msgid "Beacon received from %s!" msgstr "" -#: src/scriptfuncs.cpp:9546 +#: src/scriptfuncs.cpp:9583 #, c-format msgid "Beacon %d" msgstr "" @@ -14836,12 +14837,12 @@ msgstr "Nemožno nájsť žiadnu senzorovú jednotku!" msgid "Unable to locate any Commanders!" msgstr "Nemožno nájsť žiadneho velitela!" -#: src/structure.cpp:2615 +#: src/structure.cpp:2614 msgid "Command Control Limit Reached - Production Halted" msgstr "" -#: src/structure.cpp:5815 -#: src/structure.cpp:5840 +#: src/structure.cpp:5806 +#: src/structure.cpp:5831 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" @@ -14849,50 +14850,50 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/structure.cpp:5845 -#: src/structure.cpp:5913 -#: src/structure.cpp:5929 -#: src/structure.cpp:5943 +#: src/structure.cpp:5836 +#: src/structure.cpp:5904 +#: src/structure.cpp:5920 +#: src/structure.cpp:5934 #, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - Poškodenie %3.0f%%" -#: src/structure.cpp:5895 +#: src/structure.cpp:5886 #, c-format msgid "%s - Connected %u of %u" msgstr "%s - Pripojených %u z %u" -#: src/structure.cpp:6059 -#: src/structure.cpp:6104 +#: src/structure.cpp:6050 +#: src/structure.cpp:6095 #, c-format msgid "%s - Electronically Damaged" msgstr "" -#: src/structure.cpp:6341 +#: src/structure.cpp:6332 msgid "Electronic Reward - Visibility Report" msgstr "" -#: src/structure.cpp:6381 +#: src/structure.cpp:6372 msgid "Factory Reward - Propulsion" msgstr "" -#: src/structure.cpp:6405 +#: src/structure.cpp:6396 msgid "Factory Reward - Body" msgstr "" -#: src/structure.cpp:6429 +#: src/structure.cpp:6420 msgid "Factory Reward - Weapon" msgstr "" -#: src/structure.cpp:6438 +#: src/structure.cpp:6429 msgid "Factory Reward - Nothing" msgstr "" -#: src/structure.cpp:6466 +#: src/structure.cpp:6457 msgid "Repair Facility Award - Repair" msgstr "" -#: src/structure.cpp:6473 +#: src/structure.cpp:6464 msgid "Repair Facility Award - Nothing" msgstr "" diff --git a/po/sl.po b/po/sl.po index a4ee43ae8..b11bb4b79 100644 --- a/po/sl.po +++ b/po/sl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-01-18 00:54+0100\n" +"POT-Creation-Date: 2011-02-25 23:35+0100\n" "PO-Revision-Date: 2009-06-10 14:43+0100\n" "Last-Translator: Tomaž Povšin \n" "Language-Team: Slovenian \n" @@ -5729,7 +5729,7 @@ msgid "New Design" msgstr "Nov načrt" #: data/base/messages/strings/names.txt:15 -#: src/design.cpp:1313 +#: src/design.cpp:1275 msgid "Transport" msgstr "Prevoz" @@ -12157,27 +12157,27 @@ msgid "System locale" msgstr "Lokalni sistem" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1043 +#: lib/netplay/netplay.cpp:1042 #, fuzzy msgid "Enter password here" msgstr "Najprej vnesite geslo" -#: lib/netplay/netplay.cpp:2048 +#: lib/netplay/netplay.cpp:2060 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "Ni bilo mogoče razrešiti imena glavnega strežnika (%s)!" -#: lib/netplay/netplay.cpp:2062 +#: lib/netplay/netplay.cpp:2082 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "Ni bilo mogoče komunicirati z vežnim strežnikom! Je TCP prehod %u odprt za izhodni promet?" #: src/challenge.cpp:184 -#: src/hci.cpp:922 -#: src/hci.cpp:3390 -#: src/hci.cpp:3513 -#: src/hci.cpp:3924 -#: src/hci.cpp:4942 +#: src/hci.cpp:916 +#: src/hci.cpp:3378 +#: src/hci.cpp:3501 +#: src/hci.cpp:3912 +#: src/hci.cpp:4930 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12329,149 +12329,149 @@ msgstr "pojdi naravnost na gostiteljev zaslon" #: src/configuration.cpp:393 #: src/configuration.cpp:394 -#: src/multistat.cpp:130 +#: src/multistat.cpp:124 msgid "Player" msgstr "Igralec" -#: src/design.cpp:449 -#: src/design.cpp:469 -#: src/design.cpp:3501 +#: src/design.cpp:443 +#: src/design.cpp:455 +#: src/design.cpp:3464 msgid "New Vehicle" msgstr "Novo vozilo" -#: src/design.cpp:515 +#: src/design.cpp:500 msgid "Vehicle Body" msgstr "Telo vozila" -#: src/design.cpp:535 +#: src/design.cpp:520 msgid "Vehicle Propulsion" msgstr "Pogon vozila" -#: src/design.cpp:556 -#: src/design.cpp:579 -#: src/design.cpp:603 +#: src/design.cpp:541 +#: src/design.cpp:564 +#: src/design.cpp:588 msgid "Vehicle Turret" msgstr "Kupola vozila" -#: src/design.cpp:622 +#: src/design.cpp:607 msgid "Delete Design" msgstr "Izbriši načrt" -#: src/design.cpp:673 -#: src/design.cpp:720 +#: src/design.cpp:658 +#: src/design.cpp:705 msgid "Kinetic Armour" msgstr "Kinetični oklep" -#: src/design.cpp:682 -#: src/design.cpp:730 +#: src/design.cpp:667 +#: src/design.cpp:715 msgid "Thermal Armour" msgstr "Toplotni oklep" -#: src/design.cpp:698 -#: src/design.cpp:750 +#: src/design.cpp:683 +#: src/design.cpp:735 msgid "Engine Output" msgstr "Proizvodnja motorja" -#: src/design.cpp:706 -#: src/design.cpp:759 -#: src/design.cpp:1529 -#: src/design.cpp:1553 -#: src/design.cpp:1574 -#: src/design.cpp:1590 -#: src/design.cpp:1610 -#: src/design.cpp:1627 -#: src/design.cpp:1647 -#: src/design.cpp:1664 -#: src/design.cpp:1705 -#: src/design.cpp:1737 -#: src/design.cpp:1869 -#: src/design.cpp:1885 -#: src/design.cpp:1923 -#: src/design.cpp:1956 +#: src/design.cpp:691 +#: src/design.cpp:744 +#: src/design.cpp:1486 +#: src/design.cpp:1510 +#: src/design.cpp:1531 +#: src/design.cpp:1547 +#: src/design.cpp:1567 +#: src/design.cpp:1584 +#: src/design.cpp:1604 +#: src/design.cpp:1621 +#: src/design.cpp:1662 +#: src/design.cpp:1694 +#: src/design.cpp:1826 +#: src/design.cpp:1842 +#: src/design.cpp:1880 +#: src/design.cpp:1913 msgid "Weight" msgstr "Teža" -#: src/design.cpp:790 -#: src/design.cpp:808 +#: src/design.cpp:775 +#: src/design.cpp:793 msgid "Total Power Required" msgstr "Celotna potrebna moč" -#: src/design.cpp:821 -#: src/design.cpp:840 +#: src/design.cpp:806 +#: src/design.cpp:825 msgid "Total Body Points" msgstr "Celotne telesne točke" -#: src/design.cpp:1027 -#: src/design.cpp:1059 +#: src/design.cpp:996 +#: src/design.cpp:1025 msgid "Power Usage" msgstr "Poraba moči" -#: src/design.cpp:1335 +#: src/design.cpp:1298 msgid "Hydra " msgstr "Hidra" -#: src/design.cpp:1509 -#: src/design.cpp:1537 +#: src/design.cpp:1466 +#: src/design.cpp:1494 msgid "Sensor Range" msgstr "Domet senzorja" -#: src/design.cpp:1521 -#: src/design.cpp:1545 +#: src/design.cpp:1478 +#: src/design.cpp:1502 msgid "Sensor Power" msgstr "Moč senzorja" -#: src/design.cpp:1566 -#: src/design.cpp:1582 +#: src/design.cpp:1523 +#: src/design.cpp:1539 msgid "ECM Power" msgstr "Moč EPU" -#: src/design.cpp:1602 -#: src/design.cpp:1619 -#: src/design.cpp:1639 -#: src/design.cpp:1656 +#: src/design.cpp:1559 +#: src/design.cpp:1576 +#: src/design.cpp:1596 +#: src/design.cpp:1613 msgid "Build Points" msgstr "Gradne točke" -#: src/design.cpp:1677 -#: src/design.cpp:1713 +#: src/design.cpp:1634 +#: src/design.cpp:1670 msgid "Range" msgstr "Domet" -#: src/design.cpp:1689 -#: src/design.cpp:1721 +#: src/design.cpp:1646 +#: src/design.cpp:1678 msgid "Damage" msgstr "Poškodbe" -#: src/design.cpp:1697 -#: src/design.cpp:1729 +#: src/design.cpp:1654 +#: src/design.cpp:1686 msgid "Rate-of-Fire" msgstr "Brzina streljanja" -#: src/design.cpp:1857 -#: src/design.cpp:1877 +#: src/design.cpp:1814 +#: src/design.cpp:1834 msgid "Air Speed" msgstr "Zračna hitrost" -#: src/design.cpp:1895 -#: src/design.cpp:1932 +#: src/design.cpp:1852 +#: src/design.cpp:1889 msgid "Road Speed" msgstr "Cestna hitrost" -#: src/design.cpp:1905 -#: src/design.cpp:1940 +#: src/design.cpp:1862 +#: src/design.cpp:1897 msgid "Off-Road Speed" msgstr "Izven cestna hitrost" -#: src/design.cpp:1913 -#: src/design.cpp:1948 +#: src/design.cpp:1870 +#: src/design.cpp:1905 msgid "Water Speed" msgstr "Vodna hitrost" -#: src/design.cpp:2074 +#: src/design.cpp:2031 msgid "Weapons" msgstr "Orožja" -#: src/design.cpp:2094 +#: src/design.cpp:2051 msgid "Systems" msgstr "Sistemi" @@ -12484,7 +12484,7 @@ msgid "Player dropped" msgstr "Igralec izpadel" #: src/display3d.cpp:599 -#: src/multiint.cpp:2116 +#: src/multiint.cpp:2125 msgid "Waiting for other players" msgstr "Čakanje ostalih igralcev" @@ -12492,44 +12492,44 @@ msgstr "Čakanje ostalih igralcev" msgid "Out of sync" msgstr "" -#: src/display.cpp:1651 +#: src/display.cpp:1649 msgid "Cannot Build. Oil Resource Burning." msgstr "Gradnja ni možna. Vir nafte gori." -#: src/display.cpp:1830 -#: src/display.cpp:2423 +#: src/display.cpp:1828 +#: src/display.cpp:2421 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - Poškodbe %d%% - Izkušenj %d %s" -#: src/display.cpp:1846 +#: src/display.cpp:1844 #, fuzzy, c-format msgid "%s - Allied - Damage %d%% - Experience %d, %s" msgstr "%s - Poškodbe %d%% - Izkušenj %d %s" -#: src/display.cpp:2044 +#: src/display.cpp:2042 msgid "Truck ordered to build Oil Derrick" msgstr "Tovornjaku ukazana gradnja naftne vrtine" -#: src/display.cpp:2045 +#: src/display.cpp:2043 #, fuzzy msgid "2 trucks ordered to build Oil Derrick" msgstr "Tovornjaku ukazana gradnja naftne vrtine" -#: src/display.cpp:2046 +#: src/display.cpp:2044 #, fuzzy, c-format msgid "%d trucks ordered to build Oil Derrick" msgstr "Tovornjaku ukazana gradnja naftne vrtine" -#: src/droid.cpp:208 +#: src/droid.cpp:211 msgid "Unit Lost!" msgstr "Enota izgubljena!" -#: src/droid.cpp:1370 +#: src/droid.cpp:1376 msgid "Structure Restored" msgstr "Zgradba obnovljena" -#: src/droid.cpp:2712 +#: src/droid.cpp:2732 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" @@ -12538,7 +12538,7 @@ msgstr[1] "Skupina %u izbrana - %u enota" msgstr[2] "Skupina %u izbrana - %u enoti" msgstr[3] "Skupina %u izbrana - %u enote" -#: src/droid.cpp:2725 +#: src/droid.cpp:2745 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" @@ -12547,7 +12547,7 @@ msgstr[1] "%u enota dodeljena skupini %u" msgstr[2] "%u enoti dodeljeni skupini %u" msgstr[3] "%u enote dodeljene skupini %u" -#: src/droid.cpp:2738 +#: src/droid.cpp:2758 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" @@ -12556,7 +12556,7 @@ msgstr[1] "Centriran na skupino %u - %u enota" msgstr[2] "Centriran na skupino %u - %u enoti" msgstr[3] "Centriran na skupino %u - %u enote" -#: src/droid.cpp:2742 +#: src/droid.cpp:2762 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" @@ -12565,49 +12565,49 @@ msgstr[1] "Poravnava s skupino %u - %u enota" msgstr[2] "Poravnava s skupino %u - %u enoti" msgstr[3] "Poravnava s skupino %u - %u enote" -#: src/droid.cpp:3080 +#: src/droid.cpp:3093 msgid "Rookie" msgstr "Novinec" -#: src/droid.cpp:3081 +#: src/droid.cpp:3094 msgctxt "rank" msgid "Green" msgstr "Zelen" -#: src/droid.cpp:3082 +#: src/droid.cpp:3095 msgid "Trained" msgstr "Izurjen" -#: src/droid.cpp:3083 +#: src/droid.cpp:3096 msgid "Regular" msgstr "Navaden" -#: src/droid.cpp:3084 +#: src/droid.cpp:3097 msgid "Professional" msgstr "Poklicni" -#: src/droid.cpp:3085 +#: src/droid.cpp:3098 msgid "Veteran" msgstr "Veteran" -#: src/droid.cpp:3086 +#: src/droid.cpp:3099 msgid "Elite" msgstr "Elita" -#: src/droid.cpp:3087 +#: src/droid.cpp:3100 msgid "Special" msgstr "Poseben" -#: src/droid.cpp:3088 +#: src/droid.cpp:3101 msgid "Hero" msgstr "Junak" -#: src/droid.cpp:4110 +#: src/droid.cpp:4123 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "" -#: src/droid.cpp:4114 +#: src/droid.cpp:4127 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "" @@ -12626,7 +12626,7 @@ msgid "Tutorial" msgstr "Učna vaja" #: src/frontend.cpp:100 -#: src/hci.cpp:3499 +#: src/hci.cpp:3487 msgid "Options" msgstr "Možnosti" @@ -12678,7 +12678,7 @@ msgid "Challenges" msgstr "Plenilec" #: src/frontend.cpp:215 -#: src/ingameop.cpp:275 +#: src/ingameop.cpp:272 msgid "Load Game" msgstr "Naloži igro" @@ -12687,9 +12687,9 @@ msgid "SINGLE PLAYER" msgstr "EN IGRALEC" #: src/frontend.cpp:303 -#: src/ingameop.cpp:498 -#: src/mission.cpp:2527 -#: src/mission.cpp:2630 +#: src/ingameop.cpp:494 +#: src/mission.cpp:2493 +#: src/mission.cpp:2596 msgid "Load Saved Game" msgstr "Naloži shranjeno igro" @@ -12706,7 +12706,7 @@ msgid "Join Game" msgstr "Pridružite se igri" #: src/frontend.cpp:422 -#: src/multiint.cpp:1276 +#: src/multiint.cpp:1285 msgid "OPTIONS" msgstr "MOŽNOSTI" @@ -12723,7 +12723,7 @@ msgid "Video Options" msgstr "Video možnosti" #: src/frontend.cpp:426 -#: src/ingameop.cpp:270 +#: src/ingameop.cpp:267 msgid "Audio Options" msgstr "Zvočne možnosti" @@ -12801,7 +12801,7 @@ msgid "Off" msgstr "Izklopljeno" #: src/frontend.cpp:523 -#: src/multiint.cpp:1345 +#: src/multiint.cpp:1354 msgid "Fog" msgstr "Megla" @@ -12812,7 +12812,7 @@ msgstr "Meglica" #: src/frontend.cpp:530 #: src/frontend.cpp:595 -#: src/multiint.cpp:1347 +#: src/multiint.cpp:1356 msgid "Fog Of War" msgstr "Megla vojne" @@ -12980,200 +12980,200 @@ msgid "GAME OPTIONS" msgstr "MOŽNOSTI IGRE" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2389 +#: src/multiint.cpp:2398 msgid "Mod: " msgstr "" -#: src/hci.cpp:1245 +#: src/hci.cpp:1237 msgid "MAP SAVED!" msgstr "MAPA SHRANJENA!" -#: src/hci.cpp:1584 +#: src/hci.cpp:1573 #: src/loop.cpp:558 #: src/loop.cpp:574 #, fuzzy msgid "GAME SAVED: " msgstr "IGRA SHRANJENA:" -#: src/hci.cpp:1971 +#: src/hci.cpp:1960 msgid "Failed to create building" msgstr "Ni uspelo zgraditi stavbe" -#: src/hci.cpp:1988 +#: src/hci.cpp:1977 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new structure: %s." msgstr "Igralec/ka %u si je prigoljufal/a (razhroščevalni meni) novo zgradbo: %s." -#: src/hci.cpp:2003 +#: src/hci.cpp:1992 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new feature: %s." msgstr "Igralec/ka %u si je prigoljufal/a (razhroščevalni meni) novo odliko: %s." -#: src/hci.cpp:2025 +#: src/hci.cpp:2014 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid: %s." msgstr "Igralec/ka %u si je prigoljufal/a (razhroščevalni meni) novega droida: %s." -#: src/hci.cpp:2036 +#: src/hci.cpp:2025 #, fuzzy, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "Igralec/ka %u si je prigoljufal/a (razhroščevalni meni) novega droida: %s." -#: src/hci.cpp:3310 +#: src/hci.cpp:3298 msgid "Commanders (F6)" msgstr "Poveljniki (F6)" -#: src/hci.cpp:3323 +#: src/hci.cpp:3311 msgid "Intelligence Display (F5)" msgstr "Obveščevalni zaslon (F5)" -#: src/hci.cpp:3336 +#: src/hci.cpp:3324 msgid "Manufacture (F1)" msgstr "Izdelava (F1)" -#: src/hci.cpp:3349 +#: src/hci.cpp:3337 msgid "Design (F4)" msgstr "Načrtovanje (F4)" -#: src/hci.cpp:3362 +#: src/hci.cpp:3350 msgid "Research (F2)" msgstr "Raziskave (F2)" -#: src/hci.cpp:3375 +#: src/hci.cpp:3363 msgid "Build (F3)" msgstr "Gradnja (F3)" -#: src/hci.cpp:3446 -#: src/multiint.cpp:1392 +#: src/hci.cpp:3434 +#: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Moč" -#: src/hci.cpp:3537 +#: src/hci.cpp:3525 msgid "Map:" msgstr "" -#: src/hci.cpp:3550 +#: src/hci.cpp:3538 #, fuzzy msgid "Load" msgstr "Naloži igro" -#: src/hci.cpp:3551 +#: src/hci.cpp:3539 #, fuzzy msgid "Load Map File" msgstr "Naloži igro" -#: src/hci.cpp:3558 +#: src/hci.cpp:3546 #, fuzzy msgid "Save" msgstr "Shrani igro" -#: src/hci.cpp:3559 +#: src/hci.cpp:3547 #, fuzzy msgid "Save Map File" msgstr "Shrani igro" -#: src/hci.cpp:3567 +#: src/hci.cpp:3555 msgid "New" msgstr "" -#: src/hci.cpp:3568 +#: src/hci.cpp:3556 msgid "New Blank Map" msgstr "" -#: src/hci.cpp:3604 +#: src/hci.cpp:3592 msgid "Tile" msgstr "Plošča" -#: src/hci.cpp:3605 +#: src/hci.cpp:3593 msgid "Place tiles on map" msgstr "Položi plošče na mapo" -#: src/hci.cpp:3614 +#: src/hci.cpp:3602 msgid "Unit" msgstr "Enota" -#: src/hci.cpp:3615 +#: src/hci.cpp:3603 msgid "Place Unit on map" msgstr "Položi enote na mapo" -#: src/hci.cpp:3623 +#: src/hci.cpp:3611 msgid "Struct" msgstr "Zgradba" -#: src/hci.cpp:3624 +#: src/hci.cpp:3612 msgid "Place Structures on map" msgstr "Položi zgradbe na mapo" -#: src/hci.cpp:3632 +#: src/hci.cpp:3620 msgid "Feat" msgstr "Odlika" -#: src/hci.cpp:3633 +#: src/hci.cpp:3621 msgid "Place Features on map" msgstr "Položi odlike na mapo" -#: src/hci.cpp:3643 +#: src/hci.cpp:3631 msgid "Pause" msgstr "" -#: src/hci.cpp:3644 +#: src/hci.cpp:3632 msgid "Pause or unpause the game" msgstr "Ustavi ali nadaljuj igro" -#: src/hci.cpp:3658 +#: src/hci.cpp:3646 msgid "Align height of all map objects" msgstr "Uskladi višino vseh predmetov na mapi" -#: src/hci.cpp:3668 +#: src/hci.cpp:3656 msgid "Edit" msgstr "" -#: src/hci.cpp:3669 +#: src/hci.cpp:3657 #, fuzzy msgid "Start Edit Mode" msgstr "Začnite brez baz" -#: src/hci.cpp:3683 +#: src/hci.cpp:3671 #: src/ingameop.cpp:112 -#: src/ingameop.cpp:258 -#: src/ingameop.cpp:263 +#: src/ingameop.cpp:256 +#: src/ingameop.cpp:260 msgid "Quit" msgstr "Končaj" -#: src/hci.cpp:3684 +#: src/hci.cpp:3672 msgid "Exit Game" msgstr "Zapusti igro" -#: src/hci.cpp:3710 +#: src/hci.cpp:3698 #, fuzzy msgid "Current Player:" msgstr "Več igralcev" -#: src/hci.cpp:4001 +#: src/hci.cpp:3989 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "Črta napredka" -#: src/hci.cpp:4867 +#: src/hci.cpp:4855 msgid "Factory Delivery Point" msgstr "Dostavna točka tovarne" -#: src/hci.cpp:4885 +#: src/hci.cpp:4873 msgid "Loop Production" msgstr "Ponavljaj izdelavo" -#: src/hci.cpp:4965 +#: src/hci.cpp:4953 msgid "Tab Scroll left" msgstr "Tab premakni levo" -#: src/hci.cpp:4980 +#: src/hci.cpp:4968 msgid "Tab Scroll right" msgstr "Tab premakni desno" #: src/ingameop.cpp:111 -#: src/ingameop.cpp:193 -#: src/ingameop.cpp:267 +#: src/ingameop.cpp:195 +#: src/ingameop.cpp:264 msgid "Resume Game" msgstr "Nadaljuj igro" @@ -13181,33 +13181,33 @@ msgstr "Nadaljuj igro" msgid "WARNING: You're the host. If you quit, the game ends for everyone!" msgstr "" -#: src/ingameop.cpp:185 -#: src/ingameop.cpp:527 +#: src/ingameop.cpp:186 +#: src/ingameop.cpp:523 msgid "Tactical UI (Target Origin Icon): Show" msgstr "" -#: src/ingameop.cpp:190 -#: src/ingameop.cpp:531 +#: src/ingameop.cpp:191 +#: src/ingameop.cpp:527 msgid "Tactical UI (Target Origin Icon): Hide" msgstr "" -#: src/ingameop.cpp:277 -#: src/ingameop.cpp:502 -#: src/mission.cpp:2514 -#: src/mission.cpp:2633 +#: src/ingameop.cpp:274 +#: src/ingameop.cpp:498 +#: src/mission.cpp:2480 +#: src/mission.cpp:2599 msgid "Save Game" msgstr "Shrani igro" -#: src/ingameop.cpp:343 +#: src/ingameop.cpp:339 #, fuzzy msgid "Host has quit the game!" msgstr "Gostitelj je zapustil igro!" -#: src/ingameop.cpp:349 +#: src/ingameop.cpp:345 msgid "The game can't continue without the host." msgstr "" -#: src/ingameop.cpp:355 +#: src/ingameop.cpp:351 msgid "--> QUIT <--" msgstr "" @@ -13582,54 +13582,54 @@ msgstr "" msgid "Screen shake when things die: On" msgstr "" -#: src/keybind.cpp:2603 -#: src/keybind.cpp:2646 +#: src/keybind.cpp:2604 +#: src/keybind.cpp:2647 #, fuzzy msgid "Sorry, but game speed cannot be changed in multiplayer." msgstr "Oprostite, ta goljufija je onemogočena v igrah z večimi igralci." -#: src/keybind.cpp:2624 -#: src/keybind.cpp:2667 -#: src/keybind.cpp:2689 +#: src/keybind.cpp:2625 +#: src/keybind.cpp:2668 +#: src/keybind.cpp:2690 msgid "Game Speed Reset" msgstr "Hitrost igre ponastavljena" -#: src/keybind.cpp:2628 +#: src/keybind.cpp:2629 #, c-format msgid "Game Speed Increased to %3.1f" msgstr "Hitrost igre povečana na %3.1f" -#: src/keybind.cpp:2671 +#: src/keybind.cpp:2672 #, c-format msgid "Game Speed Reduced to %3.1f" msgstr "Hitrost igre zmanjšana na %3.1f" -#: src/keybind.cpp:2701 +#: src/keybind.cpp:2702 msgid "Radar showing friend-foe colors" msgstr "Radar kaže barve prijateja-sovražnika" -#: src/keybind.cpp:2705 +#: src/keybind.cpp:2706 msgid "Radar showing player colors" msgstr "Radar kaže barve igralca" -#: src/keybind.cpp:2726 +#: src/keybind.cpp:2727 msgid "Radar showing only objects" msgstr "Radar kaže samo predmete" -#: src/keybind.cpp:2729 +#: src/keybind.cpp:2730 msgid "Radar blending terrain and height" msgstr "Radar združuje teren in višino " -#: src/keybind.cpp:2732 +#: src/keybind.cpp:2733 msgid "Radar showing terrain" msgstr "Radar kaže teren" -#: src/keybind.cpp:2735 +#: src/keybind.cpp:2736 #, fuzzy msgid "Radar showing revealed terrain" msgstr "Radar kaže teren" -#: src/keybind.cpp:2738 +#: src/keybind.cpp:2739 msgid "Radar showing height" msgstr "Radar kaže višino" @@ -13638,9 +13638,9 @@ msgid "KEY MAPPING" msgstr "VNAŠANJE TIPK" #: src/keyedit.cpp:372 -#: src/multiint.cpp:662 -#: src/multiint.cpp:1072 -#: src/multiint.cpp:1478 +#: src/multiint.cpp:671 +#: src/multiint.cpp:1081 +#: src/multiint.cpp:1487 msgid "Return To Previous Screen" msgstr "Vrni se na prejšnji zaslon" @@ -14149,37 +14149,37 @@ msgstr "Nastavi sledilno kamero" msgid "Could not save game!" msgstr "Ni bilo mogoče shraniti igre!" -#: src/mission.cpp:2075 +#: src/mission.cpp:2041 msgid "Load Transport" msgstr "Naloži prevoz" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "CILJ DOSEŽEN z goljufanjem!" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED" msgstr "CILJ DOSEŽEN" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED--and you cheated!" msgstr "CILJ SPODLETEL--in vi ste goljufali!" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED" msgstr "CILJ SPODLETEL" -#: src/mission.cpp:2493 -#: src/mission.cpp:2533 -#: src/mission.cpp:2647 +#: src/mission.cpp:2459 +#: src/mission.cpp:2499 +#: src/mission.cpp:2613 msgid "Quit To Main Menu" msgstr "Končaj v glavni meni" -#: src/mission.cpp:2501 +#: src/mission.cpp:2467 msgid "Continue Game" msgstr "Nadaljuj igro" -#: src/mission.cpp:2598 +#: src/mission.cpp:2564 msgid "GAME SAVED :" msgstr "IGRA SHRANJENA:" @@ -14238,355 +14238,360 @@ msgstr "%s je sklenil zavezništvo z %s" msgid "You Discover Blueprints For %s" msgstr "Odkrijete načrte za %s" -#: src/multiint.cpp:600 +#: src/multiint.cpp:609 #: src/multilimit.cpp:190 msgid "Accept Settings" msgstr "Sprejmi nastavitve" -#: src/multiint.cpp:602 -#: src/multiint.cpp:1117 +#: src/multiint.cpp:611 +#: src/multiint.cpp:1126 #, fuzzy msgid "Cancel" msgstr "Suličar" -#: src/multiint.cpp:613 +#: src/multiint.cpp:622 msgid "IP Address or Machine Name" msgstr "IP naslov ali ime računalnika" -#: src/multiint.cpp:659 +#: src/multiint.cpp:668 msgid "CONNECTION" msgstr "POVEZAVA" -#: src/multiint.cpp:664 +#: src/multiint.cpp:673 msgid "Lobby" msgstr "Veža" -#: src/multiint.cpp:665 +#: src/multiint.cpp:674 msgid "IP" msgstr "IP" -#: src/multiint.cpp:854 +#: src/multiint.cpp:863 msgid "No games are available" msgstr "Nobenih iger ni na voljo" -#: src/multiint.cpp:857 +#: src/multiint.cpp:866 msgid "Game is full" msgstr "Igra je polna" -#: src/multiint.cpp:861 +#: src/multiint.cpp:870 msgid "You were kicked!" msgstr "Bili ste brcnjeni!" -#: src/multiint.cpp:864 +#: src/multiint.cpp:873 msgid "Wrong Game Version!" msgstr "Napačna verzija igre!" -#: src/multiint.cpp:867 +#: src/multiint.cpp:876 msgid "You have an incompatible mod." msgstr "" -#: src/multiint.cpp:871 +#: src/multiint.cpp:880 msgid "Host couldn't send file?" msgstr "" -#: src/multiint.cpp:875 +#: src/multiint.cpp:884 msgid "Incorrect Password!" msgstr "Napačno geslo!" -#: src/multiint.cpp:878 +#: src/multiint.cpp:887 msgid "Host has dropped connection!" msgstr "" -#: src/multiint.cpp:882 +#: src/multiint.cpp:891 msgid "Connection Error" msgstr "Napaka v povezavi" -#: src/multiint.cpp:1012 +#: src/multiint.cpp:1021 msgid "Searching" msgstr "Iskanje" -#: src/multiint.cpp:1069 +#: src/multiint.cpp:1078 msgid "GAMES" msgstr "IGRE" -#: src/multiint.cpp:1077 +#: src/multiint.cpp:1086 msgid "Refresh Games List" msgstr "Osveži spisek iger" -#: src/multiint.cpp:1097 +#: src/multiint.cpp:1106 #, fuzzy msgid "Enter Password:" msgstr "Najprej vnesite geslo" -#: src/multiint.cpp:1115 +#: src/multiint.cpp:1124 msgid "OK" msgstr "" -#: src/multiint.cpp:1232 +#: src/multiint.cpp:1241 msgid "Tanks disabled!!" msgstr "" -#: src/multiint.cpp:1233 +#: src/multiint.cpp:1242 #, fuzzy msgid "Cyborgs disabled." msgstr "Nov kiborg na voljo" -#: src/multiint.cpp:1234 +#: src/multiint.cpp:1243 msgid "VTOLs disabled." msgstr "" -#: src/multiint.cpp:1281 -#: src/multiint.cpp:1288 +#: src/multiint.cpp:1290 +#: src/multiint.cpp:1297 msgid "Select Game Name" msgstr "Izberite ime igre" -#: src/multiint.cpp:1281 +#: src/multiint.cpp:1290 #, fuzzy msgid "One-Player Skirmish" msgstr "Enoigralski spopad" -#: src/multiint.cpp:1291 +#: src/multiint.cpp:1300 msgid "Select Map" msgstr "Izberite mapo" -#: src/multiint.cpp:1299 +#: src/multiint.cpp:1308 msgid "Click to set Password" msgstr "Kliknite za nastavitev gesla" -#: src/multiint.cpp:1309 -#: src/multiint.cpp:1310 +#: src/multiint.cpp:1318 +#: src/multiint.cpp:1319 #, fuzzy msgid "Scavengers" msgstr "Plenilec" -#: src/multiint.cpp:1312 +#: src/multiint.cpp:1321 #, fuzzy msgid "No Scavengers" msgstr "Plenilec" -#: src/multiint.cpp:1342 +#: src/multiint.cpp:1351 msgid "Select Player Name" msgstr "Izberite ime igralca" -#: src/multiint.cpp:1348 +#: src/multiint.cpp:1357 msgid "Distance Fog" msgstr "Daljna megla" -#: src/multiint.cpp:1359 +#: src/multiint.cpp:1368 #: src/multimenu.cpp:756 msgid "Alliances" msgstr "Zavezništva" -#: src/multiint.cpp:1362 +#: src/multiint.cpp:1371 msgid "No Alliances" msgstr "Nobenih zavezništev" -#: src/multiint.cpp:1364 +#: src/multiint.cpp:1373 msgid "Allow Alliances" msgstr "Dovoli zavezništva" -#: src/multiint.cpp:1368 +#: src/multiint.cpp:1377 msgid "Locked Teams" msgstr "Zaklenjene skupine" -#: src/multiint.cpp:1394 +#: src/multiint.cpp:1403 msgid "Low Power Levels" msgstr "Nizke stopnje moči" -#: src/multiint.cpp:1396 +#: src/multiint.cpp:1405 msgid "Medium Power Levels" msgstr "Srednje velike stopnje moči" -#: src/multiint.cpp:1398 +#: src/multiint.cpp:1407 msgid "High Power Levels" msgstr "Visoke stopnje moči" -#: src/multiint.cpp:1430 +#: src/multiint.cpp:1439 msgid "Base" msgstr "Baza" -#: src/multiint.cpp:1432 +#: src/multiint.cpp:1441 msgid "Start with No Bases" msgstr "Začnite brez baz" -#: src/multiint.cpp:1434 +#: src/multiint.cpp:1443 msgid "Start with Bases" msgstr "Začnite z bazami" -#: src/multiint.cpp:1436 +#: src/multiint.cpp:1445 msgid "Start with Advanced Bases" msgstr "Začnite z naprednimi bazami" -#: src/multiint.cpp:1468 +#: src/multiint.cpp:1477 msgid "Map Preview" msgstr "Predogled mape" -#: src/multiint.cpp:1470 +#: src/multiint.cpp:1479 msgid "Click to see Map" msgstr "Kliknite za ogled mape" -#: src/multiint.cpp:1484 +#: src/multiint.cpp:1493 msgid "Start Hosting Game" msgstr "Začnite gostiti igro" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 #, fuzzy msgid "Show Structure Limits" msgstr "Nastavite gradbene omejitve" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 msgid "Set Structure Limits" msgstr "Nastavite gradbene omejitve" -#: src/multiint.cpp:1587 +#: src/multiint.cpp:1596 msgid "DIFFICULTY" msgstr "" -#: src/multiint.cpp:1601 +#: src/multiint.cpp:1610 msgid "Less aggressive and starts with less units" msgstr "" -#: src/multiint.cpp:1602 +#: src/multiint.cpp:1611 #, fuzzy msgid "Plays nice" msgstr "Igralec" -#: src/multiint.cpp:1603 +#: src/multiint.cpp:1612 msgid "No holds barred" msgstr "" -#: src/multiint.cpp:1604 +#: src/multiint.cpp:1613 msgid "Starts with advantages and gets twice as much oil from derricks" msgstr "" -#: src/multiint.cpp:1632 +#: src/multiint.cpp:1641 msgid "CHOOSE AI" msgstr "" -#: src/multiint.cpp:1648 +#: src/multiint.cpp:1657 msgid "Allow human players to join in this slot" msgstr "" -#: src/multiint.cpp:1656 +#: src/multiint.cpp:1665 msgid "Leave this slot unused" msgstr "" -#: src/multiint.cpp:1736 +#: src/multiint.cpp:1745 #, fuzzy msgid "Player colour" msgstr "Igralec odšel" -#: src/multiint.cpp:2062 +#: src/multiint.cpp:2071 msgid "Team" msgstr "Skupina" -#: src/multiint.cpp:2074 +#: src/multiint.cpp:2083 #, fuzzy msgid "Kick player" msgstr "2 igralca" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 #, fuzzy msgid "Click to change difficulty" msgstr "Kliknite za nastavitev gesla" -#: src/multiint.cpp:2121 +#: src/multiint.cpp:2130 msgid "Click when ready" msgstr "Kliknite, ko boste pripravljeni" -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2134 msgid "READY?" msgstr "" -#: src/multiint.cpp:2169 +#: src/multiint.cpp:2178 msgid "PLAYERS" msgstr "IGRALCI" -#: src/multiint.cpp:2204 +#: src/multiint.cpp:2213 #, fuzzy msgid "Click to change to this slot" msgstr "Kliknite za nastavitev gesla" -#: src/multiint.cpp:2232 +#: src/multiint.cpp:2241 #, fuzzy msgid "Choose Team" msgstr "Zaklenjene skupine" -#: src/multiint.cpp:2262 +#: src/multiint.cpp:2271 #, fuzzy msgid "Click to change player colour" msgstr "Radar kaže barve igralca" -#: src/multiint.cpp:2290 +#: src/multiint.cpp:2299 #, fuzzy msgid "Click to change player position" msgstr "Straži položaj" -#: src/multiint.cpp:2296 +#: src/multiint.cpp:2305 #, fuzzy msgid "Click to change AI" msgstr "Kliknite za nastavitev gesla" -#: src/multiint.cpp:2300 +#: src/multiint.cpp:2309 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2362 +#: src/multiint.cpp:2371 msgid "CHAT" msgstr "POGOVOR" -#: src/multiint.cpp:2394 +#: src/multiint.cpp:2403 msgid "All players need to have the same mods to join your game." msgstr "" -#: src/multiint.cpp:2552 +#: src/multiint.cpp:2561 #, fuzzy, c-format msgid "*** password [%s] is now required! ***" msgstr "*** geslo je sedaj potrebno! ***" -#: src/multiint.cpp:2560 +#: src/multiint.cpp:2569 msgid "*** password is NOT required! ***" msgstr "*** geslo NI potrebno! ***" -#: src/multiint.cpp:2801 +#: src/multiint.cpp:2810 msgid "Sorry! Failed to host the game." msgstr "" -#: src/multiint.cpp:2922 +#: src/multiint.cpp:2931 msgid "'Locked Teams' mode enabled" msgstr "Omogočen način 'zaklenjene skupine'" -#: src/multiint.cpp:3003 +#: src/multiint.cpp:3012 #, c-format msgid "The host has kicked %s from the game!" msgstr "Gostitelj je brcnil %s iz igre!" -#: src/multiint.cpp:3073 +#: src/multiint.cpp:3082 msgid "Host is Starting Game" msgstr "Gostitelj začenja igro" -#: src/multiint.cpp:3639 +#: src/multiint.cpp:3648 msgid "Players" msgstr "Igralci" -#: src/multiint.cpp:3772 +#: src/multiint.cpp:3786 #, c-format msgid "Sending Map: %d%% " msgstr "" -#: src/multiint.cpp:3780 +#: src/multiint.cpp:3794 #, c-format msgid "Map: %d%% downloaded" msgstr "" -#: src/multiint.cpp:3803 +#: src/multiint.cpp:3820 msgid "HOST" msgstr "" +#: src/multiint.cpp:3827 +#: src/multimenu.cpp:772 +msgid "Ping" +msgstr "Ping" + #: src/multijoin.cpp:100 #: src/multijoin.cpp:101 msgid "Players Still Joining" @@ -14602,17 +14607,17 @@ msgstr "%s je zapustil igro" msgid "File transfer has been aborted for %d." msgstr "" -#: src/multijoin.cpp:376 +#: src/multijoin.cpp:373 #, c-format msgid "%s (%u) has an incompatible mod, and has been kicked." msgstr "" -#: src/multijoin.cpp:415 +#: src/multijoin.cpp:412 #, c-format msgid "%s is Joining the Game" msgstr "%s se pridružuje igri" -#: src/multijoin.cpp:425 +#: src/multijoin.cpp:422 msgid "System message:" msgstr "Sistemsko sporočilo:" @@ -14726,10 +14731,6 @@ msgstr "Uničene enote" msgid "Units" msgstr "Enote" -#: src/multimenu.cpp:772 -msgid "Ping" -msgstr "Ping" - #: src/multimenu.cpp:776 msgid "Structs" msgstr "Zgradbe" @@ -14763,84 +14764,84 @@ msgstr "Daj igralcu moč" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "" -#: src/multiplay.cpp:1146 +#: src/multiplay.cpp:1057 #, fuzzy msgid "(allies" msgstr "Zavezništva" -#: src/multiplay.cpp:1154 +#: src/multiplay.cpp:1065 msgid "(private to " msgstr "" -#: src/multiplay.cpp:1167 +#: src/multiplay.cpp:1078 msgid "[invalid]" msgstr "" -#: src/multiplay.cpp:2057 +#: src/multiplay.cpp:1942 msgid "Green" msgstr "Zelena" -#: src/multiplay.cpp:2058 +#: src/multiplay.cpp:1943 msgid "Orange" msgstr "Oranžna" -#: src/multiplay.cpp:2059 +#: src/multiplay.cpp:1944 msgid "Grey" msgstr "Siva" -#: src/multiplay.cpp:2060 +#: src/multiplay.cpp:1945 msgid "Black" msgstr "Črna" -#: src/multiplay.cpp:2061 +#: src/multiplay.cpp:1946 msgid "Red" msgstr "Rdeča" -#: src/multiplay.cpp:2062 +#: src/multiplay.cpp:1947 msgid "Blue" msgstr "Modra" -#: src/multiplay.cpp:2063 +#: src/multiplay.cpp:1948 msgid "Pink" msgstr "Roza" -#: src/multiplay.cpp:2064 +#: src/multiplay.cpp:1949 msgid "Cyan" msgstr "Cijan" -#: src/multiplay.cpp:2065 +#: src/multiplay.cpp:1950 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:2066 +#: src/multiplay.cpp:1951 msgid "Purple" msgstr "" -#: src/multiplay.cpp:2067 +#: src/multiplay.cpp:1952 msgid "White" msgstr "" -#: src/multiplay.cpp:2068 +#: src/multiplay.cpp:1953 msgid "Bright blue" msgstr "" -#: src/multiplay.cpp:2069 +#: src/multiplay.cpp:1954 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:2070 +#: src/multiplay.cpp:1955 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:2071 +#: src/multiplay.cpp:1956 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:2072 +#: src/multiplay.cpp:1957 msgid "Brown" msgstr "" -#: src/order.cpp:841 +#: src/order.cpp:800 msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "" @@ -14975,20 +14976,20 @@ msgstr "Celotni čas igranja - %s" msgid "You cheated!" msgstr "Goljufali ste!" -#: src/scriptfuncs.cpp:3250 +#: src/scriptfuncs.cpp:3287 msgid "YOU ARE VICTORIOUS!" msgstr "ZMAGALI STE!" -#: src/scriptfuncs.cpp:3254 +#: src/scriptfuncs.cpp:3291 msgid "YOU WERE DEFEATED!" msgstr "BILI STE PREMAGANI!" -#: src/scriptfuncs.cpp:9500 +#: src/scriptfuncs.cpp:9537 #, c-format msgid "Beacon received from %s!" msgstr "Prejet poziv od %s!" -#: src/scriptfuncs.cpp:9546 +#: src/scriptfuncs.cpp:9583 #, c-format msgid "Beacon %d" msgstr "Poziv %d" @@ -15019,12 +15020,12 @@ msgstr "Ni mogoče najti nobenih senzorskih enot!" msgid "Unable to locate any Commanders!" msgstr "Ni mogoče najti nobenih poveljnikov!" -#: src/structure.cpp:2615 +#: src/structure.cpp:2614 msgid "Command Control Limit Reached - Production Halted" msgstr "Meja poveljniškega nadzora dosežena - izdelava ustavljena" -#: src/structure.cpp:5815 -#: src/structure.cpp:5840 +#: src/structure.cpp:5806 +#: src/structure.cpp:5831 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" @@ -15033,50 +15034,50 @@ msgstr[1] "%s - %u enota dodeljena" msgstr[2] "%s - %u enoti dodeljeni" msgstr[3] "%s - %u enote dodeljene" -#: src/structure.cpp:5845 -#: src/structure.cpp:5913 -#: src/structure.cpp:5929 -#: src/structure.cpp:5943 +#: src/structure.cpp:5836 +#: src/structure.cpp:5904 +#: src/structure.cpp:5920 +#: src/structure.cpp:5934 #, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - Poškodbe %3.0f%%" -#: src/structure.cpp:5895 +#: src/structure.cpp:5886 #, c-format msgid "%s - Connected %u of %u" msgstr "%s - povezane %u od %u" -#: src/structure.cpp:6059 -#: src/structure.cpp:6104 +#: src/structure.cpp:6050 +#: src/structure.cpp:6095 #, c-format msgid "%s - Electronically Damaged" msgstr "%s - elektronsko poškodovan" -#: src/structure.cpp:6341 +#: src/structure.cpp:6332 msgid "Electronic Reward - Visibility Report" msgstr "Elektronska nagrada - poročilo o vidljivosti" -#: src/structure.cpp:6381 +#: src/structure.cpp:6372 msgid "Factory Reward - Propulsion" msgstr "Nagrada tovarne - pogon" -#: src/structure.cpp:6405 +#: src/structure.cpp:6396 msgid "Factory Reward - Body" msgstr "Nagrada tovarne - telo" -#: src/structure.cpp:6429 +#: src/structure.cpp:6420 msgid "Factory Reward - Weapon" msgstr "Nagrada tovarne - orožje" -#: src/structure.cpp:6438 +#: src/structure.cpp:6429 msgid "Factory Reward - Nothing" msgstr "Nagrada tovarne - nič" -#: src/structure.cpp:6466 +#: src/structure.cpp:6457 msgid "Repair Facility Award - Repair" msgstr "Nagrada stavbe za popravila - popravilo" -#: src/structure.cpp:6473 +#: src/structure.cpp:6464 msgid "Repair Facility Award - Nothing" msgstr "Nagrada stavbe za popravila - nič" diff --git a/po/tr.po b/po/tr.po index 73fcae93b..a76cc5cdc 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-01-19 19:36+0100\n" +"POT-Creation-Date: 2011-02-25 23:35+0100\n" "PO-Revision-Date: 2011-01-19 18:01+0200\n" "Last-Translator: Ayhan GORGULU \n" "Language-Team: Turkey \n" @@ -5740,7 +5740,7 @@ msgid "New Design" msgstr "Yeni Tasarım" #: data/base/messages/strings/names.txt:15 -#: src/design.cpp:1310 +#: src/design.cpp:1275 msgid "Transport" msgstr "Taşıyıcı" @@ -12031,26 +12031,26 @@ msgid "System locale" msgstr "Yerel Sistem" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1044 +#: lib/netplay/netplay.cpp:1042 msgid "Enter password here" msgstr "Parolayı buraya gir" -#: lib/netplay/netplay.cpp:2052 +#: lib/netplay/netplay.cpp:2060 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "Konnte Lobbyserver-Namen nicht auflösen (%s)!" -#: lib/netplay/netplay.cpp:2066 +#: lib/netplay/netplay.cpp:2082 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "Lobi Sunucusu ile iletişim kurulamadı! TCP-Port %u u açıkmı?" #: src/challenge.cpp:184 -#: src/hci.cpp:922 -#: src/hci.cpp:3390 -#: src/hci.cpp:3513 -#: src/hci.cpp:3924 -#: src/hci.cpp:4942 +#: src/hci.cpp:916 +#: src/hci.cpp:3378 +#: src/hci.cpp:3501 +#: src/hci.cpp:3912 +#: src/hci.cpp:4930 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12203,149 +12203,149 @@ msgstr "Direk kurulum ekranına git" #: src/configuration.cpp:393 #: src/configuration.cpp:394 -#: src/multistat.cpp:130 +#: src/multistat.cpp:124 msgid "Player" msgstr "Oyuncu" -#: src/design.cpp:449 -#: src/design.cpp:469 -#: src/design.cpp:3493 +#: src/design.cpp:443 +#: src/design.cpp:455 +#: src/design.cpp:3464 msgid "New Vehicle" msgstr "Yeni Araç" -#: src/design.cpp:515 +#: src/design.cpp:500 msgid "Vehicle Body" msgstr "Araç Bedeni" -#: src/design.cpp:535 +#: src/design.cpp:520 msgid "Vehicle Propulsion" msgstr "Araç Yürütücüsü" -#: src/design.cpp:556 -#: src/design.cpp:579 -#: src/design.cpp:603 +#: src/design.cpp:541 +#: src/design.cpp:564 +#: src/design.cpp:588 msgid "Vehicle Turret" msgstr "Araç Tareti" -#: src/design.cpp:622 +#: src/design.cpp:607 msgid "Delete Design" msgstr "Tasarımı Sil" -#: src/design.cpp:673 -#: src/design.cpp:720 +#: src/design.cpp:658 +#: src/design.cpp:705 msgid "Kinetic Armour" msgstr "Kinetik Zırh" -#: src/design.cpp:682 -#: src/design.cpp:730 +#: src/design.cpp:667 +#: src/design.cpp:715 msgid "Thermal Armour" msgstr "Termal Zırh" -#: src/design.cpp:698 -#: src/design.cpp:750 +#: src/design.cpp:683 +#: src/design.cpp:735 msgid "Engine Output" msgstr "Motor Gücü" -#: src/design.cpp:706 -#: src/design.cpp:759 -#: src/design.cpp:1521 -#: src/design.cpp:1545 -#: src/design.cpp:1566 -#: src/design.cpp:1582 -#: src/design.cpp:1602 -#: src/design.cpp:1619 -#: src/design.cpp:1639 -#: src/design.cpp:1656 -#: src/design.cpp:1697 -#: src/design.cpp:1729 -#: src/design.cpp:1861 -#: src/design.cpp:1877 -#: src/design.cpp:1915 -#: src/design.cpp:1948 +#: src/design.cpp:691 +#: src/design.cpp:744 +#: src/design.cpp:1486 +#: src/design.cpp:1510 +#: src/design.cpp:1531 +#: src/design.cpp:1547 +#: src/design.cpp:1567 +#: src/design.cpp:1584 +#: src/design.cpp:1604 +#: src/design.cpp:1621 +#: src/design.cpp:1662 +#: src/design.cpp:1694 +#: src/design.cpp:1826 +#: src/design.cpp:1842 +#: src/design.cpp:1880 +#: src/design.cpp:1913 msgid "Weight" msgstr "Ağırlık" -#: src/design.cpp:790 -#: src/design.cpp:808 +#: src/design.cpp:775 +#: src/design.cpp:793 msgid "Total Power Required" msgstr "Toplam Güç Gereksinimi" -#: src/design.cpp:821 -#: src/design.cpp:840 +#: src/design.cpp:806 +#: src/design.cpp:825 msgid "Total Body Points" msgstr "Toplam Beden Puanı" -#: src/design.cpp:1027 -#: src/design.cpp:1059 +#: src/design.cpp:996 +#: src/design.cpp:1025 msgid "Power Usage" msgstr "Güç Kullanımı" -#: src/design.cpp:1333 +#: src/design.cpp:1298 msgid "Hydra " msgstr "Püsküllü Bela" -#: src/design.cpp:1501 -#: src/design.cpp:1529 +#: src/design.cpp:1466 +#: src/design.cpp:1494 msgid "Sensor Range" msgstr "Algılayıcı'nın Görüş Alanı" -#: src/design.cpp:1513 -#: src/design.cpp:1537 +#: src/design.cpp:1478 +#: src/design.cpp:1502 msgid "Sensor Power" msgstr "Algılayıcı Gücü" -#: src/design.cpp:1558 -#: src/design.cpp:1574 +#: src/design.cpp:1523 +#: src/design.cpp:1539 msgid "ECM Power" msgstr "ECM-Güç" -#: src/design.cpp:1594 -#: src/design.cpp:1611 -#: src/design.cpp:1631 -#: src/design.cpp:1648 +#: src/design.cpp:1559 +#: src/design.cpp:1576 +#: src/design.cpp:1596 +#: src/design.cpp:1613 msgid "Build Points" msgstr "İnşa Noktaları" -#: src/design.cpp:1669 -#: src/design.cpp:1705 +#: src/design.cpp:1634 +#: src/design.cpp:1670 msgid "Range" msgstr "Menzil" -#: src/design.cpp:1681 -#: src/design.cpp:1713 +#: src/design.cpp:1646 +#: src/design.cpp:1678 msgid "Damage" msgstr "Hasar" -#: src/design.cpp:1689 -#: src/design.cpp:1721 +#: src/design.cpp:1654 +#: src/design.cpp:1686 msgid "Rate-of-Fire" msgstr "Ateş Oranı" -#: src/design.cpp:1849 -#: src/design.cpp:1869 +#: src/design.cpp:1814 +#: src/design.cpp:1834 msgid "Air Speed" msgstr "Hava Hızı" -#: src/design.cpp:1887 -#: src/design.cpp:1924 +#: src/design.cpp:1852 +#: src/design.cpp:1889 msgid "Road Speed" msgstr "Yol Hızı" +#: src/design.cpp:1862 #: src/design.cpp:1897 -#: src/design.cpp:1932 msgid "Off-Road Speed" msgstr "Yer Hızı" +#: src/design.cpp:1870 #: src/design.cpp:1905 -#: src/design.cpp:1940 msgid "Water Speed" msgstr "Sudaki Hızı" -#: src/design.cpp:2066 +#: src/design.cpp:2031 msgid "Weapons" msgstr "Silahlar" -#: src/design.cpp:2086 +#: src/design.cpp:2051 msgid "Systems" msgstr "Sistemler" @@ -12358,7 +12358,7 @@ msgid "Player dropped" msgstr "Oyuncu Düştü" #: src/display3d.cpp:599 -#: src/multiint.cpp:2116 +#: src/multiint.cpp:2125 msgid "Waiting for other players" msgstr "Diğer oyuncular bekleniyor" @@ -12394,85 +12394,85 @@ msgstr "2 kamyona bir Petrol Kuyusu inşatı emri verildi." msgid "%d trucks ordered to build Oil Derrick" msgstr "%d kamyon'lara bir Petrol Kuyusu inşatı emri verildi." -#: src/droid.cpp:208 +#: src/droid.cpp:211 msgid "Unit Lost!" msgstr "Birim Kaybı!" -#: src/droid.cpp:1370 +#: src/droid.cpp:1376 msgid "Structure Restored" msgstr "Bina Yenilendi" -#: src/droid.cpp:2712 +#: src/droid.cpp:2732 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" msgstr[0] "Grup %u Seçildi - %u Birim" msgstr[1] "Grup %u Seçildi - %u Birimler" -#: src/droid.cpp:2725 +#: src/droid.cpp:2745 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" msgstr[0] "%u Birim şu Gruba Atandı: %u " msgstr[1] "%u Birimler şu Gruba Atandı: %u " -#: src/droid.cpp:2738 +#: src/droid.cpp:2758 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" msgstr[0] "%u Numaralı Grup Merkezde - %u Birim" msgstr[1] "%u Numaralı Grup Merkezde - %u Birimler" -#: src/droid.cpp:2742 +#: src/droid.cpp:2762 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" msgstr[0] "Grup %u 'e - %u Birim atandı" msgstr[1] "Grup %u 'e - %u Birimler Atandı" -#: src/droid.cpp:3080 +#: src/droid.cpp:3093 msgid "Rookie" msgstr "Er" -#: src/droid.cpp:3081 +#: src/droid.cpp:3094 msgctxt "rank" msgid "Green" msgstr "Onbaşı" -#: src/droid.cpp:3082 +#: src/droid.cpp:3095 msgid "Trained" msgstr "Çavuş" -#: src/droid.cpp:3083 +#: src/droid.cpp:3096 msgid "Regular" msgstr "Teğmen" -#: src/droid.cpp:3084 +#: src/droid.cpp:3097 msgid "Professional" msgstr "Üsteğmen" -#: src/droid.cpp:3085 +#: src/droid.cpp:3098 msgid "Veteran" msgstr "Albay" -#: src/droid.cpp:3086 +#: src/droid.cpp:3099 msgid "Elite" msgstr "Korgeneral" -#: src/droid.cpp:3087 +#: src/droid.cpp:3100 msgid "Special" msgstr "Orgeneral" -#: src/droid.cpp:3088 +#: src/droid.cpp:3101 msgid "Hero" msgstr "Mareşal" -#: src/droid.cpp:4110 +#: src/droid.cpp:4123 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "%s Sana vermek istedi %s ama, Sende daha çok var!" -#: src/droid.cpp:4114 +#: src/droid.cpp:4127 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "Sen %s 'a %s vermek istedin ama, Onda daha çok var!" @@ -12491,7 +12491,7 @@ msgid "Tutorial" msgstr "Öğretici" #: src/frontend.cpp:100 -#: src/hci.cpp:3499 +#: src/hci.cpp:3487 msgid "Options" msgstr "Ayarlar" @@ -12542,7 +12542,7 @@ msgid "Challenges" msgstr "Mücadeleler" #: src/frontend.cpp:215 -#: src/ingameop.cpp:275 +#: src/ingameop.cpp:272 msgid "Load Game" msgstr "Oyun Yükle" @@ -12551,9 +12551,9 @@ msgid "SINGLE PLAYER" msgstr "TEK OYUNCU" #: src/frontend.cpp:303 -#: src/ingameop.cpp:498 -#: src/mission.cpp:2527 -#: src/mission.cpp:2630 +#: src/ingameop.cpp:494 +#: src/mission.cpp:2493 +#: src/mission.cpp:2596 msgid "Load Saved Game" msgstr "Kayıtlı Oyun Yükle" @@ -12570,7 +12570,7 @@ msgid "Join Game" msgstr "Oyuna Katıl" #: src/frontend.cpp:422 -#: src/multiint.cpp:1276 +#: src/multiint.cpp:1285 msgid "OPTIONS" msgstr "AYARLAR" @@ -12587,7 +12587,7 @@ msgid "Video Options" msgstr "Video Ayarları" #: src/frontend.cpp:426 -#: src/ingameop.cpp:270 +#: src/ingameop.cpp:267 msgid "Audio Options" msgstr "Ses Ayarları" @@ -12665,7 +12665,7 @@ msgid "Off" msgstr "Kapalı" #: src/frontend.cpp:523 -#: src/multiint.cpp:1345 +#: src/multiint.cpp:1354 msgid "Fog" msgstr "Sis" @@ -12676,7 +12676,7 @@ msgstr "Duman" #: src/frontend.cpp:530 #: src/frontend.cpp:595 -#: src/multiint.cpp:1347 +#: src/multiint.cpp:1356 msgid "Fog Of War" msgstr "Siste Savaş" @@ -12836,195 +12836,195 @@ msgid "GAME OPTIONS" msgstr "OYUN AYARLARI" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2389 +#: src/multiint.cpp:2398 msgid "Mod: " msgstr "Mod: " -#: src/hci.cpp:1245 +#: src/hci.cpp:1237 msgid "MAP SAVED!" msgstr "HARİTAN KAYDEDİLDİ!" -#: src/hci.cpp:1584 +#: src/hci.cpp:1573 #: src/loop.cpp:558 #: src/loop.cpp:574 msgid "GAME SAVED: " msgstr "OYUN KAYDEDİLDİ :" -#: src/hci.cpp:1971 +#: src/hci.cpp:1960 msgid "Failed to create building" msgstr "Bina inşası başarısız" -#: src/hci.cpp:1988 +#: src/hci.cpp:1977 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new structure: %s." msgstr "Oyuncu %u Yeni binasını (debug menü) inşa etti: %s." -#: src/hci.cpp:2003 +#: src/hci.cpp:1992 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new feature: %s." msgstr "Oyuncu %u (debug menü) yeni doğal maddesini oluşturdu: %s." -#: src/hci.cpp:2025 +#: src/hci.cpp:2014 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid: %s." msgstr "Oyuncu %u (debug menü) Yeni birimini oluşturdu: %s." -#: src/hci.cpp:2036 +#: src/hci.cpp:2025 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "Oyuncu %u (debug menü) Yeni birimini oluşturdu." # Commander kann als Eigenname im Deutschen allerdings mit deutschem Plural stehen bleiben -Kreuvf -#: src/hci.cpp:3310 +#: src/hci.cpp:3298 msgid "Commanders (F6)" msgstr "Komutanlar (F6)" -#: src/hci.cpp:3323 +#: src/hci.cpp:3311 msgid "Intelligence Display (F5)" msgstr "Görev Ekranı (F5)" -#: src/hci.cpp:3336 +#: src/hci.cpp:3324 msgid "Manufacture (F1)" msgstr "Üretim (F1)" -#: src/hci.cpp:3349 +#: src/hci.cpp:3337 msgid "Design (F4)" msgstr "Tasarım (F4)" -#: src/hci.cpp:3362 +#: src/hci.cpp:3350 msgid "Research (F2)" msgstr "Araştırma (F2)" -#: src/hci.cpp:3375 +#: src/hci.cpp:3363 msgid "Build (F3)" msgstr "İnşa (F3)" -#: src/hci.cpp:3446 -#: src/multiint.cpp:1392 +#: src/hci.cpp:3434 +#: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Güç" -#: src/hci.cpp:3537 +#: src/hci.cpp:3525 msgid "Map:" msgstr "Harita:" -#: src/hci.cpp:3550 +#: src/hci.cpp:3538 msgid "Load" msgstr "Yükle" -#: src/hci.cpp:3551 +#: src/hci.cpp:3539 msgid "Load Map File" msgstr "Harita Dosyası Yükle" -#: src/hci.cpp:3558 +#: src/hci.cpp:3546 msgid "Save" msgstr "Kaydet" -#: src/hci.cpp:3559 +#: src/hci.cpp:3547 msgid "Save Map File" msgstr "Harita dosyası kaydet" -#: src/hci.cpp:3567 +#: src/hci.cpp:3555 msgid "New" msgstr "Yeni" -#: src/hci.cpp:3568 +#: src/hci.cpp:3556 msgid "New Blank Map" msgstr "Yeni Boş Harita" -#: src/hci.cpp:3604 +#: src/hci.cpp:3592 msgid "Tile" msgstr "Harita Ö." -#: src/hci.cpp:3605 +#: src/hci.cpp:3593 msgid "Place tiles on map" msgstr "Haritaya yeni öğeler yerleştir" -#: src/hci.cpp:3614 +#: src/hci.cpp:3602 msgid "Unit" msgstr "Birim" -#: src/hci.cpp:3615 +#: src/hci.cpp:3603 msgid "Place Unit on map" msgstr "Haritaya yeni birimler yerleştir" -#: src/hci.cpp:3623 +#: src/hci.cpp:3611 msgid "Struct" msgstr "Bina" -#: src/hci.cpp:3624 +#: src/hci.cpp:3612 msgid "Place Structures on map" msgstr "Haritaya yeni binalar yerleştir" # gemäß: http://dict.leo.org/ende?search=Feat -Kreuvf -#: src/hci.cpp:3632 +#: src/hci.cpp:3620 msgid "Feat" msgstr "Özellik" -#: src/hci.cpp:3633 +#: src/hci.cpp:3621 msgid "Place Features on map" msgstr "Haritaya Özel Öğeler ekle" -#: src/hci.cpp:3643 +#: src/hci.cpp:3631 msgid "Pause" msgstr "Durdur" -#: src/hci.cpp:3644 +#: src/hci.cpp:3632 msgid "Pause or unpause the game" msgstr "Oyunu durdur yada başlat" -#: src/hci.cpp:3658 +#: src/hci.cpp:3646 msgid "Align height of all map objects" msgstr "Tüm harita yüksekliğini objelere uygun hale getir" -#: src/hci.cpp:3668 +#: src/hci.cpp:3656 msgid "Edit" msgstr "Düzenle" -#: src/hci.cpp:3669 +#: src/hci.cpp:3657 msgid "Start Edit Mode" msgstr "Düzenleme Modunu Aç" -#: src/hci.cpp:3683 +#: src/hci.cpp:3671 #: src/ingameop.cpp:112 -#: src/ingameop.cpp:258 -#: src/ingameop.cpp:263 +#: src/ingameop.cpp:256 +#: src/ingameop.cpp:260 msgid "Quit" msgstr "Çıkış" -#: src/hci.cpp:3684 +#: src/hci.cpp:3672 msgid "Exit Game" msgstr "Oyundan Çık" -#: src/hci.cpp:3710 +#: src/hci.cpp:3698 msgid "Current Player:" msgstr "Geçerli Oyuncu:" -#: src/hci.cpp:4001 +#: src/hci.cpp:3989 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "İlerleme Çubuğu" -#: src/hci.cpp:4867 +#: src/hci.cpp:4855 msgid "Factory Delivery Point" msgstr "Fabrika Teslim Noktası" -#: src/hci.cpp:4885 +#: src/hci.cpp:4873 msgid "Loop Production" msgstr "Üretimi Tekrarla" -#: src/hci.cpp:4965 +#: src/hci.cpp:4953 msgid "Tab Scroll left" msgstr "Tabloyu Sola Kaydır" -#: src/hci.cpp:4980 +#: src/hci.cpp:4968 msgid "Tab Scroll right" msgstr "Tabloyu Sağa Kaydır" #: src/ingameop.cpp:111 -#: src/ingameop.cpp:193 -#: src/ingameop.cpp:267 +#: src/ingameop.cpp:195 +#: src/ingameop.cpp:264 msgid "Resume Game" msgstr "Oyuna Dön" @@ -13032,32 +13032,32 @@ msgstr "Oyuna Dön" msgid "WARNING: You're the host. If you quit, the game ends for everyone!" msgstr "DİKKAT: Sen Kurucusun. Eğer oyundan çıkarsan , oyun herkes için bitmiş olacak!" -#: src/ingameop.cpp:185 -#: src/ingameop.cpp:527 +#: src/ingameop.cpp:186 +#: src/ingameop.cpp:523 msgid "Tactical UI (Target Origin Icon): Show" msgstr "Taktiksel UI (Hedef Kaynak Simgesi): Göster" -#: src/ingameop.cpp:190 -#: src/ingameop.cpp:531 +#: src/ingameop.cpp:191 +#: src/ingameop.cpp:527 msgid "Tactical UI (Target Origin Icon): Hide" msgstr "Taktiksel UI (Hedef Kaynak Simgesi): Gizle" -#: src/ingameop.cpp:277 -#: src/ingameop.cpp:502 -#: src/mission.cpp:2514 -#: src/mission.cpp:2633 +#: src/ingameop.cpp:274 +#: src/ingameop.cpp:498 +#: src/mission.cpp:2480 +#: src/mission.cpp:2599 msgid "Save Game" msgstr "Oyunu Kaydet" -#: src/ingameop.cpp:343 +#: src/ingameop.cpp:339 msgid "Host has quit the game!" msgstr "Kurucu oyundan çıktı!" -#: src/ingameop.cpp:349 +#: src/ingameop.cpp:345 msgid "The game can't continue without the host." msgstr "Oyun Kurucu olmadan devam edemez." -#: src/ingameop.cpp:355 +#: src/ingameop.cpp:351 msgid "--> QUIT <--" msgstr "--> ÇIKIŞ <--" @@ -13438,52 +13438,52 @@ msgstr "Bişeyler öldüğünde ekran sarsıntısı: Kapalı" msgid "Screen shake when things die: On" msgstr "Bişeyler öldüğünde ekran sarsıntısı: Açık" -#: src/keybind.cpp:2603 -#: src/keybind.cpp:2646 +#: src/keybind.cpp:2604 +#: src/keybind.cpp:2647 msgid "Sorry, but game speed cannot be changed in multiplayer." msgstr "Üzgünüm, fakat oyun hızı çoklu oyunculu oyunlarda değiştirilemez" -#: src/keybind.cpp:2624 -#: src/keybind.cpp:2667 -#: src/keybind.cpp:2689 +#: src/keybind.cpp:2625 +#: src/keybind.cpp:2668 +#: src/keybind.cpp:2690 msgid "Game Speed Reset" msgstr "Oyun Hızı Sıfırlandı" -#: src/keybind.cpp:2628 +#: src/keybind.cpp:2629 #, c-format msgid "Game Speed Increased to %3.1f" msgstr "Oyun Hızı %3.1f yükseltildi" -#: src/keybind.cpp:2671 +#: src/keybind.cpp:2672 #, c-format msgid "Game Speed Reduced to %3.1f" msgstr "Oyun Hızı %3.1f ' indirildi" -#: src/keybind.cpp:2701 +#: src/keybind.cpp:2702 msgid "Radar showing friend-foe colors" msgstr "Radar Dost-Düşman haritasını gösterecek" -#: src/keybind.cpp:2705 +#: src/keybind.cpp:2706 msgid "Radar showing player colors" msgstr "Radar oyuncu renklerini gösterecek" -#: src/keybind.cpp:2726 +#: src/keybind.cpp:2727 msgid "Radar showing only objects" msgstr "Radar sadece nesneleri gösterecek" -#: src/keybind.cpp:2729 +#: src/keybind.cpp:2730 msgid "Radar blending terrain and height" msgstr "Radar bölge ve yüksekliği gösterecek" -#: src/keybind.cpp:2732 +#: src/keybind.cpp:2733 msgid "Radar showing terrain" msgstr "Radar bölgeyi gösterecek" -#: src/keybind.cpp:2735 +#: src/keybind.cpp:2736 msgid "Radar showing revealed terrain" msgstr "Radar keşfedilen alanı gösterecek" -#: src/keybind.cpp:2738 +#: src/keybind.cpp:2739 msgid "Radar showing height" msgstr "Radar yüksekliği gösterecek" @@ -13492,9 +13492,9 @@ msgid "KEY MAPPING" msgstr "KLAVYE KISAYOLLARI" #: src/keyedit.cpp:372 -#: src/multiint.cpp:662 -#: src/multiint.cpp:1072 -#: src/multiint.cpp:1478 +#: src/multiint.cpp:671 +#: src/multiint.cpp:1081 +#: src/multiint.cpp:1487 msgid "Return To Previous Screen" msgstr "Bir Önceki Ekrana Dön" @@ -13983,37 +13983,37 @@ msgstr "Sürüş Moduna" msgid "Could not save game!" msgstr "Oyun Kaydedilemedi!" -#: src/mission.cpp:2075 +#: src/mission.cpp:2041 msgid "Load Transport" msgstr "Taşımaya Yükle" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "GÖREV BAŞARILI--hileci seni!" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED" msgstr "GÖREV BAŞARILI" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED--and you cheated!" msgstr "GÖREV BAŞARISIZ--ve sen hile yaptın!" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED" msgstr "GÖREV BAŞARISIZ" -#: src/mission.cpp:2493 -#: src/mission.cpp:2533 -#: src/mission.cpp:2647 +#: src/mission.cpp:2459 +#: src/mission.cpp:2499 +#: src/mission.cpp:2613 msgid "Quit To Main Menu" msgstr "Ana Menüye Dön" -#: src/mission.cpp:2501 +#: src/mission.cpp:2467 msgid "Continue Game" msgstr "Oyuna Devam" -#: src/mission.cpp:2598 +#: src/mission.cpp:2564 msgid "GAME SAVED :" msgstr "OYUN KAYDEDİLDİ :" @@ -14072,341 +14072,346 @@ msgstr "%s İsimli Oyuncu %s ile Anlaşma İmzaladı." msgid "You Discover Blueprints For %s" msgstr "Sen %s 'in kalıntılarını keşfettin" -#: src/multiint.cpp:600 +#: src/multiint.cpp:609 #: src/multilimit.cpp:190 msgid "Accept Settings" msgstr "Ayarları Kabul et" -#: src/multiint.cpp:602 -#: src/multiint.cpp:1117 +#: src/multiint.cpp:611 +#: src/multiint.cpp:1126 msgid "Cancel" msgstr "İptal" -#: src/multiint.cpp:613 +#: src/multiint.cpp:622 msgid "IP Address or Machine Name" msgstr "IP-Adresi yada Makine İsmi" -#: src/multiint.cpp:659 +#: src/multiint.cpp:668 msgid "CONNECTION" msgstr "BAĞLANTI" -#: src/multiint.cpp:664 +#: src/multiint.cpp:673 msgid "Lobby" msgstr "Bekleme Odası" -#: src/multiint.cpp:665 +#: src/multiint.cpp:674 msgid "IP" msgstr "IP" -#: src/multiint.cpp:854 +#: src/multiint.cpp:863 msgid "No games are available" msgstr "Geçerli oyun yok" -#: src/multiint.cpp:857 +#: src/multiint.cpp:866 msgid "Game is full" msgstr "Oyun Dolu" -#: src/multiint.cpp:861 +#: src/multiint.cpp:870 msgid "You were kicked!" msgstr "Oyundan Atıldın!" -#: src/multiint.cpp:864 +#: src/multiint.cpp:873 msgid "Wrong Game Version!" msgstr "Yanlış Oyun Sürümü!" -#: src/multiint.cpp:867 +#: src/multiint.cpp:876 msgid "You have an incompatible mod." msgstr "Uyumsuz bir mod." -#: src/multiint.cpp:871 +#: src/multiint.cpp:880 msgid "Host couldn't send file?" msgstr "Kurucu dosya gönderebilir mi?" -#: src/multiint.cpp:875 +#: src/multiint.cpp:884 msgid "Incorrect Password!" msgstr "Geçersiz Şifre!" -#: src/multiint.cpp:878 +#: src/multiint.cpp:887 msgid "Host has dropped connection!" msgstr "Kurucu Bağlantıyı Kesti" -#: src/multiint.cpp:882 +#: src/multiint.cpp:891 msgid "Connection Error" msgstr "Bağlantı Hatası" -#: src/multiint.cpp:1012 +#: src/multiint.cpp:1021 msgid "Searching" msgstr "Araştırılıyor..." -#: src/multiint.cpp:1069 +#: src/multiint.cpp:1078 msgid "GAMES" msgstr "OYUNLAR" -#: src/multiint.cpp:1077 +#: src/multiint.cpp:1086 msgid "Refresh Games List" msgstr "Oyun Listesini Yenile" -#: src/multiint.cpp:1097 +#: src/multiint.cpp:1106 msgid "Enter Password:" msgstr "Şifreyi gir:" -#: src/multiint.cpp:1115 +#: src/multiint.cpp:1124 msgid "OK" msgstr "TAMAM" -#: src/multiint.cpp:1232 +#: src/multiint.cpp:1241 msgid "Tanks disabled!!" msgstr "Tanklar Devre Dışı!!" -#: src/multiint.cpp:1233 +#: src/multiint.cpp:1242 msgid "Cyborgs disabled." msgstr "Cyborg'lar Devre Dışı" -#: src/multiint.cpp:1234 +#: src/multiint.cpp:1243 msgid "VTOLs disabled." msgstr "VTOL'lar Devre Dışı" -#: src/multiint.cpp:1281 -#: src/multiint.cpp:1288 +#: src/multiint.cpp:1290 +#: src/multiint.cpp:1297 msgid "Select Game Name" msgstr "Oyun İsmi Seç" -#: src/multiint.cpp:1281 +#: src/multiint.cpp:1290 msgid "One-Player Skirmish" msgstr "Tek Kişilik Çatışma" -#: src/multiint.cpp:1291 +#: src/multiint.cpp:1300 msgid "Select Map" msgstr "Harita Seç" -#: src/multiint.cpp:1299 +#: src/multiint.cpp:1308 msgid "Click to set Password" msgstr "Parolayı kurmak için tıkla" -#: src/multiint.cpp:1309 -#: src/multiint.cpp:1310 +#: src/multiint.cpp:1318 +#: src/multiint.cpp:1319 msgid "Scavengers" msgstr "Çöpçüler var" -#: src/multiint.cpp:1312 +#: src/multiint.cpp:1321 msgid "No Scavengers" msgstr "Çöpçüler yok" -#: src/multiint.cpp:1342 +#: src/multiint.cpp:1351 msgid "Select Player Name" msgstr "Oyuncu İsmi Seç" -#: src/multiint.cpp:1348 +#: src/multiint.cpp:1357 msgid "Distance Fog" msgstr "Yoğun Sis" -#: src/multiint.cpp:1359 +#: src/multiint.cpp:1368 #: src/multimenu.cpp:756 msgid "Alliances" msgstr "Müttefiklikler" -#: src/multiint.cpp:1362 +#: src/multiint.cpp:1371 msgid "No Alliances" msgstr "Müttefiklik yok" -#: src/multiint.cpp:1364 +#: src/multiint.cpp:1373 msgid "Allow Alliances" msgstr "Müttefiklikleri Göster" # festgelegt ungleich fest -Kreuvf -#: src/multiint.cpp:1368 +#: src/multiint.cpp:1377 msgid "Locked Teams" msgstr "Takım Kilidi" -#: src/multiint.cpp:1394 +#: src/multiint.cpp:1403 msgid "Low Power Levels" msgstr "Düşük güç seviyesi" -#: src/multiint.cpp:1396 +#: src/multiint.cpp:1405 msgid "Medium Power Levels" msgstr "Orta güç seviyesi" -#: src/multiint.cpp:1398 +#: src/multiint.cpp:1407 msgid "High Power Levels" msgstr "Yüksek güç seviyesi" -#: src/multiint.cpp:1430 +#: src/multiint.cpp:1439 msgid "Base" msgstr "Üs" -#: src/multiint.cpp:1432 +#: src/multiint.cpp:1441 msgid "Start with No Bases" msgstr "Üs olmadan başla." -#: src/multiint.cpp:1434 +#: src/multiint.cpp:1443 msgid "Start with Bases" msgstr "Üsler ile başla." -#: src/multiint.cpp:1436 +#: src/multiint.cpp:1445 msgid "Start with Advanced Bases" msgstr "Gelişmiş üsler ile başla." -#: src/multiint.cpp:1468 +#: src/multiint.cpp:1477 msgid "Map Preview" msgstr "Haritayı Gör" -#: src/multiint.cpp:1470 +#: src/multiint.cpp:1479 msgid "Click to see Map" msgstr "Haritayı görmek için tıkla" -#: src/multiint.cpp:1484 +#: src/multiint.cpp:1493 msgid "Start Hosting Game" msgstr "Oyunu kurulumunu başlat" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 msgid "Show Structure Limits" msgstr "Bina limitlerini göster" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 msgid "Set Structure Limits" msgstr "Bina limitlerini ayarla" -#: src/multiint.cpp:1587 +#: src/multiint.cpp:1596 msgid "DIFFICULTY" msgstr "ZORLUK" -#: src/multiint.cpp:1601 +#: src/multiint.cpp:1610 msgid "Less aggressive and starts with less units" msgstr "Daha agresif ve daha az birim" -#: src/multiint.cpp:1602 +#: src/multiint.cpp:1611 msgid "Plays nice" msgstr "Güzel çalış" -#: src/multiint.cpp:1603 +#: src/multiint.cpp:1612 msgid "No holds barred" msgstr "Hiçbir tutar engellenmedi" -#: src/multiint.cpp:1604 +#: src/multiint.cpp:1613 msgid "Starts with advantages and gets twice as much oil from derricks" msgstr "Avantajlar ile başlarsın ve Petrol pompalarından iki kaz daha fazla petrol alırsın" -#: src/multiint.cpp:1632 +#: src/multiint.cpp:1641 msgid "CHOOSE AI" msgstr "Y.Z SEÇ" -#: src/multiint.cpp:1648 +#: src/multiint.cpp:1657 msgid "Allow human players to join in this slot" msgstr "İnsan oyuncuların bu slota girmesi için izin ver" -#: src/multiint.cpp:1656 +#: src/multiint.cpp:1665 msgid "Leave this slot unused" msgstr "Bu slotu kullanılmaz olarak belirle" -#: src/multiint.cpp:1736 +#: src/multiint.cpp:1745 msgid "Player colour" msgstr "Oyuncu rengi" -#: src/multiint.cpp:2062 +#: src/multiint.cpp:2071 msgid "Team" msgstr "Takım" -#: src/multiint.cpp:2074 +#: src/multiint.cpp:2083 msgid "Kick player" msgstr "Oyundan at" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 msgid "You cannot change difficulty in a challenge" msgstr "Mücadele modunda zorluğu değiştiremezsin" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 msgid "Click to change difficulty" msgstr "Zorluğu değiştirmek için tıkla" -#: src/multiint.cpp:2121 +#: src/multiint.cpp:2130 msgid "Click when ready" msgstr "Hazırsan tıkla" -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2134 msgid "READY?" msgstr "HAZIR?" -#: src/multiint.cpp:2169 +#: src/multiint.cpp:2178 msgid "PLAYERS" msgstr "OYUNCULAR" -#: src/multiint.cpp:2204 +#: src/multiint.cpp:2213 msgid "Click to change to this slot" msgstr "Bu slotu değiştirmek için tıkla" -#: src/multiint.cpp:2232 +#: src/multiint.cpp:2241 msgid "Choose Team" msgstr "Takım seç" -#: src/multiint.cpp:2262 +#: src/multiint.cpp:2271 msgid "Click to change player colour" msgstr "Oyuncu renklerini değiştirmek için tıkla" -#: src/multiint.cpp:2290 +#: src/multiint.cpp:2299 msgid "Click to change player position" msgstr "Oyuncu pozisyonunu değiştirmek için tıkla" -#: src/multiint.cpp:2296 +#: src/multiint.cpp:2305 msgid "Click to change AI" msgstr "Yapay zekayı ayarlamak için tıkla" -#: src/multiint.cpp:2300 +#: src/multiint.cpp:2309 msgid "You cannot change AI in a challenge" msgstr "Mücadele modunda Y.Z değiştiremezsin" -#: src/multiint.cpp:2362 +#: src/multiint.cpp:2371 msgid "CHAT" msgstr "SOHBET" -#: src/multiint.cpp:2394 +#: src/multiint.cpp:2403 msgid "All players need to have the same mods to join your game." msgstr "TÜm oyuncular oyununa girebilmek için aynı moda ihtiyaç duyar." -#: src/multiint.cpp:2552 +#: src/multiint.cpp:2561 #, c-format msgid "*** password [%s] is now required! ***" msgstr "*** Şifre [%s] şimdi isteniyor ! ***" -#: src/multiint.cpp:2560 +#: src/multiint.cpp:2569 msgid "*** password is NOT required! ***" msgstr "*** Şifreye gerek yok! ***" -#: src/multiint.cpp:2801 +#: src/multiint.cpp:2810 msgid "Sorry! Failed to host the game." msgstr "Üzgünüm! Oyun kurulurken bir hata oldu." # festgelegt ungleich fest -Kreuvf -#: src/multiint.cpp:2922 +#: src/multiint.cpp:2931 msgid "'Locked Teams' mode enabled" msgstr "\"Takım Kilidi\"-Modu Aktif" -#: src/multiint.cpp:3003 +#: src/multiint.cpp:3012 #, c-format msgid "The host has kicked %s from the game!" msgstr "Kurucu %s isimli oyuncuyu oyundan attı!" -#: src/multiint.cpp:3073 +#: src/multiint.cpp:3082 msgid "Host is Starting Game" msgstr "Kurucu oyunu başlatıyor" -#: src/multiint.cpp:3639 +#: src/multiint.cpp:3648 msgid "Players" msgstr "Oyuncular" -#: src/multiint.cpp:3777 +#: src/multiint.cpp:3786 #, c-format msgid "Sending Map: %d%% " msgstr "Harita Gönderiliyor: %d%%" -#: src/multiint.cpp:3785 +#: src/multiint.cpp:3794 #, c-format msgid "Map: %d%% downloaded" msgstr "Harita: %d%% indirildi" -#: src/multiint.cpp:3813 +#: src/multiint.cpp:3820 msgid "HOST" msgstr "KURUCU" +#: src/multiint.cpp:3827 +#: src/multimenu.cpp:772 +msgid "Ping" +msgstr "Ping" + #: src/multijoin.cpp:100 #: src/multijoin.cpp:101 msgid "Players Still Joining" @@ -14422,17 +14427,17 @@ msgstr "%s Oyundan çıktı" msgid "File transfer has been aborted for %d." msgstr "Dosya transferi iptal %d " -#: src/multijoin.cpp:376 +#: src/multijoin.cpp:373 #, c-format msgid "%s (%u) has an incompatible mod, and has been kicked." msgstr "%s (%u) uyumsuz bir mod.Ve oyundan atıldı" -#: src/multijoin.cpp:415 +#: src/multijoin.cpp:412 #, c-format msgid "%s is Joining the Game" msgstr "%s Oyuna katılıyor" -#: src/multijoin.cpp:425 +#: src/multijoin.cpp:422 msgid "System message:" msgstr "Sistem İletisi:" @@ -14533,10 +14538,6 @@ msgstr "Öldürme" msgid "Units" msgstr "Birimler" -#: src/multimenu.cpp:772 -msgid "Ping" -msgstr "Ping" - #: src/multimenu.cpp:776 msgid "Structs" msgstr "Binalar" @@ -14570,83 +14571,83 @@ msgstr "Oyuncuya güç ver" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "Oyuncu atılıyor %s veri bütünlüğünü korumak için!" -#: src/multiplay.cpp:1146 +#: src/multiplay.cpp:1057 msgid "(allies" msgstr "(Müttefikler" -#: src/multiplay.cpp:1154 +#: src/multiplay.cpp:1065 msgid "(private to " msgstr "(bir direk" -#: src/multiplay.cpp:1167 +#: src/multiplay.cpp:1078 msgid "[invalid]" msgstr "[gereksiz]" -#: src/multiplay.cpp:2057 +#: src/multiplay.cpp:1942 msgid "Green" msgstr "Yeşil" -#: src/multiplay.cpp:2058 +#: src/multiplay.cpp:1943 msgid "Orange" msgstr "Portakal Sarısı" -#: src/multiplay.cpp:2059 +#: src/multiplay.cpp:1944 msgid "Grey" msgstr "Gri" -#: src/multiplay.cpp:2060 +#: src/multiplay.cpp:1945 msgid "Black" msgstr "Siyah" -#: src/multiplay.cpp:2061 +#: src/multiplay.cpp:1946 msgid "Red" msgstr "Kırmızı" -#: src/multiplay.cpp:2062 +#: src/multiplay.cpp:1947 msgid "Blue" msgstr "Koyu Mavi" -#: src/multiplay.cpp:2063 +#: src/multiplay.cpp:1948 msgid "Pink" msgstr "Pembe" -#: src/multiplay.cpp:2064 +#: src/multiplay.cpp:1949 msgid "Cyan" msgstr "Mavi" -#: src/multiplay.cpp:2065 +#: src/multiplay.cpp:1950 msgid "Yellow" msgstr "Sarı" -#: src/multiplay.cpp:2066 +#: src/multiplay.cpp:1951 msgid "Purple" msgstr "Mor" -#: src/multiplay.cpp:2067 +#: src/multiplay.cpp:1952 msgid "White" msgstr "Beyaz" -#: src/multiplay.cpp:2068 +#: src/multiplay.cpp:1953 msgid "Bright blue" msgstr "Açık Mavi" -#: src/multiplay.cpp:2069 +#: src/multiplay.cpp:1954 msgid "Neon green" msgstr "Neon yeşili" -#: src/multiplay.cpp:2070 +#: src/multiplay.cpp:1955 msgid "Infrared" msgstr "Kızılötesi" -#: src/multiplay.cpp:2071 +#: src/multiplay.cpp:1956 msgid "Ultraviolet" msgstr "Morötesi" -#: src/multiplay.cpp:2072 +#: src/multiplay.cpp:1957 msgid "Brown" msgstr "Kahverengi" -#: src/order.cpp:864 +#: src/order.cpp:800 msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "Bunu Yapamıyoruz! Biz Cyborg Taşıma Gemisi'ni kullanmak için bir Cyborg birimine sahip olmalıyız!" @@ -14781,20 +14782,20 @@ msgstr "Toplam Oyun Zamanı - %s" msgid "You cheated!" msgstr "Hile Yaptın!" -#: src/scriptfuncs.cpp:3250 +#: src/scriptfuncs.cpp:3287 msgid "YOU ARE VICTORIOUS!" msgstr "KAZANDIN!" -#: src/scriptfuncs.cpp:3254 +#: src/scriptfuncs.cpp:3291 msgid "YOU WERE DEFEATED!" msgstr "YENİLDİN!" -#: src/scriptfuncs.cpp:9500 +#: src/scriptfuncs.cpp:9537 #, c-format msgid "Beacon received from %s!" msgstr "Sinyal alındı: %s !" -#: src/scriptfuncs.cpp:9546 +#: src/scriptfuncs.cpp:9583 #, c-format msgid "Beacon %d" msgstr "Sinyal %d" @@ -14823,64 +14824,64 @@ msgstr "Hiç Algılayıcı birimi bulunamadı!" msgid "Unable to locate any Commanders!" msgstr "Hiç Komutan birimi bulunamadı!" -#: src/structure.cpp:2615 +#: src/structure.cpp:2614 msgid "Command Control Limit Reached - Production Halted" msgstr "Komuta Kontrol Limitine Ulaştın - Üretim Durduruldu" # nix Gruppe! -Kreuvf -#: src/structure.cpp:5815 -#: src/structure.cpp:5840 +#: src/structure.cpp:5806 +#: src/structure.cpp:5831 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" msgstr[0] "%s - %u Birim Atandı" msgstr[1] "%s - %u Birimler Atandı" -#: src/structure.cpp:5845 -#: src/structure.cpp:5913 -#: src/structure.cpp:5929 -#: src/structure.cpp:5943 +#: src/structure.cpp:5836 +#: src/structure.cpp:5904 +#: src/structure.cpp:5920 +#: src/structure.cpp:5934 #, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - Hasar %3.0f%%" -#: src/structure.cpp:5895 +#: src/structure.cpp:5886 #, c-format msgid "%s - Connected %u of %u" msgstr "%s - %u de %u 'e Bağlandı" -#: src/structure.cpp:6059 -#: src/structure.cpp:6104 +#: src/structure.cpp:6050 +#: src/structure.cpp:6095 #, c-format msgid "%s - Electronically Damaged" msgstr "%s - Elektronik Hasar Aldı" # Reward ist zwar nicht Beute, aber im Krieg erbeutet man eben Dinge -Kreuvf -#: src/structure.cpp:6341 +#: src/structure.cpp:6332 msgid "Electronic Reward - Visibility Report" msgstr "Elektronik Ödül - Görünebilirlik Raporu" -#: src/structure.cpp:6381 +#: src/structure.cpp:6372 msgid "Factory Reward - Propulsion" msgstr "Fabrika Ödülü - Yürütücü" -#: src/structure.cpp:6405 +#: src/structure.cpp:6396 msgid "Factory Reward - Body" msgstr "Fabrika Ödülü - Beden" -#: src/structure.cpp:6429 +#: src/structure.cpp:6420 msgid "Factory Reward - Weapon" msgstr "Fabrika Ödülü - Silah" -#: src/structure.cpp:6438 +#: src/structure.cpp:6429 msgid "Factory Reward - Nothing" msgstr "Fabrika Ödülü - Sıfır" -#: src/structure.cpp:6466 +#: src/structure.cpp:6457 msgid "Repair Facility Award - Repair" msgstr "Tamir Tesisi Ödülü - Tamir" -#: src/structure.cpp:6473 +#: src/structure.cpp:6464 msgid "Repair Facility Award - Nothing" msgstr "Tamir Tesisi Ödülü - Sıfır" diff --git a/po/uk_UA.po b/po/uk_UA.po index db306f500..6c2b1df0a 100644 --- a/po/uk_UA.po +++ b/po/uk_UA.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Warzone 2100 version 2.2.3\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-01-18 00:54+0100\n" +"POT-Creation-Date: 2011-02-25 23:35+0100\n" "PO-Revision-Date: \n" "Last-Translator: Меденцій Олександр \n" "Language-Team: \n" @@ -5724,7 +5724,7 @@ msgid "New Design" msgstr "Новий Макет" #: data/base/messages/strings/names.txt:15 -#: src/design.cpp:1313 +#: src/design.cpp:1275 msgid "Transport" msgstr "Транспорт" @@ -12046,26 +12046,26 @@ msgid "System locale" msgstr "Мова локалізації системи" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1043 +#: lib/netplay/netplay.cpp:1042 msgid "Enter password here" msgstr "Визначте Пароль" -#: lib/netplay/netplay.cpp:2048 +#: lib/netplay/netplay.cpp:2060 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "Неможливо отримати ім'я основного сервера (%s)!" -#: lib/netplay/netplay.cpp:2062 +#: lib/netplay/netplay.cpp:2082 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "Неможливо зв'язатись з сервером лоббі! Чи відкритий TCP порт %u для вихідного трафіку?" #: src/challenge.cpp:184 -#: src/hci.cpp:922 -#: src/hci.cpp:3390 -#: src/hci.cpp:3513 -#: src/hci.cpp:3924 -#: src/hci.cpp:4942 +#: src/hci.cpp:916 +#: src/hci.cpp:3378 +#: src/hci.cpp:3501 +#: src/hci.cpp:3912 +#: src/hci.cpp:4930 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12217,149 +12217,149 @@ msgstr "перейти безпосередньо до екрану хосту" #: src/configuration.cpp:393 #: src/configuration.cpp:394 -#: src/multistat.cpp:130 +#: src/multistat.cpp:124 msgid "Player" msgstr "Гравець" -#: src/design.cpp:449 -#: src/design.cpp:469 -#: src/design.cpp:3501 +#: src/design.cpp:443 +#: src/design.cpp:455 +#: src/design.cpp:3464 msgid "New Vehicle" msgstr "Новий Підрозділ" -#: src/design.cpp:515 +#: src/design.cpp:500 msgid "Vehicle Body" msgstr "Корпус Підрозділу" -#: src/design.cpp:535 +#: src/design.cpp:520 msgid "Vehicle Propulsion" msgstr "Ходова Підрозділу" -#: src/design.cpp:556 -#: src/design.cpp:579 -#: src/design.cpp:603 +#: src/design.cpp:541 +#: src/design.cpp:564 +#: src/design.cpp:588 msgid "Vehicle Turret" msgstr "Башта Підрозділу" -#: src/design.cpp:622 +#: src/design.cpp:607 msgid "Delete Design" msgstr "Видалити Макет" -#: src/design.cpp:673 -#: src/design.cpp:720 +#: src/design.cpp:658 +#: src/design.cpp:705 msgid "Kinetic Armour" msgstr "Кінетична Броня" -#: src/design.cpp:682 -#: src/design.cpp:730 +#: src/design.cpp:667 +#: src/design.cpp:715 msgid "Thermal Armour" msgstr "Термальна Броня" -#: src/design.cpp:698 -#: src/design.cpp:750 +#: src/design.cpp:683 +#: src/design.cpp:735 msgid "Engine Output" msgstr "Потужність Двигуна" -#: src/design.cpp:706 -#: src/design.cpp:759 -#: src/design.cpp:1529 -#: src/design.cpp:1553 -#: src/design.cpp:1574 -#: src/design.cpp:1590 -#: src/design.cpp:1610 -#: src/design.cpp:1627 -#: src/design.cpp:1647 -#: src/design.cpp:1664 -#: src/design.cpp:1705 -#: src/design.cpp:1737 -#: src/design.cpp:1869 -#: src/design.cpp:1885 -#: src/design.cpp:1923 -#: src/design.cpp:1956 +#: src/design.cpp:691 +#: src/design.cpp:744 +#: src/design.cpp:1486 +#: src/design.cpp:1510 +#: src/design.cpp:1531 +#: src/design.cpp:1547 +#: src/design.cpp:1567 +#: src/design.cpp:1584 +#: src/design.cpp:1604 +#: src/design.cpp:1621 +#: src/design.cpp:1662 +#: src/design.cpp:1694 +#: src/design.cpp:1826 +#: src/design.cpp:1842 +#: src/design.cpp:1880 +#: src/design.cpp:1913 msgid "Weight" msgstr "Вага" -#: src/design.cpp:790 -#: src/design.cpp:808 +#: src/design.cpp:775 +#: src/design.cpp:793 msgid "Total Power Required" msgstr "Загальна Ціна Енергії" -#: src/design.cpp:821 -#: src/design.cpp:840 +#: src/design.cpp:806 +#: src/design.cpp:825 msgid "Total Body Points" msgstr "Запас Міцності Корпусу" -#: src/design.cpp:1027 -#: src/design.cpp:1059 +#: src/design.cpp:996 +#: src/design.cpp:1025 msgid "Power Usage" msgstr "Ціна Енергії" -#: src/design.cpp:1335 +#: src/design.cpp:1298 msgid "Hydra " msgstr "Гідра " -#: src/design.cpp:1509 -#: src/design.cpp:1537 +#: src/design.cpp:1466 +#: src/design.cpp:1494 msgid "Sensor Range" msgstr "Радіус Дії Сенсора" -#: src/design.cpp:1521 -#: src/design.cpp:1545 +#: src/design.cpp:1478 +#: src/design.cpp:1502 msgid "Sensor Power" msgstr "Потужність Сенсора" -#: src/design.cpp:1566 -#: src/design.cpp:1582 +#: src/design.cpp:1523 +#: src/design.cpp:1539 msgid "ECM Power" msgstr "Потужність ЕМ Хвиль" -#: src/design.cpp:1602 -#: src/design.cpp:1619 -#: src/design.cpp:1639 -#: src/design.cpp:1656 +#: src/design.cpp:1559 +#: src/design.cpp:1576 +#: src/design.cpp:1596 +#: src/design.cpp:1613 msgid "Build Points" msgstr "Ефективність Інженерного Обладнання" -#: src/design.cpp:1677 -#: src/design.cpp:1713 +#: src/design.cpp:1634 +#: src/design.cpp:1670 msgid "Range" msgstr "Радіус Дії" -#: src/design.cpp:1689 -#: src/design.cpp:1721 +#: src/design.cpp:1646 +#: src/design.cpp:1678 msgid "Damage" msgstr "Сила" -#: src/design.cpp:1697 -#: src/design.cpp:1729 +#: src/design.cpp:1654 +#: src/design.cpp:1686 msgid "Rate-of-Fire" msgstr "Швидкострільність" -#: src/design.cpp:1857 -#: src/design.cpp:1877 +#: src/design.cpp:1814 +#: src/design.cpp:1834 msgid "Air Speed" msgstr "Швидкість у Повітрі" -#: src/design.cpp:1895 -#: src/design.cpp:1932 +#: src/design.cpp:1852 +#: src/design.cpp:1889 msgid "Road Speed" msgstr "Швидкість на Дорозі" -#: src/design.cpp:1905 -#: src/design.cpp:1940 +#: src/design.cpp:1862 +#: src/design.cpp:1897 msgid "Off-Road Speed" msgstr "Швидкість по Бездоріжжю" -#: src/design.cpp:1913 -#: src/design.cpp:1948 +#: src/design.cpp:1870 +#: src/design.cpp:1905 msgid "Water Speed" msgstr "Швидкість на Воді" -#: src/design.cpp:2074 +#: src/design.cpp:2031 msgid "Weapons" msgstr "Озброєння" -#: src/design.cpp:2094 +#: src/design.cpp:2051 msgid "Systems" msgstr "Системи" @@ -12372,7 +12372,7 @@ msgid "Player dropped" msgstr "Гравець здався" #: src/display3d.cpp:599 -#: src/multiint.cpp:2116 +#: src/multiint.cpp:2125 msgid "Waiting for other players" msgstr "Чекаємо інших гравців" @@ -12380,114 +12380,114 @@ msgstr "Чекаємо інших гравців" msgid "Out of sync" msgstr "" -#: src/display.cpp:1651 +#: src/display.cpp:1649 msgid "Cannot Build. Oil Resource Burning." msgstr "Будівництво Неможливе. Через пожежу на Нафтовому Родовищі" -#: src/display.cpp:1830 -#: src/display.cpp:2423 +#: src/display.cpp:1828 +#: src/display.cpp:2421 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - Пошкоджень %d%% - Вбито %d, %s" -#: src/display.cpp:1846 +#: src/display.cpp:1844 #, c-format msgid "%s - Allied - Damage %d%% - Experience %d, %s" msgstr "%s - Союзник - Пошкоджень %d%% - Вбито %d, %s" -#: src/display.cpp:2044 +#: src/display.cpp:2042 msgid "Truck ordered to build Oil Derrick" msgstr "Інженеру наказано побудувати Бурову Вежу" -#: src/display.cpp:2045 +#: src/display.cpp:2043 #, fuzzy msgid "2 trucks ordered to build Oil Derrick" msgstr "Інженеру наказано побудувати Бурову Вежу" -#: src/display.cpp:2046 +#: src/display.cpp:2044 #, fuzzy, c-format msgid "%d trucks ordered to build Oil Derrick" msgstr "Інженеру наказано побудувати Бурову Вежу" -#: src/droid.cpp:208 +#: src/droid.cpp:211 msgid "Unit Lost!" msgstr "Втрачено Бойову Одиницю!" -#: src/droid.cpp:1370 +#: src/droid.cpp:1376 msgid "Structure Restored" msgstr "Будівлю Відновлено" -#: src/droid.cpp:2712 +#: src/droid.cpp:2732 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" msgstr[0] "Групу %u обрано - %u Підрозділ" msgstr[1] "Групу %u обрано - %u Підрозділів" -#: src/droid.cpp:2725 +#: src/droid.cpp:2745 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" msgstr[0] "%u підрозділ призначено у Групу %u" msgstr[1] "%u підрозділів призначено у Групу %u" -#: src/droid.cpp:2738 +#: src/droid.cpp:2758 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" msgstr[0] "Центр екрану на Групі %u - %u Підрозділ" msgstr[1] "Центр екрану на Групі %u - %u Підрозділів" -#: src/droid.cpp:2742 +#: src/droid.cpp:2762 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" msgstr[0] "Вирівнювання з Групою %u - %u Підрозділ" msgstr[1] "Вирівнювання з Групою %u - %u Підрозділів" -#: src/droid.cpp:3080 +#: src/droid.cpp:3093 msgid "Rookie" msgstr "Новобранець" -#: src/droid.cpp:3081 +#: src/droid.cpp:3094 msgctxt "rank" msgid "Green" msgstr "Зелений" -#: src/droid.cpp:3082 +#: src/droid.cpp:3095 msgid "Trained" msgstr "Рекрут" -#: src/droid.cpp:3083 +#: src/droid.cpp:3096 msgid "Regular" msgstr "Досвідчений" -#: src/droid.cpp:3084 +#: src/droid.cpp:3097 msgid "Professional" msgstr "Професіонал" -#: src/droid.cpp:3085 +#: src/droid.cpp:3098 msgid "Veteran" msgstr "Ветеран" -#: src/droid.cpp:3086 +#: src/droid.cpp:3099 msgid "Elite" msgstr "Елітний" -#: src/droid.cpp:3087 +#: src/droid.cpp:3100 msgid "Special" msgstr "Особливий" -#: src/droid.cpp:3088 +#: src/droid.cpp:3101 msgid "Hero" msgstr "Герой" -#: src/droid.cpp:4110 +#: src/droid.cpp:4123 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "" -#: src/droid.cpp:4114 +#: src/droid.cpp:4127 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "" @@ -12506,7 +12506,7 @@ msgid "Tutorial" msgstr "Навчання" #: src/frontend.cpp:100 -#: src/hci.cpp:3499 +#: src/hci.cpp:3487 msgid "Options" msgstr "Опції" @@ -12557,7 +12557,7 @@ msgid "Challenges" msgstr "Виклики" #: src/frontend.cpp:215 -#: src/ingameop.cpp:275 +#: src/ingameop.cpp:272 msgid "Load Game" msgstr "Завнтажити Гру" @@ -12566,9 +12566,9 @@ msgid "SINGLE PLAYER" msgstr "РЕЖИМ ОДНОГО ГРАВЦЯ" #: src/frontend.cpp:303 -#: src/ingameop.cpp:498 -#: src/mission.cpp:2527 -#: src/mission.cpp:2630 +#: src/ingameop.cpp:494 +#: src/mission.cpp:2493 +#: src/mission.cpp:2596 msgid "Load Saved Game" msgstr "Завантажити Збережену Гру" @@ -12585,7 +12585,7 @@ msgid "Join Game" msgstr "Приєднатись до Гри" #: src/frontend.cpp:422 -#: src/multiint.cpp:1276 +#: src/multiint.cpp:1285 msgid "OPTIONS" msgstr "ОПЦІЇ" @@ -12602,7 +12602,7 @@ msgid "Video Options" msgstr "Опції Відео" #: src/frontend.cpp:426 -#: src/ingameop.cpp:270 +#: src/ingameop.cpp:267 msgid "Audio Options" msgstr "Опції Звуку" @@ -12680,7 +12680,7 @@ msgid "Off" msgstr "Вимкнено" #: src/frontend.cpp:523 -#: src/multiint.cpp:1345 +#: src/multiint.cpp:1354 msgid "Fog" msgstr "Туман" @@ -12691,7 +12691,7 @@ msgstr "Імла" #: src/frontend.cpp:530 #: src/frontend.cpp:595 -#: src/multiint.cpp:1347 +#: src/multiint.cpp:1356 msgid "Fog Of War" msgstr "Туман Війни" @@ -12853,199 +12853,199 @@ msgid "GAME OPTIONS" msgstr "ІГРОВІ ОПЦІЇ" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2389 +#: src/multiint.cpp:2398 msgid "Mod: " msgstr ", моди: " -#: src/hci.cpp:1245 +#: src/hci.cpp:1237 msgid "MAP SAVED!" msgstr "МАПУ ЗБЕРЕЖЕНО!" -#: src/hci.cpp:1584 +#: src/hci.cpp:1573 #: src/loop.cpp:558 #: src/loop.cpp:574 msgid "GAME SAVED: " msgstr "ГРУ ЗБЕРЕЖЕНО:" -#: src/hci.cpp:1971 +#: src/hci.cpp:1960 msgid "Failed to create building" msgstr "Не вдалося створити будівлю" -#: src/hci.cpp:1988 +#: src/hci.cpp:1977 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new structure: %s." msgstr "Гравець %u за допомогою шахрайства (меню налагодження) здобув(ла) нову будівлю : %s." -#: src/hci.cpp:2003 +#: src/hci.cpp:1992 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new feature: %s." msgstr "Гравець %u за допомогою шахрайства (меню налагодження) здобув(ла) нову властивість : %s." -#: src/hci.cpp:2025 +#: src/hci.cpp:2014 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid: %s." msgstr "Гравець %u за допомогою шахрайства (меню налагодження) здобув(ла) нову одиницю : %s." -#: src/hci.cpp:2036 +#: src/hci.cpp:2025 #, fuzzy, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "Гравець %u за допомогою шахрайства (меню налагодження) здобув(ла) нову одиницю : %s." -#: src/hci.cpp:3310 +#: src/hci.cpp:3298 msgid "Commanders (F6)" msgstr "Командири (F6)" -#: src/hci.cpp:3323 +#: src/hci.cpp:3311 msgid "Intelligence Display (F5)" msgstr "Показати Розвіддані (F5)" -#: src/hci.cpp:3336 +#: src/hci.cpp:3324 msgid "Manufacture (F1)" msgstr "Виробництво (F1)" -#: src/hci.cpp:3349 +#: src/hci.cpp:3337 msgid "Design (F4)" msgstr "Конструювання (F4)" -#: src/hci.cpp:3362 +#: src/hci.cpp:3350 msgid "Research (F2)" msgstr "Дослідження (F2)" -#: src/hci.cpp:3375 +#: src/hci.cpp:3363 msgid "Build (F3)" msgstr "Будівництво (F3)" -#: src/hci.cpp:3446 -#: src/multiint.cpp:1392 +#: src/hci.cpp:3434 +#: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Енергія" -#: src/hci.cpp:3537 +#: src/hci.cpp:3525 msgid "Map:" msgstr "" -#: src/hci.cpp:3550 +#: src/hci.cpp:3538 #, fuzzy msgid "Load" msgstr "Завнтажити Гру" -#: src/hci.cpp:3551 +#: src/hci.cpp:3539 #, fuzzy msgid "Load Map File" msgstr "Завнтажити Гру" -#: src/hci.cpp:3558 +#: src/hci.cpp:3546 #, fuzzy msgid "Save" msgstr "Зберегти Гру" -#: src/hci.cpp:3559 +#: src/hci.cpp:3547 #, fuzzy msgid "Save Map File" msgstr "Зберегти Гру" -#: src/hci.cpp:3567 +#: src/hci.cpp:3555 msgid "New" msgstr "" -#: src/hci.cpp:3568 +#: src/hci.cpp:3556 msgid "New Blank Map" msgstr "" -#: src/hci.cpp:3604 +#: src/hci.cpp:3592 msgid "Tile" msgstr "Клітинка" -#: src/hci.cpp:3605 +#: src/hci.cpp:3593 msgid "Place tiles on map" msgstr "Розмістити клітинки на мапі" -#: src/hci.cpp:3614 +#: src/hci.cpp:3602 msgid "Unit" msgstr "Підрозділ" -#: src/hci.cpp:3615 +#: src/hci.cpp:3603 msgid "Place Unit on map" msgstr "Розмістити Підрозділ на мапі" -#: src/hci.cpp:3623 +#: src/hci.cpp:3611 msgid "Struct" msgstr "Struct" -#: src/hci.cpp:3624 +#: src/hci.cpp:3612 msgid "Place Structures on map" msgstr "Розмістити Будівлі на мапі" -#: src/hci.cpp:3632 +#: src/hci.cpp:3620 msgid "Feat" msgstr "Feat" -#: src/hci.cpp:3633 +#: src/hci.cpp:3621 msgid "Place Features on map" msgstr "Розмістити Особливості на мапі" -#: src/hci.cpp:3643 +#: src/hci.cpp:3631 msgid "Pause" msgstr "" -#: src/hci.cpp:3644 +#: src/hci.cpp:3632 msgid "Pause or unpause the game" msgstr "Поставити гру на паузу, або зняти з паузи" -#: src/hci.cpp:3658 +#: src/hci.cpp:3646 msgid "Align height of all map objects" msgstr "Вирівняти висоту усіх об'єктів на мапі" -#: src/hci.cpp:3668 +#: src/hci.cpp:3656 msgid "Edit" msgstr "" -#: src/hci.cpp:3669 +#: src/hci.cpp:3657 #, fuzzy msgid "Start Edit Mode" msgstr "Старт без Баз" -#: src/hci.cpp:3683 +#: src/hci.cpp:3671 #: src/ingameop.cpp:112 -#: src/ingameop.cpp:258 -#: src/ingameop.cpp:263 +#: src/ingameop.cpp:256 +#: src/ingameop.cpp:260 msgid "Quit" msgstr "Вийти" -#: src/hci.cpp:3684 +#: src/hci.cpp:3672 msgid "Exit Game" msgstr "Покинути Гру" -#: src/hci.cpp:3710 +#: src/hci.cpp:3698 #, fuzzy msgid "Current Player:" msgstr "Кілька Гравців" -#: src/hci.cpp:4001 +#: src/hci.cpp:3989 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "Індикатор Прогресу" -#: src/hci.cpp:4867 +#: src/hci.cpp:4855 msgid "Factory Delivery Point" msgstr "Точка Доставки Фабрики" -#: src/hci.cpp:4885 +#: src/hci.cpp:4873 msgid "Loop Production" msgstr "Зациклити Виробництво" -#: src/hci.cpp:4965 +#: src/hci.cpp:4953 msgid "Tab Scroll left" msgstr "Прогорнути Вкладку ліворуч" -#: src/hci.cpp:4980 +#: src/hci.cpp:4968 msgid "Tab Scroll right" msgstr "Прогорнути Вкладку праворуч" #: src/ingameop.cpp:111 -#: src/ingameop.cpp:193 -#: src/ingameop.cpp:267 +#: src/ingameop.cpp:195 +#: src/ingameop.cpp:264 msgid "Resume Game" msgstr "Продовжити Гру" @@ -13053,34 +13053,34 @@ msgstr "Продовжити Гру" msgid "WARNING: You're the host. If you quit, the game ends for everyone!" msgstr "ОБЕРЕЖНО: Ви хост. Якщо ви вийдете, гра закінчиться для всіх!" -#: src/ingameop.cpp:185 -#: src/ingameop.cpp:527 +#: src/ingameop.cpp:186 +#: src/ingameop.cpp:523 #, fuzzy msgid "Tactical UI (Target Origin Icon): Show" msgstr "Тактична UI (Іконка Походження Цілі): Показати" -#: src/ingameop.cpp:190 -#: src/ingameop.cpp:531 +#: src/ingameop.cpp:191 +#: src/ingameop.cpp:527 #, fuzzy msgid "Tactical UI (Target Origin Icon): Hide" msgstr "Тактична UI (Іконка Походження Цілі): Приховати" -#: src/ingameop.cpp:277 -#: src/ingameop.cpp:502 -#: src/mission.cpp:2514 -#: src/mission.cpp:2633 +#: src/ingameop.cpp:274 +#: src/ingameop.cpp:498 +#: src/mission.cpp:2480 +#: src/mission.cpp:2599 msgid "Save Game" msgstr "Зберегти Гру" -#: src/ingameop.cpp:343 +#: src/ingameop.cpp:339 msgid "Host has quit the game!" msgstr "Хост покинув гру!" -#: src/ingameop.cpp:349 +#: src/ingameop.cpp:345 msgid "The game can't continue without the host." msgstr "Гра не може продовжуватись без хосту." -#: src/ingameop.cpp:355 +#: src/ingameop.cpp:351 msgid "--> QUIT <--" msgstr "--> ВИХІД <--" @@ -13460,52 +13460,52 @@ msgstr "Трясіння екрану при знищенні підрозділ msgid "Screen shake when things die: On" msgstr "Трясіння екрану при знищенні підрозділів: Задіяне" -#: src/keybind.cpp:2603 -#: src/keybind.cpp:2646 +#: src/keybind.cpp:2604 +#: src/keybind.cpp:2647 msgid "Sorry, but game speed cannot be changed in multiplayer." msgstr "На жаль, швидкість гри не можу бути змінена у мультиплеєрі." -#: src/keybind.cpp:2624 -#: src/keybind.cpp:2667 -#: src/keybind.cpp:2689 +#: src/keybind.cpp:2625 +#: src/keybind.cpp:2668 +#: src/keybind.cpp:2690 msgid "Game Speed Reset" msgstr "Швидкість Гри Нормалізовано" -#: src/keybind.cpp:2628 +#: src/keybind.cpp:2629 #, c-format msgid "Game Speed Increased to %3.1f" msgstr "Швидкість Гри Підвищено до %3.1f" -#: src/keybind.cpp:2671 +#: src/keybind.cpp:2672 #, c-format msgid "Game Speed Reduced to %3.1f" msgstr "Швидкість Гри Знижено до %3.1f" -#: src/keybind.cpp:2701 +#: src/keybind.cpp:2702 msgid "Radar showing friend-foe colors" msgstr "Радар показує кольори свій-чужий" -#: src/keybind.cpp:2705 +#: src/keybind.cpp:2706 msgid "Radar showing player colors" msgstr "Радар показує кольори гравців" -#: src/keybind.cpp:2726 +#: src/keybind.cpp:2727 msgid "Radar showing only objects" msgstr "Радар показує лише об’єкти" -#: src/keybind.cpp:2729 +#: src/keybind.cpp:2730 msgid "Radar blending terrain and height" msgstr "Радар відображає місцевість та рельєф" -#: src/keybind.cpp:2732 +#: src/keybind.cpp:2733 msgid "Radar showing terrain" msgstr "Радар показує місцевість" -#: src/keybind.cpp:2735 +#: src/keybind.cpp:2736 msgid "Radar showing revealed terrain" msgstr "Радар показує розвідану місцевість" -#: src/keybind.cpp:2738 +#: src/keybind.cpp:2739 msgid "Radar showing height" msgstr "Радар показує рельєф" @@ -13514,9 +13514,9 @@ msgid "KEY MAPPING" msgstr "ПРИЗНАЧЕННЯ КЛАВІШ" #: src/keyedit.cpp:372 -#: src/multiint.cpp:662 -#: src/multiint.cpp:1072 -#: src/multiint.cpp:1478 +#: src/multiint.cpp:671 +#: src/multiint.cpp:1081 +#: src/multiint.cpp:1487 msgid "Return To Previous Screen" msgstr "Повернутися До Попереднього Екрану" @@ -14023,37 +14023,37 @@ msgstr "Задіяти Відслідковувальну Камеру" msgid "Could not save game!" msgstr "Не вдалося зберегти гру!" -#: src/mission.cpp:2075 +#: src/mission.cpp:2041 msgid "Load Transport" msgstr "Завантажити Транспорт" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "ЗАВДАННЯ ВИКОНАНО за допомогою шахрайства!" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED" msgstr "ЗАВДАННЯ ВИКОНАНО" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED--and you cheated!" msgstr "ЗАВДАННЯ ПРОВАЛЕНЕ--шахрайство вам не допомогло!" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED" msgstr "ЗАВДАННЯ ПРОВАЛЕНЕ" -#: src/mission.cpp:2493 -#: src/mission.cpp:2533 -#: src/mission.cpp:2647 +#: src/mission.cpp:2459 +#: src/mission.cpp:2499 +#: src/mission.cpp:2613 msgid "Quit To Main Menu" msgstr "Вийти В Головне Меню" -#: src/mission.cpp:2501 +#: src/mission.cpp:2467 msgid "Continue Game" msgstr "Продовжити Гру" -#: src/mission.cpp:2598 +#: src/mission.cpp:2564 msgid "GAME SAVED :" msgstr "ГРУ ЗБЕРЕЖЕНО:" @@ -14112,347 +14112,352 @@ msgstr "%s Сформував Союз З %s" msgid "You Discover Blueprints For %s" msgstr "Ви Знайшли Креслення Для %s" -#: src/multiint.cpp:600 +#: src/multiint.cpp:609 #: src/multilimit.cpp:190 msgid "Accept Settings" msgstr "Прийняти Налаштування" -#: src/multiint.cpp:602 -#: src/multiint.cpp:1117 +#: src/multiint.cpp:611 +#: src/multiint.cpp:1126 msgid "Cancel" msgstr "Відмінити" -#: src/multiint.cpp:613 +#: src/multiint.cpp:622 msgid "IP Address or Machine Name" msgstr "IP Адреса або Ім’я Машини" -#: src/multiint.cpp:659 +#: src/multiint.cpp:668 msgid "CONNECTION" msgstr "З’ЄДНАННЯ" -#: src/multiint.cpp:664 +#: src/multiint.cpp:673 msgid "Lobby" msgstr "Лоббі" -#: src/multiint.cpp:665 +#: src/multiint.cpp:674 msgid "IP" msgstr "IP" -#: src/multiint.cpp:854 +#: src/multiint.cpp:863 msgid "No games are available" msgstr "Немає доступних ігор" -#: src/multiint.cpp:857 +#: src/multiint.cpp:866 msgid "Game is full" msgstr "Гра повна" -#: src/multiint.cpp:861 +#: src/multiint.cpp:870 msgid "You were kicked!" msgstr "Вас викинуто!" -#: src/multiint.cpp:864 +#: src/multiint.cpp:873 msgid "Wrong Game Version!" msgstr "Невірна Версія Гри!" -#: src/multiint.cpp:867 +#: src/multiint.cpp:876 msgid "You have an incompatible mod." msgstr "У вас несумісний мод." -#: src/multiint.cpp:871 +#: src/multiint.cpp:880 msgid "Host couldn't send file?" msgstr "Хост не зміг відправити файл?" -#: src/multiint.cpp:875 +#: src/multiint.cpp:884 msgid "Incorrect Password!" msgstr "Невірний Пароль!" -#: src/multiint.cpp:878 +#: src/multiint.cpp:887 msgid "Host has dropped connection!" msgstr "Хост обірвав з'єднання!" -#: src/multiint.cpp:882 +#: src/multiint.cpp:891 msgid "Connection Error" msgstr "Помилка З’єднання" -#: src/multiint.cpp:1012 +#: src/multiint.cpp:1021 msgid "Searching" msgstr "Пошук" -#: src/multiint.cpp:1069 +#: src/multiint.cpp:1078 msgid "GAMES" msgstr "ІГРИ" -#: src/multiint.cpp:1077 +#: src/multiint.cpp:1086 msgid "Refresh Games List" msgstr "Оновити Список Ігор" -#: src/multiint.cpp:1097 +#: src/multiint.cpp:1106 msgid "Enter Password:" msgstr "Введіть Пароль" -#: src/multiint.cpp:1115 +#: src/multiint.cpp:1124 msgid "OK" msgstr "ОК" -#: src/multiint.cpp:1232 +#: src/multiint.cpp:1241 msgid "Tanks disabled!!" msgstr "" -#: src/multiint.cpp:1233 +#: src/multiint.cpp:1242 #, fuzzy msgid "Cyborgs disabled." msgstr "Доступний Новий Кіборг" -#: src/multiint.cpp:1234 +#: src/multiint.cpp:1243 msgid "VTOLs disabled." msgstr "" -#: src/multiint.cpp:1281 -#: src/multiint.cpp:1288 +#: src/multiint.cpp:1290 +#: src/multiint.cpp:1297 msgid "Select Game Name" msgstr "Виберіть Ім’я Гри" -#: src/multiint.cpp:1281 +#: src/multiint.cpp:1290 msgid "One-Player Skirmish" msgstr "Сутичка для Одного Гравця" -#: src/multiint.cpp:1291 +#: src/multiint.cpp:1300 msgid "Select Map" msgstr "Оберіть Мапу" -#: src/multiint.cpp:1299 +#: src/multiint.cpp:1308 msgid "Click to set Password" msgstr "Натисніть аби встановити Пароль" -#: src/multiint.cpp:1309 -#: src/multiint.cpp:1310 +#: src/multiint.cpp:1318 +#: src/multiint.cpp:1319 msgid "Scavengers" msgstr "Звалищники" -#: src/multiint.cpp:1312 +#: src/multiint.cpp:1321 msgid "No Scavengers" msgstr "Без Звалищників" -#: src/multiint.cpp:1342 +#: src/multiint.cpp:1351 msgid "Select Player Name" msgstr "Виберіть Ім’я Гравця" -#: src/multiint.cpp:1348 +#: src/multiint.cpp:1357 msgid "Distance Fog" msgstr "Дальній Туман" -#: src/multiint.cpp:1359 +#: src/multiint.cpp:1368 #: src/multimenu.cpp:756 msgid "Alliances" msgstr "Союзи" -#: src/multiint.cpp:1362 +#: src/multiint.cpp:1371 msgid "No Alliances" msgstr "Без Союзів" -#: src/multiint.cpp:1364 +#: src/multiint.cpp:1373 msgid "Allow Alliances" msgstr "Союзи Дозволені" -#: src/multiint.cpp:1368 +#: src/multiint.cpp:1377 msgid "Locked Teams" msgstr "Закріплені Команди" -#: src/multiint.cpp:1394 +#: src/multiint.cpp:1403 msgid "Low Power Levels" msgstr "Низькі Рівні Енергії" -#: src/multiint.cpp:1396 +#: src/multiint.cpp:1405 msgid "Medium Power Levels" msgstr "Середні Рівні Енергії" -#: src/multiint.cpp:1398 +#: src/multiint.cpp:1407 msgid "High Power Levels" msgstr "Високі Рівні Енергії" -#: src/multiint.cpp:1430 +#: src/multiint.cpp:1439 msgid "Base" msgstr "База" -#: src/multiint.cpp:1432 +#: src/multiint.cpp:1441 msgid "Start with No Bases" msgstr "Старт без Баз" -#: src/multiint.cpp:1434 +#: src/multiint.cpp:1443 msgid "Start with Bases" msgstr "Старт з Базами" -#: src/multiint.cpp:1436 +#: src/multiint.cpp:1445 msgid "Start with Advanced Bases" msgstr "Старт з Розвиненими Базами" -#: src/multiint.cpp:1468 +#: src/multiint.cpp:1477 msgid "Map Preview" msgstr "Вигляд Мапи" -#: src/multiint.cpp:1470 +#: src/multiint.cpp:1479 msgid "Click to see Map" msgstr "Натисни, щоб побачити Мапу" -#: src/multiint.cpp:1484 +#: src/multiint.cpp:1493 msgid "Start Hosting Game" msgstr "Створити Гру" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 msgid "Show Structure Limits" msgstr "Показати Межу Кількості Будівель" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 msgid "Set Structure Limits" msgstr "Встановити Межу Кількості Будівель" -#: src/multiint.cpp:1587 +#: src/multiint.cpp:1596 msgid "DIFFICULTY" msgstr "" -#: src/multiint.cpp:1601 +#: src/multiint.cpp:1610 msgid "Less aggressive and starts with less units" msgstr "" -#: src/multiint.cpp:1602 +#: src/multiint.cpp:1611 #, fuzzy msgid "Plays nice" msgstr "Гравець" -#: src/multiint.cpp:1603 +#: src/multiint.cpp:1612 msgid "No holds barred" msgstr "" -#: src/multiint.cpp:1604 +#: src/multiint.cpp:1613 msgid "Starts with advantages and gets twice as much oil from derricks" msgstr "" -#: src/multiint.cpp:1632 +#: src/multiint.cpp:1641 msgid "CHOOSE AI" msgstr "" -#: src/multiint.cpp:1648 +#: src/multiint.cpp:1657 msgid "Allow human players to join in this slot" msgstr "" -#: src/multiint.cpp:1656 +#: src/multiint.cpp:1665 msgid "Leave this slot unused" msgstr "" -#: src/multiint.cpp:1736 +#: src/multiint.cpp:1745 msgid "Player colour" msgstr "Колір гравця" -#: src/multiint.cpp:2062 +#: src/multiint.cpp:2071 msgid "Team" msgstr "Команда" -#: src/multiint.cpp:2074 +#: src/multiint.cpp:2083 msgid "Kick player" msgstr "Викинути гравця" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 #, fuzzy msgid "Click to change difficulty" msgstr "Натисніть аби встановити Пароль" -#: src/multiint.cpp:2121 +#: src/multiint.cpp:2130 msgid "Click when ready" msgstr "Натисни, коли готовий" -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2134 msgid "READY?" msgstr "ГОТОВІ?" -#: src/multiint.cpp:2169 +#: src/multiint.cpp:2178 msgid "PLAYERS" msgstr "ГРАВЦІ" -#: src/multiint.cpp:2204 +#: src/multiint.cpp:2213 #, fuzzy msgid "Click to change to this slot" msgstr "Натисніть аби встановити Пароль" -#: src/multiint.cpp:2232 +#: src/multiint.cpp:2241 #, fuzzy msgid "Choose Team" msgstr "Закріплені Команди" -#: src/multiint.cpp:2262 +#: src/multiint.cpp:2271 #, fuzzy msgid "Click to change player colour" msgstr "Радар показує кольори гравців" -#: src/multiint.cpp:2290 +#: src/multiint.cpp:2299 #, fuzzy msgid "Click to change player position" msgstr "Охороняти Позицію" -#: src/multiint.cpp:2296 +#: src/multiint.cpp:2305 #, fuzzy msgid "Click to change AI" msgstr "Натисніть аби встановити Пароль" -#: src/multiint.cpp:2300 +#: src/multiint.cpp:2309 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2362 +#: src/multiint.cpp:2371 msgid "CHAT" msgstr "ЧАТ" -#: src/multiint.cpp:2394 +#: src/multiint.cpp:2403 msgid "All players need to have the same mods to join your game." msgstr "Всі гравці повинні мати однакові моди щоб приєднатись до гри." -#: src/multiint.cpp:2552 +#: src/multiint.cpp:2561 #, fuzzy, c-format msgid "*** password [%s] is now required! ***" msgstr "*** зараз потрібен пароль! ***" -#: src/multiint.cpp:2560 +#: src/multiint.cpp:2569 msgid "*** password is NOT required! ***" msgstr "*** пароль НЕ потрібен! ***" -#: src/multiint.cpp:2801 +#: src/multiint.cpp:2810 msgid "Sorry! Failed to host the game." msgstr "Вибачте! Не далося створити гру." -#: src/multiint.cpp:2922 +#: src/multiint.cpp:2931 msgid "'Locked Teams' mode enabled" msgstr "'Закріплені Команди' режим активовано" -#: src/multiint.cpp:3003 +#: src/multiint.cpp:3012 #, c-format msgid "The host has kicked %s from the game!" msgstr "Хост викинув %s з гри!" -#: src/multiint.cpp:3073 +#: src/multiint.cpp:3082 msgid "Host is Starting Game" msgstr "Хост Починає Гру" -#: src/multiint.cpp:3639 +#: src/multiint.cpp:3648 msgid "Players" msgstr "Гравці" -#: src/multiint.cpp:3772 +#: src/multiint.cpp:3786 #, c-format msgid "Sending Map: %d%% " msgstr "Відправляється Карта: %d%% " -#: src/multiint.cpp:3780 +#: src/multiint.cpp:3794 #, c-format msgid "Map: %d%% downloaded" msgstr "Мапа: %d%% завантажена" -#: src/multiint.cpp:3803 +#: src/multiint.cpp:3820 msgid "HOST" msgstr "ХОСТ" +#: src/multiint.cpp:3827 +#: src/multimenu.cpp:772 +msgid "Ping" +msgstr "Пінг" + #: src/multijoin.cpp:100 #: src/multijoin.cpp:101 msgid "Players Still Joining" @@ -14468,17 +14473,17 @@ msgstr "%s покинув Гру" msgid "File transfer has been aborted for %d." msgstr "Передача файлу була перервана для %d." -#: src/multijoin.cpp:376 +#: src/multijoin.cpp:373 #, c-format msgid "%s (%u) has an incompatible mod, and has been kicked." msgstr "%s (%u) має несумісний мод, отже був викинутий." -#: src/multijoin.cpp:415 +#: src/multijoin.cpp:412 #, c-format msgid "%s is Joining the Game" msgstr "%s Приєднався до Гри" -#: src/multijoin.cpp:425 +#: src/multijoin.cpp:422 msgid "System message:" msgstr "Повідомлення системи:" @@ -14591,10 +14596,6 @@ msgstr "Вбивства" msgid "Units" msgstr "Підрозділи" -#: src/multimenu.cpp:772 -msgid "Ping" -msgstr "Пінг" - #: src/multimenu.cpp:776 msgid "Structs" msgstr "Будівлі" @@ -14628,83 +14629,83 @@ msgstr "Надати Енергію Гравцю" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "Викидуємо гравця %s, тому що він намагався обійти перевірку цілісності даних!" -#: src/multiplay.cpp:1146 +#: src/multiplay.cpp:1057 msgid "(allies" msgstr "(союзники" -#: src/multiplay.cpp:1154 +#: src/multiplay.cpp:1065 msgid "(private to " msgstr "(приватно до" -#: src/multiplay.cpp:1167 +#: src/multiplay.cpp:1078 msgid "[invalid]" msgstr "[невірний]" -#: src/multiplay.cpp:2057 +#: src/multiplay.cpp:1942 msgid "Green" msgstr "Зелений" -#: src/multiplay.cpp:2058 +#: src/multiplay.cpp:1943 msgid "Orange" msgstr "Помаранчовий" -#: src/multiplay.cpp:2059 +#: src/multiplay.cpp:1944 msgid "Grey" msgstr "Сірий" -#: src/multiplay.cpp:2060 +#: src/multiplay.cpp:1945 msgid "Black" msgstr "Чорний" -#: src/multiplay.cpp:2061 +#: src/multiplay.cpp:1946 msgid "Red" msgstr "Червоний" -#: src/multiplay.cpp:2062 +#: src/multiplay.cpp:1947 msgid "Blue" msgstr "Синій" -#: src/multiplay.cpp:2063 +#: src/multiplay.cpp:1948 msgid "Pink" msgstr "Рожевий" -#: src/multiplay.cpp:2064 +#: src/multiplay.cpp:1949 msgid "Cyan" msgstr "Блакитний" -#: src/multiplay.cpp:2065 +#: src/multiplay.cpp:1950 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:2066 +#: src/multiplay.cpp:1951 msgid "Purple" msgstr "" -#: src/multiplay.cpp:2067 +#: src/multiplay.cpp:1952 msgid "White" msgstr "" -#: src/multiplay.cpp:2068 +#: src/multiplay.cpp:1953 msgid "Bright blue" msgstr "" -#: src/multiplay.cpp:2069 +#: src/multiplay.cpp:1954 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:2070 +#: src/multiplay.cpp:1955 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:2071 +#: src/multiplay.cpp:1956 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:2072 +#: src/multiplay.cpp:1957 msgid "Brown" msgstr "" -#: src/order.cpp:841 +#: src/order.cpp:800 msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "" @@ -14839,20 +14840,20 @@ msgstr "Повний Час Гри - %s" msgid "You cheated!" msgstr "Ви застосували шахрайство!" -#: src/scriptfuncs.cpp:3250 +#: src/scriptfuncs.cpp:3287 msgid "YOU ARE VICTORIOUS!" msgstr "ВИ ПЕРЕМОГЛИ!" -#: src/scriptfuncs.cpp:3254 +#: src/scriptfuncs.cpp:3291 msgid "YOU WERE DEFEATED!" msgstr "ВИ ЗАЗНАЛИ ПОРАЗКИ!" -#: src/scriptfuncs.cpp:9500 +#: src/scriptfuncs.cpp:9537 #, c-format msgid "Beacon received from %s!" msgstr "Отримано Сигнал від %s!" -#: src/scriptfuncs.cpp:9546 +#: src/scriptfuncs.cpp:9583 #, c-format msgid "Beacon %d" msgstr "Сигнал %d" @@ -14881,63 +14882,63 @@ msgstr "Не можу знайти жодного Сенсорного Підр msgid "Unable to locate any Commanders!" msgstr "Не можу знайти жодного Командира!" -#: src/structure.cpp:2615 +#: src/structure.cpp:2614 #, fuzzy msgid "Command Control Limit Reached - Production Halted" msgstr "Досягнуто Межі Контролю - Виробництво Призупинене" -#: src/structure.cpp:5815 -#: src/structure.cpp:5840 +#: src/structure.cpp:5806 +#: src/structure.cpp:5831 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" msgstr[0] "%s - %u Підрозділ закріплено" msgstr[1] "%s - %u Підрозділи закріплено" -#: src/structure.cpp:5845 -#: src/structure.cpp:5913 -#: src/structure.cpp:5929 -#: src/structure.cpp:5943 +#: src/structure.cpp:5836 +#: src/structure.cpp:5904 +#: src/structure.cpp:5920 +#: src/structure.cpp:5934 #, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - Пошкоджено %3.0f%%" -#: src/structure.cpp:5895 +#: src/structure.cpp:5886 #, c-format msgid "%s - Connected %u of %u" msgstr "%s - Під'єднано %u з %u" -#: src/structure.cpp:6059 -#: src/structure.cpp:6104 +#: src/structure.cpp:6050 +#: src/structure.cpp:6095 #, c-format msgid "%s - Electronically Damaged" msgstr "%s - Електронних Ушкоджень" -#: src/structure.cpp:6341 +#: src/structure.cpp:6332 msgid "Electronic Reward - Visibility Report" msgstr "Електронна Винагорода - Звіт про Зону Видимості" -#: src/structure.cpp:6381 +#: src/structure.cpp:6372 msgid "Factory Reward - Propulsion" msgstr "Винагорода Фабрики - Ходова" -#: src/structure.cpp:6405 +#: src/structure.cpp:6396 msgid "Factory Reward - Body" msgstr "Винагорода Фабрики - Корпус" -#: src/structure.cpp:6429 +#: src/structure.cpp:6420 msgid "Factory Reward - Weapon" msgstr "Винагорода Фабрики - Озброєння" -#: src/structure.cpp:6438 +#: src/structure.cpp:6429 msgid "Factory Reward - Nothing" msgstr "Винагорода Фабрики - Нічого" -#: src/structure.cpp:6466 +#: src/structure.cpp:6457 msgid "Repair Facility Award - Repair" msgstr "Винагорода Ремонтної Майстерні - Ремонт" -#: src/structure.cpp:6473 +#: src/structure.cpp:6464 msgid "Repair Facility Award - Nothing" msgstr "Винагорода Ремонтної Майстерні - Нічого" diff --git a/po/zh_CN.po b/po/zh_CN.po index 4a70d03c3..ed3f8aa70 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-01-18 00:54+0100\n" +"POT-Creation-Date: 2011-02-25 23:35+0100\n" "PO-Revision-Date: 2009-05-13 16:12+0800\n" "Last-Translator: Terra \n" "Language-Team: Simplified Chinese \n" @@ -5733,7 +5733,7 @@ msgid "New Design" msgstr "设计新的单位" #: data/base/messages/strings/names.txt:15 -#: src/design.cpp:1313 +#: src/design.cpp:1275 msgid "Transport" msgstr "运送" @@ -12149,26 +12149,26 @@ msgid "System locale" msgstr "系统语言" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1043 +#: lib/netplay/netplay.cpp:1042 msgid "Enter password here" msgstr "" -#: lib/netplay/netplay.cpp:2048 +#: lib/netplay/netplay.cpp:2060 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "" -#: lib/netplay/netplay.cpp:2062 +#: lib/netplay/netplay.cpp:2082 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "" #: src/challenge.cpp:184 -#: src/hci.cpp:922 -#: src/hci.cpp:3390 -#: src/hci.cpp:3513 -#: src/hci.cpp:3924 -#: src/hci.cpp:4942 +#: src/hci.cpp:916 +#: src/hci.cpp:3378 +#: src/hci.cpp:3501 +#: src/hci.cpp:3912 +#: src/hci.cpp:4930 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12321,149 +12321,149 @@ msgstr "" #: src/configuration.cpp:393 #: src/configuration.cpp:394 -#: src/multistat.cpp:130 +#: src/multistat.cpp:124 msgid "Player" msgstr "玩家" -#: src/design.cpp:449 -#: src/design.cpp:469 -#: src/design.cpp:3501 +#: src/design.cpp:443 +#: src/design.cpp:455 +#: src/design.cpp:3464 msgid "New Vehicle" msgstr "设计新单位" -#: src/design.cpp:515 +#: src/design.cpp:500 msgid "Vehicle Body" msgstr "车体" -#: src/design.cpp:535 +#: src/design.cpp:520 msgid "Vehicle Propulsion" msgstr "驱动" -#: src/design.cpp:556 -#: src/design.cpp:579 -#: src/design.cpp:603 +#: src/design.cpp:541 +#: src/design.cpp:564 +#: src/design.cpp:588 msgid "Vehicle Turret" msgstr "炮塔" -#: src/design.cpp:622 +#: src/design.cpp:607 msgid "Delete Design" msgstr "删除设计图" -#: src/design.cpp:673 -#: src/design.cpp:720 +#: src/design.cpp:658 +#: src/design.cpp:705 msgid "Kinetic Armour" msgstr "动能防护力" -#: src/design.cpp:682 -#: src/design.cpp:730 +#: src/design.cpp:667 +#: src/design.cpp:715 msgid "Thermal Armour" msgstr "热能防护力" -#: src/design.cpp:698 -#: src/design.cpp:750 +#: src/design.cpp:683 +#: src/design.cpp:735 msgid "Engine Output" msgstr "发动机输出功率" -#: src/design.cpp:706 -#: src/design.cpp:759 -#: src/design.cpp:1529 -#: src/design.cpp:1553 -#: src/design.cpp:1574 -#: src/design.cpp:1590 -#: src/design.cpp:1610 -#: src/design.cpp:1627 -#: src/design.cpp:1647 -#: src/design.cpp:1664 -#: src/design.cpp:1705 -#: src/design.cpp:1737 -#: src/design.cpp:1869 -#: src/design.cpp:1885 -#: src/design.cpp:1923 -#: src/design.cpp:1956 +#: src/design.cpp:691 +#: src/design.cpp:744 +#: src/design.cpp:1486 +#: src/design.cpp:1510 +#: src/design.cpp:1531 +#: src/design.cpp:1547 +#: src/design.cpp:1567 +#: src/design.cpp:1584 +#: src/design.cpp:1604 +#: src/design.cpp:1621 +#: src/design.cpp:1662 +#: src/design.cpp:1694 +#: src/design.cpp:1826 +#: src/design.cpp:1842 +#: src/design.cpp:1880 +#: src/design.cpp:1913 msgid "Weight" msgstr "重量" -#: src/design.cpp:790 -#: src/design.cpp:808 +#: src/design.cpp:775 +#: src/design.cpp:793 msgid "Total Power Required" msgstr "总体能源需求" -#: src/design.cpp:821 -#: src/design.cpp:840 +#: src/design.cpp:806 +#: src/design.cpp:825 msgid "Total Body Points" msgstr "总体成本" -#: src/design.cpp:1027 -#: src/design.cpp:1059 +#: src/design.cpp:996 +#: src/design.cpp:1025 msgid "Power Usage" msgstr "能源占用" -#: src/design.cpp:1335 +#: src/design.cpp:1298 msgid "Hydra " msgstr "" -#: src/design.cpp:1509 -#: src/design.cpp:1537 +#: src/design.cpp:1466 +#: src/design.cpp:1494 msgid "Sensor Range" msgstr "传感器半径" -#: src/design.cpp:1521 -#: src/design.cpp:1545 +#: src/design.cpp:1478 +#: src/design.cpp:1502 msgid "Sensor Power" msgstr "传感器能源" -#: src/design.cpp:1566 -#: src/design.cpp:1582 +#: src/design.cpp:1523 +#: src/design.cpp:1539 msgid "ECM Power" msgstr "ECM 能源" -#: src/design.cpp:1602 -#: src/design.cpp:1619 -#: src/design.cpp:1639 -#: src/design.cpp:1656 +#: src/design.cpp:1559 +#: src/design.cpp:1576 +#: src/design.cpp:1596 +#: src/design.cpp:1613 msgid "Build Points" msgstr "生产成本" -#: src/design.cpp:1677 -#: src/design.cpp:1713 +#: src/design.cpp:1634 +#: src/design.cpp:1670 msgid "Range" msgstr "攻击范围" -#: src/design.cpp:1689 -#: src/design.cpp:1721 +#: src/design.cpp:1646 +#: src/design.cpp:1678 msgid "Damage" msgstr "攻击力" -#: src/design.cpp:1697 -#: src/design.cpp:1729 +#: src/design.cpp:1654 +#: src/design.cpp:1686 msgid "Rate-of-Fire" msgstr "火力评估" -#: src/design.cpp:1857 -#: src/design.cpp:1877 +#: src/design.cpp:1814 +#: src/design.cpp:1834 msgid "Air Speed" msgstr "飞行移动速度" -#: src/design.cpp:1895 -#: src/design.cpp:1932 +#: src/design.cpp:1852 +#: src/design.cpp:1889 msgid "Road Speed" msgstr "公路移动速度" -#: src/design.cpp:1905 -#: src/design.cpp:1940 +#: src/design.cpp:1862 +#: src/design.cpp:1897 msgid "Off-Road Speed" msgstr "野地移动速度" -#: src/design.cpp:1913 -#: src/design.cpp:1948 +#: src/design.cpp:1870 +#: src/design.cpp:1905 msgid "Water Speed" msgstr "水面移动速度" -#: src/design.cpp:2074 +#: src/design.cpp:2031 msgid "Weapons" msgstr "武器" -#: src/design.cpp:2094 +#: src/design.cpp:2051 msgid "Systems" msgstr "系统" @@ -12478,7 +12478,7 @@ msgid "Player dropped" msgstr "玩家" #: src/display3d.cpp:599 -#: src/multiint.cpp:2116 +#: src/multiint.cpp:2125 msgid "Waiting for other players" msgstr "等待其他玩家" @@ -12486,115 +12486,115 @@ msgstr "等待其他玩家" msgid "Out of sync" msgstr "" -#: src/display.cpp:1651 +#: src/display.cpp:1649 msgid "Cannot Build. Oil Resource Burning." msgstr "油井在燃烧, 无法建造钻油塔" -#: src/display.cpp:1830 -#: src/display.cpp:2423 +#: src/display.cpp:1828 +#: src/display.cpp:2421 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - 损伤 %d%% - 经验 %d, %s" -#: src/display.cpp:1846 +#: src/display.cpp:1844 #, fuzzy, c-format msgid "%s - Allied - Damage %d%% - Experience %d, %s" msgstr "%s - 损伤 %d%% - 经验 %d, %s" -#: src/display.cpp:2044 +#: src/display.cpp:2042 msgid "Truck ordered to build Oil Derrick" msgstr "命令工程车建造钻油塔" -#: src/display.cpp:2045 +#: src/display.cpp:2043 #, fuzzy msgid "2 trucks ordered to build Oil Derrick" msgstr "命令工程车建造钻油塔" -#: src/display.cpp:2046 +#: src/display.cpp:2044 #, fuzzy, c-format msgid "%d trucks ordered to build Oil Derrick" msgstr "命令工程车建造钻油塔" -#: src/droid.cpp:208 +#: src/droid.cpp:211 msgid "Unit Lost!" msgstr "单位被摧毁! " -#: src/droid.cpp:1370 +#: src/droid.cpp:1376 msgid "Structure Restored" msgstr "重建建筑物" -#: src/droid.cpp:2712 +#: src/droid.cpp:2732 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" msgstr[0] "已选择 %u 号编队 - %u 单位" -#: src/droid.cpp:2725 +#: src/droid.cpp:2745 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" msgstr[0] "%u 单位已指派为 %u 号编队" -#: src/droid.cpp:2738 +#: src/droid.cpp:2758 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" msgstr[0] "移动视野中心到 %u 号编队 - %u 单位" -#: src/droid.cpp:2742 +#: src/droid.cpp:2762 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:3080 +#: src/droid.cpp:3093 #, fuzzy msgid "Rookie" msgstr "新兵部队: %u" -#: src/droid.cpp:3081 +#: src/droid.cpp:3094 #, fuzzy msgctxt "rank" msgid "Green" msgstr "绿色" -#: src/droid.cpp:3082 +#: src/droid.cpp:3095 #, fuzzy msgid "Trained" msgstr "作训部队: %u" -#: src/droid.cpp:3083 +#: src/droid.cpp:3096 #, fuzzy msgid "Regular" msgstr "标准部队: %u" -#: src/droid.cpp:3084 +#: src/droid.cpp:3097 msgid "Professional" msgstr "专业部队" -#: src/droid.cpp:3085 +#: src/droid.cpp:3098 msgid "Veteran" msgstr "老兵部队" -#: src/droid.cpp:3086 +#: src/droid.cpp:3099 msgid "Elite" msgstr "精锐部队" -#: src/droid.cpp:3087 +#: src/droid.cpp:3100 msgid "Special" msgstr "特种部队" -#: src/droid.cpp:3088 +#: src/droid.cpp:3101 msgid "Hero" msgstr "英雄部队" -#: src/droid.cpp:4110 +#: src/droid.cpp:4123 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "" -#: src/droid.cpp:4114 +#: src/droid.cpp:4127 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "" @@ -12613,7 +12613,7 @@ msgid "Tutorial" msgstr "游戏教程" #: src/frontend.cpp:100 -#: src/hci.cpp:3499 +#: src/hci.cpp:3487 msgid "Options" msgstr "选项设置" @@ -12665,7 +12665,7 @@ msgid "Challenges" msgstr "" #: src/frontend.cpp:215 -#: src/ingameop.cpp:275 +#: src/ingameop.cpp:272 msgid "Load Game" msgstr "载入游戏" @@ -12674,9 +12674,9 @@ msgid "SINGLE PLAYER" msgstr "单人游戏" #: src/frontend.cpp:303 -#: src/ingameop.cpp:498 -#: src/mission.cpp:2527 -#: src/mission.cpp:2630 +#: src/ingameop.cpp:494 +#: src/mission.cpp:2493 +#: src/mission.cpp:2596 msgid "Load Saved Game" msgstr "载入游戏" @@ -12693,7 +12693,7 @@ msgid "Join Game" msgstr "加入游戏" #: src/frontend.cpp:422 -#: src/multiint.cpp:1276 +#: src/multiint.cpp:1285 msgid "OPTIONS" msgstr "选项" @@ -12710,7 +12710,7 @@ msgid "Video Options" msgstr "视频选项" #: src/frontend.cpp:426 -#: src/ingameop.cpp:270 +#: src/ingameop.cpp:267 msgid "Audio Options" msgstr "音频选项" @@ -12789,7 +12789,7 @@ msgid "Off" msgstr "关" #: src/frontend.cpp:523 -#: src/multiint.cpp:1345 +#: src/multiint.cpp:1354 msgid "Fog" msgstr "迷雾" @@ -12800,7 +12800,7 @@ msgstr "薄雾（可以看见地形）" #: src/frontend.cpp:530 #: src/frontend.cpp:595 -#: src/multiint.cpp:1347 +#: src/multiint.cpp:1356 msgid "Fog Of War" msgstr "战争迷雾" @@ -12966,202 +12966,202 @@ msgid "GAME OPTIONS" msgstr "游戏选项" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2389 +#: src/multiint.cpp:2398 msgid "Mod: " msgstr "" -#: src/hci.cpp:1245 +#: src/hci.cpp:1237 #, fuzzy msgid "MAP SAVED!" msgstr "游戏已保存! " -#: src/hci.cpp:1584 +#: src/hci.cpp:1573 #: src/loop.cpp:558 #: src/loop.cpp:574 #, fuzzy msgid "GAME SAVED: " msgstr "游戏已保存! " -#: src/hci.cpp:1971 +#: src/hci.cpp:1960 msgid "Failed to create building" msgstr "" -#: src/hci.cpp:1988 +#: src/hci.cpp:1977 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new structure: %s." msgstr "" -#: src/hci.cpp:2003 +#: src/hci.cpp:1992 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new feature: %s." msgstr "" -#: src/hci.cpp:2025 +#: src/hci.cpp:2014 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid: %s." msgstr "" -#: src/hci.cpp:2036 +#: src/hci.cpp:2025 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "" -#: src/hci.cpp:3310 +#: src/hci.cpp:3298 msgid "Commanders (F6)" msgstr "指挥官 (F6)" -#: src/hci.cpp:3323 +#: src/hci.cpp:3311 msgid "Intelligence Display (F5)" msgstr "情报显示 (F5)" -#: src/hci.cpp:3336 +#: src/hci.cpp:3324 msgid "Manufacture (F1)" msgstr "单位生产 (F1)" -#: src/hci.cpp:3349 +#: src/hci.cpp:3337 msgid "Design (F4)" msgstr "单位设计 (F4)" -#: src/hci.cpp:3362 +#: src/hci.cpp:3350 msgid "Research (F2)" msgstr "科技研究 (F2)" -#: src/hci.cpp:3375 +#: src/hci.cpp:3363 msgid "Build (F3)" msgstr "建造建筑 (F3)" -#: src/hci.cpp:3446 -#: src/multiint.cpp:1392 +#: src/hci.cpp:3434 +#: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "能源" -#: src/hci.cpp:3537 +#: src/hci.cpp:3525 msgid "Map:" msgstr "" -#: src/hci.cpp:3550 +#: src/hci.cpp:3538 #, fuzzy msgid "Load" msgstr "载入游戏" -#: src/hci.cpp:3551 +#: src/hci.cpp:3539 #, fuzzy msgid "Load Map File" msgstr "载入游戏" -#: src/hci.cpp:3558 +#: src/hci.cpp:3546 #, fuzzy msgid "Save" msgstr "保存游戏" -#: src/hci.cpp:3559 +#: src/hci.cpp:3547 #, fuzzy msgid "Save Map File" msgstr "保存游戏" -#: src/hci.cpp:3567 +#: src/hci.cpp:3555 msgid "New" msgstr "" -#: src/hci.cpp:3568 +#: src/hci.cpp:3556 msgid "New Blank Map" msgstr "" -#: src/hci.cpp:3604 +#: src/hci.cpp:3592 msgid "Tile" msgstr "" -#: src/hci.cpp:3605 +#: src/hci.cpp:3593 msgid "Place tiles on map" msgstr "" -#: src/hci.cpp:3614 +#: src/hci.cpp:3602 msgid "Unit" msgstr "单位" -#: src/hci.cpp:3615 +#: src/hci.cpp:3603 msgid "Place Unit on map" msgstr "" -#: src/hci.cpp:3623 +#: src/hci.cpp:3611 msgid "Struct" msgstr "" -#: src/hci.cpp:3624 +#: src/hci.cpp:3612 msgid "Place Structures on map" msgstr "" -#: src/hci.cpp:3632 +#: src/hci.cpp:3620 msgid "Feat" msgstr "" -#: src/hci.cpp:3633 +#: src/hci.cpp:3621 msgid "Place Features on map" msgstr "" -#: src/hci.cpp:3643 +#: src/hci.cpp:3631 msgid "Pause" msgstr "" -#: src/hci.cpp:3644 +#: src/hci.cpp:3632 #, fuzzy msgid "Pause or unpause the game" msgstr "暂停/继续游戏" -#: src/hci.cpp:3658 +#: src/hci.cpp:3646 msgid "Align height of all map objects" msgstr "" -#: src/hci.cpp:3668 +#: src/hci.cpp:3656 msgid "Edit" msgstr "" -#: src/hci.cpp:3669 +#: src/hci.cpp:3657 #, fuzzy msgid "Start Edit Mode" msgstr "开始时没有基地" -#: src/hci.cpp:3683 +#: src/hci.cpp:3671 #: src/ingameop.cpp:112 -#: src/ingameop.cpp:258 -#: src/ingameop.cpp:263 +#: src/ingameop.cpp:256 +#: src/ingameop.cpp:260 msgid "Quit" msgstr "退出" -#: src/hci.cpp:3684 +#: src/hci.cpp:3672 msgid "Exit Game" msgstr "退出游戏" -#: src/hci.cpp:3710 +#: src/hci.cpp:3698 #, fuzzy msgid "Current Player:" msgstr "多人游戏" -#: src/hci.cpp:4001 +#: src/hci.cpp:3989 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "进度条" -#: src/hci.cpp:4867 +#: src/hci.cpp:4855 msgid "Factory Delivery Point" msgstr "" -#: src/hci.cpp:4885 +#: src/hci.cpp:4873 msgid "Loop Production" msgstr "循环生产" -#: src/hci.cpp:4965 +#: src/hci.cpp:4953 msgid "Tab Scroll left" msgstr "" -#: src/hci.cpp:4980 +#: src/hci.cpp:4968 msgid "Tab Scroll right" msgstr "" #: src/ingameop.cpp:111 -#: src/ingameop.cpp:193 -#: src/ingameop.cpp:267 +#: src/ingameop.cpp:195 +#: src/ingameop.cpp:264 msgid "Resume Game" msgstr "继续游戏" @@ -13169,33 +13169,33 @@ msgstr "继续游戏" msgid "WARNING: You're the host. If you quit, the game ends for everyone!" msgstr "" -#: src/ingameop.cpp:185 -#: src/ingameop.cpp:527 +#: src/ingameop.cpp:186 +#: src/ingameop.cpp:523 msgid "Tactical UI (Target Origin Icon): Show" msgstr "" -#: src/ingameop.cpp:190 -#: src/ingameop.cpp:531 +#: src/ingameop.cpp:191 +#: src/ingameop.cpp:527 msgid "Tactical UI (Target Origin Icon): Hide" msgstr "" -#: src/ingameop.cpp:277 -#: src/ingameop.cpp:502 -#: src/mission.cpp:2514 -#: src/mission.cpp:2633 +#: src/ingameop.cpp:274 +#: src/ingameop.cpp:498 +#: src/mission.cpp:2480 +#: src/mission.cpp:2599 msgid "Save Game" msgstr "保存游戏" -#: src/ingameop.cpp:343 +#: src/ingameop.cpp:339 #, fuzzy msgid "Host has quit the game!" msgstr "主机已经离开了游戏! " -#: src/ingameop.cpp:349 +#: src/ingameop.cpp:345 msgid "The game can't continue without the host." msgstr "" -#: src/ingameop.cpp:355 +#: src/ingameop.cpp:351 msgid "--> QUIT <--" msgstr "" @@ -13573,53 +13573,53 @@ msgstr "" msgid "Screen shake when things die: On" msgstr "" -#: src/keybind.cpp:2603 -#: src/keybind.cpp:2646 +#: src/keybind.cpp:2604 +#: src/keybind.cpp:2647 #, fuzzy msgid "Sorry, but game speed cannot be changed in multiplayer." msgstr "抱歉, 多人游戏时无法使用作弊码" -#: src/keybind.cpp:2624 -#: src/keybind.cpp:2667 -#: src/keybind.cpp:2689 +#: src/keybind.cpp:2625 +#: src/keybind.cpp:2668 +#: src/keybind.cpp:2690 msgid "Game Speed Reset" msgstr "" -#: src/keybind.cpp:2628 +#: src/keybind.cpp:2629 #, c-format msgid "Game Speed Increased to %3.1f" msgstr "" -#: src/keybind.cpp:2671 +#: src/keybind.cpp:2672 #, c-format msgid "Game Speed Reduced to %3.1f" msgstr "" -#: src/keybind.cpp:2701 +#: src/keybind.cpp:2702 msgid "Radar showing friend-foe colors" msgstr "" -#: src/keybind.cpp:2705 +#: src/keybind.cpp:2706 msgid "Radar showing player colors" msgstr "" -#: src/keybind.cpp:2726 +#: src/keybind.cpp:2727 msgid "Radar showing only objects" msgstr "" -#: src/keybind.cpp:2729 +#: src/keybind.cpp:2730 msgid "Radar blending terrain and height" msgstr "" -#: src/keybind.cpp:2732 +#: src/keybind.cpp:2733 msgid "Radar showing terrain" msgstr "" -#: src/keybind.cpp:2735 +#: src/keybind.cpp:2736 msgid "Radar showing revealed terrain" msgstr "" -#: src/keybind.cpp:2738 +#: src/keybind.cpp:2739 msgid "Radar showing height" msgstr "" @@ -13628,9 +13628,9 @@ msgid "KEY MAPPING" msgstr "按键设置" #: src/keyedit.cpp:372 -#: src/multiint.cpp:662 -#: src/multiint.cpp:1072 -#: src/multiint.cpp:1478 +#: src/multiint.cpp:671 +#: src/multiint.cpp:1081 +#: src/multiint.cpp:1487 msgid "Return To Previous Screen" msgstr "返回到前一个屏幕" @@ -14126,39 +14126,39 @@ msgstr "" msgid "Could not save game!" msgstr "载入游戏" -#: src/mission.cpp:2075 +#: src/mission.cpp:2041 msgid "Load Transport" msgstr "登陆运输飞船" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 #, fuzzy msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "任务目标完成" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED" msgstr "任务目标完成" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 #, fuzzy msgid "OBJECTIVE FAILED--and you cheated!" msgstr "任务目标失败" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED" msgstr "任务目标失败" -#: src/mission.cpp:2493 -#: src/mission.cpp:2533 -#: src/mission.cpp:2647 +#: src/mission.cpp:2459 +#: src/mission.cpp:2499 +#: src/mission.cpp:2613 msgid "Quit To Main Menu" msgstr "退回到主菜单" -#: src/mission.cpp:2501 +#: src/mission.cpp:2467 msgid "Continue Game" msgstr "继续游戏" -#: src/mission.cpp:2598 +#: src/mission.cpp:2564 #, fuzzy msgid "GAME SAVED :" msgstr "游戏已保存! " @@ -14218,353 +14218,358 @@ msgstr "" msgid "You Discover Blueprints For %s" msgstr "" -#: src/multiint.cpp:600 +#: src/multiint.cpp:609 #: src/multilimit.cpp:190 msgid "Accept Settings" msgstr "确认设置" -#: src/multiint.cpp:602 -#: src/multiint.cpp:1117 +#: src/multiint.cpp:611 +#: src/multiint.cpp:1126 #, fuzzy msgid "Cancel" msgstr "青绿色" -#: src/multiint.cpp:613 +#: src/multiint.cpp:622 msgid "IP Address or Machine Name" msgstr "IP地址或计算机名称" -#: src/multiint.cpp:659 +#: src/multiint.cpp:668 msgid "CONNECTION" msgstr "连接" -#: src/multiint.cpp:664 +#: src/multiint.cpp:673 msgid "Lobby" msgstr "游戏大厅" -#: src/multiint.cpp:665 +#: src/multiint.cpp:674 msgid "IP" msgstr "IP直连" -#: src/multiint.cpp:854 +#: src/multiint.cpp:863 msgid "No games are available" msgstr "" -#: src/multiint.cpp:857 +#: src/multiint.cpp:866 msgid "Game is full" msgstr "" -#: src/multiint.cpp:861 +#: src/multiint.cpp:870 msgid "You were kicked!" msgstr "" -#: src/multiint.cpp:864 +#: src/multiint.cpp:873 msgid "Wrong Game Version!" msgstr "" -#: src/multiint.cpp:867 +#: src/multiint.cpp:876 msgid "You have an incompatible mod." msgstr "" -#: src/multiint.cpp:871 +#: src/multiint.cpp:880 msgid "Host couldn't send file?" msgstr "" -#: src/multiint.cpp:875 +#: src/multiint.cpp:884 msgid "Incorrect Password!" msgstr "" -#: src/multiint.cpp:878 +#: src/multiint.cpp:887 msgid "Host has dropped connection!" msgstr "" -#: src/multiint.cpp:882 +#: src/multiint.cpp:891 msgid "Connection Error" msgstr "" -#: src/multiint.cpp:1012 +#: src/multiint.cpp:1021 msgid "Searching" msgstr "正在搜索" -#: src/multiint.cpp:1069 +#: src/multiint.cpp:1078 msgid "GAMES" msgstr "游戏" -#: src/multiint.cpp:1077 +#: src/multiint.cpp:1086 msgid "Refresh Games List" msgstr "刷新游戏列表" -#: src/multiint.cpp:1097 +#: src/multiint.cpp:1106 #, fuzzy msgid "Enter Password:" msgstr "点击查看地图" -#: src/multiint.cpp:1115 +#: src/multiint.cpp:1124 msgid "OK" msgstr "" -#: src/multiint.cpp:1232 +#: src/multiint.cpp:1241 msgid "Tanks disabled!!" msgstr "" -#: src/multiint.cpp:1233 +#: src/multiint.cpp:1242 msgid "Cyborgs disabled." msgstr "" -#: src/multiint.cpp:1234 +#: src/multiint.cpp:1243 msgid "VTOLs disabled." msgstr "" -#: src/multiint.cpp:1281 -#: src/multiint.cpp:1288 +#: src/multiint.cpp:1290 +#: src/multiint.cpp:1297 msgid "Select Game Name" msgstr "选择游戏名称" -#: src/multiint.cpp:1281 +#: src/multiint.cpp:1290 #, fuzzy msgid "One-Player Skirmish" msgstr "单人的人机对战" -#: src/multiint.cpp:1291 +#: src/multiint.cpp:1300 msgid "Select Map" msgstr "选择地图" -#: src/multiint.cpp:1299 +#: src/multiint.cpp:1308 #, fuzzy msgid "Click to set Password" msgstr "点击查看地图" -#: src/multiint.cpp:1309 -#: src/multiint.cpp:1310 +#: src/multiint.cpp:1318 +#: src/multiint.cpp:1319 msgid "Scavengers" msgstr "" -#: src/multiint.cpp:1312 +#: src/multiint.cpp:1321 msgid "No Scavengers" msgstr "" -#: src/multiint.cpp:1342 +#: src/multiint.cpp:1351 msgid "Select Player Name" msgstr "选择玩家名字" -#: src/multiint.cpp:1348 +#: src/multiint.cpp:1357 msgid "Distance Fog" msgstr "薄雾（可以看见地形）" -#: src/multiint.cpp:1359 +#: src/multiint.cpp:1368 #: src/multimenu.cpp:756 msgid "Alliances" msgstr "同盟" -#: src/multiint.cpp:1362 +#: src/multiint.cpp:1371 msgid "No Alliances" msgstr "无同盟" -#: src/multiint.cpp:1364 +#: src/multiint.cpp:1373 msgid "Allow Alliances" msgstr "允许同盟" -#: src/multiint.cpp:1368 +#: src/multiint.cpp:1377 msgid "Locked Teams" msgstr "已锁定团队" -#: src/multiint.cpp:1394 +#: src/multiint.cpp:1403 msgid "Low Power Levels" msgstr "低能源水平" -#: src/multiint.cpp:1396 +#: src/multiint.cpp:1405 msgid "Medium Power Levels" msgstr "中等能源水平" -#: src/multiint.cpp:1398 +#: src/multiint.cpp:1407 msgid "High Power Levels" msgstr "高能源水平" -#: src/multiint.cpp:1430 +#: src/multiint.cpp:1439 msgid "Base" msgstr "基地" -#: src/multiint.cpp:1432 +#: src/multiint.cpp:1441 msgid "Start with No Bases" msgstr "开始时没有基地" -#: src/multiint.cpp:1434 +#: src/multiint.cpp:1443 msgid "Start with Bases" msgstr "开始时有基地" -#: src/multiint.cpp:1436 +#: src/multiint.cpp:1445 msgid "Start with Advanced Bases" msgstr "开始时有高级基地" -#: src/multiint.cpp:1468 +#: src/multiint.cpp:1477 msgid "Map Preview" msgstr "地图预览" -#: src/multiint.cpp:1470 +#: src/multiint.cpp:1479 msgid "Click to see Map" msgstr "点击查看地图" -#: src/multiint.cpp:1484 +#: src/multiint.cpp:1493 msgid "Start Hosting Game" msgstr "开始建立游戏" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 #, fuzzy msgid "Show Structure Limits" msgstr "设置建筑数量限制" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 msgid "Set Structure Limits" msgstr "设置建筑数量限制" -#: src/multiint.cpp:1587 +#: src/multiint.cpp:1596 msgid "DIFFICULTY" msgstr "" -#: src/multiint.cpp:1601 +#: src/multiint.cpp:1610 msgid "Less aggressive and starts with less units" msgstr "" -#: src/multiint.cpp:1602 +#: src/multiint.cpp:1611 #, fuzzy msgid "Plays nice" msgstr "玩家" -#: src/multiint.cpp:1603 +#: src/multiint.cpp:1612 msgid "No holds barred" msgstr "" -#: src/multiint.cpp:1604 +#: src/multiint.cpp:1613 msgid "Starts with advantages and gets twice as much oil from derricks" msgstr "" -#: src/multiint.cpp:1632 +#: src/multiint.cpp:1641 msgid "CHOOSE AI" msgstr "" -#: src/multiint.cpp:1648 +#: src/multiint.cpp:1657 msgid "Allow human players to join in this slot" msgstr "" -#: src/multiint.cpp:1656 +#: src/multiint.cpp:1665 msgid "Leave this slot unused" msgstr "" -#: src/multiint.cpp:1736 +#: src/multiint.cpp:1745 #, fuzzy msgid "Player colour" msgstr "玩家" -#: src/multiint.cpp:2062 +#: src/multiint.cpp:2071 msgid "Team" msgstr "团队" -#: src/multiint.cpp:2074 +#: src/multiint.cpp:2083 #, fuzzy msgid "Kick player" msgstr "2个玩家" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 #, fuzzy msgid "Click to change difficulty" msgstr "点击查看地图" -#: src/multiint.cpp:2121 +#: src/multiint.cpp:2130 msgid "Click when ready" msgstr "点击准备开始游戏" -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2134 msgid "READY?" msgstr "" -#: src/multiint.cpp:2169 +#: src/multiint.cpp:2178 msgid "PLAYERS" msgstr "玩家" -#: src/multiint.cpp:2204 +#: src/multiint.cpp:2213 #, fuzzy msgid "Click to change to this slot" msgstr "点击查看地图" -#: src/multiint.cpp:2232 +#: src/multiint.cpp:2241 #, fuzzy msgid "Choose Team" msgstr "已锁定团队" -#: src/multiint.cpp:2262 +#: src/multiint.cpp:2271 msgid "Click to change player colour" msgstr "" -#: src/multiint.cpp:2290 +#: src/multiint.cpp:2299 #, fuzzy msgid "Click to change player position" msgstr "保护" -#: src/multiint.cpp:2296 +#: src/multiint.cpp:2305 #, fuzzy msgid "Click to change AI" msgstr "点击查看地图" -#: src/multiint.cpp:2300 +#: src/multiint.cpp:2309 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2362 +#: src/multiint.cpp:2371 msgid "CHAT" msgstr "聊天" -#: src/multiint.cpp:2394 +#: src/multiint.cpp:2403 msgid "All players need to have the same mods to join your game." msgstr "" -#: src/multiint.cpp:2552 +#: src/multiint.cpp:2561 #, c-format msgid "*** password [%s] is now required! ***" msgstr "" -#: src/multiint.cpp:2560 +#: src/multiint.cpp:2569 msgid "*** password is NOT required! ***" msgstr "" -#: src/multiint.cpp:2801 +#: src/multiint.cpp:2810 msgid "Sorry! Failed to host the game." msgstr "" -#: src/multiint.cpp:2922 +#: src/multiint.cpp:2931 #, fuzzy msgid "'Locked Teams' mode enabled" msgstr "已锁定团队" -#: src/multiint.cpp:3003 +#: src/multiint.cpp:3012 #, c-format msgid "The host has kicked %s from the game!" msgstr "主玩家将 %s 踢出游戏!" -#: src/multiint.cpp:3073 +#: src/multiint.cpp:3082 msgid "Host is Starting Game" msgstr "主玩家正在开始游戏" -#: src/multiint.cpp:3639 +#: src/multiint.cpp:3648 msgid "Players" msgstr "玩家" -#: src/multiint.cpp:3772 +#: src/multiint.cpp:3786 #, c-format msgid "Sending Map: %d%% " msgstr "" -#: src/multiint.cpp:3780 +#: src/multiint.cpp:3794 #, c-format msgid "Map: %d%% downloaded" msgstr "" -#: src/multiint.cpp:3803 +#: src/multiint.cpp:3820 msgid "HOST" msgstr "" +#: src/multiint.cpp:3827 +#: src/multimenu.cpp:772 +msgid "Ping" +msgstr "" + #: src/multijoin.cpp:100 #: src/multijoin.cpp:101 msgid "Players Still Joining" @@ -14580,17 +14585,17 @@ msgstr "%s 已离开游戏" msgid "File transfer has been aborted for %d." msgstr "" -#: src/multijoin.cpp:376 +#: src/multijoin.cpp:373 #, c-format msgid "%s (%u) has an incompatible mod, and has been kicked." msgstr "" -#: src/multijoin.cpp:415 +#: src/multijoin.cpp:412 #, c-format msgid "%s is Joining the Game" msgstr "%s 正在进入游戏" -#: src/multijoin.cpp:425 +#: src/multijoin.cpp:422 #, fuzzy msgid "System message:" msgstr "系统语言" @@ -14706,10 +14711,6 @@ msgstr "杀敌" msgid "Units" msgstr "单位" -#: src/multimenu.cpp:772 -msgid "Ping" -msgstr "" - #: src/multimenu.cpp:776 #, fuzzy msgid "Structs" @@ -14744,84 +14745,84 @@ msgstr "" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "" -#: src/multiplay.cpp:1146 +#: src/multiplay.cpp:1057 #, fuzzy msgid "(allies" msgstr "同盟" -#: src/multiplay.cpp:1154 +#: src/multiplay.cpp:1065 msgid "(private to " msgstr "" -#: src/multiplay.cpp:1167 +#: src/multiplay.cpp:1078 msgid "[invalid]" msgstr "" -#: src/multiplay.cpp:2057 +#: src/multiplay.cpp:1942 msgid "Green" msgstr "绿色" -#: src/multiplay.cpp:2058 +#: src/multiplay.cpp:1943 msgid "Orange" msgstr "橙色" -#: src/multiplay.cpp:2059 +#: src/multiplay.cpp:1944 msgid "Grey" msgstr "灰色" -#: src/multiplay.cpp:2060 +#: src/multiplay.cpp:1945 msgid "Black" msgstr "黑色" -#: src/multiplay.cpp:2061 +#: src/multiplay.cpp:1946 msgid "Red" msgstr "红色" -#: src/multiplay.cpp:2062 +#: src/multiplay.cpp:1947 msgid "Blue" msgstr "蓝色" -#: src/multiplay.cpp:2063 +#: src/multiplay.cpp:1948 msgid "Pink" msgstr "粉红色" -#: src/multiplay.cpp:2064 +#: src/multiplay.cpp:1949 msgid "Cyan" msgstr "青绿色" -#: src/multiplay.cpp:2065 +#: src/multiplay.cpp:1950 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:2066 +#: src/multiplay.cpp:1951 msgid "Purple" msgstr "" -#: src/multiplay.cpp:2067 +#: src/multiplay.cpp:1952 msgid "White" msgstr "" -#: src/multiplay.cpp:2068 +#: src/multiplay.cpp:1953 msgid "Bright blue" msgstr "" -#: src/multiplay.cpp:2069 +#: src/multiplay.cpp:1954 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:2070 +#: src/multiplay.cpp:1955 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:2071 +#: src/multiplay.cpp:1956 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:2072 +#: src/multiplay.cpp:1957 msgid "Brown" msgstr "" -#: src/order.cpp:841 +#: src/order.cpp:800 msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "" @@ -14956,20 +14957,20 @@ msgstr "总游戏时间 - %s" msgid "You cheated!" msgstr "" -#: src/scriptfuncs.cpp:3250 +#: src/scriptfuncs.cpp:3287 msgid "YOU ARE VICTORIOUS!" msgstr "你取得了胜利! " -#: src/scriptfuncs.cpp:3254 +#: src/scriptfuncs.cpp:3291 msgid "YOU WERE DEFEATED!" msgstr "你被击败了! " -#: src/scriptfuncs.cpp:9500 +#: src/scriptfuncs.cpp:9537 #, c-format msgid "Beacon received from %s!" msgstr "" -#: src/scriptfuncs.cpp:9546 +#: src/scriptfuncs.cpp:9583 #, c-format msgid "Beacon %d" msgstr "" @@ -14997,61 +14998,61 @@ msgstr "" msgid "Unable to locate any Commanders!" msgstr "未能定位任何指挥官" -#: src/structure.cpp:2615 +#: src/structure.cpp:2614 msgid "Command Control Limit Reached - Production Halted" msgstr "已达到可控制单位总数上限 - 停止生产新单位" -#: src/structure.cpp:5815 -#: src/structure.cpp:5840 +#: src/structure.cpp:5806 +#: src/structure.cpp:5831 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" msgstr[0] "%s - 已指派 %u 单位" -#: src/structure.cpp:5845 -#: src/structure.cpp:5913 -#: src/structure.cpp:5929 -#: src/structure.cpp:5943 +#: src/structure.cpp:5836 +#: src/structure.cpp:5904 +#: src/structure.cpp:5920 +#: src/structure.cpp:5934 #, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - 损伤 %3.0f%%" -#: src/structure.cpp:5895 +#: src/structure.cpp:5886 #, c-format msgid "%s - Connected %u of %u" msgstr "" -#: src/structure.cpp:6059 -#: src/structure.cpp:6104 +#: src/structure.cpp:6050 +#: src/structure.cpp:6095 #, c-format msgid "%s - Electronically Damaged" msgstr "%s - 电子伤害" -#: src/structure.cpp:6341 +#: src/structure.cpp:6332 msgid "Electronic Reward - Visibility Report" msgstr "" -#: src/structure.cpp:6381 +#: src/structure.cpp:6372 msgid "Factory Reward - Propulsion" msgstr "" -#: src/structure.cpp:6405 +#: src/structure.cpp:6396 msgid "Factory Reward - Body" msgstr "" -#: src/structure.cpp:6429 +#: src/structure.cpp:6420 msgid "Factory Reward - Weapon" msgstr "" -#: src/structure.cpp:6438 +#: src/structure.cpp:6429 msgid "Factory Reward - Nothing" msgstr "" -#: src/structure.cpp:6466 +#: src/structure.cpp:6457 msgid "Repair Facility Award - Repair" msgstr "" -#: src/structure.cpp:6473 +#: src/structure.cpp:6464 msgid "Repair Facility Award - Nothing" msgstr "" diff --git a/po/zh_TW.po b/po/zh_TW.po index d34f8abea..515e621e6 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-01-18 00:54+0100\n" +"POT-Creation-Date: 2011-02-25 23:35+0100\n" "PO-Revision-Date: 2009-05-11 00:21+0800\n" "Last-Translator: \n" "Language-Team: zh_TW\n" @@ -5733,7 +5733,7 @@ msgid "New Design" msgstr "新的設計" #: data/base/messages/strings/names.txt:15 -#: src/design.cpp:1313 +#: src/design.cpp:1275 msgid "Transport" msgstr "運輸艦" @@ -12202,26 +12202,26 @@ msgid "System locale" msgstr "系統語系" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1043 +#: lib/netplay/netplay.cpp:1042 msgid "Enter password here" msgstr "" -#: lib/netplay/netplay.cpp:2048 +#: lib/netplay/netplay.cpp:2060 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "" -#: lib/netplay/netplay.cpp:2062 +#: lib/netplay/netplay.cpp:2082 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "" #: src/challenge.cpp:184 -#: src/hci.cpp:922 -#: src/hci.cpp:3390 -#: src/hci.cpp:3513 -#: src/hci.cpp:3924 -#: src/hci.cpp:4942 +#: src/hci.cpp:916 +#: src/hci.cpp:3378 +#: src/hci.cpp:3501 +#: src/hci.cpp:3912 +#: src/hci.cpp:4930 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12373,149 +12373,149 @@ msgstr "go directly to host screen" #: src/configuration.cpp:393 #: src/configuration.cpp:394 -#: src/multistat.cpp:130 +#: src/multistat.cpp:124 msgid "Player" msgstr "玩家" -#: src/design.cpp:449 -#: src/design.cpp:469 -#: src/design.cpp:3501 +#: src/design.cpp:443 +#: src/design.cpp:455 +#: src/design.cpp:3464 msgid "New Vehicle" msgstr "新車身" -#: src/design.cpp:515 +#: src/design.cpp:500 msgid "Vehicle Body" msgstr "車身" -#: src/design.cpp:535 +#: src/design.cpp:520 msgid "Vehicle Propulsion" msgstr "車輛推進系統" -#: src/design.cpp:556 -#: src/design.cpp:579 -#: src/design.cpp:603 +#: src/design.cpp:541 +#: src/design.cpp:564 +#: src/design.cpp:588 msgid "Vehicle Turret" msgstr "車輛武器系統" -#: src/design.cpp:622 +#: src/design.cpp:607 msgid "Delete Design" msgstr "刪除設計" -#: src/design.cpp:673 -#: src/design.cpp:720 +#: src/design.cpp:658 +#: src/design.cpp:705 msgid "Kinetic Armour" msgstr "物理防禦" -#: src/design.cpp:682 -#: src/design.cpp:730 +#: src/design.cpp:667 +#: src/design.cpp:715 msgid "Thermal Armour" msgstr "熱能防禦" -#: src/design.cpp:698 -#: src/design.cpp:750 +#: src/design.cpp:683 +#: src/design.cpp:735 msgid "Engine Output" msgstr "引擎輸出" -#: src/design.cpp:706 -#: src/design.cpp:759 -#: src/design.cpp:1529 -#: src/design.cpp:1553 -#: src/design.cpp:1574 -#: src/design.cpp:1590 -#: src/design.cpp:1610 -#: src/design.cpp:1627 -#: src/design.cpp:1647 -#: src/design.cpp:1664 -#: src/design.cpp:1705 -#: src/design.cpp:1737 -#: src/design.cpp:1869 -#: src/design.cpp:1885 -#: src/design.cpp:1923 -#: src/design.cpp:1956 +#: src/design.cpp:691 +#: src/design.cpp:744 +#: src/design.cpp:1486 +#: src/design.cpp:1510 +#: src/design.cpp:1531 +#: src/design.cpp:1547 +#: src/design.cpp:1567 +#: src/design.cpp:1584 +#: src/design.cpp:1604 +#: src/design.cpp:1621 +#: src/design.cpp:1662 +#: src/design.cpp:1694 +#: src/design.cpp:1826 +#: src/design.cpp:1842 +#: src/design.cpp:1880 +#: src/design.cpp:1913 msgid "Weight" msgstr "重量" -#: src/design.cpp:790 -#: src/design.cpp:808 +#: src/design.cpp:775 +#: src/design.cpp:793 msgid "Total Power Required" msgstr "全部所需能源" -#: src/design.cpp:821 -#: src/design.cpp:840 +#: src/design.cpp:806 +#: src/design.cpp:825 msgid "Total Body Points" msgstr "HP" -#: src/design.cpp:1027 -#: src/design.cpp:1059 +#: src/design.cpp:996 +#: src/design.cpp:1025 msgid "Power Usage" msgstr "需要能源" -#: src/design.cpp:1335 +#: src/design.cpp:1298 msgid "Hydra " msgstr "" -#: src/design.cpp:1509 -#: src/design.cpp:1537 +#: src/design.cpp:1466 +#: src/design.cpp:1494 msgid "Sensor Range" msgstr "雷達可視距離" -#: src/design.cpp:1521 -#: src/design.cpp:1545 +#: src/design.cpp:1478 +#: src/design.cpp:1502 msgid "Sensor Power" msgstr "雷達能源" -#: src/design.cpp:1566 -#: src/design.cpp:1582 +#: src/design.cpp:1523 +#: src/design.cpp:1539 msgid "ECM Power" msgstr "ECM Power" -#: src/design.cpp:1602 -#: src/design.cpp:1619 -#: src/design.cpp:1639 -#: src/design.cpp:1656 +#: src/design.cpp:1559 +#: src/design.cpp:1576 +#: src/design.cpp:1596 +#: src/design.cpp:1613 msgid "Build Points" msgstr "建築物HP（Build Points）" -#: src/design.cpp:1677 -#: src/design.cpp:1713 +#: src/design.cpp:1634 +#: src/design.cpp:1670 msgid "Range" msgstr "射程" -#: src/design.cpp:1689 -#: src/design.cpp:1721 +#: src/design.cpp:1646 +#: src/design.cpp:1678 msgid "Damage" msgstr "傷害" -#: src/design.cpp:1697 -#: src/design.cpp:1729 +#: src/design.cpp:1654 +#: src/design.cpp:1686 msgid "Rate-of-Fire" msgstr "射速" -#: src/design.cpp:1857 -#: src/design.cpp:1877 +#: src/design.cpp:1814 +#: src/design.cpp:1834 msgid "Air Speed" msgstr "空中移動速度" -#: src/design.cpp:1895 -#: src/design.cpp:1932 +#: src/design.cpp:1852 +#: src/design.cpp:1889 msgid "Road Speed" msgstr "道路移動速度" -#: src/design.cpp:1905 -#: src/design.cpp:1940 +#: src/design.cpp:1862 +#: src/design.cpp:1897 msgid "Off-Road Speed" msgstr "越野移動速度" -#: src/design.cpp:1913 -#: src/design.cpp:1948 +#: src/design.cpp:1870 +#: src/design.cpp:1905 msgid "Water Speed" msgstr "水面移動速度" -#: src/design.cpp:2074 +#: src/design.cpp:2031 msgid "Weapons" msgstr "武器裝備" -#: src/design.cpp:2094 +#: src/design.cpp:2051 msgid "Systems" msgstr "系統裝備" @@ -12530,7 +12530,7 @@ msgid "Player dropped" msgstr "玩家" #: src/display3d.cpp:599 -#: src/multiint.cpp:2116 +#: src/multiint.cpp:2125 msgid "Waiting for other players" msgstr "等待其他玩家" @@ -12538,110 +12538,110 @@ msgstr "等待其他玩家" msgid "Out of sync" msgstr "" -#: src/display.cpp:1651 +#: src/display.cpp:1649 msgid "Cannot Build. Oil Resource Burning." msgstr "油田燃燒中，無法建築鑽油井" -#: src/display.cpp:1830 -#: src/display.cpp:2423 +#: src/display.cpp:1828 +#: src/display.cpp:2421 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - 損傷 %d%% - 經驗值 %d, %s" -#: src/display.cpp:1846 +#: src/display.cpp:1844 #, fuzzy, c-format msgid "%s - Allied - Damage %d%% - Experience %d, %s" msgstr "%s - 損傷 %d%% - 經驗值 %d, %s" -#: src/display.cpp:2044 +#: src/display.cpp:2042 msgid "Truck ordered to build Oil Derrick" msgstr "命令工程車建造鑽油井" -#: src/display.cpp:2045 +#: src/display.cpp:2043 #, fuzzy msgid "2 trucks ordered to build Oil Derrick" msgstr "命令工程車建造鑽油井" -#: src/display.cpp:2046 +#: src/display.cpp:2044 #, fuzzy, c-format msgid "%d trucks ordered to build Oil Derrick" msgstr "命令工程車建造鑽油井" -#: src/droid.cpp:208 +#: src/droid.cpp:211 msgid "Unit Lost!" msgstr "損失單位！" -#: src/droid.cpp:1370 +#: src/droid.cpp:1376 msgid "Structure Restored" msgstr "建築物重建" -#: src/droid.cpp:2712 +#: src/droid.cpp:2732 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" msgstr[0] "第 %u 隊聽令 - 共 %u 單位" -#: src/droid.cpp:2725 +#: src/droid.cpp:2745 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" msgstr[0] "共 %u 單位 被指派為 第 %u 隊" -#: src/droid.cpp:2738 +#: src/droid.cpp:2758 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" msgstr[0] "視角移動至第 %u 隊 - 共 %u 單位" -#: src/droid.cpp:2742 +#: src/droid.cpp:2762 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" msgstr[0] "Aligning with Group %u - %u 單位" -#: src/droid.cpp:3080 +#: src/droid.cpp:3093 msgid "Rookie" msgstr "菜鳥" -#: src/droid.cpp:3081 +#: src/droid.cpp:3094 msgctxt "rank" msgid "Green" msgstr "青澀" -#: src/droid.cpp:3082 +#: src/droid.cpp:3095 msgid "Trained" msgstr "訓練有素的" -#: src/droid.cpp:3083 +#: src/droid.cpp:3096 msgid "Regular" msgstr "好樣的" -#: src/droid.cpp:3084 +#: src/droid.cpp:3097 msgid "Professional" msgstr "專家" -#: src/droid.cpp:3085 +#: src/droid.cpp:3098 msgid "Veteran" msgstr "老手" -#: src/droid.cpp:3086 +#: src/droid.cpp:3099 msgid "Elite" msgstr "菁英" -#: src/droid.cpp:3087 +#: src/droid.cpp:3100 msgid "Special" msgstr "特務" -#: src/droid.cpp:3088 +#: src/droid.cpp:3101 msgid "Hero" msgstr "英雄" -#: src/droid.cpp:4110 +#: src/droid.cpp:4123 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "" -#: src/droid.cpp:4114 +#: src/droid.cpp:4127 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "" @@ -12660,7 +12660,7 @@ msgid "Tutorial" msgstr "教學模式" #: src/frontend.cpp:100 -#: src/hci.cpp:3499 +#: src/hci.cpp:3487 msgid "Options" msgstr "選項" @@ -12712,7 +12712,7 @@ msgid "Challenges" msgstr "拾荒者" #: src/frontend.cpp:215 -#: src/ingameop.cpp:275 +#: src/ingameop.cpp:272 msgid "Load Game" msgstr "載入遊戲" @@ -12721,9 +12721,9 @@ msgid "SINGLE PLAYER" msgstr "SINGLE PLAYER" #: src/frontend.cpp:303 -#: src/ingameop.cpp:498 -#: src/mission.cpp:2527 -#: src/mission.cpp:2630 +#: src/ingameop.cpp:494 +#: src/mission.cpp:2493 +#: src/mission.cpp:2596 msgid "Load Saved Game" msgstr "載入已儲存的遊戲" @@ -12740,7 +12740,7 @@ msgid "Join Game" msgstr "加入遊戲" #: src/frontend.cpp:422 -#: src/multiint.cpp:1276 +#: src/multiint.cpp:1285 msgid "OPTIONS" msgstr "選項" @@ -12757,7 +12757,7 @@ msgid "Video Options" msgstr "顯示選項" #: src/frontend.cpp:426 -#: src/ingameop.cpp:270 +#: src/ingameop.cpp:267 msgid "Audio Options" msgstr "音效選項" @@ -12835,7 +12835,7 @@ msgid "Off" msgstr "關閉" #: src/frontend.cpp:523 -#: src/multiint.cpp:1345 +#: src/multiint.cpp:1354 msgid "Fog" msgstr "迷霧" @@ -12846,7 +12846,7 @@ msgstr "迷霧" #: src/frontend.cpp:530 #: src/frontend.cpp:595 -#: src/multiint.cpp:1347 +#: src/multiint.cpp:1356 msgid "Fog Of War" msgstr "完全迷霧" @@ -13014,201 +13014,201 @@ msgid "GAME OPTIONS" msgstr "遊戲選項" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2389 +#: src/multiint.cpp:2398 msgid "Mod: " msgstr "" -#: src/hci.cpp:1245 +#: src/hci.cpp:1237 #, fuzzy msgid "MAP SAVED!" msgstr "遊戲已儲存" -#: src/hci.cpp:1584 +#: src/hci.cpp:1573 #: src/loop.cpp:558 #: src/loop.cpp:574 #, fuzzy msgid "GAME SAVED: " msgstr "遊戲已儲存" -#: src/hci.cpp:1971 +#: src/hci.cpp:1960 msgid "Failed to create building" msgstr "建築物建造失敗" -#: src/hci.cpp:1988 +#: src/hci.cpp:1977 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new structure: %s." msgstr "玩家 %u 利用作弊（除錯）模式建立了一個新建築物: %s." -#: src/hci.cpp:2003 +#: src/hci.cpp:1992 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new feature: %s." msgstr "玩家 %u 利用作弊（除錯）模式建立了一個新功能: %s." -#: src/hci.cpp:2025 +#: src/hci.cpp:2014 #, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid: %s." msgstr "玩家 %u 利用作弊（除錯）模式建立了一個新droid: %s." -#: src/hci.cpp:2036 +#: src/hci.cpp:2025 #, fuzzy, c-format msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "玩家 %u 利用作弊（除錯）模式建立了一個新droid: %s." -#: src/hci.cpp:3310 +#: src/hci.cpp:3298 msgid "Commanders (F6)" msgstr "指揮命令 （F6）" -#: src/hci.cpp:3323 +#: src/hci.cpp:3311 msgid "Intelligence Display (F5)" msgstr "顯示任務及情報（F5）" -#: src/hci.cpp:3336 +#: src/hci.cpp:3324 msgid "Manufacture (F1)" msgstr "生產新的單位 （F1）" -#: src/hci.cpp:3349 +#: src/hci.cpp:3337 msgid "Design (F4)" msgstr "設計新的單位（F4）" -#: src/hci.cpp:3362 +#: src/hci.cpp:3350 msgid "Research (F2)" msgstr "研發新科技（F2）" -#: src/hci.cpp:3375 +#: src/hci.cpp:3363 msgid "Build (F3)" msgstr "建造新的建築物 （F3）" -#: src/hci.cpp:3446 -#: src/multiint.cpp:1392 +#: src/hci.cpp:3434 +#: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "能源" -#: src/hci.cpp:3537 +#: src/hci.cpp:3525 msgid "Map:" msgstr "" -#: src/hci.cpp:3550 +#: src/hci.cpp:3538 #, fuzzy msgid "Load" msgstr "載入遊戲" -#: src/hci.cpp:3551 +#: src/hci.cpp:3539 #, fuzzy msgid "Load Map File" msgstr "載入遊戲" -#: src/hci.cpp:3558 +#: src/hci.cpp:3546 #, fuzzy msgid "Save" msgstr "儲存遊戲" -#: src/hci.cpp:3559 +#: src/hci.cpp:3547 #, fuzzy msgid "Save Map File" msgstr "儲存遊戲" -#: src/hci.cpp:3567 +#: src/hci.cpp:3555 msgid "New" msgstr "" -#: src/hci.cpp:3568 +#: src/hci.cpp:3556 msgid "New Blank Map" msgstr "" -#: src/hci.cpp:3604 +#: src/hci.cpp:3592 msgid "Tile" msgstr "貼圖" -#: src/hci.cpp:3605 +#: src/hci.cpp:3593 msgid "Place tiles on map" msgstr "在地圖上加入貼圖" -#: src/hci.cpp:3614 +#: src/hci.cpp:3602 msgid "Unit" msgstr "單位" -#: src/hci.cpp:3615 +#: src/hci.cpp:3603 msgid "Place Unit on map" msgstr "在地圖上加入單位" -#: src/hci.cpp:3623 +#: src/hci.cpp:3611 msgid "Struct" msgstr "建築" -#: src/hci.cpp:3624 +#: src/hci.cpp:3612 msgid "Place Structures on map" msgstr "在地圖上加入建築物" -#: src/hci.cpp:3632 +#: src/hci.cpp:3620 msgid "Feat" msgstr "特徵" -#: src/hci.cpp:3633 +#: src/hci.cpp:3621 msgid "Place Features on map" msgstr "在地圖上加入特徵" -#: src/hci.cpp:3643 +#: src/hci.cpp:3631 msgid "Pause" msgstr "" -#: src/hci.cpp:3644 +#: src/hci.cpp:3632 msgid "Pause or unpause the game" msgstr "暫停（或繼續）遊戲" -#: src/hci.cpp:3658 +#: src/hci.cpp:3646 msgid "Align height of all map objects" msgstr "使地圖上所有物件等高" -#: src/hci.cpp:3668 +#: src/hci.cpp:3656 msgid "Edit" msgstr "" -#: src/hci.cpp:3669 +#: src/hci.cpp:3657 #, fuzzy msgid "Start Edit Mode" msgstr "開始時無基地" -#: src/hci.cpp:3683 +#: src/hci.cpp:3671 #: src/ingameop.cpp:112 -#: src/ingameop.cpp:258 -#: src/ingameop.cpp:263 +#: src/ingameop.cpp:256 +#: src/ingameop.cpp:260 msgid "Quit" msgstr "退出" -#: src/hci.cpp:3684 +#: src/hci.cpp:3672 msgid "Exit Game" msgstr "離開遊戲" -#: src/hci.cpp:3710 +#: src/hci.cpp:3698 #, fuzzy msgid "Current Player:" msgstr "多人遊戲" -#: src/hci.cpp:4001 +#: src/hci.cpp:3989 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "進度條" -#: src/hci.cpp:4867 +#: src/hci.cpp:4855 msgid "Factory Delivery Point" msgstr "工廠單位產出點" -#: src/hci.cpp:4885 +#: src/hci.cpp:4873 msgid "Loop Production" msgstr "循環生產" -#: src/hci.cpp:4965 +#: src/hci.cpp:4953 msgid "Tab Scroll left" msgstr "頁簽向左捲動" -#: src/hci.cpp:4980 +#: src/hci.cpp:4968 msgid "Tab Scroll right" msgstr "頁簽向右捲動" #: src/ingameop.cpp:111 -#: src/ingameop.cpp:193 -#: src/ingameop.cpp:267 +#: src/ingameop.cpp:195 +#: src/ingameop.cpp:264 msgid "Resume Game" msgstr "返回遊戲" @@ -13216,33 +13216,33 @@ msgstr "返回遊戲" msgid "WARNING: You're the host. If you quit, the game ends for everyone!" msgstr "" -#: src/ingameop.cpp:185 -#: src/ingameop.cpp:527 +#: src/ingameop.cpp:186 +#: src/ingameop.cpp:523 msgid "Tactical UI (Target Origin Icon): Show" msgstr "" -#: src/ingameop.cpp:190 -#: src/ingameop.cpp:531 +#: src/ingameop.cpp:191 +#: src/ingameop.cpp:527 msgid "Tactical UI (Target Origin Icon): Hide" msgstr "" -#: src/ingameop.cpp:277 -#: src/ingameop.cpp:502 -#: src/mission.cpp:2514 -#: src/mission.cpp:2633 +#: src/ingameop.cpp:274 +#: src/ingameop.cpp:498 +#: src/mission.cpp:2480 +#: src/mission.cpp:2599 msgid "Save Game" msgstr "儲存遊戲" -#: src/ingameop.cpp:343 +#: src/ingameop.cpp:339 #, fuzzy msgid "Host has quit the game!" msgstr "主玩家已離開遊戲" -#: src/ingameop.cpp:349 +#: src/ingameop.cpp:345 msgid "The game can't continue without the host." msgstr "" -#: src/ingameop.cpp:355 +#: src/ingameop.cpp:351 msgid "--> QUIT <--" msgstr "" @@ -13623,54 +13623,54 @@ msgstr "" msgid "Screen shake when things die: On" msgstr "" -#: src/keybind.cpp:2603 -#: src/keybind.cpp:2646 +#: src/keybind.cpp:2604 +#: src/keybind.cpp:2647 #, fuzzy msgid "Sorry, but game speed cannot be changed in multiplayer." msgstr "抱歉，多人遊戲中無法使用此作弊碼" -#: src/keybind.cpp:2624 -#: src/keybind.cpp:2667 -#: src/keybind.cpp:2689 +#: src/keybind.cpp:2625 +#: src/keybind.cpp:2668 +#: src/keybind.cpp:2690 msgid "Game Speed Reset" msgstr "重設遊戲速度" -#: src/keybind.cpp:2628 +#: src/keybind.cpp:2629 #, c-format msgid "Game Speed Increased to %3.1f" msgstr "遊戲速度增加至 %3.1f" -#: src/keybind.cpp:2671 +#: src/keybind.cpp:2672 #, c-format msgid "Game Speed Reduced to %3.1f" msgstr "遊戲速度減少至 %3.1f" -#: src/keybind.cpp:2701 +#: src/keybind.cpp:2702 msgid "Radar showing friend-foe colors" msgstr "雷達顯示友軍顏色" -#: src/keybind.cpp:2705 +#: src/keybind.cpp:2706 msgid "Radar showing player colors" msgstr "雷達顯示玩家顏色" -#: src/keybind.cpp:2726 +#: src/keybind.cpp:2727 msgid "Radar showing only objects" msgstr "雷達僅顯示物件" -#: src/keybind.cpp:2729 +#: src/keybind.cpp:2730 msgid "Radar blending terrain and height" msgstr "雷達描繪地形及高度" -#: src/keybind.cpp:2732 +#: src/keybind.cpp:2733 msgid "Radar showing terrain" msgstr "雷達顯示地形" -#: src/keybind.cpp:2735 +#: src/keybind.cpp:2736 #, fuzzy msgid "Radar showing revealed terrain" msgstr "雷達顯示地形" -#: src/keybind.cpp:2738 +#: src/keybind.cpp:2739 msgid "Radar showing height" msgstr "雷達顯示高度" @@ -13679,9 +13679,9 @@ msgid "KEY MAPPING" msgstr "鍵盤配置" #: src/keyedit.cpp:372 -#: src/multiint.cpp:662 -#: src/multiint.cpp:1072 -#: src/multiint.cpp:1478 +#: src/multiint.cpp:671 +#: src/multiint.cpp:1081 +#: src/multiint.cpp:1487 msgid "Return To Previous Screen" msgstr "回到前一個畫面" @@ -14191,39 +14191,39 @@ msgstr "開啟或關閉追蹤視角" msgid "Could not save game!" msgstr "載入已儲存的遊戲" -#: src/mission.cpp:2075 +#: src/mission.cpp:2041 msgid "Load Transport" msgstr "送上運輸艦" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 #, fuzzy msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "任務完成" -#: src/mission.cpp:2462 +#: src/mission.cpp:2428 msgid "OBJECTIVE ACHIEVED" msgstr "任務完成" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 #, fuzzy msgid "OBJECTIVE FAILED--and you cheated!" msgstr "任務失敗" -#: src/mission.cpp:2468 +#: src/mission.cpp:2434 msgid "OBJECTIVE FAILED" msgstr "任務失敗" -#: src/mission.cpp:2493 -#: src/mission.cpp:2533 -#: src/mission.cpp:2647 +#: src/mission.cpp:2459 +#: src/mission.cpp:2499 +#: src/mission.cpp:2613 msgid "Quit To Main Menu" msgstr "退出至主選單" -#: src/mission.cpp:2501 +#: src/mission.cpp:2467 msgid "Continue Game" msgstr "繼續遊戲" -#: src/mission.cpp:2598 +#: src/mission.cpp:2564 #, fuzzy msgid "GAME SAVED :" msgstr "遊戲已儲存" @@ -14283,357 +14283,362 @@ msgstr "%s 與 %s 結盟" msgid "You Discover Blueprints For %s" msgstr "你發現一個用作於 %s 的藍圖" -#: src/multiint.cpp:600 +#: src/multiint.cpp:609 #: src/multilimit.cpp:190 msgid "Accept Settings" msgstr "接受設定" -#: src/multiint.cpp:602 -#: src/multiint.cpp:1117 +#: src/multiint.cpp:611 +#: src/multiint.cpp:1126 #, fuzzy msgid "Cancel" msgstr "槍騎兵火箭" -#: src/multiint.cpp:613 +#: src/multiint.cpp:622 msgid "IP Address or Machine Name" msgstr "IP 位置或電腦名稱" -#: src/multiint.cpp:659 +#: src/multiint.cpp:668 msgid "CONNECTION" msgstr "連接" -#: src/multiint.cpp:664 +#: src/multiint.cpp:673 msgid "Lobby" msgstr "遊戲大廳" -#: src/multiint.cpp:665 +#: src/multiint.cpp:674 msgid "IP" msgstr "IP" -#: src/multiint.cpp:854 +#: src/multiint.cpp:863 #, fuzzy msgid "No games are available" msgstr "可使用新的科技" -#: src/multiint.cpp:857 +#: src/multiint.cpp:866 msgid "Game is full" msgstr "" -#: src/multiint.cpp:861 +#: src/multiint.cpp:870 msgid "You were kicked!" msgstr "" -#: src/multiint.cpp:864 +#: src/multiint.cpp:873 msgid "Wrong Game Version!" msgstr "" -#: src/multiint.cpp:867 +#: src/multiint.cpp:876 msgid "You have an incompatible mod." msgstr "" -#: src/multiint.cpp:871 +#: src/multiint.cpp:880 msgid "Host couldn't send file?" msgstr "" -#: src/multiint.cpp:875 +#: src/multiint.cpp:884 msgid "Incorrect Password!" msgstr "" -#: src/multiint.cpp:878 +#: src/multiint.cpp:887 msgid "Host has dropped connection!" msgstr "" -#: src/multiint.cpp:882 +#: src/multiint.cpp:891 msgid "Connection Error" msgstr "" -#: src/multiint.cpp:1012 +#: src/multiint.cpp:1021 msgid "Searching" msgstr "搜尋" -#: src/multiint.cpp:1069 +#: src/multiint.cpp:1078 msgid "GAMES" msgstr "遊戲" -#: src/multiint.cpp:1077 +#: src/multiint.cpp:1086 msgid "Refresh Games List" msgstr "重新整理遊戲清單" -#: src/multiint.cpp:1097 +#: src/multiint.cpp:1106 #, fuzzy msgid "Enter Password:" msgstr "按一下看地圖" -#: src/multiint.cpp:1115 +#: src/multiint.cpp:1124 msgid "OK" msgstr "" -#: src/multiint.cpp:1232 +#: src/multiint.cpp:1241 msgid "Tanks disabled!!" msgstr "" -#: src/multiint.cpp:1233 +#: src/multiint.cpp:1242 #, fuzzy msgid "Cyborgs disabled." msgstr "可生產新的生化人步兵" -#: src/multiint.cpp:1234 +#: src/multiint.cpp:1243 msgid "VTOLs disabled." msgstr "" -#: src/multiint.cpp:1281 -#: src/multiint.cpp:1288 +#: src/multiint.cpp:1290 +#: src/multiint.cpp:1297 msgid "Select Game Name" msgstr "選擇遊戲名稱" -#: src/multiint.cpp:1281 +#: src/multiint.cpp:1290 #, fuzzy msgid "One-Player Skirmish" msgstr "單人戰役模式" -#: src/multiint.cpp:1291 +#: src/multiint.cpp:1300 msgid "Select Map" msgstr "選擇地圖" -#: src/multiint.cpp:1299 +#: src/multiint.cpp:1308 #, fuzzy msgid "Click to set Password" msgstr "按一下看地圖" -#: src/multiint.cpp:1309 -#: src/multiint.cpp:1310 +#: src/multiint.cpp:1318 +#: src/multiint.cpp:1319 #, fuzzy msgid "Scavengers" msgstr "拾荒者" -#: src/multiint.cpp:1312 +#: src/multiint.cpp:1321 #, fuzzy msgid "No Scavengers" msgstr "拾荒者" -#: src/multiint.cpp:1342 +#: src/multiint.cpp:1351 msgid "Select Player Name" msgstr "選擇玩家名稱" -#: src/multiint.cpp:1348 +#: src/multiint.cpp:1357 msgid "Distance Fog" msgstr "迷霧（看得見地形）" -#: src/multiint.cpp:1359 +#: src/multiint.cpp:1368 #: src/multimenu.cpp:756 msgid "Alliances" msgstr "同盟" -#: src/multiint.cpp:1362 +#: src/multiint.cpp:1371 msgid "No Alliances" msgstr "不允許同盟" -#: src/multiint.cpp:1364 +#: src/multiint.cpp:1373 msgid "Allow Alliances" msgstr "允許同盟" -#: src/multiint.cpp:1368 +#: src/multiint.cpp:1377 msgid "Locked Teams" msgstr "鎖定同盟模式" -#: src/multiint.cpp:1394 +#: src/multiint.cpp:1403 msgid "Low Power Levels" msgstr "生產能源速度：慢" -#: src/multiint.cpp:1396 +#: src/multiint.cpp:1405 msgid "Medium Power Levels" msgstr "生產能源速度：中" -#: src/multiint.cpp:1398 +#: src/multiint.cpp:1407 msgid "High Power Levels" msgstr "生產能源速度：快" -#: src/multiint.cpp:1430 +#: src/multiint.cpp:1439 msgid "Base" msgstr "基地" -#: src/multiint.cpp:1432 +#: src/multiint.cpp:1441 msgid "Start with No Bases" msgstr "開始時無基地" -#: src/multiint.cpp:1434 +#: src/multiint.cpp:1443 msgid "Start with Bases" msgstr "開始時有基地" -#: src/multiint.cpp:1436 +#: src/multiint.cpp:1445 msgid "Start with Advanced Bases" msgstr "開始時具規模基地" -#: src/multiint.cpp:1468 +#: src/multiint.cpp:1477 msgid "Map Preview" msgstr "預覽地圖" -#: src/multiint.cpp:1470 +#: src/multiint.cpp:1479 msgid "Click to see Map" msgstr "按一下看地圖" -#: src/multiint.cpp:1484 +#: src/multiint.cpp:1493 msgid "Start Hosting Game" msgstr "開始遊戲" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 #, fuzzy msgid "Show Structure Limits" msgstr "設定建築物數量限制" -#: src/multiint.cpp:1492 +#: src/multiint.cpp:1501 msgid "Set Structure Limits" msgstr "設定建築物數量限制" -#: src/multiint.cpp:1587 +#: src/multiint.cpp:1596 msgid "DIFFICULTY" msgstr "" -#: src/multiint.cpp:1601 +#: src/multiint.cpp:1610 msgid "Less aggressive and starts with less units" msgstr "" -#: src/multiint.cpp:1602 +#: src/multiint.cpp:1611 #, fuzzy msgid "Plays nice" msgstr "玩家" -#: src/multiint.cpp:1603 +#: src/multiint.cpp:1612 msgid "No holds barred" msgstr "" -#: src/multiint.cpp:1604 +#: src/multiint.cpp:1613 msgid "Starts with advantages and gets twice as much oil from derricks" msgstr "" -#: src/multiint.cpp:1632 +#: src/multiint.cpp:1641 msgid "CHOOSE AI" msgstr "" -#: src/multiint.cpp:1648 +#: src/multiint.cpp:1657 msgid "Allow human players to join in this slot" msgstr "" -#: src/multiint.cpp:1656 +#: src/multiint.cpp:1665 msgid "Leave this slot unused" msgstr "" -#: src/multiint.cpp:1736 +#: src/multiint.cpp:1745 #, fuzzy msgid "Player colour" msgstr "玩家" -#: src/multiint.cpp:2062 +#: src/multiint.cpp:2071 msgid "Team" msgstr "隊伍" -#: src/multiint.cpp:2074 +#: src/multiint.cpp:2083 #, fuzzy msgid "Kick player" msgstr "2 玩家" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2104 +#: src/multiint.cpp:2113 #, fuzzy msgid "Click to change difficulty" msgstr "按一下看地圖" -#: src/multiint.cpp:2121 +#: src/multiint.cpp:2130 msgid "Click when ready" msgstr "按一下開始" -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2134 msgid "READY?" msgstr "" -#: src/multiint.cpp:2169 +#: src/multiint.cpp:2178 msgid "PLAYERS" msgstr "玩家" -#: src/multiint.cpp:2204 +#: src/multiint.cpp:2213 #, fuzzy msgid "Click to change to this slot" msgstr "按一下看地圖" -#: src/multiint.cpp:2232 +#: src/multiint.cpp:2241 #, fuzzy msgid "Choose Team" msgstr "鎖定同盟模式" -#: src/multiint.cpp:2262 +#: src/multiint.cpp:2271 #, fuzzy msgid "Click to change player colour" msgstr "雷達顯示玩家顏色" -#: src/multiint.cpp:2290 +#: src/multiint.cpp:2299 #, fuzzy msgid "Click to change player position" msgstr "保持戒備" -#: src/multiint.cpp:2296 +#: src/multiint.cpp:2305 #, fuzzy msgid "Click to change AI" msgstr "按一下看地圖" -#: src/multiint.cpp:2300 +#: src/multiint.cpp:2309 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2362 +#: src/multiint.cpp:2371 msgid "CHAT" msgstr "聊天" -#: src/multiint.cpp:2394 +#: src/multiint.cpp:2403 msgid "All players need to have the same mods to join your game." msgstr "" -#: src/multiint.cpp:2552 +#: src/multiint.cpp:2561 #, c-format msgid "*** password [%s] is now required! ***" msgstr "" -#: src/multiint.cpp:2560 +#: src/multiint.cpp:2569 msgid "*** password is NOT required! ***" msgstr "" -#: src/multiint.cpp:2801 +#: src/multiint.cpp:2810 msgid "Sorry! Failed to host the game." msgstr "" -#: src/multiint.cpp:2922 +#: src/multiint.cpp:2931 msgid "'Locked Teams' mode enabled" msgstr "鎖定同盟模式" -#: src/multiint.cpp:3003 +#: src/multiint.cpp:3012 #, c-format msgid "The host has kicked %s from the game!" msgstr "主玩家將 %s 踢出遊戲！" -#: src/multiint.cpp:3073 +#: src/multiint.cpp:3082 msgid "Host is Starting Game" msgstr "主玩家已開始遊戲" -#: src/multiint.cpp:3639 +#: src/multiint.cpp:3648 msgid "Players" msgstr "玩家" -#: src/multiint.cpp:3772 +#: src/multiint.cpp:3786 #, c-format msgid "Sending Map: %d%% " msgstr "" -#: src/multiint.cpp:3780 +#: src/multiint.cpp:3794 #, c-format msgid "Map: %d%% downloaded" msgstr "" -#: src/multiint.cpp:3803 +#: src/multiint.cpp:3820 msgid "HOST" msgstr "" +#: src/multiint.cpp:3827 +#: src/multimenu.cpp:772 +msgid "Ping" +msgstr "Ping" + #: src/multijoin.cpp:100 #: src/multijoin.cpp:101 msgid "Players Still Joining" @@ -14649,17 +14654,17 @@ msgstr "%s 已離開遊戲" msgid "File transfer has been aborted for %d." msgstr "" -#: src/multijoin.cpp:376 +#: src/multijoin.cpp:373 #, c-format msgid "%s (%u) has an incompatible mod, and has been kicked." msgstr "" -#: src/multijoin.cpp:415 +#: src/multijoin.cpp:412 #, c-format msgid "%s is Joining the Game" msgstr "%s 加入遊戲" -#: src/multijoin.cpp:425 +#: src/multijoin.cpp:422 #, fuzzy msgid "System message:" msgstr "系統語系" @@ -14774,10 +14779,6 @@ msgstr "殺敵數" msgid "Units" msgstr "單位" -#: src/multimenu.cpp:772 -msgid "Ping" -msgstr "Ping" - #: src/multimenu.cpp:776 msgid "Structs" msgstr "建築" @@ -14811,84 +14812,84 @@ msgstr "提供玩家能源" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "" -#: src/multiplay.cpp:1146 +#: src/multiplay.cpp:1057 #, fuzzy msgid "(allies" msgstr "同盟" -#: src/multiplay.cpp:1154 +#: src/multiplay.cpp:1065 msgid "(private to " msgstr "" -#: src/multiplay.cpp:1167 +#: src/multiplay.cpp:1078 msgid "[invalid]" msgstr "" -#: src/multiplay.cpp:2057 +#: src/multiplay.cpp:1942 msgid "Green" msgstr "綠色" -#: src/multiplay.cpp:2058 +#: src/multiplay.cpp:1943 msgid "Orange" msgstr "橙色" -#: src/multiplay.cpp:2059 +#: src/multiplay.cpp:1944 msgid "Grey" msgstr "灰色" -#: src/multiplay.cpp:2060 +#: src/multiplay.cpp:1945 msgid "Black" msgstr "黑色" -#: src/multiplay.cpp:2061 +#: src/multiplay.cpp:1946 msgid "Red" msgstr "紅色" -#: src/multiplay.cpp:2062 +#: src/multiplay.cpp:1947 msgid "Blue" msgstr "藍色" -#: src/multiplay.cpp:2063 +#: src/multiplay.cpp:1948 msgid "Pink" msgstr "粉紅色" -#: src/multiplay.cpp:2064 +#: src/multiplay.cpp:1949 msgid "Cyan" msgstr "青綠色" -#: src/multiplay.cpp:2065 +#: src/multiplay.cpp:1950 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:2066 +#: src/multiplay.cpp:1951 msgid "Purple" msgstr "" -#: src/multiplay.cpp:2067 +#: src/multiplay.cpp:1952 msgid "White" msgstr "" -#: src/multiplay.cpp:2068 +#: src/multiplay.cpp:1953 msgid "Bright blue" msgstr "" -#: src/multiplay.cpp:2069 +#: src/multiplay.cpp:1954 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:2070 +#: src/multiplay.cpp:1955 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:2071 +#: src/multiplay.cpp:1956 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:2072 +#: src/multiplay.cpp:1957 msgid "Brown" msgstr "" -#: src/order.cpp:841 +#: src/order.cpp:800 msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "" @@ -15023,20 +15024,20 @@ msgstr "全部遊戲時間 - %s" msgid "You cheated!" msgstr "" -#: src/scriptfuncs.cpp:3250 +#: src/scriptfuncs.cpp:3287 msgid "YOU ARE VICTORIOUS!" msgstr "你獲勝了！" -#: src/scriptfuncs.cpp:3254 +#: src/scriptfuncs.cpp:3291 msgid "YOU WERE DEFEATED!" msgstr "你被打敗了！" -#: src/scriptfuncs.cpp:9500 +#: src/scriptfuncs.cpp:9537 #, c-format msgid "Beacon received from %s!" msgstr "由 %s 獲得引導指標" -#: src/scriptfuncs.cpp:9546 +#: src/scriptfuncs.cpp:9583 #, c-format msgid "Beacon %d" msgstr "引導指標 %d" @@ -15064,61 +15065,61 @@ msgstr "找不到任何雷達單位！" msgid "Unable to locate any Commanders!" msgstr "找不到任何指揮官車！" -#: src/structure.cpp:2615 +#: src/structure.cpp:2614 msgid "Command Control Limit Reached - Production Halted" msgstr "已達到可控制單位總數上限，停止生產新單位" -#: src/structure.cpp:5815 -#: src/structure.cpp:5840 +#: src/structure.cpp:5806 +#: src/structure.cpp:5831 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" msgstr[0] "%s - 已指派 %u 單位" -#: src/structure.cpp:5845 -#: src/structure.cpp:5913 -#: src/structure.cpp:5929 -#: src/structure.cpp:5943 +#: src/structure.cpp:5836 +#: src/structure.cpp:5904 +#: src/structure.cpp:5920 +#: src/structure.cpp:5934 #, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - 損傷 %3.0f%%" -#: src/structure.cpp:5895 +#: src/structure.cpp:5886 #, c-format msgid "%s - Connected %u of %u" msgstr "%s - 連接鑽油井數量 %u of %u" -#: src/structure.cpp:6059 -#: src/structure.cpp:6104 +#: src/structure.cpp:6050 +#: src/structure.cpp:6095 #, c-format msgid "%s - Electronically Damaged" msgstr "%s -電子傷害" -#: src/structure.cpp:6341 +#: src/structure.cpp:6332 msgid "Electronic Reward - Visibility Report" msgstr "電子回饋—可檢視報告" -#: src/structure.cpp:6381 +#: src/structure.cpp:6372 msgid "Factory Reward - Propulsion" msgstr "工廠獎勵—推進動力" -#: src/structure.cpp:6405 +#: src/structure.cpp:6396 msgid "Factory Reward - Body" msgstr "工廠獎勵—車身" -#: src/structure.cpp:6429 +#: src/structure.cpp:6420 msgid "Factory Reward - Weapon" msgstr "工廠獎勵—武器" -#: src/structure.cpp:6438 +#: src/structure.cpp:6429 msgid "Factory Reward - Nothing" msgstr "工廠獎勵—無" -#: src/structure.cpp:6466 +#: src/structure.cpp:6457 msgid "Repair Facility Award - Repair" msgstr "修理中心獎勵—修理" -#: src/structure.cpp:6473 +#: src/structure.cpp:6464 msgid "Repair Facility Award - Nothing" msgstr "修理工廠回饋—無" From 31251248042d2fb07d95170ef3e01a55891d2b86 Mon Sep 17 00:00:00 2001 From: Cyp Date: Sat, 26 Feb 2011 01:44:09 +0100 Subject: [PATCH 05/59] Make IdToStruct search mission data, so factories work during missions. --- src/multiplay.cpp | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/src/multiplay.cpp b/src/multiplay.cpp index 45c4effc6..cd61b5ad6 100644 --- a/src/multiplay.cpp +++ b/src/multiplay.cpp @@ -322,11 +322,18 @@ DROID *IdToDroid(UDWORD id, UDWORD player) // find a structure STRUCTURE *IdToStruct(UDWORD id, UDWORD player) { - if (player == ANYPLAYER) + int beginPlayer = 0, endPlayer = MAX_PLAYERS; + if (player != ANYPLAYER) { - for (int i = 0; i < MAX_PLAYERS; i++) + beginPlayer = player; + endPlayer = std::min(player + 1, MAX_PLAYERS); + } + STRUCTURE **lists[2] = {apsStructLists, mission.apsStructLists}; + for (int j = 0; j < 2; ++j) + { + for (int i = beginPlayer; i < endPlayer; ++i) { - for (STRUCTURE *d = apsStructLists[i]; d; d = d->psNext) + for (STRUCTURE *d = lists[j][i]; d; d = d->psNext) { if (d->id == id) { @@ -335,16 +342,6 @@ STRUCTURE *IdToStruct(UDWORD id, UDWORD player) } } } - else if (player < MAX_PLAYERS) - { - for (STRUCTURE *d = apsStructLists[player]; d; d = d->psNext) - { - if (d->id == id) - { - return d; - } - } - } return NULL; } From 7f55f5a048f6cea2e4d70fea1758a389e5f05edf Mon Sep 17 00:00:00 2001 From: Cyp Date: Sat, 26 Feb 2011 01:44:57 +0100 Subject: [PATCH 06/59] Save/restore psBlockMap and psAuxMap during missions, to prevent weird crashes at the end of missions. Mission stuff is very confusing, but whether or not it is correct now, it at least doesn't crash. --- src/map.cpp | 2 +- src/mission.cpp | 52 ++++++++++++++++++++++++++++++++++++++++++++---- src/missiondef.h | 2 ++ 3 files changed, 51 insertions(+), 5 deletions(-) diff --git a/src/map.cpp b/src/map.cpp index b6a7dca4b..ad7370ca5 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -905,7 +905,7 @@ BOOL mapLoad(char *filename, BOOL preview) scrollMaxY = mapHeight; /* Allocate aux maps */ - psBlockMap[AUX_MAP] = (uint8_t *)malloc(mapWidth * mapHeight * sizeof(*psAuxMap[0])); + psBlockMap[AUX_MAP] = (uint8_t *)malloc(mapWidth * mapHeight * sizeof(*psBlockMap[0])); psBlockMap[AUX_ASTARMAP] = (uint8_t *)malloc(mapWidth * mapHeight * sizeof(*psBlockMap[0])); psBlockMap[AUX_DANGERMAP] = (uint8_t *)malloc(mapWidth * mapHeight * sizeof(*psBlockMap[0])); for (x = 0; x < MAX_PLAYERS + AUX_MAX; x++) diff --git a/src/mission.cpp b/src/mission.cpp index d28cf9874..fd0182f8d 100644 --- a/src/mission.cpp +++ b/src/mission.cpp @@ -241,11 +241,9 @@ BOOL missionLimboExpand(void) // mission initialisation game code void initMission(void) { - UDWORD inc; - debug(LOG_SAVE, "*** Init Mission ***"); mission.type = LDS_NONE; - for (inc = 0; inc < MAX_PLAYERS; inc++) + for (int inc = 0; inc < MAX_PLAYERS; inc++) { mission.apsStructLists[inc] = NULL; mission.apsDroidLists[inc] = NULL; @@ -265,9 +263,17 @@ void initMission(void) mission.psGateways = NULL; mission.mapHeight = 0; mission.mapWidth = 0; + for (int i = 0; i < ARRAY_SIZE(mission.psBlockMap); ++i) + { + mission.psBlockMap[i] = NULL; + } + for (int i = 0; i < ARRAY_SIZE(mission.psAuxMap); ++i) + { + mission.psAuxMap[i] = NULL; + } //init all the landing zones - for (inc = 0; inc < MAX_NOGO_AREAS; inc++) + for (int inc = 0; inc < MAX_NOGO_AREAS; inc++) { sLandingZone[inc].x1 = sLandingZone[inc].y1 = sLandingZone[inc].x2 = sLandingZone[inc].y2 = 0; } @@ -336,6 +342,18 @@ BOOL missionShutDown(void) psMapTiles = mission.psMapTiles; mapWidth = mission.mapWidth; mapHeight = mission.mapHeight; + for (int i = 0; i < ARRAY_SIZE(mission.psBlockMap); ++i) + { + free(psBlockMap[i]); + psBlockMap[i] = mission.psBlockMap[i]; + mission.psBlockMap[i] = NULL; + } + for (int i = 0; i < ARRAY_SIZE(mission.psAuxMap); ++i) + { + free(psAuxMap[i]); + psAuxMap[i] = mission.psAuxMap[i]; + mission.psAuxMap[i] = NULL; + } gwSetGateways(mission.psGateways); } @@ -731,6 +749,14 @@ static void saveMissionData(void) mission.psMapTiles = psMapTiles; mission.mapWidth = mapWidth; mission.mapHeight = mapHeight; + for (int i = 0; i < ARRAY_SIZE(mission.psBlockMap); ++i) + { + mission.psBlockMap[i] = psBlockMap[i]; + } + for (int i = 0; i < ARRAY_SIZE(mission.psAuxMap); ++i) + { + mission.psAuxMap[i] = psAuxMap[i]; + } mission.scrollMinX = scrollMinX; mission.scrollMinY = scrollMinY; mission.scrollMaxX = scrollMaxX; @@ -888,6 +914,16 @@ void restoreMissionData(void) mapWidth = mission.mapWidth; mapHeight = mission.mapHeight; + for (int i = 0; i < ARRAY_SIZE(mission.psBlockMap); ++i) + { + psBlockMap[i] = mission.psBlockMap[i]; + mission.psBlockMap[i] = NULL; + } + for (int i = 0; i < ARRAY_SIZE(mission.psAuxMap); ++i) + { + psAuxMap[i] = mission.psAuxMap[i]; + mission.psAuxMap[i] = NULL; + } scrollMinX = mission.scrollMinX; scrollMinY = mission.scrollMinY; scrollMaxX = mission.scrollMaxX; @@ -1425,6 +1461,14 @@ void swapMissionPointers(void) std::swap(psMapTiles, mission.psMapTiles); std::swap(mapWidth, mission.mapWidth); std::swap(mapHeight, mission.mapHeight); + for (int i = 0; i < ARRAY_SIZE(mission.psBlockMap); ++i) + { + std::swap(psBlockMap[i], mission.psBlockMap[i]); + } + for (int i = 0; i < ARRAY_SIZE(mission.psAuxMap); ++i) + { + std::swap(psAuxMap[i], mission.psAuxMap[i]); + } //swap gateway zones GATEWAY *gateway = gwGetGateways(); gwSetGateways(mission.psGateways); diff --git a/src/missiondef.h b/src/missiondef.h index 332a1472e..f76da706d 100644 --- a/src/missiondef.h +++ b/src/missiondef.h @@ -55,6 +55,8 @@ struct MISSION MAPTILE *psMapTiles; //the original mapTiles int32_t mapWidth; //the original mapWidth int32_t mapHeight; //the original mapHeight + uint8_t * psBlockMap[AUX_MAX]; + uint8_t * psAuxMap[MAX_PLAYERS + AUX_MAX]; GATEWAY * psGateways; //the gateway list int32_t scrollMinX; //scroll coords for original map int32_t scrollMinY; From 879c6ea4d89f58d756d456ea912bf510262e06d8 Mon Sep 17 00:00:00 2001 From: Cyp Date: Sat, 26 Feb 2011 19:01:10 +0100 Subject: [PATCH 07/59] Don't syncDebug isHumanPlayer. Caused desynch dumps when players leave. Fixes ticket:2501. --- src/loop.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/loop.cpp b/src/loop.cpp index 6c785b2e7..72fe06337 100644 --- a/src/loop.cpp +++ b/src/loop.cpp @@ -158,7 +158,10 @@ GAMECODE gameLoop(void) if (gameTicked) { - syncDebug("map = \"%s\", humanPlayers = %d %d %d %d %d %d %d %d", game.map, isHumanPlayer(0), isHumanPlayer(1), isHumanPlayer(2), isHumanPlayer(3), isHumanPlayer(4), isHumanPlayer(5), isHumanPlayer(6), isHumanPlayer(7)); + // Can't dump isHumanPlayer, since it causes spurious desynch dumps when players leave. + // TODO isHumanPlayer should probably be synchronised, since the game state seems to depend on it, so there might also be a risk of real desynchs when players leave. + //syncDebug("map = \"%s\", humanPlayers = %d %d %d %d %d %d %d %d", game.map, isHumanPlayer(0), isHumanPlayer(1), isHumanPlayer(2), isHumanPlayer(3), isHumanPlayer(4), isHumanPlayer(5), isHumanPlayer(6), isHumanPlayer(7)); + syncDebug("map = \"%s\"", game.map); // Actually send pending droid orders. sendQueuedDroidInfo(); From 3889f42f2538a9bb383df23a301e44bc3b004209 Mon Sep 17 00:00:00 2001 From: Cyp Date: Sat, 26 Feb 2011 19:15:07 +0100 Subject: [PATCH 08/59] If a droid has ID 0, change it to the arbitrary ID 0xFEDBCA98 after the assertion. Fixes ticket:2498. --- src/droid.cpp | 1 + src/structure.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/src/droid.cpp b/src/droid.cpp index c0397b063..5fa11c7a9 100644 --- a/src/droid.cpp +++ b/src/droid.cpp @@ -4544,6 +4544,7 @@ void checkDroid(const DROID *droid, const char *const location, const char *func ASSERT_HELPER(droid != NULL, location, function, "CHECK_DROID: NULL pointer"); ASSERT_HELPER(droid->id != 0, location, function, "CHECK_DROID: Droid with ID 0"); + if (droid->id == 0) const_cast(droid->id) = 0xFEDBCA98; // HACK Don't spam assertions in maps with a droid with droid ID 0. ASSERT_HELPER(droid->type == OBJ_DROID, location, function, "CHECK_DROID: Not droid (type %d)", (int)droid->type); ASSERT_HELPER(droid->numWeaps <= DROID_MAXWEAPS, location, function, "CHECK_DROID: Bad number of droid weapons %d", (int)droid->numWeaps); ASSERT_HELPER((unsigned)droid->listSize <= droid->asOrderList.size() && (unsigned)droid->listPendingBegin <= droid->asOrderList.size(), location, function, "CHECK_DROID: Bad number of droid orders %d %d %d", (int)droid->listSize, (int)droid->listPendingBegin, (int)droid->asOrderList.size()); diff --git a/src/structure.cpp b/src/structure.cpp index 5fd579204..41b24e9e6 100644 --- a/src/structure.cpp +++ b/src/structure.cpp @@ -7801,6 +7801,7 @@ void checkStructure(const STRUCTURE* psStructure, const char * const location_de ASSERT_HELPER(psStructure != NULL, location_description, function, "CHECK_STRUCTURE: NULL pointer"); ASSERT_HELPER(psStructure->id != 0, location_description, function, "CHECK_STRUCTURE: Structure with ID 0"); + if (psStructure->id == 0) const_cast(psStructure->id) = 0xFEDBCA98; // HACK Don't spam assertions in maps with a structure with structure ID 0. ASSERT_HELPER(psStructure->type == OBJ_STRUCTURE, location_description, function, "CHECK_STRUCTURE: No structure (type num %u)", (unsigned int)psStructure->type); ASSERT_HELPER(psStructure->player < MAX_PLAYERS, location_description, function, "CHECK_STRUCTURE: Out of bound player num (%u)", (unsigned int)psStructure->player); ASSERT_HELPER(psStructure->pStructureType->type < NUM_DIFF_BUILDINGS, location_description, function, "CHECK_STRUCTURE: Out of bound structure type (%u)", (unsigned int)psStructure->pStructureType->type); From bfe900b78e3ecb9f146cd68cb86bebe84a856ac5 Mon Sep 17 00:00:00 2001 From: safety0ff Date: Sat, 26 Feb 2011 14:38:04 -0500 Subject: [PATCH 09/59] Use QuesoGLC's pkg-config file for build configuration. Closes #2458. --- configure.ac | 23 +---------------------- win32/libs/quesoglc/Makefile | 9 ++++++++- 2 files changed, 9 insertions(+), 23 deletions(-) diff --git a/configure.ac b/configure.ac index 651aacbf8..e8c613362 100644 --- a/configure.ac +++ b/configure.ac @@ -338,13 +338,7 @@ AS_IF([test "x$enable_sound" = "xyes"],[ PKG_CHECK_MODULES([OGGVORBIS], [vorbisfile >= 1.1]) ]) -if test "x$enable_static" = "xyes" ; then - # If linking statically, make sure to include the direct dependencies of - # QuesoGLC as well, because it does not have a pkg-config file. - # FIXME Remove this whenever QuesoGLC has a pkg-config file - PKG_CHECK_MODULES([FONTCONFIG], [fontconfig]) - PKG_CHECK_MODULES([FREETYPE], [freetype2]) -fi +PKG_CHECK_MODULES([OPENGLC], [quesoglc >= 0.7.2]) system_glee=false if test "x$host_os_mingw32" != "xyes" ; then @@ -418,21 +412,6 @@ AC_CHECK_LIB(GLU, main, [${OPENGL_LIBS} -lm]), [${OPENGL_LIBS} -lm]) AC_SUBST([OPENGL_LIBS], [${OPENGL_LIBS}]) -# Look for OpenGLC -AC_CHECK_HEADER(GL/glc.h, , - AC_MSG_ERROR([OpenGLC header not found. Please install QuesoGLC: http://quesoglc.sourceforge.net/])) -AC_CHECK_LIB(GLC, main, - OPENGLC_LIBS="-lGLC", - AC_CHECK_LIB(glc32, main, - OPENGLC_LIBS="-lglc32", - AC_MSG_ERROR([OpenGLC library not found. Please install QuesoGLC: http://quesoglc.sourceforge.net/]))) -if test "x$enable_static" = "xyes" ; then - # If linking statically, make sure to link against the direct dependencies, too. - # FIXME Remove this whenever QuesoGLC has a pkg-config file - OPENGLC_LIBS="${OPENGLC_LIBS} ${FONTCONFIG_LIBS} ${FREETYPE_LIBS}" -fi -AC_SUBST([OPENGLC_LIBS], [${OPENGLC_LIBS}]) - # When (cross-)compiling for Windows (MinGW) we need to link in BFD for the Dr. # MinGW derived exception handler. if test "x$host_os_mingw32" = "xyes" ; then diff --git a/win32/libs/quesoglc/Makefile b/win32/libs/quesoglc/Makefile index 1724da535..bba3cd131 100644 --- a/win32/libs/quesoglc/Makefile +++ b/win32/libs/quesoglc/Makefile @@ -10,7 +10,8 @@ PKG_MD5SUM:=b009f87f5cc2e79106cf1bf8ca45418d TARGETS:= \ $(TOPDIR)/build/libs/lib/libGLC.la \ - $(TOPDIR)/build/libs/include/GL/glc.h + $(TOPDIR)/build/libs/include/GL/glc.h \ + $(TOPDIR)/build/libs/lib/pkgconfig/quesoglc.pc include $(TOPDIR)/rules.mk @@ -39,6 +40,12 @@ $(PKG_SOURCEBASE)/build/libGLC.la: $(PKG_SOURCEBASE)/config.status $(TOPDIR)/build/libs/lib/libGLC.la: $(PKG_SOURCEBASE)/build/libGLC.la $(MAKE) -C $(PKG_SOURCEBASE)/build install-libLTLIBRARIES +$(PKG_SOURCEBASE)/quesoglc.pc: $(PKG_SOURCEBASE)/config.status + $(MAKE) -C $(PKG_SOURCEBASE) quesoglc.pc && sed -i -e "s/,\s*$$//" $(PKG_SOURCEBASE)/quesoglc.pc # Remove extraneous comma (autoconfigure artifact) + +$(TOPDIR)/build/libs/lib/pkgconfig/quesoglc.pc: $(PKG_SOURCEBASE)/quesoglc.pc + $(MAKE) -C $(PKG_SOURCEBASE) install-pkgconfigDATA + $(PKG_SOURCEBASE)/include/GL/glc.h: extract-stamp $(TOPDIR)/build/libs/include/GL/glc.h: $(PKG_SOURCEBASE)/include/GL/glc.h $(PKG_SOURCEBASE)/config.status From 88788ad5014d31f617896446833c3bcee1e67421 Mon Sep 17 00:00:00 2001 From: Per Inge Mathisen Date: Sun, 27 Feb 2011 10:26:26 +0100 Subject: [PATCH 10/59] Move kick button back into its proper place. Closes ticket:2506 --- src/multiint.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/multiint.cpp b/src/multiint.cpp index 4166e50e7..8152b625c 100644 --- a/src/multiint.cpp +++ b/src/multiint.cpp @@ -2038,10 +2038,7 @@ static void addTeamChooser(UDWORD player) initChooser(player); // add form. - addBlueForm(MULTIOP_PLAYERS,MULTIOP_TEAMCHOOSER_FORM,"", - 7, - playerBoxHeight(player), - MULTIOP_ROW_WIDTH,MULTIOP_TEAMSHEIGHT); + addBlueForm(MULTIOP_PLAYERS, MULTIOP_TEAMCHOOSER_FORM, "", 7, playerBoxHeight(player), MULTIOP_ROW_WIDTH, MULTIOP_TEAMSHEIGHT); // tally up the team counts for (i=0; i< game.maxPlayers ; i++) @@ -2076,11 +2073,10 @@ static void addTeamChooser(UDWORD player) // add a kick button if (player != selectedPlayer && NetPlay.bComms && NetPlay.isHost && NetPlay.players[player].allocated) { - addMultiBut(psWScreen,MULTIOP_TEAMCHOOSER_FORM, MULTIOP_TEAMCHOOSER_KICK, - 8*(teamW + 5) + 7, 8, - iV_GetImageWidth(FrontImages,IMAGE_NOJOIN), //w - iV_GetImageHeight(FrontImages,IMAGE_NOJOIN), //h - _("Kick player"), IMAGE_NOJOIN, IMAGE_NOJOIN, IMAGE_NOJOIN); + const int imgwidth = iV_GetImageWidth(FrontImages, IMAGE_NOJOIN); + const int imgheight = iV_GetImageHeight(FrontImages, IMAGE_NOJOIN); + addMultiBut(psWScreen, MULTIOP_TEAMCHOOSER_FORM, MULTIOP_TEAMCHOOSER_KICK, MULTIOP_ROW_WIDTH - imgwidth - 4, 8, imgwidth, imgheight, + ("Kick player"), IMAGE_NOJOIN, IMAGE_NOJOIN, IMAGE_NOJOIN); } teamChooserUp = player; From 639f735b2721c9a41d52341fade58d8909f1b467 Mon Sep 17 00:00:00 2001 From: Per Inge Mathisen Date: Sun, 27 Feb 2011 10:56:01 +0100 Subject: [PATCH 11/59] Add some kind of checking, so that things don't get lasatted by bunkers. --- src/multistruct.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/multistruct.cpp b/src/multistruct.cpp index 0fd333385..506623259 100644 --- a/src/multistruct.cpp +++ b/src/multistruct.cpp @@ -258,7 +258,6 @@ BOOL recvLasSat(NETQUEUE queue) STRUCTURE *psStruct; uint32_t id,targetid; - // TODO Add some kind of checking, so that things don't get lasatted by bunkers. NETbeginDecode(queue, GAME_LASSAT); NETuint8_t(&player); NETuint32_t(&id); @@ -269,7 +268,7 @@ BOOL recvLasSat(NETQUEUE queue) psStruct = IdToStruct (id, player); psObj = IdToPointer(targetid, targetplayer); - if (psStruct && psObj) + if (psStruct && psObj && psStruct->pStructureType->psWeapStat[0]->weaponSubClass == WSC_LAS_SAT) { // Give enemy no quarter, unleash the lasat proj_SendProjectile(&psStruct->asWeaps[0], NULL, player, psObj->pos, psObj, true, 0); From 97097da97adde736487b586f95bfbc2cd75df348 Mon Sep 17 00:00:00 2001 From: Cyp Date: Sun, 27 Feb 2011 11:19:10 +0100 Subject: [PATCH 12/59] Try to prevent patrolling/scouting droids from forgetting to stop when encountering something. --- src/action.cpp | 33 +++++++++++++++------------------ src/order.cpp | 2 +- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/src/action.cpp b/src/action.cpp index b5b6e1972..5cd18475e 100644 --- a/src/action.cpp +++ b/src/action.cpp @@ -999,22 +999,27 @@ void actionUpdateDroid(DROID *psDroid) break; case DACTION_MOVE: + case DACTION_RETURNTOPOS: + case DACTION_FIRESUPPORT_RETREAT: // moving to a location if (DROID_STOPPED(psDroid)) { + bool notify = psDroid->action == DACTION_MOVE; // Got to destination psDroid->action = DACTION_NONE; - /* notify scripts we have reached the destination - * also triggers when patrolling and reached a waypoint - */ - psScrCBOrder = psDroid->order; - psScrCBOrderDroid = psDroid; - eventFireCallbackTrigger((TRIGGER_TYPE)CALL_DROID_REACH_LOCATION); - psScrCBOrderDroid = NULL; - psScrCBOrder = DORDER_NONE; + if (notify) + { + /* notify scripts we have reached the destination + * also triggers when patrolling and reached a waypoint + */ + psScrCBOrder = psDroid->order; + psScrCBOrderDroid = psDroid; + eventFireCallbackTrigger((TRIGGER_TYPE)CALL_DROID_REACH_LOCATION); + psScrCBOrderDroid = NULL; + psScrCBOrder = DORDER_NONE; + } } - //added multiple weapon check else if (psDroid->numWeaps > 0) { @@ -1035,21 +1040,13 @@ void actionUpdateDroid(DROID *psDroid) if (secondaryGetState(psDroid, DSO_ATTACK_LEVEL) == DSS_ALEV_ALWAYS) { psDroid->action = DACTION_MOVEFIRE; - setDroidActionTarget(psDroid, psTemp, 0); + setDroidActionTarget(psDroid, psTemp, i); } } } } } break; - case DACTION_RETURNTOPOS: - case DACTION_FIRESUPPORT_RETREAT: - if (DROID_STOPPED(psDroid)) - { - // Got to destination - psDroid->action = DACTION_NONE; - } - break; case DACTION_TRANSPORTIN: case DACTION_TRANSPORTOUT: actionUpdateTransporter( psDroid ); diff --git a/src/order.cpp b/src/order.cpp index d32e2ced1..ca6fab00e 100644 --- a/src/order.cpp +++ b/src/order.cpp @@ -469,7 +469,7 @@ void orderUpdateDroid(DROID *psDroid) case DORDER_SCOUT: case DORDER_PATROL: // if there is an enemy around, attack it - if (psDroid->action == DACTION_MOVE || (psDroid->action == DACTION_NONE && isVtolDroid(psDroid))) + if (psDroid->action == DACTION_MOVE || psDroid->action == DACTION_MOVEFIRE || (psDroid->action == DACTION_NONE && isVtolDroid(psDroid))) { bool tooFarFromPath = false; if (isVtolDroid(psDroid) && psDroid->order == DORDER_PATROL) From 31c6586f9c338c0415aa9f39eb59a54f38a90d1e Mon Sep 17 00:00:00 2001 From: Cyp Date: Sun, 27 Feb 2011 12:10:40 +0100 Subject: [PATCH 13/59] Fix crash in moveBestTarget when sMove.Position == 0. The moveBestTarget function could be called while sMove.Position == 0, if moveCalcBlockingSlide detected a gate and changed the status to MOVEPAUSE. To reproduce the crash (before this commit), add a bunch of gates and a bunch of droids, and have the droids patrol near the gates, and wait a while. Renamed sMove.Position to sMove.pathIndex to reduce confusion and to verify all uses of it. --- src/astar.cpp | 4 ++-- src/display3d.cpp | 5 ++--- src/droid.cpp | 2 +- src/fpath.cpp | 2 +- src/game.cpp | 4 ++-- src/move.cpp | 40 ++++++++++++++++++++-------------------- src/movedef.h | 4 ++-- 7 files changed, 30 insertions(+), 31 deletions(-) diff --git a/src/astar.cpp b/src/astar.cpp index 47400f608..4ce239f00 100644 --- a/src/astar.cpp +++ b/src/astar.cpp @@ -461,8 +461,8 @@ ASR_RETVAL fpathAStarRoute(MOVE_CONTROL *psMove, PATHJOB *psJob) } } - // TODO FIXME once we can change numPoints to something larger than uint16_t - psMove->numPoints = std::min(UINT16_MAX, path.size()); + // TODO FIXME once we can change numPoints to something larger than int + psMove->numPoints = std::min(INT32_MAX - 1, path.size()); // Allocate memory psMove->asPath = static_cast(malloc(sizeof(*psMove->asPath) * path.size())); diff --git a/src/display3d.cpp b/src/display3d.cpp index 6f4c93249..4692eb452 100644 --- a/src/display3d.cpp +++ b/src/display3d.cpp @@ -409,7 +409,7 @@ static void showDroidPaths(void) { DROID *psDroid; - if (((gameTime2 / 250) % 2) != 0) + if ((graphicsTime / 250 % 2) != 0) { return; } @@ -418,10 +418,9 @@ static void showDroidPaths(void) { if (psDroid->selected && psDroid->sMove.Status != MOVEINACTIVE) { - int i; int len = psDroid->sMove.numPoints; - i = MAX(psDroid->sMove.Position-1,0); + int i = std::max(psDroid->sMove.pathIndex - 1, 0); for (; i < len; i++) { Vector3i pos; diff --git a/src/droid.cpp b/src/droid.cpp index 5fa11c7a9..42d2eccd3 100644 --- a/src/droid.cpp +++ b/src/droid.cpp @@ -720,7 +720,7 @@ void _syncDebugDroid(const char *function, DROID const *psDroid, char ch) psDroid->body, psDroid->sMove.Status, psDroid->sMove.speed, psDroid->sMove.moveDir, - psDroid->sMove.Position, psDroid->sMove.numPoints, + psDroid->sMove.pathIndex, psDroid->sMove.numPoints, psDroid->sMove.src.x, psDroid->sMove.src.y, psDroid->sMove.target.x, psDroid->sMove.target.y, psDroid->sMove.destination.x, psDroid->sMove.destination.y, psDroid->sMove.bumpDir, psDroid->sMove.bumpTime, psDroid->sMove.lastBump, psDroid->sMove.pauseTime, psDroid->sMove.bumpX, psDroid->sMove.bumpY, psDroid->sMove.shuffleStart, psDroid->experience, diff --git a/src/fpath.cpp b/src/fpath.cpp index 4fb6fc518..e3b535512 100644 --- a/src/fpath.cpp +++ b/src/fpath.cpp @@ -376,7 +376,7 @@ static FPATH_RETVAL fpathRoute(MOVE_CONTROL *psMove, int id, int startX, int sta // Copy over select fields - preserve others psMove->destination = psResult->sMove.destination; psMove->numPoints = psResult->sMove.numPoints; - psMove->Position = 0; + psMove->pathIndex = 0; psMove->Status = MOVENAVIGATE; free(psMove->asPath); psMove->asPath = psResult->sMove.asPath; diff --git a/src/game.cpp b/src/game.cpp index f3579af35..857e8384e 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -5055,7 +5055,7 @@ static void SaveDroidMoveControl(SAVE_DROID * const psSaveDroid, DROID const * c // Copy over the endian neutral stuff (all UBYTE) psSaveDroid->sMove.Status = psDroid->sMove.Status; - psSaveDroid->sMove.Position = psDroid->sMove.Position; + psSaveDroid->sMove.Position = psDroid->sMove.pathIndex; psSaveDroid->sMove.numPoints = MIN(psDroid->sMove.numPoints, TRAVELSIZE); for (i = 0; i < MIN(psDroid->sMove.numPoints, TRAVELSIZE); i++) { @@ -5112,7 +5112,7 @@ static void LoadDroidMoveControl(DROID * const psDroid, SAVE_DROID const * const // Copy over the endian neutral stuff (all UBYTE) psDroid->sMove.Status = (MOVE_STATUS)psSaveDroid->sMove.Status; - psDroid->sMove.Position = psSaveDroid->sMove.Position; + psDroid->sMove.pathIndex = psSaveDroid->sMove.Position; psDroid->sMove.numPoints = psSaveDroid->sMove.numPoints; psDroid->sMove.asPath = (Vector2i *)malloc(sizeof(*psDroid->sMove.asPath) * psDroid->sMove.numPoints); for (i = 0; i < psDroid->sMove.numPoints; i++) diff --git a/src/move.cpp b/src/move.cpp index b366ebcd0..fbb93be77 100644 --- a/src/move.cpp +++ b/src/move.cpp @@ -232,7 +232,7 @@ static BOOL moveDroidToBase(DROID *psDroid, UDWORD x, UDWORD y, BOOL bFormation) { fpathSetDirectRoute(psDroid, x, y); psDroid->sMove.Status = MOVENAVIGATE; - psDroid->sMove.Position=0; + psDroid->sMove.pathIndex = 0; return true; } else if (isVtolDroid(psDroid) || (game.maxPlayers > 0 && psDroid->droidType == DROID_TRANSPORTER)) @@ -258,7 +258,7 @@ static BOOL moveDroidToBase(DROID *psDroid, UDWORD x, UDWORD y, BOOL bFormation) (int)psDroid->id, psDroid->baseSpeed, psDroid->sMove.speed, x, map_coord(x), y, map_coord(y)); psDroid->sMove.Status = MOVENAVIGATE; - psDroid->sMove.Position=0; + psDroid->sMove.pathIndex = 0; } else if (retVal == FPR_WAIT) { @@ -307,7 +307,7 @@ void moveDroidToDirect(DROID* psDroid, UDWORD x, UDWORD y) fpathSetDirectRoute(psDroid, x, y); psDroid->sMove.Status = MOVENAVIGATE; - psDroid->sMove.Position=0; + psDroid->sMove.pathIndex = 0; } @@ -439,7 +439,7 @@ static void moveShuffleDroid(DROID *psDroid, Vector2i s) psDroid->sMove.target.x = tarX; psDroid->sMove.target.y = tarY; psDroid->sMove.numPoints = 0; - psDroid->sMove.Position = 0; + psDroid->sMove.pathIndex = 0; CHECK_DROID(psDroid); } @@ -567,7 +567,7 @@ static int32_t moveDirectPathToWaypoint(DROID *psDroid, unsigned positionIndex) // Returns true if still able to find the path. static bool moveBestTarget(DROID *psDroid) { - int positionIndex = psDroid->sMove.Position - 1; + int positionIndex = std::max(psDroid->sMove.pathIndex - 1, 0); int32_t dist = moveDirectPathToWaypoint(psDroid, positionIndex); if (dist >= 0) { @@ -600,33 +600,33 @@ static bool moveBestTarget(DROID *psDroid) return false; // Couldn't find path, and backtracking didn't help. } } - psDroid->sMove.Position = positionIndex + 1; + psDroid->sMove.pathIndex = positionIndex + 1; psDroid->sMove.src = removeZ(psDroid->pos); psDroid->sMove.target = psDroid->sMove.asPath[positionIndex]; return true; } /* Get the next target point from the route */ -static BOOL moveNextTarget(DROID *psDroid) +static bool moveNextTarget(DROID *psDroid) { CHECK_DROID(psDroid); // See if there is anything left in the move list - if (psDroid->sMove.Position == psDroid->sMove.numPoints) + if (psDroid->sMove.pathIndex == psDroid->sMove.numPoints) { return false; } - if (psDroid->sMove.Position == 0) + if (psDroid->sMove.pathIndex == 0) { psDroid->sMove.src = removeZ(psDroid->pos); } else { - psDroid->sMove.src = psDroid->sMove.asPath[psDroid->sMove.Position - 1]; + psDroid->sMove.src = psDroid->sMove.asPath[psDroid->sMove.pathIndex - 1]; } - psDroid->sMove.target = psDroid->sMove.asPath[psDroid->sMove.Position]; - psDroid->sMove.Position++; + psDroid->sMove.target = psDroid->sMove.asPath[psDroid->sMove.pathIndex]; + ++psDroid->sMove.pathIndex; CHECK_DROID(psDroid); return true; @@ -636,14 +636,14 @@ static BOOL moveNextTarget(DROID *psDroid) static Vector2i movePeekNextTarget(DROID *psDroid) { // See if there is anything left in the move list - if (psDroid->sMove.Position == psDroid->sMove.numPoints) + if (psDroid->sMove.pathIndex == psDroid->sMove.numPoints) { // No points left - fudge one to continue the same direction return psDroid->sMove.target*2 - psDroid->sMove.src; } else { - return psDroid->sMove.asPath[psDroid->sMove.Position]; + return psDroid->sMove.asPath[psDroid->sMove.pathIndex]; } } @@ -791,9 +791,9 @@ static BOOL moveBlocked(DROID *psDroid) objTrace(psDroid->id, "BLOCKED"); // if the unit cannot see the next way point - reroute it's got stuck - if ( ( bMultiPlayer || (psDroid->player == selectedPlayer) ) && - (psDroid->sMove.Position != psDroid->sMove.numPoints) && - !fpathTileLOS(psDroid, Vector3i(psDroid->sMove.destination, 0))) + if ((bMultiPlayer || psDroid->player == selectedPlayer) && + psDroid->sMove.pathIndex != psDroid->sMove.numPoints && + !fpathTileLOS(psDroid, Vector3i(psDroid->sMove.destination, 0))) { objTrace(psDroid->id, "Trying to reroute to (%d,%d)", psDroid->sMove.destination.x, psDroid->sMove.destination.y); moveDroidTo(psDroid, psDroid->sMove.destination.x, psDroid->sMove.destination.y); @@ -1326,11 +1326,11 @@ static uint16_t moveGetDirection(DROID *psDroid) } // Check if a droid has got to a way point -static BOOL moveReachedWayPoint(DROID *psDroid) +static bool moveReachedWayPoint(DROID *psDroid) { // Calculate the vector to the droid const Vector2i droid = removeZ(psDroid->pos) - psDroid->sMove.target; - const bool last = (psDroid->sMove.Position == psDroid->sMove.numPoints); + const bool last = psDroid->sMove.pathIndex == psDroid->sMove.numPoints; const int sqprecision = last ? ((TILE_UNITS / 4) * (TILE_UNITS / 4)) : ((TILE_UNITS / 2) * (TILE_UNITS / 2)); // See if we have reached the next waypoint - occasionally happens due to bumping @@ -1556,7 +1556,7 @@ static void moveCheckFinalWaypoint( DROID *psDroid, SDWORD *pSpeed ) if (*pSpeed > minEndSpeed && (psDroid->sMove.Status != MOVESHUFFLE) && - psDroid->sMove.Position == psDroid->sMove.numPoints) + psDroid->sMove.pathIndex == psDroid->sMove.numPoints) { Vector2i diff = removeZ(psDroid->pos) - psDroid->sMove.target; int distSq = diff*diff; diff --git a/src/movedef.h b/src/movedef.h index baf5933ce..df767d1e0 100644 --- a/src/movedef.h +++ b/src/movedef.h @@ -51,8 +51,8 @@ enum MOVE_STATUS struct MOVE_CONTROL { MOVE_STATUS Status; // Inactive, Navigating or moving point to point status - uint16_t Position; // Position in asPath - uint16_t numPoints; // number of points in asPath + int pathIndex; // Position in asPath + int numPoints; // number of points in asPath Vector2i *asPath; // Pointer to list of block X,Y map coordinates. Vector2i destination; // World coordinates of movement destination From 239eebec0063cd4f7b4b5dacb9de7d18105d47e5 Mon Sep 17 00:00:00 2001 From: Cyp Date: Sun, 27 Feb 2011 20:20:43 +0100 Subject: [PATCH 14/59] Remove GAME_SECONDARY in favour of GAME_DROIDINFO, which is sent more efficiently for multiple droids. Instead of one message per droid, it sends one message for all droids, with the list of droids encoded as droid ID deltas. --- lib/netplay/netplay.cpp | 5 +- lib/netplay/netplay.h | 1 - src/multibot.cpp | 253 ++++++++++++++++++++-------------------- src/multiplay.cpp | 3 - src/multirecv.h | 2 - 5 files changed, 131 insertions(+), 133 deletions(-) diff --git a/lib/netplay/netplay.cpp b/lib/netplay/netplay.cpp index a127b26a1..b77f7ec56 100644 --- a/lib/netplay/netplay.cpp +++ b/lib/netplay/netplay.cpp @@ -168,9 +168,9 @@ unsigned NET_PlayerConnectionStatus[CONNECTIONSTATUS_NORMAL][MAX_PLAYERS]; ** ie ("trunk", "2.1.3", "3.0", ...) ************************************************************************************ **/ -char VersionString[VersionStringSize] = "master, netcode 4.1009"; +char VersionString[VersionStringSize] = "master, netcode 4.1010"; static int NETCODE_VERSION_MAJOR = 4; -static int NETCODE_VERSION_MINOR = 1009; +static int NETCODE_VERSION_MINOR = 1010; bool NETisCorrectVersion(uint32_t game_version_major, uint32_t game_version_minor) { @@ -3267,7 +3267,6 @@ const char *messageTypeToString(unsigned messageType_) case GAME_FEATUREDEST: return "GAME_FEATUREDEST"; case GAME_RESEARCH: return "GAME_RESEARCH"; case GAME_FEATURES: return "GAME_FEATURES"; - case GAME_SECONDARY: return "GAME_SECONDARY"; case GAME_ALLIANCE: return "GAME_ALLIANCE"; case GAME_GIFT: return "GAME_GIFT"; case GAME_ARTIFACTS: return "GAME_ARTIFACTS"; diff --git a/lib/netplay/netplay.h b/lib/netplay/netplay.h index 59ebeb0d8..c552ecbe3 100644 --- a/lib/netplay/netplay.h +++ b/lib/netplay/netplay.h @@ -97,7 +97,6 @@ enum MESSAGE_TYPES GAME_FEATUREDEST, ///< destroy a game feature. GAME_RESEARCH, ///< Research has been completed. GAME_FEATURES, ///< information regarding features. - GAME_SECONDARY, ///< set a droids secondary order GAME_ALLIANCE, ///< alliance data. GAME_GIFT, ///< a luvly gift between players. GAME_ARTIFACTS, ///< artifacts randomly placed. diff --git a/src/multibot.cpp b/src/multibot.cpp index a9de29c99..a03d765a3 100644 --- a/src/multibot.cpp +++ b/src/multibot.cpp @@ -48,6 +48,11 @@ #define ANYPLAYER 99 +enum SubType +{ + ObjOrder, LocOrder, SecondaryOrder +}; + struct QueuedDroidInfo { /// Sorts by order, then finally by droid id, to group multiple droids with the same order. @@ -61,46 +66,59 @@ struct QueuedDroidInfo int orderCompare(QueuedDroidInfo const &z) const { if (player != z.player) return player < z.player ? -1 : 1; - if (order != z.order) return order < z.order ? -1 : 1; if (subType != z.subType) return subType < z.subType ? -1 : 1; - if (subType) + switch (subType) { - if (destId != z.destId) return destId < z.destId ? -1 : 1; - if (destType != z.destType) return destType < z.destType ? -1 : 1; + case ObjOrder: + case LocOrder: + if (order != z.order) return order < z.order ? -1 : 1; + if (subType == ObjOrder) + { + if (destId != z.destId) return destId < z.destId ? -1 : 1; + if (destType != z.destType) return destType < z.destType ? -1 : 1; + } + else + { + if (x != z.x) return x < z.x ? -1 : 1; + if (y != z.y) return y < z.y ? -1 : 1; + } + if (order == DORDER_BUILD || order == DORDER_LINEBUILD) + { + if (structRef != z.structRef) return structRef < z.structRef ? -1 : 1; + if (direction != z.direction) return direction < z.direction ? -1 : 1; + } + if (order == DORDER_LINEBUILD) + { + if (x2 != z.x2) return x2 < z.x2 ? -1 : 1; + if (y2 != z.y2) return y2 < z.y2 ? -1 : 1; + } + if (add != z.add) return add < z.add ? -1 : 1; + break; + case SecondaryOrder: + if (secOrder != z.secOrder) return secOrder < z.secOrder ? -1 : 1; + if (secState != z.secState) return secState < z.secState ? -1 : 1; + break; } - else - { - if (x != z.x) return x < z.x ? -1 : 1; - if (y != z.y) return y < z.y ? -1 : 1; - } - if (order == DORDER_BUILD || order == DORDER_LINEBUILD) - { - if (structRef != z.structRef) return structRef < z.structRef ? -1 : 1; - if (direction != z.direction) return direction < z.direction ? -1 : 1; - } - if (order == DORDER_LINEBUILD) - { - if (x2 != z.x2) return x2 < z.x2 ? -1 : 1; - if (y2 != z.y2) return y2 < z.y2 ? -1 : 1; - } - if (add != z.add) return add < z.add ? -1 : 1; return 0; } uint8_t player; uint32_t droidId; - DROID_ORDER order; - BOOL subType; - uint32_t destId; // if (subType) - OBJECT_TYPE destType; // if (subType) - uint32_t x; // if (!subType) - uint32_t y; // if (!subType) - uint32_t structRef; // if (order == DORDER_BUILD || order == DORDER_LINEBUILD) - uint16_t direction; // if (order == DORDER_BUILD || order == DORDER_LINEBUILD) - uint32_t x2; // if (order == DORDER_LINEBUILD) - uint32_t y2; // if (order == DORDER_LINEBUILD) - - BOOL add; + SubType subType; + // subType == ObjOrder || subType == LocOrder + DROID_ORDER order; + uint32_t destId; // if (subType == ObjOrder) + OBJECT_TYPE destType; // if (subType == ObjOrder) + uint32_t x; // if (subType == LocOrder) + uint32_t y; // if (subType == LocOrder) + uint32_t structRef; // if (order == DORDER_BUILD || order == DORDER_LINEBUILD) + uint16_t direction; // if (order == DORDER_BUILD || order == DORDER_LINEBUILD) + uint32_t x2; // if (order == DORDER_LINEBUILD) + uint32_t y2; // if (order == DORDER_LINEBUILD) + bool add; + // subType == SecondaryOrder + SECONDARY_ORDER secOrder; + SECONDARY_STATE secState; }; static std::vector queuedOrders; @@ -128,50 +146,17 @@ BOOL sendDroidSecondary(const DROID* psDroid, SECONDARY_ORDER sec, SECONDARY_STA if (!bMultiMessages) return true; - NETbeginEncode(NETgameQueue(selectedPlayer), GAME_SECONDARY); - { - uint8_t player = psDroid->player; - uint32_t droid = psDroid->id; + QueuedDroidInfo info; + memset(&info, 0x00, sizeof(info)); // Suppress uninitialised warnings. (The uninitialised values in the queue would be ignored when reading the queue.) - NETuint8_t(&player); - NETuint32_t(&droid); - NETenum(&sec); - NETenum(&state); - } - return NETend(); -} + info.player = psDroid->player; + info.droidId = psDroid->id; + info.subType = SecondaryOrder; + info.secOrder = sec; + info.secState = state; -// recv -BOOL recvDroidSecondary(NETQUEUE queue) -{ - DROID* psDroid; - SECONDARY_ORDER sec = DSO_ATTACK_RANGE; - SECONDARY_STATE state = DSS_NONE; - - NETbeginDecode(queue, GAME_SECONDARY); - { - uint8_t player; - uint32_t droid; - - NETuint8_t(&player); - NETuint32_t(&droid); - NETenum(&sec); - NETenum(&state); - - // If we can not find the droid should we not ask for it? - psDroid = IdToDroid(droid, player); - if (!psDroid) - { - NETend(); - return false; - } - } - NETend(); - - // Set the droids secondary order - turnOffMultiMsg(true); - secondarySetState(psDroid, sec, state); - turnOffMultiMsg(false); + // Send later, grouped by order, so multiple droids with the same order can be encoded to much less data. + queuedOrders.push_back(info); return true; } @@ -503,29 +488,39 @@ BOOL recvDroid(NETQUEUE queue) static void NETQueuedDroidInfo(QueuedDroidInfo *info) { NETuint8_t(&info->player); - NETenum(&info->order); - NETbool(&info->subType); - if (info->subType) + NETenum(&info->subType); + switch (info->subType) { - NETuint32_t(&info->destId); - NETenum(&info->destType); + case ObjOrder: + case LocOrder: + NETenum(&info->order); + if (info->subType == ObjOrder) + { + NETuint32_t(&info->destId); + NETenum(&info->destType); + } + else + { + NETuint32_t(&info->x); + NETuint32_t(&info->y); + } + if (info->order == DORDER_BUILD || info->order == DORDER_LINEBUILD) + { + NETuint32_t(&info->structRef); + NETuint16_t(&info->direction); + } + if (info->order == DORDER_LINEBUILD) + { + NETuint32_t(&info->x2); + NETuint32_t(&info->y2); + } + NETbool(&info->add); + break; + case SecondaryOrder: + NETenum(&info->secOrder); + NETenum(&info->secState); + break; } - else - { - NETuint32_t(&info->x); - NETuint32_t(&info->y); - } - if (info->order == DORDER_BUILD || info->order == DORDER_LINEBUILD) - { - NETuint32_t(&info->structRef); - NETuint16_t(&info->direction); - } - if (info->order == DORDER_LINEBUILD) - { - NETuint32_t(&info->x2); - NETuint32_t(&info->y2); - } - NETbool(&info->add); } // Actually send the droid info. @@ -596,9 +591,9 @@ bool sendDroidInfo(DROID *psDroid, DROID_ORDER order, uint32_t x, uint32_t y, co info.player = psDroid->player; info.droidId = psDroid->id; + info.subType = psObj != NULL? ObjOrder : LocOrder; info.order = order; - info.subType = psObj != NULL; - if (info.subType) + if (info.subType == ObjOrder) { info.destId = psObj->id; info.destType = psObj->type; @@ -646,7 +641,7 @@ BOOL recvDroidInfo(NETQUEUE queue) NETQueuedDroidInfo(&info); STRUCTURE_STATS *psStats = NULL; - if (info.order == DORDER_BUILD || info.order == DORDER_LINEBUILD) + if (info.subType == LocOrder && (info.order == DORDER_BUILD || info.order == DORDER_LINEBUILD)) { // Find structure target for (unsigned typeIndex = 0; typeIndex < numStructureStats; typeIndex++) @@ -659,16 +654,14 @@ BOOL recvDroidInfo(NETQUEUE queue) } } - if (info.subType) + switch (info.subType) { - syncDebug("Order=%s,%d(%d)", getDroidOrderName(info.order), info.destId, info.destType); - } - else - { - syncDebug("Order=%s,(%d,%d)", getDroidOrderName(info.order), info.x, info.y); + case ObjOrder: syncDebug("Order=%s,%d(%d)", getDroidOrderName(info.order), info.destId, info.destType); break; + case LocOrder: syncDebug("Order=%s,(%d,%d)", getDroidOrderName(info.order), info.x, info.y); break; + case SecondaryOrder: syncDebug("SecondaryOrder=%d,%08X", (int)info.secOrder, (int)info.secState); break; } - DROID_ORDER_DATA sOrder = infoToOrderData(info, (BASE_STATS *)psStats); + DROID_ORDER_DATA sOrder = infoToOrderData(info, psStats); uint32_t num = 0; NETuint32_t(&num); @@ -680,7 +673,7 @@ BOOL recvDroidInfo(NETQUEUE queue) NETuint32_t(&deltaDroidId); info.droidId += deltaDroidId; - DROID *psDroid = IdToDroid(info.droidId, ANYPLAYER); + DROID *psDroid = IdToDroid(info.droidId, info.player); if (!psDroid) { debug(LOG_NEVER, "Packet from %d refers to non-existent droid %u, [%s : p%d]", @@ -693,26 +686,38 @@ BOOL recvDroidInfo(NETQUEUE queue) syncDebugDroid(psDroid, '<'); - /* - * If the current order not is a command order and we are not a - * commander yet are in the commander group remove us from it. - */ - if (hasCommander(psDroid)) + switch (info.subType) { - psDroid->psGroup->remove(psDroid); - } + case ObjOrder: + case LocOrder: + /* + * If the current order not is a command order and we are not a + * commander yet are in the commander group remove us from it. + */ + if (hasCommander(psDroid)) + { + psDroid->psGroup->remove(psDroid); + } - if (sOrder.psObj != TargetMissing) // Only do order if the target didn't die. - { - if (!info.add) - { - orderDroidListEraseRange(psDroid, 0, psDroid->listSize + 1); // Clear all non-pending orders, plus the first pending order (which is probably the order we just received). - orderDroidBase(psDroid, &sOrder); // Execute the order immediately (even if in the middle of another order. - } - else - { - orderDroidAdd(psDroid, &sOrder); // Add the order to the (non-pending) list. Will probably overwrite the corresponding pending order, assuming all pending orders were written to the list. - } + if (sOrder.psObj != TargetMissing) // Only do order if the target didn't die. + { + if (!info.add) + { + orderDroidListEraseRange(psDroid, 0, psDroid->listSize + 1); // Clear all non-pending orders, plus the first pending order (which is probably the order we just received). + orderDroidBase(psDroid, &sOrder); // Execute the order immediately (even if in the middle of another order. + } + else + { + orderDroidAdd(psDroid, &sOrder); // Add the order to the (non-pending) list. Will probably overwrite the corresponding pending order, assuming all pending orders were written to the list. + } + } + break; + case SecondaryOrder: + // Set the droids secondary order + turnOffMultiMsg(true); + secondarySetState(psDroid, info.secOrder, info.secState); + turnOffMultiMsg(false); + break; } syncDebugDroid(psDroid, '>'); diff --git a/src/multiplay.cpp b/src/multiplay.cpp index cd61b5ad6..ee20618bf 100644 --- a/src/multiplay.cpp +++ b/src/multiplay.cpp @@ -612,9 +612,6 @@ BOOL recvMessage(void) case GAME_STRUCTDEST: // structure destroy recvDestroyStructure(queue); break; - case GAME_SECONDARY: // set a droids secondary order level. - recvDroidSecondary(queue); - break; case GAME_DROIDEMBARK: recvDroidEmbark(queue); //droid has embarked on a Transporter break; diff --git a/src/multirecv.h b/src/multirecv.h index 4974df669..cb9b2c794 100644 --- a/src/multirecv.h +++ b/src/multirecv.h @@ -39,13 +39,11 @@ extern BOOL recvDemolishFinished (NETQUEUE queue); extern BOOL recvPing (NETQUEUE queue); extern BOOL recvRequestDroid (NETQUEUE queue); extern BOOL recvTextMessage (NETQUEUE queue); -extern BOOL recvDroidSecondary (NETQUEUE queue); extern BOOL recvDroidEmbark (NETQUEUE queue); extern BOOL recvDroidDisEmbark (NETQUEUE queue); extern BOOL recvDroidCheck (NETQUEUE queue); extern BOOL recvStructureCheck (NETQUEUE queue); extern BOOL recvPowerCheck (NETQUEUE queue); -//extern BOOL recvAlliance (NETQUEUE queue, BOOL allowAudio); // Was declared in multigifts.h, too. extern BOOL recvColourRequest (NETQUEUE queue); extern BOOL recvPositionRequest (NETQUEUE queue); extern void recvOptions (NETQUEUE queue); From 676f453332761fa5250b2e9ab8db19a5e90eae48 Mon Sep 17 00:00:00 2001 From: Cyp Date: Mon, 28 Feb 2011 20:06:30 +0100 Subject: [PATCH 15/59] Do memset of NetPlay.games array, not MAX_PLAYERS elements of NetPlay.games. MAX_PLAYERS was less than MaxGames, so it wouldn't memset too much, at least. --- lib/netplay/netplay.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/lib/netplay/netplay.cpp b/lib/netplay/netplay.cpp index b77f7ec56..b987fa308 100644 --- a/lib/netplay/netplay.cpp +++ b/lib/netplay/netplay.cpp @@ -1016,8 +1016,6 @@ void NETdiscoverUPnPDevices(void) // setup stuff int NETinit(BOOL bFirstCall) { - UDWORD i; - debug(LOG_NET, "NETinit"); NETlogEntry("NETinit!", SYNC_FLAG, selectedPlayer); NET_InitPlayers(); @@ -1028,10 +1026,7 @@ int NETinit(BOOL bFirstCall) { debug(LOG_NET, "NETPLAY: Init called, MORNIN'"); - for(i = 0; i < MAX_PLAYERS; i++) - { - memset(&NetPlay.games[i], 0, sizeof(NetPlay.games[i])); - } + memset(&NetPlay.games, 0, sizeof(NetPlay.games)); // NOTE NetPlay.isUPNP is already set in configuration.c! NetPlay.bComms = true; NetPlay.GamePassworded = false; From eeb413d9e39448b29baa98035032feeb06d04bfc Mon Sep 17 00:00:00 2001 From: Cyp Date: Mon, 28 Feb 2011 20:16:30 +0100 Subject: [PATCH 16/59] Don't send GAME_BUILDFINISHED when in synch. Was causing the second module to instantly finish, with the structure at 10% body points, if queueing two module build orders in a row for the same structure. Fixes ticket:2480. --- src/structure.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/structure.cpp b/src/structure.cpp index 41b24e9e6..560539db9 100644 --- a/src/structure.cpp +++ b/src/structure.cpp @@ -918,7 +918,7 @@ void structureBuild(STRUCTURE *psStruct, DROID *psDroid, int buildPoints) intBuildFinished(psDroid); } - if((bMultiMessages) && myResponsibility(psStruct->player)) + if (!isInSync() && bMultiMessages && myResponsibility(psStruct->player)) { SendBuildFinished(psStruct); } From e3ac1cef9cea32f142b19ae4117a53b2afeb033b Mon Sep 17 00:00:00 2001 From: Cyp Date: Mon, 28 Feb 2011 20:28:18 +0100 Subject: [PATCH 17/59] Don't allow body points to become negative when demolishing. --- src/structure.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/structure.cpp b/src/structure.cpp index 560539db9..c5b7f77ff 100644 --- a/src/structure.cpp +++ b/src/structure.cpp @@ -904,7 +904,7 @@ void structureBuild(STRUCTURE *psStruct, DROID *psDroid, int buildPoints) before = (9 * psStruct->currentBuildPts * structureBody(psStruct) ) / (10 * psStruct->pStructureType->buildPoints); psStruct->currentBuildPts = newBuildPoints; after = (9 * psStruct->currentBuildPts * structureBody(psStruct) ) / (10 * psStruct->pStructureType->buildPoints); - psStruct->body += after - before; + psStruct->body = std::max(psStruct->body + after - before, 1); //check if structure is built if (buildPoints > 0 && psStruct->currentBuildPts >= (SDWORD)psStruct->pStructureType->buildPoints) From f18f98452202cd232184540932381b5a44da1881 Mon Sep 17 00:00:00 2001 From: Cyp Date: Mon, 28 Feb 2011 20:51:14 +0100 Subject: [PATCH 18/59] Fix cyborgs and inital truck design being displayed as free. Fixes ticket:2510. --- src/droid.cpp | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/src/droid.cpp b/src/droid.cpp index 42d2eccd3..ff2c23271 100644 --- a/src/droid.cpp +++ b/src/droid.cpp @@ -1691,29 +1691,31 @@ BOOL loadDroidTemplates(const char *pDroidData, UDWORD bufferSize) return true; } +static void initTemplatePoints(DROID_TEMPLATE *pDroidDesign) +{ + //calculate the total build points + pDroidDesign->buildPoints = calcTemplateBuild(pDroidDesign); + //calc the total power points + pDroidDesign->powerPoints = calcTemplatePower(pDroidDesign); +} + /*initialise the template build and power points */ void initTemplatePoints(void) { - UDWORD player; - DROID_TEMPLATE *pDroidDesign; - - for (player=0; player < MAX_PLAYERS; player++) + for (int player = 0; player < MAX_PLAYERS; ++player) { - for(pDroidDesign = apsDroidTemplates[player]; pDroidDesign != NULL; - pDroidDesign = pDroidDesign->psNext) + for (DROID_TEMPLATE *pDroidDesign = apsDroidTemplates[player]; pDroidDesign != NULL; pDroidDesign = pDroidDesign->psNext) { - //calculate the total build points - pDroidDesign->buildPoints = calcTemplateBuild(pDroidDesign); - //calc the total power points - pDroidDesign->powerPoints = calcTemplatePower(pDroidDesign); + initTemplatePoints(pDroidDesign); } } - for (pDroidDesign = apsStaticTemplates; pDroidDesign != NULL; pDroidDesign = pDroidDesign->psNext) + for (DROID_TEMPLATE *pDroidDesign = apsStaticTemplates; pDroidDesign != NULL; pDroidDesign = pDroidDesign->psNext) { - //calculate the total build points - pDroidDesign->buildPoints = calcTemplateBuild(pDroidDesign); - //calc the total power points - pDroidDesign->powerPoints = calcTemplatePower(pDroidDesign); + initTemplatePoints(pDroidDesign); + } + for (std::list::iterator pDroidDesign = localTemplates.begin(); pDroidDesign != localTemplates.end(); ++pDroidDesign) + { + initTemplatePoints(&*pDroidDesign); } } From 48f00204553b976f60b198bb5583a5889c1b12f3 Mon Sep 17 00:00:00 2001 From: Cyp Date: Mon, 28 Feb 2011 22:58:19 +0100 Subject: [PATCH 19/59] Fix gates. It is now possible to go through gates when, and only when, they are open, and friendly gates are always ignored by pathfinding. Fixes ticket:2486. --- src/display3d.cpp | 4 +-- src/fpath.cpp | 3 +- src/fpath.h | 1 + src/map.h | 16 +++++++++- src/move.cpp | 19 ++---------- src/structure.cpp | 74 +++++++++++++++++++++++++++++++++++++++++++---- src/structure.h | 2 ++ 7 files changed, 94 insertions(+), 25 deletions(-) diff --git a/src/display3d.cpp b/src/display3d.cpp index 4692eb452..e966527fc 100644 --- a/src/display3d.cpp +++ b/src/display3d.cpp @@ -2571,11 +2571,11 @@ static BOOL renderWallSection(STRUCTURE *psStructure) } else if (psStructure->pStructureType->type == REF_GATE && psStructure->state == SAS_OPENING) { - dv.y -= (height * (gameTime - psStructure->lastStateTime)) / SAS_OPEN_SPEED; + dv.y -= (height * std::max(graphicsTime + GAME_TICKS_PER_UPDATE - psStructure->lastStateTime, 0)) / SAS_OPEN_SPEED; } else if (psStructure->pStructureType->type == REF_GATE && psStructure->state == SAS_CLOSING) { - dv.y -= height - (height * (gameTime - psStructure->lastStateTime)) / SAS_OPEN_SPEED; + dv.y -= height - (height * std::max(graphicsTime - psStructure->lastStateTime, 0)) / SAS_OPEN_SPEED; } /* Push the indentity matrix */ diff --git a/src/fpath.cpp b/src/fpath.cpp index e3b535512..35b62f719 100644 --- a/src/fpath.cpp +++ b/src/fpath.cpp @@ -267,6 +267,7 @@ BOOL fpathBaseBlockingTile(SDWORD x, SDWORD y, PROPULSION_TYPE propulsion, int m if ((unitbits & FEATURE_BLOCKED) && ((moveType == FMT_MOVE && (aux & AUXBITS_ANY_BUILDING)) // do not wish to shoot our way through enemy buildings + || (moveType == FMT_BLOCK && (aux & AUXBITS_CLOSED_GATE)) // Do not wish to tunnel through closed gates. || (aux & AUXBITS_OUR_BUILDING))) // move blocked by friendly building, assuming we do not want to shoot it up en route { return true; // move blocked by building, and we cannot or do not want to shoot our way through anything @@ -284,7 +285,7 @@ BOOL fpathDroidBlockingTile(DROID *psDroid, int x, int y, FPATH_MOVETYPE moveTyp // Check if the map tile at a location blocks a droid BOOL fpathBlockingTile(SDWORD x, SDWORD y, PROPULSION_TYPE propulsion) { - return fpathBaseBlockingTile(x, y, propulsion, 0, FMT_MOVE); // with FMT_MOVE, it is irrelevant which player is passed in + return fpathBaseBlockingTile(x, y, propulsion, 0, FMT_BLOCK); // with FMT_BLOCK, it is irrelevant which player is passed in } diff --git a/src/fpath.h b/src/fpath.h index f33b77878..2556e95be 100644 --- a/src/fpath.h +++ b/src/fpath.h @@ -36,6 +36,7 @@ enum FPATH_MOVETYPE { FMT_MOVE, ///< Move around all obstacles FMT_ATTACK, ///< Assume that we will destroy enemy obstacles + FMT_BLOCK, ///< Don't go through obstacles, not even gates. }; struct PathBlockingMap; diff --git a/src/map.h b/src/map.h index 5dda58dfb..675433e87 100644 --- a/src/map.h +++ b/src/map.h @@ -124,7 +124,7 @@ extern char *tileset; #define WATER_BLOCKED 0x04 ///< Units that cannot pass water are blocked by this tile #define LAND_BLOCKED 0x08 ///< The inverse of the above -- for propeller driven crafts -#define AUXBITS_UNUSED 0x01 ///< Unused for now +#define AUXBITS_CLOSED_GATE 0x01 ///< There is a gate which is not open. #define AUXBITS_OUR_BUILDING 0x02 ///< Do we or our allies have a building at this tile #define AUXBITS_ANY_BUILDING 0x04 ///< Is there any building that might be blocking here? #define AUXBITS_TEMPORARY 0x08 ///< Temporary bit used in calculations @@ -206,6 +206,20 @@ WZ_DECL_ALWAYS_INLINE static inline void auxSetAllied(int x, int y, int player, } } +/// Set aux bits. Always set identically for all players. States not set are retained. +WZ_DECL_ALWAYS_INLINE static inline void auxSetEnemy(int x, int y, int player, int state) +{ + int i; + + for (i = 0; i < MAX_PLAYERS; i++) + { + if (!(alliancebits[player] & (1 << i))) + { + psAuxMap[i][x + y * mapWidth] |= state; + } + } +} + /// Clear aux bits. Always set identically for all players. States not cleared are retained. WZ_DECL_ALWAYS_INLINE static inline void auxClear(int x, int y, int player, int state) { diff --git a/src/move.cpp b/src/move.cpp index fbb93be77..c5c70281a 100644 --- a/src/move.cpp +++ b/src/move.cpp @@ -872,26 +872,13 @@ static void moveCalcBlockingSlide(DROID *psDroid, int32_t *pmx, int32_t *pmy, ui psTile = mapTile(ntx, nty); } if (!isFlying(psDroid) && psTile && psTile->psObject && psTile->psObject->type == OBJ_STRUCTURE - && aiCheckAlliances(psTile->psObject->player, psDroid->player) - && ((STRUCTURE *)psTile->psObject)->status == SS_BUILT - && ((STRUCTURE *)psTile->psObject)->pStructureType->type == REF_GATE) + && aiCheckAlliances(psTile->psObject->player, psDroid->player)) { - STRUCTURE *psStruct = (STRUCTURE *)psTile->psObject; - - if (psStruct->state == SAS_NORMAL) - { - psStruct->lastStateTime = gameTime; - psStruct->state = SAS_OPENING; - psDroid->sMove.Status = MOVEPAUSE; - psDroid->sMove.pauseTime = SAS_OPEN_SPEED; - psDroid->sMove.bumpTime = gameTime; - psDroid->sMove.lastBump = 0; - return; // wait for it to open - } + requestOpenGate((STRUCTURE *)psTile->psObject); // If it's a friendly gate, open it. (It would be impolite to open an enemy gate.) } // is the new tile blocking? - if (!fpathBaseBlockingTile(ntx, nty, propulsion, psDroid->player, FMT_MOVE)) + if (!fpathBlockingTile(ntx, nty, propulsion)) { // not blocking, don't change the move vector return; diff --git a/src/structure.cpp b/src/structure.cpp index c5b7f77ff..7aa0f6238 100644 --- a/src/structure.cpp +++ b/src/structure.cpp @@ -211,7 +211,7 @@ static void auxStructureNonblocking(STRUCTURE *psStructure) { for (int j = 0; j < size.y; j++) { - auxClearAll(map.x + i, map.y + j, AUXBITS_ANY_BUILDING | AUXBITS_OUR_BUILDING); + auxClearAll(map.x + i, map.y + j, AUXBITS_ANY_BUILDING | AUXBITS_OUR_BUILDING | AUXBITS_CLOSED_GATE); } } } @@ -231,6 +231,35 @@ static void auxStructureBlocking(STRUCTURE *psStructure) } } +static void auxStructureOpenGate(STRUCTURE *psStructure) +{ + Vector2i size = getStructureSize(psStructure); + Vector2i map = map_coord(removeZ(psStructure->pos)) - size/2; + + for (int i = 0; i < size.x; i++) + { + for (int j = 0; j < size.y; j++) + { + auxClearAll(map.x + i, map.y + j, AUXBITS_CLOSED_GATE); + } + } +} + +static void auxStructureClosedGate(STRUCTURE *psStructure) +{ + Vector2i size = getStructureSize(psStructure); + Vector2i map = map_coord(removeZ(psStructure->pos)) - size/2; + + for (int i = 0; i < size.x; i++) + { + for (int j = 0; j < size.y; j++) + { + auxSetEnemy(map.x + i, map.y + j, psStructure->player, AUXBITS_ANY_BUILDING); + auxSetAll(map.x + i, map.y + j, AUXBITS_CLOSED_GATE); + } + } +} + BOOL IsStatExpansionModule(STRUCTURE_STATS *psStats) { // If the stat is any of the 3 expansion types ... then return true @@ -1505,9 +1534,16 @@ STRUCTURE* buildStructureDir(STRUCTURE_STATS *pStructureType, UDWORD x, UDWORD y } } - if (pStructureType->type != REF_REARM_PAD && pStructureType->type != REF_GATE) + switch (pStructureType->type) { - auxStructureBlocking(psBuilding); + case REF_REARM_PAD: + break; // Not blocking. + case REF_GATE: + auxStructureClosedGate(psBuilding); // Don't block for the sake of allied pathfinding. + break; + default: + auxStructureBlocking(psBuilding); + break; } //set up the rest of the data @@ -3605,6 +3641,34 @@ void _syncDebugStructure(const char *function, STRUCTURE const *psStruct, char c getPrecisePower(psStruct->player)); } +int requestOpenGate(STRUCTURE *psStructure) +{ + if (psStructure->status != SS_BUILT || psStructure->pStructureType->type != REF_GATE) + { + return 0; // Can't open. + } + + switch (psStructure->state) + { + case SAS_NORMAL: + psStructure->lastStateTime = gameTime; + psStructure->state = SAS_OPENING; + break; + case SAS_OPEN: + psStructure->lastStateTime = gameTime; + return 0; // Already open. + case SAS_OPENING: + break; + case SAS_CLOSING: + psStructure->lastStateTime = 2*gameTime - psStructure->lastStateTime - SAS_OPEN_SPEED; + psStructure->state = SAS_OPENING; + default: + return 0; // Unknown state... + } + + return psStructure->lastStateTime + SAS_OPEN_SPEED - gameTime; +} + /* The main update routine for all Structures */ void structureUpdate(STRUCTURE *psBuilding, bool mission) { @@ -3631,14 +3695,14 @@ void structureUpdate(STRUCTURE *psBuilding, bool mission) if (!found) // no droids on our tile, safe to close { psBuilding->state = SAS_CLOSING; - auxStructureBlocking(psBuilding); // closed + auxStructureClosedGate(psBuilding); // closed psBuilding->lastStateTime = gameTime; // reset timer } } else if (psBuilding->state == SAS_OPENING && psBuilding->lastStateTime + SAS_OPEN_SPEED < gameTime) { psBuilding->state = SAS_OPEN; - auxStructureNonblocking(psBuilding); // opened + auxStructureOpenGate(psBuilding); // opened psBuilding->lastStateTime = gameTime; // reset timer } else if (psBuilding->state == SAS_CLOSING && psBuilding->lastStateTime + SAS_OPEN_SPEED < gameTime) diff --git a/src/structure.h b/src/structure.h index 69ae7f647..6f2a6b12c 100644 --- a/src/structure.h +++ b/src/structure.h @@ -110,6 +110,8 @@ extern BOOL loadStructureStrengthModifiers(const char *pStrengthModData, UDWORD extern BOOL structureStatsShutDown(void); +int requestOpenGate(STRUCTURE *psStructure); + int32_t structureDamage(STRUCTURE *psStructure, UDWORD damage, WEAPON_CLASS weaponClass, WEAPON_SUBCLASS weaponSubClass, HIT_SIDE impactSide); extern void structureBuild(STRUCTURE *psStructure, DROID *psDroid, int buildPoints); extern void structureDemolish(STRUCTURE *psStructure, DROID *psDroid, int buildPoints); From 9d4c9f89edc21b4a28939fc0366c31e68d0dc0c5 Mon Sep 17 00:00:00 2001 From: Cyp Date: Mon, 28 Feb 2011 23:21:04 +0100 Subject: [PATCH 20/59] Fix research sharing. Fixes ticket:2508. --- src/research.cpp | 6 ++++-- src/structure.cpp | 24 +++++++++++++++++++++--- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/src/research.cpp b/src/research.cpp index 2181ce711..4537d0923 100644 --- a/src/research.cpp +++ b/src/research.cpp @@ -1126,8 +1126,10 @@ void researchResult(UDWORD researchIndex, UBYTE player, BOOL bDisplay, STRUCTURE ASSERT_OR_RETURN( , researchIndex < numResearch, "Invalid research index %u", researchIndex); - sendResearchStatus(NULL, researchIndex, player, false); - // Confused whether we should wait for our message before doing anything, and confused what this function does... + if (!isInSync()) + { + sendResearchStatus(NULL, researchIndex, player, false); + } MakeResearchCompleted(&pPlayerRes[researchIndex]); diff --git a/src/structure.cpp b/src/structure.cpp index 7aa0f6238..54c4b9827 100644 --- a/src/structure.cpp +++ b/src/structure.cpp @@ -3186,7 +3186,9 @@ static void aiUpdateStructure(STRUCTURE *psStructure, bool isMission) } } - PLAYER_RESEARCH *pPlayerRes = &asPlayerResList[psStructure->player][pSubject->ref - REF_RESEARCH_START]; + int researchIndex = pSubject->ref - REF_RESEARCH_START; + + PLAYER_RESEARCH *pPlayerRes = &asPlayerResList[psStructure->player][researchIndex]; //check research has not already been completed by another structure if (!IsResearchCompleted(pPlayerRes)) { @@ -3220,7 +3222,7 @@ static void aiUpdateStructure(STRUCTURE *psStructure, bool isMission) if (myResponsibility(psStructure->player) && !isInSync()) { // This message should have no effect if in synch. - SendResearch(psStructure->player, pSubject->ref - REF_RESEARCH_START, true); + SendResearch(psStructure->player, researchIndex, true); } } @@ -3238,9 +3240,25 @@ static void aiUpdateStructure(STRUCTURE *psStructure, bool isMission) } psResFacility->psSubject = NULL; intResearchFinished(psStructure); - researchResult(pSubject->ref - REF_RESEARCH_START, psStructure->player, true, psStructure, true); + researchResult(researchIndex, psStructure->player, true, psStructure, true); //check if this result has enabled another topic intCheckResearchButton(); + + // Update allies research accordingly + if (game.type == SKIRMISH) + { + for (i = 0; i < MAX_PLAYERS; i++) + { + if (alliances[i][psStructure->player] == ALLIANCE_FORMED) + { + if (!IsResearchCompleted(&asPlayerResList[i][researchIndex])) + { + // Do the research for that player + researchResult(researchIndex, i, false, NULL, true); + } + } + } + } } } else From a6e22910254702c9f4574179442a0105110d299f Mon Sep 17 00:00:00 2001 From: Cyp Date: Mon, 28 Feb 2011 23:33:57 +0100 Subject: [PATCH 21/59] Update ally research information in real-time. Old behaviour was to wait for you to click on something (for example, to start the research), before showing that the ally was already researching. --- src/hci.cpp | 8 ++++++++ src/hci.h | 1 + src/multiplay.cpp | 5 +++++ 3 files changed, 14 insertions(+) diff --git a/src/hci.cpp b/src/hci.cpp index 460dd0d13..df97cfe92 100644 --- a/src/hci.cpp +++ b/src/hci.cpp @@ -3248,6 +3248,14 @@ void intResearchFinished(STRUCTURE *psBuilding) intRefreshScreen(); } +void intAlliedResearchChanged() +{ + if ((intMode == INT_OBJECT || intMode == INT_STAT) && objMode == IOBJ_RESEARCH) + { + intRefreshScreen(); + } +} + /* Do the annoying calculation for how many forms are needed * given the total number of buttons and the number of * buttons per page. diff --git a/src/hci.h b/src/hci.h index 59a457a2a..667df5c8b 100644 --- a/src/hci.h +++ b/src/hci.h @@ -334,6 +334,7 @@ extern void intBuildFinished(DROID *psDroid); extern void intBuildStarted(DROID *psDroid); /* Tell the interface a research facility has completed a topic */ extern void intResearchFinished(STRUCTURE *psBuilding); +void intAlliedResearchChanged(); /* Tell the interface a factory has completed building ALL droids */ extern void intManufactureFinished(STRUCTURE *psBuilding); extern void intUpdateManufacture(STRUCTURE *psBuilding); diff --git a/src/multiplay.cpp b/src/multiplay.cpp index ee20618bf..de40bec62 100644 --- a/src/multiplay.cpp +++ b/src/multiplay.cpp @@ -994,6 +994,11 @@ BOOL recvResearchStatus(NETQUEUE queue) } } + if (alliances[selectedPlayer][player] == ALLIANCE_FORMED) + { + intAlliedResearchChanged(); + } + return true; } From eb60d358641bb746142817d28da6751a657fa3cc Mon Sep 17 00:00:00 2001 From: safety0ff Date: Sat, 26 Feb 2011 17:05:27 -0500 Subject: [PATCH 22/59] Add physfs 2+ cross compilation. --- win32/Makefile.am | 1 + win32/Toolchain-mingw32.cmake | 23 +++++++++++++++++++++++ win32/libs/Makefile | 2 +- win32/libs/devpkg/Makefile | 2 +- win32/libs/physfs/Makefile | 30 ++++++++++++++++++++++++++++++ 5 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 win32/Toolchain-mingw32.cmake create mode 100644 win32/libs/physfs/Makefile diff --git a/win32/Makefile.am b/win32/Makefile.am index 0c245d911..b69161584 100644 --- a/win32/Makefile.am +++ b/win32/Makefile.am @@ -16,6 +16,7 @@ EXTRA_DIST = __BUILD_SCRIPT \ libs/iconv/Makefile \ libs/ogg/Makefile \ libs/png/Makefile \ + libs/physfs/Makefile \ libs/quesoglc/Makefile \ libs/quesoglc/patches \ libs/sdl/Makefile \ diff --git a/win32/Toolchain-mingw32.cmake b/win32/Toolchain-mingw32.cmake new file mode 100644 index 000000000..5d164e123 --- /dev/null +++ b/win32/Toolchain-mingw32.cmake @@ -0,0 +1,23 @@ +SET(CMAKE_SYSTEM_NAME Windows) +SET(CMAKE_C_COMPILER i586-mingw32msvc-gcc) + +SET(CMAKE_CXX_COMPILER i586-mingw32msvc-g++) + +# Define paths to search for libraries +SET(CMAKE_FIND_ROOT_PATH /usr/i586-mingw32msvc/ ${CMAKE_SOURCE_DIR}/win32/build/libs/) +SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) + +# Don't search in native paths, just the specified root paths +SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) + +# FIXME CMake's defaults struggle to find these +SET(OPENAL_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/win32/build/libs/include/AL) +SET(OPENAL_LIBRARY ${CMAKE_SOURCE_DIR}/win32/build/libs/lib/libopenal32.a) +# Our openal lib doesn't have correct capitalisation (e.g. OpenAL or al or openal or OpenAL32) , which causes issues. + +SET(SDL_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/win32/build/libs/include/SDL) + +SET(NEED_DEP_DEPS TRUE) # Our CC dev pkg don't link the deps of the deps, so we need to do this + +SET(MINGW TRUE) # just in case... diff --git a/win32/libs/Makefile b/win32/libs/Makefile index f2db33ef2..ca09dd43e 100644 --- a/win32/libs/Makefile +++ b/win32/libs/Makefile @@ -1,4 +1,4 @@ -SUBDIRS=dejavu devpkg expat freetype2 gettext iconv zlib fontconfig ogg png quesoglc sdl vorbis theora +SUBDIRS=dejavu devpkg expat freetype2 gettext iconv zlib physfs fontconfig ogg png quesoglc sdl vorbis theora all: all-recursive build: build-recursive diff --git a/win32/libs/devpkg/Makefile b/win32/libs/devpkg/Makefile index 59949b3f8..d124ef901 100644 --- a/win32/libs/devpkg/Makefile +++ b/win32/libs/devpkg/Makefile @@ -15,7 +15,7 @@ extract-stamp: $(DOWNLOADS)/$(PKG_SOURCE) echo mkdir -p $(TOPDIR)/build/libs ; \ mkdir -p $(TOPDIR)/build/libs || exit ; \ } - tar -x -j -C $(TOPDIR)/build/libs -f $^ + tar -x --keep-newer-files -j -C $(TOPDIR)/build/libs -f $^ touch extract-stamp all: build diff --git a/win32/libs/physfs/Makefile b/win32/libs/physfs/Makefile new file mode 100644 index 000000000..4c4d47813 --- /dev/null +++ b/win32/libs/physfs/Makefile @@ -0,0 +1,30 @@ +PKG_NAME:=physfs +PKG_VERSION=2.0.2 + +PKG_SOURCEBASE:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE:=$(PKG_SOURCEBASE).tar.gz +PKG_SOURCE_URL:= \ + http://icculus.org/physfs/downloads/ +PKG_MD5SUM:=4e8927c3d30279b03e2592106eb9184a + +TARGET:=$(TOPDIR)/build/libs/lib/libphysfs.a + +include $(TOPDIR)/rules.mk + +extract-stamp: $(DOWNLOADS)/$(PKG_SOURCE) + tar xvzf $^ + touch extract-stamp + +$(PKG_SOURCEBASE)/Makefile: extract-stamp + cd $(PKG_SOURCEBASE) && cmake -DCMAKE_TOOLCHAIN_FILE=`pwd`/../$(TOPDIR)/Toolchain-mingw32.cmake -DCMAKE_INSTALL_PREFIX=`pwd`/../$(TOPDIR)/build/libs -DPHYSFS_BUILD_SHARED=FALSE -DPHYSFS_INTERNAL_ZLIB=FALSE -DZLIB_INCLUDE_DIR=`pwd`/../$(TOPDIR)/build/libs/include -DZLIB_LIBRARY=`pwd`/../$(TOPDIR)/build/libs/lib/libz.a -DPHYSFS_BUILD_TEST=FALSE -DPHYSFS_BUILD_WX_TEST=FALSE . + +$(TARGET): $(PKG_SOURCEBASE)/Makefile + $(MAKE) -C $(PKG_SOURCEBASE) $(MAKE_FLAGS) install + +all: build +build: $(TARGET) + +clean: + $(MAKE) -C $(PKG_SOURCEBASE) clean + +.PHONY: all build clean From f1495ac6ef7326392c8091fced47ef47a61a3fd6 Mon Sep 17 00:00:00 2001 From: safety0ff Date: Sun, 27 Feb 2011 04:45:22 -0500 Subject: [PATCH 23/59] Convert command line options to utf-8 and use unicode directory routines (Windows). Closes #1066. --- lib/exceptionhandler/dumpinfo.cpp | 4 +- lib/exceptionhandler/dumpinfo.h | 2 +- lib/exceptionhandler/exceptionhandler.cpp | 2 +- lib/exceptionhandler/exceptionhandler.h | 2 +- src/main.cpp | 88 ++++++++++++++++++++--- 5 files changed, 83 insertions(+), 15 deletions(-) diff --git a/lib/exceptionhandler/dumpinfo.cpp b/lib/exceptionhandler/dumpinfo.cpp index 73fbd9be8..8f9aa1e1f 100644 --- a/lib/exceptionhandler/dumpinfo.cpp +++ b/lib/exceptionhandler/dumpinfo.cpp @@ -276,7 +276,7 @@ std::basic_ostream& operator<<(std::basic_ostream& << "." << static_cast(ver.patch); } -static void createHeader(int const argc, char* argv[]) +static void createHeader(int const argc, const char** argv) { std::ostringstream os; @@ -352,7 +352,7 @@ void addDumpInfo(const char *inbuffer) miscData.insert(miscData.end(), msg.begin(), msg.end()); } -void dbgDumpInit(int argc, char* argv[]) +void dbgDumpInit(int argc, const char** argv) { debug_register_callback(&debug_exceptionhandler_data, NULL, NULL, NULL ); createHeader(argc, argv); diff --git a/lib/exceptionhandler/dumpinfo.h b/lib/exceptionhandler/dumpinfo.h index c059e4382..e63ef9d70 100644 --- a/lib/exceptionhandler/dumpinfo.h +++ b/lib/exceptionhandler/dumpinfo.h @@ -38,7 +38,7 @@ extern void dbgDumpHeader(DumpFileHandle file); */ extern void dbgDumpLog(DumpFileHandle file); -extern void dbgDumpInit(int argc, char* argv[]); +extern void dbgDumpInit(int argc, const char** argv); extern void addDumpInfo(const char *inbuffer); diff --git a/lib/exceptionhandler/exceptionhandler.cpp b/lib/exceptionhandler/exceptionhandler.cpp index 4e8e16349..d4988b748 100644 --- a/lib/exceptionhandler/exceptionhandler.cpp +++ b/lib/exceptionhandler/exceptionhandler.cpp @@ -736,7 +736,7 @@ static bool fetchProgramPath(char * const programPath, size_t const bufSize, con * * \param programCommand Command used to launch this program. Only used for POSIX handler. */ -void setupExceptionHandler(int argc, char * argv[]) +void setupExceptionHandler(int argc, const char ** argv) { #if defined(WZ_OS_UNIX) && !defined(WZ_OS_MAC) const char *programCommand; diff --git a/lib/exceptionhandler/exceptionhandler.h b/lib/exceptionhandler/exceptionhandler.h index 10a4403fa..6d259f387 100644 --- a/lib/exceptionhandler/exceptionhandler.h +++ b/lib/exceptionhandler/exceptionhandler.h @@ -20,6 +20,6 @@ #ifndef __INCLUDED_LIB_EXCEPTIONHANDLER_EXCEPTIONHANDLER_H__ #define __INCLUDED_LIB_EXCEPTIONHANDLER_EXCEPTIONHANDLER_H__ -extern void setupExceptionHandler(int argc, char * argv[]); +extern void setupExceptionHandler(int argc, const char ** argv); extern bool OverrideRPTDirectory(char *newPath); #endif // __INCLUDED_LIB_EXCEPTIONHANDLER_EXCEPTIONHANDLER_H__ diff --git a/src/main.cpp b/src/main.cpp index d7d2ceed2..592f04633 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -378,7 +378,8 @@ static bool getCurrentDir(char * const dest, size_t const size) return false; } #elif defined(WZ_OS_WIN) - const int len = GetCurrentDirectoryA(size, dest); + wchar_t tmpWStr[PATH_MAX]; + const int len = GetCurrentDirectoryW(PATH_MAX, tmpWStr); if (len == 0) { @@ -390,7 +391,7 @@ static bool getCurrentDir(char * const dest, size_t const size) FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, err, 0, (char*)&err_string, 0, NULL); // Print an error message with the above description - debug(LOG_ERROR, "getPlatformUserDir: GetCurrentDirectoryA failed (error code: %d): %s", err, err_string); + debug(LOG_ERROR, "getPlatformUserDir: GetCurrentDirectory failed (error code: %d): %s", err, err_string); // Free our chunk of memory FormatMessageA gave us LocalFree(err_string); @@ -403,6 +404,12 @@ static bool getCurrentDir(char * const dest, size_t const size) return false; } + if (WideCharToMultiByte(CP_UTF8, 0, tmpWStr, -1, dest, size, NULL, NULL) == 0) + { + dest[0] = '\0'; + debug(LOG_ERROR, "Encoding conversion error."); + return false; + } #else # error "Provide an implementation here to copy the current working directory in 'dest', which is 'size' bytes large." #endif @@ -415,9 +422,16 @@ static bool getCurrentDir(char * const dest, size_t const size) static void getPlatformUserDir(char * const tmpstr, size_t const size) { #if defined(WZ_OS_WIN) - ASSERT(size >= MAX_PATH, "size (%u) is smaller than the required minimum of MAX_PATH (%u)", size, (size_t)MAX_PATH); - if ( SUCCEEDED( SHGetFolderPathA( NULL, CSIDL_PERSONAL|CSIDL_FLAG_CREATE, NULL, SHGFP_TYPE_CURRENT, tmpstr ) ) ) + wchar_t tmpWStr[MAX_PATH]; + if ( SUCCEEDED( SHGetFolderPathW( NULL, CSIDL_PERSONAL|CSIDL_FLAG_CREATE, NULL, SHGFP_TYPE_CURRENT, tmpWStr ) ) ) + { + if (WideCharToMultiByte(CP_UTF8, 0, tmpWStr, -1, tmpstr, size, NULL, NULL) == 0) + { + debug(LOG_ERROR, "Encoding conversion error."); + exit(1); + } strlcat(tmpstr, PHYSFS_getDirSeparator(), size); + } else #elif defined(WZ_OS_MAC) FSRef fsref; @@ -441,7 +455,7 @@ static void getPlatformUserDir(char * const tmpstr, size_t const size) { debug(LOG_FATAL, "Can't get UserDir?"); abort(); -} + } } @@ -1044,28 +1058,82 @@ static void mainLoop(void) } } +bool getUTF8CmdLine(int* const utfargc, const char*** const utfargv) // explicitely pass by reference +{ +#ifdef WZ_OS_WIN + int wargc; + wchar_t** wargv = CommandLineToArgvW(GetCommandLineW(), &wargc); + + if (wargv == NULL) + { + const int err = GetLastError(); + char* err_string; + + // Retrieve a (locally encoded) string describing the error (uses LocalAlloc() to allocate memory) + FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, err, 0, (char*)&err_string, 0, NULL); + + debug(LOG_FATAL, "CommandLineToArgvW failed: %s (code:%d)", err_string, err); + + LocalFree(err_string); // Free the chunk of memory FormatMessageA gave us + LocalFree(wargv); + return false; + } + // the following malloc and UTF16toUTF8 will create leaks. + *utfargv = (const char**)malloc(sizeof(const char*) * wargc); + if (!*utfargv) + { + debug(LOG_FATAL, "Out of memory!"); + abort(); + return false; + } + for (int i = 0; i < wargc; ++i) + { + STATIC_ASSERT(sizeof(wchar_t) == sizeof(utf_16_char)); // Should be true on windows + (*utfargv)[i] = UTF16toUTF8((const utf_16_char*)wargv[i], NULL); // only returns null when memory runs out + if ((*utfargv)[i] == NULL) + { + *utfargc = i; + LocalFree(wargv); + abort(); + return false; + } + } + *utfargc = wargc; + LocalFree(wargv); +#endif + return true; +} + int main(int argc, char *argv[]) { + int utfargc = argc; + const char** utfargv = (const char**)argv; + #ifdef WZ_OS_MAC cocoaInit(); #endif - setupExceptionHandler(argc, argv); - debug_init(); debug_register_callback( debug_callback_stderr, NULL, NULL, NULL ); #if defined(WZ_OS_WIN) && defined(DEBUG_INSANE) debug_register_callback( debug_callback_win32debug, NULL, NULL, NULL ); #endif // WZ_OS_WIN && DEBUG_INSANE + if (!getUTF8CmdLine(&utfargc, &utfargv)) + { + return -1; + } + + setupExceptionHandler(utfargc, utfargv); + /*** Initialize PhysicsFS ***/ - initialize_PhysicsFS(argv[0]); + initialize_PhysicsFS(utfargv[0]); /*** Initialize translations ***/ initI18n(); // find early boot info - if ( !ParseCommandLineEarly(argc, (const char**)argv) ) { + if ( !ParseCommandLineEarly(utfargc, utfargv) ) { return -1; } @@ -1122,7 +1190,7 @@ int main(int argc, char *argv[]) NETinit(true); // parse the command line - if (!ParseCommandLine(argc, (const char**)argv)) { + if (!ParseCommandLine(utfargc, utfargv)) { return -1; } From 6afff6e0c04da6bfaed80c68e98012135e6a8168 Mon Sep 17 00:00:00 2001 From: dak180 Date: Mon, 28 Feb 2011 23:26:08 -0500 Subject: [PATCH 24/59] Use PhysFS 2.0.2 for the mac builds. Refs #1066. --- macosx/Warzone.xcodeproj/project.pbxproj | 6 +++++- macosx/configs/PhysFS-All.xcconfig | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/macosx/Warzone.xcodeproj/project.pbxproj b/macosx/Warzone.xcodeproj/project.pbxproj index 190889fdf..f2de44e56 100644 --- a/macosx/Warzone.xcodeproj/project.pbxproj +++ b/macosx/Warzone.xcodeproj/project.pbxproj @@ -399,6 +399,7 @@ 432BE40210D9CF6F00A486AB /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 432BE3FE10D9CF1300A486AB /* InfoPlist.strings */; }; 432BE41A10D9D32000A486AB /* SDL.framework in Copy frameworks */ = {isa = PBXBuildFile; fileRef = 432BE34C10D9C21900A486AB /* SDL.framework */; }; 4336D8AA111DDF0F0012E8E4 /* random.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4336D8A8111DDF0F0012E8E4 /* random.cpp */; }; + 4347DD4C131CA7B300D61392 /* physfs_casefolding.h in Headers */ = {isa = PBXBuildFile; fileRef = 4347DD4B131CA7B300D61392 /* physfs_casefolding.h */; }; 4353C86E1282199C00CAFEDA /* tone.c in Sources */ = {isa = PBXBuildFile; fileRef = 43C3B9C2118BEBE0000BBE59 /* tone.c */; }; 4355E08010D5FADE00A19EE4 /* physfs_platforms.h in Headers */ = {isa = PBXBuildFile; fileRef = 4355E07F10D5FAC200A19EE4 /* physfs_platforms.h */; }; 4355E13010D6028C00A19EE4 /* codec.h in Headers */ = {isa = PBXBuildFile; fileRef = 4355E12C10D6028C00A19EE4 /* codec.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -1413,6 +1414,7 @@ 432BE40010D9CF1300A486AB /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 4336D8A8111DDF0F0012E8E4 /* random.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = random.cpp; path = ../src/random.cpp; sourceTree = SOURCE_ROOT; }; 4336D8A9111DDF0F0012E8E4 /* random.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = random.h; path = ../src/random.h; sourceTree = SOURCE_ROOT; }; + 4347DD4B131CA7B300D61392 /* physfs_casefolding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = physfs_casefolding.h; path = external/physfs/physfs_casefolding.h; sourceTree = ""; }; 43536BD210DFEB37006B579C /* GenericFramework-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GenericFramework-Info.plist"; path = "Resources/GenericFramework-Info.plist"; sourceTree = ""; }; 4355E07F10D5FAC200A19EE4 /* physfs_platforms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = physfs_platforms.h; path = external/physfs/physfs_platforms.h; sourceTree = ""; }; 4355E12C10D6028C00A19EE4 /* codec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = codec.h; path = external/libtheora/include/theora/codec.h; sourceTree = ""; }; @@ -2481,6 +2483,7 @@ 43F3FFCC10D33E6400707B6E /* archivers */, 43F3FFF610D33EB000707B6E /* platform */, 02DDA8BB0BD3C32D0049AB60 /* physfs.h */, + 4347DD4B131CA7B300D61392 /* physfs_casefolding.h */, 4355E07F10D5FAC200A19EE4 /* physfs_platforms.h */, 02DDA8B90BD3C32D0049AB60 /* physfs_internal.h */, 02DDA8BA0BD3C32D0049AB60 /* physfs.c */, @@ -3112,6 +3115,7 @@ 02DDA8BD0BD3C32D0049AB60 /* physfs_internal.h in Headers */, 02DDA8BF0BD3C32D0049AB60 /* physfs.h in Headers */, 4355E08010D5FADE00A19EE4 /* physfs_platforms.h in Headers */, + 4347DD4C131CA7B300D61392 /* physfs_casefolding.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3662,7 +3666,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "DirectorY=\"physfs-1.1.1\"\nOutDir=\"physfs\"\nFileName=\"physfs-1.1.1.tar.gz\"\nSourceDLP=\"http://icculus.org/physfs/downloads/physfs-1.1.1.tar.gz\"\nMD5Sum=\"0359b67793c1c14f00de1d1bbeb8ed6a\"\n\nconfigs/FetchSource.sh \"${DirectorY}\" \"${OutDir}\" \"${FileName}\" \"${SourceDLP}\" \"${MD5Sum}\"\nexit ${?}"; + shellScript = "DirectorY=\"physfs-2.0.2\"\nOutDir=\"physfs\"\nFileName=\"physfs-2.0.2.tar.gz\"\nSourceDLP=\"http://icculus.org/physfs/downloads/physfs-2.0.2.tar.gz\"\nMD5Sum=\"4e8927c3d30279b03e2592106eb9184a\"\n\nconfigs/FetchSource.sh \"${DirectorY}\" \"${OutDir}\" \"${FileName}\" \"${SourceDLP}\" \"${MD5Sum}\"\nexit ${?}"; }; 43025CD1111FB66E006C49B1 /* i18n */ = { isa = PBXShellScriptBuildPhase; diff --git a/macosx/configs/PhysFS-All.xcconfig b/macosx/configs/PhysFS-All.xcconfig index 8e8f59bfa..a674fed05 100644 --- a/macosx/configs/PhysFS-All.xcconfig +++ b/macosx/configs/PhysFS-All.xcconfig @@ -10,4 +10,5 @@ INFOPLIST_FILE = Resources/GenericFramework-Info.plist PRODUCT_NAME = PhysFS FRAMEWORK_SEARCH_PATHS = $(inherited) $(FRAMEWORK_SEARCH_PATHS_QUOTED_1) GCC_MODEL_TUNING = G5 -GCC_PREPROCESSOR_DEFINITIONS = PHYSFS_SUPPORTS_GRP PHYSFS_SUPPORTS_HOG PHYSFS_SUPPORTS_QPAK PHYSFS_SUPPORTS_WAD PHYSFS_SUPPORTS_MVL PHYSFS_SUPPORTS_ZIP $(inherited) \ No newline at end of file +GCC_NO_COMMON_BLOCKS = YES +GCC_PREPROCESSOR_DEFINITIONS = $(inherited) _THREAD_SAFE _REENTRANT HAVE_ASSERT_H PHYSFS_HAVE_SYS_UCRED_H PHYSFS_SUPPORTS_ZIP From 2875a599813215934540fe71a861f062b7162218 Mon Sep 17 00:00:00 2001 From: Cyp Date: Wed, 2 Mar 2011 11:55:16 +0100 Subject: [PATCH 25/59] Simplify mapFloodFill. Reduced memory usage by an order of magnitude and allocations by several orders of magnitude. And the function should be easier to understand, now. --- src/map.cpp | 80 ++++++++++++++--------------------------------------- 1 file changed, 21 insertions(+), 59 deletions(-) diff --git a/src/map.cpp b/src/map.cpp index ad7370ca5..ae53d31a4 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -64,12 +64,6 @@ static int bucketcounter; static UDWORD lastDangerUpdate = 0; static int lastDangerPlayer = -1; -struct ffnode -{ - struct ffnode *next; - int x, y; -}; - //scroll min and max values SDWORD scrollMinX, scrollMaxX, scrollMinY, scrollMaxY; @@ -1632,62 +1626,38 @@ static const Vector2i aDirOffset[] = Vector2i( 1, 1), }; -// Flood fill a "continent". Note that we reuse x, y inside this function. -static void mapFloodFill(int x, int y, int continent, uint8_t blockedBits) +// Flood fill a "continent". +static void mapFloodFill(int x, int y, int continent, uint8_t blockedBits, uint16_t MAPTILE::*varContinent) { - struct ffnode *open = NULL; - int i; - bool limitedTile = (blockedBits & WATER_BLOCKED) || (blockedBits & LAND_BLOCKED); + std::vector open; + open.push_back(Vector2i(x, y)); + mapTile(x, y)->*varContinent = continent; // Set continent value - do + while (!open.empty()) { - MAPTILE *currTile = mapTile(x, y); + // Pop the first open node off the list for this iteration + Vector2i pos = open.back(); + open.pop_back(); // Add accessible neighbouring tiles to the open list - for (i = 0; i < NUM_DIR; i++) + for (int i = 0; i < NUM_DIR; ++i) { // rely on the fact that all border tiles are inaccessible to avoid checking explicitly - Vector2i npos = Vector2i(x, y) + aDirOffset[i]; - MAPTILE *psTile; + Vector2i npos = pos + aDirOffset[i]; - if (!tileOnMap(npos.x, npos.y)) + if (!tileOnMap(npos)) { continue; } - psTile = mapTile(npos.x, npos.y); + MAPTILE *psTile = mapTile(npos); - if (!(blockTile(npos.x, npos.y, AUX_MAP) & blockedBits) && ((limitedTile && psTile->limitedContinent == 0) || (!limitedTile && psTile->hoverContinent == 0))) + if (!(blockTile(npos.x, npos.y, AUX_MAP) & blockedBits) && psTile->*varContinent == 0) { - struct ffnode *node = (struct ffnode *)malloc(sizeof(*node)); - - node->next = open; // add to beginning of open list - node->x = npos.x; - node->y = npos.y; - open = node; + open.push_back(npos); // add to open list + psTile->*varContinent = continent; // Set continent value } } - - // Set continent value - if (limitedTile) - { - currTile->limitedContinent = continent; - } - else // we are amphibious - { - currTile->hoverContinent = continent; - } - - // Pop the first open node off the list for the next iteration - if (open) - { - struct ffnode *tmp = open; - - x = open->x; - y = open->y; - open = open->next; - free(tmp); - } - } while (open); + } } void mapFloodFillContinents() @@ -1715,28 +1685,20 @@ void mapFloodFillContinents() if (psTile->limitedContinent == 0 && !fpathBlockingTile(x, y, PROPULSION_TYPE_WHEELED)) { - mapFloodFill(x, y, 1 + limitedContinents++, WATER_BLOCKED | FEATURE_BLOCKED); + mapFloodFill(x, y, 1 + limitedContinents++, WATER_BLOCKED | FEATURE_BLOCKED, &MAPTILE::limitedContinent); } else if (psTile->limitedContinent == 0 && !fpathBlockingTile(x, y, PROPULSION_TYPE_PROPELLOR)) { - mapFloodFill(x, y, 1 + limitedContinents++, LAND_BLOCKED | FEATURE_BLOCKED); + mapFloodFill(x, y, 1 + limitedContinents++, LAND_BLOCKED | FEATURE_BLOCKED, &MAPTILE::limitedContinent); } - } - } - debug(LOG_MAP, "Found %d limited continents", (int)limitedContinents); - for (y = 0; y < mapHeight; y++) - { - for (x = 0; x < mapWidth; x++) - { - MAPTILE *psTile = mapTile(x, y); if (psTile->hoverContinent == 0 && !fpathBlockingTile(x, y, PROPULSION_TYPE_HOVER)) { - mapFloodFill(x, y, 1 + hoverContinents++, FEATURE_BLOCKED); + mapFloodFill(x, y, 1 + hoverContinents++, FEATURE_BLOCKED, &MAPTILE::hoverContinent); } } } - debug(LOG_MAP, "Found %d hover continents", (int)hoverContinents); + debug(LOG_MAP, "Found %d limited and %d hover continents", limitedContinents, hoverContinents); } void tileSetFire(int32_t x, int32_t y, uint32_t duration) From 50c02e99441ab9c7db2399090295932186e270be Mon Sep 17 00:00:00 2001 From: Cyp Date: Wed, 2 Mar 2011 12:35:59 +0100 Subject: [PATCH 26/59] Fix all droids passing through all structures not allied to host. Hopefully now both gates and regular structures should work correctly now. --- src/fpath.cpp | 23 ++++++++++++++--------- src/map.cpp | 4 ++-- src/map.h | 6 +++--- src/structure.cpp | 12 ++++++------ 4 files changed, 25 insertions(+), 20 deletions(-) diff --git a/src/fpath.cpp b/src/fpath.cpp index 35b62f719..1be1ba8a1 100644 --- a/src/fpath.cpp +++ b/src/fpath.cpp @@ -249,8 +249,6 @@ static uint8_t prop2bits(PROPULSION_TYPE propulsion) // Check if the map tile at a location blocks a droid BOOL fpathBaseBlockingTile(SDWORD x, SDWORD y, PROPULSION_TYPE propulsion, int mapIndex, FPATH_MOVETYPE moveType) { - uint8_t aux, unitbits = prop2bits(propulsion); // TODO - cache prop2bits to psDroid, and pass in instead of propulsion type - /* All tiles outside of the map and on map border are blocking. */ if (x < 1 || y < 1 || x > mapWidth - 1 || y > mapHeight - 1) { @@ -263,18 +261,24 @@ BOOL fpathBaseBlockingTile(SDWORD x, SDWORD y, PROPULSION_TYPE propulsion, int m // coords off map - auto blocking tile return true; } - aux = auxTile(x, y, mapIndex); + unsigned aux = auxTile(x, y, mapIndex); - if ((unitbits & FEATURE_BLOCKED) - && ((moveType == FMT_MOVE && (aux & AUXBITS_ANY_BUILDING)) // do not wish to shoot our way through enemy buildings - || (moveType == FMT_BLOCK && (aux & AUXBITS_CLOSED_GATE)) // Do not wish to tunnel through closed gates. - || (aux & AUXBITS_OUR_BUILDING))) // move blocked by friendly building, assuming we do not want to shoot it up en route + int auxMask = 0; + switch (moveType) + { + case FMT_MOVE: auxMask = AUXBITS_NONPASSABLE; break; // do not wish to shoot our way through enemy buildings, but want to go through friendly gates (without shooting them) + case FMT_ATTACK: auxMask = AUXBITS_OUR_BUILDING; break; // move blocked by friendly building, assuming we do not want to shoot it up en route + case FMT_BLOCK: auxMask = AUXBITS_BLOCKING; break; // Do not wish to tunnel through closed gates or buildings. + } + + unsigned unitbits = prop2bits(propulsion); // TODO - cache prop2bits to psDroid, and pass in instead of propulsion type + if ((unitbits & FEATURE_BLOCKED) != 0 && (aux & auxMask) != 0) { return true; // move blocked by building, and we cannot or do not want to shoot our way through anything } // the MAX hack below is because blockTile() range does not include player-specific versions... - return (blockTile(x, y, MAX(0, mapIndex - MAX_PLAYERS)) & unitbits); // finally check if move is blocked by propulsion related factors + return (blockTile(x, y, MAX(0, mapIndex - MAX_PLAYERS)) & unitbits) != 0; // finally check if move is blocked by propulsion related factors } BOOL fpathDroidBlockingTile(DROID *psDroid, int x, int y, FPATH_MOVETYPE moveType) @@ -615,9 +619,10 @@ static int fpathResultQueueLength(void) } +// Only used by fpathTest. static FPATH_RETVAL fpathSimpleRoute(MOVE_CONTROL *psMove, int id, int startX, int startY, int tX, int tY) { - return fpathRoute(psMove, id, startX, startY, tX, tY, PROPULSION_TYPE_WHEELED, DROID_WEAPON, FMT_MOVE, 0, true); + return fpathRoute(psMove, id, startX, startY, tX, tY, PROPULSION_TYPE_WHEELED, DROID_WEAPON, FMT_BLOCK, 0, true); } void fpathTest(int x, int y, int x2, int y2) diff --git a/src/map.cpp b/src/map.cpp index ae53d31a4..93969afba 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -1776,12 +1776,12 @@ static int dangerFloodFill(int player) if (!(aux & AUXBITS_TEMPORARY) && !(aux & AUXBITS_THREAT) && (aux & AUXBITS_DANGER)) { // Note that we do not consider water to be a blocker here. This may or may not be a feature... - if (!(block & FEATURE_BLOCKED) && (!(aux & AUXBITS_ANY_BUILDING) || start)) + if (!(block & FEATURE_BLOCKED) && (!(aux & AUXBITS_NONPASSABLE) || start)) { floodbucket[bucketcounter].x = npos.x; floodbucket[bucketcounter].y = npos.y; bucketcounter++; - if (start && !(aux & AUXBITS_ANY_BUILDING)) + if (start && !(aux & AUXBITS_NONPASSABLE)) { start = false; } diff --git a/src/map.h b/src/map.h index 675433e87..69b234e08 100644 --- a/src/map.h +++ b/src/map.h @@ -124,14 +124,14 @@ extern char *tileset; #define WATER_BLOCKED 0x04 ///< Units that cannot pass water are blocked by this tile #define LAND_BLOCKED 0x08 ///< The inverse of the above -- for propeller driven crafts -#define AUXBITS_CLOSED_GATE 0x01 ///< There is a gate which is not open. +#define AUXBITS_NONPASSABLE 0x01 ///< Is there any building blocking here, other than a gate that would open for us? #define AUXBITS_OUR_BUILDING 0x02 ///< Do we or our allies have a building at this tile -#define AUXBITS_ANY_BUILDING 0x04 ///< Is there any building that might be blocking here? +#define AUXBITS_BLOCKING 0x04 ///< Is there any building currently blocking here? #define AUXBITS_TEMPORARY 0x08 ///< Temporary bit used in calculations #define AUXBITS_DANGER 0x10 ///< Does AI sense danger going there? #define AUXBITS_THREAT 0x20 ///< Can hostile players shoot here? #define AUXBITS_AATHREAT 0x40 ///< Can hostile players shoot at my VTOLs here? -#define AUXBITS_BUILDING 0x80 ///< Whether player has blocking building at tile, combine it with alliance bits and blockingBits +#define AUXBITS_UNUSED 0x80 ///< Unused #define AUXBITS_ALL 0xff #define AUX_MAP 0 diff --git a/src/structure.cpp b/src/structure.cpp index 54c4b9827..33c9e0dda 100644 --- a/src/structure.cpp +++ b/src/structure.cpp @@ -211,7 +211,7 @@ static void auxStructureNonblocking(STRUCTURE *psStructure) { for (int j = 0; j < size.y; j++) { - auxClearAll(map.x + i, map.y + j, AUXBITS_ANY_BUILDING | AUXBITS_OUR_BUILDING | AUXBITS_CLOSED_GATE); + auxClearAll(map.x + i, map.y + j, AUXBITS_BLOCKING | AUXBITS_OUR_BUILDING | AUXBITS_NONPASSABLE); } } } @@ -226,7 +226,7 @@ static void auxStructureBlocking(STRUCTURE *psStructure) for (int j = 0; j < size.y; j++) { auxSetAllied(map.x + i, map.y + j, psStructure->player, AUXBITS_OUR_BUILDING); - auxSetAll(map.x + i, map.y + j, AUXBITS_ANY_BUILDING); + auxSetAll(map.x + i, map.y + j, AUXBITS_BLOCKING | AUXBITS_NONPASSABLE); } } } @@ -240,7 +240,7 @@ static void auxStructureOpenGate(STRUCTURE *psStructure) { for (int j = 0; j < size.y; j++) { - auxClearAll(map.x + i, map.y + j, AUXBITS_CLOSED_GATE); + auxClearAll(map.x + i, map.y + j, AUXBITS_BLOCKING); } } } @@ -254,8 +254,8 @@ static void auxStructureClosedGate(STRUCTURE *psStructure) { for (int j = 0; j < size.y; j++) { - auxSetEnemy(map.x + i, map.y + j, psStructure->player, AUXBITS_ANY_BUILDING); - auxSetAll(map.x + i, map.y + j, AUXBITS_CLOSED_GATE); + auxSetEnemy(map.x + i, map.y + j, psStructure->player, AUXBITS_NONPASSABLE); + auxSetAll(map.x + i, map.y + j, AUXBITS_BLOCKING); } } } @@ -3590,7 +3590,7 @@ static void aiUpdateStructure(STRUCTURE *psStructure, bool isMission) //clear the rearm pad psDroid->action = DACTION_NONE; psReArmPad->psObj = NULL; - auxClearAll(map_coord(psStructure->pos.x), map_coord(psStructure->pos.y), AUXBITS_ANY_BUILDING | AUXBITS_OUR_BUILDING); + auxStructureNonblocking(psStructure); } } } From 23f46a51acad28116ca7ff928561222624d0ad5b Mon Sep 17 00:00:00 2001 From: Cyp Date: Wed, 2 Mar 2011 12:59:56 +0100 Subject: [PATCH 27/59] Open gates before bumping nose. --- src/move.cpp | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/src/move.cpp b/src/move.cpp index c5c70281a..8eb373a61 100644 --- a/src/move.cpp +++ b/src/move.cpp @@ -844,6 +844,26 @@ static void moveCalcSlideVector(DROID *psDroid, int32_t objX, int32_t objY, int3 } +static void moveOpenGates(DROID *psDroid, Vector2i tile) +{ + // is the new tile a gate? + if (!worldOnMap(tile.x, tile.y)) + { + return; + } + MAPTILE *psTile = mapTile(tile); + if (!isFlying(psDroid) && psTile && psTile->psObject && psTile->psObject->type == OBJ_STRUCTURE && aiCheckAlliances(psTile->psObject->player, psDroid->player)) + { + requestOpenGate((STRUCTURE *)psTile->psObject); // If it's a friendly gate, open it. (It would be impolite to open an enemy gate.) + } +} + +static void moveOpenGates(DROID *psDroid) +{ + Vector2i pos = removeZ(psDroid->pos) + iSinCosR(psDroid->sMove.moveDir, psDroid->sMove.speed * SAS_OPEN_SPEED / GAME_TICKS_PER_SEC); + moveOpenGates(psDroid, map_coord(pos)); +} + // see if a droid has run into a blocking tile // TODO See if this function can be simplified. static void moveCalcBlockingSlide(DROID *psDroid, int32_t *pmx, int32_t *pmy, uint16_t tarDir, uint16_t *pSlideDir) @@ -851,7 +871,6 @@ static void moveCalcBlockingSlide(DROID *psDroid, int32_t *pmx, int32_t *pmy, ui PROPULSION_TYPE propulsion = getPropulsionStats(psDroid)->propulsionType; SDWORD horizX,horizY, vertX,vertY; uint16_t slideDir; - MAPTILE *psTile = NULL; // calculate the new coords and see if they are on a different tile const int32_t mx = *pmx / EXTRA_PRECISION; const int32_t my = *pmy / EXTRA_PRECISION; @@ -867,15 +886,7 @@ static void moveCalcBlockingSlide(DROID *psDroid, int32_t *pmx, int32_t *pmy, ui CHECK_DROID(psDroid); // is the new tile a gate? - if (worldOnMap(ntx, nty)) - { - psTile = mapTile(ntx, nty); - } - if (!isFlying(psDroid) && psTile && psTile->psObject && psTile->psObject->type == OBJ_STRUCTURE - && aiCheckAlliances(psTile->psObject->player, psDroid->player)) - { - requestOpenGate((STRUCTURE *)psTile->psObject); // If it's a friendly gate, open it. (It would be impolite to open an enemy gate.) - } + moveOpenGates(psDroid, Vector2i(ntx, nty)); // is the new tile blocking? if (!fpathBlockingTile(ntx, nty, propulsion)) @@ -1650,6 +1661,7 @@ static void moveUpdateGroundModel(DROID *psDroid, SDWORD speed, uint16_t directi moveCombineNormalAndPerpSpeeds(psDroid, fNormalSpeed, fPerpSpeed, iDroidDir); moveGetDroidPosDiffs(psDroid, &dx, &dy); + moveOpenGates(psDroid); moveCheckSquished(psDroid, dx,dy); moveCalcDroidSlide(psDroid, &dx, &dy); bx = dx; @@ -1727,6 +1739,7 @@ static void moveUpdatePersonModel(DROID *psDroid, SDWORD speed, uint16_t directi moveCombineNormalAndPerpSpeeds(psDroid, fNormalSpeed, fPerpSpeed, iDroidDir); moveGetDroidPosDiffs( psDroid, &dx, &dy ); + moveOpenGates(psDroid); moveCalcDroidSlide(psDroid, &dx,&dy); moveCalcBlockingSlide(psDroid, &dx, &dy, direction, &slideDir); moveUpdateDroidPos( psDroid, dx, dy ); From 635643e1011a0f85bba31dad1c30c00a0025abd8 Mon Sep 17 00:00:00 2001 From: safety0ff Date: Wed, 2 Mar 2011 22:26:22 -0500 Subject: [PATCH 28/59] Add openal cflags to sequence lib build, fixes linking with static openal-soft. --- lib/sequence/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/sequence/Makefile.am b/lib/sequence/Makefile.am index bf0984210..f0697233b 100644 --- a/lib/sequence/Makefile.am +++ b/lib/sequence/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = $(SDL_CFLAGS) $(THEORA_CFLAGS) $(WZ_CPPFLAGS) $(GLee_CFLAGS) +AM_CPPFLAGS = $(SDL_CFLAGS) $(THEORA_CFLAGS) $(OPENAL_CFLAGS) $(WZ_CPPFLAGS) $(GLee_CFLAGS) AM_CFLAGS = $(WZ_CFLAGS) AM_CXXFLAGS = $(WZ_CXXFLAGS) From 92db46314fe62ed33cc6e6700be2fe0820cfd2e9 Mon Sep 17 00:00:00 2001 From: Cyp Date: Thu, 3 Mar 2011 17:49:00 +0100 Subject: [PATCH 29/59] Remove -Wc++-compat, since everything that will be C++ is now already C++. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index e8c613362..5361e05e8 100644 --- a/configure.ac +++ b/configure.ac @@ -231,7 +231,7 @@ else fi WZ_WARNINGS_GCC="-Wall -Wextra ${WZ_Wno_}unused-parameter ${WZ_Wno_}sign-compare -Wcast-align -Wwrite-strings -Wpointer-arith ${WZ_Wno_}format-security" -WZ_WARNINGS_GCC_C="${WZ_WARNINGS_GCC} -Wstrict-prototypes -Wdeclaration-after-statement -Wc++-compat ${WZ_Wno_}c++-compat ${CFLAGS_IGNORE_WARNINGS}" +WZ_WARNINGS_GCC_C="${WZ_WARNINGS_GCC} -Wstrict-prototypes -Wdeclaration-after-statement ${CFLAGS_IGNORE_WARNINGS}" WZ_WARNINGS_GCC_CXX="${WZ_Wno_}enum-compare ${WZ_WARNINGS_GCC}" if test "x$enable_debug" = "xyes" ; then if test "x$cc_icc" = "xyes" ; then From e6fd3c3c90b97af730abb2e2a3c588811c83e1bf Mon Sep 17 00:00:00 2001 From: dak180 Date: Thu, 3 Mar 2011 12:53:11 -0500 Subject: [PATCH 30/59] Remove -Wc++-compat, to keep pace with Cyp. --- macosx/configs/Warzone-Debug.xcconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macosx/configs/Warzone-Debug.xcconfig b/macosx/configs/Warzone-Debug.xcconfig index 58609a03b..45fd3ac18 100644 --- a/macosx/configs/Warzone-Debug.xcconfig +++ b/macosx/configs/Warzone-Debug.xcconfig @@ -13,5 +13,5 @@ BuildDependentFlagsForCandCpp = -Werror // -fstack-protector // Needs 10.6 min f // Build setting dependent warnings WarnForCandCppDep = -Wno-error=unused-parameter -Wno-error=format-security -Wno-sign-compare // -Wno-error=sign-compare // FIXME: For some reason these will be errors anyway, so off for now -WarnForCDep = -Wc++-compat -Wno-error=c++-compat +WarnForCDep = WarnForCppDep = // -Wno-error=enum-compare // not currently supported by compiler From c9f97fe8d886f5782620c1fa5971d0050bc68cb2 Mon Sep 17 00:00:00 2001 From: dak180 Date: Thu, 3 Mar 2011 14:40:14 -0500 Subject: [PATCH 31/59] Provide a backup download location. --- macosx/configs/FetchSource.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/macosx/configs/FetchSource.sh b/macosx/configs/FetchSource.sh index 74f4fc4ae..36a93fb86 100755 --- a/macosx/configs/FetchSource.sh +++ b/macosx/configs/FetchSource.sh @@ -6,6 +6,7 @@ OutDir="$2" FileName="$3" SourceDLP="$4" MD5Sum="$5" +BackupDLP="http://wz2100.net/~dak180/BuildTools/external/" # Make sure we are in the right place @@ -50,8 +51,10 @@ fi if [ ! -r "${FileName}" ]; then echo "Fetching ${SourceDLP}" if ! curl -Lfo "${FileName}" --connect-timeout "30" "${SourceDLP}"; then - echo "error: Unable to fetch ${SourceDLP}" >&2 - exit 1 + if ! curl -LfOC - --connect-timeout "30" "${BackupDLP}${FileName}"; then + echo "error: Unable to fetch ${SourceDLP}" >&2 + exit 1 + fi fi else echo "${FileName} already exists, skipping" From d1f7e50c7f04eb38cf894dc10760a218cfed5b93 Mon Sep 17 00:00:00 2001 From: Cyp Date: Thu, 3 Mar 2011 19:30:32 +0100 Subject: [PATCH 32/59] Fix tanks on blocking tiles unable to move. Tanks shouldn't really end up on blocking tiles, though. Fixes ticket:2478 and ticket:2512. --- src/fpath.cpp | 114 +++++++++++++++++--------------------------------- src/map.h | 19 ++------- 2 files changed, 41 insertions(+), 92 deletions(-) diff --git a/src/fpath.cpp b/src/fpath.cpp index 1be1ba8a1..3dc63cb42 100644 --- a/src/fpath.cpp +++ b/src/fpath.cpp @@ -48,11 +48,6 @@ static volatile bool fpathQuit = false; /* Beware: Enabling this will cause significant slow-down. */ #undef DEBUG_MAP -/* minimum height difference for VTOL blocking tile */ -#define LIFT_BLOCK_HEIGHT_LIGHTBODY 30 -#define LIFT_BLOCK_HEIGHT_MEDIUMBODY 350 -#define LIFT_BLOCK_HEIGHT_HEAVYBODY 350 - struct PATHRESULT { UDWORD droidID; ///< Unique droid ID. @@ -61,17 +56,6 @@ struct PATHRESULT }; -#define NUM_BASIC 8 -#define NUM_DIR 24 - -// Convert a direction into an offset, spanning two tiles -static const Vector2i aDirOffset[NUM_DIR] = -{ - Vector2i( 0, 1), Vector2i(-1, 1), Vector2i(-1, 0), Vector2i(-1, -1), Vector2i( 0, -1), Vector2i( 1, -1), Vector2i( 1, 0), Vector2i( 1, 1), - Vector2i(-2, -2), Vector2i(-1, -2), Vector2i( 0, -2), Vector2i( 1, -2), Vector2i( 2, -2), Vector2i(-2, -1), Vector2i( 2, -1), Vector2i(-2, 0), - Vector2i( 2, 0), Vector2i(-2, 1), Vector2i( 2, 1), Vector2i(-2, 2), Vector2i(-1, 2), Vector2i( 0, 2), Vector2i( 1, 2), Vector2i( 2, 2), -}; - // threading stuff static WZ_THREAD *fpathThread = NULL; static WZ_MUTEX *fpathMutex = NULL; @@ -293,20 +277,38 @@ BOOL fpathBlockingTile(SDWORD x, SDWORD y, PROPULSION_TYPE propulsion) } -/** Calculate the distance to a tile from a point - * - * @ingroup pathfinding - */ -static inline int fpathDistToTile(int tileX, int tileY, int pointX, int pointY) +// Returns the closest non-blocking tile to pos, or returns pos if no non-blocking tiles are present within a 2 tile distance. +static Position findNonblockingPosition(Position pos, PROPULSION_TYPE propulsion, int player = 0, FPATH_MOVETYPE moveType = FMT_BLOCK) { - // get the difference in world coords - int xdiff = world_coord(tileX) - pointX; - int ydiff = world_coord(tileY) - pointY; + Vector2i centreTile = map_coord(removeZ(pos)); + if (!fpathBaseBlockingTile(centreTile.x, centreTile.y, propulsion, player, moveType)) + { + return pos; // Fast case, pos is not on a blocking tile. + } - return iHypot(xdiff, ydiff); + Vector2i bestTile = centreTile; + int bestDistSq = INT32_MAX; + for (int y = -2; y <= 2; ++y) + for (int x = -2; x <= 2; ++x) + { + Vector2i tile = centreTile + Vector2i(x, y); + Vector2i diff = world_coord(tile) + Vector2i(TILE_UNITS/2, TILE_UNITS/2) - removeZ(pos); + int distSq = diff*diff; + if (distSq < bestDistSq && !fpathBaseBlockingTile(tile.x, tile.y, propulsion, player, moveType)) + { + bestTile = tile; + bestDistSq = distSq; + } + } + + // Return point on tile closest to the original pos. + Vector2i minCoord = world_coord(bestTile); + Vector2i maxCoord = minCoord + Vector2i(TILE_UNITS - 1, TILE_UNITS - 1); + return Position(std::min(std::max(pos.x, minCoord.x), maxCoord.x), std::min(std::max(pos.y, minCoord.y), maxCoord.y), pos.z); } + static void fpathSetMove(MOVE_CONTROL *psMoveCntl, SDWORD targetX, SDWORD targetY) { psMoveCntl->asPath = (Vector2i *)realloc(psMoveCntl->asPath, sizeof(*psMoveCntl->asPath)); @@ -459,51 +461,14 @@ FPATH_RETVAL fpathDroidRoute(DROID* psDroid, SDWORD tX, SDWORD tY, FPATH_MOVETYP ASSERT_OR_RETURN(FPR_FAILED, psPropStats != NULL, "invalid propulsion stats pointer"); ASSERT_OR_RETURN(FPR_FAILED, psDroid->type == OBJ_DROID, "We got passed an object that isn't a DROID!"); - // check whether the end point of the route - // is a blocking tile and find an alternative if it is - if (psDroid->sMove.Status != MOVEWAITROUTE && fpathDroidBlockingTile(psDroid, map_coord(tX), map_coord(tY), moveType)) + // Check whether the start and end points of the route are blocking tiles and find an alternative if they are. + Position startPos = psDroid->pos; + Position endPos = Position(tX, tY, 0); + if (psDroid->sMove.Status != MOVEWAITROUTE) { - // find the nearest non blocking tile to the DROID - int minDist = SDWORD_MAX; - int nearestDir = NUM_DIR; - int dir; - - objTrace(psDroid->id, "BLOCKED(%d,%d) - trying workaround", map_coord(tX), map_coord(tY)); - for (dir = 0; dir < NUM_DIR; dir++) - { - int x = map_coord(tX) + aDirOffset[dir].x; - int y = map_coord(tY) + aDirOffset[dir].y; - - if (tileOnMap(x, y) && !fpathDroidBlockingTile(psDroid, x, y, moveType)) - { - // pick the adjacent tile closest to our starting point - int tileDist = fpathDistToTile(x, y, psDroid->pos.x, psDroid->pos.y); - - if (tileDist < minDist) - { - minDist = tileDist; - nearestDir = dir; - } - } - - if (dir == NUM_BASIC - 1 && nearestDir != NUM_DIR) - { - break; // found a solution without checking at greater distance - } - } - - if (nearestDir == NUM_DIR) - { - // surrounded by blocking tiles, give up - objTrace(psDroid->id, "route to (%d, %d) failed - target blocked", map_coord(tX), map_coord(tY)); - return FPR_FAILED; - } - else - { - tX = world_coord(map_coord(tX) + aDirOffset[nearestDir].x) + TILE_UNITS / 2; - tY = world_coord(map_coord(tY) + aDirOffset[nearestDir].y) + TILE_UNITS / 2; - objTrace(psDroid->id, "Workaround found at (%d, %d)", map_coord(tX), map_coord(tY)); - } + startPos = findNonblockingPosition(startPos, getPropulsionStats(psDroid)->propulsionType, psDroid->player, moveType); + endPos = findNonblockingPosition(endPos, getPropulsionStats(psDroid)->propulsionType, psDroid->player, moveType); + objTrace(psDroid->id, "Want to go to (%d, %d) -> (%d, %d), going (%d, %d) -> (%d, %d)", map_coord(psDroid->pos.x), map_coord(psDroid->pos.y), map_coord(tX), map_coord(tY), map_coord(startPos.x), map_coord(startPos.y), map_coord(endPos.x), map_coord(endPos.y)); } switch (psDroid->order) { @@ -518,7 +483,7 @@ FPATH_RETVAL fpathDroidRoute(DROID* psDroid, SDWORD tX, SDWORD tY, FPATH_MOVETYP acceptNearest = true; break; } - return fpathRoute(&psDroid->sMove, psDroid->id, psDroid->pos.x, psDroid->pos.y, tX, tY, psPropStats->propulsionType, + return fpathRoute(&psDroid->sMove, psDroid->id, startPos.x, startPos.y, endPos.x, endPos.y, psPropStats->propulsionType, psDroid->droidType, moveType, psDroid->player, acceptNearest); } @@ -703,19 +668,16 @@ void fpathTest(int x, int y, int x2, int y2) bool fpathCheck(Position orig, Position dest, PROPULSION_TYPE propulsion) { - MAPTILE *origTile; - MAPTILE *destTile; - // We have to be careful with this check because it is called on // load when playing campaign on droids that are on the other // map during missions, and those maps are usually larger. - if (!worldOnMap(orig.x, orig.y) || !worldOnMap(dest.x, dest.y)) + if (!worldOnMap(removeZ(orig)) || !worldOnMap(removeZ(dest))) { return false; } - origTile = worldTile(orig.x, orig.y); - destTile = worldTile(dest.x, dest.y); + MAPTILE *origTile = worldTile(removeZ(findNonblockingPosition(orig, propulsion))); + MAPTILE *destTile = worldTile(removeZ(findNonblockingPosition(dest, propulsion))); ASSERT(propulsion != PROPULSION_TYPE_NUM, "Bad propulsion type"); ASSERT(origTile != NULL && destTile != NULL, "Bad tile parameter"); diff --git a/src/map.h b/src/map.h index 69b234e08..303fa01f6 100644 --- a/src/map.h +++ b/src/map.h @@ -433,7 +433,8 @@ static inline WZ_DECL_PURE MAPTILE *mapTile(int32_t x, int32_t y) static inline WZ_DECL_PURE MAPTILE *mapTile(Vector2i const &v) { return mapTile(v.x, v.y); } /** Return a pointer to the tile structure at x,y in world coordinates */ -#define worldTile(_x, _y) mapTile(map_coord(_x), map_coord(_y)) +static inline WZ_DECL_PURE MAPTILE *worldTile(int32_t x, int32_t y) { return mapTile(map_coord(x), map_coord(y)); } +static inline WZ_DECL_PURE MAPTILE *worldTile(Vector2i const &v) { return mapTile(map_coord(v)); } /// Return ground height of top-left corner of tile at x,y static inline WZ_DECL_PURE int32_t map_TileHeight(int32_t x, int32_t y) @@ -503,21 +504,7 @@ WZ_DECL_ALWAYS_INLINE static inline BOOL worldOnMap(int x, int y) /* Return whether a world coordinate is on the map */ -WZ_DECL_ALWAYS_INLINE static inline bool worldOnMap2i(Vector2i pos) -{ - return worldOnMap(pos.x, pos.y); -} - - -/* Return whether a world coordinate is on the map */ -WZ_DECL_ALWAYS_INLINE static inline bool worldOnMap3i(Vector3i pos) -{ - return worldOnMap(pos.x, pos.y); -} - - -/* Return whether a world coordinate is on the map */ -WZ_DECL_ALWAYS_INLINE static inline bool worldOnMap3f(Vector3f pos) +WZ_DECL_ALWAYS_INLINE static inline bool worldOnMap(Vector2i pos) { return worldOnMap(pos.x, pos.y); } From afb524e923fa44075276f0858277c8d3e46ed5e1 Mon Sep 17 00:00:00 2001 From: Cyp Date: Thu, 3 Mar 2011 21:56:40 +0100 Subject: [PATCH 33/59] Fix occasional failure to find the tile under the mouse. The problem was integer truncation during division in inQuad. --- src/geometry.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/geometry.cpp b/src/geometry.cpp index 6f142d80c..3e25b6e38 100644 --- a/src/geometry.cpp +++ b/src/geometry.cpp @@ -85,13 +85,10 @@ int inQuad(const Vector2i *pt, const QUAD *quad) for (i = 0, j = 3; i < 4; j = i++) { - if (((quad->coords[i].y <= pt->y && pt->y < quad->coords[j].y) || - (quad->coords[j].y <= pt->y && pt->y < quad->coords[i].y)) && - (pt->x < - (quad->coords[j].x - quad->coords[i].x) - * (pt->y - quad->coords[i].y) - / (quad->coords[j].y - quad->coords[i].y) - + quad->coords[i].x)) + Vector2i edge = quad->coords[j] - quad->coords[i]; + Vector2i pos = *pt - quad->coords[i]; + if (( 0 <= pos.y && pos.y < edge.y && pos.x * edge.y < pos.y * edge.x) || + (edge.y <= pos.y && pos.y < 0 && pos.x * edge.y > pos.y * edge.x)) { c = !c; } From 12e5d2a2b83f76b86ccb302ee50678b2d1ee501a Mon Sep 17 00:00:00 2001 From: Cyp Date: Thu, 3 Mar 2011 23:15:40 +0100 Subject: [PATCH 34/59] Make droids go exactly where the mouse was clicked. Useful for people that are very picky with where their droids go. Previous behaviour was to go to the centre of the tile that was clicked on. --- src/display.cpp | 3 +-- src/display3d.cpp | 3 +++ src/display3d.h | 1 + src/geometry.cpp | 28 +++++++++++++++++++++++++--- src/geometry.h | 3 ++- 5 files changed, 32 insertions(+), 6 deletions(-) diff --git a/src/display.cpp b/src/display.cpp index 30d3dcb6d..798a4527a 100644 --- a/src/display.cpp +++ b/src/display.cpp @@ -2153,8 +2153,7 @@ void dealWithLMB( void ) { // now changed to use the multiple order stuff // clicked on a destination. - orderSelectedLoc(selectedPlayer, mouseTileX*TILE_UNITS+TILE_UNITS/2, - mouseTileY*TILE_UNITS+TILE_UNITS/2, ctrlShiftDown()); // ctrlShiftDown() = ctrl clicked a destination, add an order + orderSelectedLoc(selectedPlayer, mousePos.x, mousePos.y, ctrlShiftDown()); // ctrlShiftDown() = ctrl clicked a destination, add an order /* Otherwise send them all */ if(getNumDroidsSelected()) { diff --git a/src/display3d.cpp b/src/display3d.cpp index e966527fc..a170f7dd2 100644 --- a/src/display3d.cpp +++ b/src/display3d.cpp @@ -165,6 +165,7 @@ static Vector3i tileScreenInfo[VISIBLE_YTILES+1][VISIBLE_XTILES+1]; /// Records the present X and Y values for the current mouse tile (in tiles) SDWORD mouseTileX, mouseTileY; +Vector2i mousePos(0, 0); /// Do we want the radar to be rendered BOOL radarOnScreen=false; @@ -3618,6 +3619,8 @@ static void locateMouse(void) else if (mouseTileY > mapHeight-1) mouseTileY = mapHeight - 1; + mousePos = world_coord(Vector2i(mouseTileX, mouseTileY)) + positionInQuad(pt, quad); + /* Store away z value */ nearestZ = tileZ; } diff --git a/src/display3d.h b/src/display3d.h index e4c1d6177..b33b11df0 100644 --- a/src/display3d.h +++ b/src/display3d.h @@ -115,6 +115,7 @@ extern SDWORD getCentreZ( void ); STRUCTURE *getTileBlueprint(int mapX, int mapY); ///< Gets the blueprint at those coordinates, if any. extern SDWORD mouseTileX, mouseTileY; +extern Vector2i mousePos; extern BOOL bRender3DOnly; extern BOOL showGateways; diff --git a/src/geometry.cpp b/src/geometry.cpp index 3e25b6e38..d3a3f7547 100644 --- a/src/geometry.cpp +++ b/src/geometry.cpp @@ -79,11 +79,11 @@ UDWORD bestSoFar; /* Returns non-zero if a point is in a 4 sided polygon */ /* See header file for definition of QUAD */ -int inQuad(const Vector2i *pt, const QUAD *quad) +bool inQuad(const Vector2i *pt, const QUAD *quad) { - int i, j, c = 0; + bool c = false; - for (i = 0, j = 3; i < 4; j = i++) + for (int i = 0, j = 3; i < 4; j = i++) { Vector2i edge = quad->coords[j] - quad->coords[i]; Vector2i pos = *pt - quad->coords[i]; @@ -97,6 +97,28 @@ int inQuad(const Vector2i *pt, const QUAD *quad) return c; } +Vector2i positionInQuad(Vector2i const &pt, QUAD const &quad) +{ + int lenSq[4]; + int ptDot[4]; + for (int i = 0, j = 3; i < 4; j = i++) + { + Vector2i edge = quad.coords[j] - quad.coords[i]; + Vector2i pos = quad.coords[j] - pt; + Vector2i posRot(pos.y, -pos.x); + lenSq[i] = edge*edge; + ptDot[i] = posRot*edge; + } + int ret[2]; + for (int i = 0; i < 2; ++i) + { + int d1 = ptDot[i]*lenSq[i + 2]; + int d2 = ptDot[i + 2]*lenSq[i]; + ret[i] = d1 + d2 != 0? (int64_t)TILE_UNITS*d1 / (d1 + d2) : TILE_UNITS/2; + } + return Vector2i(ret[0], ret[1]); +} + //----------------------------------------------------------------------------------- BOOL droidOnScreen( DROID *psDroid, SDWORD tolerance ) { diff --git a/src/geometry.h b/src/geometry.h index acc12ef17..281f80499 100644 --- a/src/geometry.h +++ b/src/geometry.h @@ -30,7 +30,8 @@ struct QUAD }; extern uint16_t calcDirection(int32_t x0, int32_t y0, int32_t x1, int32_t y1); -extern int inQuad( const Vector2i *pt, const QUAD *quad ); +bool inQuad(const Vector2i *pt, const QUAD *quad); +Vector2i positionInQuad(Vector2i const &pt, QUAD const &quad); extern DROID *getNearestDroid( UDWORD x, UDWORD y, BOOL bSelected ); extern BOOL droidOnScreen( DROID *psDroid, SDWORD tolerance ); From d3e993da314ad11f73d894631ea2ce755c77cc72 Mon Sep 17 00:00:00 2001 From: safety0ff Date: Fri, 4 Mar 2011 12:33:06 -0500 Subject: [PATCH 35/59] Use patch instead of sed to fix extraneous comma in quesoglc pkg-config file. --- win32/libs/quesoglc/Makefile | 2 +- .../patches/pkgconfig_remove_comma.diff | 27 +++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 win32/libs/quesoglc/patches/pkgconfig_remove_comma.diff diff --git a/win32/libs/quesoglc/Makefile b/win32/libs/quesoglc/Makefile index bba3cd131..fccfb674c 100644 --- a/win32/libs/quesoglc/Makefile +++ b/win32/libs/quesoglc/Makefile @@ -41,7 +41,7 @@ $(TOPDIR)/build/libs/lib/libGLC.la: $(PKG_SOURCEBASE)/build/libGLC.la $(MAKE) -C $(PKG_SOURCEBASE)/build install-libLTLIBRARIES $(PKG_SOURCEBASE)/quesoglc.pc: $(PKG_SOURCEBASE)/config.status - $(MAKE) -C $(PKG_SOURCEBASE) quesoglc.pc && sed -i -e "s/,\s*$$//" $(PKG_SOURCEBASE)/quesoglc.pc # Remove extraneous comma (autoconfigure artifact) + $(MAKE) -C $(PKG_SOURCEBASE) quesoglc.pc $(TOPDIR)/build/libs/lib/pkgconfig/quesoglc.pc: $(PKG_SOURCEBASE)/quesoglc.pc $(MAKE) -C $(PKG_SOURCEBASE) install-pkgconfigDATA diff --git a/win32/libs/quesoglc/patches/pkgconfig_remove_comma.diff b/win32/libs/quesoglc/patches/pkgconfig_remove_comma.diff new file mode 100644 index 000000000..f07875aca --- /dev/null +++ b/win32/libs/quesoglc/patches/pkgconfig_remove_comma.diff @@ -0,0 +1,27 @@ +Index: $sourcebase/configure.in +=================================================================== +--- $sourcebase/configure.in (revision 913) ++++ $sourcebase/configure.in (working copy) +@@ -143,7 +143,7 @@ + FRIBIDI_OBJ="libGLC_la-fribidi.lo libGLC_la-fribidi_char_type.lo \ + libGLC_la-fribidi_mirroring.lo libGLC_la-fribidi_types.lo" + else +- PKGCONFIG_REQUIREMENTS="fribidi" ++ PKGCONFIG_REQUIREMENTS=", fribidi" + fi + + # Checks for OpenGL and related libraries. +Index: $sourcebase/quesoglc.pc.in +=================================================================== +--- $sourcebase/quesoglc.pc.in (revision 913) ++++ $sourcebase/quesoglc.pc.in (working copy) +@@ -9,7 +9,7 @@ + Description: An implementation of SGI's OpenGL Character Renderer (GLC). The OpenGL Character Renderer (GLC) is a state machine that provides OpenGL programs with character rendering services via an application programming interface (API). + URL: http://quesoglc.sourceforge.net + Version: @VERSION@ +-Requires: fontconfig, freetype2, @PKGCONFIG_REQUIREMENTS@ ++Requires: fontconfig, freetype2@PKGCONFIG_REQUIREMENTS@ + Conflicts: + Libs: -L${libdir} -lGLC + Libs.private: @PKGCONFIG_LIBS_PRIVATE@ + From 509fe7bb8366316356d399a60a939ce035ed72ed Mon Sep 17 00:00:00 2001 From: safety0ff Date: Fri, 4 Mar 2011 12:43:00 -0500 Subject: [PATCH 36/59] Use WIN32_LIBS instead of IBERTY_LIBS when configuring libbfd. Fixes statically linking libbfd. Closes #2514. --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 5361e05e8..4c49336c4 100644 --- a/configure.ac +++ b/configure.ac @@ -416,9 +416,9 @@ AC_SUBST([OPENGL_LIBS], [${OPENGL_LIBS}]) # MinGW derived exception handler. if test "x$host_os_mingw32" = "xyes" ; then AC_CHECK_HEADER(bfd.h, , AC_MSG_ERROR([BFD header not found.])) - AC_CHECK_LIB(bfd, bfd_openr, AC_SUBST([BFD_LIBS], [-lbfd]), AC_MSG_ERROR([BFD not found.]), [${IBERTY_LIBS}]) + AC_CHECK_LIB(bfd, bfd_openr, AC_SUBST([BFD_LIBS], [-lbfd]), AC_MSG_ERROR([BFD not found.]), [${WIN32_LIBS}]) - WIN32_LIBS="${WIN32_LIBS} ${BFD_LIBS} ${IBERTY_LIBS} -lstdc++" + WIN32_LIBS="${BFD_LIBS} ${WIN32_LIBS} -lstdc++" fi WZ_CPPFLAGS="${WZ_CPPFLAGS} -DWZ_DATADIR=\"\\\"\${datadir}/\${PACKAGE}\\\"\"" From c5928e8cf3e686b91ce6cba5be1bd85c07a2c8b8 Mon Sep 17 00:00:00 2001 From: safety0ff Date: Sat, 5 Mar 2011 16:54:52 -0500 Subject: [PATCH 37/59] Fix MSVC builds broken in f1495ac. --- src/main.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main.cpp b/src/main.cpp index 592f04633..94482106e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -28,6 +28,7 @@ #if defined(WZ_OS_WIN) # include /* For SHGetFolderPath */ +# include /* CommandLineToArgvW */ #elif defined(WZ_OS_UNIX) # include #endif // WZ_OS_WIN From 809d0ac456b8f8c8410e638a7f86a20060e6e74a Mon Sep 17 00:00:00 2001 From: cybersphinx Date: Sun, 6 Mar 2011 18:46:38 +0100 Subject: [PATCH 38/59] Get rid of the SVN_LOW_REV stuff. --- build_tools/autorevision/autorevision.cpp | 15 ++++----------- src/version.cpp | 11 +---------- 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/build_tools/autorevision/autorevision.cpp b/build_tools/autorevision/autorevision.cpp index 37a6911cf..3e82af795 100644 --- a/build_tools/autorevision/autorevision.cpp +++ b/build_tools/autorevision/autorevision.cpp @@ -849,9 +849,7 @@ bool WriteOutput(const string& outputFile, const RevisionInformation& rev_info) if(do_wx) header << "#include \n"; - header << "\n#define SVN_LOW_REV " << (rev_info.low_revisionCount.empty() ? rev_info.revisionCount : rev_info.low_revisionCount) - << "\n#define SVN_LOW_REV_STR \"" << (rev_info.low_revision.empty() ? rev_info.revision : rev_info.low_revision) << "\"" - << "\n#define SVN_REV " << rev_info.revisionCount + header << "\n#define SVN_REV " << rev_info.revisionCount << "\n#define SVN_REV_STR \"" << rev_info.revision << "\"" << "\n#define SVN_DATE \"" << rev_info.date << "\"" << "\n#define SVN_URI \"" << rev_info.wc_uri << "\"" @@ -868,23 +866,18 @@ bool WriteOutput(const string& outputFile, const RevisionInformation& rev_info) header << "namespace autorevision\n{\n"; if(do_int) - header << "\tSVN_AUTOREVISION_STATIC const unsigned int svn_low_revision = " << rev_info.low_revision << ";\n" - << "\tSVN_AUTOREVISION_STATIC const unsigned int svn_revision = " << rev_info.revision << ";\n"; + header << "\tSVN_AUTOREVISION_STATIC const unsigned int svn_revision = " << rev_info.revision << ";\n"; if(do_std) - header << "\tSVN_AUTOREVISION_STATIC const std::string svn_low_revision_s(\"" << rev_info.low_revision << "\");\n" - << "\tSVN_AUTOREVISION_STATIC const std::string svn_revision_s(\"" << rev_info.revision << "\");\n" + header << "\tSVN_AUTOREVISION_STATIC const std::string svn_revision_s(\"" << rev_info.revision << "\");\n" << "\tSVN_AUTOREVISION_STATIC const std::string svn_date_s(\"" << rev_info.date << "\");\n" << "\tSVN_AUTOREVISION_STATIC const std::string svn_uri_s(\"" << rev_info.wc_uri << "\");\n"; if(do_cstr) - header << "\tSVN_AUTOREVISION_STATIC const char svn_low_revision_cstr[] = \"" << rev_info.low_revision << "\";\n" - << "\tSVN_AUTOREVISION_STATIC const char svn_revision_cstr[] = \"" << rev_info.revision << "\";\n" + header << "\tSVN_AUTOREVISION_STATIC const char svn_revision_cstr[] = \"" << rev_info.revision << "\";\n" << "\tSVN_AUTOREVISION_STATIC const char svn_date_cstr[] = \"" << rev_info.date << "\";\n" << "\tSVN_AUTOREVISION_STATIC const char svn_uri_cstr[] = \"" << rev_info.wc_uri << "\";\n"; if(do_wx) { - header << "\tSVN_AUTOREVISION_STATIC const wxString svnLowRevision("; - if(do_translate) header << "wxT"; diff --git a/src/version.cpp b/src/version.cpp index f60f2d45a..e3db7c530 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -28,16 +28,7 @@ #define SVN_AUTOREVISION_STATIC static #include "src/autorevision.h" -#if (SVN_LOW_REV < SVN_REV) -# define SVN_FULL_REV_STR "r" SVN_LOW_REV_STR ":" SVN_REV_STR -#else -# define SVN_FULL_REV_STR "r" SVN_SHORT_HASH -#endif - -unsigned int version_getLowRevision() -{ - return SVN_LOW_REV; -} +#define SVN_FULL_REV_STR "r" SVN_SHORT_HASH unsigned int version_getRevision() { From d2eb159216337f38edd373becabe7c4151026177 Mon Sep 17 00:00:00 2001 From: cybersphinx Date: Sun, 6 Mar 2011 18:57:12 +0100 Subject: [PATCH 39/59] Get rid of the SVN_WC_SWITCHED stuff. --- build_tools/autorevision/autorevision.cpp | 29 ++--------------------- src/version.cpp | 15 +----------- src/version.h | 7 ------ 3 files changed, 3 insertions(+), 48 deletions(-) diff --git a/build_tools/autorevision/autorevision.cpp b/build_tools/autorevision/autorevision.cpp index 3e82af795..eca4c3ced 100644 --- a/build_tools/autorevision/autorevision.cpp +++ b/build_tools/autorevision/autorevision.cpp @@ -100,8 +100,7 @@ struct RevisionInformation revision("unknown"), low_revisionCount("-1"), revisionCount("-1"), - wc_modified(false), - wc_switched(false) + wc_modified(false) {} assign_once low_revision; @@ -116,7 +115,6 @@ struct RevisionInformation assign_once wc_uri; bool wc_modified; - bool wc_switched; }; /** Abstract base class for classes that extract revision information. @@ -401,13 +399,6 @@ bool RevSVNVersionQuery::extractRevision(RevisionInformation& rev_info) line.erase(char_pos, 1); } - char_pos = line.find('S'); - if (char_pos != string::npos) - { - rev_info.wc_switched = true; - line.erase(char_pos, 1); - } - rev_info.revision = line; } @@ -756,18 +747,6 @@ bool RevConfigFile::extractRevision(RevisionInformation& rev_info) done_stuff = true; } - else if (line.compare(0, strlen("wc_switched="), "wc_switched=") == 0) - { - std::string bool_val = line.substr(strlen("wc_switched=")); - - if (bool_val.find("true") != std::string::npos - || bool_val.find('1') != std::string::npos) - rev_info.wc_switched = true; - else - rev_info.wc_switched = false; - - done_stuff = true; - } } if (done_stuff) @@ -798,9 +777,6 @@ bool WriteOutput(const string& outputFile, const RevisionInformation& rev_info) if (rev_info.wc_modified) comment_str << "M"; - if (rev_info.wc_switched) - comment_str << "S"; - comment_str << "*/"; string comment(comment_str.str()); @@ -858,8 +834,7 @@ bool WriteOutput(const string& outputFile, const RevisionInformation& rev_info) << "\n#define SVN_SHORT_HASH_WITHOUT_QUOTES " << rev_info.revision.substr(0, 7) << "\n"; - header << "\n#define SVN_WC_MODIFIED " << rev_info.wc_modified - << "\n#define SVN_WC_SWITCHED " << rev_info.wc_switched << "\n\n"; + header << "\n#define SVN_WC_MODIFIED " << rev_info.wc_modified << "\n\n"; // Open namespace if(do_int || do_std || do_wx) diff --git a/src/version.cpp b/src/version.cpp index e3db7c530..342b9c204 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -79,15 +79,6 @@ bool version_modified() #endif } -bool version_switched() -{ -#if (SVN_WC_SWITCHED) - return true; -#else - return false; -#endif -} - const char* version_getBuildDate() { return __DATE__; @@ -130,12 +121,8 @@ const char* version_getFormattedVersionString() if (versionString[0] == '\0') { // Compose the working copy state string -#if (SVN_WC_MODIFIED && SVN_WC_SWITCHED) - const char* wc_state = _(" (modified and switched locally)"); -#elif (SVN_WC_MODIFIED) +#if (SVN_WC_MODIFIED) const char* wc_state = _(" (modified locally)"); -#elif (SVN_WC_SWITCHED) - const char* wc_state = _(" (switched locally)"); #else const char* wc_state = ""; #endif diff --git a/src/version.h b/src/version.h index 5c9b41738..fee516e46 100644 --- a/src/version.h +++ b/src/version.h @@ -57,13 +57,6 @@ extern const char* version_getVersionString(void); */ extern bool version_modified(void); -/** Determine whether this version is compiled from a working copy which has - * some of its files and/or directories switched to a different URL. - * \return when part of the working copy was switched, false when it wasn't or - * a switch cannot be determined. - */ -extern bool version_switched(void); - /** Retrieves the date at which this build was compiled. * \return the date at which this build was made (uses __DATE__) */ From a30a8d21ce46c8e206cc9158e4384834f29f517e Mon Sep 17 00:00:00 2001 From: cybersphinx Date: Sun, 6 Mar 2011 19:23:33 +0100 Subject: [PATCH 40/59] Replace svn with vcs. --- build_tools/autorevision/autorevision.cpp | 40 ++++++++--------- src/main.cpp | 4 +- src/multiint.cpp | 2 +- src/version.cpp | 52 +++++++++++------------ src/version.h | 6 +-- 5 files changed, 51 insertions(+), 53 deletions(-) diff --git a/build_tools/autorevision/autorevision.cpp b/build_tools/autorevision/autorevision.cpp index eca4c3ced..981a4c149 100644 --- a/build_tools/autorevision/autorevision.cpp +++ b/build_tools/autorevision/autorevision.cpp @@ -814,8 +814,8 @@ bool WriteOutput(const string& outputFile, const RevisionInformation& rev_info) "#define AUTOREVISION_H\n" "\n" "\n" - "#ifndef SVN_AUTOREVISION_STATIC\n" - "#define SVN_AUTOREVISION_STATIC\n" + "#ifndef VCS_AUTOREVISION_STATIC\n" + "#define VCS_AUTOREVISION_STATIC\n" "#endif\n" "\n" "\n"; @@ -825,32 +825,32 @@ bool WriteOutput(const string& outputFile, const RevisionInformation& rev_info) if(do_wx) header << "#include \n"; - header << "\n#define SVN_REV " << rev_info.revisionCount - << "\n#define SVN_REV_STR \"" << rev_info.revision << "\"" - << "\n#define SVN_DATE \"" << rev_info.date << "\"" - << "\n#define SVN_URI \"" << rev_info.wc_uri << "\"" - << "\n#define SVN_TAG \"" << rev_info.tag << "\"\n" - << "\n#define SVN_SHORT_HASH \"" << rev_info.revision.substr(0, 7) << "\"" - << "\n#define SVN_SHORT_HASH_WITHOUT_QUOTES " << rev_info.revision.substr(0, 7) + header << "\n#define VCS_NUM " << rev_info.revisionCount + << "\n#define VCS_REV_STR \"" << rev_info.revision << "\"" + << "\n#define VCS_DATE \"" << rev_info.date << "\"" + << "\n#define VCS_URI \"" << rev_info.wc_uri << "\"" + << "\n#define VCS_TAG \"" << rev_info.tag << "\"\n" + << "\n#define VCS_SHORT_HASH \"" << rev_info.revision.substr(0, 7) << "\"" + << "\n#define VCS_SHORT_HASH_WITHOUT_QUOTES " << rev_info.revision.substr(0, 7) << "\n"; - header << "\n#define SVN_WC_MODIFIED " << rev_info.wc_modified << "\n\n"; + header << "\n#define VCS_WC_MODIFIED " << rev_info.wc_modified << "\n\n"; // Open namespace if(do_int || do_std || do_wx) header << "namespace autorevision\n{\n"; if(do_int) - header << "\tSVN_AUTOREVISION_STATIC const unsigned int svn_revision = " << rev_info.revision << ";\n"; + header << "\tVCS_AUTOREVISION_STATIC const unsigned int vcs_revision = " << rev_info.revision << ";\n"; if(do_std) - header << "\tSVN_AUTOREVISION_STATIC const std::string svn_revision_s(\"" << rev_info.revision << "\");\n" - << "\tSVN_AUTOREVISION_STATIC const std::string svn_date_s(\"" << rev_info.date << "\");\n" - << "\tSVN_AUTOREVISION_STATIC const std::string svn_uri_s(\"" << rev_info.wc_uri << "\");\n"; + header << "\tVCS_AUTOREVISION_STATIC const std::string vcs_revision_s(\"" << rev_info.revision << "\");\n" + << "\tVCS_AUTOREVISION_STATIC const std::string vcs_date_s(\"" << rev_info.date << "\");\n" + << "\tVCS_AUTOREVISION_STATIC const std::string vcs_uri_s(\"" << rev_info.wc_uri << "\");\n"; if(do_cstr) - header << "\tSVN_AUTOREVISION_STATIC const char svn_revision_cstr[] = \"" << rev_info.revision << "\";\n" - << "\tSVN_AUTOREVISION_STATIC const char svn_date_cstr[] = \"" << rev_info.date << "\";\n" - << "\tSVN_AUTOREVISION_STATIC const char svn_uri_cstr[] = \"" << rev_info.wc_uri << "\";\n"; + header << "\tVCS_AUTOREVISION_STATIC const char vcs_revision_cstr[] = \"" << rev_info.revision << "\";\n" + << "\tVCS_AUTOREVISION_STATIC const char vcs_date_cstr[] = \"" << rev_info.date << "\";\n" + << "\tVCS_AUTOREVISION_STATIC const char vcs_uri_cstr[] = \"" << rev_info.wc_uri << "\";\n"; if(do_wx) { if(do_translate) @@ -858,21 +858,21 @@ bool WriteOutput(const string& outputFile, const RevisionInformation& rev_info) header << "(\"" << rev_info.low_revision << "\"));\n" - << "\tSVN_AUTOREVISION_STATIC const wxString svnRevision("; + << "\tVCS_AUTOREVISION_STATIC const wxString svnRevision("; if(do_translate) header << "wxT"; header << "(\"" << rev_info.revision << "\"));\n" - << "\tSVN_AUTOREVISION_STATIC const wxString svnDate("; + << "\tVCS_AUTOREVISION_STATIC const wxString svnDate("; if(do_translate) header << "wxT"; header << "(\"" << rev_info.date << "\"));\n" - << "\tSVN_AUTOREVISION_STATIC const wxString svnUri("; + << "\tVCS_AUTOREVISION_STATIC const wxString svnUri("; if(do_translate) header << "wxT"; diff --git a/src/main.cpp b/src/main.cpp index 94482106e..55e34fd72 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -555,7 +555,7 @@ static void initialize_PhysicsFS(const char* argv_0) * * Priority: * Lower loads first. Current: - * -datadir > User's home dir > SVN data > AutoPackage > BaseDir > DEFAULT_DATADIR + * -datadir > User's home dir > source tree data > AutoPackage > BaseDir > DEFAULT_DATADIR * * Only -datadir and home dir are allways examined. Others only if data still not found. * @@ -598,7 +598,7 @@ static void scanDataDirs( void ) if( !PHYSFS_exists("gamedesc.lev") ) { - // Data in SVN dir + // Data in source tree sstrcpy(tmpstr, prefix); sstrcat(tmpstr, "/data/"); registerSearchPath( tmpstr, 3 ); diff --git a/src/multiint.cpp b/src/multiint.cpp index 8152b625c..157ce03dd 100644 --- a/src/multiint.cpp +++ b/src/multiint.cpp @@ -3034,7 +3034,7 @@ void startMultiplayerGame(void) { debug(LOG_NET, "limiter was NOT activated, setting defaults"); - // NOTE: TRUNK <->svn/2.3 difference, we don't load limiter_tex! + // NOTE: master <-> 2.3 difference, we don't load limiter_tex! if (!resLoad("wrf/limiter_tex.wrf", 501)) { debug(LOG_INFO, "Unable to load limiter_tex. Defaults not set."); diff --git a/src/version.cpp b/src/version.cpp index 342b9c204..90fff7b12 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -25,14 +25,12 @@ #include "version.h" #include "stringdef.h" -#define SVN_AUTOREVISION_STATIC static +#define VCS_AUTOREVISION_STATIC static #include "src/autorevision.h" -#define SVN_FULL_REV_STR "r" SVN_SHORT_HASH - unsigned int version_getRevision() { - return SVN_REV; + return VCS_NUM; } const char* version_getVersionString() @@ -41,29 +39,29 @@ const char* version_getVersionString() if (version_string == NULL) { - if (strncmp(svn_uri_cstr, "tags/", strlen("tags/")) == 0) + if (strncmp(vcs_uri_cstr, "tags/", strlen("tags/")) == 0) { - version_string = svn_uri_cstr + strlen("tags/"); + version_string = vcs_uri_cstr + strlen("tags/"); } - else if (strcmp(svn_uri_cstr, "trunk") == 0) + else if (strcmp(vcs_uri_cstr, "trunk") == 0) { - version_string = "TRUNK " SVN_FULL_REV_STR; + version_string = "TRUNK " VCS_SHORT_HASH; } - else if (strncmp(svn_uri_cstr, "branches/", strlen("branches/")) == 0) + else if (strncmp(vcs_uri_cstr, "branches/", strlen("branches/")) == 0) { - version_string = (SVN_URI " branch " SVN_FULL_REV_STR) + strlen("branches/"); + version_string = (VCS_URI " branch " VCS_SHORT_HASH) + strlen("branches/"); } - else if (strncmp(svn_uri_cstr, "refs/heads/", strlen("refs/heads/")) == 0) + else if (strncmp(vcs_uri_cstr, "refs/heads/", strlen("refs/heads/")) == 0) { - version_string = (SVN_URI " branch " SVN_FULL_REV_STR) + strlen("refs/heads/"); + version_string = (VCS_URI " branch " VCS_SHORT_HASH) + strlen("refs/heads/"); } - else if (SVN_REV != 0) + else if (VCS_NUM != 0) { - version_string = SVN_URI " " SVN_FULL_REV_STR; + version_string = VCS_URI " " VCS_SHORT_HASH; } else { - version_string = SVN_FULL_REV_STR; + version_string = VCS_SHORT_HASH; } } @@ -72,7 +70,7 @@ const char* version_getVersionString() bool version_modified() { -#if (SVN_WC_MODIFIED) +#if (VCS_WC_MODIFIED) return true; #else return false; @@ -89,28 +87,28 @@ const char* version_getBuildTime() return __TIME__; } -const char* version_getSvnDate() +const char* version_getVcsDate() { -#if (SVN_REV == 0) +#if (VCS_NUM == 0) return ""; #else - static char svn_date[sizeof(svn_date_cstr) - 9] = { '\0' }; + static char vcs_date[sizeof(vcs_date_cstr) - 9] = { '\0' }; - if (svn_date[0] == '\0') + if (vcs_date[0] == '\0') { - sstrcpy(svn_date, svn_date_cstr); + sstrcpy(vcs_date, vcs_date_cstr); } - return svn_date; + return vcs_date; #endif } -const char* version_getSvnTime() +const char* version_getVcsTime() { -#if (SVN_REV == 0) +#if (VCS_NUM == 0) return ""; #else - return SVN_DATE + sizeof(SVN_DATE) - 8 - 1; + return VCS_DATE + sizeof(VCS_DATE) - 8 - 1; #endif } @@ -121,7 +119,7 @@ const char* version_getFormattedVersionString() if (versionString[0] == '\0') { // Compose the working copy state string -#if (SVN_WC_MODIFIED) +#if (VCS_WC_MODIFIED) const char* wc_state = _(" (modified locally)"); #else const char* wc_state = ""; @@ -136,7 +134,7 @@ const char* version_getFormattedVersionString() const char* build_date = NULL; - if (strncmp(svn_uri_cstr, "tags/", strlen("tags/")) != 0) + if (strncmp(vcs_uri_cstr, "tags/", strlen("tags/")) != 0) { sasprintf((char**)&build_date, _(" - Built %s"), version_getBuildDate()); } diff --git a/src/version.h b/src/version.h index fee516e46..895e39e98 100644 --- a/src/version.h +++ b/src/version.h @@ -71,13 +71,13 @@ extern const char* version_getBuildTime(void); * \return the date when this revision was committed to the subversion * repository */ -extern const char* version_getSvnDate(void); +extern const char* version_getVcsDate(void); /** Retrieves the time at which the source of this build was committed. * \return the time when this revision was committed to the subversion * repository */ -extern const char* version_getSvnTime(void); +extern const char* version_getVcsTime(void); /** Composes a nicely formatted version string. * @@ -88,7 +88,7 @@ extern const char* version_getSvnTime(void); * - "" represents the modification and switch state * of the working copy from which this build was made. * - "" the date of building as returned by version_getBuildDate() or - * version_getSvnDate(); the latter is only used when the working + * version_getVcsDate(); the latter is only used when the working * copy has no local modifications. * - "" the type of build produced (i.e. DEBUG or not) */ From 784fe5f629d8e4bf79f3706e7dffd60dd1bc9229 Mon Sep 17 00:00:00 2001 From: cybersphinx Date: Sun, 6 Mar 2011 19:31:06 +0100 Subject: [PATCH 41/59] Always use static strings in autorevision.h. --- build_tools/autorevision/autorevision.cpp | 25 +++++++++-------------- src/version.cpp | 1 - 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/build_tools/autorevision/autorevision.cpp b/build_tools/autorevision/autorevision.cpp index 981a4c149..9e4a45573 100644 --- a/build_tools/autorevision/autorevision.cpp +++ b/build_tools/autorevision/autorevision.cpp @@ -813,11 +813,6 @@ bool WriteOutput(const string& outputFile, const RevisionInformation& rev_info) "#ifndef AUTOREVISION_H\n" "#define AUTOREVISION_H\n" "\n" - "\n" - "#ifndef VCS_AUTOREVISION_STATIC\n" - "#define VCS_AUTOREVISION_STATIC\n" - "#endif\n" - "\n" "\n"; if(do_std) @@ -841,16 +836,16 @@ bool WriteOutput(const string& outputFile, const RevisionInformation& rev_info) header << "namespace autorevision\n{\n"; if(do_int) - header << "\tVCS_AUTOREVISION_STATIC const unsigned int vcs_revision = " << rev_info.revision << ";\n"; + header << "\tstatic const unsigned int vcs_revision = " << rev_info.revision << ";\n"; if(do_std) - header << "\tVCS_AUTOREVISION_STATIC const std::string vcs_revision_s(\"" << rev_info.revision << "\");\n" - << "\tVCS_AUTOREVISION_STATIC const std::string vcs_date_s(\"" << rev_info.date << "\");\n" - << "\tVCS_AUTOREVISION_STATIC const std::string vcs_uri_s(\"" << rev_info.wc_uri << "\");\n"; + header << "\tstatic const std::string vcs_revision_s(\"" << rev_info.revision << "\");\n" + << "\tstatic const std::string vcs_date_s(\"" << rev_info.date << "\");\n" + << "\tstatic const std::string vcs_uri_s(\"" << rev_info.wc_uri << "\");\n"; if(do_cstr) - header << "\tVCS_AUTOREVISION_STATIC const char vcs_revision_cstr[] = \"" << rev_info.revision << "\";\n" - << "\tVCS_AUTOREVISION_STATIC const char vcs_date_cstr[] = \"" << rev_info.date << "\";\n" - << "\tVCS_AUTOREVISION_STATIC const char vcs_uri_cstr[] = \"" << rev_info.wc_uri << "\";\n"; + header << "\tstatic const char vcs_revision_cstr[] = \"" << rev_info.revision << "\";\n" + << "\tstatic const char vcs_date_cstr[] = \"" << rev_info.date << "\";\n" + << "\tstatic const char vcs_uri_cstr[] = \"" << rev_info.wc_uri << "\";\n"; if(do_wx) { if(do_translate) @@ -858,21 +853,21 @@ bool WriteOutput(const string& outputFile, const RevisionInformation& rev_info) header << "(\"" << rev_info.low_revision << "\"));\n" - << "\tVCS_AUTOREVISION_STATIC const wxString svnRevision("; + << "\tstatic const wxString svnRevision("; if(do_translate) header << "wxT"; header << "(\"" << rev_info.revision << "\"));\n" - << "\tVCS_AUTOREVISION_STATIC const wxString svnDate("; + << "\tstatic const wxString svnDate("; if(do_translate) header << "wxT"; header << "(\"" << rev_info.date << "\"));\n" - << "\tVCS_AUTOREVISION_STATIC const wxString svnUri("; + << "\tstatic const wxString svnUri("; if(do_translate) header << "wxT"; diff --git a/src/version.cpp b/src/version.cpp index 90fff7b12..acfde6ede 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -25,7 +25,6 @@ #include "version.h" #include "stringdef.h" -#define VCS_AUTOREVISION_STATIC static #include "src/autorevision.h" unsigned int version_getRevision() From 9626edb7f5fc6c8433e91b6deb5085dd59cfb221 Mon Sep 17 00:00:00 2001 From: cybersphinx Date: Sun, 6 Mar 2011 19:39:43 +0100 Subject: [PATCH 42/59] Simplify version_modified(). --- src/version.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/version.cpp b/src/version.cpp index acfde6ede..48bcb436c 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -69,11 +69,7 @@ const char* version_getVersionString() bool version_modified() { -#if (VCS_WC_MODIFIED) - return true; -#else - return false; -#endif + return VCS_WC_MODIFIED; } const char* version_getBuildDate() From 3490bf21d7d641b104b1e0d0fe47b00339e83e4c Mon Sep 17 00:00:00 2001 From: cybersphinx Date: Mon, 7 Mar 2011 00:24:25 +0100 Subject: [PATCH 43/59] Make autorevision only output the things we actually need. --- build_tools/autorevision/autorevision.cpp | 55 +---------------------- 1 file changed, 1 insertion(+), 54 deletions(-) diff --git a/build_tools/autorevision/autorevision.cpp b/build_tools/autorevision/autorevision.cpp index 9e4a45573..9a4219dbc 100644 --- a/build_tools/autorevision/autorevision.cpp +++ b/build_tools/autorevision/autorevision.cpp @@ -815,69 +815,16 @@ bool WriteOutput(const string& outputFile, const RevisionInformation& rev_info) "\n" "\n"; - if(do_std) - header << "#include \n"; - if(do_wx) - header << "#include \n"; - header << "\n#define VCS_NUM " << rev_info.revisionCount - << "\n#define VCS_REV_STR \"" << rev_info.revision << "\"" << "\n#define VCS_DATE \"" << rev_info.date << "\"" << "\n#define VCS_URI \"" << rev_info.wc_uri << "\"" - << "\n#define VCS_TAG \"" << rev_info.tag << "\"\n" << "\n#define VCS_SHORT_HASH \"" << rev_info.revision.substr(0, 7) << "\"" - << "\n#define VCS_SHORT_HASH_WITHOUT_QUOTES " << rev_info.revision.substr(0, 7) << "\n"; header << "\n#define VCS_WC_MODIFIED " << rev_info.wc_modified << "\n\n"; - // Open namespace - if(do_int || do_std || do_wx) - header << "namespace autorevision\n{\n"; - - if(do_int) - header << "\tstatic const unsigned int vcs_revision = " << rev_info.revision << ";\n"; - - if(do_std) - header << "\tstatic const std::string vcs_revision_s(\"" << rev_info.revision << "\");\n" - << "\tstatic const std::string vcs_date_s(\"" << rev_info.date << "\");\n" - << "\tstatic const std::string vcs_uri_s(\"" << rev_info.wc_uri << "\");\n"; - if(do_cstr) - header << "\tstatic const char vcs_revision_cstr[] = \"" << rev_info.revision << "\";\n" - << "\tstatic const char vcs_date_cstr[] = \"" << rev_info.date << "\";\n" + header << "\tstatic const char vcs_date_cstr[] = \"" << rev_info.date << "\";\n" << "\tstatic const char vcs_uri_cstr[] = \"" << rev_info.wc_uri << "\";\n"; - if(do_wx) - { - if(do_translate) - header << "wxT"; - - header << "(\"" << rev_info.low_revision << "\"));\n" - - << "\tstatic const wxString svnRevision("; - - if(do_translate) - header << "wxT"; - - header << "(\"" << rev_info.revision << "\"));\n" - - << "\tstatic const wxString svnDate("; - - if(do_translate) - header << "wxT"; - - header << "(\"" << rev_info.date << "\"));\n" - - << "\tstatic const wxString svnUri("; - - if(do_translate) - header << "wxT"; - - header << "(\"" << rev_info.wc_uri << "\"));\n"; - } - - // Terminate/close namespace - if(do_int || do_std || do_wx) - header << "}\n\n"; header << "\n\n#endif\n"; From 1d358beb19fe458024e7cafb85d4b61349c31eaa Mon Sep 17 00:00:00 2001 From: cybersphinx Date: Mon, 7 Mar 2011 01:04:52 +0100 Subject: [PATCH 44/59] Move _cstr creation into version.cpp. --- build_tools/autorevision/autorevision.cpp | 3 --- src/version.cpp | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build_tools/autorevision/autorevision.cpp b/build_tools/autorevision/autorevision.cpp index 9a4219dbc..96716204d 100644 --- a/build_tools/autorevision/autorevision.cpp +++ b/build_tools/autorevision/autorevision.cpp @@ -823,9 +823,6 @@ bool WriteOutput(const string& outputFile, const RevisionInformation& rev_info) header << "\n#define VCS_WC_MODIFIED " << rev_info.wc_modified << "\n\n"; - header << "\tstatic const char vcs_date_cstr[] = \"" << rev_info.date << "\";\n" - << "\tstatic const char vcs_uri_cstr[] = \"" << rev_info.wc_uri << "\";\n"; - header << "\n\n#endif\n"; return true; diff --git a/src/version.cpp b/src/version.cpp index 48bcb436c..d662b0249 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -27,6 +27,9 @@ #include "src/autorevision.h" +static const char vcs_date_cstr[] = VCS_DATE; +static const char vcs_uri_cstr[] = VCS_URI; + unsigned int version_getRevision() { return VCS_NUM; From 0af9d47a34e837b2a4d056ee535f0df005756252 Mon Sep 17 00:00:00 2001 From: cybersphinx Date: Mon, 7 Mar 2011 01:18:18 +0100 Subject: [PATCH 45/59] Call autorevision.sh instead of compiling and running the C++ autorevision. --- Makefile.am | 2 +- build_tools/autorevision.sh | 103 ++++++++++++++++++++++++++++++++++++ configure.ac | 1 - src/Makefile.am | 4 ++ src/version.cpp | 24 ++++++--- 5 files changed, 124 insertions(+), 10 deletions(-) create mode 100755 build_tools/autorevision.sh diff --git a/Makefile.am b/Makefile.am index 377c4875e..c6b254b4c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,4 @@ SUBDIRS = \ - build_tools/autorevision \ win32 \ lib/framework \ lib/exceptionhandler \ @@ -33,6 +32,7 @@ macosx/prebuilt: $(MKDIR_P) macosx/prebuilt EXTRA_DIST= \ + build_tools/autorevision.sh \ autogen.sh \ autorevision.conf \ config.rpath \ diff --git a/build_tools/autorevision.sh b/build_tools/autorevision.sh new file mode 100755 index 000000000..ca2c17b59 --- /dev/null +++ b/build_tools/autorevision.sh @@ -0,0 +1,103 @@ +#!/bin/bash + +# autorevision.sh - a shell script to get git / hg revisions etc. into binary builds. +# To use pass a path to the desired output file: some/path/to/autorevision.h. +# Note: the script will run at the root level of the repository that it is in. + +# Config +TARGETFILE="${1}" + +# For git repos +function gitRepo { + cd "$(git rev-parse --show-toplevel)" + + # Is the working copy clean? + git diff --quiet HEAD &> /dev/null + WC_MODIFIED="${?}" + + # Enumeration of changesets + VCS_NUM="$(git rev-list --count HEAD)" + + # The full revision hash + VCS_FULL_HASH="$(git rev-parse HEAD)" + + # The short hash + VCS_SHORT_HASH="$(echo ${VCS_FULL_HASH} | cut -b 1-7)" + + # Current branch + VCS_URI="$(git symbolic-ref HEAD)" + + # Current tag (or uri if there is no tag) + VCS_TAG="$(git describe --exact-match --tags 2>/dev/null)" + if [ -z "${VCS_TAG}" ]; then + VCS_TAG="${VCS_URI}" + fi + + # Date of the curent commit + VCS_DATE="$(git log -1 --pretty=format:%ci)" +} + +# For hg repos +function hgRepo { + cd "$(hg root)" + + # Is the working copy clean? + hg sum | grep -q 'commit: (clean)' + WC_MODIFIED="${?}" + + # Enumeration of changesets + VCS_NUM="$(hg id -n)" + + # The full revision hash + VCS_FULL_HASH="$(hg log -r ${VCS_NUM} -l 1 --template '{node}\n')" + + # The short hash + VCS_SHORT_HASH="$(hg id -i)" + + # Current bookmark (bookmarks are roughly equivalent to git's branches) or branch if no bookmark + VCS_URI="$(hg id -B | cut -d ' ' -f 1)" + # Fall back to the branch if there are no bookmarks + if [ -z "${VCS_URI}" ]; then + VCS_URI="$(hg id -b)" + fi + + # Current tag (or uri if there is no tag) + if [ "$(hg log -r ${VCS_NUM} -l 1 --template '{latesttagdistance}\n')" = "0" ]; then + VCS_TAG="`hg id -t | sed -e 's:qtip::' -e 's:tip::' -e 's:qbase::' -e 's:qparent::' -e "s:$(hg --color never qtop 2>/dev/null)::" | cut -d ' ' -f 1`" + else + VCS_TAG="${VCS_URI}" + fi + + # Date of the curent commit + VCS_DATE="$(hg log -r ${VCS_NUM} -l 1 --template '{date|isodatesec}\n')" +} + + +if [[ ! -z "$(hg id 2>/dev/null)" ]]; then + hgRepo +elif [[ ! -z "$(git rev-parse HEAD 2>/dev/null)" ]]; then + gitRepo +else + echo "error: No repo detected." + exit 1 +fi + + +cat > "${TARGETFILE}" << EOF +/* ${VCS_FULL_HASH} */ +#ifndef AUTOREVISION_H +#define AUTOREVISION_H + +#define VCS_NUM ${VCS_NUM} +#define VCS_DATE ${VCS_DATE} +#define VCS_URI ${VCS_URI} +#define VCS_TAG ${VCS_TAG} + +#define VCS_FULL_HASH ${VCS_FULL_HASH} +#define VCS_SHORT_HASH ${VCS_SHORT_HASH} + +#define VCS_WC_MODIFIED ${WC_MODIFIED} + +#endif + +EOF \ No newline at end of file diff --git a/configure.ac b/configure.ac index 4c49336c4..75737a674 100644 --- a/configure.ac +++ b/configure.ac @@ -436,7 +436,6 @@ AC_CONFIG_HEADER([config.h]) AC_CONFIG_FILES([Makefile po/Makefile.in doc/Makefile - build_tools/autorevision/Makefile icons/Makefile data/Makefile data/mods/multiplay/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 1817df55e..dfefabac7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,7 +10,11 @@ AM_CXXFLAGS = $(WZ_CXXFLAGS) AM_LFLAGS = $(FLEX_FLAGS) AM_YFLAGS = -d +autorevision.h: $(top_srcdir)/build_tools/autorevision.sh + $(top_srcdir)/build_tools/autorevision.sh $(abs_top_builddir)/src/autorevision.h + BUILT_SOURCES = \ + autorevision.h \ level_lexer.lex.cpp \ message_lexer.lex.cpp \ message_parser.tab.cpp \ diff --git a/src/version.cpp b/src/version.cpp index d662b0249..4f4df6149 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -27,8 +27,16 @@ #include "src/autorevision.h" -static const char vcs_date_cstr[] = VCS_DATE; -static const char vcs_uri_cstr[] = VCS_URI; +// Two-step process to put quotes around anything, including preprocessor definitions. +#define EXPAND(token) #token +#define QUOTE(token) EXPAND(token) + +#define VCS_SHORT_HASH_QUOTED QUOTE(VCS_SHORT_HASH) +#define VCS_URI_QUOTED QUOTE(VCS_URI) +#define VCS_DATE_QUOTED QUOTE(VCS_DATE) + +static const char vcs_date_cstr[] = QUOTE(VCS_DATE); +static const char vcs_uri_cstr[] = QUOTE(VCS_URI); unsigned int version_getRevision() { @@ -47,23 +55,23 @@ const char* version_getVersionString() } else if (strcmp(vcs_uri_cstr, "trunk") == 0) { - version_string = "TRUNK " VCS_SHORT_HASH; + version_string = "TRUNK " VCS_SHORT_HASH_QUOTED; } else if (strncmp(vcs_uri_cstr, "branches/", strlen("branches/")) == 0) { - version_string = (VCS_URI " branch " VCS_SHORT_HASH) + strlen("branches/"); + version_string = (VCS_URI_QUOTED " branch " VCS_SHORT_HASH_QUOTED) + strlen("branches/"); } else if (strncmp(vcs_uri_cstr, "refs/heads/", strlen("refs/heads/")) == 0) { - version_string = (VCS_URI " branch " VCS_SHORT_HASH) + strlen("refs/heads/"); + version_string = (VCS_URI_QUOTED " branch " VCS_SHORT_HASH_QUOTED) + strlen("refs/heads/"); } else if (VCS_NUM != 0) { - version_string = VCS_URI " " VCS_SHORT_HASH; + version_string = VCS_URI_QUOTED " " VCS_SHORT_HASH_QUOTED; } else { - version_string = VCS_SHORT_HASH; + version_string = VCS_SHORT_HASH_QUOTED; } } @@ -106,7 +114,7 @@ const char* version_getVcsTime() #if (VCS_NUM == 0) return ""; #else - return VCS_DATE + sizeof(VCS_DATE) - 8 - 1; + return VCS_DATE_QUOTED + sizeof(VCS_DATE_QUOTED) - 8 - 1; #endif } From 6d7572131ecda237fc829768e69325651e1e7cf1 Mon Sep 17 00:00:00 2001 From: cybersphinx Date: Mon, 7 Mar 2011 01:30:45 +0100 Subject: [PATCH 46/59] Make the shell and C++ autorevision output the same. --- build_tools/autorevision/autorevision.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build_tools/autorevision/autorevision.cpp b/build_tools/autorevision/autorevision.cpp index 96716204d..b06983145 100644 --- a/build_tools/autorevision/autorevision.cpp +++ b/build_tools/autorevision/autorevision.cpp @@ -816,9 +816,9 @@ bool WriteOutput(const string& outputFile, const RevisionInformation& rev_info) "\n"; header << "\n#define VCS_NUM " << rev_info.revisionCount - << "\n#define VCS_DATE \"" << rev_info.date << "\"" - << "\n#define VCS_URI \"" << rev_info.wc_uri << "\"" - << "\n#define VCS_SHORT_HASH \"" << rev_info.revision.substr(0, 7) << "\"" + << "\n#define VCS_DATE " << rev_info.date + << "\n#define VCS_URI " << rev_info.wc_uri + << "\n#define VCS_SHORT_HASH " << rev_info.revision.substr(0, 7) << "\n"; header << "\n#define VCS_WC_MODIFIED " << rev_info.wc_modified << "\n\n"; From add956d337899b1482caf8a483dc289e5d53e1e9 Mon Sep 17 00:00:00 2001 From: dak180 Date: Sun, 6 Mar 2011 20:13:40 -0500 Subject: [PATCH 47/59] Use the autorevision script instead of the program. Refs #2401. --- build_tools/autorevision.sh | 2 +- macosx/Resources/Warzone-Info.plist | 12 +- macosx/Warzone.xcodeproj/project.pbxproj | 143 ++++++++----------- macosx/configs/Autorevision-All.xcconfig | 9 -- macosx/configs/Autorevision-Debug.xcconfig | 11 -- macosx/configs/Autorevision-Release.xcconfig | 9 -- 6 files changed, 68 insertions(+), 118 deletions(-) delete mode 100644 macosx/configs/Autorevision-All.xcconfig delete mode 100644 macosx/configs/Autorevision-Debug.xcconfig delete mode 100644 macosx/configs/Autorevision-Release.xcconfig diff --git a/build_tools/autorevision.sh b/build_tools/autorevision.sh index ca2c17b59..1c9f76f34 100755 --- a/build_tools/autorevision.sh +++ b/build_tools/autorevision.sh @@ -100,4 +100,4 @@ cat > "${TARGETFILE}" << EOF #endif -EOF \ No newline at end of file +EOF diff --git a/macosx/Resources/Warzone-Info.plist b/macosx/Resources/Warzone-Info.plist index b990324b0..1c3821979 100644 --- a/macosx/Resources/Warzone-Info.plist +++ b/macosx/Resources/Warzone-Info.plist @@ -28,18 +28,22 @@ ATSApplicationFontsPath Fonts/ + VCSLongHash + VCS_FULL_HASH + VCSShortHash + VCS_SHORT_HASH CFBundleVersion - SVN_REV + VCS_NUM LSApplicationCategoryType public.app-category.strategy-games CFBundleShortVersionString - SVN_TAG [SVN_SHORT_HASH_WITHOUT_QUOTES] + VCS_TAG [VCS_SHORT_HASH] NSHumanReadableCopyright Copyright © 1999-2004 Eidos Interactive, Copyright © 2005-2010 The Warzone 2100 Project CFBundleGetInfoString - SVN_TAG [SVN_SHORT_HASH_WITHOUT_QUOTES], Copyright © 1999-2004 Eidos Interactive, Copyright © 2005-2010 The Warzone 2100 Project + VCS_TAG [VCS_SHORT_HASH], Copyright © 1999-2004 Eidos Interactive, Copyright © 2005-2010 The Warzone 2100 Project LSMinimumSystemVersion - 10.4.0 + ${MACOSX_DEPLOYMENT_TARGET}.0 LSRequiresNativeExecution UTExportedTypeDeclarations diff --git a/macosx/Warzone.xcodeproj/project.pbxproj b/macosx/Warzone.xcodeproj/project.pbxproj index f2de44e56..b5ba0efd2 100644 --- a/macosx/Warzone.xcodeproj/project.pbxproj +++ b/macosx/Warzone.xcodeproj/project.pbxproj @@ -7,6 +7,17 @@ objects = { /* Begin PBXAggregateTarget section */ + 43071471132465D500FB6EBF /* Autorevision */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 4307147F132465F000FB6EBF /* Build configuration list for PBXAggregateTarget "Autorevision" */; + buildPhases = ( + 43071470132465D500FB6EBF /* Run autorevision */, + ); + dependencies = ( + ); + name = Autorevision; + productName = Autorevision; + }; 43F77C7710F0125E00E04615 /* Make DMGs for Release */ = { isa = PBXAggregateTarget; buildConfigurationList = 43F77C8A10F0126F00E04615 /* Build configuration list for PBXAggregateTarget "Make DMGs for Release" */; @@ -306,7 +317,6 @@ 02BBB2090DA874F6002D438B /* exceptionhandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02BBB2070DA874F6002D438B /* exceptionhandler.cpp */; }; 02C8AEF80BE68A5600E9D8A7 /* png_util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02C8AEF60BE68A5600E9D8A7 /* png_util.cpp */; }; 02C8AEFC0BE68A6800E9D8A7 /* oggvorbis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02C8AEFA0BE68A6800E9D8A7 /* oggvorbis.cpp */; }; - 02CDDCF90D159BE000722688 /* autorevision.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02CDDCF80D159BE000722688 /* autorevision.cpp */; }; 02CDDD130D159DF600722688 /* QuesoGLC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0223BBD10CFE3D5C0056EF85 /* QuesoGLC.framework */; }; 02CDDD1C0D159E2F00722688 /* openal_error.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02CDDD1A0D159E2F00722688 /* openal_error.cpp */; }; 02DDA81C0BD3C1420049AB60 /* analysis.c in Sources */ = {isa = PBXBuildFile; fileRef = 02DDA7F50BD3C1420049AB60 /* analysis.c */; }; @@ -661,13 +671,6 @@ remoteGlobalIDString = 02581C5C0BD5A94A00957CBC; remoteInfo = SDLmain; }; - 02CDDCFE0D159C0000722688 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 02356D660BD3BB2600E9A019 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 02CDDCF30D159BC300722688; - remoteInfo = Autorevision; - }; 02DDA8680BD3C21E0049AB60 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 02356D660BD3BB2600E9A019 /* Project object */; @@ -682,6 +685,13 @@ remoteGlobalIDString = 02356D820BD3BB4100E9A019; remoteInfo = Zlib; }; + 430714801324663A00FB6EBF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 02356D660BD3BB2600E9A019 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 43071471132465D500FB6EBF; + remoteInfo = Autorevision; + }; 43AE78FC10F0F4F500FED5D3 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 02356D660BD3BB2600E9A019 /* Project object */; @@ -1269,7 +1279,6 @@ 02C8AEF70BE68A5600E9D8A7 /* png_util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = png_util.h; path = ../lib/ivis_opengl/png_util.h; sourceTree = SOURCE_ROOT; }; 02C8AEFA0BE68A6800E9D8A7 /* oggvorbis.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = oggvorbis.cpp; path = ../lib/sound/oggvorbis.cpp; sourceTree = SOURCE_ROOT; }; 02C8AEFB0BE68A6800E9D8A7 /* oggvorbis.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = oggvorbis.h; path = ../lib/sound/oggvorbis.h; sourceTree = SOURCE_ROOT; }; - 02CDDCF40D159BC300722688 /* Autorevision */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = Autorevision; sourceTree = BUILT_PRODUCTS_DIR; }; 02CDDCF80D159BE000722688 /* autorevision.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = autorevision.cpp; path = ../build_tools/autorevision/autorevision.cpp; sourceTree = SOURCE_ROOT; }; 02CDDD080D159D5900722688 /* autorevision.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = autorevision.h; path = ../src/autorevision.h; sourceTree = SOURCE_ROOT; }; 02CDDD1A0D159E2F00722688 /* openal_error.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = openal_error.cpp; path = ../lib/sound/openal_error.cpp; sourceTree = SOURCE_ROOT; }; @@ -1690,13 +1699,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 02CDDCF20D159BC300722688 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; 02DDA7EC0BD3C03F0049AB60 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -1867,7 +1869,6 @@ 022B2F220BD55814002E64E3 /* Gettext.framework */, 02581C5D0BD5A94A00957CBC /* libSDLmain.a */, 0223BBD10CFE3D5C0056EF85 /* QuesoGLC.framework */, - 02CDDCF40D159BC300722688 /* Autorevision */, 97AEAB330E8C1B5200A10721 /* Theora.framework */, ); name = Products; @@ -3210,7 +3211,7 @@ 0246AA730BD3E47F004D1C70 /* PBXBuildRule */, ); dependencies = ( - 02CDDCFF0D159C0000722688 /* PBXTargetDependency */, + 430714811324663A00FB6EBF /* PBXTargetDependency */, 02581C630BD5A97400957CBC /* PBXTargetDependency */, 022B313F0BD56915002E64E3 /* PBXTargetDependency */, 0246A2FF0BD3CCF0004D1C70 /* PBXTargetDependency */, @@ -3303,23 +3304,6 @@ productReference = 02581C5D0BD5A94A00957CBC /* libSDLmain.a */; productType = "com.apple.product-type.library.static"; }; - 02CDDCF30D159BC300722688 /* Autorevision */ = { - isa = PBXNativeTarget; - buildConfigurationList = 02CDDCFA0D159BE000722688 /* Build configuration list for PBXNativeTarget "Autorevision" */; - buildPhases = ( - 02CDDCF10D159BC300722688 /* Sources */, - 02CDDCF20D159BC300722688 /* Frameworks */, - 43095E9A10EEA8630067E86B /* Run autorevision */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = Autorevision; - productName = Autorevision; - productReference = 02CDDCF40D159BC300722688 /* Autorevision */; - productType = "com.apple.product-type.tool"; - }; 02DDA7ED0BD3C03F0049AB60 /* Vorbis */ = { isa = PBXNativeTarget; buildConfigurationList = 02DDA7F00BD3C03F0049AB60 /* Build configuration list for PBXNativeTarget "Vorbis" */; @@ -3434,7 +3418,7 @@ projectRoot = ..; targets = ( 02356D740BD3BB3400E9A019 /* Warzone */, - 02CDDCF30D159BC300722688 /* Autorevision */, + 43071471132465D500FB6EBF /* Autorevision */, 43FA570C10FF8E9B0074E914 /* Setup Prebuilt Components */, 02581C5C0BD5A94A00957CBC /* SDLmain */, 022B2F210BD55814002E64E3 /* Gettext */, @@ -3682,7 +3666,7 @@ shellPath = /bin/sh; shellScript = "# Config\nexport PATH=$PATH:/sw/bin:/opt/local/bin\npodir=\"../po\"\ndisfile=\"configs/LangDis\"\naresdir=\"build/${CONFIGURATION}/Warzone.app/Contents/Resources/\"\nbresdir=\"locale/\"\nmessdir=\"LC_MESSAGES/\"\nmonme=\"warzone2100.mo\"\npolist=`ls -1 ${podir} | sed -n 's:\\.po$:&:p' | sed -e 's:\\.po::'`\ndislist=`cat ${disfile} | sed -n 's:^<::p'`\n\n# 1st san check\necho \"Checking for msgfmt...\"\nif [ -f build/notrans.dis ]; then\n rm build/notrans.dis\n echo \"warning: Gettext support has been disabled for this build because we could not find a binary.\" >&2\n exit 0\nelif ! type -aP msgfmt; then\n echo \"error: Fatal inability to properly translate messages.\" >&2\n exit 1\nfi\n\n# Get the path\nmsgfmtpth=`type -P msgfmt`\n\n# 2nd san check\necho \"Checking for sanity...\"\nif ! $msgfmtpth --version; then\n echo \"error: Fatal failure of san check.\" >&2\n exit 1\nfi\n\n# Disable selected langs\nfor dislang in ${dislist}; do\n echo \"Cleaning up for ${dislang} ...\"\n rm -rfv \"${aresdir}${dislang}.lproj\"\ndone\n\n# Make .mo\nfor lang in ${polist}; do\n if [ -d \"${aresdir}${lang}.lproj\" ]; then\n echo \"Setting up for ${lang} ...\"\n mkdir -p \"${aresdir}${bresdir}${lang}/${messdir}\"\n $msgfmtpth -v -o \"${aresdir}${bresdir}${lang}/${messdir}${monme}\" \"${podir}/${lang}.po\"\n fi\ndone\n\nexit 0"; }; - 43095E9A10EEA8630067E86B /* Run autorevision */ = { + 43071470132465D500FB6EBF /* Run autorevision */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -3691,11 +3675,10 @@ ); name = "Run autorevision"; outputPaths = ( - "$(SRCROOT)/../src/autorevision.h", ); runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/bash; - shellScript = "function hfilter {\n sed -n 's:#define:&:p' src/autorevision.h | sed 's:\"::g' | sed -e 's:refs/heads/:branch/:' -e 's:master:Master:' -e 's:^v::' | sed -e 's:_beta: Beta :' -e 's:_rc: RC :' >macosx/build/autorevision.h\n}\n\n\ncd ..\nexport PATH=$PATH:/sw/bin:/opt/local/bin\n\n# Do not run if we will not get useful information\nif [[ ! -d \".git\" ]] && [[ ! -d \".hg\" ]]; then\n if [ -f \"src/autorevision.h\" ]; then\n echo \"Not a repo.\"\n hfilter\n exit 0\n fi\nfi\n\n# Wait a bit if Autorevision does not exist\ntick=0\nwhile [ ! -s \"./macosx/build/${CONFIGURATION}/Autorevision\" ]; do\n let tick=${tick}+1\n if [ ${tick} == 11 ]; then\n break\n fi\n sleep 1\ndone\n\n\nif ! ./macosx/build/${CONFIGURATION}/Autorevision +cstr . src/autorevision.h; then\n echo \"error: Could not run Autorevision\"\n exit 1\nfi\n\nhfilter\nexit 0\n"; + shellPath = /bin/sh; + shellScript = "function hfilter {\n sed -e 's:refs/heads/:branch/:' -e 's:master:Master:' -e 's:^v::' src/autorevision.h | sed -e 's:_beta: Beta :' -e 's:_rc: RC :' > \"${OBJROOT}/autorevision.h\"\n}\n\n\nexport PATH=$PATH:/sw/bin:/opt/local/bin\ncd ..\n\n# Do not run if we will not get useful information\nif [[ ! -d \".git\" ]] && [[ ! -d \".hg\" ]]; then\n if [ -f \"src/autorevision.h\" ]; then\n echo \"Not a repo.\"\n hfilter\n exit 0\n fi\nfi\n\n\nif ! build_tools/autorevision.sh src/autorevision.h; then\n echo \"error: Could not run Autorevision\"\n exit 1\nfi\n\nhfilter\nexit 0\n"; }; 4345290E1130F84E002AD731 /* msgfmt */ = { isa = PBXShellScriptBuildPhase; @@ -4113,14 +4096,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 02CDDCF10D159BC300722688 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 02CDDCF90D159BE000722688 /* autorevision.cpp in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 02DDA7EB0BD3C03F0049AB60 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -4255,11 +4230,6 @@ target = 02581C5C0BD5A94A00957CBC /* SDLmain */; targetProxy = 02581C620BD5A97400957CBC /* PBXContainerItemProxy */; }; - 02CDDCFF0D159C0000722688 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 02CDDCF30D159BC300722688 /* Autorevision */; - targetProxy = 02CDDCFE0D159C0000722688 /* PBXContainerItemProxy */; - }; 02DDA8690BD3C21E0049AB60 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 02356E080BD3BCFE00E9A019 /* Ogg */; @@ -4270,6 +4240,11 @@ target = 02356D820BD3BB4100E9A019 /* Zlib */; targetProxy = 02DDA8D20BD3C3780049AB60 /* PBXContainerItemProxy */; }; + 430714811324663A00FB6EBF /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 43071471132465D500FB6EBF /* Autorevision */; + targetProxy = 430714801324663A00FB6EBF /* PBXContainerItemProxy */; + }; 43AE78FD10F0F4F500FED5D3 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 02356D740BD3BB3400E9A019 /* Warzone */; @@ -4499,20 +4474,6 @@ }; name = Release; }; - 02CDDCFB0D159BE000722688 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 43025EB71120CD41006C49B1 /* Autorevision-Debug.xcconfig */; - buildSettings = { - }; - name = Debug; - }; - 02CDDCFC0D159BE000722688 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 43025EB81120CD41006C49B1 /* Autorevision-Release.xcconfig */; - buildSettings = { - }; - name = Release; - }; 02DDA7F10BD3C03F0049AB60 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 43025F2B1121F965006C49B1 /* Vorbis-Debug.xcconfig */; @@ -4541,6 +4502,27 @@ }; name = Release; }; + 4307147A132465D600FB6EBF /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = Autorevision; + }; + name = Debug; + }; + 4307147B132465D600FB6EBF /* StaticAnalyzer */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = Autorevision; + }; + name = StaticAnalyzer; + }; + 4307147C132465D600FB6EBF /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = Autorevision; + }; + name = Release; + }; 4389DBD4111B0A0700B98DEF /* StaticAnalyzer */ = { isa = XCBuildConfiguration; baseConfigurationReference = 43025DFE1120A4CA006C49B1 /* Project-All.xcconfig */; @@ -4555,13 +4537,6 @@ }; name = StaticAnalyzer; }; - 4389DBD7111B0A0700B98DEF /* StaticAnalyzer */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 43025EB71120CD41006C49B1 /* Autorevision-Debug.xcconfig */; - buildSettings = { - }; - name = StaticAnalyzer; - }; 4389DBD8111B0A0700B98DEF /* StaticAnalyzer */ = { isa = XCBuildConfiguration; buildSettings = { @@ -4786,16 +4761,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - 02CDDCFA0D159BE000722688 /* Build configuration list for PBXNativeTarget "Autorevision" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 02CDDCFB0D159BE000722688 /* Debug */, - 4389DBD7111B0A0700B98DEF /* StaticAnalyzer */, - 02CDDCFC0D159BE000722688 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug; - }; 02DDA7F00BD3C03F0049AB60 /* Build configuration list for PBXNativeTarget "Vorbis" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -4816,6 +4781,16 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; + 4307147F132465F000FB6EBF /* Build configuration list for PBXAggregateTarget "Autorevision" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 4307147A132465D600FB6EBF /* Debug */, + 4307147B132465D600FB6EBF /* StaticAnalyzer */, + 4307147C132465D600FB6EBF /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; + }; 43F77C8A10F0126F00E04615 /* Build configuration list for PBXAggregateTarget "Make DMGs for Release" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/macosx/configs/Autorevision-All.xcconfig b/macosx/configs/Autorevision-All.xcconfig deleted file mode 100644 index 6a4990031..000000000 --- a/macosx/configs/Autorevision-All.xcconfig +++ /dev/null @@ -1,9 +0,0 @@ -// Autorevision settings for all configurations - - -ARCHS = $(ARCHS_STANDARD_32_64_BIT) -ONLY_ACTIVE_ARCH = YES -INSTALL_PATH = $(HOME)/bin -PREBINDING = NO -PRODUCT_NAME = Autorevision -GCC_MODEL_TUNING = G5 \ No newline at end of file diff --git a/macosx/configs/Autorevision-Debug.xcconfig b/macosx/configs/Autorevision-Debug.xcconfig deleted file mode 100644 index 41707923c..000000000 --- a/macosx/configs/Autorevision-Debug.xcconfig +++ /dev/null @@ -1,11 +0,0 @@ -// Autorevision settings for Debug configuration - -#include "Autorevision-All.xcconfig" - - -COPY_PHASE_STRIP = NO -GCC_ENABLE_FIX_AND_CONTINUE = YES -GCC_GENERATE_DEBUGGING_SYMBOLS = YES -GCC_DYNAMIC_NO_PIC = NO -GCC_OPTIMIZATION_LEVEL = 0 -ZERO_LINK = YES \ No newline at end of file diff --git a/macosx/configs/Autorevision-Release.xcconfig b/macosx/configs/Autorevision-Release.xcconfig deleted file mode 100644 index 79a512ab4..000000000 --- a/macosx/configs/Autorevision-Release.xcconfig +++ /dev/null @@ -1,9 +0,0 @@ -// Autorevision settings for Release configuration - -#include "Autorevision-All.xcconfig" - - -COPY_PHASE_STRIP = YES -GCC_ENABLE_FIX_AND_CONTINUE = NO -GCC_GENERATE_DEBUGGING_SYMBOLS = NO -ZERO_LINK = NO \ No newline at end of file From 8b4e67c019c19ab610f3328113f333930b97224d Mon Sep 17 00:00:00 2001 From: Cyp Date: Tue, 8 Mar 2011 11:10:24 +0100 Subject: [PATCH 48/59] Fix gates belonging to certain players shown as grey by setting TYPE 10200 in blgateh.pie. --- data/mp/structs/blgateh.pie | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mp/structs/blgateh.pie b/data/mp/structs/blgateh.pie index 4ebb43d4e..e20c9d110 100644 --- a/data/mp/structs/blgateh.pie +++ b/data/mp/structs/blgateh.pie @@ -1,5 +1,5 @@ PIE 2 -TYPE 200 +TYPE 10200 TEXTURE 0 page-12-player-buildings.png 256 256 LEVELS 1 LEVEL 1 From b1c3d25a0713b5184f904901615f5a92ff928cda Mon Sep 17 00:00:00 2001 From: cybersphinx Date: Tue, 8 Mar 2011 16:11:29 +0100 Subject: [PATCH 49/59] Update translations. --- po/cs.po | 313 +++++++++++++++++++++++++-------------------------- po/da.po | 313 +++++++++++++++++++++++++-------------------------- po/de.po | 317 ++++++++++++++++++++++++++------------------------- po/en_GB.po | 319 ++++++++++++++++++++++++++-------------------------- po/es.po | 317 ++++++++++++++++++++++++++------------------------- po/et_EE.po | 317 ++++++++++++++++++++++++++------------------------- po/fi.po | 313 +++++++++++++++++++++++++-------------------------- po/fr.po | 317 ++++++++++++++++++++++++++------------------------- po/fy.po | 313 +++++++++++++++++++++++++-------------------------- po/ga.po | 313 +++++++++++++++++++++++++-------------------------- po/hr.po | 317 ++++++++++++++++++++++++++------------------------- po/it.po | 317 ++++++++++++++++++++++++++------------------------- po/ko.po | 317 ++++++++++++++++++++++++++------------------------- po/la.po | 308 ++++++++++++++++++++++++-------------------------- po/lt.po | 313 +++++++++++++++++++++++++-------------------------- po/nb.po | 313 +++++++++++++++++++++++++-------------------------- po/nl.po | 319 ++++++++++++++++++++++++++-------------------------- po/pl.po | 317 ++++++++++++++++++++++++++------------------------- po/pt.po | 319 ++++++++++++++++++++++++++-------------------------- po/pt_BR.po | 317 ++++++++++++++++++++++++++------------------------- po/ro.po | 317 ++++++++++++++++++++++++++------------------------- po/ru.po | 317 ++++++++++++++++++++++++++------------------------- po/sk.po | 311 +++++++++++++++++++++++++------------------------- po/sl.po | 319 ++++++++++++++++++++++++++-------------------------- po/tr.po | 317 ++++++++++++++++++++++++++------------------------- po/uk_UA.po | 317 ++++++++++++++++++++++++++------------------------- po/zh_CN.po | 313 +++++++++++++++++++++++++-------------------------- po/zh_TW.po | 319 ++++++++++++++++++++++++++-------------------------- 28 files changed, 4346 insertions(+), 4493 deletions(-) diff --git a/po/cs.po b/po/cs.po index 457d6b859..7b6f84a69 100644 --- a/po/cs.po +++ b/po/cs.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-02-25 23:35+0100\n" +"POT-Creation-Date: 2011-03-08 15:43+0100\n" "PO-Revision-Date: 2008-05-09 16:05+0000\n" "Last-Translator: Lubos \n" "Language-Team: Czech \n" @@ -12056,26 +12056,26 @@ msgid "System locale" msgstr "Systémové místo" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1042 +#: lib/netplay/netplay.cpp:1037 msgid "Enter password here" msgstr "" -#: lib/netplay/netplay.cpp:2060 +#: lib/netplay/netplay.cpp:2055 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "" -#: lib/netplay/netplay.cpp:2082 +#: lib/netplay/netplay.cpp:2077 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "" #: src/challenge.cpp:184 #: src/hci.cpp:916 -#: src/hci.cpp:3378 -#: src/hci.cpp:3501 -#: src/hci.cpp:3912 -#: src/hci.cpp:4930 +#: src/hci.cpp:3386 +#: src/hci.cpp:3509 +#: src/hci.cpp:3920 +#: src/hci.cpp:4938 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12387,7 +12387,7 @@ msgid "Player dropped" msgstr "Hráč" #: src/display3d.cpp:599 -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2121 msgid "Waiting for other players" msgstr "" @@ -12400,7 +12400,7 @@ msgid "Cannot Build. Oil Resource Burning." msgstr "Nemohu stavět. Ropný vrt hoří." #: src/display.cpp:1828 -#: src/display.cpp:2421 +#: src/display.cpp:2420 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - Poškození %d%% - Zkušenosti %d, %s" @@ -12434,7 +12434,7 @@ msgstr "Jednotka ztracena!" msgid "Structure Restored" msgstr "Budova obnovena" -#: src/droid.cpp:2732 +#: src/droid.cpp:2734 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" @@ -12442,7 +12442,7 @@ msgstr[0] "Skupina %u vybrána - %u Jednotka" msgstr[1] "Skupina %u vybrána - %u Jednotky" msgstr[2] "Skupina %u vybrána - %u Jednotek" -#: src/droid.cpp:2745 +#: src/droid.cpp:2747 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" @@ -12450,7 +12450,7 @@ msgstr[0] "%u jednotka začleněna do Skupiny %u" msgstr[1] "%u jednotky začleněny do Skupiny %u" msgstr[2] "%u jednotek začleněno do Skupiny %u" -#: src/droid.cpp:2758 +#: src/droid.cpp:2760 #, fuzzy, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" @@ -12458,7 +12458,7 @@ msgstr[0] "Zameřeno na skupinu %u - %u jednotka" msgstr[1] "Zameřeno na skupinu %u - %u jednotky" msgstr[2] "Zameřeno na skupinu %u - %u jednotek" -#: src/droid.cpp:2762 +#: src/droid.cpp:2764 #, fuzzy, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" @@ -12466,50 +12466,50 @@ msgstr[0] "Vyrovnání se skupinou %u - %u jednotka" msgstr[1] "Vyrovnání se skupinou %u - %u jednotky" msgstr[2] "Vyrovnání se skupinou %u - %u jednotek" -#: src/droid.cpp:3093 +#: src/droid.cpp:3095 msgid "Rookie" msgstr "Nováček" -#: src/droid.cpp:3094 +#: src/droid.cpp:3096 msgctxt "rank" msgid "Green" msgstr "Zelenáč" -#: src/droid.cpp:3095 +#: src/droid.cpp:3097 #, fuzzy msgid "Trained" msgstr "Trénovaný" -#: src/droid.cpp:3096 +#: src/droid.cpp:3098 msgid "Regular" msgstr "Běžný" -#: src/droid.cpp:3097 +#: src/droid.cpp:3099 msgid "Professional" msgstr "Profesionální" -#: src/droid.cpp:3098 +#: src/droid.cpp:3100 msgid "Veteran" msgstr "Veterán" -#: src/droid.cpp:3099 +#: src/droid.cpp:3101 msgid "Elite" msgstr "Elita" -#: src/droid.cpp:3100 +#: src/droid.cpp:3102 msgid "Special" msgstr "Speciální" -#: src/droid.cpp:3101 +#: src/droid.cpp:3103 msgid "Hero" msgstr "Hrdina" -#: src/droid.cpp:4123 +#: src/droid.cpp:4125 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "" -#: src/droid.cpp:4127 +#: src/droid.cpp:4129 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "" @@ -12530,7 +12530,7 @@ msgid "Tutorial" msgstr "Tutoriál" #: src/frontend.cpp:100 -#: src/hci.cpp:3487 +#: src/hci.cpp:3495 msgid "Options" msgstr "Nastavení" @@ -12593,8 +12593,8 @@ msgstr "HRA JEDNOHO HRÁČE" #: src/frontend.cpp:303 #: src/ingameop.cpp:494 -#: src/mission.cpp:2493 -#: src/mission.cpp:2596 +#: src/mission.cpp:2537 +#: src/mission.cpp:2640 msgid "Load Saved Game" msgstr "Načti Uloženou Hru" @@ -12887,7 +12887,7 @@ msgid "GAME OPTIONS" msgstr "HERNÍ NASTAVENÍ" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2398 +#: src/multiint.cpp:2394 msgid "Mod: " msgstr "" @@ -12897,8 +12897,8 @@ msgid "MAP SAVED!" msgstr "HRA ULOŽENA!" #: src/hci.cpp:1573 -#: src/loop.cpp:558 -#: src/loop.cpp:574 +#: src/loop.cpp:561 +#: src/loop.cpp:577 #, fuzzy msgid "GAME SAVED: " msgstr "HRA ULOŽENA!" @@ -12927,161 +12927,161 @@ msgstr "" msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "Hráč %u podvádí ( ladící menu ) sebe sama novou budovou: %s" -#: src/hci.cpp:3298 +#: src/hci.cpp:3306 msgid "Commanders (F6)" msgstr "Velitelé (F6)" -#: src/hci.cpp:3311 +#: src/hci.cpp:3319 msgid "Intelligence Display (F5)" msgstr "Zpravodajský display (F5)" -#: src/hci.cpp:3324 +#: src/hci.cpp:3332 msgid "Manufacture (F1)" msgstr "Výroba (F1)" -#: src/hci.cpp:3337 +#: src/hci.cpp:3345 msgid "Design (F4)" msgstr "Konstrukce (F4)" -#: src/hci.cpp:3350 +#: src/hci.cpp:3358 msgid "Research (F2)" msgstr "Výzkum (F2)" -#: src/hci.cpp:3363 +#: src/hci.cpp:3371 msgid "Build (F3)" msgstr "Stavba (F3)" -#: src/hci.cpp:3434 +#: src/hci.cpp:3442 #: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Energie" -#: src/hci.cpp:3525 +#: src/hci.cpp:3533 msgid "Map:" msgstr "" -#: src/hci.cpp:3538 +#: src/hci.cpp:3546 #, fuzzy msgid "Load" msgstr "Nahraj Hru" -#: src/hci.cpp:3539 +#: src/hci.cpp:3547 #, fuzzy msgid "Load Map File" msgstr "Nahraj Hru" -#: src/hci.cpp:3546 +#: src/hci.cpp:3554 #, fuzzy msgid "Save" msgstr "Uložit hru" -#: src/hci.cpp:3547 +#: src/hci.cpp:3555 #, fuzzy msgid "Save Map File" msgstr "Uložit hru" -#: src/hci.cpp:3555 +#: src/hci.cpp:3563 msgid "New" msgstr "" -#: src/hci.cpp:3556 +#: src/hci.cpp:3564 msgid "New Blank Map" msgstr "" -#: src/hci.cpp:3592 +#: src/hci.cpp:3600 #, fuzzy msgid "Tile" msgstr "soubor" -#: src/hci.cpp:3593 +#: src/hci.cpp:3601 #, fuzzy msgid "Place tiles on map" msgstr "Nastavení limitu budov" -#: src/hci.cpp:3602 +#: src/hci.cpp:3610 msgid "Unit" msgstr "Jednotka" -#: src/hci.cpp:3603 +#: src/hci.cpp:3611 #, fuzzy msgid "Place Unit on map" msgstr "Nastavení limitu budov" -#: src/hci.cpp:3611 +#: src/hci.cpp:3619 msgid "Struct" msgstr "Stavba" -#: src/hci.cpp:3612 +#: src/hci.cpp:3620 #, fuzzy msgid "Place Structures on map" msgstr "Nastavení limitu budov" -#: src/hci.cpp:3620 +#: src/hci.cpp:3628 msgid "Feat" msgstr "" -#: src/hci.cpp:3621 +#: src/hci.cpp:3629 #, fuzzy msgid "Place Features on map" msgstr "Nastavení limitu budov" -#: src/hci.cpp:3631 +#: src/hci.cpp:3639 msgid "Pause" msgstr "" -#: src/hci.cpp:3632 +#: src/hci.cpp:3640 #, fuzzy msgid "Pause or unpause the game" msgstr "Hostitel opustil hru!" -#: src/hci.cpp:3646 +#: src/hci.cpp:3654 msgid "Align height of all map objects" msgstr "" -#: src/hci.cpp:3656 +#: src/hci.cpp:3664 msgid "Edit" msgstr "" -#: src/hci.cpp:3657 +#: src/hci.cpp:3665 #, fuzzy msgid "Start Edit Mode" msgstr "Začni bez Základen" -#: src/hci.cpp:3671 +#: src/hci.cpp:3679 #: src/ingameop.cpp:112 #: src/ingameop.cpp:256 #: src/ingameop.cpp:260 msgid "Quit" msgstr "Ukončit" -#: src/hci.cpp:3672 +#: src/hci.cpp:3680 msgid "Exit Game" msgstr "Ukončit hru" -#: src/hci.cpp:3698 +#: src/hci.cpp:3706 #, fuzzy msgid "Current Player:" msgstr "Hra pro Více Hráčů" -#: src/hci.cpp:3989 +#: src/hci.cpp:3997 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "Panel průběhu" -#: src/hci.cpp:4855 +#: src/hci.cpp:4863 msgid "Factory Delivery Point" msgstr "" -#: src/hci.cpp:4873 +#: src/hci.cpp:4881 msgid "Loop Production" msgstr "Opakovat výrobu" -#: src/hci.cpp:4953 +#: src/hci.cpp:4961 msgid "Tab Scroll left" msgstr "" -#: src/hci.cpp:4968 +#: src/hci.cpp:4976 msgid "Tab Scroll right" msgstr "" @@ -13107,8 +13107,8 @@ msgstr "" #: src/ingameop.cpp:274 #: src/ingameop.cpp:498 -#: src/mission.cpp:2480 -#: src/mission.cpp:2599 +#: src/mission.cpp:2524 +#: src/mission.cpp:2643 msgid "Save Game" msgstr "Uložit hru" @@ -14066,45 +14066,45 @@ msgstr "" msgid "Toggle Driving Mode" msgstr "" -#: src/loop.cpp:565 -#: src/loop.cpp:581 +#: src/loop.cpp:568 +#: src/loop.cpp:584 #, fuzzy msgid "Could not save game!" msgstr "Nahrát uloženou hru" -#: src/mission.cpp:2041 +#: src/mission.cpp:2085 msgid "Load Transport" msgstr "Naložit transport" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 #, fuzzy msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "CÍL SPLNĚN" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED" msgstr "CÍL SPLNĚN" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 #, fuzzy msgid "OBJECTIVE FAILED--and you cheated!" msgstr "SELHÁNÍ" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED" msgstr "SELHÁNÍ" -#: src/mission.cpp:2459 -#: src/mission.cpp:2499 -#: src/mission.cpp:2613 +#: src/mission.cpp:2503 +#: src/mission.cpp:2543 +#: src/mission.cpp:2657 msgid "Quit To Main Menu" msgstr "Vyskočit do hlavního menu" -#: src/mission.cpp:2467 +#: src/mission.cpp:2511 msgid "Continue Game" msgstr "Pokračovat ve hře" -#: src/mission.cpp:2564 +#: src/mission.cpp:2608 #, fuzzy msgid "GAME SAVED :" msgstr "HRA ULOŽENA!" @@ -14403,118 +14403,113 @@ msgstr "" msgid "Player colour" msgstr "Hráč" -#: src/multiint.cpp:2071 +#: src/multiint.cpp:2068 msgid "Team" msgstr "" -#: src/multiint.cpp:2083 -#, fuzzy -msgid "Kick player" -msgstr "2 hráči" - -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 #, fuzzy msgid "Click to change difficulty" msgstr "Radar ukazuje barvy hráčů" -#: src/multiint.cpp:2130 +#: src/multiint.cpp:2126 msgid "Click when ready" msgstr "" -#: src/multiint.cpp:2134 +#: src/multiint.cpp:2130 msgid "READY?" msgstr "" -#: src/multiint.cpp:2178 +#: src/multiint.cpp:2174 msgid "PLAYERS" msgstr "HRÁČI" -#: src/multiint.cpp:2213 +#: src/multiint.cpp:2209 msgid "Click to change to this slot" msgstr "" -#: src/multiint.cpp:2241 +#: src/multiint.cpp:2237 #, fuzzy msgid "Choose Team" msgstr "Pevné Týmy" -#: src/multiint.cpp:2271 +#: src/multiint.cpp:2267 #, fuzzy msgid "Click to change player colour" msgstr "Radar ukazuje barvy hráčů" -#: src/multiint.cpp:2299 +#: src/multiint.cpp:2295 #, fuzzy msgid "Click to change player position" msgstr "Braň pozici" -#: src/multiint.cpp:2305 +#: src/multiint.cpp:2301 #, fuzzy msgid "Click to change AI" msgstr "Radar ukazuje barvy hráčů" -#: src/multiint.cpp:2309 +#: src/multiint.cpp:2305 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2371 +#: src/multiint.cpp:2367 msgid "CHAT" msgstr "CHAT" -#: src/multiint.cpp:2403 +#: src/multiint.cpp:2399 msgid "All players need to have the same mods to join your game." msgstr "" -#: src/multiint.cpp:2561 +#: src/multiint.cpp:2557 #, c-format msgid "*** password [%s] is now required! ***" msgstr "" -#: src/multiint.cpp:2569 +#: src/multiint.cpp:2565 msgid "*** password is NOT required! ***" msgstr "" -#: src/multiint.cpp:2810 +#: src/multiint.cpp:2806 msgid "Sorry! Failed to host the game." msgstr "" -#: src/multiint.cpp:2931 +#: src/multiint.cpp:2927 #, fuzzy msgid "'Locked Teams' mode enabled" msgstr "Pevné Týmy" -#: src/multiint.cpp:3012 +#: src/multiint.cpp:3008 #, c-format msgid "The host has kicked %s from the game!" msgstr "Hostitel vyhodil %s ze hry!" -#: src/multiint.cpp:3082 +#: src/multiint.cpp:3078 msgid "Host is Starting Game" msgstr "Host začíná hru" -#: src/multiint.cpp:3648 +#: src/multiint.cpp:3644 msgid "Players" msgstr "Hráči" -#: src/multiint.cpp:3786 +#: src/multiint.cpp:3782 #, c-format msgid "Sending Map: %d%% " msgstr "" -#: src/multiint.cpp:3794 +#: src/multiint.cpp:3790 #, c-format msgid "Map: %d%% downloaded" msgstr "" -#: src/multiint.cpp:3820 +#: src/multiint.cpp:3816 msgid "HOST" msgstr "" -#: src/multiint.cpp:3827 +#: src/multiint.cpp:3823 #: src/multimenu.cpp:772 msgid "Ping" msgstr "" @@ -14694,80 +14689,80 @@ msgstr "" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "" -#: src/multiplay.cpp:1057 +#: src/multiplay.cpp:1056 #, fuzzy msgid "(allies" msgstr "Spojenectví" -#: src/multiplay.cpp:1065 +#: src/multiplay.cpp:1064 msgid "(private to " msgstr "" -#: src/multiplay.cpp:1078 +#: src/multiplay.cpp:1077 msgid "[invalid]" msgstr "" -#: src/multiplay.cpp:1942 +#: src/multiplay.cpp:1941 msgid "Green" msgstr "Zelená" -#: src/multiplay.cpp:1943 +#: src/multiplay.cpp:1942 msgid "Orange" msgstr "Oranžová" -#: src/multiplay.cpp:1944 +#: src/multiplay.cpp:1943 msgid "Grey" msgstr "Šedá" -#: src/multiplay.cpp:1945 +#: src/multiplay.cpp:1944 msgid "Black" msgstr "Černá" -#: src/multiplay.cpp:1946 +#: src/multiplay.cpp:1945 msgid "Red" msgstr "Červená" -#: src/multiplay.cpp:1947 +#: src/multiplay.cpp:1946 msgid "Blue" msgstr "Modrá" -#: src/multiplay.cpp:1948 +#: src/multiplay.cpp:1947 msgid "Pink" msgstr "Růžová" -#: src/multiplay.cpp:1949 +#: src/multiplay.cpp:1948 msgid "Cyan" msgstr "Azurová" -#: src/multiplay.cpp:1950 +#: src/multiplay.cpp:1949 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:1951 +#: src/multiplay.cpp:1950 msgid "Purple" msgstr "" -#: src/multiplay.cpp:1952 +#: src/multiplay.cpp:1951 msgid "White" msgstr "" -#: src/multiplay.cpp:1953 +#: src/multiplay.cpp:1952 msgid "Bright blue" msgstr "" -#: src/multiplay.cpp:1954 +#: src/multiplay.cpp:1953 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:1955 +#: src/multiplay.cpp:1954 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:1956 +#: src/multiplay.cpp:1955 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:1957 +#: src/multiplay.cpp:1956 msgid "Brown" msgstr "" @@ -14775,16 +14770,16 @@ msgstr "" msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "" -#: src/research.cpp:1737 +#: src/research.cpp:1739 #, c-format msgid "Research completed: %s" msgstr "Výzkum dokončen: %s" -#: src/research.cpp:1742 +#: src/research.cpp:1744 msgid "Research Completed" msgstr "Výzkum Dokončen" -#: src/research.cpp:2563 +#: src/research.cpp:2565 msgid "Research Award" msgstr "" @@ -14949,62 +14944,62 @@ msgstr "Nemohu nalézt žádnou senzorovou jednotku!" msgid "Unable to locate any Commanders!" msgstr "Nemohu nalézt žádného velitele!" -#: src/structure.cpp:2614 +#: src/structure.cpp:2650 msgid "Command Control Limit Reached - Production Halted" msgstr "" -#: src/structure.cpp:5806 -#: src/structure.cpp:5831 +#: src/structure.cpp:5888 +#: src/structure.cpp:5913 #, fuzzy, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" msgstr[0] "Jednotka přiřazena" msgstr[1] "Jednotky přiřazeny" -#: src/structure.cpp:5836 -#: src/structure.cpp:5904 -#: src/structure.cpp:5920 -#: src/structure.cpp:5934 +#: src/structure.cpp:5918 +#: src/structure.cpp:5986 +#: src/structure.cpp:6002 +#: src/structure.cpp:6016 #, fuzzy, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - Poškození %3.0f%%" -#: src/structure.cpp:5886 +#: src/structure.cpp:5968 #, fuzzy, c-format msgid "%s - Connected %u of %u" msgstr "%s - Připojeno %u z %u" -#: src/structure.cpp:6050 -#: src/structure.cpp:6095 +#: src/structure.cpp:6132 +#: src/structure.cpp:6177 #, c-format msgid "%s - Electronically Damaged" msgstr "" -#: src/structure.cpp:6332 +#: src/structure.cpp:6414 msgid "Electronic Reward - Visibility Report" msgstr "" -#: src/structure.cpp:6372 +#: src/structure.cpp:6454 msgid "Factory Reward - Propulsion" msgstr "" -#: src/structure.cpp:6396 +#: src/structure.cpp:6478 msgid "Factory Reward - Body" msgstr "" -#: src/structure.cpp:6420 +#: src/structure.cpp:6502 msgid "Factory Reward - Weapon" msgstr "" -#: src/structure.cpp:6429 +#: src/structure.cpp:6511 msgid "Factory Reward - Nothing" msgstr "" -#: src/structure.cpp:6457 +#: src/structure.cpp:6539 msgid "Repair Facility Award - Repair" msgstr "" -#: src/structure.cpp:6464 +#: src/structure.cpp:6546 msgid "Repair Facility Award - Nothing" msgstr "" @@ -15021,34 +15016,30 @@ msgstr "" msgid "Reinforcements landing" msgstr "Posily přistály" -#: src/version.cpp:143 -msgid " (modified and switched locally)" -msgstr "" - -#: src/version.cpp:145 +#: src/version.cpp:129 msgid " (modified locally)" msgstr "" -#: src/version.cpp:147 -msgid " (switched locally)" -msgstr "" - -#: src/version.cpp:154 +#: src/version.cpp:136 msgid " - DEBUG" msgstr "" -#: src/version.cpp:163 +#: src/version.cpp:145 #, c-format msgid " - Built %s" msgstr "" #. TRANSLATORS: This string looks as follows when expanded. #. "Version " -#: src/version.cpp:173 +#: src/version.cpp:155 #, c-format msgid "Version %s%s%s%s" msgstr "" +#, fuzzy +#~ msgid "Kick player" +#~ msgstr "2 hráči" + #, fuzzy #~ msgid "Infinite Production" #~ msgstr "Opakovat výrobu" diff --git a/po/da.po b/po/da.po index d5d648064..da096356d 100644 --- a/po/da.po +++ b/po/da.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-02-25 23:35+0100\n" +"POT-Creation-Date: 2011-03-08 15:43+0100\n" "PO-Revision-Date: 2008-05-09 16:08+0000\n" "Last-Translator: carson \n" "Language-Team: Dansk \n" @@ -12315,26 +12315,26 @@ msgid "System locale" msgstr "Elektronik" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1042 +#: lib/netplay/netplay.cpp:1037 msgid "Enter password here" msgstr "" -#: lib/netplay/netplay.cpp:2060 +#: lib/netplay/netplay.cpp:2055 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "" -#: lib/netplay/netplay.cpp:2082 +#: lib/netplay/netplay.cpp:2077 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "" #: src/challenge.cpp:184 #: src/hci.cpp:916 -#: src/hci.cpp:3378 -#: src/hci.cpp:3501 -#: src/hci.cpp:3912 -#: src/hci.cpp:4930 +#: src/hci.cpp:3386 +#: src/hci.cpp:3509 +#: src/hci.cpp:3920 +#: src/hci.cpp:4938 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12645,7 +12645,7 @@ msgid "Player dropped" msgstr "Spiller" #: src/display3d.cpp:599 -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2121 msgid "Waiting for other players" msgstr "" @@ -12658,7 +12658,7 @@ msgid "Cannot Build. Oil Resource Burning." msgstr "Kan ikke bygge på brændende oilebrøn." #: src/display.cpp:1828 -#: src/display.cpp:2421 +#: src/display.cpp:2420 #, fuzzy, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - Skade %d%% - Drab %d, %s" @@ -12690,77 +12690,77 @@ msgstr "Enhed tabt!" msgid "Structure Restored" msgstr "Bygning restoreret" -#: src/droid.cpp:2732 +#: src/droid.cpp:2734 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" msgstr[0] "Gruppe %u valgt - %u Enheder" msgstr[1] "Gruppe %u valgt - %u Enheder" -#: src/droid.cpp:2745 +#: src/droid.cpp:2747 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" msgstr[0] "%u Enheder tildelt gruppe %u" msgstr[1] "%u Enheder tildelt gruppe %u" -#: src/droid.cpp:2758 +#: src/droid.cpp:2760 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" msgstr[0] "Fokuseret på gruppe %u - %u Enheder" msgstr[1] "Fokuseret på gruppe %u - %u Enheder" -#: src/droid.cpp:2762 +#: src/droid.cpp:2764 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" msgstr[0] "Korigerede med gruppe %u - %u Enheder" msgstr[1] "Korigerede med gruppe %u - %u Enheder" -#: src/droid.cpp:3093 +#: src/droid.cpp:3095 msgid "Rookie" msgstr "Utrænet" -#: src/droid.cpp:3094 +#: src/droid.cpp:3096 msgctxt "rank" msgid "Green" msgstr "Grøn" -#: src/droid.cpp:3095 +#: src/droid.cpp:3097 msgid "Trained" msgstr "Trænet" -#: src/droid.cpp:3096 +#: src/droid.cpp:3098 msgid "Regular" msgstr "Regulær" -#: src/droid.cpp:3097 +#: src/droid.cpp:3099 msgid "Professional" msgstr "Professionel" -#: src/droid.cpp:3098 +#: src/droid.cpp:3100 msgid "Veteran" msgstr "Veteran" -#: src/droid.cpp:3099 +#: src/droid.cpp:3101 msgid "Elite" msgstr "Elite" -#: src/droid.cpp:3100 +#: src/droid.cpp:3102 msgid "Special" msgstr "Speciel" -#: src/droid.cpp:3101 +#: src/droid.cpp:3103 msgid "Hero" msgstr "Helt" -#: src/droid.cpp:4123 +#: src/droid.cpp:4125 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "" -#: src/droid.cpp:4127 +#: src/droid.cpp:4129 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "" @@ -12781,7 +12781,7 @@ msgid "Tutorial" msgstr "Gennemgang" #: src/frontend.cpp:100 -#: src/hci.cpp:3487 +#: src/hci.cpp:3495 msgid "Options" msgstr "Indstillinger" @@ -12845,8 +12845,8 @@ msgstr "SOLO SPILLER" #: src/frontend.cpp:303 #: src/ingameop.cpp:494 -#: src/mission.cpp:2493 -#: src/mission.cpp:2596 +#: src/mission.cpp:2537 +#: src/mission.cpp:2640 msgid "Load Saved Game" msgstr "Indlæs gemt spil" @@ -13141,7 +13141,7 @@ msgid "GAME OPTIONS" msgstr "SPIL INDSTILLINGER" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2398 +#: src/multiint.cpp:2394 msgid "Mod: " msgstr "" @@ -13151,8 +13151,8 @@ msgid "MAP SAVED!" msgstr "SPIL GEMT!" #: src/hci.cpp:1573 -#: src/loop.cpp:558 -#: src/loop.cpp:574 +#: src/loop.cpp:561 +#: src/loop.cpp:577 #, fuzzy msgid "GAME SAVED: " msgstr "SPIL GEMT!" @@ -13181,163 +13181,163 @@ msgstr "" msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "" -#: src/hci.cpp:3298 +#: src/hci.cpp:3306 msgid "Commanders (F6)" msgstr "Kommandører (F6)" -#: src/hci.cpp:3311 +#: src/hci.cpp:3319 #, fuzzy msgid "Intelligence Display (F5)" msgstr "Kommando Pult" -#: src/hci.cpp:3324 +#: src/hci.cpp:3332 #, fuzzy msgid "Manufacture (F1)" msgstr "Fabrikering" -#: src/hci.cpp:3337 +#: src/hci.cpp:3345 msgid "Design (F4)" msgstr "Design (F4)" -#: src/hci.cpp:3350 +#: src/hci.cpp:3358 msgid "Research (F2)" msgstr "Forskning (F2)" -#: src/hci.cpp:3363 +#: src/hci.cpp:3371 msgid "Build (F3)" msgstr "Konstruktion (F3)" -#: src/hci.cpp:3434 +#: src/hci.cpp:3442 #: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Kraft" -#: src/hci.cpp:3525 +#: src/hci.cpp:3533 msgid "Map:" msgstr "" -#: src/hci.cpp:3538 +#: src/hci.cpp:3546 #, fuzzy msgid "Load" msgstr "Indlæs spil" -#: src/hci.cpp:3539 +#: src/hci.cpp:3547 #, fuzzy msgid "Load Map File" msgstr "Indlæs spil" -#: src/hci.cpp:3546 +#: src/hci.cpp:3554 #, fuzzy msgid "Save" msgstr "Gem spil" -#: src/hci.cpp:3547 +#: src/hci.cpp:3555 #, fuzzy msgid "Save Map File" msgstr "Gem spil" -#: src/hci.cpp:3555 +#: src/hci.cpp:3563 msgid "New" msgstr "" -#: src/hci.cpp:3556 +#: src/hci.cpp:3564 msgid "New Blank Map" msgstr "" -#: src/hci.cpp:3592 +#: src/hci.cpp:3600 #, fuzzy msgid "Tile" msgstr "fil" -#: src/hci.cpp:3593 +#: src/hci.cpp:3601 #, fuzzy msgid "Place tiles on map" msgstr "Tabte bygninger" -#: src/hci.cpp:3602 +#: src/hci.cpp:3610 msgid "Unit" msgstr "Enhed" -#: src/hci.cpp:3603 +#: src/hci.cpp:3611 #, fuzzy msgid "Place Unit on map" msgstr "Tabte bygninger" -#: src/hci.cpp:3611 +#: src/hci.cpp:3619 msgid "Struct" msgstr "" -#: src/hci.cpp:3612 +#: src/hci.cpp:3620 #, fuzzy msgid "Place Structures on map" msgstr "Tabte bygninger" -#: src/hci.cpp:3620 +#: src/hci.cpp:3628 msgid "Feat" msgstr "" -#: src/hci.cpp:3621 +#: src/hci.cpp:3629 #, fuzzy msgid "Place Features on map" msgstr "Tabte bygninger" -#: src/hci.cpp:3631 +#: src/hci.cpp:3639 msgid "Pause" msgstr "" -#: src/hci.cpp:3632 +#: src/hci.cpp:3640 #, fuzzy msgid "Pause or unpause the game" msgstr "Værten har forladt spillet" -#: src/hci.cpp:3646 +#: src/hci.cpp:3654 msgid "Align height of all map objects" msgstr "" -#: src/hci.cpp:3656 +#: src/hci.cpp:3664 msgid "Edit" msgstr "" -#: src/hci.cpp:3657 +#: src/hci.cpp:3665 #, fuzzy msgid "Start Edit Mode" msgstr "Start uden baser" -#: src/hci.cpp:3671 +#: src/hci.cpp:3679 #: src/ingameop.cpp:112 #: src/ingameop.cpp:256 #: src/ingameop.cpp:260 msgid "Quit" msgstr "Afslut" -#: src/hci.cpp:3672 +#: src/hci.cpp:3680 msgid "Exit Game" msgstr "Forlad spil" -#: src/hci.cpp:3698 +#: src/hci.cpp:3706 #, fuzzy msgid "Current Player:" msgstr "Flerbruger spil" -#: src/hci.cpp:3989 +#: src/hci.cpp:3997 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "Statuslinje" -#: src/hci.cpp:4855 +#: src/hci.cpp:4863 msgid "Factory Delivery Point" msgstr "Leveringspunkt" -#: src/hci.cpp:4873 +#: src/hci.cpp:4881 msgid "Loop Production" msgstr "Gentag produktion" -#: src/hci.cpp:4953 +#: src/hci.cpp:4961 msgid "Tab Scroll left" msgstr "" -#: src/hci.cpp:4968 +#: src/hci.cpp:4976 msgid "Tab Scroll right" msgstr "" @@ -13363,8 +13363,8 @@ msgstr "" #: src/ingameop.cpp:274 #: src/ingameop.cpp:498 -#: src/mission.cpp:2480 -#: src/mission.cpp:2599 +#: src/mission.cpp:2524 +#: src/mission.cpp:2643 msgid "Save Game" msgstr "Gem spil" @@ -14320,45 +14320,45 @@ msgstr "" msgid "Toggle Driving Mode" msgstr "Forfølgelseskamera" -#: src/loop.cpp:565 -#: src/loop.cpp:581 +#: src/loop.cpp:568 +#: src/loop.cpp:584 #, fuzzy msgid "Could not save game!" msgstr "Hent et gemt spil" -#: src/mission.cpp:2041 +#: src/mission.cpp:2085 msgid "Load Transport" msgstr "Fyld transportskib" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 #, fuzzy msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "MISSIONEN LYKKEDES" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED" msgstr "MISSIONEN LYKKEDES" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 #, fuzzy msgid "OBJECTIVE FAILED--and you cheated!" msgstr "MISSIONEN FEJLEDE" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED" msgstr "MISSIONEN FEJLEDE" -#: src/mission.cpp:2459 -#: src/mission.cpp:2499 -#: src/mission.cpp:2613 +#: src/mission.cpp:2503 +#: src/mission.cpp:2543 +#: src/mission.cpp:2657 msgid "Quit To Main Menu" msgstr "Tilbage til hovedmenu" -#: src/mission.cpp:2467 +#: src/mission.cpp:2511 msgid "Continue Game" msgstr "Fortsæt spil" -#: src/mission.cpp:2564 +#: src/mission.cpp:2608 #, fuzzy msgid "GAME SAVED :" msgstr "SPIL GEMT!" @@ -14658,118 +14658,113 @@ msgstr "" msgid "Player colour" msgstr "Spiller" -#: src/multiint.cpp:2071 +#: src/multiint.cpp:2068 #, fuzzy msgid "Team" msgstr "Hurtgigt spil" -#: src/multiint.cpp:2083 -#, fuzzy -msgid "Kick player" -msgstr "2 spillere" - -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 #, fuzzy msgid "Click to change difficulty" msgstr "Bevogt position" -#: src/multiint.cpp:2130 +#: src/multiint.cpp:2126 msgid "Click when ready" msgstr "" -#: src/multiint.cpp:2134 +#: src/multiint.cpp:2130 msgid "READY?" msgstr "" -#: src/multiint.cpp:2178 +#: src/multiint.cpp:2174 msgid "PLAYERS" msgstr "SPILLERE" -#: src/multiint.cpp:2213 +#: src/multiint.cpp:2209 msgid "Click to change to this slot" msgstr "" -#: src/multiint.cpp:2241 +#: src/multiint.cpp:2237 #, fuzzy msgid "Choose Team" msgstr "Låste hold" -#: src/multiint.cpp:2271 +#: src/multiint.cpp:2267 msgid "Click to change player colour" msgstr "" -#: src/multiint.cpp:2299 +#: src/multiint.cpp:2295 #, fuzzy msgid "Click to change player position" msgstr "Bevogt position" -#: src/multiint.cpp:2305 +#: src/multiint.cpp:2301 #, fuzzy msgid "Click to change AI" msgstr "Bevogt position" -#: src/multiint.cpp:2309 +#: src/multiint.cpp:2305 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2371 +#: src/multiint.cpp:2367 msgid "CHAT" msgstr "BESKEDER" -#: src/multiint.cpp:2403 +#: src/multiint.cpp:2399 msgid "All players need to have the same mods to join your game." msgstr "" -#: src/multiint.cpp:2561 +#: src/multiint.cpp:2557 #, c-format msgid "*** password [%s] is now required! ***" msgstr "" -#: src/multiint.cpp:2569 +#: src/multiint.cpp:2565 msgid "*** password is NOT required! ***" msgstr "" -#: src/multiint.cpp:2810 +#: src/multiint.cpp:2806 msgid "Sorry! Failed to host the game." msgstr "" -#: src/multiint.cpp:2931 +#: src/multiint.cpp:2927 #, fuzzy msgid "'Locked Teams' mode enabled" msgstr "Låste hold" -#: src/multiint.cpp:3012 +#: src/multiint.cpp:3008 #, fuzzy, c-format msgid "The host has kicked %s from the game!" msgstr "%s har forladt spillet" -#: src/multiint.cpp:3082 +#: src/multiint.cpp:3078 msgid "Host is Starting Game" msgstr "Værten starter spillet" -#: src/multiint.cpp:3648 +#: src/multiint.cpp:3644 msgid "Players" msgstr "Spillere" -#: src/multiint.cpp:3786 +#: src/multiint.cpp:3782 #, c-format msgid "Sending Map: %d%% " msgstr "" -#: src/multiint.cpp:3794 +#: src/multiint.cpp:3790 #, c-format msgid "Map: %d%% downloaded" msgstr "" -#: src/multiint.cpp:3820 +#: src/multiint.cpp:3816 msgid "HOST" msgstr "" -#: src/multiint.cpp:3827 +#: src/multiint.cpp:3823 #: src/multimenu.cpp:772 msgid "Ping" msgstr "Ping" @@ -14949,80 +14944,80 @@ msgstr "Forær energi" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "" -#: src/multiplay.cpp:1057 +#: src/multiplay.cpp:1056 #, fuzzy msgid "(allies" msgstr "Aliancer" -#: src/multiplay.cpp:1065 +#: src/multiplay.cpp:1064 msgid "(private to " msgstr "" -#: src/multiplay.cpp:1078 +#: src/multiplay.cpp:1077 msgid "[invalid]" msgstr "" -#: src/multiplay.cpp:1942 +#: src/multiplay.cpp:1941 msgid "Green" msgstr "Grøn" -#: src/multiplay.cpp:1943 +#: src/multiplay.cpp:1942 msgid "Orange" msgstr "Orange" -#: src/multiplay.cpp:1944 +#: src/multiplay.cpp:1943 msgid "Grey" msgstr "Grå" -#: src/multiplay.cpp:1945 +#: src/multiplay.cpp:1944 msgid "Black" msgstr "Sort" -#: src/multiplay.cpp:1946 +#: src/multiplay.cpp:1945 msgid "Red" msgstr "Rød" -#: src/multiplay.cpp:1947 +#: src/multiplay.cpp:1946 msgid "Blue" msgstr "Blå" -#: src/multiplay.cpp:1948 +#: src/multiplay.cpp:1947 msgid "Pink" msgstr "Lyserød" -#: src/multiplay.cpp:1949 +#: src/multiplay.cpp:1948 msgid "Cyan" msgstr "Turkis" -#: src/multiplay.cpp:1950 +#: src/multiplay.cpp:1949 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:1951 +#: src/multiplay.cpp:1950 msgid "Purple" msgstr "" -#: src/multiplay.cpp:1952 +#: src/multiplay.cpp:1951 msgid "White" msgstr "" -#: src/multiplay.cpp:1953 +#: src/multiplay.cpp:1952 msgid "Bright blue" msgstr "" -#: src/multiplay.cpp:1954 +#: src/multiplay.cpp:1953 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:1955 +#: src/multiplay.cpp:1954 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:1956 +#: src/multiplay.cpp:1955 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:1957 +#: src/multiplay.cpp:1956 msgid "Brown" msgstr "" @@ -15030,16 +15025,16 @@ msgstr "" msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "" -#: src/research.cpp:1737 +#: src/research.cpp:1739 #, c-format msgid "Research completed: %s" msgstr "Forskning fuldendt: %s" -#: src/research.cpp:1742 +#: src/research.cpp:1744 msgid "Research Completed" msgstr "Forskning fuldendt" -#: src/research.cpp:2563 +#: src/research.cpp:2565 msgid "Research Award" msgstr "Forskningsgevinst" @@ -15203,62 +15198,62 @@ msgstr "Kan ikke finde nogle rekonniseringsenheder!" msgid "Unable to locate any Commanders!" msgstr "Kan ikke finde nogle kommandører!" -#: src/structure.cpp:2614 +#: src/structure.cpp:2650 msgid "Command Control Limit Reached - Production Halted" msgstr "Kommandobegrænsning nået - indstiller produktion" -#: src/structure.cpp:5806 -#: src/structure.cpp:5831 +#: src/structure.cpp:5888 +#: src/structure.cpp:5913 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" msgstr[0] "" msgstr[1] "" -#: src/structure.cpp:5836 -#: src/structure.cpp:5904 -#: src/structure.cpp:5920 -#: src/structure.cpp:5934 +#: src/structure.cpp:5918 +#: src/structure.cpp:5986 +#: src/structure.cpp:6002 +#: src/structure.cpp:6016 #, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - Skade %3.0f%%" -#: src/structure.cpp:5886 +#: src/structure.cpp:5968 #, c-format msgid "%s - Connected %u of %u" msgstr "%s - Forbundet %u af %u" -#: src/structure.cpp:6050 -#: src/structure.cpp:6095 +#: src/structure.cpp:6132 +#: src/structure.cpp:6177 #, c-format msgid "%s - Electronically Damaged" msgstr "%s - Elektronisk beskadiget" -#: src/structure.cpp:6332 +#: src/structure.cpp:6414 msgid "Electronic Reward - Visibility Report" msgstr "Elektronisk gevinst - Rekonniseringsrapport" -#: src/structure.cpp:6372 +#: src/structure.cpp:6454 msgid "Factory Reward - Propulsion" msgstr "Fabriksgevinst - Fremdrift" -#: src/structure.cpp:6396 +#: src/structure.cpp:6478 msgid "Factory Reward - Body" msgstr "Fabriksgevinst - Skrog" -#: src/structure.cpp:6420 +#: src/structure.cpp:6502 msgid "Factory Reward - Weapon" msgstr "Frabriskgevinst - Våben" -#: src/structure.cpp:6429 +#: src/structure.cpp:6511 msgid "Factory Reward - Nothing" msgstr "Fabriksgevinst - Ingen" -#: src/structure.cpp:6457 +#: src/structure.cpp:6539 msgid "Repair Facility Award - Repair" msgstr "Reperationsgevinst - Reperation" -#: src/structure.cpp:6464 +#: src/structure.cpp:6546 msgid "Repair Facility Award - Nothing" msgstr "Reperationsgevinst - Ingen" @@ -15275,34 +15270,30 @@ msgstr "" msgid "Reinforcements landing" msgstr "Forstærkninger er ankommet" -#: src/version.cpp:143 -msgid " (modified and switched locally)" -msgstr "" - -#: src/version.cpp:145 +#: src/version.cpp:129 msgid " (modified locally)" msgstr "" -#: src/version.cpp:147 -msgid " (switched locally)" -msgstr "" - -#: src/version.cpp:154 +#: src/version.cpp:136 msgid " - DEBUG" msgstr "" -#: src/version.cpp:163 +#: src/version.cpp:145 #, c-format msgid " - Built %s" msgstr "" #. TRANSLATORS: This string looks as follows when expanded. #. "Version " -#: src/version.cpp:173 +#: src/version.cpp:155 #, c-format msgid "Version %s%s%s%s" msgstr "" +#, fuzzy +#~ msgid "Kick player" +#~ msgstr "2 spillere" + #, fuzzy #~ msgid "Infinite Production" #~ msgstr "Gentag produktion" diff --git a/po/de.po b/po/de.po index 4327f6416..2767c9a4f 100644 --- a/po/de.po +++ b/po/de.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-02-25 23:35+0100\n" +"POT-Creation-Date: 2011-03-08 15:43+0100\n" "PO-Revision-Date: 2010-06-05 07:09+0100\n" "Last-Translator: Steven 'Kreuvf' Koenig \n" "Language-Team: Deutsch \n" @@ -12056,26 +12056,26 @@ msgid "System locale" msgstr "Systemsprache" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1042 +#: lib/netplay/netplay.cpp:1037 msgid "Enter password here" msgstr "Passwort hier eingeben" -#: lib/netplay/netplay.cpp:2060 +#: lib/netplay/netplay.cpp:2055 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "Konnte Lobbyserver-Namen nicht auflösen (%s)!" -#: lib/netplay/netplay.cpp:2082 +#: lib/netplay/netplay.cpp:2077 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "Konnte nicht mit Lobbyserver kommunizieren! Ist der TCP-Port %u für ausgehenden Verkehr geöffnet?" #: src/challenge.cpp:184 #: src/hci.cpp:916 -#: src/hci.cpp:3378 -#: src/hci.cpp:3501 -#: src/hci.cpp:3912 -#: src/hci.cpp:4930 +#: src/hci.cpp:3386 +#: src/hci.cpp:3509 +#: src/hci.cpp:3920 +#: src/hci.cpp:4938 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12383,7 +12383,7 @@ msgid "Player dropped" msgstr "Spieler ausgefallen" #: src/display3d.cpp:599 -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2121 msgid "Waiting for other players" msgstr "Warte auf andere Spieler" @@ -12396,7 +12396,7 @@ msgid "Cannot Build. Oil Resource Burning." msgstr "Bau nicht möglich. Ölquelle brennt." #: src/display.cpp:1828 -#: src/display.cpp:2421 +#: src/display.cpp:2420 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - Schaden %d%% - Erfahrung %d, %s" @@ -12427,77 +12427,77 @@ msgstr "Einheit verloren!" msgid "Structure Restored" msgstr "Gebäude wiederhergestellt" -#: src/droid.cpp:2732 +#: src/droid.cpp:2734 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" msgstr[0] "Gruppe %u ausgewählt - %u Einheit" msgstr[1] "Gruppe %u ausgewählt - %u Einheiten" -#: src/droid.cpp:2745 +#: src/droid.cpp:2747 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" msgstr[0] "%u Einheit zur Gruppe %u hinzugefügt" msgstr[1] "%u Einheiten zur Gruppe %u hinzugefügt" -#: src/droid.cpp:2758 +#: src/droid.cpp:2760 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" msgstr[0] "Auf Gruppe %u zentriert - %u Einheit" msgstr[1] "Auf Gruppe %u zentriert - %u Einheiten" -#: src/droid.cpp:2762 +#: src/droid.cpp:2764 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" msgstr[0] "An Gruppe %u ausgerichtet - %u Einheit" msgstr[1] "An Gruppe %u ausgerichtet - %u Einheiten" -#: src/droid.cpp:3093 +#: src/droid.cpp:3095 msgid "Rookie" msgstr "Anfänger" -#: src/droid.cpp:3094 +#: src/droid.cpp:3096 msgctxt "rank" msgid "Green" msgstr "Neuling" -#: src/droid.cpp:3095 +#: src/droid.cpp:3097 msgid "Trained" msgstr "Geübter" -#: src/droid.cpp:3096 +#: src/droid.cpp:3098 msgid "Regular" msgstr "Durchschnitt" -#: src/droid.cpp:3097 +#: src/droid.cpp:3099 msgid "Professional" msgstr "Profi" -#: src/droid.cpp:3098 +#: src/droid.cpp:3100 msgid "Veteran" msgstr "Veteran" -#: src/droid.cpp:3099 +#: src/droid.cpp:3101 msgid "Elite" msgstr "Elite" -#: src/droid.cpp:3100 +#: src/droid.cpp:3102 msgid "Special" msgstr "Spezialist" -#: src/droid.cpp:3101 +#: src/droid.cpp:3103 msgid "Hero" msgstr "Held" -#: src/droid.cpp:4123 +#: src/droid.cpp:4125 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "" -#: src/droid.cpp:4127 +#: src/droid.cpp:4129 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "" @@ -12516,7 +12516,7 @@ msgid "Tutorial" msgstr "Tutorial" #: src/frontend.cpp:100 -#: src/hci.cpp:3487 +#: src/hci.cpp:3495 msgid "Options" msgstr "Optionen" @@ -12577,8 +12577,8 @@ msgstr "Einzelspieler" #: src/frontend.cpp:303 #: src/ingameop.cpp:494 -#: src/mission.cpp:2493 -#: src/mission.cpp:2596 +#: src/mission.cpp:2537 +#: src/mission.cpp:2640 msgid "Load Saved Game" msgstr "Spielstand laden" @@ -12863,7 +12863,7 @@ msgid "GAME OPTIONS" msgstr "SPIELOPTIONEN" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2398 +#: src/multiint.cpp:2394 msgid "Mod: " msgstr "Mod: " @@ -12872,8 +12872,8 @@ msgid "MAP SAVED!" msgstr "KARTE GESPEICHERT!" #: src/hci.cpp:1573 -#: src/loop.cpp:558 -#: src/loop.cpp:574 +#: src/loop.cpp:561 +#: src/loop.cpp:577 msgid "GAME SAVED: " msgstr "SPIEL GESPEICHERT!" @@ -12902,156 +12902,156 @@ msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "Spieler %u erschummelt (Debugmenü) sich eine neue Einheit: %s." # Commander kann als Eigenname im Deutschen allerdings mit deutschem Plural stehen bleiben -Kreuvf -#: src/hci.cpp:3298 +#: src/hci.cpp:3306 msgid "Commanders (F6)" msgstr "Commandermenü" -#: src/hci.cpp:3311 +#: src/hci.cpp:3319 msgid "Intelligence Display (F5)" msgstr "Aufklärungsbildschirm" -#: src/hci.cpp:3324 +#: src/hci.cpp:3332 msgid "Manufacture (F1)" msgstr "Produktionsmenü" -#: src/hci.cpp:3337 +#: src/hci.cpp:3345 msgid "Design (F4)" msgstr "Entwurfmenü" -#: src/hci.cpp:3350 +#: src/hci.cpp:3358 msgid "Research (F2)" msgstr "Forschungsmenü" -#: src/hci.cpp:3363 +#: src/hci.cpp:3371 msgid "Build (F3)" msgstr "Konstruktionsmenü" -#: src/hci.cpp:3434 +#: src/hci.cpp:3442 #: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Energie" -#: src/hci.cpp:3525 +#: src/hci.cpp:3533 msgid "Map:" msgstr "" -#: src/hci.cpp:3538 +#: src/hci.cpp:3546 #, fuzzy msgid "Load" msgstr "Spielstand laden" -#: src/hci.cpp:3539 +#: src/hci.cpp:3547 #, fuzzy msgid "Load Map File" msgstr "Spielstand laden" -#: src/hci.cpp:3546 +#: src/hci.cpp:3554 #, fuzzy msgid "Save" msgstr "Spiel speichern" -#: src/hci.cpp:3547 +#: src/hci.cpp:3555 #, fuzzy msgid "Save Map File" msgstr "Spiel speichern" -#: src/hci.cpp:3555 +#: src/hci.cpp:3563 msgid "New" msgstr "" -#: src/hci.cpp:3556 +#: src/hci.cpp:3564 msgid "New Blank Map" msgstr "" -#: src/hci.cpp:3592 +#: src/hci.cpp:3600 msgid "Tile" msgstr "Kartenkachel" -#: src/hci.cpp:3593 +#: src/hci.cpp:3601 msgid "Place tiles on map" msgstr "Kartenkacheln platzieren" -#: src/hci.cpp:3602 +#: src/hci.cpp:3610 msgid "Unit" msgstr "Einheit" -#: src/hci.cpp:3603 +#: src/hci.cpp:3611 msgid "Place Unit on map" msgstr "Einheit auf der Karte platzieren" -#: src/hci.cpp:3611 +#: src/hci.cpp:3619 msgid "Struct" msgstr "Gebäude" -#: src/hci.cpp:3612 +#: src/hci.cpp:3620 msgid "Place Structures on map" msgstr "Gebäude auf der Karte platzieren" # gemäß: http://dict.leo.org/ende?search=Feat -Kreuvf -#: src/hci.cpp:3620 +#: src/hci.cpp:3628 msgid "Feat" msgstr "Leistung" -#: src/hci.cpp:3621 +#: src/hci.cpp:3629 msgid "Place Features on map" msgstr "Feature auf der Karte platzieren" -#: src/hci.cpp:3631 +#: src/hci.cpp:3639 msgid "Pause" msgstr "" -#: src/hci.cpp:3632 +#: src/hci.cpp:3640 msgid "Pause or unpause the game" msgstr "Spiel pausieren oder fortsetzen" -#: src/hci.cpp:3646 +#: src/hci.cpp:3654 msgid "Align height of all map objects" msgstr "Höhe aller Kartenobjekte abgleichen" -#: src/hci.cpp:3656 +#: src/hci.cpp:3664 msgid "Edit" msgstr "" -#: src/hci.cpp:3657 +#: src/hci.cpp:3665 #, fuzzy msgid "Start Edit Mode" msgstr "Ohne Basen starten" -#: src/hci.cpp:3671 +#: src/hci.cpp:3679 #: src/ingameop.cpp:112 #: src/ingameop.cpp:256 #: src/ingameop.cpp:260 msgid "Quit" msgstr "Beenden" -#: src/hci.cpp:3672 +#: src/hci.cpp:3680 msgid "Exit Game" msgstr "Spiel verlassen" -#: src/hci.cpp:3698 +#: src/hci.cpp:3706 #, fuzzy msgid "Current Player:" msgstr "Mehrspieler" -#: src/hci.cpp:3989 +#: src/hci.cpp:3997 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "Fortschrittsbalken" -#: src/hci.cpp:4855 +#: src/hci.cpp:4863 msgid "Factory Delivery Point" msgstr "Fabrik-Auslieferungspunkt" -#: src/hci.cpp:4873 +#: src/hci.cpp:4881 msgid "Loop Production" msgstr "Produktion wiederholen" -#: src/hci.cpp:4953 +#: src/hci.cpp:4961 msgid "Tab Scroll left" msgstr "Reiter nach links durchschalten" -#: src/hci.cpp:4968 +#: src/hci.cpp:4976 msgid "Tab Scroll right" msgstr "Reiter nach rechts durchschalten" @@ -13077,8 +13077,8 @@ msgstr "Taktische Anzeige (Zielherkunftssymbol): Verstecken" #: src/ingameop.cpp:274 #: src/ingameop.cpp:498 -#: src/mission.cpp:2480 -#: src/mission.cpp:2599 +#: src/mission.cpp:2524 +#: src/mission.cpp:2643 msgid "Save Game" msgstr "Spiel speichern" @@ -14030,42 +14030,42 @@ msgstr "" msgid "Toggle Driving Mode" msgstr "Verfolgerkamera umschalten" -#: src/loop.cpp:565 -#: src/loop.cpp:581 +#: src/loop.cpp:568 +#: src/loop.cpp:584 msgid "Could not save game!" msgstr "Konnte Spiel nicht speichern!" -#: src/mission.cpp:2041 +#: src/mission.cpp:2085 msgid "Load Transport" msgstr "Transporter beladen" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "ZIEL ERREICHT durch Schummeln!" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED" msgstr "MISSION ERFOLGREICH" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED--and you cheated!" msgstr "ZIEL NICHT ERREICHT--und Sie haben geschummelt!" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED" msgstr "MISSION FEHLGESCHLAGEN" -#: src/mission.cpp:2459 -#: src/mission.cpp:2499 -#: src/mission.cpp:2613 +#: src/mission.cpp:2503 +#: src/mission.cpp:2543 +#: src/mission.cpp:2657 msgid "Quit To Main Menu" msgstr "Zurück zum Hauptmenü" -#: src/mission.cpp:2467 +#: src/mission.cpp:2511 msgid "Continue Game" msgstr "Spiel fortsetzen" -#: src/mission.cpp:2564 +#: src/mission.cpp:2608 msgid "GAME SAVED :" msgstr "SPIEL GESPEICHERT :" @@ -14356,119 +14356,115 @@ msgstr "" msgid "Player colour" msgstr "Spielerfarbe" -#: src/multiint.cpp:2071 +#: src/multiint.cpp:2068 msgid "Team" msgstr "Gruppe" -#: src/multiint.cpp:2083 -msgid "Kick player" -msgstr "Spieler rauswerfen" - -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 #, fuzzy msgid "Click to change difficulty" msgstr "Klicken zum Setzen eines Passworts" -#: src/multiint.cpp:2130 +#: src/multiint.cpp:2126 msgid "Click when ready" msgstr "Klicken, wenn bereit" -#: src/multiint.cpp:2134 +#: src/multiint.cpp:2130 msgid "READY?" msgstr "BEREIT?" -#: src/multiint.cpp:2178 +#: src/multiint.cpp:2174 msgid "PLAYERS" msgstr "SPIELER" -#: src/multiint.cpp:2213 +#: src/multiint.cpp:2209 #, fuzzy msgid "Click to change to this slot" msgstr "Klicken zum Setzen eines Passworts" # festgelegt ungleich fest -Kreuvf -#: src/multiint.cpp:2241 +#: src/multiint.cpp:2237 #, fuzzy msgid "Choose Team" msgstr "Feste Teams" -#: src/multiint.cpp:2271 +#: src/multiint.cpp:2267 #, fuzzy msgid "Click to change player colour" msgstr "Radar zeigt Spielerfarben" -#: src/multiint.cpp:2299 +#: src/multiint.cpp:2295 #, fuzzy msgid "Click to change player position" msgstr "Position bewachen" -#: src/multiint.cpp:2305 +#: src/multiint.cpp:2301 #, fuzzy msgid "Click to change AI" msgstr "Klicken zum Setzen eines Passworts" -#: src/multiint.cpp:2309 +#: src/multiint.cpp:2305 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2371 +#: src/multiint.cpp:2367 msgid "CHAT" msgstr "CHAT" -#: src/multiint.cpp:2403 +#: src/multiint.cpp:2399 msgid "All players need to have the same mods to join your game." msgstr "Alle Spieler benötigen dieselben Mods, um Ihrem Spiel beitreten zu können." -#: src/multiint.cpp:2561 +#: src/multiint.cpp:2557 #, fuzzy, c-format msgid "*** password [%s] is now required! ***" msgstr "*** Jetzt wird ein Passwort benötigt! ***" -#: src/multiint.cpp:2569 +#: src/multiint.cpp:2565 msgid "*** password is NOT required! ***" msgstr "*** Passwort wird nicht benötigt! ***" -#: src/multiint.cpp:2810 +#: src/multiint.cpp:2806 msgid "Sorry! Failed to host the game." msgstr "Tut mir leid! Spieleröffnung fehlgeschlagen." # festgelegt ungleich fest -Kreuvf -#: src/multiint.cpp:2931 +#: src/multiint.cpp:2927 msgid "'Locked Teams' mode enabled" msgstr "\"Feste Teams\"-Modus aktiviert" -#: src/multiint.cpp:3012 +#: src/multiint.cpp:3008 #, c-format msgid "The host has kicked %s from the game!" msgstr "Der Spielleiter hat %s aus dem Spiel geworfen!" -#: src/multiint.cpp:3082 +#: src/multiint.cpp:3078 msgid "Host is Starting Game" msgstr "Der Spielleiter startet das Spiel" -#: src/multiint.cpp:3648 +#: src/multiint.cpp:3644 msgid "Players" msgstr "Spieler" -#: src/multiint.cpp:3786 +#: src/multiint.cpp:3782 #, c-format msgid "Sending Map: %d%% " msgstr "Sende Karte: %d%%" -#: src/multiint.cpp:3794 +#: src/multiint.cpp:3790 #, c-format msgid "Map: %d%% downloaded" msgstr "Karte: %d%% heruntergeladen" -#: src/multiint.cpp:3820 +#: src/multiint.cpp:3816 msgid "HOST" msgstr "SPIELLEITER" -#: src/multiint.cpp:3827 +#: src/multiint.cpp:3823 #: src/multimenu.cpp:772 msgid "Ping" msgstr "Ping" @@ -14644,79 +14640,79 @@ msgstr "Energie übertragen" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "Werfe Spieler %s hinaus wegen des Versuchs die Datenintegritätsprüfung zu umgehen!" -#: src/multiplay.cpp:1057 +#: src/multiplay.cpp:1056 msgid "(allies" msgstr "(Verbündete" -#: src/multiplay.cpp:1065 +#: src/multiplay.cpp:1064 msgid "(private to " msgstr "(direkt an " -#: src/multiplay.cpp:1078 +#: src/multiplay.cpp:1077 msgid "[invalid]" msgstr "[ungültig]" -#: src/multiplay.cpp:1942 +#: src/multiplay.cpp:1941 msgid "Green" msgstr "Grün" -#: src/multiplay.cpp:1943 +#: src/multiplay.cpp:1942 msgid "Orange" msgstr "Orange" -#: src/multiplay.cpp:1944 +#: src/multiplay.cpp:1943 msgid "Grey" msgstr "Grau" -#: src/multiplay.cpp:1945 +#: src/multiplay.cpp:1944 msgid "Black" msgstr "Schwarz" -#: src/multiplay.cpp:1946 +#: src/multiplay.cpp:1945 msgid "Red" msgstr "Rot" -#: src/multiplay.cpp:1947 +#: src/multiplay.cpp:1946 msgid "Blue" msgstr "Blau" -#: src/multiplay.cpp:1948 +#: src/multiplay.cpp:1947 msgid "Pink" msgstr "Pink" -#: src/multiplay.cpp:1949 +#: src/multiplay.cpp:1948 msgid "Cyan" msgstr "Cyan" -#: src/multiplay.cpp:1950 +#: src/multiplay.cpp:1949 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:1951 +#: src/multiplay.cpp:1950 msgid "Purple" msgstr "" -#: src/multiplay.cpp:1952 +#: src/multiplay.cpp:1951 msgid "White" msgstr "" -#: src/multiplay.cpp:1953 +#: src/multiplay.cpp:1952 msgid "Bright blue" msgstr "" -#: src/multiplay.cpp:1954 +#: src/multiplay.cpp:1953 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:1955 +#: src/multiplay.cpp:1954 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:1956 +#: src/multiplay.cpp:1955 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:1957 +#: src/multiplay.cpp:1956 msgid "Brown" msgstr "" @@ -14724,16 +14720,16 @@ msgstr "" msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "" -#: src/research.cpp:1737 +#: src/research.cpp:1739 #, c-format msgid "Research completed: %s" msgstr "Forschung abgeschlossen: %s" -#: src/research.cpp:1742 +#: src/research.cpp:1744 msgid "Research Completed" msgstr "Forschung abgeschlossen" -#: src/research.cpp:2563 +#: src/research.cpp:2565 msgid "Research Award" msgstr "Forschungsbeute" @@ -14897,64 +14893,64 @@ msgstr "Kann keine Sensoreinheit finden!" msgid "Unable to locate any Commanders!" msgstr "Kann keine Commander finden!" -#: src/structure.cpp:2614 +#: src/structure.cpp:2650 msgid "Command Control Limit Reached - Production Halted" msgstr "Commandereinheit hat Kontrollgrenze erreicht - Produktion angehalten" # nix Gruppe! -Kreuvf -#: src/structure.cpp:5806 -#: src/structure.cpp:5831 +#: src/structure.cpp:5888 +#: src/structure.cpp:5913 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" msgstr[0] "%s - %u Einheit hinzugefügt" msgstr[1] "%s - %u Einheiten hinzugefügt" -#: src/structure.cpp:5836 -#: src/structure.cpp:5904 -#: src/structure.cpp:5920 -#: src/structure.cpp:5934 +#: src/structure.cpp:5918 +#: src/structure.cpp:5986 +#: src/structure.cpp:6002 +#: src/structure.cpp:6016 #, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - Schaden %3.0f%%" -#: src/structure.cpp:5886 +#: src/structure.cpp:5968 #, c-format msgid "%s - Connected %u of %u" msgstr "%s - %u von %u verbunden" -#: src/structure.cpp:6050 -#: src/structure.cpp:6095 +#: src/structure.cpp:6132 +#: src/structure.cpp:6177 #, c-format msgid "%s - Electronically Damaged" msgstr "%s - Elektronisch beschädigt" # Reward ist zwar nicht Beute, aber im Krieg erbeutet man eben Dinge -Kreuvf -#: src/structure.cpp:6332 +#: src/structure.cpp:6414 msgid "Electronic Reward - Visibility Report" msgstr "Elektronische Beute - Sichtbarkeitsbericht" -#: src/structure.cpp:6372 +#: src/structure.cpp:6454 msgid "Factory Reward - Propulsion" msgstr "Fabrikbeute - Antrieb" -#: src/structure.cpp:6396 +#: src/structure.cpp:6478 msgid "Factory Reward - Body" msgstr "Fabrikbeute - Rumpf" -#: src/structure.cpp:6420 +#: src/structure.cpp:6502 msgid "Factory Reward - Weapon" msgstr "Fabrikbeute - Waffe" -#: src/structure.cpp:6429 +#: src/structure.cpp:6511 msgid "Factory Reward - Nothing" msgstr "Fabrikbeute - Nichts" -#: src/structure.cpp:6457 +#: src/structure.cpp:6539 msgid "Repair Facility Award - Repair" msgstr "Beute aus Reparatureinrichtung - Reparatur" -#: src/structure.cpp:6464 +#: src/structure.cpp:6546 msgid "Repair Facility Award - Nothing" msgstr "Beute aus Reparatureinrichtung - Nichts" @@ -14971,34 +14967,35 @@ msgstr "" msgid "Reinforcements landing" msgstr "Verstärkung landet" -#: src/version.cpp:143 -msgid " (modified and switched locally)" -msgstr " (lokal geändert und umgeschaltet)" - -#: src/version.cpp:145 +#: src/version.cpp:129 msgid " (modified locally)" msgstr " (lokal geändert)" -#: src/version.cpp:147 -msgid " (switched locally)" -msgstr " (lokal umgeschaltet)" - -#: src/version.cpp:154 +#: src/version.cpp:136 msgid " - DEBUG" msgstr " - DEBUG" -#: src/version.cpp:163 +#: src/version.cpp:145 #, c-format msgid " - Built %s" msgstr " - %s gebaut" #. TRANSLATORS: This string looks as follows when expanded. #. "Version " -#: src/version.cpp:173 +#: src/version.cpp:155 #, c-format msgid "Version %s%s%s%s" msgstr "Version %s%s%s%s" +#~ msgid "Kick player" +#~ msgstr "Spieler rauswerfen" + +#~ msgid " (modified and switched locally)" +#~ msgstr " (lokal geändert und umgeschaltet)" + +#~ msgid " (switched locally)" +#~ msgstr " (lokal umgeschaltet)" + #, fuzzy #~ msgid "Infinite Production" #~ msgstr "Produktion wiederholen" diff --git a/po/en_GB.po b/po/en_GB.po index ee9051961..d7886b6ab 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-02-25 23:35+0100\n" +"POT-Creation-Date: 2011-03-08 15:43+0100\n" "PO-Revision-Date: 2008-05-05 12:29+0000\n" "Last-Translator: Jen Ockwell \n" "Language-Team: English (United Kingdom) \n" @@ -12332,26 +12332,26 @@ msgid "System locale" msgstr "System locale" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1042 +#: lib/netplay/netplay.cpp:1037 msgid "Enter password here" msgstr "" -#: lib/netplay/netplay.cpp:2060 +#: lib/netplay/netplay.cpp:2055 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "" -#: lib/netplay/netplay.cpp:2082 +#: lib/netplay/netplay.cpp:2077 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "" #: src/challenge.cpp:184 #: src/hci.cpp:916 -#: src/hci.cpp:3378 -#: src/hci.cpp:3501 -#: src/hci.cpp:3912 -#: src/hci.cpp:4930 +#: src/hci.cpp:3386 +#: src/hci.cpp:3509 +#: src/hci.cpp:3920 +#: src/hci.cpp:4938 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12661,7 +12661,7 @@ msgid "Player dropped" msgstr "Player" #: src/display3d.cpp:599 -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2121 msgid "Waiting for other players" msgstr "" @@ -12674,7 +12674,7 @@ msgid "Cannot Build. Oil Resource Burning." msgstr "Cannot Build. Oil Resource Burning." #: src/display.cpp:1828 -#: src/display.cpp:2421 +#: src/display.cpp:2420 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - Damage %d%% - Experience %d, %s" @@ -12706,77 +12706,77 @@ msgstr "Unit Lost!" msgid "Structure Restored" msgstr "Structure Restored" -#: src/droid.cpp:2732 +#: src/droid.cpp:2734 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" msgstr[0] "Group %u selected - %u Unit" msgstr[1] "Group %u selected - %u Units" -#: src/droid.cpp:2745 +#: src/droid.cpp:2747 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" msgstr[0] "%u unit assigned to Group %u" msgstr[1] "%u units assigned to Group %u" -#: src/droid.cpp:2758 +#: src/droid.cpp:2760 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" msgstr[0] "Centred on Group %u - %u Unit" msgstr[1] "Centred on Group %u - %u Units" -#: src/droid.cpp:2762 +#: src/droid.cpp:2764 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" msgstr[0] "Aligning with Group %u - %u Unit" msgstr[1] "Aligning with Group %u - %u Units" -#: src/droid.cpp:3093 +#: src/droid.cpp:3095 msgid "Rookie" msgstr "Rookie" -#: src/droid.cpp:3094 +#: src/droid.cpp:3096 msgctxt "rank" msgid "Green" msgstr "Green" -#: src/droid.cpp:3095 +#: src/droid.cpp:3097 msgid "Trained" msgstr "Trained" -#: src/droid.cpp:3096 +#: src/droid.cpp:3098 msgid "Regular" msgstr "Regular" -#: src/droid.cpp:3097 +#: src/droid.cpp:3099 msgid "Professional" msgstr "Professional" -#: src/droid.cpp:3098 +#: src/droid.cpp:3100 msgid "Veteran" msgstr "Veteran" -#: src/droid.cpp:3099 +#: src/droid.cpp:3101 msgid "Elite" msgstr "Elite" -#: src/droid.cpp:3100 +#: src/droid.cpp:3102 msgid "Special" msgstr "Special" -#: src/droid.cpp:3101 +#: src/droid.cpp:3103 msgid "Hero" msgstr "Hero" -#: src/droid.cpp:4123 +#: src/droid.cpp:4125 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "" -#: src/droid.cpp:4127 +#: src/droid.cpp:4129 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "" @@ -12797,7 +12797,7 @@ msgid "Tutorial" msgstr "Tutorial" #: src/frontend.cpp:100 -#: src/hci.cpp:3487 +#: src/hci.cpp:3495 msgid "Options" msgstr "Options" @@ -12861,8 +12861,8 @@ msgstr "SINGLE PLAYER" #: src/frontend.cpp:303 #: src/ingameop.cpp:494 -#: src/mission.cpp:2493 -#: src/mission.cpp:2596 +#: src/mission.cpp:2537 +#: src/mission.cpp:2640 msgid "Load Saved Game" msgstr "Load Saved Game" @@ -13155,7 +13155,7 @@ msgid "GAME OPTIONS" msgstr "GAME OPTIONS" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2398 +#: src/multiint.cpp:2394 msgid "Mod: " msgstr "" @@ -13165,8 +13165,8 @@ msgid "MAP SAVED!" msgstr "GAME SAVED!" #: src/hci.cpp:1573 -#: src/loop.cpp:558 -#: src/loop.cpp:574 +#: src/loop.cpp:561 +#: src/loop.cpp:577 #, fuzzy msgid "GAME SAVED: " msgstr "GAME SAVED!" @@ -13195,158 +13195,158 @@ msgstr "Player %u is cheating (debug menu) him/herself a new droid: %s." msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "Player %u is cheating (debug menu) him/herself a new droid: %s." -#: src/hci.cpp:3298 +#: src/hci.cpp:3306 msgid "Commanders (F6)" msgstr "Commanders (F6)" -#: src/hci.cpp:3311 +#: src/hci.cpp:3319 msgid "Intelligence Display (F5)" msgstr "Intelligence Display (F5)" -#: src/hci.cpp:3324 +#: src/hci.cpp:3332 msgid "Manufacture (F1)" msgstr "Manufacture (F1)" -#: src/hci.cpp:3337 +#: src/hci.cpp:3345 msgid "Design (F4)" msgstr "Design (F4)" -#: src/hci.cpp:3350 +#: src/hci.cpp:3358 msgid "Research (F2)" msgstr "Research (F2)" -#: src/hci.cpp:3363 +#: src/hci.cpp:3371 msgid "Build (F3)" msgstr "Build (F3)" -#: src/hci.cpp:3434 +#: src/hci.cpp:3442 #: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Power" -#: src/hci.cpp:3525 +#: src/hci.cpp:3533 msgid "Map:" msgstr "" -#: src/hci.cpp:3538 +#: src/hci.cpp:3546 #, fuzzy msgid "Load" msgstr "Load Game" -#: src/hci.cpp:3539 +#: src/hci.cpp:3547 #, fuzzy msgid "Load Map File" msgstr "Load Game" -#: src/hci.cpp:3546 +#: src/hci.cpp:3554 #, fuzzy msgid "Save" msgstr "Save Game" -#: src/hci.cpp:3547 +#: src/hci.cpp:3555 #, fuzzy msgid "Save Map File" msgstr "Save Game" -#: src/hci.cpp:3555 +#: src/hci.cpp:3563 msgid "New" msgstr "" -#: src/hci.cpp:3556 +#: src/hci.cpp:3564 msgid "New Blank Map" msgstr "" -#: src/hci.cpp:3592 +#: src/hci.cpp:3600 #, fuzzy msgid "Tile" msgstr "file" -#: src/hci.cpp:3593 +#: src/hci.cpp:3601 msgid "Place tiles on map" msgstr "" -#: src/hci.cpp:3602 +#: src/hci.cpp:3610 msgid "Unit" msgstr "Unit" -#: src/hci.cpp:3603 +#: src/hci.cpp:3611 msgid "Place Unit on map" msgstr "" -#: src/hci.cpp:3611 +#: src/hci.cpp:3619 msgid "Struct" msgstr "Struct" -#: src/hci.cpp:3612 +#: src/hci.cpp:3620 #, fuzzy msgid "Place Structures on map" msgstr "Set Structure Limits" -#: src/hci.cpp:3620 +#: src/hci.cpp:3628 msgid "Feat" msgstr "Feat" -#: src/hci.cpp:3621 +#: src/hci.cpp:3629 msgid "Place Features on map" msgstr "" -#: src/hci.cpp:3631 +#: src/hci.cpp:3639 msgid "Pause" msgstr "" -#: src/hci.cpp:3632 +#: src/hci.cpp:3640 #, fuzzy msgid "Pause or unpause the game" msgstr "The host has left the game!" -#: src/hci.cpp:3646 +#: src/hci.cpp:3654 msgid "Align height of all map objects" msgstr "" -#: src/hci.cpp:3656 +#: src/hci.cpp:3664 msgid "Edit" msgstr "" -#: src/hci.cpp:3657 +#: src/hci.cpp:3665 #, fuzzy msgid "Start Edit Mode" msgstr "Start with No Bases" -#: src/hci.cpp:3671 +#: src/hci.cpp:3679 #: src/ingameop.cpp:112 #: src/ingameop.cpp:256 #: src/ingameop.cpp:260 msgid "Quit" msgstr "Quit" -#: src/hci.cpp:3672 +#: src/hci.cpp:3680 msgid "Exit Game" msgstr "Exit Game" -#: src/hci.cpp:3698 +#: src/hci.cpp:3706 #, fuzzy msgid "Current Player:" msgstr "Multi Player Game" -#: src/hci.cpp:3989 +#: src/hci.cpp:3997 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "Progress Bar" -#: src/hci.cpp:4855 +#: src/hci.cpp:4863 msgid "Factory Delivery Point" msgstr "Factory Delivery Point" -#: src/hci.cpp:4873 +#: src/hci.cpp:4881 msgid "Loop Production" msgstr "Loop Production" -#: src/hci.cpp:4953 +#: src/hci.cpp:4961 msgid "Tab Scroll left" msgstr "Tab Scroll left" -#: src/hci.cpp:4968 +#: src/hci.cpp:4976 msgid "Tab Scroll right" msgstr "Tab Scroll right" @@ -13372,8 +13372,8 @@ msgstr "" #: src/ingameop.cpp:274 #: src/ingameop.cpp:498 -#: src/mission.cpp:2480 -#: src/mission.cpp:2599 +#: src/mission.cpp:2524 +#: src/mission.cpp:2643 msgid "Save Game" msgstr "Save Game" @@ -14331,45 +14331,45 @@ msgstr "" msgid "Toggle Driving Mode" msgstr "Toggle Tracking Camera" -#: src/loop.cpp:565 -#: src/loop.cpp:581 +#: src/loop.cpp:568 +#: src/loop.cpp:584 #, fuzzy msgid "Could not save game!" msgstr "Load a saved game" -#: src/mission.cpp:2041 +#: src/mission.cpp:2085 msgid "Load Transport" msgstr "Load Transport" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 #, fuzzy msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "OBJECTIVE ACHIEVED" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED" msgstr "OBJECTIVE ACHIEVED" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 #, fuzzy msgid "OBJECTIVE FAILED--and you cheated!" msgstr "OBJECTIVE FAILED" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED" msgstr "OBJECTIVE FAILED" -#: src/mission.cpp:2459 -#: src/mission.cpp:2499 -#: src/mission.cpp:2613 +#: src/mission.cpp:2503 +#: src/mission.cpp:2543 +#: src/mission.cpp:2657 msgid "Quit To Main Menu" msgstr "Quit To Main Menu" -#: src/mission.cpp:2467 +#: src/mission.cpp:2511 msgid "Continue Game" msgstr "Continue Game" -#: src/mission.cpp:2564 +#: src/mission.cpp:2608 #, fuzzy msgid "GAME SAVED :" msgstr "GAME SAVED!" @@ -14667,118 +14667,113 @@ msgstr "" msgid "Player colour" msgstr "Player" -#: src/multiint.cpp:2071 +#: src/multiint.cpp:2068 msgid "Team" msgstr "" -#: src/multiint.cpp:2083 -#, fuzzy -msgid "Kick player" -msgstr "2 players" - -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 #, fuzzy msgid "Click to change difficulty" msgstr "Radar showing player colours" -#: src/multiint.cpp:2130 +#: src/multiint.cpp:2126 msgid "Click when ready" msgstr "" -#: src/multiint.cpp:2134 +#: src/multiint.cpp:2130 msgid "READY?" msgstr "" -#: src/multiint.cpp:2178 +#: src/multiint.cpp:2174 msgid "PLAYERS" msgstr "PLAYERS" -#: src/multiint.cpp:2213 +#: src/multiint.cpp:2209 msgid "Click to change to this slot" msgstr "" -#: src/multiint.cpp:2241 +#: src/multiint.cpp:2237 #, fuzzy msgid "Choose Team" msgstr "Locked Teams" -#: src/multiint.cpp:2271 +#: src/multiint.cpp:2267 #, fuzzy msgid "Click to change player colour" msgstr "Radar showing player colours" -#: src/multiint.cpp:2299 +#: src/multiint.cpp:2295 #, fuzzy msgid "Click to change player position" msgstr "Guard Position" -#: src/multiint.cpp:2305 +#: src/multiint.cpp:2301 #, fuzzy msgid "Click to change AI" msgstr "Radar showing player colours" -#: src/multiint.cpp:2309 +#: src/multiint.cpp:2305 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2371 +#: src/multiint.cpp:2367 msgid "CHAT" msgstr "CHAT" -#: src/multiint.cpp:2403 +#: src/multiint.cpp:2399 msgid "All players need to have the same mods to join your game." msgstr "" -#: src/multiint.cpp:2561 +#: src/multiint.cpp:2557 #, c-format msgid "*** password [%s] is now required! ***" msgstr "" -#: src/multiint.cpp:2569 +#: src/multiint.cpp:2565 msgid "*** password is NOT required! ***" msgstr "" -#: src/multiint.cpp:2810 +#: src/multiint.cpp:2806 msgid "Sorry! Failed to host the game." msgstr "" -#: src/multiint.cpp:2931 +#: src/multiint.cpp:2927 #, fuzzy msgid "'Locked Teams' mode enabled" msgstr "Locked Teams" -#: src/multiint.cpp:3012 +#: src/multiint.cpp:3008 #, c-format msgid "The host has kicked %s from the game!" msgstr "The host has kicked %s from the game!" -#: src/multiint.cpp:3082 +#: src/multiint.cpp:3078 msgid "Host is Starting Game" msgstr "Host is Starting Game" -#: src/multiint.cpp:3648 +#: src/multiint.cpp:3644 msgid "Players" msgstr "Players" -#: src/multiint.cpp:3786 +#: src/multiint.cpp:3782 #, c-format msgid "Sending Map: %d%% " msgstr "" -#: src/multiint.cpp:3794 +#: src/multiint.cpp:3790 #, c-format msgid "Map: %d%% downloaded" msgstr "" -#: src/multiint.cpp:3820 +#: src/multiint.cpp:3816 msgid "HOST" msgstr "" -#: src/multiint.cpp:3827 +#: src/multiint.cpp:3823 #: src/multimenu.cpp:772 msgid "Ping" msgstr "Ping" @@ -14958,80 +14953,80 @@ msgstr "Give Power To Player" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "" -#: src/multiplay.cpp:1057 +#: src/multiplay.cpp:1056 #, fuzzy msgid "(allies" msgstr "Alliances" -#: src/multiplay.cpp:1065 +#: src/multiplay.cpp:1064 msgid "(private to " msgstr "" -#: src/multiplay.cpp:1078 +#: src/multiplay.cpp:1077 msgid "[invalid]" msgstr "" -#: src/multiplay.cpp:1942 +#: src/multiplay.cpp:1941 msgid "Green" msgstr "Green" -#: src/multiplay.cpp:1943 +#: src/multiplay.cpp:1942 msgid "Orange" msgstr "Orange" -#: src/multiplay.cpp:1944 +#: src/multiplay.cpp:1943 msgid "Grey" msgstr "Grey" -#: src/multiplay.cpp:1945 +#: src/multiplay.cpp:1944 msgid "Black" msgstr "Black" -#: src/multiplay.cpp:1946 +#: src/multiplay.cpp:1945 msgid "Red" msgstr "Red" -#: src/multiplay.cpp:1947 +#: src/multiplay.cpp:1946 msgid "Blue" msgstr "Blue" -#: src/multiplay.cpp:1948 +#: src/multiplay.cpp:1947 msgid "Pink" msgstr "Pink" -#: src/multiplay.cpp:1949 +#: src/multiplay.cpp:1948 msgid "Cyan" msgstr "Cyan" -#: src/multiplay.cpp:1950 +#: src/multiplay.cpp:1949 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:1951 +#: src/multiplay.cpp:1950 msgid "Purple" msgstr "" -#: src/multiplay.cpp:1952 +#: src/multiplay.cpp:1951 msgid "White" msgstr "" -#: src/multiplay.cpp:1953 +#: src/multiplay.cpp:1952 msgid "Bright blue" msgstr "" -#: src/multiplay.cpp:1954 +#: src/multiplay.cpp:1953 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:1955 +#: src/multiplay.cpp:1954 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:1956 +#: src/multiplay.cpp:1955 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:1957 +#: src/multiplay.cpp:1956 msgid "Brown" msgstr "" @@ -15039,16 +15034,16 @@ msgstr "" msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "" -#: src/research.cpp:1737 +#: src/research.cpp:1739 #, c-format msgid "Research completed: %s" msgstr "Research completed: %s" -#: src/research.cpp:1742 +#: src/research.cpp:1744 msgid "Research Completed" msgstr "Research Completed" -#: src/research.cpp:2563 +#: src/research.cpp:2565 msgid "Research Award" msgstr "Research Award" @@ -15213,62 +15208,62 @@ msgstr "Unable to locate any Sensor Units!" msgid "Unable to locate any Commanders!" msgstr "Unable to locate any Commanders!" -#: src/structure.cpp:2614 +#: src/structure.cpp:2650 msgid "Command Control Limit Reached - Production Halted" msgstr "Command Control Limit Reached - Production Halted" -#: src/structure.cpp:5806 -#: src/structure.cpp:5831 +#: src/structure.cpp:5888 +#: src/structure.cpp:5913 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" msgstr[0] "%s - %u Unit assigned" msgstr[1] "%s - %u Units assigned" -#: src/structure.cpp:5836 -#: src/structure.cpp:5904 -#: src/structure.cpp:5920 -#: src/structure.cpp:5934 +#: src/structure.cpp:5918 +#: src/structure.cpp:5986 +#: src/structure.cpp:6002 +#: src/structure.cpp:6016 #, fuzzy, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - Damage %3.0f%%" -#: src/structure.cpp:5886 +#: src/structure.cpp:5968 #, c-format msgid "%s - Connected %u of %u" msgstr "%s - Connected %u of %u" -#: src/structure.cpp:6050 -#: src/structure.cpp:6095 +#: src/structure.cpp:6132 +#: src/structure.cpp:6177 #, c-format msgid "%s - Electronically Damaged" msgstr "%s - Electronically Damaged" -#: src/structure.cpp:6332 +#: src/structure.cpp:6414 msgid "Electronic Reward - Visibility Report" msgstr "Electronic Reward - Visibility Report" -#: src/structure.cpp:6372 +#: src/structure.cpp:6454 msgid "Factory Reward - Propulsion" msgstr "Factory Reward - Propulsion" -#: src/structure.cpp:6396 +#: src/structure.cpp:6478 msgid "Factory Reward - Body" msgstr "Factory Reward - Body" -#: src/structure.cpp:6420 +#: src/structure.cpp:6502 msgid "Factory Reward - Weapon" msgstr "Factory Reward - Weapon" -#: src/structure.cpp:6429 +#: src/structure.cpp:6511 msgid "Factory Reward - Nothing" msgstr "Factory Reward - Nothing" -#: src/structure.cpp:6457 +#: src/structure.cpp:6539 msgid "Repair Facility Award - Repair" msgstr "Repair Facility Award - Repair" -#: src/structure.cpp:6464 +#: src/structure.cpp:6546 msgid "Repair Facility Award - Nothing" msgstr "Repair Facility Award - Nothing" @@ -15285,34 +15280,36 @@ msgstr "" msgid "Reinforcements landing" msgstr "Reinforcements landing" -#: src/version.cpp:143 -msgid " (modified and switched locally)" -msgstr " (modified and switched locally)" - -#: src/version.cpp:145 +#: src/version.cpp:129 msgid " (modified locally)" msgstr " (modified locally)" -#: src/version.cpp:147 -msgid " (switched locally)" -msgstr " (switched locally)" - -#: src/version.cpp:154 +#: src/version.cpp:136 msgid " - DEBUG" msgstr " - DEBUG" -#: src/version.cpp:163 +#: src/version.cpp:145 #, c-format msgid " - Built %s" msgstr " - Built %s" #. TRANSLATORS: This string looks as follows when expanded. #. "Version " -#: src/version.cpp:173 +#: src/version.cpp:155 #, c-format msgid "Version %s%s%s%s" msgstr "Version %s%s%s%s" +#, fuzzy +#~ msgid "Kick player" +#~ msgstr "2 players" + +#~ msgid " (modified and switched locally)" +#~ msgstr " (modified and switched locally)" + +#~ msgid " (switched locally)" +#~ msgstr " (switched locally)" + #, fuzzy #~ msgid "Infinite Production" #~ msgstr "Loop Production" diff --git a/po/es.po b/po/es.po index 0189d3ee6..6bce3511b 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-02-25 23:35+0100\n" +"POT-Creation-Date: 2011-03-08 15:43+0100\n" "PO-Revision-Date: 2011-01-10 15:11+0100\n" "Last-Translator: Daniel Vijande \n" "Language-Team: Spanish \n" @@ -12011,26 +12011,26 @@ msgid "System locale" msgstr "Idioma del sistema" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1042 +#: lib/netplay/netplay.cpp:1037 msgid "Enter password here" msgstr "Introducir contraseña aquí" -#: lib/netplay/netplay.cpp:2060 +#: lib/netplay/netplay.cpp:2055 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "¡No se pudo resolver el nombre del servidor maestro (%s)!" -#: lib/netplay/netplay.cpp:2082 +#: lib/netplay/netplay.cpp:2077 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "¡No se pudo comunicar con el servidor! ¿Está el puerto TCP %u abierto para tráfico saliente?" #: src/challenge.cpp:184 #: src/hci.cpp:916 -#: src/hci.cpp:3378 -#: src/hci.cpp:3501 -#: src/hci.cpp:3912 -#: src/hci.cpp:4930 +#: src/hci.cpp:3386 +#: src/hci.cpp:3509 +#: src/hci.cpp:3920 +#: src/hci.cpp:4938 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12337,7 +12337,7 @@ msgid "Player dropped" msgstr "Jugador Desconectado" #: src/display3d.cpp:599 -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2121 msgid "Waiting for other players" msgstr "Esperando a otros jugadores" @@ -12350,7 +12350,7 @@ msgid "Cannot Build. Oil Resource Burning." msgstr "No se puede construir. Yacimiento de petróleo ardiendo." #: src/display.cpp:1828 -#: src/display.cpp:2421 +#: src/display.cpp:2420 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - Daño %d%% - Experiencia %d, %s" @@ -12381,77 +12381,77 @@ msgstr "¡Unidad destruída!" msgid "Structure Restored" msgstr "Estructura Restaurada" -#: src/droid.cpp:2732 +#: src/droid.cpp:2734 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" msgstr[0] "Grupo %u seleccionado - %u Unidad" msgstr[1] "Grupo %u seleccionado - %u Unidades" -#: src/droid.cpp:2745 +#: src/droid.cpp:2747 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" msgstr[0] "%u unidad asignada al Grupo %u" msgstr[1] "%u unidades asignadas al Grupo %u" -#: src/droid.cpp:2758 +#: src/droid.cpp:2760 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" msgstr[0] "Centrado en el Grupo %u - %u Unidad" msgstr[1] "Centrado en el Grupo %u - %u Unidades" -#: src/droid.cpp:2762 +#: src/droid.cpp:2764 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" msgstr[0] "Alineando con el Grupo %u - %u Unidad" msgstr[1] "Alineando con el Grupo %u - %u Unidades" -#: src/droid.cpp:3093 +#: src/droid.cpp:3095 msgid "Rookie" msgstr "Novato" -#: src/droid.cpp:3094 +#: src/droid.cpp:3096 msgctxt "rank" msgid "Green" msgstr "Principiante" -#: src/droid.cpp:3095 +#: src/droid.cpp:3097 msgid "Trained" msgstr "Entrenado" -#: src/droid.cpp:3096 +#: src/droid.cpp:3098 msgid "Regular" msgstr "Regular" -#: src/droid.cpp:3097 +#: src/droid.cpp:3099 msgid "Professional" msgstr "Profesional" -#: src/droid.cpp:3098 +#: src/droid.cpp:3100 msgid "Veteran" msgstr "Veterano" -#: src/droid.cpp:3099 +#: src/droid.cpp:3101 msgid "Elite" msgstr "Élite" -#: src/droid.cpp:3100 +#: src/droid.cpp:3102 msgid "Special" msgstr "Especial" -#: src/droid.cpp:3101 +#: src/droid.cpp:3103 msgid "Hero" msgstr "Héroe" -#: src/droid.cpp:4123 +#: src/droid.cpp:4125 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "¡%s quiso darte un %s pero tienes demasiados!" -#: src/droid.cpp:4127 +#: src/droid.cpp:4129 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "¡Intentaste dar a %s un %s pero tiene demasiados!" @@ -12470,7 +12470,7 @@ msgid "Tutorial" msgstr "Tutorial" #: src/frontend.cpp:100 -#: src/hci.cpp:3487 +#: src/hci.cpp:3495 msgid "Options" msgstr "Opciones" @@ -12531,8 +12531,8 @@ msgstr "UN JUGADOR" #: src/frontend.cpp:303 #: src/ingameop.cpp:494 -#: src/mission.cpp:2493 -#: src/mission.cpp:2596 +#: src/mission.cpp:2537 +#: src/mission.cpp:2640 msgid "Load Saved Game" msgstr "Cargar Partida Guardada" @@ -12815,7 +12815,7 @@ msgid "GAME OPTIONS" msgstr "OPCIONES DE JUEGO" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2398 +#: src/multiint.cpp:2394 msgid "Mod: " msgstr "Mod:" @@ -12824,8 +12824,8 @@ msgid "MAP SAVED!" msgstr "¡MAPA GUARDADO!" #: src/hci.cpp:1573 -#: src/loop.cpp:558 -#: src/loop.cpp:574 +#: src/loop.cpp:561 +#: src/loop.cpp:577 msgid "GAME SAVED: " msgstr "PARTIDA GUARDADA:" @@ -12853,149 +12853,149 @@ msgstr "El jugador %u está haciendo trampas (menú depuración) con un nuevo an msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "El jugador %u está haciendo trampas (menú depuración) con un nuevo androide." -#: src/hci.cpp:3298 +#: src/hci.cpp:3306 msgid "Commanders (F6)" msgstr "Comandantes (F6)" -#: src/hci.cpp:3311 +#: src/hci.cpp:3319 msgid "Intelligence Display (F5)" msgstr "Inteligencia (F5)" -#: src/hci.cpp:3324 +#: src/hci.cpp:3332 msgid "Manufacture (F1)" msgstr "Fabricación (F1)" -#: src/hci.cpp:3337 +#: src/hci.cpp:3345 msgid "Design (F4)" msgstr "Diseño (F4)" -#: src/hci.cpp:3350 +#: src/hci.cpp:3358 msgid "Research (F2)" msgstr "Investigación (F2)" -#: src/hci.cpp:3363 +#: src/hci.cpp:3371 msgid "Build (F3)" msgstr "Construcción (F3)" -#: src/hci.cpp:3434 +#: src/hci.cpp:3442 #: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Energía" -#: src/hci.cpp:3525 +#: src/hci.cpp:3533 msgid "Map:" msgstr "Mapa:" -#: src/hci.cpp:3538 +#: src/hci.cpp:3546 msgid "Load" msgstr "Cargar" -#: src/hci.cpp:3539 +#: src/hci.cpp:3547 msgid "Load Map File" msgstr "Cargar Mapa" -#: src/hci.cpp:3546 +#: src/hci.cpp:3554 msgid "Save" msgstr "Guardar" -#: src/hci.cpp:3547 +#: src/hci.cpp:3555 msgid "Save Map File" msgstr "Guardar Mapa" -#: src/hci.cpp:3555 +#: src/hci.cpp:3563 msgid "New" msgstr "Nuevo" -#: src/hci.cpp:3556 +#: src/hci.cpp:3564 msgid "New Blank Map" msgstr "Nuevo Mapa en Blanco" -#: src/hci.cpp:3592 +#: src/hci.cpp:3600 msgid "Tile" msgstr "casilla" -#: src/hci.cpp:3593 +#: src/hci.cpp:3601 msgid "Place tiles on map" msgstr "Colocar casillas en el mapa" -#: src/hci.cpp:3602 +#: src/hci.cpp:3610 msgid "Unit" msgstr "Unidad" -#: src/hci.cpp:3603 +#: src/hci.cpp:3611 msgid "Place Unit on map" msgstr "Colocar Unidad en el mapa" -#: src/hci.cpp:3611 +#: src/hci.cpp:3619 msgid "Struct" msgstr "Estructura" -#: src/hci.cpp:3612 +#: src/hci.cpp:3620 msgid "Place Structures on map" msgstr "Colocar Estructuras en el mapa" -#: src/hci.cpp:3620 +#: src/hci.cpp:3628 msgid "Feat" msgstr "Hazaña" -#: src/hci.cpp:3621 +#: src/hci.cpp:3629 msgid "Place Features on map" msgstr "Colocar Características en el mapa" -#: src/hci.cpp:3631 +#: src/hci.cpp:3639 msgid "Pause" msgstr "Pausa" -#: src/hci.cpp:3632 +#: src/hci.cpp:3640 msgid "Pause or unpause the game" msgstr "Pausa o despausa la partida" -#: src/hci.cpp:3646 +#: src/hci.cpp:3654 msgid "Align height of all map objects" msgstr "Anchura de alineacion de todos los objetos del mapa" -#: src/hci.cpp:3656 +#: src/hci.cpp:3664 msgid "Edit" msgstr "Editar" -#: src/hci.cpp:3657 +#: src/hci.cpp:3665 msgid "Start Edit Mode" msgstr "Iniciar modo de Edición" -#: src/hci.cpp:3671 +#: src/hci.cpp:3679 #: src/ingameop.cpp:112 #: src/ingameop.cpp:256 #: src/ingameop.cpp:260 msgid "Quit" msgstr "Salir" -#: src/hci.cpp:3672 +#: src/hci.cpp:3680 msgid "Exit Game" msgstr "Salir del Juego" -#: src/hci.cpp:3698 +#: src/hci.cpp:3706 msgid "Current Player:" msgstr "Jugador actual:" -#: src/hci.cpp:3989 +#: src/hci.cpp:3997 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "Barra de progreso" -#: src/hci.cpp:4855 +#: src/hci.cpp:4863 msgid "Factory Delivery Point" msgstr "Punto de Reparto de la Fábrica" -#: src/hci.cpp:4873 +#: src/hci.cpp:4881 msgid "Loop Production" msgstr "Ciclos de Producción" -#: src/hci.cpp:4953 +#: src/hci.cpp:4961 msgid "Tab Scroll left" msgstr "Tab Desplazamiento Izquierda" -#: src/hci.cpp:4968 +#: src/hci.cpp:4976 msgid "Tab Scroll right" msgstr "Tab Desplazamiento Derecha" @@ -13021,8 +13021,8 @@ msgstr "UI Táctica (Icono de origen de objetivo): Ocultar" #: src/ingameop.cpp:274 #: src/ingameop.cpp:498 -#: src/mission.cpp:2480 -#: src/mission.cpp:2599 +#: src/mission.cpp:2524 +#: src/mission.cpp:2643 msgid "Save Game" msgstr "Guardar Partida" @@ -13951,42 +13951,42 @@ msgstr "Rastrear un objeto del juego." msgid "Toggle Driving Mode" msgstr "Alternar Cámara de Seguimiento" -#: src/loop.cpp:565 -#: src/loop.cpp:581 +#: src/loop.cpp:568 +#: src/loop.cpp:584 msgid "Could not save game!" msgstr "¡No se pudo guardar la partida!" -#: src/mission.cpp:2041 +#: src/mission.cpp:2085 msgid "Load Transport" msgstr "Cargar Transporte" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "¡OBJETIVO CUMPLIDO con trampas!" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED" msgstr "OBJETIVO CUMPLIDO" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED--and you cheated!" msgstr "OBJETIVO FALLADO-- ¡e hiciste trampas!" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED" msgstr "OBJETIVO FALLADO" -#: src/mission.cpp:2459 -#: src/mission.cpp:2499 -#: src/mission.cpp:2613 +#: src/mission.cpp:2503 +#: src/mission.cpp:2543 +#: src/mission.cpp:2657 msgid "Quit To Main Menu" msgstr "Salir al Menú Principal" -#: src/mission.cpp:2467 +#: src/mission.cpp:2511 msgid "Continue Game" msgstr "Continuar Partida" -#: src/mission.cpp:2564 +#: src/mission.cpp:2608 msgid "GAME SAVED :" msgstr "¡PARTIDA GUARDADA!" @@ -14275,113 +14275,109 @@ msgstr "" msgid "Player colour" msgstr "Color del Jugador" -#: src/multiint.cpp:2071 +#: src/multiint.cpp:2068 msgid "Team" msgstr "Equipo" -#: src/multiint.cpp:2083 -msgid "Kick player" -msgstr "Expulsar jugador" - -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 #, fuzzy msgid "Click to change difficulty" msgstr "Click para ajustar dificultad de la IA" -#: src/multiint.cpp:2130 +#: src/multiint.cpp:2126 msgid "Click when ready" msgstr "Click cuando esté listo" -#: src/multiint.cpp:2134 +#: src/multiint.cpp:2130 msgid "READY?" msgstr "¿LISTO?" -#: src/multiint.cpp:2178 +#: src/multiint.cpp:2174 msgid "PLAYERS" msgstr "JUGADORES" -#: src/multiint.cpp:2213 +#: src/multiint.cpp:2209 msgid "Click to change to this slot" msgstr "Click para cambiar a esta ranura." -#: src/multiint.cpp:2241 +#: src/multiint.cpp:2237 msgid "Choose Team" msgstr "Elegir equipo" -#: src/multiint.cpp:2271 +#: src/multiint.cpp:2267 msgid "Click to change player colour" msgstr "Click para cambiar el color de jugador." -#: src/multiint.cpp:2299 +#: src/multiint.cpp:2295 msgid "Click to change player position" msgstr "Click para cambiar la posición de jugador." -#: src/multiint.cpp:2305 +#: src/multiint.cpp:2301 #, fuzzy msgid "Click to change AI" msgstr "Click para cambiar a esta ranura." -#: src/multiint.cpp:2309 +#: src/multiint.cpp:2305 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2371 +#: src/multiint.cpp:2367 msgid "CHAT" msgstr "CHAT" -#: src/multiint.cpp:2403 +#: src/multiint.cpp:2399 msgid "All players need to have the same mods to join your game." msgstr "Todos los jugadores necesitan tener los mismos mods para unirse" -#: src/multiint.cpp:2561 +#: src/multiint.cpp:2557 #, c-format msgid "*** password [%s] is now required! ***" msgstr "*** ¡contraseña [%s] requerida! ***" -#: src/multiint.cpp:2569 +#: src/multiint.cpp:2565 msgid "*** password is NOT required! ***" msgstr "*** ¡contraseña no requerida! ***" -#: src/multiint.cpp:2810 +#: src/multiint.cpp:2806 msgid "Sorry! Failed to host the game." msgstr "¡Lo sentimos! No se pudo hospedar la partida" -#: src/multiint.cpp:2931 +#: src/multiint.cpp:2927 msgid "'Locked Teams' mode enabled" msgstr "Modo de Equipos Fijos Activado" -#: src/multiint.cpp:3012 +#: src/multiint.cpp:3008 #, c-format msgid "The host has kicked %s from the game!" msgstr "¡El anfitrión ha expulsado a %s de la partida!" -#: src/multiint.cpp:3082 +#: src/multiint.cpp:3078 msgid "Host is Starting Game" msgstr "Anfitrión Comenzando Partida" -#: src/multiint.cpp:3648 +#: src/multiint.cpp:3644 msgid "Players" msgstr "Jugadores" -#: src/multiint.cpp:3786 +#: src/multiint.cpp:3782 #, c-format msgid "Sending Map: %d%% " msgstr "Enviando Mapa: %d%%" -#: src/multiint.cpp:3794 +#: src/multiint.cpp:3790 #, c-format msgid "Map: %d%% downloaded" msgstr "Mapa: %d%% descargado" -#: src/multiint.cpp:3820 +#: src/multiint.cpp:3816 msgid "HOST" msgstr "ANFITRIÓN" -#: src/multiint.cpp:3827 +#: src/multiint.cpp:3823 #: src/multimenu.cpp:772 msgid "Ping" msgstr "Ping" @@ -14553,80 +14549,80 @@ msgstr "Dar Energía al Jugador" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "¡Expulsado el jugador %s, porque intentó saltar la seguridad de integridad de datos!" -#: src/multiplay.cpp:1057 +#: src/multiplay.cpp:1056 msgid "(allies" msgstr "( a aliados" -#: src/multiplay.cpp:1065 +#: src/multiplay.cpp:1064 msgid "(private to " msgstr "(privado a " -#: src/multiplay.cpp:1078 +#: src/multiplay.cpp:1077 msgid "[invalid]" msgstr "[inválido]" -#: src/multiplay.cpp:1942 +#: src/multiplay.cpp:1941 msgid "Green" msgstr "Verde" -#: src/multiplay.cpp:1943 +#: src/multiplay.cpp:1942 msgid "Orange" msgstr "Naranja" -#: src/multiplay.cpp:1944 +#: src/multiplay.cpp:1943 msgid "Grey" msgstr "Gris" -#: src/multiplay.cpp:1945 +#: src/multiplay.cpp:1944 msgid "Black" msgstr "Negro" -#: src/multiplay.cpp:1946 +#: src/multiplay.cpp:1945 msgid "Red" msgstr "Rojo" -#: src/multiplay.cpp:1947 +#: src/multiplay.cpp:1946 msgid "Blue" msgstr "Azul" -#: src/multiplay.cpp:1948 +#: src/multiplay.cpp:1947 msgid "Pink" msgstr "Rosa" -#: src/multiplay.cpp:1949 +#: src/multiplay.cpp:1948 msgid "Cyan" msgstr "Cian" -#: src/multiplay.cpp:1950 +#: src/multiplay.cpp:1949 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:1951 +#: src/multiplay.cpp:1950 msgid "Purple" msgstr "" -#: src/multiplay.cpp:1952 +#: src/multiplay.cpp:1951 msgid "White" msgstr "" -#: src/multiplay.cpp:1953 +#: src/multiplay.cpp:1952 #, fuzzy msgid "Bright blue" msgstr "Botón derecho" -#: src/multiplay.cpp:1954 +#: src/multiplay.cpp:1953 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:1955 +#: src/multiplay.cpp:1954 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:1956 +#: src/multiplay.cpp:1955 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:1957 +#: src/multiplay.cpp:1956 msgid "Brown" msgstr "" @@ -14634,16 +14630,16 @@ msgstr "" msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "¡No podemos hacer eso! ¡Debemos ser una unidad cyborg para usar el transporte Cyborg!" -#: src/research.cpp:1737 +#: src/research.cpp:1739 #, c-format msgid "Research completed: %s" msgstr "Investigación completada: %s" -#: src/research.cpp:1742 +#: src/research.cpp:1744 msgid "Research Completed" msgstr "Investigación Completada" -#: src/research.cpp:2563 +#: src/research.cpp:2565 msgid "Research Award" msgstr "Premio de Investigación" @@ -14807,62 +14803,62 @@ msgstr "¡Imposible localizar ninguna unidad de sensores!" msgid "Unable to locate any Commanders!" msgstr "¡Imposible localizar ningún Comandante!" -#: src/structure.cpp:2614 +#: src/structure.cpp:2650 msgid "Command Control Limit Reached - Production Halted" msgstr "Alcanzado Límite de Control de Unidades - Producción Detenida" -#: src/structure.cpp:5806 -#: src/structure.cpp:5831 +#: src/structure.cpp:5888 +#: src/structure.cpp:5913 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" msgstr[0] "%s - %u Unidad asignada" msgstr[1] "%s - %u Unidades asignadas" -#: src/structure.cpp:5836 -#: src/structure.cpp:5904 -#: src/structure.cpp:5920 -#: src/structure.cpp:5934 +#: src/structure.cpp:5918 +#: src/structure.cpp:5986 +#: src/structure.cpp:6002 +#: src/structure.cpp:6016 #, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - Daño %3.0f%%" -#: src/structure.cpp:5886 +#: src/structure.cpp:5968 #, c-format msgid "%s - Connected %u of %u" msgstr "%s - Conectado %u de %u" -#: src/structure.cpp:6050 -#: src/structure.cpp:6095 +#: src/structure.cpp:6132 +#: src/structure.cpp:6177 #, c-format msgid "%s - Electronically Damaged" msgstr "%s - Dañado Electrónicamente" -#: src/structure.cpp:6332 +#: src/structure.cpp:6414 msgid "Electronic Reward - Visibility Report" msgstr "Recompensa de Electrónica - Informe de Visibilidad" -#: src/structure.cpp:6372 +#: src/structure.cpp:6454 msgid "Factory Reward - Propulsion" msgstr "Recompensa de Fábrica - Propulsión" -#: src/structure.cpp:6396 +#: src/structure.cpp:6478 msgid "Factory Reward - Body" msgstr "Recompensa de Fábrica - Carrocería" -#: src/structure.cpp:6420 +#: src/structure.cpp:6502 msgid "Factory Reward - Weapon" msgstr "Recompensa de Fábrica - Arma" -#: src/structure.cpp:6429 +#: src/structure.cpp:6511 msgid "Factory Reward - Nothing" msgstr "Recompensa de Fábrica - Nada" -#: src/structure.cpp:6457 +#: src/structure.cpp:6539 msgid "Repair Facility Award - Repair" msgstr "Premio de Instalación de Reparación - Reparación" -#: src/structure.cpp:6464 +#: src/structure.cpp:6546 msgid "Repair Facility Award - Nothing" msgstr "Premio de Instalación de Reparación - Nada" @@ -14879,34 +14875,35 @@ msgstr "¡No hay espacio suficiente en el transporte!" msgid "Reinforcements landing" msgstr "Refuerzos aterrizando" -#: src/version.cpp:143 -msgid " (modified and switched locally)" -msgstr " (modificado y cambiado localmente)" - -#: src/version.cpp:145 +#: src/version.cpp:129 msgid " (modified locally)" msgstr " (modificado localmente)" -#: src/version.cpp:147 -msgid " (switched locally)" -msgstr " (cambiado localmente)" - -#: src/version.cpp:154 +#: src/version.cpp:136 msgid " - DEBUG" msgstr " - DEPURACIÓN" -#: src/version.cpp:163 +#: src/version.cpp:145 #, c-format msgid " - Built %s" msgstr " - Construido %s" #. TRANSLATORS: This string looks as follows when expanded. #. "Version " -#: src/version.cpp:173 +#: src/version.cpp:155 #, c-format msgid "Version %s%s%s%s" msgstr "Versión: %s%s%s%s" +#~ msgid "Kick player" +#~ msgstr "Expulsar jugador" + +#~ msgid " (modified and switched locally)" +#~ msgstr " (modificado y cambiado localmente)" + +#~ msgid " (switched locally)" +#~ msgstr " (cambiado localmente)" + #~ msgid "Infinite Production" #~ msgstr "Producción Infinita" diff --git a/po/et_EE.po b/po/et_EE.po index c9508f51b..ed9838db7 100644 --- a/po/et_EE.po +++ b/po/et_EE.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-02-25 23:35+0100\n" +"POT-Creation-Date: 2011-03-08 15:43+0100\n" "PO-Revision-Date: 2010-05-10 16:59+0200\n" "Last-Translator: erlando \n" "Language-Team: Estonian \n" @@ -12027,26 +12027,26 @@ msgid "System locale" msgstr "Süsteemi Asukoht" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1042 +#: lib/netplay/netplay.cpp:1037 msgid "Enter password here" msgstr "Sisesta salasõna siia" -#: lib/netplay/netplay.cpp:2060 +#: lib/netplay/netplay.cpp:2055 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "Ei suuda peaserveri nime lahendada (%s)!" -#: lib/netplay/netplay.cpp:2082 +#: lib/netplay/netplay.cpp:2077 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "Ei suuda lobby serveriga suhelda! Kas port %u on väljaminevale liiklusele avatud?" #: src/challenge.cpp:184 #: src/hci.cpp:916 -#: src/hci.cpp:3378 -#: src/hci.cpp:3501 -#: src/hci.cpp:3912 -#: src/hci.cpp:4930 +#: src/hci.cpp:3386 +#: src/hci.cpp:3509 +#: src/hci.cpp:3920 +#: src/hci.cpp:4938 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12353,7 +12353,7 @@ msgid "Player dropped" msgstr "Mängija Väjavisatud" #: src/display3d.cpp:599 -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2121 msgid "Waiting for other players" msgstr "Teiste mängijate ootamine" @@ -12366,7 +12366,7 @@ msgid "Cannot Build. Oil Resource Burning." msgstr "EI Saa Ehitada. Naftaresurss Põleb." #: src/display.cpp:1828 -#: src/display.cpp:2421 +#: src/display.cpp:2420 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - Kahju %d%% - Kogemus %d, %s" @@ -12398,77 +12398,77 @@ msgstr "Üksus Kaotatud!" msgid "Structure Restored" msgstr "Ehitis taastatud" -#: src/droid.cpp:2732 +#: src/droid.cpp:2734 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" msgstr[0] "Grupp %u valitud - %u Üksus" msgstr[1] "Grupp %u valitud - %u Üksust" -#: src/droid.cpp:2745 +#: src/droid.cpp:2747 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" msgstr[0] "%u üksus määratud gruppi %u" msgstr[1] "%u Üksust määratud Gruppi %u" -#: src/droid.cpp:2758 +#: src/droid.cpp:2760 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" msgstr[0] "Grupi %u Vaade - %u Üksus" msgstr[1] "Grupi %u Vaade - %u Üksust" -#: src/droid.cpp:2762 +#: src/droid.cpp:2764 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" msgstr[0] "Aligning with Group %u - %u Unit" msgstr[1] "Aligning with Group %u - %u Units" -#: src/droid.cpp:3093 +#: src/droid.cpp:3095 msgid "Rookie" msgstr "Uustulnuk" -#: src/droid.cpp:3094 +#: src/droid.cpp:3096 msgctxt "rank" msgid "Green" msgstr "Algaja" -#: src/droid.cpp:3095 +#: src/droid.cpp:3097 msgid "Trained" msgstr "Treenitud" -#: src/droid.cpp:3096 +#: src/droid.cpp:3098 msgid "Regular" msgstr "Regulaar" -#: src/droid.cpp:3097 +#: src/droid.cpp:3099 msgid "Professional" msgstr "Professionaal" -#: src/droid.cpp:3098 +#: src/droid.cpp:3100 msgid "Veteran" msgstr "Veteran" -#: src/droid.cpp:3099 +#: src/droid.cpp:3101 msgid "Elite" msgstr "Eliit" -#: src/droid.cpp:3100 +#: src/droid.cpp:3102 msgid "Special" msgstr "Eriline" -#: src/droid.cpp:3101 +#: src/droid.cpp:3103 msgid "Hero" msgstr "Kangelane" -#: src/droid.cpp:4123 +#: src/droid.cpp:4125 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "" -#: src/droid.cpp:4127 +#: src/droid.cpp:4129 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "" @@ -12487,7 +12487,7 @@ msgid "Tutorial" msgstr "Õpetus" #: src/frontend.cpp:100 -#: src/hci.cpp:3487 +#: src/hci.cpp:3495 msgid "Options" msgstr "Seaded" @@ -12548,8 +12548,8 @@ msgstr "ÜKSIK MÄNG" #: src/frontend.cpp:303 #: src/ingameop.cpp:494 -#: src/mission.cpp:2493 -#: src/mission.cpp:2596 +#: src/mission.cpp:2537 +#: src/mission.cpp:2640 msgid "Load Saved Game" msgstr "Laadi Salvestatud Mäng" @@ -12834,7 +12834,7 @@ msgid "GAME OPTIONS" msgstr "MÄNGU SEADED" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2398 +#: src/multiint.cpp:2394 msgid "Mod: " msgstr "Mod:" @@ -12843,8 +12843,8 @@ msgid "MAP SAVED!" msgstr "KAART SALVESTATUD!" #: src/hci.cpp:1573 -#: src/loop.cpp:558 -#: src/loop.cpp:574 +#: src/loop.cpp:561 +#: src/loop.cpp:577 #, fuzzy msgid "GAME SAVED: " msgstr "MÄNG SALVESTATUD!" @@ -12873,155 +12873,155 @@ msgstr "Mängija %u teeb sohki(debug menu) talle uus droid: %s." msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "Mängija %u teeb sohki(debug menu) talle uus droid: %s." -#: src/hci.cpp:3298 +#: src/hci.cpp:3306 msgid "Commanders (F6)" msgstr "Komandörid (F6)" -#: src/hci.cpp:3311 +#: src/hci.cpp:3319 msgid "Intelligence Display (F5)" msgstr "Intelligentsus Ekraan (F5)" -#: src/hci.cpp:3324 +#: src/hci.cpp:3332 msgid "Manufacture (F1)" msgstr "Tootmine (F1)" -#: src/hci.cpp:3337 +#: src/hci.cpp:3345 msgid "Design (F4)" msgstr "Konstrueerimine (F4)" -#: src/hci.cpp:3350 +#: src/hci.cpp:3358 msgid "Research (F2)" msgstr "Uurimine (F2)" -#: src/hci.cpp:3363 +#: src/hci.cpp:3371 msgid "Build (F3)" msgstr "Ehitamine (F3)" -#: src/hci.cpp:3434 +#: src/hci.cpp:3442 #: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Energia" -#: src/hci.cpp:3525 +#: src/hci.cpp:3533 msgid "Map:" msgstr "" -#: src/hci.cpp:3538 +#: src/hci.cpp:3546 #, fuzzy msgid "Load" msgstr "Laadi Mäng" -#: src/hci.cpp:3539 +#: src/hci.cpp:3547 #, fuzzy msgid "Load Map File" msgstr "Laadi Mäng" -#: src/hci.cpp:3546 +#: src/hci.cpp:3554 #, fuzzy msgid "Save" msgstr "Salvesta Mäng" -#: src/hci.cpp:3547 +#: src/hci.cpp:3555 #, fuzzy msgid "Save Map File" msgstr "Salvesta Mäng" -#: src/hci.cpp:3555 +#: src/hci.cpp:3563 msgid "New" msgstr "" -#: src/hci.cpp:3556 +#: src/hci.cpp:3564 msgid "New Blank Map" msgstr "" -#: src/hci.cpp:3592 +#: src/hci.cpp:3600 msgid "Tile" msgstr "Tile" -#: src/hci.cpp:3593 +#: src/hci.cpp:3601 msgid "Place tiles on map" msgstr "Place tiles on map" -#: src/hci.cpp:3602 +#: src/hci.cpp:3610 msgid "Unit" msgstr "Üksus" -#: src/hci.cpp:3603 +#: src/hci.cpp:3611 msgid "Place Unit on map" msgstr "Paiguta kaartile üksus" -#: src/hci.cpp:3611 +#: src/hci.cpp:3619 msgid "Struct" msgstr "Ehitis" -#: src/hci.cpp:3612 +#: src/hci.cpp:3620 msgid "Place Structures on map" msgstr "Paiguta kaartile ehitis" -#: src/hci.cpp:3620 +#: src/hci.cpp:3628 msgid "Feat" msgstr "Saavutus" -#: src/hci.cpp:3621 +#: src/hci.cpp:3629 msgid "Place Features on map" msgstr "Place Features on map" -#: src/hci.cpp:3631 +#: src/hci.cpp:3639 msgid "Pause" msgstr "" -#: src/hci.cpp:3632 +#: src/hci.cpp:3640 msgid "Pause or unpause the game" msgstr "Paus või Pausi mahavõtmine" -#: src/hci.cpp:3646 +#: src/hci.cpp:3654 msgid "Align height of all map objects" msgstr "Align height of all map objects" -#: src/hci.cpp:3656 +#: src/hci.cpp:3664 msgid "Edit" msgstr "" -#: src/hci.cpp:3657 +#: src/hci.cpp:3665 #, fuzzy msgid "Start Edit Mode" msgstr "Alusta Baasideta" -#: src/hci.cpp:3671 +#: src/hci.cpp:3679 #: src/ingameop.cpp:112 #: src/ingameop.cpp:256 #: src/ingameop.cpp:260 msgid "Quit" msgstr "Välju" -#: src/hci.cpp:3672 +#: src/hci.cpp:3680 msgid "Exit Game" msgstr "Välju Mängust" -#: src/hci.cpp:3698 +#: src/hci.cpp:3706 #, fuzzy msgid "Current Player:" msgstr "Mitmik Mäng" -#: src/hci.cpp:3989 +#: src/hci.cpp:3997 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "Progressi Riba" -#: src/hci.cpp:4855 +#: src/hci.cpp:4863 msgid "Factory Delivery Point" msgstr "Tehase Saatmis Koht" -#: src/hci.cpp:4873 +#: src/hci.cpp:4881 msgid "Loop Production" msgstr "Tsükkel tootmine" -#: src/hci.cpp:4953 +#: src/hci.cpp:4961 msgid "Tab Scroll left" msgstr "Tab Scroll left" -#: src/hci.cpp:4968 +#: src/hci.cpp:4976 msgid "Tab Scroll right" msgstr "Tab Scroll right" @@ -13047,8 +13047,8 @@ msgstr "" #: src/ingameop.cpp:274 #: src/ingameop.cpp:498 -#: src/mission.cpp:2480 -#: src/mission.cpp:2599 +#: src/mission.cpp:2524 +#: src/mission.cpp:2643 msgid "Save Game" msgstr "Salvesta Mäng" @@ -13995,42 +13995,42 @@ msgstr "" msgid "Toggle Driving Mode" msgstr "Toggle Tracking Camera" -#: src/loop.cpp:565 -#: src/loop.cpp:581 +#: src/loop.cpp:568 +#: src/loop.cpp:584 msgid "Could not save game!" msgstr "Ei suutnud mängu salvestada" -#: src/mission.cpp:2041 +#: src/mission.cpp:2085 msgid "Load Transport" msgstr "Laadi Transport" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "EESMÄRK SAAVUTATUD sohki tehes" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED" msgstr "EESMÄRK SAAVUTATUD" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED--and you cheated!" msgstr "EESMÄRK EBAÕNNESTUNUD--ja sa tegid sohki" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED" msgstr "EESMÄRK EBAÕNNESTUNUD" -#: src/mission.cpp:2459 -#: src/mission.cpp:2499 -#: src/mission.cpp:2613 +#: src/mission.cpp:2503 +#: src/mission.cpp:2543 +#: src/mission.cpp:2657 msgid "Quit To Main Menu" msgstr "Välju Peamenüüsse" -#: src/mission.cpp:2467 +#: src/mission.cpp:2511 msgid "Continue Game" msgstr "Jätka Mängu" -#: src/mission.cpp:2564 +#: src/mission.cpp:2608 msgid "GAME SAVED :" msgstr "MÄNG SALVESTATUD!" @@ -14320,117 +14320,113 @@ msgstr "" msgid "Player colour" msgstr "Mängija värv" -#: src/multiint.cpp:2071 +#: src/multiint.cpp:2068 msgid "Team" msgstr "Tiim" -#: src/multiint.cpp:2083 -msgid "Kick player" -msgstr "Löö mängija välja" - -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 #, fuzzy msgid "Click to change difficulty" msgstr "Vajuta, et Salasõna sisestada" -#: src/multiint.cpp:2130 +#: src/multiint.cpp:2126 msgid "Click when ready" msgstr "Vajuta kui valmis" -#: src/multiint.cpp:2134 +#: src/multiint.cpp:2130 msgid "READY?" msgstr "VALMIS?" -#: src/multiint.cpp:2178 +#: src/multiint.cpp:2174 msgid "PLAYERS" msgstr "MÄNGIJAD" -#: src/multiint.cpp:2213 +#: src/multiint.cpp:2209 #, fuzzy msgid "Click to change to this slot" msgstr "Vajuta, et Salasõna sisestada" -#: src/multiint.cpp:2241 +#: src/multiint.cpp:2237 #, fuzzy msgid "Choose Team" msgstr "Lukustatud Tiimid" -#: src/multiint.cpp:2271 +#: src/multiint.cpp:2267 #, fuzzy msgid "Click to change player colour" msgstr "Radar showing player colours" -#: src/multiint.cpp:2299 +#: src/multiint.cpp:2295 #, fuzzy msgid "Click to change player position" msgstr "Kaitse Positsiooni" -#: src/multiint.cpp:2305 +#: src/multiint.cpp:2301 #, fuzzy msgid "Click to change AI" msgstr "Vajuta, et Salasõna sisestada" -#: src/multiint.cpp:2309 +#: src/multiint.cpp:2305 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2371 +#: src/multiint.cpp:2367 msgid "CHAT" msgstr "VESTLUS" -#: src/multiint.cpp:2403 +#: src/multiint.cpp:2399 msgid "All players need to have the same mods to join your game." msgstr "Kõigil mängijatel peab olema sama mod, et sinu mänguga liituda" -#: src/multiint.cpp:2561 +#: src/multiint.cpp:2557 #, fuzzy, c-format msgid "*** password [%s] is now required! ***" msgstr "*** salasõna on vajalik! ***" -#: src/multiint.cpp:2569 +#: src/multiint.cpp:2565 msgid "*** password is NOT required! ***" msgstr "*** salasõna pole vaja! ***" -#: src/multiint.cpp:2810 +#: src/multiint.cpp:2806 msgid "Sorry! Failed to host the game." msgstr "Kahju! Ebaõnnestusid mängu võõrustamisel." -#: src/multiint.cpp:2931 +#: src/multiint.cpp:2927 msgid "'Locked Teams' mode enabled" msgstr "Lukustatud Tiimid, mode lubatud" -#: src/multiint.cpp:3012 +#: src/multiint.cpp:3008 #, c-format msgid "The host has kicked %s from the game!" msgstr "Võõrustaja lõi %s mängust välja!" -#: src/multiint.cpp:3082 +#: src/multiint.cpp:3078 msgid "Host is Starting Game" msgstr "Võõrustaja Alustab Mängu" -#: src/multiint.cpp:3648 +#: src/multiint.cpp:3644 msgid "Players" msgstr "Mängijad" -#: src/multiint.cpp:3786 +#: src/multiint.cpp:3782 #, c-format msgid "Sending Map: %d%% " msgstr "Kaarti Saatmine: %d%%" -#: src/multiint.cpp:3794 +#: src/multiint.cpp:3790 #, c-format msgid "Map: %d%% downloaded" msgstr "Kaart: %d%% allalaaditud" -#: src/multiint.cpp:3820 +#: src/multiint.cpp:3816 msgid "HOST" msgstr "VÕÕRUSTJA" -#: src/multiint.cpp:3827 +#: src/multiint.cpp:3823 #: src/multimenu.cpp:772 msgid "Ping" msgstr "Ping" @@ -14606,79 +14602,79 @@ msgstr "Anna Mängijale Energiat" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "Mängija %s väljalöömine, sest ta proovis infokontrollist mõõda pääseda!" -#: src/multiplay.cpp:1057 +#: src/multiplay.cpp:1056 msgid "(allies" msgstr "(Liitlased" -#: src/multiplay.cpp:1065 +#: src/multiplay.cpp:1064 msgid "(private to " msgstr "(eraviisiline" -#: src/multiplay.cpp:1078 +#: src/multiplay.cpp:1077 msgid "[invalid]" msgstr "[kehtetu]" -#: src/multiplay.cpp:1942 +#: src/multiplay.cpp:1941 msgid "Green" msgstr "Roheline" -#: src/multiplay.cpp:1943 +#: src/multiplay.cpp:1942 msgid "Orange" msgstr "Oranð" -#: src/multiplay.cpp:1944 +#: src/multiplay.cpp:1943 msgid "Grey" msgstr "Hall" -#: src/multiplay.cpp:1945 +#: src/multiplay.cpp:1944 msgid "Black" msgstr "Must" -#: src/multiplay.cpp:1946 +#: src/multiplay.cpp:1945 msgid "Red" msgstr "Punane" -#: src/multiplay.cpp:1947 +#: src/multiplay.cpp:1946 msgid "Blue" msgstr "Sinine" -#: src/multiplay.cpp:1948 +#: src/multiplay.cpp:1947 msgid "Pink" msgstr "Roosa" -#: src/multiplay.cpp:1949 +#: src/multiplay.cpp:1948 msgid "Cyan" msgstr "Helesinine" -#: src/multiplay.cpp:1950 +#: src/multiplay.cpp:1949 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:1951 +#: src/multiplay.cpp:1950 msgid "Purple" msgstr "" -#: src/multiplay.cpp:1952 +#: src/multiplay.cpp:1951 msgid "White" msgstr "" -#: src/multiplay.cpp:1953 +#: src/multiplay.cpp:1952 msgid "Bright blue" msgstr "" -#: src/multiplay.cpp:1954 +#: src/multiplay.cpp:1953 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:1955 +#: src/multiplay.cpp:1954 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:1956 +#: src/multiplay.cpp:1955 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:1957 +#: src/multiplay.cpp:1956 msgid "Brown" msgstr "" @@ -14686,16 +14682,16 @@ msgstr "" msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "" -#: src/research.cpp:1737 +#: src/research.cpp:1739 #, c-format msgid "Research completed: %s" msgstr "Uurimine Lõpetatud: %s" -#: src/research.cpp:1742 +#: src/research.cpp:1744 msgid "Research Completed" msgstr "Uurimine Lõpetatud" -#: src/research.cpp:2563 +#: src/research.cpp:2565 msgid "Research Award" msgstr "Uurimise Auhind" @@ -14859,63 +14855,63 @@ msgstr "Võimetu leidma Sensorüksusi!" msgid "Unable to locate any Commanders!" msgstr "Võimetu leidma Komandöre!" -#: src/structure.cpp:2614 +#: src/structure.cpp:2650 #, fuzzy msgid "Command Control Limit Reached - Production Halted" msgstr "Kontroll Limiit Saavutatud - Tootmine Peatatud" -#: src/structure.cpp:5806 -#: src/structure.cpp:5831 +#: src/structure.cpp:5888 +#: src/structure.cpp:5913 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" msgstr[0] "%s - %u Üksus määratud" msgstr[1] "%s - %u Üksused määratud" -#: src/structure.cpp:5836 -#: src/structure.cpp:5904 -#: src/structure.cpp:5920 -#: src/structure.cpp:5934 +#: src/structure.cpp:5918 +#: src/structure.cpp:5986 +#: src/structure.cpp:6002 +#: src/structure.cpp:6016 #, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - Kahju %3.0f%%" -#: src/structure.cpp:5886 +#: src/structure.cpp:5968 #, c-format msgid "%s - Connected %u of %u" msgstr "%s - %u Ühendatud %u -st" -#: src/structure.cpp:6050 -#: src/structure.cpp:6095 +#: src/structure.cpp:6132 +#: src/structure.cpp:6177 #, c-format msgid "%s - Electronically Damaged" msgstr "%s - Elektrooniliselt Kahjustatud" -#: src/structure.cpp:6332 +#: src/structure.cpp:6414 msgid "Electronic Reward - Visibility Report" msgstr "Elektrooniline Autasu - Nägemis Raport" -#: src/structure.cpp:6372 +#: src/structure.cpp:6454 msgid "Factory Reward - Propulsion" msgstr "Tehase Auhind - Liikumissüsteem" -#: src/structure.cpp:6396 +#: src/structure.cpp:6478 msgid "Factory Reward - Body" msgstr "Tehase Autasu - Kere" -#: src/structure.cpp:6420 +#: src/structure.cpp:6502 msgid "Factory Reward - Weapon" msgstr "Tehase Autasu - Relv" -#: src/structure.cpp:6429 +#: src/structure.cpp:6511 msgid "Factory Reward - Nothing" msgstr "Tehase Autasu - Midagi" -#: src/structure.cpp:6457 +#: src/structure.cpp:6539 msgid "Repair Facility Award - Repair" msgstr "Remontimiskeskuse Autasu - Remont" -#: src/structure.cpp:6464 +#: src/structure.cpp:6546 msgid "Repair Facility Award - Nothing" msgstr "Remontimiskeskuse Autasu - Midagi" @@ -14932,34 +14928,35 @@ msgstr "" msgid "Reinforcements landing" msgstr "Abiväed Maanduvad" -#: src/version.cpp:143 -msgid " (modified and switched locally)" -msgstr " (Muudetud ja vahetatud kohalikult)" - -#: src/version.cpp:145 +#: src/version.cpp:129 msgid " (modified locally)" msgstr " (muudetud kohalikult)" -#: src/version.cpp:147 -msgid " (switched locally)" -msgstr " (vahetatud kohalikult)" - -#: src/version.cpp:154 +#: src/version.cpp:136 msgid " - DEBUG" msgstr " - DEBUG" -#: src/version.cpp:163 +#: src/version.cpp:145 #, c-format msgid " - Built %s" msgstr " - Built %s" #. TRANSLATORS: This string looks as follows when expanded. #. "Version " -#: src/version.cpp:173 +#: src/version.cpp:155 #, c-format msgid "Version %s%s%s%s" msgstr "Versioon %s%s%s%s" +#~ msgid "Kick player" +#~ msgstr "Löö mängija välja" + +#~ msgid " (modified and switched locally)" +#~ msgstr " (Muudetud ja vahetatud kohalikult)" + +#~ msgid " (switched locally)" +#~ msgstr " (vahetatud kohalikult)" + #, fuzzy #~ msgid "Infinite Production" #~ msgstr "Tsükkel tootmine" diff --git a/po/fi.po b/po/fi.po index dea342207..5d3ee4400 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-02-25 23:35+0100\n" +"POT-Creation-Date: 2011-03-08 15:43+0100\n" "PO-Revision-Date: 2008-05-09 10:33+0000\n" "Last-Translator: Lartza \n" "Language-Team: Finnish \n" @@ -12015,26 +12015,26 @@ msgid "System locale" msgstr "" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1042 +#: lib/netplay/netplay.cpp:1037 msgid "Enter password here" msgstr "" -#: lib/netplay/netplay.cpp:2060 +#: lib/netplay/netplay.cpp:2055 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "" -#: lib/netplay/netplay.cpp:2082 +#: lib/netplay/netplay.cpp:2077 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "" #: src/challenge.cpp:184 #: src/hci.cpp:916 -#: src/hci.cpp:3378 -#: src/hci.cpp:3501 -#: src/hci.cpp:3912 -#: src/hci.cpp:4930 +#: src/hci.cpp:3386 +#: src/hci.cpp:3509 +#: src/hci.cpp:3920 +#: src/hci.cpp:4938 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12345,7 +12345,7 @@ msgid "Player dropped" msgstr "Pelaaja" #: src/display3d.cpp:599 -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2121 msgid "Waiting for other players" msgstr "" @@ -12358,7 +12358,7 @@ msgid "Cannot Build. Oil Resource Burning." msgstr "" #: src/display.cpp:1828 -#: src/display.cpp:2421 +#: src/display.cpp:2420 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - Vahinko %d%% - Kokemus %d, %s" @@ -12389,80 +12389,80 @@ msgstr "" msgid "Structure Restored" msgstr "" -#: src/droid.cpp:2732 +#: src/droid.cpp:2734 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:2745 +#: src/droid.cpp:2747 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:2758 +#: src/droid.cpp:2760 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:2762 +#: src/droid.cpp:2764 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:3093 +#: src/droid.cpp:3095 msgid "Rookie" msgstr "" -#: src/droid.cpp:3094 +#: src/droid.cpp:3096 msgctxt "rank" msgid "Green" msgstr "" -#: src/droid.cpp:3095 +#: src/droid.cpp:3097 msgid "Trained" msgstr "" -#: src/droid.cpp:3096 +#: src/droid.cpp:3098 msgid "Regular" msgstr "" -#: src/droid.cpp:3097 +#: src/droid.cpp:3099 #, fuzzy msgid "Professional" msgstr "Ammattilainen" -#: src/droid.cpp:3098 +#: src/droid.cpp:3100 #, fuzzy msgid "Veteran" msgstr "Veteraani" -#: src/droid.cpp:3099 +#: src/droid.cpp:3101 #, fuzzy msgid "Elite" msgstr "Eliitti" -#: src/droid.cpp:3100 +#: src/droid.cpp:3102 msgid "Special" msgstr "" -#: src/droid.cpp:3101 +#: src/droid.cpp:3103 msgid "Hero" msgstr "Sankari" -#: src/droid.cpp:4123 +#: src/droid.cpp:4125 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "" -#: src/droid.cpp:4127 +#: src/droid.cpp:4129 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "" @@ -12483,7 +12483,7 @@ msgid "Tutorial" msgstr "" #: src/frontend.cpp:100 -#: src/hci.cpp:3487 +#: src/hci.cpp:3495 msgid "Options" msgstr "Asetukset" @@ -12544,8 +12544,8 @@ msgstr "YKSINPELI" #: src/frontend.cpp:303 #: src/ingameop.cpp:494 -#: src/mission.cpp:2493 -#: src/mission.cpp:2596 +#: src/mission.cpp:2537 +#: src/mission.cpp:2640 msgid "Load Saved Game" msgstr "Lataa tallennettu peli" @@ -12836,7 +12836,7 @@ msgid "GAME OPTIONS" msgstr "PELIASETUKSET" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2398 +#: src/multiint.cpp:2394 msgid "Mod: " msgstr "" @@ -12846,8 +12846,8 @@ msgid "MAP SAVED!" msgstr "Peli tallennettu" #: src/hci.cpp:1573 -#: src/loop.cpp:558 -#: src/loop.cpp:574 +#: src/loop.cpp:561 +#: src/loop.cpp:577 #, fuzzy msgid "GAME SAVED: " msgstr "Peli tallennettu" @@ -12876,157 +12876,157 @@ msgstr "" msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "" -#: src/hci.cpp:3298 +#: src/hci.cpp:3306 msgid "Commanders (F6)" msgstr "Komentajat (F6)" -#: src/hci.cpp:3311 +#: src/hci.cpp:3319 msgid "Intelligence Display (F5)" msgstr "" -#: src/hci.cpp:3324 +#: src/hci.cpp:3332 msgid "Manufacture (F1)" msgstr "Valmista (F1)" -#: src/hci.cpp:3337 +#: src/hci.cpp:3345 msgid "Design (F4)" msgstr "Suunnittele (F4)" -#: src/hci.cpp:3350 +#: src/hci.cpp:3358 msgid "Research (F2)" msgstr "Tutki (F2)" -#: src/hci.cpp:3363 +#: src/hci.cpp:3371 msgid "Build (F3)" msgstr "Rakenna (F3)" -#: src/hci.cpp:3434 +#: src/hci.cpp:3442 #: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "" -#: src/hci.cpp:3525 +#: src/hci.cpp:3533 msgid "Map:" msgstr "" -#: src/hci.cpp:3538 +#: src/hci.cpp:3546 #, fuzzy msgid "Load" msgstr "Lataa peli" -#: src/hci.cpp:3539 +#: src/hci.cpp:3547 #, fuzzy msgid "Load Map File" msgstr "Lataa peli" -#: src/hci.cpp:3546 +#: src/hci.cpp:3554 #, fuzzy msgid "Save" msgstr "Tallenna peli" -#: src/hci.cpp:3547 +#: src/hci.cpp:3555 #, fuzzy msgid "Save Map File" msgstr "Tallenna peli" -#: src/hci.cpp:3555 +#: src/hci.cpp:3563 msgid "New" msgstr "" -#: src/hci.cpp:3556 +#: src/hci.cpp:3564 msgid "New Blank Map" msgstr "" -#: src/hci.cpp:3592 +#: src/hci.cpp:3600 msgid "Tile" msgstr "" -#: src/hci.cpp:3593 +#: src/hci.cpp:3601 msgid "Place tiles on map" msgstr "" -#: src/hci.cpp:3602 +#: src/hci.cpp:3610 #, fuzzy msgid "Unit" msgstr "Yksikkö" -#: src/hci.cpp:3603 +#: src/hci.cpp:3611 msgid "Place Unit on map" msgstr "" -#: src/hci.cpp:3611 +#: src/hci.cpp:3619 msgid "Struct" msgstr "" -#: src/hci.cpp:3612 +#: src/hci.cpp:3620 #, fuzzy msgid "Place Structures on map" msgstr "Vihollisrakennukset: %u" -#: src/hci.cpp:3620 +#: src/hci.cpp:3628 msgid "Feat" msgstr "" -#: src/hci.cpp:3621 +#: src/hci.cpp:3629 msgid "Place Features on map" msgstr "" -#: src/hci.cpp:3631 +#: src/hci.cpp:3639 msgid "Pause" msgstr "" -#: src/hci.cpp:3632 +#: src/hci.cpp:3640 msgid "Pause or unpause the game" msgstr "" -#: src/hci.cpp:3646 +#: src/hci.cpp:3654 msgid "Align height of all map objects" msgstr "" -#: src/hci.cpp:3656 +#: src/hci.cpp:3664 msgid "Edit" msgstr "" -#: src/hci.cpp:3657 +#: src/hci.cpp:3665 #, fuzzy msgid "Start Edit Mode" msgstr "Aloita ilman tukikohtaa" -#: src/hci.cpp:3671 +#: src/hci.cpp:3679 #: src/ingameop.cpp:112 #: src/ingameop.cpp:256 #: src/ingameop.cpp:260 msgid "Quit" msgstr "Lopeta" -#: src/hci.cpp:3672 +#: src/hci.cpp:3680 msgid "Exit Game" msgstr "Poistu pelistä" -#: src/hci.cpp:3698 +#: src/hci.cpp:3706 #, fuzzy msgid "Current Player:" msgstr "Moninpelikampanja" -#: src/hci.cpp:3989 +#: src/hci.cpp:3997 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "Edistymispalkki" -#: src/hci.cpp:4855 +#: src/hci.cpp:4863 msgid "Factory Delivery Point" msgstr "" -#: src/hci.cpp:4873 +#: src/hci.cpp:4881 msgid "Loop Production" msgstr "Jatkuva tuotanto" -#: src/hci.cpp:4953 +#: src/hci.cpp:4961 msgid "Tab Scroll left" msgstr "" -#: src/hci.cpp:4968 +#: src/hci.cpp:4976 msgid "Tab Scroll right" msgstr "" @@ -13052,8 +13052,8 @@ msgstr "" #: src/ingameop.cpp:274 #: src/ingameop.cpp:498 -#: src/mission.cpp:2480 -#: src/mission.cpp:2599 +#: src/mission.cpp:2524 +#: src/mission.cpp:2643 msgid "Save Game" msgstr "Tallenna peli" @@ -13981,43 +13981,43 @@ msgstr "" msgid "Toggle Driving Mode" msgstr "" -#: src/loop.cpp:565 -#: src/loop.cpp:581 +#: src/loop.cpp:568 +#: src/loop.cpp:584 #, fuzzy msgid "Could not save game!" msgstr "Lataa tallennettu peli" -#: src/mission.cpp:2041 +#: src/mission.cpp:2085 msgid "Load Transport" msgstr "Lastaa kuljetus" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED" msgstr "" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED--and you cheated!" msgstr "" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED" msgstr "" -#: src/mission.cpp:2459 -#: src/mission.cpp:2499 -#: src/mission.cpp:2613 +#: src/mission.cpp:2503 +#: src/mission.cpp:2543 +#: src/mission.cpp:2657 msgid "Quit To Main Menu" msgstr "Poistu päävalikkoon" -#: src/mission.cpp:2467 +#: src/mission.cpp:2511 msgid "Continue Game" msgstr "Jatka peliä" -#: src/mission.cpp:2564 +#: src/mission.cpp:2608 #, fuzzy msgid "GAME SAVED :" msgstr "Peli tallennettu" @@ -14311,115 +14311,110 @@ msgstr "" msgid "Player colour" msgstr "Pelaaja" -#: src/multiint.cpp:2071 +#: src/multiint.cpp:2068 msgid "Team" msgstr "" -#: src/multiint.cpp:2083 -#, fuzzy -msgid "Kick player" -msgstr "Moninpelikampanja" - -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 #, fuzzy msgid "Click to change difficulty" msgstr "Pelaaja" -#: src/multiint.cpp:2130 +#: src/multiint.cpp:2126 msgid "Click when ready" msgstr "" -#: src/multiint.cpp:2134 +#: src/multiint.cpp:2130 msgid "READY?" msgstr "" -#: src/multiint.cpp:2178 +#: src/multiint.cpp:2174 msgid "PLAYERS" msgstr "PELAAJAT" -#: src/multiint.cpp:2213 +#: src/multiint.cpp:2209 msgid "Click to change to this slot" msgstr "" -#: src/multiint.cpp:2241 +#: src/multiint.cpp:2237 msgid "Choose Team" msgstr "" -#: src/multiint.cpp:2271 +#: src/multiint.cpp:2267 msgid "Click to change player colour" msgstr "" -#: src/multiint.cpp:2299 +#: src/multiint.cpp:2295 #, fuzzy msgid "Click to change player position" msgstr "Pelaaja" -#: src/multiint.cpp:2305 +#: src/multiint.cpp:2301 #, fuzzy msgid "Click to change AI" msgstr "Pelaaja" -#: src/multiint.cpp:2309 +#: src/multiint.cpp:2305 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2371 +#: src/multiint.cpp:2367 msgid "CHAT" msgstr "" -#: src/multiint.cpp:2403 +#: src/multiint.cpp:2399 msgid "All players need to have the same mods to join your game." msgstr "" -#: src/multiint.cpp:2561 +#: src/multiint.cpp:2557 #, c-format msgid "*** password [%s] is now required! ***" msgstr "" -#: src/multiint.cpp:2569 +#: src/multiint.cpp:2565 msgid "*** password is NOT required! ***" msgstr "" -#: src/multiint.cpp:2810 +#: src/multiint.cpp:2806 msgid "Sorry! Failed to host the game." msgstr "" -#: src/multiint.cpp:2931 +#: src/multiint.cpp:2927 msgid "'Locked Teams' mode enabled" msgstr "" -#: src/multiint.cpp:3012 +#: src/multiint.cpp:3008 #, c-format msgid "The host has kicked %s from the game!" msgstr "" -#: src/multiint.cpp:3082 +#: src/multiint.cpp:3078 msgid "Host is Starting Game" msgstr "" -#: src/multiint.cpp:3648 +#: src/multiint.cpp:3644 msgid "Players" msgstr "Pelaajat" -#: src/multiint.cpp:3786 +#: src/multiint.cpp:3782 #, c-format msgid "Sending Map: %d%% " msgstr "" -#: src/multiint.cpp:3794 +#: src/multiint.cpp:3790 #, c-format msgid "Map: %d%% downloaded" msgstr "" -#: src/multiint.cpp:3820 +#: src/multiint.cpp:3816 msgid "HOST" msgstr "" -#: src/multiint.cpp:3827 +#: src/multiint.cpp:3823 #: src/multimenu.cpp:772 msgid "Ping" msgstr "" @@ -14596,80 +14591,80 @@ msgstr "" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "" -#: src/multiplay.cpp:1057 +#: src/multiplay.cpp:1056 #, fuzzy msgid "(allies" msgstr "Liittoumat" -#: src/multiplay.cpp:1065 +#: src/multiplay.cpp:1064 msgid "(private to " msgstr "" -#: src/multiplay.cpp:1078 +#: src/multiplay.cpp:1077 msgid "[invalid]" msgstr "" -#: src/multiplay.cpp:1942 +#: src/multiplay.cpp:1941 msgid "Green" msgstr "Vihreä" -#: src/multiplay.cpp:1943 +#: src/multiplay.cpp:1942 msgid "Orange" msgstr "Oranssi" -#: src/multiplay.cpp:1944 +#: src/multiplay.cpp:1943 msgid "Grey" msgstr "Harmaa" -#: src/multiplay.cpp:1945 +#: src/multiplay.cpp:1944 msgid "Black" msgstr "Musta" -#: src/multiplay.cpp:1946 +#: src/multiplay.cpp:1945 msgid "Red" msgstr "Punainen" -#: src/multiplay.cpp:1947 +#: src/multiplay.cpp:1946 msgid "Blue" msgstr "Sininen" -#: src/multiplay.cpp:1948 +#: src/multiplay.cpp:1947 msgid "Pink" msgstr "Pinkki" -#: src/multiplay.cpp:1949 +#: src/multiplay.cpp:1948 msgid "Cyan" msgstr "Syaani" -#: src/multiplay.cpp:1950 +#: src/multiplay.cpp:1949 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:1951 +#: src/multiplay.cpp:1950 msgid "Purple" msgstr "" -#: src/multiplay.cpp:1952 +#: src/multiplay.cpp:1951 msgid "White" msgstr "" -#: src/multiplay.cpp:1953 +#: src/multiplay.cpp:1952 msgid "Bright blue" msgstr "" -#: src/multiplay.cpp:1954 +#: src/multiplay.cpp:1953 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:1955 +#: src/multiplay.cpp:1954 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:1956 +#: src/multiplay.cpp:1955 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:1957 +#: src/multiplay.cpp:1956 msgid "Brown" msgstr "" @@ -14677,16 +14672,16 @@ msgstr "" msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "" -#: src/research.cpp:1737 +#: src/research.cpp:1739 #, c-format msgid "Research completed: %s" msgstr "" -#: src/research.cpp:1742 +#: src/research.cpp:1744 msgid "Research Completed" msgstr "" -#: src/research.cpp:2563 +#: src/research.cpp:2565 msgid "Research Award" msgstr "" @@ -14850,62 +14845,62 @@ msgstr "" msgid "Unable to locate any Commanders!" msgstr "" -#: src/structure.cpp:2614 +#: src/structure.cpp:2650 msgid "Command Control Limit Reached - Production Halted" msgstr "" -#: src/structure.cpp:5806 -#: src/structure.cpp:5831 +#: src/structure.cpp:5888 +#: src/structure.cpp:5913 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" msgstr[0] "" msgstr[1] "" -#: src/structure.cpp:5836 -#: src/structure.cpp:5904 -#: src/structure.cpp:5920 -#: src/structure.cpp:5934 +#: src/structure.cpp:5918 +#: src/structure.cpp:5986 +#: src/structure.cpp:6002 +#: src/structure.cpp:6016 #, c-format msgid "%s - Damage %3.0f%%" msgstr "" -#: src/structure.cpp:5886 +#: src/structure.cpp:5968 #, c-format msgid "%s - Connected %u of %u" msgstr "" -#: src/structure.cpp:6050 -#: src/structure.cpp:6095 +#: src/structure.cpp:6132 +#: src/structure.cpp:6177 #, c-format msgid "%s - Electronically Damaged" msgstr "" -#: src/structure.cpp:6332 +#: src/structure.cpp:6414 msgid "Electronic Reward - Visibility Report" msgstr "" -#: src/structure.cpp:6372 +#: src/structure.cpp:6454 msgid "Factory Reward - Propulsion" msgstr "" -#: src/structure.cpp:6396 +#: src/structure.cpp:6478 msgid "Factory Reward - Body" msgstr "" -#: src/structure.cpp:6420 +#: src/structure.cpp:6502 msgid "Factory Reward - Weapon" msgstr "" -#: src/structure.cpp:6429 +#: src/structure.cpp:6511 msgid "Factory Reward - Nothing" msgstr "" -#: src/structure.cpp:6457 +#: src/structure.cpp:6539 msgid "Repair Facility Award - Repair" msgstr "" -#: src/structure.cpp:6464 +#: src/structure.cpp:6546 msgid "Repair Facility Award - Nothing" msgstr "" @@ -14922,34 +14917,30 @@ msgstr "" msgid "Reinforcements landing" msgstr "Lisäjoukot laskeutuvat" -#: src/version.cpp:143 -msgid " (modified and switched locally)" -msgstr "" - -#: src/version.cpp:145 +#: src/version.cpp:129 msgid " (modified locally)" msgstr "" -#: src/version.cpp:147 -msgid " (switched locally)" -msgstr "" - -#: src/version.cpp:154 +#: src/version.cpp:136 msgid " - DEBUG" msgstr "" -#: src/version.cpp:163 +#: src/version.cpp:145 #, c-format msgid " - Built %s" msgstr "" #. TRANSLATORS: This string looks as follows when expanded. #. "Version " -#: src/version.cpp:173 +#: src/version.cpp:155 #, c-format msgid "Version %s%s%s%s" msgstr "" +#, fuzzy +#~ msgid "Kick player" +#~ msgstr "Moninpelikampanja" + #, fuzzy #~ msgid "Infinite Production" #~ msgstr "Jatkuva tuotanto" diff --git a/po/fr.po b/po/fr.po index 7258178ad..0b98859e6 100644 --- a/po/fr.po +++ b/po/fr.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-02-25 23:35+0100\n" +"POT-Creation-Date: 2011-03-08 15:43+0100\n" "PO-Revision-Date: 2010-04-21 08:32-0500\n" "Last-Translator: Gilles J. Séguin \n" "Language-Team: French \n" @@ -12128,27 +12128,27 @@ msgid "System locale" msgstr "Langage du système" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1042 +#: lib/netplay/netplay.cpp:1037 #, fuzzy msgid "Enter password here" msgstr "Entrez le mot de passe " -#: lib/netplay/netplay.cpp:2060 +#: lib/netplay/netplay.cpp:2055 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "Impossible de résourdre le DNS du serveur maître (%s) !" -#: lib/netplay/netplay.cpp:2082 +#: lib/netplay/netplay.cpp:2077 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "Impossible de communiquer avec le serveur maître ! Le port TCP %u est-il ouvert en sortie ?" #: src/challenge.cpp:184 #: src/hci.cpp:916 -#: src/hci.cpp:3378 -#: src/hci.cpp:3501 -#: src/hci.cpp:3912 -#: src/hci.cpp:4930 +#: src/hci.cpp:3386 +#: src/hci.cpp:3509 +#: src/hci.cpp:3920 +#: src/hci.cpp:4938 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12455,7 +12455,7 @@ msgid "Player dropped" msgstr "Joueur échapper" #: src/display3d.cpp:599 -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2121 msgid "Waiting for other players" msgstr "Attente des autres joueurs" @@ -12468,7 +12468,7 @@ msgid "Cannot Build. Oil Resource Burning." msgstr "Construction Impossible. Le Gisement de Pétrole est en Feu." #: src/display.cpp:1828 -#: src/display.cpp:2421 +#: src/display.cpp:2420 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - Endommagé à %d%% - Expérience %d, %s" @@ -12500,77 +12500,77 @@ msgstr "Unité Perdue !" msgid "Structure Restored" msgstr "Structure Restaurée" -#: src/droid.cpp:2732 +#: src/droid.cpp:2734 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" msgstr[0] "Groupe %u selectioné - %u Unité" msgstr[1] "Groupe %u selectioné - %u Unités" -#: src/droid.cpp:2745 +#: src/droid.cpp:2747 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" msgstr[0] "%u unité assignée au groupe %u" msgstr[1] "%u unités assignées au groupe %u" -#: src/droid.cpp:2758 +#: src/droid.cpp:2760 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" msgstr[0] "Caméra centrée sur le groupe %u - %u Unité" msgstr[1] "Caméra centrée sur le groupe %u - %u Unités" -#: src/droid.cpp:2762 +#: src/droid.cpp:2764 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" msgstr[0] "Alignement avec le groupe %u - %u Unité" msgstr[1] "Alignement avec le groupe %u - %u Unités" -#: src/droid.cpp:3093 +#: src/droid.cpp:3095 msgid "Rookie" msgstr "Débutant" -#: src/droid.cpp:3094 +#: src/droid.cpp:3096 msgctxt "rank" msgid "Green" msgstr "Deuxième Classe" -#: src/droid.cpp:3095 +#: src/droid.cpp:3097 msgid "Trained" msgstr "Aspirant" -#: src/droid.cpp:3096 +#: src/droid.cpp:3098 msgid "Regular" msgstr "Normal" -#: src/droid.cpp:3097 +#: src/droid.cpp:3099 msgid "Professional" msgstr "Professionnel" -#: src/droid.cpp:3098 +#: src/droid.cpp:3100 msgid "Veteran" msgstr "Vétéran" -#: src/droid.cpp:3099 +#: src/droid.cpp:3101 msgid "Elite" msgstr "Élite" -#: src/droid.cpp:3100 +#: src/droid.cpp:3102 msgid "Special" msgstr "Spécial" -#: src/droid.cpp:3101 +#: src/droid.cpp:3103 msgid "Hero" msgstr "Héros" -#: src/droid.cpp:4123 +#: src/droid.cpp:4125 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "" -#: src/droid.cpp:4127 +#: src/droid.cpp:4129 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "" @@ -12589,7 +12589,7 @@ msgid "Tutorial" msgstr "Tutoriel" #: src/frontend.cpp:100 -#: src/hci.cpp:3487 +#: src/hci.cpp:3495 msgid "Options" msgstr "Options" @@ -12650,8 +12650,8 @@ msgstr "UN JOUEUR" #: src/frontend.cpp:303 #: src/ingameop.cpp:494 -#: src/mission.cpp:2493 -#: src/mission.cpp:2596 +#: src/mission.cpp:2537 +#: src/mission.cpp:2640 msgid "Load Saved Game" msgstr "Charger une partie Enregistrée" @@ -12939,7 +12939,7 @@ msgid "GAME OPTIONS" msgstr "OPTIONS" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2398 +#: src/multiint.cpp:2394 msgid "Mod: " msgstr "Mod: " @@ -12948,8 +12948,8 @@ msgid "MAP SAVED!" msgstr "Carte SAUVEGARDÉE!" #: src/hci.cpp:1573 -#: src/loop.cpp:558 -#: src/loop.cpp:574 +#: src/loop.cpp:561 +#: src/loop.cpp:577 #, fuzzy msgid "GAME SAVED: " msgstr "PARTIE SAUVEGARDÉE!" @@ -12978,155 +12978,155 @@ msgstr "Le joueur %u Triche (Il se sert du debug menu pour se faire une nouvelle msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "Le joueur %u Triche (Il se sert du debug menu pour se faire une nouvelle unitée: %s.)" -#: src/hci.cpp:3298 +#: src/hci.cpp:3306 msgid "Commanders (F6)" msgstr "Commandants (F6)" -#: src/hci.cpp:3311 +#: src/hci.cpp:3319 msgid "Intelligence Display (F5)" msgstr "Panneau d'Informations (F5)" -#: src/hci.cpp:3324 +#: src/hci.cpp:3332 msgid "Manufacture (F1)" msgstr "Assemblage (F1)" -#: src/hci.cpp:3337 +#: src/hci.cpp:3345 msgid "Design (F4)" msgstr "Conception (F4)" -#: src/hci.cpp:3350 +#: src/hci.cpp:3358 msgid "Research (F2)" msgstr "Recherche (F2)" -#: src/hci.cpp:3363 +#: src/hci.cpp:3371 msgid "Build (F3)" msgstr "Construction (F3)" -#: src/hci.cpp:3434 +#: src/hci.cpp:3442 #: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Énergie" -#: src/hci.cpp:3525 +#: src/hci.cpp:3533 msgid "Map:" msgstr "" -#: src/hci.cpp:3538 +#: src/hci.cpp:3546 #, fuzzy msgid "Load" msgstr "Charger une Partie" -#: src/hci.cpp:3539 +#: src/hci.cpp:3547 #, fuzzy msgid "Load Map File" msgstr "Charger une Partie" -#: src/hci.cpp:3546 +#: src/hci.cpp:3554 #, fuzzy msgid "Save" msgstr "Sauvegarder" -#: src/hci.cpp:3547 +#: src/hci.cpp:3555 #, fuzzy msgid "Save Map File" msgstr "Sauvegarder" -#: src/hci.cpp:3555 +#: src/hci.cpp:3563 msgid "New" msgstr "" -#: src/hci.cpp:3556 +#: src/hci.cpp:3564 msgid "New Blank Map" msgstr "" -#: src/hci.cpp:3592 +#: src/hci.cpp:3600 msgid "Tile" msgstr "Tuile" -#: src/hci.cpp:3593 +#: src/hci.cpp:3601 msgid "Place tiles on map" msgstr "Placer des tuiles sur la carte" -#: src/hci.cpp:3602 +#: src/hci.cpp:3610 msgid "Unit" msgstr "Unité" -#: src/hci.cpp:3603 +#: src/hci.cpp:3611 msgid "Place Unit on map" msgstr "Placer des Unités sur la carte" -#: src/hci.cpp:3611 +#: src/hci.cpp:3619 msgid "Struct" msgstr "Structure" -#: src/hci.cpp:3612 +#: src/hci.cpp:3620 msgid "Place Structures on map" msgstr "Placer des Bâtiments sur la carte" -#: src/hci.cpp:3620 +#: src/hci.cpp:3628 msgid "Feat" msgstr "Fonction" -#: src/hci.cpp:3621 +#: src/hci.cpp:3629 msgid "Place Features on map" msgstr "Placer les éléments sur la carte" -#: src/hci.cpp:3631 +#: src/hci.cpp:3639 msgid "Pause" msgstr "Pause" -#: src/hci.cpp:3632 +#: src/hci.cpp:3640 msgid "Pause or unpause the game" msgstr "Mettre en pause ou enlever la pause" -#: src/hci.cpp:3646 +#: src/hci.cpp:3654 msgid "Align height of all map objects" msgstr "Align height of all map objects" -#: src/hci.cpp:3656 +#: src/hci.cpp:3664 msgid "Edit" msgstr "Édit" -#: src/hci.cpp:3657 +#: src/hci.cpp:3665 #, fuzzy msgid "Start Edit Mode" msgstr "Commencer sans Base" -#: src/hci.cpp:3671 +#: src/hci.cpp:3679 #: src/ingameop.cpp:112 #: src/ingameop.cpp:256 #: src/ingameop.cpp:260 msgid "Quit" msgstr "Quitter" -#: src/hci.cpp:3672 +#: src/hci.cpp:3680 msgid "Exit Game" msgstr "Quitter" -#: src/hci.cpp:3698 +#: src/hci.cpp:3706 #, fuzzy msgid "Current Player:" msgstr "Multi-joueurs" -#: src/hci.cpp:3989 +#: src/hci.cpp:3997 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "Barre de Progression" -#: src/hci.cpp:4855 +#: src/hci.cpp:4863 msgid "Factory Delivery Point" msgstr "Point de Livraison" -#: src/hci.cpp:4873 +#: src/hci.cpp:4881 msgid "Loop Production" msgstr "Production en boucle" -#: src/hci.cpp:4953 +#: src/hci.cpp:4961 msgid "Tab Scroll left" msgstr "Défilement à Gauche" -#: src/hci.cpp:4968 +#: src/hci.cpp:4976 msgid "Tab Scroll right" msgstr "Défilement à droite" @@ -13152,8 +13152,8 @@ msgstr "" #: src/ingameop.cpp:274 #: src/ingameop.cpp:498 -#: src/mission.cpp:2480 -#: src/mission.cpp:2599 +#: src/mission.cpp:2524 +#: src/mission.cpp:2643 msgid "Save Game" msgstr "Sauvegarder" @@ -14110,42 +14110,42 @@ msgstr "" msgid "Toggle Driving Mode" msgstr "Basculer la Caméra Traqueuse" -#: src/loop.cpp:565 -#: src/loop.cpp:581 +#: src/loop.cpp:568 +#: src/loop.cpp:584 msgid "Could not save game!" msgstr "Ne peut sauver une partie!" -#: src/mission.cpp:2041 +#: src/mission.cpp:2085 msgid "Load Transport" msgstr "Charger le Transporteur" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "MISSION ACCOMPLIE en trichant" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED" msgstr "MISSION ACCOMPLIE" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED--and you cheated!" msgstr "ÉCHEC DE LA MISSION--et vous avez triché" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED" msgstr "ÉCHEC DE LA MISSION" -#: src/mission.cpp:2459 -#: src/mission.cpp:2499 -#: src/mission.cpp:2613 +#: src/mission.cpp:2503 +#: src/mission.cpp:2543 +#: src/mission.cpp:2657 msgid "Quit To Main Menu" msgstr "Retour au Menu Principal" -#: src/mission.cpp:2467 +#: src/mission.cpp:2511 msgid "Continue Game" msgstr "Continuer" -#: src/mission.cpp:2564 +#: src/mission.cpp:2608 #, fuzzy msgid "GAME SAVED :" msgstr "PARTIE SAUVEGARDÉE!" @@ -14439,117 +14439,113 @@ msgstr "" msgid "Player colour" msgstr "Couleur du Joueur" -#: src/multiint.cpp:2071 +#: src/multiint.cpp:2068 msgid "Team" msgstr "Équipe" -#: src/multiint.cpp:2083 -msgid "Kick player" -msgstr "chasser le joueur" - -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 #, fuzzy msgid "Click to change difficulty" msgstr "Cliquer pour choisir un mot de passe" -#: src/multiint.cpp:2130 +#: src/multiint.cpp:2126 msgid "Click when ready" msgstr "Cliquer une fois prêt" -#: src/multiint.cpp:2134 +#: src/multiint.cpp:2130 msgid "READY?" msgstr "PRÊT?" -#: src/multiint.cpp:2178 +#: src/multiint.cpp:2174 msgid "PLAYERS" msgstr "JOUEURS" -#: src/multiint.cpp:2213 +#: src/multiint.cpp:2209 #, fuzzy msgid "Click to change to this slot" msgstr "Cliquer pour choisir un mot de passe" -#: src/multiint.cpp:2241 +#: src/multiint.cpp:2237 #, fuzzy msgid "Choose Team" msgstr "Verrouiller les Équipes" -#: src/multiint.cpp:2271 +#: src/multiint.cpp:2267 #, fuzzy msgid "Click to change player colour" msgstr "Radar montrant les couleurs des joueurs" -#: src/multiint.cpp:2299 +#: src/multiint.cpp:2295 #, fuzzy msgid "Click to change player position" msgstr "Défendre sa position" -#: src/multiint.cpp:2305 +#: src/multiint.cpp:2301 #, fuzzy msgid "Click to change AI" msgstr "Cliquer pour choisir un mot de passe" -#: src/multiint.cpp:2309 +#: src/multiint.cpp:2305 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2371 +#: src/multiint.cpp:2367 msgid "CHAT" msgstr "Clavardage" -#: src/multiint.cpp:2403 +#: src/multiint.cpp:2399 msgid "All players need to have the same mods to join your game." msgstr "Tout les joueurs doivent avoir les mêmes mods pour jouer une partie." -#: src/multiint.cpp:2561 +#: src/multiint.cpp:2557 #, fuzzy, c-format msgid "*** password [%s] is now required! ***" msgstr "*** un mot de passe est désormais requis ***" -#: src/multiint.cpp:2569 +#: src/multiint.cpp:2565 msgid "*** password is NOT required! ***" msgstr "*** mot de passe non requis ***" -#: src/multiint.cpp:2810 +#: src/multiint.cpp:2806 msgid "Sorry! Failed to host the game." msgstr "Désolé ! Impossible d'héberger la partie." -#: src/multiint.cpp:2931 +#: src/multiint.cpp:2927 msgid "'Locked Teams' mode enabled" msgstr "Verrouiller les équipes" -#: src/multiint.cpp:3012 +#: src/multiint.cpp:3008 #, c-format msgid "The host has kicked %s from the game!" msgstr "L'hôte a banni %s de la partie" -#: src/multiint.cpp:3082 +#: src/multiint.cpp:3078 msgid "Host is Starting Game" msgstr "L'hôte démarre la partie" -#: src/multiint.cpp:3648 +#: src/multiint.cpp:3644 msgid "Players" msgstr "Joueurs" -#: src/multiint.cpp:3786 +#: src/multiint.cpp:3782 #, c-format msgid "Sending Map: %d%% " msgstr "Carte envoyé: %d%% " -#: src/multiint.cpp:3794 +#: src/multiint.cpp:3790 #, c-format msgid "Map: %d%% downloaded" msgstr "Carte: %d%% téléchargé" -#: src/multiint.cpp:3820 +#: src/multiint.cpp:3816 msgid "HOST" msgstr "HOTE" -#: src/multiint.cpp:3827 +#: src/multiint.cpp:3823 #: src/multimenu.cpp:772 msgid "Ping" msgstr "Ping" @@ -14725,79 +14721,79 @@ msgstr "Donner de l'énergie au Joueur" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "Le joueur %s à été kické car il a essayé de contourner le contrôle d'intégrité des données !" -#: src/multiplay.cpp:1057 +#: src/multiplay.cpp:1056 msgid "(allies" msgstr "( Alliés" -#: src/multiplay.cpp:1065 +#: src/multiplay.cpp:1064 msgid "(private to " msgstr "(privé à " -#: src/multiplay.cpp:1078 +#: src/multiplay.cpp:1077 msgid "[invalid]" msgstr "[invalide]" -#: src/multiplay.cpp:1942 +#: src/multiplay.cpp:1941 msgid "Green" msgstr "Vert" -#: src/multiplay.cpp:1943 +#: src/multiplay.cpp:1942 msgid "Orange" msgstr "Orange" -#: src/multiplay.cpp:1944 +#: src/multiplay.cpp:1943 msgid "Grey" msgstr "Gris" -#: src/multiplay.cpp:1945 +#: src/multiplay.cpp:1944 msgid "Black" msgstr "Noir" -#: src/multiplay.cpp:1946 +#: src/multiplay.cpp:1945 msgid "Red" msgstr "Rouge" -#: src/multiplay.cpp:1947 +#: src/multiplay.cpp:1946 msgid "Blue" msgstr "Bleu" -#: src/multiplay.cpp:1948 +#: src/multiplay.cpp:1947 msgid "Pink" msgstr "Rose" -#: src/multiplay.cpp:1949 +#: src/multiplay.cpp:1948 msgid "Cyan" msgstr "Cyan" -#: src/multiplay.cpp:1950 +#: src/multiplay.cpp:1949 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:1951 +#: src/multiplay.cpp:1950 msgid "Purple" msgstr "" -#: src/multiplay.cpp:1952 +#: src/multiplay.cpp:1951 msgid "White" msgstr "" -#: src/multiplay.cpp:1953 +#: src/multiplay.cpp:1952 msgid "Bright blue" msgstr "" -#: src/multiplay.cpp:1954 +#: src/multiplay.cpp:1953 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:1955 +#: src/multiplay.cpp:1954 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:1956 +#: src/multiplay.cpp:1955 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:1957 +#: src/multiplay.cpp:1956 msgid "Brown" msgstr "" @@ -14805,16 +14801,16 @@ msgstr "" msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "" -#: src/research.cpp:1737 +#: src/research.cpp:1739 #, c-format msgid "Research completed: %s" msgstr "Recherche terminée : %s" -#: src/research.cpp:1742 +#: src/research.cpp:1744 msgid "Research Completed" msgstr "Recherche Terminée" -#: src/research.cpp:2563 +#: src/research.cpp:2565 msgid "Research Award" msgstr "Bourse de recherche" @@ -14978,63 +14974,63 @@ msgstr "Impossible de localiser la moindre unité radar !" msgid "Unable to locate any Commanders!" msgstr "Impossible de localiser le moindre Commandant !" -#: src/structure.cpp:2614 +#: src/structure.cpp:2650 #, fuzzy msgid "Command Control Limit Reached - Production Halted" msgstr "Limite du Control Atteinte - Arrêt de la Production" -#: src/structure.cpp:5806 -#: src/structure.cpp:5831 +#: src/structure.cpp:5888 +#: src/structure.cpp:5913 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" msgstr[0] "%s - %u Unité assignée" msgstr[1] "%s - %u Unités assignées" -#: src/structure.cpp:5836 -#: src/structure.cpp:5904 -#: src/structure.cpp:5920 -#: src/structure.cpp:5934 +#: src/structure.cpp:5918 +#: src/structure.cpp:5986 +#: src/structure.cpp:6002 +#: src/structure.cpp:6016 #, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - Endommagé à %3.0f%%" -#: src/structure.cpp:5886 +#: src/structure.cpp:5968 #, c-format msgid "%s - Connected %u of %u" msgstr "%s - %u connexions établies sur %u" -#: src/structure.cpp:6050 -#: src/structure.cpp:6095 +#: src/structure.cpp:6132 +#: src/structure.cpp:6177 #, c-format msgid "%s - Electronically Damaged" msgstr "%s - Électroniquement endommagé" -#: src/structure.cpp:6332 +#: src/structure.cpp:6414 msgid "Electronic Reward - Visibility Report" msgstr "Récompense électronique - Rapport de visibilité" -#: src/structure.cpp:6372 +#: src/structure.cpp:6454 msgid "Factory Reward - Propulsion" msgstr "Récompense d'usine - Propulsion" -#: src/structure.cpp:6396 +#: src/structure.cpp:6478 msgid "Factory Reward - Body" msgstr "Récompense d'usine - Corps" -#: src/structure.cpp:6420 +#: src/structure.cpp:6502 msgid "Factory Reward - Weapon" msgstr "Récompense d'usine - Armes" -#: src/structure.cpp:6429 +#: src/structure.cpp:6511 msgid "Factory Reward - Nothing" msgstr "Récompense d'usine - Rien" -#: src/structure.cpp:6457 +#: src/structure.cpp:6539 msgid "Repair Facility Award - Repair" msgstr "Récompense Atelier de réparation - Réparation" -#: src/structure.cpp:6464 +#: src/structure.cpp:6546 msgid "Repair Facility Award - Nothing" msgstr "Récompense Atelier de réparation - Rien" @@ -15051,34 +15047,35 @@ msgstr "" msgid "Reinforcements landing" msgstr "Les renforts sont arrivés !" -#: src/version.cpp:143 -msgid " (modified and switched locally)" -msgstr " (modifié et changé localement)" - -#: src/version.cpp:145 +#: src/version.cpp:129 msgid " (modified locally)" msgstr " (modifié localement)" -#: src/version.cpp:147 -msgid " (switched locally)" -msgstr " (changé localement)" - -#: src/version.cpp:154 +#: src/version.cpp:136 msgid " - DEBUG" msgstr " - DEBOGUER" -#: src/version.cpp:163 +#: src/version.cpp:145 #, c-format msgid " - Built %s" msgstr " - Compilation %s" #. TRANSLATORS: This string looks as follows when expanded. #. "Version " -#: src/version.cpp:173 +#: src/version.cpp:155 #, c-format msgid "Version %s%s%s%s" msgstr "Version %s%s%s%s" +#~ msgid "Kick player" +#~ msgstr "chasser le joueur" + +#~ msgid " (modified and switched locally)" +#~ msgstr " (modifié et changé localement)" + +#~ msgid " (switched locally)" +#~ msgstr " (changé localement)" + #, fuzzy #~ msgid "Infinite Production" #~ msgstr "Production en boucle" diff --git a/po/fy.po b/po/fy.po index eddfa26e7..f1734229f 100644 --- a/po/fy.po +++ b/po/fy.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-02-25 23:35+0100\n" +"POT-Creation-Date: 2011-03-08 15:43+0100\n" "PO-Revision-Date: 2008-04-21 08:59+0000\n" "Last-Translator: Wander Nauta \n" "Language-Team: Frisian \n" @@ -12011,26 +12011,26 @@ msgid "System locale" msgstr "Systeemlocale" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1042 +#: lib/netplay/netplay.cpp:1037 msgid "Enter password here" msgstr "" -#: lib/netplay/netplay.cpp:2060 +#: lib/netplay/netplay.cpp:2055 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "" -#: lib/netplay/netplay.cpp:2082 +#: lib/netplay/netplay.cpp:2077 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "" #: src/challenge.cpp:184 #: src/hci.cpp:916 -#: src/hci.cpp:3378 -#: src/hci.cpp:3501 -#: src/hci.cpp:3912 -#: src/hci.cpp:4930 +#: src/hci.cpp:3386 +#: src/hci.cpp:3509 +#: src/hci.cpp:3920 +#: src/hci.cpp:4938 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12339,7 +12339,7 @@ msgid "Player dropped" msgstr "Spiler" #: src/display3d.cpp:599 -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2121 msgid "Waiting for other players" msgstr "" @@ -12352,7 +12352,7 @@ msgid "Cannot Build. Oil Resource Burning." msgstr "Kin net bouwe. Oaljebron is oan it brânen." #: src/display.cpp:1828 -#: src/display.cpp:2421 +#: src/display.cpp:2420 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - Skea %d%% - Erfaring %d, %s" @@ -12384,77 +12384,77 @@ msgstr "Ienheid Ferlen!" msgid "Structure Restored" msgstr "Struktuur Hersteld" -#: src/droid.cpp:2732 +#: src/droid.cpp:2734 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" msgstr[0] "Groep %u selekteard - %u Ienheid" msgstr[1] "Groep %u selekteard - %u Ienheden" -#: src/droid.cpp:2745 +#: src/droid.cpp:2747 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" msgstr[0] "%u ienheid tafoege oan Groep %u" msgstr[1] "%u ienheden tafoege oan Groep %u" -#: src/droid.cpp:2758 +#: src/droid.cpp:2760 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" msgstr[0] "Sentreard op Groep %u - %u Ienheid" msgstr[1] "Sentreard op Groep %u - %u Ienheden" -#: src/droid.cpp:2762 +#: src/droid.cpp:2764 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:3093 +#: src/droid.cpp:3095 msgid "Rookie" msgstr "Kabouter" -#: src/droid.cpp:3094 +#: src/droid.cpp:3096 msgctxt "rank" msgid "Green" msgstr "Begjinner" -#: src/droid.cpp:3095 +#: src/droid.cpp:3097 msgid "Trained" msgstr "Traint" -#: src/droid.cpp:3096 +#: src/droid.cpp:3098 msgid "Regular" msgstr "Normaal" -#: src/droid.cpp:3097 +#: src/droid.cpp:3099 msgid "Professional" msgstr "Professioneel" -#: src/droid.cpp:3098 +#: src/droid.cpp:3100 msgid "Veteran" msgstr "Feteraan" -#: src/droid.cpp:3099 +#: src/droid.cpp:3101 msgid "Elite" msgstr "Elite" -#: src/droid.cpp:3100 +#: src/droid.cpp:3102 msgid "Special" msgstr "Spesjaal" -#: src/droid.cpp:3101 +#: src/droid.cpp:3103 msgid "Hero" msgstr "Held" -#: src/droid.cpp:4123 +#: src/droid.cpp:4125 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "" -#: src/droid.cpp:4127 +#: src/droid.cpp:4129 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "" @@ -12475,7 +12475,7 @@ msgid "Tutorial" msgstr "" #: src/frontend.cpp:100 -#: src/hci.cpp:3487 +#: src/hci.cpp:3495 msgid "Options" msgstr "" @@ -12537,8 +12537,8 @@ msgstr "" #: src/frontend.cpp:303 #: src/ingameop.cpp:494 -#: src/mission.cpp:2493 -#: src/mission.cpp:2596 +#: src/mission.cpp:2537 +#: src/mission.cpp:2640 msgid "Load Saved Game" msgstr "Opslein Spul Lade" @@ -12826,7 +12826,7 @@ msgid "GAME OPTIONS" msgstr "" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2398 +#: src/multiint.cpp:2394 msgid "Mod: " msgstr "" @@ -12836,8 +12836,8 @@ msgid "MAP SAVED!" msgstr "SPUL OPSLEIN!" #: src/hci.cpp:1573 -#: src/loop.cpp:558 -#: src/loop.cpp:574 +#: src/loop.cpp:561 +#: src/loop.cpp:577 #, fuzzy msgid "GAME SAVED: " msgstr "SPUL OPSLEIN!" @@ -12866,155 +12866,155 @@ msgstr "Spiler %u is oan it fals spyljen (debugmenu)! Him of sij krijt in nije r msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "Spiler %u is oan it fals spyljen (debugmenu)! Him of sij krijt in nije robot: %s." -#: src/hci.cpp:3298 +#: src/hci.cpp:3306 msgid "Commanders (F6)" msgstr "Kommandanten (F6)" -#: src/hci.cpp:3311 +#: src/hci.cpp:3319 msgid "Intelligence Display (F5)" msgstr "Intelligensjeskerm (F5)" -#: src/hci.cpp:3324 +#: src/hci.cpp:3332 msgid "Manufacture (F1)" msgstr "Meitsje (F1)" -#: src/hci.cpp:3337 +#: src/hci.cpp:3345 msgid "Design (F4)" msgstr "Ontwerpe (F4)" -#: src/hci.cpp:3350 +#: src/hci.cpp:3358 msgid "Research (F2)" msgstr "Ûndersyk (F2)" -#: src/hci.cpp:3363 +#: src/hci.cpp:3371 msgid "Build (F3)" msgstr "Bouwe (F3)" -#: src/hci.cpp:3434 +#: src/hci.cpp:3442 #: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Krêft" -#: src/hci.cpp:3525 +#: src/hci.cpp:3533 msgid "Map:" msgstr "" -#: src/hci.cpp:3538 +#: src/hci.cpp:3546 msgid "Load" msgstr "" -#: src/hci.cpp:3539 +#: src/hci.cpp:3547 msgid "Load Map File" msgstr "" -#: src/hci.cpp:3546 +#: src/hci.cpp:3554 #, fuzzy msgid "Save" msgstr "Spul Opslaan" -#: src/hci.cpp:3547 +#: src/hci.cpp:3555 #, fuzzy msgid "Save Map File" msgstr "Spul Opslaan" -#: src/hci.cpp:3555 +#: src/hci.cpp:3563 msgid "New" msgstr "" -#: src/hci.cpp:3556 +#: src/hci.cpp:3564 msgid "New Blank Map" msgstr "" -#: src/hci.cpp:3592 +#: src/hci.cpp:3600 msgid "Tile" msgstr "" -#: src/hci.cpp:3593 +#: src/hci.cpp:3601 msgid "Place tiles on map" msgstr "" -#: src/hci.cpp:3602 +#: src/hci.cpp:3610 msgid "Unit" msgstr "Ienheid" -#: src/hci.cpp:3603 +#: src/hci.cpp:3611 msgid "Place Unit on map" msgstr "" -#: src/hci.cpp:3611 +#: src/hci.cpp:3619 msgid "Struct" msgstr "Strukt" -#: src/hci.cpp:3612 +#: src/hci.cpp:3620 #, fuzzy msgid "Place Structures on map" msgstr "Struktuurlimyten ynstelle" -#: src/hci.cpp:3620 +#: src/hci.cpp:3628 msgid "Feat" msgstr "Funk" -#: src/hci.cpp:3621 +#: src/hci.cpp:3629 msgid "Place Features on map" msgstr "" -#: src/hci.cpp:3631 +#: src/hci.cpp:3639 msgid "Pause" msgstr "" -#: src/hci.cpp:3632 +#: src/hci.cpp:3640 #, fuzzy msgid "Pause or unpause the game" msgstr "De tsjinner hat it spul ferlitten!" -#: src/hci.cpp:3646 +#: src/hci.cpp:3654 msgid "Align height of all map objects" msgstr "" -#: src/hci.cpp:3656 +#: src/hci.cpp:3664 msgid "Edit" msgstr "" -#: src/hci.cpp:3657 +#: src/hci.cpp:3665 #, fuzzy msgid "Start Edit Mode" msgstr "Begjinne mei gjin basis" -#: src/hci.cpp:3671 +#: src/hci.cpp:3679 #: src/ingameop.cpp:112 #: src/ingameop.cpp:256 #: src/ingameop.cpp:260 msgid "Quit" msgstr "Ofslute" -#: src/hci.cpp:3672 +#: src/hci.cpp:3680 msgid "Exit Game" msgstr "Spul ferlitte" -#: src/hci.cpp:3698 +#: src/hci.cpp:3706 #, fuzzy msgid "Current Player:" msgstr "Spiler" -#: src/hci.cpp:3989 +#: src/hci.cpp:3997 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "Foartgongsbalke" -#: src/hci.cpp:4855 +#: src/hci.cpp:4863 msgid "Factory Delivery Point" msgstr "Fabrykôfleverpunt" -#: src/hci.cpp:4873 +#: src/hci.cpp:4881 msgid "Loop Production" msgstr "Sirkelproduksje" -#: src/hci.cpp:4953 +#: src/hci.cpp:4961 msgid "Tab Scroll left" msgstr "Tab links" -#: src/hci.cpp:4968 +#: src/hci.cpp:4976 msgid "Tab Scroll right" msgstr "Tab rjochts" @@ -13040,8 +13040,8 @@ msgstr "" #: src/ingameop.cpp:274 #: src/ingameop.cpp:498 -#: src/mission.cpp:2480 -#: src/mission.cpp:2599 +#: src/mission.cpp:2524 +#: src/mission.cpp:2643 msgid "Save Game" msgstr "Spul Opslaan" @@ -13976,44 +13976,44 @@ msgstr "" msgid "Toggle Driving Mode" msgstr "" -#: src/loop.cpp:565 -#: src/loop.cpp:581 +#: src/loop.cpp:568 +#: src/loop.cpp:584 msgid "Could not save game!" msgstr "" -#: src/mission.cpp:2041 +#: src/mission.cpp:2085 msgid "Load Transport" msgstr "Transport lade" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 #, fuzzy msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "DOEL HELLE" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED" msgstr "DOEL HELLE" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 #, fuzzy msgid "OBJECTIVE FAILED--and you cheated!" msgstr "DOEL MISLUKT" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED" msgstr "DOEL MISLUKT" -#: src/mission.cpp:2459 -#: src/mission.cpp:2499 -#: src/mission.cpp:2613 +#: src/mission.cpp:2503 +#: src/mission.cpp:2543 +#: src/mission.cpp:2657 msgid "Quit To Main Menu" msgstr "Ferlitte Nei Haadmenu" -#: src/mission.cpp:2467 +#: src/mission.cpp:2511 msgid "Continue Game" msgstr "Fjirder Mei Spul" -#: src/mission.cpp:2564 +#: src/mission.cpp:2608 #, fuzzy msgid "GAME SAVED :" msgstr "SPUL OPSLEIN!" @@ -14307,118 +14307,113 @@ msgstr "" msgid "Player colour" msgstr "Spiler" -#: src/multiint.cpp:2071 +#: src/multiint.cpp:2068 msgid "Team" msgstr "" -#: src/multiint.cpp:2083 -#, fuzzy -msgid "Kick player" -msgstr "Spiler" - -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 #, fuzzy msgid "Click to change difficulty" msgstr "Radar lit spilerkleuren sjen" -#: src/multiint.cpp:2130 +#: src/multiint.cpp:2126 msgid "Click when ready" msgstr "" -#: src/multiint.cpp:2134 +#: src/multiint.cpp:2130 msgid "READY?" msgstr "" -#: src/multiint.cpp:2178 +#: src/multiint.cpp:2174 msgid "PLAYERS" msgstr "SPILERS" -#: src/multiint.cpp:2213 +#: src/multiint.cpp:2209 msgid "Click to change to this slot" msgstr "" -#: src/multiint.cpp:2241 +#: src/multiint.cpp:2237 #, fuzzy msgid "Choose Team" msgstr "Teams fêststelle" -#: src/multiint.cpp:2271 +#: src/multiint.cpp:2267 #, fuzzy msgid "Click to change player colour" msgstr "Radar lit spilerkleuren sjen" -#: src/multiint.cpp:2299 +#: src/multiint.cpp:2295 #, fuzzy msgid "Click to change player position" msgstr "Spiler" -#: src/multiint.cpp:2305 +#: src/multiint.cpp:2301 #, fuzzy msgid "Click to change AI" msgstr "Radar lit spilerkleuren sjen" -#: src/multiint.cpp:2309 +#: src/multiint.cpp:2305 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2371 +#: src/multiint.cpp:2367 msgid "CHAT" msgstr "CHAT" -#: src/multiint.cpp:2403 +#: src/multiint.cpp:2399 msgid "All players need to have the same mods to join your game." msgstr "" -#: src/multiint.cpp:2561 +#: src/multiint.cpp:2557 #, c-format msgid "*** password [%s] is now required! ***" msgstr "" -#: src/multiint.cpp:2569 +#: src/multiint.cpp:2565 msgid "*** password is NOT required! ***" msgstr "" -#: src/multiint.cpp:2810 +#: src/multiint.cpp:2806 msgid "Sorry! Failed to host the game." msgstr "" -#: src/multiint.cpp:2931 +#: src/multiint.cpp:2927 #, fuzzy msgid "'Locked Teams' mode enabled" msgstr "Teams fêststelle" -#: src/multiint.cpp:3012 +#: src/multiint.cpp:3008 #, c-format msgid "The host has kicked %s from the game!" msgstr "De tsjinner hat %s fan it spul skopt!" -#: src/multiint.cpp:3082 +#: src/multiint.cpp:3078 msgid "Host is Starting Game" msgstr "Tsjinner is spul oan it starten" -#: src/multiint.cpp:3648 +#: src/multiint.cpp:3644 msgid "Players" msgstr "Spilers" -#: src/multiint.cpp:3786 +#: src/multiint.cpp:3782 #, c-format msgid "Sending Map: %d%% " msgstr "" -#: src/multiint.cpp:3794 +#: src/multiint.cpp:3790 #, c-format msgid "Map: %d%% downloaded" msgstr "" -#: src/multiint.cpp:3820 +#: src/multiint.cpp:3816 msgid "HOST" msgstr "" -#: src/multiint.cpp:3827 +#: src/multiint.cpp:3823 #: src/multimenu.cpp:772 msgid "Ping" msgstr "" @@ -14598,80 +14593,80 @@ msgstr "" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "" -#: src/multiplay.cpp:1057 +#: src/multiplay.cpp:1056 #, fuzzy msgid "(allies" msgstr "Freonskippen" -#: src/multiplay.cpp:1065 +#: src/multiplay.cpp:1064 msgid "(private to " msgstr "" -#: src/multiplay.cpp:1078 +#: src/multiplay.cpp:1077 msgid "[invalid]" msgstr "" -#: src/multiplay.cpp:1942 +#: src/multiplay.cpp:1941 msgid "Green" msgstr "Grien" -#: src/multiplay.cpp:1943 +#: src/multiplay.cpp:1942 msgid "Orange" msgstr "Oranje" -#: src/multiplay.cpp:1944 +#: src/multiplay.cpp:1943 msgid "Grey" msgstr "Griis" -#: src/multiplay.cpp:1945 +#: src/multiplay.cpp:1944 msgid "Black" msgstr "Swart" -#: src/multiplay.cpp:1946 +#: src/multiplay.cpp:1945 msgid "Red" msgstr "Read" -#: src/multiplay.cpp:1947 +#: src/multiplay.cpp:1946 msgid "Blue" msgstr "Blau" -#: src/multiplay.cpp:1948 +#: src/multiplay.cpp:1947 msgid "Pink" msgstr "Roze" -#: src/multiplay.cpp:1949 +#: src/multiplay.cpp:1948 msgid "Cyan" msgstr "Lochtblau" -#: src/multiplay.cpp:1950 +#: src/multiplay.cpp:1949 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:1951 +#: src/multiplay.cpp:1950 msgid "Purple" msgstr "" -#: src/multiplay.cpp:1952 +#: src/multiplay.cpp:1951 msgid "White" msgstr "" -#: src/multiplay.cpp:1953 +#: src/multiplay.cpp:1952 msgid "Bright blue" msgstr "" -#: src/multiplay.cpp:1954 +#: src/multiplay.cpp:1953 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:1955 +#: src/multiplay.cpp:1954 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:1956 +#: src/multiplay.cpp:1955 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:1957 +#: src/multiplay.cpp:1956 msgid "Brown" msgstr "" @@ -14679,16 +14674,16 @@ msgstr "" msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "" -#: src/research.cpp:1737 +#: src/research.cpp:1739 #, c-format msgid "Research completed: %s" msgstr "Ûndersyk foltooid: %s" -#: src/research.cpp:1742 +#: src/research.cpp:1744 msgid "Research Completed" msgstr "Ûndersyk foltooid" -#: src/research.cpp:2563 +#: src/research.cpp:2565 msgid "Research Award" msgstr "Ûndersykspriis" @@ -14852,62 +14847,62 @@ msgstr "Koe gjin Sensorienheden fine!" msgid "Unable to locate any Commanders!" msgstr "Koe gjin Kommandanten fine!" -#: src/structure.cpp:2614 +#: src/structure.cpp:2650 msgid "Command Control Limit Reached - Production Halted" msgstr "Kommandolimyt helle - Produksje stopt" -#: src/structure.cpp:5806 -#: src/structure.cpp:5831 +#: src/structure.cpp:5888 +#: src/structure.cpp:5913 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" msgstr[0] "%s - %u Ienheid tawezen" msgstr[1] "%s - %u Ienheden tawezen" -#: src/structure.cpp:5836 -#: src/structure.cpp:5904 -#: src/structure.cpp:5920 -#: src/structure.cpp:5934 +#: src/structure.cpp:5918 +#: src/structure.cpp:5986 +#: src/structure.cpp:6002 +#: src/structure.cpp:6016 #, fuzzy, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - Skea %3.0f%%" -#: src/structure.cpp:5886 +#: src/structure.cpp:5968 #, c-format msgid "%s - Connected %u of %u" msgstr "%s - %u fan %u ferbûn" -#: src/structure.cpp:6050 -#: src/structure.cpp:6095 +#: src/structure.cpp:6132 +#: src/structure.cpp:6177 #, c-format msgid "%s - Electronically Damaged" msgstr "%s - Elektronysk skea tabrocht" -#: src/structure.cpp:6332 +#: src/structure.cpp:6414 msgid "Electronic Reward - Visibility Report" msgstr "Elektronyske priis - Sichtberhydsrapport" -#: src/structure.cpp:6372 +#: src/structure.cpp:6454 msgid "Factory Reward - Propulsion" msgstr "Fabrykspriis - Oandriuwing" -#: src/structure.cpp:6396 +#: src/structure.cpp:6478 msgid "Factory Reward - Body" msgstr "Fabrykspriis - Lichem" -#: src/structure.cpp:6420 +#: src/structure.cpp:6502 msgid "Factory Reward - Weapon" msgstr "Fabrykspriis - Wapen" -#: src/structure.cpp:6429 +#: src/structure.cpp:6511 msgid "Factory Reward - Nothing" msgstr "Fabrykspriis - Niks" -#: src/structure.cpp:6457 +#: src/structure.cpp:6539 msgid "Repair Facility Award - Repair" msgstr "Reparaasjefasiliteit Priis - Reparaasje" -#: src/structure.cpp:6464 +#: src/structure.cpp:6546 msgid "Repair Facility Award - Nothing" msgstr "Reparaasjefasiliteit Priis - Niks" @@ -14924,34 +14919,30 @@ msgstr "" msgid "Reinforcements landing" msgstr "Fersterking oan it landen" -#: src/version.cpp:143 -msgid " (modified and switched locally)" -msgstr "" - -#: src/version.cpp:145 +#: src/version.cpp:129 msgid " (modified locally)" msgstr "" -#: src/version.cpp:147 -msgid " (switched locally)" -msgstr "" - -#: src/version.cpp:154 +#: src/version.cpp:136 msgid " - DEBUG" msgstr "" -#: src/version.cpp:163 +#: src/version.cpp:145 #, c-format msgid " - Built %s" msgstr "" #. TRANSLATORS: This string looks as follows when expanded. #. "Version " -#: src/version.cpp:173 +#: src/version.cpp:155 #, c-format msgid "Version %s%s%s%s" msgstr "" +#, fuzzy +#~ msgid "Kick player" +#~ msgstr "Spiler" + #, fuzzy #~ msgid "Infinite Production" #~ msgstr "Sirkelproduksje" diff --git a/po/ga.po b/po/ga.po index a4f073708..57a8d6ab2 100644 --- a/po/ga.po +++ b/po/ga.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-02-25 23:35+0100\n" +"POT-Creation-Date: 2011-03-08 15:43+0100\n" "PO-Revision-Date: 2008-05-08 17:14+0000\n" "Last-Translator: Seanan \n" "Language-Team: Irish \n" @@ -12009,26 +12009,26 @@ msgid "System locale" msgstr "" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1042 +#: lib/netplay/netplay.cpp:1037 msgid "Enter password here" msgstr "" -#: lib/netplay/netplay.cpp:2060 +#: lib/netplay/netplay.cpp:2055 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "" -#: lib/netplay/netplay.cpp:2082 +#: lib/netplay/netplay.cpp:2077 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "" #: src/challenge.cpp:184 #: src/hci.cpp:916 -#: src/hci.cpp:3378 -#: src/hci.cpp:3501 -#: src/hci.cpp:3912 -#: src/hci.cpp:4930 +#: src/hci.cpp:3386 +#: src/hci.cpp:3509 +#: src/hci.cpp:3920 +#: src/hci.cpp:4938 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12337,7 +12337,7 @@ msgid "Player dropped" msgstr "Imreoir" #: src/display3d.cpp:599 -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2121 msgid "Waiting for other players" msgstr "" @@ -12350,7 +12350,7 @@ msgid "Cannot Build. Oil Resource Burning." msgstr "" #: src/display.cpp:1828 -#: src/display.cpp:2421 +#: src/display.cpp:2420 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - Dochar %d%% - Taithí %d, %s" @@ -12381,77 +12381,77 @@ msgstr "Chaill an t-Aonad!" msgid "Structure Restored" msgstr "" -#: src/droid.cpp:2732 +#: src/droid.cpp:2734 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:2745 +#: src/droid.cpp:2747 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:2758 +#: src/droid.cpp:2760 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:2762 +#: src/droid.cpp:2764 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:3093 +#: src/droid.cpp:3095 msgid "Rookie" msgstr "Glasearcach" -#: src/droid.cpp:3094 +#: src/droid.cpp:3096 msgctxt "rank" msgid "Green" msgstr "Glasearcach" -#: src/droid.cpp:3095 +#: src/droid.cpp:3097 msgid "Trained" msgstr "Oilte" -#: src/droid.cpp:3096 +#: src/droid.cpp:3098 msgid "Regular" msgstr "Gnáth" -#: src/droid.cpp:3097 +#: src/droid.cpp:3099 msgid "Professional" msgstr "Gairmiúil" -#: src/droid.cpp:3098 +#: src/droid.cpp:3100 msgid "Veteran" msgstr "Seansaighdiúir" -#: src/droid.cpp:3099 +#: src/droid.cpp:3101 msgid "Elite" msgstr "Tofa" -#: src/droid.cpp:3100 +#: src/droid.cpp:3102 msgid "Special" msgstr "Sain" -#: src/droid.cpp:3101 +#: src/droid.cpp:3103 msgid "Hero" msgstr "Laoch" -#: src/droid.cpp:4123 +#: src/droid.cpp:4125 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "" -#: src/droid.cpp:4127 +#: src/droid.cpp:4129 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "" @@ -12472,7 +12472,7 @@ msgid "Tutorial" msgstr "" #: src/frontend.cpp:100 -#: src/hci.cpp:3487 +#: src/hci.cpp:3495 msgid "Options" msgstr "" @@ -12534,8 +12534,8 @@ msgstr "" #: src/frontend.cpp:303 #: src/ingameop.cpp:494 -#: src/mission.cpp:2493 -#: src/mission.cpp:2596 +#: src/mission.cpp:2537 +#: src/mission.cpp:2640 msgid "Load Saved Game" msgstr "" @@ -12823,7 +12823,7 @@ msgid "GAME OPTIONS" msgstr "" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2398 +#: src/multiint.cpp:2394 msgid "Mod: " msgstr "" @@ -12832,8 +12832,8 @@ msgid "MAP SAVED!" msgstr "" #: src/hci.cpp:1573 -#: src/loop.cpp:558 -#: src/loop.cpp:574 +#: src/loop.cpp:561 +#: src/loop.cpp:577 msgid "GAME SAVED: " msgstr "" @@ -12861,152 +12861,152 @@ msgstr "" msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "" -#: src/hci.cpp:3298 +#: src/hci.cpp:3306 msgid "Commanders (F6)" msgstr "Ceannasaithe (F6)" -#: src/hci.cpp:3311 +#: src/hci.cpp:3319 msgid "Intelligence Display (F5)" msgstr "" -#: src/hci.cpp:3324 +#: src/hci.cpp:3332 msgid "Manufacture (F1)" msgstr "" -#: src/hci.cpp:3337 +#: src/hci.cpp:3345 msgid "Design (F4)" msgstr "Dearadh (F4)" -#: src/hci.cpp:3350 +#: src/hci.cpp:3358 msgid "Research (F2)" msgstr "Taighde (F2)" -#: src/hci.cpp:3363 +#: src/hci.cpp:3371 msgid "Build (F3)" msgstr "Tógáil (F3)" -#: src/hci.cpp:3434 +#: src/hci.cpp:3442 #: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Cumhacht" -#: src/hci.cpp:3525 +#: src/hci.cpp:3533 msgid "Map:" msgstr "" -#: src/hci.cpp:3538 +#: src/hci.cpp:3546 msgid "Load" msgstr "" -#: src/hci.cpp:3539 +#: src/hci.cpp:3547 msgid "Load Map File" msgstr "" -#: src/hci.cpp:3546 +#: src/hci.cpp:3554 msgid "Save" msgstr "" -#: src/hci.cpp:3547 +#: src/hci.cpp:3555 msgid "Save Map File" msgstr "" -#: src/hci.cpp:3555 +#: src/hci.cpp:3563 msgid "New" msgstr "" -#: src/hci.cpp:3556 +#: src/hci.cpp:3564 msgid "New Blank Map" msgstr "" -#: src/hci.cpp:3592 +#: src/hci.cpp:3600 msgid "Tile" msgstr "" -#: src/hci.cpp:3593 +#: src/hci.cpp:3601 msgid "Place tiles on map" msgstr "" -#: src/hci.cpp:3602 +#: src/hci.cpp:3610 msgid "Unit" msgstr "Aonad" -#: src/hci.cpp:3603 +#: src/hci.cpp:3611 msgid "Place Unit on map" msgstr "" -#: src/hci.cpp:3611 +#: src/hci.cpp:3619 msgid "Struct" msgstr "" -#: src/hci.cpp:3612 +#: src/hci.cpp:3620 msgid "Place Structures on map" msgstr "" -#: src/hci.cpp:3620 +#: src/hci.cpp:3628 msgid "Feat" msgstr "Éacht" -#: src/hci.cpp:3621 +#: src/hci.cpp:3629 msgid "Place Features on map" msgstr "" -#: src/hci.cpp:3631 +#: src/hci.cpp:3639 msgid "Pause" msgstr "" -#: src/hci.cpp:3632 +#: src/hci.cpp:3640 #, fuzzy msgid "Pause or unpause the game" msgstr "D'fhág an tíosach an cluiche!" -#: src/hci.cpp:3646 +#: src/hci.cpp:3654 msgid "Align height of all map objects" msgstr "" -#: src/hci.cpp:3656 +#: src/hci.cpp:3664 msgid "Edit" msgstr "" -#: src/hci.cpp:3657 +#: src/hci.cpp:3665 #, fuzzy msgid "Start Edit Mode" msgstr "Tosaigh Gan Bunáiteanna" -#: src/hci.cpp:3671 +#: src/hci.cpp:3679 #: src/ingameop.cpp:112 #: src/ingameop.cpp:256 #: src/ingameop.cpp:260 msgid "Quit" msgstr "Scoir" -#: src/hci.cpp:3672 +#: src/hci.cpp:3680 msgid "Exit Game" msgstr "Scoir ón Cluiche" -#: src/hci.cpp:3698 +#: src/hci.cpp:3706 #, fuzzy msgid "Current Player:" msgstr "Imreoir" -#: src/hci.cpp:3989 +#: src/hci.cpp:3997 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "Barra Dul Chun Cinn" -#: src/hci.cpp:4855 +#: src/hci.cpp:4863 msgid "Factory Delivery Point" msgstr "" -#: src/hci.cpp:4873 +#: src/hci.cpp:4881 msgid "Loop Production" msgstr "" -#: src/hci.cpp:4953 +#: src/hci.cpp:4961 msgid "Tab Scroll left" msgstr "" -#: src/hci.cpp:4968 +#: src/hci.cpp:4976 msgid "Tab Scroll right" msgstr "" @@ -13032,8 +13032,8 @@ msgstr "" #: src/ingameop.cpp:274 #: src/ingameop.cpp:498 -#: src/mission.cpp:2480 -#: src/mission.cpp:2599 +#: src/mission.cpp:2524 +#: src/mission.cpp:2643 msgid "Save Game" msgstr "" @@ -13963,42 +13963,42 @@ msgstr "" msgid "Toggle Driving Mode" msgstr "" -#: src/loop.cpp:565 -#: src/loop.cpp:581 +#: src/loop.cpp:568 +#: src/loop.cpp:584 msgid "Could not save game!" msgstr "" -#: src/mission.cpp:2041 +#: src/mission.cpp:2085 msgid "Load Transport" msgstr "" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED" msgstr "" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED--and you cheated!" msgstr "" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED" msgstr "" -#: src/mission.cpp:2459 -#: src/mission.cpp:2499 -#: src/mission.cpp:2613 +#: src/mission.cpp:2503 +#: src/mission.cpp:2543 +#: src/mission.cpp:2657 msgid "Quit To Main Menu" msgstr "Fill Chuig An Príomh Roghchlár" -#: src/mission.cpp:2467 +#: src/mission.cpp:2511 msgid "Continue Game" msgstr "Lean Leis an Cluiche" -#: src/mission.cpp:2564 +#: src/mission.cpp:2608 msgid "GAME SAVED :" msgstr "" @@ -14289,115 +14289,110 @@ msgstr "" msgid "Player colour" msgstr "Imreoir" -#: src/multiint.cpp:2071 +#: src/multiint.cpp:2068 msgid "Team" msgstr "" -#: src/multiint.cpp:2083 -#, fuzzy -msgid "Kick player" -msgstr "Imreoir" - -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 #, fuzzy msgid "Click to change difficulty" msgstr "Imreoir" -#: src/multiint.cpp:2130 +#: src/multiint.cpp:2126 msgid "Click when ready" msgstr "" -#: src/multiint.cpp:2134 +#: src/multiint.cpp:2130 msgid "READY?" msgstr "" -#: src/multiint.cpp:2178 +#: src/multiint.cpp:2174 msgid "PLAYERS" msgstr "IMREOIRÍ" -#: src/multiint.cpp:2213 +#: src/multiint.cpp:2209 msgid "Click to change to this slot" msgstr "" -#: src/multiint.cpp:2241 +#: src/multiint.cpp:2237 msgid "Choose Team" msgstr "" -#: src/multiint.cpp:2271 +#: src/multiint.cpp:2267 msgid "Click to change player colour" msgstr "" -#: src/multiint.cpp:2299 +#: src/multiint.cpp:2295 #, fuzzy msgid "Click to change player position" msgstr "Imreoir" -#: src/multiint.cpp:2305 +#: src/multiint.cpp:2301 #, fuzzy msgid "Click to change AI" msgstr "Imreoir" -#: src/multiint.cpp:2309 +#: src/multiint.cpp:2305 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2371 +#: src/multiint.cpp:2367 msgid "CHAT" msgstr "DÉAN COMHRÁ" -#: src/multiint.cpp:2403 +#: src/multiint.cpp:2399 msgid "All players need to have the same mods to join your game." msgstr "" -#: src/multiint.cpp:2561 +#: src/multiint.cpp:2557 #, c-format msgid "*** password [%s] is now required! ***" msgstr "" -#: src/multiint.cpp:2569 +#: src/multiint.cpp:2565 msgid "*** password is NOT required! ***" msgstr "" -#: src/multiint.cpp:2810 +#: src/multiint.cpp:2806 msgid "Sorry! Failed to host the game." msgstr "" -#: src/multiint.cpp:2931 +#: src/multiint.cpp:2927 msgid "'Locked Teams' mode enabled" msgstr "" -#: src/multiint.cpp:3012 +#: src/multiint.cpp:3008 #, c-format msgid "The host has kicked %s from the game!" msgstr "" -#: src/multiint.cpp:3082 +#: src/multiint.cpp:3078 msgid "Host is Starting Game" msgstr "" -#: src/multiint.cpp:3648 +#: src/multiint.cpp:3644 msgid "Players" msgstr "Imreoirí" -#: src/multiint.cpp:3786 +#: src/multiint.cpp:3782 #, c-format msgid "Sending Map: %d%% " msgstr "" -#: src/multiint.cpp:3794 +#: src/multiint.cpp:3790 #, c-format msgid "Map: %d%% downloaded" msgstr "" -#: src/multiint.cpp:3820 +#: src/multiint.cpp:3816 msgid "HOST" msgstr "" -#: src/multiint.cpp:3827 +#: src/multiint.cpp:3823 #: src/multimenu.cpp:772 msgid "Ping" msgstr "" @@ -14575,80 +14570,80 @@ msgstr "" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "" -#: src/multiplay.cpp:1057 +#: src/multiplay.cpp:1056 #, fuzzy msgid "(allies" msgstr "Comhbhánna" -#: src/multiplay.cpp:1065 +#: src/multiplay.cpp:1064 msgid "(private to " msgstr "" -#: src/multiplay.cpp:1078 +#: src/multiplay.cpp:1077 msgid "[invalid]" msgstr "" -#: src/multiplay.cpp:1942 +#: src/multiplay.cpp:1941 msgid "Green" msgstr "Uaine" -#: src/multiplay.cpp:1943 +#: src/multiplay.cpp:1942 msgid "Orange" msgstr "Flannbhuí" -#: src/multiplay.cpp:1944 +#: src/multiplay.cpp:1943 msgid "Grey" msgstr "Liath" -#: src/multiplay.cpp:1945 +#: src/multiplay.cpp:1944 msgid "Black" msgstr "Dubh" -#: src/multiplay.cpp:1946 +#: src/multiplay.cpp:1945 msgid "Red" msgstr "Dearg" -#: src/multiplay.cpp:1947 +#: src/multiplay.cpp:1946 msgid "Blue" msgstr "Gorm" -#: src/multiplay.cpp:1948 +#: src/multiplay.cpp:1947 msgid "Pink" msgstr "Bándearg" -#: src/multiplay.cpp:1949 +#: src/multiplay.cpp:1948 msgid "Cyan" msgstr "Cian" -#: src/multiplay.cpp:1950 +#: src/multiplay.cpp:1949 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:1951 +#: src/multiplay.cpp:1950 msgid "Purple" msgstr "" -#: src/multiplay.cpp:1952 +#: src/multiplay.cpp:1951 msgid "White" msgstr "" -#: src/multiplay.cpp:1953 +#: src/multiplay.cpp:1952 msgid "Bright blue" msgstr "" -#: src/multiplay.cpp:1954 +#: src/multiplay.cpp:1953 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:1955 +#: src/multiplay.cpp:1954 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:1956 +#: src/multiplay.cpp:1955 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:1957 +#: src/multiplay.cpp:1956 msgid "Brown" msgstr "" @@ -14656,16 +14651,16 @@ msgstr "" msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "" -#: src/research.cpp:1737 +#: src/research.cpp:1739 #, c-format msgid "Research completed: %s" msgstr "" -#: src/research.cpp:1742 +#: src/research.cpp:1744 msgid "Research Completed" msgstr "" -#: src/research.cpp:2563 +#: src/research.cpp:2565 msgid "Research Award" msgstr "" @@ -14829,62 +14824,62 @@ msgstr "" msgid "Unable to locate any Commanders!" msgstr "" -#: src/structure.cpp:2614 +#: src/structure.cpp:2650 msgid "Command Control Limit Reached - Production Halted" msgstr "" -#: src/structure.cpp:5806 -#: src/structure.cpp:5831 +#: src/structure.cpp:5888 +#: src/structure.cpp:5913 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" msgstr[0] "" msgstr[1] "" -#: src/structure.cpp:5836 -#: src/structure.cpp:5904 -#: src/structure.cpp:5920 -#: src/structure.cpp:5934 +#: src/structure.cpp:5918 +#: src/structure.cpp:5986 +#: src/structure.cpp:6002 +#: src/structure.cpp:6016 #, c-format msgid "%s - Damage %3.0f%%" msgstr "" -#: src/structure.cpp:5886 +#: src/structure.cpp:5968 #, c-format msgid "%s - Connected %u of %u" msgstr "" -#: src/structure.cpp:6050 -#: src/structure.cpp:6095 +#: src/structure.cpp:6132 +#: src/structure.cpp:6177 #, c-format msgid "%s - Electronically Damaged" msgstr "" -#: src/structure.cpp:6332 +#: src/structure.cpp:6414 msgid "Electronic Reward - Visibility Report" msgstr "" -#: src/structure.cpp:6372 +#: src/structure.cpp:6454 msgid "Factory Reward - Propulsion" msgstr "" -#: src/structure.cpp:6396 +#: src/structure.cpp:6478 msgid "Factory Reward - Body" msgstr "" -#: src/structure.cpp:6420 +#: src/structure.cpp:6502 msgid "Factory Reward - Weapon" msgstr "" -#: src/structure.cpp:6429 +#: src/structure.cpp:6511 msgid "Factory Reward - Nothing" msgstr "" -#: src/structure.cpp:6457 +#: src/structure.cpp:6539 msgid "Repair Facility Award - Repair" msgstr "" -#: src/structure.cpp:6464 +#: src/structure.cpp:6546 msgid "Repair Facility Award - Nothing" msgstr "" @@ -14901,34 +14896,30 @@ msgstr "" msgid "Reinforcements landing" msgstr "" -#: src/version.cpp:143 -msgid " (modified and switched locally)" -msgstr "" - -#: src/version.cpp:145 +#: src/version.cpp:129 msgid " (modified locally)" msgstr "" -#: src/version.cpp:147 -msgid " (switched locally)" -msgstr "" - -#: src/version.cpp:154 +#: src/version.cpp:136 msgid " - DEBUG" msgstr "" -#: src/version.cpp:163 +#: src/version.cpp:145 #, c-format msgid " - Built %s" msgstr "" #. TRANSLATORS: This string looks as follows when expanded. #. "Version " -#: src/version.cpp:173 +#: src/version.cpp:155 #, c-format msgid "Version %s%s%s%s" msgstr "" +#, fuzzy +#~ msgid "Kick player" +#~ msgstr "Imreoir" + #, fuzzy #~ msgid "Player number" #~ msgstr "Imreoir" diff --git a/po/hr.po b/po/hr.po index 7089785c8..a7ca96fa1 100644 --- a/po/hr.po +++ b/po/hr.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: WZ2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-02-25 23:35+0100\n" +"POT-Creation-Date: 2011-03-08 15:43+0100\n" "PO-Revision-Date: \n" "Last-Translator: metalwarrior95 \n" "Language-Team: \n" @@ -12038,26 +12038,26 @@ msgid "System locale" msgstr "Lokalni" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1042 +#: lib/netplay/netplay.cpp:1037 msgid "Enter password here" msgstr "Upišite sišfru ovdje" -#: lib/netplay/netplay.cpp:2060 +#: lib/netplay/netplay.cpp:2055 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "" -#: lib/netplay/netplay.cpp:2082 +#: lib/netplay/netplay.cpp:2077 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "" #: src/challenge.cpp:184 #: src/hci.cpp:916 -#: src/hci.cpp:3378 -#: src/hci.cpp:3501 -#: src/hci.cpp:3912 -#: src/hci.cpp:4930 +#: src/hci.cpp:3386 +#: src/hci.cpp:3509 +#: src/hci.cpp:3920 +#: src/hci.cpp:4938 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12364,7 +12364,7 @@ msgid "Player dropped" msgstr "Igrač Pao" #: src/display3d.cpp:599 -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2121 msgid "Waiting for other players" msgstr "Čekanje na ostale igrače" @@ -12377,7 +12377,7 @@ msgid "Cannot Build. Oil Resource Burning." msgstr "Nedopušteno Građenje. Izvor Nafte Gori!" #: src/display.cpp:1828 -#: src/display.cpp:2421 +#: src/display.cpp:2420 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "" @@ -12409,77 +12409,77 @@ msgstr "Jedinica Izgubljena!" msgid "Structure Restored" msgstr "Građevina Restaurirana" -#: src/droid.cpp:2732 +#: src/droid.cpp:2734 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:2745 +#: src/droid.cpp:2747 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:2758 +#: src/droid.cpp:2760 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:2762 +#: src/droid.cpp:2764 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:3093 +#: src/droid.cpp:3095 msgid "Rookie" msgstr "Novak" -#: src/droid.cpp:3094 +#: src/droid.cpp:3096 msgctxt "rank" msgid "Green" msgstr "" -#: src/droid.cpp:3095 +#: src/droid.cpp:3097 msgid "Trained" msgstr "Treniran" -#: src/droid.cpp:3096 +#: src/droid.cpp:3098 msgid "Regular" msgstr "Normalan" -#: src/droid.cpp:3097 +#: src/droid.cpp:3099 msgid "Professional" msgstr "Profesionalac" -#: src/droid.cpp:3098 +#: src/droid.cpp:3100 msgid "Veteran" msgstr "Veteran" -#: src/droid.cpp:3099 +#: src/droid.cpp:3101 msgid "Elite" msgstr "Elita" -#: src/droid.cpp:3100 +#: src/droid.cpp:3102 msgid "Special" msgstr "Specijal" -#: src/droid.cpp:3101 +#: src/droid.cpp:3103 msgid "Hero" msgstr "Junak" -#: src/droid.cpp:4123 +#: src/droid.cpp:4125 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "" -#: src/droid.cpp:4127 +#: src/droid.cpp:4129 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "" @@ -12498,7 +12498,7 @@ msgid "Tutorial" msgstr "Vježbe" #: src/frontend.cpp:100 -#: src/hci.cpp:3487 +#: src/hci.cpp:3495 msgid "Options" msgstr "Opcije" @@ -12559,8 +12559,8 @@ msgstr "JEDAN IGRAČ" #: src/frontend.cpp:303 #: src/ingameop.cpp:494 -#: src/mission.cpp:2493 -#: src/mission.cpp:2596 +#: src/mission.cpp:2537 +#: src/mission.cpp:2640 msgid "Load Saved Game" msgstr "Učitaj Sačuvanu Igru" @@ -12845,7 +12845,7 @@ msgid "GAME OPTIONS" msgstr "OPCIJE IGRE" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2398 +#: src/multiint.cpp:2394 msgid "Mod: " msgstr "Modifikacija:" @@ -12854,8 +12854,8 @@ msgid "MAP SAVED!" msgstr "KARTA SPREMLJENA!" #: src/hci.cpp:1573 -#: src/loop.cpp:558 -#: src/loop.cpp:574 +#: src/loop.cpp:561 +#: src/loop.cpp:577 #, fuzzy msgid "GAME SAVED: " msgstr "Igra spremljena:" @@ -12884,155 +12884,155 @@ msgstr "Igrač %u vara, postavio si je : %s" msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "Igrač %u vara, postavio si je : %s" -#: src/hci.cpp:3298 +#: src/hci.cpp:3306 msgid "Commanders (F6)" msgstr "Kapetani (F6)" -#: src/hci.cpp:3311 +#: src/hci.cpp:3319 msgid "Intelligence Display (F5)" msgstr "Viječanje (F5)" -#: src/hci.cpp:3324 +#: src/hci.cpp:3332 msgid "Manufacture (F1)" msgstr "Proizvedi (F1)" -#: src/hci.cpp:3337 +#: src/hci.cpp:3345 msgid "Design (F4)" msgstr "Dizajniraj (F4)" -#: src/hci.cpp:3350 +#: src/hci.cpp:3358 msgid "Research (F2)" msgstr "Istražuj (F2)" -#: src/hci.cpp:3363 +#: src/hci.cpp:3371 msgid "Build (F3)" msgstr "Gradi (F3)" -#: src/hci.cpp:3434 +#: src/hci.cpp:3442 #: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Resursi" -#: src/hci.cpp:3525 +#: src/hci.cpp:3533 msgid "Map:" msgstr "" -#: src/hci.cpp:3538 +#: src/hci.cpp:3546 #, fuzzy msgid "Load" msgstr "Učitaj Igru" -#: src/hci.cpp:3539 +#: src/hci.cpp:3547 #, fuzzy msgid "Load Map File" msgstr "Učitaj Igru" -#: src/hci.cpp:3546 +#: src/hci.cpp:3554 #, fuzzy msgid "Save" msgstr "Spermi igru" -#: src/hci.cpp:3547 +#: src/hci.cpp:3555 #, fuzzy msgid "Save Map File" msgstr "Spermi igru" -#: src/hci.cpp:3555 +#: src/hci.cpp:3563 msgid "New" msgstr "" -#: src/hci.cpp:3556 +#: src/hci.cpp:3564 msgid "New Blank Map" msgstr "" -#: src/hci.cpp:3592 +#: src/hci.cpp:3600 msgid "Tile" msgstr "Kvadratić" -#: src/hci.cpp:3593 +#: src/hci.cpp:3601 msgid "Place tiles on map" msgstr "Postavi teksture na kartu" -#: src/hci.cpp:3602 +#: src/hci.cpp:3610 msgid "Unit" msgstr "Jedinica" -#: src/hci.cpp:3603 +#: src/hci.cpp:3611 msgid "Place Unit on map" msgstr "Postavi jedinice na kartu" -#: src/hci.cpp:3611 +#: src/hci.cpp:3619 msgid "Struct" msgstr "Građevina" -#: src/hci.cpp:3612 +#: src/hci.cpp:3620 msgid "Place Structures on map" msgstr "Postavi građevine na kartu" -#: src/hci.cpp:3620 +#: src/hci.cpp:3628 msgid "Feat" msgstr "Pogodnosti" -#: src/hci.cpp:3621 +#: src/hci.cpp:3629 msgid "Place Features on map" msgstr "Postavi pogodnost na kartu" -#: src/hci.cpp:3631 +#: src/hci.cpp:3639 msgid "Pause" msgstr "" -#: src/hci.cpp:3632 +#: src/hci.cpp:3640 msgid "Pause or unpause the game" msgstr "Pauziraj igru" -#: src/hci.cpp:3646 +#: src/hci.cpp:3654 msgid "Align height of all map objects" msgstr "Podesi visinu svih objekata na karti" -#: src/hci.cpp:3656 +#: src/hci.cpp:3664 msgid "Edit" msgstr "" -#: src/hci.cpp:3657 +#: src/hci.cpp:3665 #, fuzzy msgid "Start Edit Mode" msgstr "Započni bez baza" -#: src/hci.cpp:3671 +#: src/hci.cpp:3679 #: src/ingameop.cpp:112 #: src/ingameop.cpp:256 #: src/ingameop.cpp:260 msgid "Quit" msgstr "Izađi" -#: src/hci.cpp:3672 +#: src/hci.cpp:3680 msgid "Exit Game" msgstr "Izađi iz igre" -#: src/hci.cpp:3698 +#: src/hci.cpp:3706 #, fuzzy msgid "Current Player:" msgstr "Više Igrača" -#: src/hci.cpp:3989 +#: src/hci.cpp:3997 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "Procesna trakica" -#: src/hci.cpp:4855 +#: src/hci.cpp:4863 msgid "Factory Delivery Point" msgstr "Dostavna točka Tvornice" -#: src/hci.cpp:4873 +#: src/hci.cpp:4881 msgid "Loop Production" msgstr "Ponovi proizvodnju" -#: src/hci.cpp:4953 +#: src/hci.cpp:4961 msgid "Tab Scroll left" msgstr "Tablica zakreni lijevo" -#: src/hci.cpp:4968 +#: src/hci.cpp:4976 msgid "Tab Scroll right" msgstr "Tablica zakreni desno" @@ -13058,8 +13058,8 @@ msgstr "" #: src/ingameop.cpp:274 #: src/ingameop.cpp:498 -#: src/mission.cpp:2480 -#: src/mission.cpp:2599 +#: src/mission.cpp:2524 +#: src/mission.cpp:2643 msgid "Save Game" msgstr "Spermi igru" @@ -14004,42 +14004,42 @@ msgstr "" msgid "Toggle Driving Mode" msgstr "Pračenje" -#: src/loop.cpp:565 -#: src/loop.cpp:581 +#: src/loop.cpp:568 +#: src/loop.cpp:584 msgid "Could not save game!" msgstr "Igra se ne može spremiti" -#: src/mission.cpp:2041 +#: src/mission.cpp:2085 msgid "Load Transport" msgstr "Ukrcaj na transport" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "POBJEDIO SI!!! - jer si koristio sifre." -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED" msgstr "POBJEDIO SI!!!" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED--and you cheated!" msgstr "Koristio si šifre - ali si ipak IZGUBIO!!!" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED" msgstr "IZGUBIO SI!!!" -#: src/mission.cpp:2459 -#: src/mission.cpp:2499 -#: src/mission.cpp:2613 +#: src/mission.cpp:2503 +#: src/mission.cpp:2543 +#: src/mission.cpp:2657 msgid "Quit To Main Menu" msgstr "Izađi na glavni meni" -#: src/mission.cpp:2467 +#: src/mission.cpp:2511 msgid "Continue Game" msgstr "Nastavi igru" -#: src/mission.cpp:2564 +#: src/mission.cpp:2608 msgid "GAME SAVED :" msgstr "Igra spremljena:" @@ -14329,117 +14329,113 @@ msgstr "" msgid "Player colour" msgstr "Boja igrača" -#: src/multiint.cpp:2071 +#: src/multiint.cpp:2068 msgid "Team" msgstr "Savez" -#: src/multiint.cpp:2083 -msgid "Kick player" -msgstr "Izbaci igrača" - -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 #, fuzzy msgid "Click to change difficulty" msgstr "Odaberi lozinku" -#: src/multiint.cpp:2130 +#: src/multiint.cpp:2126 msgid "Click when ready" msgstr "Označi kada si spreman" -#: src/multiint.cpp:2134 +#: src/multiint.cpp:2130 msgid "READY?" msgstr "SPREMAN?" -#: src/multiint.cpp:2178 +#: src/multiint.cpp:2174 msgid "PLAYERS" msgstr "Igrači" -#: src/multiint.cpp:2213 +#: src/multiint.cpp:2209 #, fuzzy msgid "Click to change to this slot" msgstr "Odaberi lozinku" -#: src/multiint.cpp:2241 +#: src/multiint.cpp:2237 #, fuzzy msgid "Choose Team" msgstr "Timovi" -#: src/multiint.cpp:2271 +#: src/multiint.cpp:2267 #, fuzzy msgid "Click to change player colour" msgstr "Karta prikazuje boje igrača" -#: src/multiint.cpp:2299 +#: src/multiint.cpp:2295 #, fuzzy msgid "Click to change player position" msgstr "Obrambeni položaj" -#: src/multiint.cpp:2305 +#: src/multiint.cpp:2301 #, fuzzy msgid "Click to change AI" msgstr "Odaberi lozinku" -#: src/multiint.cpp:2309 +#: src/multiint.cpp:2305 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2371 +#: src/multiint.cpp:2367 msgid "CHAT" msgstr "Čavrljanje" -#: src/multiint.cpp:2403 +#: src/multiint.cpp:2399 msgid "All players need to have the same mods to join your game." msgstr "Svi igrači moraju imati iste modove." -#: src/multiint.cpp:2561 +#: src/multiint.cpp:2557 #, fuzzy, c-format msgid "*** password [%s] is now required! ***" msgstr "Lozinka je potrebna." -#: src/multiint.cpp:2569 +#: src/multiint.cpp:2565 msgid "*** password is NOT required! ***" msgstr "Lozinka nije potrebna." -#: src/multiint.cpp:2810 +#: src/multiint.cpp:2806 msgid "Sorry! Failed to host the game." msgstr "Ne možeš hostati igru." -#: src/multiint.cpp:2931 +#: src/multiint.cpp:2927 msgid "'Locked Teams' mode enabled" msgstr "Model saveza: Timovi" -#: src/multiint.cpp:3012 +#: src/multiint.cpp:3008 #, c-format msgid "The host has kicked %s from the game!" msgstr "Host je izbacio %s iz igre." -#: src/multiint.cpp:3082 +#: src/multiint.cpp:3078 msgid "Host is Starting Game" msgstr "Host započinje igru" -#: src/multiint.cpp:3648 +#: src/multiint.cpp:3644 msgid "Players" msgstr "Igrači" -#: src/multiint.cpp:3786 +#: src/multiint.cpp:3782 #, c-format msgid "Sending Map: %d%% " msgstr "Slanje karte: %d%%" -#: src/multiint.cpp:3794 +#: src/multiint.cpp:3790 #, c-format msgid "Map: %d%% downloaded" msgstr "Karta: %d%% downloadana" -#: src/multiint.cpp:3820 +#: src/multiint.cpp:3816 msgid "HOST" msgstr "HOST" -#: src/multiint.cpp:3827 +#: src/multiint.cpp:3823 #: src/multimenu.cpp:772 msgid "Ping" msgstr "Ping" @@ -14615,79 +14611,79 @@ msgstr "Pošalji resurse igraču" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "Izbacivanje igrača %s jer se podaci ne podudaraju" -#: src/multiplay.cpp:1057 +#: src/multiplay.cpp:1056 msgid "(allies" msgstr "(saveznika" -#: src/multiplay.cpp:1065 +#: src/multiplay.cpp:1064 msgid "(private to " msgstr "(samo za" -#: src/multiplay.cpp:1078 +#: src/multiplay.cpp:1077 msgid "[invalid]" msgstr "[nedostupno]" -#: src/multiplay.cpp:1942 +#: src/multiplay.cpp:1941 msgid "Green" msgstr "Zeleni" -#: src/multiplay.cpp:1943 +#: src/multiplay.cpp:1942 msgid "Orange" msgstr "Narančasti" -#: src/multiplay.cpp:1944 +#: src/multiplay.cpp:1943 msgid "Grey" msgstr "Sivi" -#: src/multiplay.cpp:1945 +#: src/multiplay.cpp:1944 msgid "Black" msgstr "Crni" -#: src/multiplay.cpp:1946 +#: src/multiplay.cpp:1945 msgid "Red" msgstr "Crveni" -#: src/multiplay.cpp:1947 +#: src/multiplay.cpp:1946 msgid "Blue" msgstr "Plavi" -#: src/multiplay.cpp:1948 +#: src/multiplay.cpp:1947 msgid "Pink" msgstr "Ljubičasta" -#: src/multiplay.cpp:1949 +#: src/multiplay.cpp:1948 msgid "Cyan" msgstr "Cijan" -#: src/multiplay.cpp:1950 +#: src/multiplay.cpp:1949 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:1951 +#: src/multiplay.cpp:1950 msgid "Purple" msgstr "" -#: src/multiplay.cpp:1952 +#: src/multiplay.cpp:1951 msgid "White" msgstr "" -#: src/multiplay.cpp:1953 +#: src/multiplay.cpp:1952 msgid "Bright blue" msgstr "" -#: src/multiplay.cpp:1954 +#: src/multiplay.cpp:1953 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:1955 +#: src/multiplay.cpp:1954 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:1956 +#: src/multiplay.cpp:1955 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:1957 +#: src/multiplay.cpp:1956 msgid "Brown" msgstr "" @@ -14695,16 +14691,16 @@ msgstr "" msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "" -#: src/research.cpp:1737 +#: src/research.cpp:1739 #, c-format msgid "Research completed: %s" msgstr "Istraživanje završeno: %s" -#: src/research.cpp:1742 +#: src/research.cpp:1744 msgid "Research Completed" msgstr "Istraživanje završeno" -#: src/research.cpp:2563 +#: src/research.cpp:2565 msgid "Research Award" msgstr "Nagrada hakiranog Istraživačkog centra" @@ -14868,63 +14864,63 @@ msgstr "Nemaš ni jedan mobilni radar." msgid "Unable to locate any Commanders!" msgstr "Nemaš ni jednog kapetana." -#: src/structure.cpp:2614 +#: src/structure.cpp:2650 #, fuzzy msgid "Command Control Limit Reached - Production Halted" msgstr "Limit prijeđen - Proizvodnja prekinuta" -#: src/structure.cpp:5806 -#: src/structure.cpp:5831 +#: src/structure.cpp:5888 +#: src/structure.cpp:5913 #, fuzzy, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" msgstr[0] "%s - %u jedinica dodjeljena" msgstr[1] "%s - %u jedinica dodjeljena" -#: src/structure.cpp:5836 -#: src/structure.cpp:5904 -#: src/structure.cpp:5920 -#: src/structure.cpp:5934 +#: src/structure.cpp:5918 +#: src/structure.cpp:5986 +#: src/structure.cpp:6002 +#: src/structure.cpp:6016 #, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - Oštečen %3.0f%%" -#: src/structure.cpp:5886 +#: src/structure.cpp:5968 #, c-format msgid "%s - Connected %u of %u" msgstr "%s - Povezan s %u od %u" -#: src/structure.cpp:6050 -#: src/structure.cpp:6095 +#: src/structure.cpp:6132 +#: src/structure.cpp:6177 #, c-format msgid "%s - Electronically Damaged" msgstr "%s - Hakirano" -#: src/structure.cpp:6332 +#: src/structure.cpp:6414 msgid "Electronic Reward - Visibility Report" msgstr "Nagrada hakirane građevine - Vizualno izvješče" -#: src/structure.cpp:6372 +#: src/structure.cpp:6454 msgid "Factory Reward - Propulsion" msgstr "Nagrada hakirane Tvornice - Vozni sustav" -#: src/structure.cpp:6396 +#: src/structure.cpp:6478 msgid "Factory Reward - Body" msgstr "Nagrada hakirane Tvornice - Trup" -#: src/structure.cpp:6420 +#: src/structure.cpp:6502 msgid "Factory Reward - Weapon" msgstr "Nagrada hakirane Tvornice - Oružje" -#: src/structure.cpp:6429 +#: src/structure.cpp:6511 msgid "Factory Reward - Nothing" msgstr "Nagrada hakirane Tvornice - Ništa" -#: src/structure.cpp:6457 +#: src/structure.cpp:6539 msgid "Repair Facility Award - Repair" msgstr "Nagrada hakiranog Servisa - Poravak" -#: src/structure.cpp:6464 +#: src/structure.cpp:6546 msgid "Repair Facility Award - Nothing" msgstr "Nagrada hakiranog Servisa - Ništa" @@ -14941,34 +14937,35 @@ msgstr "" msgid "Reinforcements landing" msgstr "Pojačanja dolaze" -#: src/version.cpp:143 -msgid " (modified and switched locally)" -msgstr " (lokalno promjenjena)" - -#: src/version.cpp:145 +#: src/version.cpp:129 msgid " (modified locally)" msgstr " (lokalno promjenjena)" -#: src/version.cpp:147 -msgid " (switched locally)" -msgstr " (lokalno promjenjena)" - -#: src/version.cpp:154 +#: src/version.cpp:136 msgid " - DEBUG" msgstr " - DEBUG" -#: src/version.cpp:163 +#: src/version.cpp:145 #, c-format msgid " - Built %s" msgstr " - Kompajlirano %s" #. TRANSLATORS: This string looks as follows when expanded. #. "Version " -#: src/version.cpp:173 +#: src/version.cpp:155 #, c-format msgid "Version %s%s%s%s" msgstr "Verzija %s%s%s%s" +#~ msgid "Kick player" +#~ msgstr "Izbaci igrača" + +#~ msgid " (modified and switched locally)" +#~ msgstr " (lokalno promjenjena)" + +#~ msgid " (switched locally)" +#~ msgstr " (lokalno promjenjena)" + #, fuzzy #~ msgid "Infinite Production" #~ msgstr "Ponovi proizvodnju" diff --git a/po/it.po b/po/it.po index 9e7554c7c..8930f992f 100644 --- a/po/it.po +++ b/po/it.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-02-25 23:35+0100\n" +"POT-Creation-Date: 2011-03-08 15:43+0100\n" "PO-Revision-Date: 2010-12-14 22:19+0100\n" "Last-Translator: Cristian Odorico \n" "Language-Team: Italian \n" @@ -12014,26 +12014,26 @@ msgid "System locale" msgstr "System locale" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1042 +#: lib/netplay/netplay.cpp:1037 msgid "Enter password here" msgstr "Inserisci qua la password" -#: lib/netplay/netplay.cpp:2060 +#: lib/netplay/netplay.cpp:2055 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "Non posso decidere il nome del server master (%s)!" -#: lib/netplay/netplay.cpp:2082 +#: lib/netplay/netplay.cpp:2077 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "Non posso comunicare con il server della Lobby! La porta TCP %u è aperta?" #: src/challenge.cpp:184 #: src/hci.cpp:916 -#: src/hci.cpp:3378 -#: src/hci.cpp:3501 -#: src/hci.cpp:3912 -#: src/hci.cpp:4930 +#: src/hci.cpp:3386 +#: src/hci.cpp:3509 +#: src/hci.cpp:3920 +#: src/hci.cpp:4938 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12340,7 +12340,7 @@ msgid "Player dropped" msgstr "Giocatore" #: src/display3d.cpp:599 -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2121 msgid "Waiting for other players" msgstr "In attesa degli altri giocatori" @@ -12353,7 +12353,7 @@ msgid "Cannot Build. Oil Resource Burning." msgstr "Impossibile costruire. Risorsa d'olio in fiamme." #: src/display.cpp:1828 -#: src/display.cpp:2421 +#: src/display.cpp:2420 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - Danno %d%% - Esperienza %d, %s" @@ -12384,77 +12384,77 @@ msgstr "Unità Persa!" msgid "Structure Restored" msgstr "Struttura Riparata" -#: src/droid.cpp:2732 +#: src/droid.cpp:2734 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" msgstr[0] "Gruppo %u selezionato - %u Unità" msgstr[1] "Gruppo %u selezionato - %u Unità" -#: src/droid.cpp:2745 +#: src/droid.cpp:2747 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" msgstr[0] "%u unità assegnata al Gruppo %u" msgstr[1] "%u unità assegnata al Gruppo %u" -#: src/droid.cpp:2758 +#: src/droid.cpp:2760 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" msgstr[0] "Visuale Centrata sul Gruppo %u - %u Unit" msgstr[1] "Visuale Centrata sul gruppo %u - %u Unità" -#: src/droid.cpp:2762 +#: src/droid.cpp:2764 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" msgstr[0] "Visuale affiancata al Gruppo %u - %u Unità" msgstr[1] "Visuale affiancata al Gruppo %u - %u Unità" -#: src/droid.cpp:3093 +#: src/droid.cpp:3095 msgid "Rookie" msgstr "Coscritta" -#: src/droid.cpp:3094 +#: src/droid.cpp:3096 msgctxt "rank" msgid "Green" msgstr "Inesperta" -#: src/droid.cpp:3095 +#: src/droid.cpp:3097 msgid "Trained" msgstr "Addestrata" -#: src/droid.cpp:3096 +#: src/droid.cpp:3098 msgid "Regular" msgstr "Normale" -#: src/droid.cpp:3097 +#: src/droid.cpp:3099 msgid "Professional" msgstr "Professionale" -#: src/droid.cpp:3098 +#: src/droid.cpp:3100 msgid "Veteran" msgstr "Veterana" -#: src/droid.cpp:3099 +#: src/droid.cpp:3101 msgid "Elite" msgstr "Elite" -#: src/droid.cpp:3100 +#: src/droid.cpp:3102 msgid "Special" msgstr "Speciale" -#: src/droid.cpp:3101 +#: src/droid.cpp:3103 msgid "Hero" msgstr "Eroe" -#: src/droid.cpp:4123 +#: src/droid.cpp:4125 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "%s avrebbe voluto darti un %s ma ne hai troppi!" -#: src/droid.cpp:4127 +#: src/droid.cpp:4129 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "Volevi dare a %s un %s ma ne hanno troppi!" @@ -12473,7 +12473,7 @@ msgid "Tutorial" msgstr "Tutorial" #: src/frontend.cpp:100 -#: src/hci.cpp:3487 +#: src/hci.cpp:3495 msgid "Options" msgstr "Opzioni" @@ -12534,8 +12534,8 @@ msgstr "GIOCATORE SINGOLO" #: src/frontend.cpp:303 #: src/ingameop.cpp:494 -#: src/mission.cpp:2493 -#: src/mission.cpp:2596 +#: src/mission.cpp:2537 +#: src/mission.cpp:2640 msgid "Load Saved Game" msgstr "Carica Partita" @@ -12820,7 +12820,7 @@ msgid "GAME OPTIONS" msgstr "OPZIONI DI GIOCO" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2398 +#: src/multiint.cpp:2394 msgid "Mod: " msgstr "Mod:" @@ -12829,8 +12829,8 @@ msgid "MAP SAVED!" msgstr "MAPPA SALVATA!" #: src/hci.cpp:1573 -#: src/loop.cpp:558 -#: src/loop.cpp:574 +#: src/loop.cpp:561 +#: src/loop.cpp:577 msgid "GAME SAVED: " msgstr "PARTITA SALVATA:" @@ -12858,149 +12858,149 @@ msgstr "Il giocatore %u sta ottenendo una nuova unità per mezzo di trucchi (deb msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "Il giocatore %u sta ottenendo una nuova unità per mezzo di trucchi (debug menu)." -#: src/hci.cpp:3298 +#: src/hci.cpp:3306 msgid "Commanders (F6)" msgstr "Comandanti (F6)" -#: src/hci.cpp:3311 +#: src/hci.cpp:3319 msgid "Intelligence Display (F5)" msgstr "Intelligence (F5)" -#: src/hci.cpp:3324 +#: src/hci.cpp:3332 msgid "Manufacture (F1)" msgstr "Produzione (F1)" -#: src/hci.cpp:3337 +#: src/hci.cpp:3345 msgid "Design (F4)" msgstr "Progettazione (F4)" -#: src/hci.cpp:3350 +#: src/hci.cpp:3358 msgid "Research (F2)" msgstr "Ricerca (F2)" -#: src/hci.cpp:3363 +#: src/hci.cpp:3371 msgid "Build (F3)" msgstr "Costruzione (F3)" -#: src/hci.cpp:3434 +#: src/hci.cpp:3442 #: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Energia" -#: src/hci.cpp:3525 +#: src/hci.cpp:3533 msgid "Map:" msgstr "Mappa:" -#: src/hci.cpp:3538 +#: src/hci.cpp:3546 msgid "Load" msgstr "Carica" -#: src/hci.cpp:3539 +#: src/hci.cpp:3547 msgid "Load Map File" msgstr "Carica File Mappa" -#: src/hci.cpp:3546 +#: src/hci.cpp:3554 msgid "Save" msgstr "Salva" -#: src/hci.cpp:3547 +#: src/hci.cpp:3555 msgid "Save Map File" msgstr "Salva File Mappa" -#: src/hci.cpp:3555 +#: src/hci.cpp:3563 msgid "New" msgstr "Nuovo" -#: src/hci.cpp:3556 +#: src/hci.cpp:3564 msgid "New Blank Map" msgstr "Nuova mappa vuota" -#: src/hci.cpp:3592 +#: src/hci.cpp:3600 msgid "Tile" msgstr "Texture" -#: src/hci.cpp:3593 +#: src/hci.cpp:3601 msgid "Place tiles on map" msgstr "Piazza texture sulla mappa" -#: src/hci.cpp:3602 +#: src/hci.cpp:3610 msgid "Unit" msgstr "Unità" -#: src/hci.cpp:3603 +#: src/hci.cpp:3611 msgid "Place Unit on map" msgstr "Piazza un' Unità sulla mappa" -#: src/hci.cpp:3611 +#: src/hci.cpp:3619 msgid "Struct" msgstr "Struttura" -#: src/hci.cpp:3612 +#: src/hci.cpp:3620 msgid "Place Structures on map" msgstr "Piazza Strutture sulla mappa" -#: src/hci.cpp:3620 +#: src/hci.cpp:3628 msgid "Feat" msgstr "Caratteristica" -#: src/hci.cpp:3621 +#: src/hci.cpp:3629 msgid "Place Features on map" msgstr "Piazza Oggetti sulla mappa" -#: src/hci.cpp:3631 +#: src/hci.cpp:3639 msgid "Pause" msgstr "Pausa" -#: src/hci.cpp:3632 +#: src/hci.cpp:3640 msgid "Pause or unpause the game" msgstr "Metti in pausa o riprendi la partita" -#: src/hci.cpp:3646 +#: src/hci.cpp:3654 msgid "Align height of all map objects" msgstr "Allinea le altezze di tutti gli oggetti della mappa" -#: src/hci.cpp:3656 +#: src/hci.cpp:3664 msgid "Edit" msgstr "Edita" -#: src/hci.cpp:3657 +#: src/hci.cpp:3665 msgid "Start Edit Mode" msgstr "Inizia Modalità Edit" -#: src/hci.cpp:3671 +#: src/hci.cpp:3679 #: src/ingameop.cpp:112 #: src/ingameop.cpp:256 #: src/ingameop.cpp:260 msgid "Quit" msgstr "Abbandona" -#: src/hci.cpp:3672 +#: src/hci.cpp:3680 msgid "Exit Game" msgstr "Esci dal Gioco" -#: src/hci.cpp:3698 +#: src/hci.cpp:3706 msgid "Current Player:" msgstr "Player Attuale:" -#: src/hci.cpp:3989 +#: src/hci.cpp:3997 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "Barra del Progresso" -#: src/hci.cpp:4855 +#: src/hci.cpp:4863 msgid "Factory Delivery Point" msgstr "Punto di Raduno della Fabbrica" -#: src/hci.cpp:4873 +#: src/hci.cpp:4881 msgid "Loop Production" msgstr "Produzione Ciclica" -#: src/hci.cpp:4953 +#: src/hci.cpp:4961 msgid "Tab Scroll left" msgstr "Scorri tabella a Sinistra" -#: src/hci.cpp:4968 +#: src/hci.cpp:4976 msgid "Tab Scroll right" msgstr "Scorri tabella a Destra" @@ -13026,8 +13026,8 @@ msgstr "UI Tattica (Icona dell'Origine del bersaglio): Nascondi" #: src/ingameop.cpp:274 #: src/ingameop.cpp:498 -#: src/mission.cpp:2480 -#: src/mission.cpp:2599 +#: src/mission.cpp:2524 +#: src/mission.cpp:2643 msgid "Save Game" msgstr "Salva Partita" @@ -13956,42 +13956,42 @@ msgstr "Traccia un oggetto del gioco" msgid "Toggle Driving Mode" msgstr "Attiva o disattiva la Modalità di Guida" -#: src/loop.cpp:565 -#: src/loop.cpp:581 +#: src/loop.cpp:568 +#: src/loop.cpp:584 msgid "Could not save game!" msgstr "Non posso salvare la partita!" -#: src/mission.cpp:2041 +#: src/mission.cpp:2085 msgid "Load Transport" msgstr "Carica il trasporto" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "OBIETTIVO RAGGIUNTO barando!" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED" msgstr "OBIETTIVO RAGGIUNTO" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED--and you cheated!" msgstr "MISSIONE FALLITA e hai barato!" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED" msgstr "MISSIONE FALLITA" -#: src/mission.cpp:2459 -#: src/mission.cpp:2499 -#: src/mission.cpp:2613 +#: src/mission.cpp:2503 +#: src/mission.cpp:2543 +#: src/mission.cpp:2657 msgid "Quit To Main Menu" msgstr "Esci al Menu Principale" -#: src/mission.cpp:2467 +#: src/mission.cpp:2511 msgid "Continue Game" msgstr "Continua la Partita" -#: src/mission.cpp:2564 +#: src/mission.cpp:2608 msgid "GAME SAVED :" msgstr "PARTITA SALVATA!" @@ -14280,116 +14280,112 @@ msgstr "" msgid "Player colour" msgstr "Colore Giocatore" -#: src/multiint.cpp:2071 +#: src/multiint.cpp:2068 msgid "Team" msgstr "Squadra" -#: src/multiint.cpp:2083 -msgid "Kick player" -msgstr "Espelli giocatore" - -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 #, fuzzy msgid "Click to change difficulty" msgstr "Clicca per modificare la difficoltà dell'AI" -#: src/multiint.cpp:2130 +#: src/multiint.cpp:2126 msgid "Click when ready" msgstr "Clicca quando sei pronto" -#: src/multiint.cpp:2134 +#: src/multiint.cpp:2130 msgid "READY?" msgstr "PRONTO?" -#: src/multiint.cpp:2178 +#: src/multiint.cpp:2174 msgid "PLAYERS" msgstr "GIOCATORI" -#: src/multiint.cpp:2213 +#: src/multiint.cpp:2209 #, fuzzy msgid "Click to change to this slot" msgstr "Clicca per cambiare le impostazione del giocatore" -#: src/multiint.cpp:2241 +#: src/multiint.cpp:2237 msgid "Choose Team" msgstr "Scegli la squadra" -#: src/multiint.cpp:2271 +#: src/multiint.cpp:2267 #, fuzzy msgid "Click to change player colour" msgstr "Clicca per cambiare le impostazione del giocatore" -#: src/multiint.cpp:2299 +#: src/multiint.cpp:2295 #, fuzzy msgid "Click to change player position" msgstr "Clicca per cambiare le impostazione del giocatore" -#: src/multiint.cpp:2305 +#: src/multiint.cpp:2301 #, fuzzy msgid "Click to change AI" msgstr "Clicca per cambiare le impostazione del giocatore" -#: src/multiint.cpp:2309 +#: src/multiint.cpp:2305 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2371 +#: src/multiint.cpp:2367 msgid "CHAT" msgstr "CHAT" -#: src/multiint.cpp:2403 +#: src/multiint.cpp:2399 msgid "All players need to have the same mods to join your game." msgstr "Tutti i giocatori devono avere gli stessi mod per entrare nella tua partita." -#: src/multiint.cpp:2561 +#: src/multiint.cpp:2557 #, c-format msgid "*** password [%s] is now required! ***" msgstr "***La password [%s] ora è richiesta! ***" -#: src/multiint.cpp:2569 +#: src/multiint.cpp:2565 msgid "*** password is NOT required! ***" msgstr "*** La password non è richiesta! ***" -#: src/multiint.cpp:2810 +#: src/multiint.cpp:2806 msgid "Sorry! Failed to host the game." msgstr "Spiacente! Host della partita fallito." -#: src/multiint.cpp:2931 +#: src/multiint.cpp:2927 msgid "'Locked Teams' mode enabled" msgstr "Squadre Bloccate" -#: src/multiint.cpp:3012 +#: src/multiint.cpp:3008 #, c-format msgid "The host has kicked %s from the game!" msgstr "L'host ha espulso %s dalla partita!" -#: src/multiint.cpp:3082 +#: src/multiint.cpp:3078 msgid "Host is Starting Game" msgstr "L'host sta avviando la partita" -#: src/multiint.cpp:3648 +#: src/multiint.cpp:3644 msgid "Players" msgstr "Giocatori" -#: src/multiint.cpp:3786 +#: src/multiint.cpp:3782 #, c-format msgid "Sending Map: %d%% " msgstr "Invio mappa: %d%%" -#: src/multiint.cpp:3794 +#: src/multiint.cpp:3790 #, c-format msgid "Map: %d%% downloaded" msgstr "Mappa: %d%% scaricata" -#: src/multiint.cpp:3820 +#: src/multiint.cpp:3816 msgid "HOST" msgstr "HOST" -#: src/multiint.cpp:3827 +#: src/multiint.cpp:3823 #: src/multimenu.cpp:772 msgid "Ping" msgstr "Ping" @@ -14561,80 +14557,80 @@ msgstr "Invia Energia al Giocatore" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "Il giocatore %s sarà kickato perchè hanno cercato di bypassare il controllo dell'integrità dei dati!" -#: src/multiplay.cpp:1057 +#: src/multiplay.cpp:1056 msgid "(allies" msgstr "(alleati" -#: src/multiplay.cpp:1065 +#: src/multiplay.cpp:1064 msgid "(private to " msgstr "(privato a" -#: src/multiplay.cpp:1078 +#: src/multiplay.cpp:1077 msgid "[invalid]" msgstr "[invalido]" -#: src/multiplay.cpp:1942 +#: src/multiplay.cpp:1941 msgid "Green" msgstr "Verde" -#: src/multiplay.cpp:1943 +#: src/multiplay.cpp:1942 msgid "Orange" msgstr "Arancione" -#: src/multiplay.cpp:1944 +#: src/multiplay.cpp:1943 msgid "Grey" msgstr "Grigio" -#: src/multiplay.cpp:1945 +#: src/multiplay.cpp:1944 msgid "Black" msgstr "Nero" -#: src/multiplay.cpp:1946 +#: src/multiplay.cpp:1945 msgid "Red" msgstr "Rosso" -#: src/multiplay.cpp:1947 +#: src/multiplay.cpp:1946 msgid "Blue" msgstr "Blu" -#: src/multiplay.cpp:1948 +#: src/multiplay.cpp:1947 msgid "Pink" msgstr "Rosa" -#: src/multiplay.cpp:1949 +#: src/multiplay.cpp:1948 msgid "Cyan" msgstr "Azzurro" -#: src/multiplay.cpp:1950 +#: src/multiplay.cpp:1949 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:1951 +#: src/multiplay.cpp:1950 msgid "Purple" msgstr "" -#: src/multiplay.cpp:1952 +#: src/multiplay.cpp:1951 msgid "White" msgstr "" -#: src/multiplay.cpp:1953 +#: src/multiplay.cpp:1952 #, fuzzy msgid "Bright blue" msgstr "Pulsante destro" -#: src/multiplay.cpp:1954 +#: src/multiplay.cpp:1953 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:1955 +#: src/multiplay.cpp:1954 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:1956 +#: src/multiplay.cpp:1955 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:1957 +#: src/multiplay.cpp:1956 msgid "Brown" msgstr "" @@ -14642,16 +14638,16 @@ msgstr "" msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "Non possiamo farlo! Dobbiamo essere un'unità Cyborg per usare un trasporto Cyborg!" -#: src/research.cpp:1737 +#: src/research.cpp:1739 #, c-format msgid "Research completed: %s" msgstr "Ricerca Completata: %s" -#: src/research.cpp:1742 +#: src/research.cpp:1744 msgid "Research Completed" msgstr "Ricerca Completata" -#: src/research.cpp:2563 +#: src/research.cpp:2565 msgid "Research Award" msgstr "Premio della Ricerca" @@ -14815,63 +14811,63 @@ msgstr "Impossibile localizzare alcuna Unità Sensoria!" msgid "Unable to locate any Commanders!" msgstr "Impossibile localizzare alcun Comandante!" -#: src/structure.cpp:2614 +#: src/structure.cpp:2650 #, fuzzy msgid "Command Control Limit Reached - Production Halted" msgstr "Limite di Controllo Raggiunto - Produzione Arrestata" -#: src/structure.cpp:5806 -#: src/structure.cpp:5831 +#: src/structure.cpp:5888 +#: src/structure.cpp:5913 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" msgstr[0] "%s - %u Unità Assegnata" msgstr[1] "%s - %u Unità Assegnate" -#: src/structure.cpp:5836 -#: src/structure.cpp:5904 -#: src/structure.cpp:5920 -#: src/structure.cpp:5934 +#: src/structure.cpp:5918 +#: src/structure.cpp:5986 +#: src/structure.cpp:6002 +#: src/structure.cpp:6016 #, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - Danno %3.0f%%" -#: src/structure.cpp:5886 +#: src/structure.cpp:5968 #, c-format msgid "%s - Connected %u of %u" msgstr "%s - Collegati %u di %u" -#: src/structure.cpp:6050 -#: src/structure.cpp:6095 +#: src/structure.cpp:6132 +#: src/structure.cpp:6177 #, c-format msgid "%s - Electronically Damaged" msgstr "%s - Danneggiato Elettronicamente" -#: src/structure.cpp:6332 +#: src/structure.cpp:6414 msgid "Electronic Reward - Visibility Report" msgstr "Premio Elettronico - Rapporto di Visibilità" -#: src/structure.cpp:6372 +#: src/structure.cpp:6454 msgid "Factory Reward - Propulsion" msgstr "Premio della Fabbrica - Propulsione" -#: src/structure.cpp:6396 +#: src/structure.cpp:6478 msgid "Factory Reward - Body" msgstr "Premio della Fabbrica - Corpo" -#: src/structure.cpp:6420 +#: src/structure.cpp:6502 msgid "Factory Reward - Weapon" msgstr "Premio della Fabbrica - Arma" -#: src/structure.cpp:6429 +#: src/structure.cpp:6511 msgid "Factory Reward - Nothing" msgstr "Premio della Fabbrica - Niente" -#: src/structure.cpp:6457 +#: src/structure.cpp:6539 msgid "Repair Facility Award - Repair" msgstr "Premio della Struttura di Riparazione - Ripara" -#: src/structure.cpp:6464 +#: src/structure.cpp:6546 msgid "Repair Facility Award - Nothing" msgstr "Premio della Struttura di Riparazione - Niente" @@ -14888,34 +14884,35 @@ msgstr "Non c'è abbastanza spazio nel Trasporto!" msgid "Reinforcements landing" msgstr "I rinforzi stanno atterrando" -#: src/version.cpp:143 -msgid " (modified and switched locally)" -msgstr " (modificato e cambiato localmente)" - -#: src/version.cpp:145 +#: src/version.cpp:129 msgid " (modified locally)" msgstr " (modificato localmente)" -#: src/version.cpp:147 -msgid " (switched locally)" -msgstr " (cambiato localmente)" - -#: src/version.cpp:154 +#: src/version.cpp:136 msgid " - DEBUG" msgstr " - DEBUG" -#: src/version.cpp:163 +#: src/version.cpp:145 #, c-format msgid " - Built %s" msgstr " - Costruito %s" #. TRANSLATORS: This string looks as follows when expanded. #. "Version " -#: src/version.cpp:173 +#: src/version.cpp:155 #, c-format msgid "Version %s%s%s%s" msgstr "Versione %s%s%s%s" +#~ msgid "Kick player" +#~ msgstr "Espelli giocatore" + +#~ msgid " (modified and switched locally)" +#~ msgstr " (modificato e cambiato localmente)" + +#~ msgid " (switched locally)" +#~ msgstr " (cambiato localmente)" + #~ msgid "Player position" #~ msgstr "Posizione del giocatore" diff --git a/po/ko.po b/po/ko.po index 1771344be..ed40881f6 100644 --- a/po/ko.po +++ b/po/ko.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100 2.3_branch\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-02-25 23:35+0100\n" +"POT-Creation-Date: 2011-03-08 15:43+0100\n" "PO-Revision-Date: 2010-11-23 21:01+0900\n" "Last-Translator: Joshua Shin \n" "Language-Team: Korean Translation Team \n" @@ -12058,26 +12058,26 @@ msgid "System locale" msgstr "사용자 시스템 언어" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1042 +#: lib/netplay/netplay.cpp:1037 msgid "Enter password here" msgstr "여기에 비밀번호를 입력하십시오" -#: lib/netplay/netplay.cpp:2060 +#: lib/netplay/netplay.cpp:2055 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "마스터서버 이름을 확인할 수 없습니다 (%s)!" -#: lib/netplay/netplay.cpp:2082 +#: lib/netplay/netplay.cpp:2077 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "로비 서버와 통신할 수 없습니다! TCP 포트 %u 가 보내는 트래픽에 대해 열려 있습니까?" #: src/challenge.cpp:184 #: src/hci.cpp:916 -#: src/hci.cpp:3378 -#: src/hci.cpp:3501 -#: src/hci.cpp:3912 -#: src/hci.cpp:4930 +#: src/hci.cpp:3386 +#: src/hci.cpp:3509 +#: src/hci.cpp:3920 +#: src/hci.cpp:4938 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12390,7 +12390,7 @@ msgid "Player dropped" msgstr "플레이어가 인터넷 연결 문제 또는 게임 버그 때문에 퇴장하였습니다" #: src/display3d.cpp:599 -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2121 msgid "Waiting for other players" msgstr "다른 플레이어를 더 기다리고 있습니다" @@ -12403,7 +12403,7 @@ msgid "Cannot Build. Oil Resource Burning." msgstr "건설이 불가능합니다. 석유 자원이 타고 있습니다" #: src/display.cpp:1828 -#: src/display.cpp:2421 +#: src/display.cpp:2420 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - 데미지 %d%% - 경험치 %d, %s" @@ -12436,76 +12436,76 @@ msgid "Structure Restored" msgstr "구조물이 복구되었습니다" # ask about form 0, 1, 2, etc -#: src/droid.cpp:2732 +#: src/droid.cpp:2734 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" msgstr[0] "부대 %u가(이) 선택되었습니다 - 유닛 %u개" -#: src/droid.cpp:2745 +#: src/droid.cpp:2747 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" msgstr[0] "유닛 %u개가 부대 %u에 할당되었습니다" -#: src/droid.cpp:2758 +#: src/droid.cpp:2760 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" msgstr[0] "부대 %u를(을) 중심으로 - 유닛 %u개" -#: src/droid.cpp:2762 +#: src/droid.cpp:2764 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" msgstr[0] "부대 %u와(과) 정렬하였습니다 - 유닛 %u개" -#: src/droid.cpp:3093 +#: src/droid.cpp:3095 msgid "Rookie" msgstr "루키" -#: src/droid.cpp:3094 +#: src/droid.cpp:3096 msgctxt "rank" msgid "Green" msgstr "그린" # finished training, # is now intern -#: src/droid.cpp:3095 +#: src/droid.cpp:3097 msgid "Trained" msgstr "견습병" # 정규 사병 = regular soldier -#: src/droid.cpp:3096 +#: src/droid.cpp:3098 msgid "Regular" msgstr "정규병" -#: src/droid.cpp:3097 +#: src/droid.cpp:3099 msgid "Professional" msgstr "프로페셔널" -#: src/droid.cpp:3098 +#: src/droid.cpp:3100 msgid "Veteran" msgstr "베테랑" -#: src/droid.cpp:3099 +#: src/droid.cpp:3101 msgid "Elite" msgstr "엘리트" -#: src/droid.cpp:3100 +#: src/droid.cpp:3102 msgid "Special" msgstr "스페셜" -#: src/droid.cpp:3101 +#: src/droid.cpp:3103 msgid "Hero" msgstr "히어로" -#: src/droid.cpp:4123 +#: src/droid.cpp:4125 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "%s가 당신에게 %s를(을) 주고 싶어하지만 이미 수가 너무 많습니다!" -#: src/droid.cpp:4127 +#: src/droid.cpp:4129 #, fuzzy, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "%s가 당신에게 %s를(을) 주고 싶어하지만 이미 수가 너무 많습니다!" @@ -12524,7 +12524,7 @@ msgid "Tutorial" msgstr "튜토리얼" #: src/frontend.cpp:100 -#: src/hci.cpp:3487 +#: src/hci.cpp:3495 msgid "Options" msgstr "옵션" @@ -12585,8 +12585,8 @@ msgstr "싱글 플레이어" #: src/frontend.cpp:303 #: src/ingameop.cpp:494 -#: src/mission.cpp:2493 -#: src/mission.cpp:2596 +#: src/mission.cpp:2537 +#: src/mission.cpp:2640 msgid "Load Saved Game" msgstr "저장된 게임 로드하기" @@ -12872,7 +12872,7 @@ msgid "GAME OPTIONS" msgstr "게임 옵션" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2398 +#: src/multiint.cpp:2394 msgid "Mod: " msgstr "Mod (Modification):" @@ -12881,8 +12881,8 @@ msgid "MAP SAVED!" msgstr "맵이 저장되었습니다!" #: src/hci.cpp:1573 -#: src/loop.cpp:558 -#: src/loop.cpp:574 +#: src/loop.cpp:561 +#: src/loop.cpp:577 #, fuzzy msgid "GAME SAVED: " msgstr "게임이 저장되었습니다 : " @@ -12911,149 +12911,149 @@ msgstr "플레이어 %u 가 치트(디버그 메뉴)를 사용해 새로운 병 msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "플레이어 %u 가 치트(디버그 메뉴)를 사용해 새로운 병사를 만들었습니다: %s." -#: src/hci.cpp:3298 +#: src/hci.cpp:3306 msgid "Commanders (F6)" msgstr "사령관 (F6)" -#: src/hci.cpp:3311 +#: src/hci.cpp:3319 msgid "Intelligence Display (F5)" msgstr "보도 디스플레이 (F5)" -#: src/hci.cpp:3324 +#: src/hci.cpp:3332 msgid "Manufacture (F1)" msgstr "생산 (F1)" -#: src/hci.cpp:3337 +#: src/hci.cpp:3345 msgid "Design (F4)" msgstr "디자인 (F4)" -#: src/hci.cpp:3350 +#: src/hci.cpp:3358 msgid "Research (F2)" msgstr "연구 (F2)" -#: src/hci.cpp:3363 +#: src/hci.cpp:3371 msgid "Build (F3)" msgstr "건축 (F3)" -#: src/hci.cpp:3434 +#: src/hci.cpp:3442 #: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "전력" -#: src/hci.cpp:3525 +#: src/hci.cpp:3533 msgid "Map:" msgstr "맵: " -#: src/hci.cpp:3538 +#: src/hci.cpp:3546 msgid "Load" msgstr "로드" -#: src/hci.cpp:3539 +#: src/hci.cpp:3547 msgid "Load Map File" msgstr "맵 파일 로드" -#: src/hci.cpp:3546 +#: src/hci.cpp:3554 msgid "Save" msgstr "저장" -#: src/hci.cpp:3547 +#: src/hci.cpp:3555 msgid "Save Map File" msgstr "맵 파일 저장" -#: src/hci.cpp:3555 +#: src/hci.cpp:3563 msgid "New" msgstr "새로 (New)" -#: src/hci.cpp:3556 +#: src/hci.cpp:3564 msgid "New Blank Map" msgstr "새로운 빈 맵" -#: src/hci.cpp:3592 +#: src/hci.cpp:3600 msgid "Tile" msgstr "타일" -#: src/hci.cpp:3593 +#: src/hci.cpp:3601 msgid "Place tiles on map" msgstr "게임 맵에서 타일을 놓기" -#: src/hci.cpp:3602 +#: src/hci.cpp:3610 msgid "Unit" msgstr "유닛" -#: src/hci.cpp:3603 +#: src/hci.cpp:3611 msgid "Place Unit on map" msgstr "게임 맵 안에 유닛 배치하기" -#: src/hci.cpp:3611 +#: src/hci.cpp:3619 msgid "Struct" msgstr "구조물" -#: src/hci.cpp:3612 +#: src/hci.cpp:3620 msgid "Place Structures on map" msgstr "게임 맵에서 구조물을 놓기" -#: src/hci.cpp:3620 +#: src/hci.cpp:3628 msgid "Feat" msgstr "물체" -#: src/hci.cpp:3621 +#: src/hci.cpp:3629 msgid "Place Features on map" msgstr "물체(Feature)를 맵위에 배치하기" -#: src/hci.cpp:3631 +#: src/hci.cpp:3639 msgid "Pause" msgstr "일시 정지" -#: src/hci.cpp:3632 +#: src/hci.cpp:3640 msgid "Pause or unpause the game" msgstr "게임을 일시 중지하거나 일시중지를 해제합니다" -#: src/hci.cpp:3646 +#: src/hci.cpp:3654 msgid "Align height of all map objects" msgstr "모든 맵 개체의 높이를 정렬하기 " -#: src/hci.cpp:3656 +#: src/hci.cpp:3664 msgid "Edit" msgstr "편집" -#: src/hci.cpp:3657 +#: src/hci.cpp:3665 msgid "Start Edit Mode" msgstr "편집 모드 시작하기" -#: src/hci.cpp:3671 +#: src/hci.cpp:3679 #: src/ingameop.cpp:112 #: src/ingameop.cpp:256 #: src/ingameop.cpp:260 msgid "Quit" msgstr "종료" -#: src/hci.cpp:3672 +#: src/hci.cpp:3680 msgid "Exit Game" msgstr "게임 종료" -#: src/hci.cpp:3698 +#: src/hci.cpp:3706 msgid "Current Player:" msgstr "현재 플레이어: " -#: src/hci.cpp:3989 +#: src/hci.cpp:3997 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "진행률 표시줄" -#: src/hci.cpp:4855 +#: src/hci.cpp:4863 msgid "Factory Delivery Point" msgstr "공장 배달 지점" -#: src/hci.cpp:4873 +#: src/hci.cpp:4881 msgid "Loop Production" msgstr "반복 생산" -#: src/hci.cpp:4953 +#: src/hci.cpp:4961 msgid "Tab Scroll left" msgstr "왼쪽으로 탭 스크롤" -#: src/hci.cpp:4968 +#: src/hci.cpp:4976 msgid "Tab Scroll right" msgstr "오른쪽으로 탭 스크롤" @@ -13079,8 +13079,8 @@ msgstr "" #: src/ingameop.cpp:274 #: src/ingameop.cpp:498 -#: src/mission.cpp:2480 -#: src/mission.cpp:2599 +#: src/mission.cpp:2524 +#: src/mission.cpp:2643 msgid "Save Game" msgstr "게임 저장" @@ -14017,42 +14017,42 @@ msgstr "게임 개체 트레이스(trace)하기" msgid "Toggle Driving Mode" msgstr "유닛 운전 모드 켜짐/꺼짐" -#: src/loop.cpp:565 -#: src/loop.cpp:581 +#: src/loop.cpp:568 +#: src/loop.cpp:584 msgid "Could not save game!" msgstr "게임을 저장할 수 없습니다!" -#: src/mission.cpp:2041 +#: src/mission.cpp:2085 msgid "Load Transport" msgstr "수송선에 싣기" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "목표 달성 (치팅했습니다!)" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED" msgstr "목표 달성" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED--and you cheated!" msgstr "목표 달성 실패--그리고 치트를 사용했습니다!" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED" msgstr "목표 달성 실패" -#: src/mission.cpp:2459 -#: src/mission.cpp:2499 -#: src/mission.cpp:2613 +#: src/mission.cpp:2503 +#: src/mission.cpp:2543 +#: src/mission.cpp:2657 msgid "Quit To Main Menu" msgstr "메인 메뉴로 종료하기" -#: src/mission.cpp:2467 +#: src/mission.cpp:2511 msgid "Continue Game" msgstr "게임 계속하기" -#: src/mission.cpp:2564 +#: src/mission.cpp:2608 msgid "GAME SAVED :" msgstr "게임이 저장되었습니다 : " @@ -14341,116 +14341,112 @@ msgstr "" msgid "Player colour" msgstr "플레이어 색" -#: src/multiint.cpp:2071 +#: src/multiint.cpp:2068 msgid "Team" msgstr "팀" -#: src/multiint.cpp:2083 -msgid "Kick player" -msgstr "플레이어 퇴장시키기" - -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 #, fuzzy msgid "Click to change difficulty" msgstr "인공 지능 난이도를 변경하려면 클릭하십시오" -#: src/multiint.cpp:2130 +#: src/multiint.cpp:2126 msgid "Click when ready" msgstr "준비되었을 때 클릭하십시오" -#: src/multiint.cpp:2134 +#: src/multiint.cpp:2130 msgid "READY?" msgstr "시작" -#: src/multiint.cpp:2178 +#: src/multiint.cpp:2174 msgid "PLAYERS" msgstr "플레이어" -#: src/multiint.cpp:2213 +#: src/multiint.cpp:2209 #, fuzzy msgid "Click to change to this slot" msgstr "사용자 설정을 변경하려면 클릭하십시오" -#: src/multiint.cpp:2241 +#: src/multiint.cpp:2237 msgid "Choose Team" msgstr "팀 선택" -#: src/multiint.cpp:2271 +#: src/multiint.cpp:2267 #, fuzzy msgid "Click to change player colour" msgstr "사용자 설정을 변경하려면 클릭하십시오" -#: src/multiint.cpp:2299 +#: src/multiint.cpp:2295 #, fuzzy msgid "Click to change player position" msgstr "사용자 설정을 변경하려면 클릭하십시오" -#: src/multiint.cpp:2305 +#: src/multiint.cpp:2301 #, fuzzy msgid "Click to change AI" msgstr "사용자 설정을 변경하려면 클릭하십시오" -#: src/multiint.cpp:2309 +#: src/multiint.cpp:2305 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2371 +#: src/multiint.cpp:2367 msgid "CHAT" msgstr "채팅" -#: src/multiint.cpp:2403 +#: src/multiint.cpp:2399 msgid "All players need to have the same mods to join your game." msgstr "모든 플레이어는 당신과 같은 mod를 사용해야만 게임에 참여할 수 있습니다" -#: src/multiint.cpp:2561 +#: src/multiint.cpp:2557 #, c-format msgid "*** password [%s] is now required! ***" msgstr "*** 이제 비밀번호 [%s] 가 요구됩니다! ***" -#: src/multiint.cpp:2569 +#: src/multiint.cpp:2565 msgid "*** password is NOT required! ***" msgstr "*** 비밀번호가 요구되지 않습니다! ***" -#: src/multiint.cpp:2810 +#: src/multiint.cpp:2806 msgid "Sorry! Failed to host the game." msgstr "죄송합니다! 게임 호스팅이 실패하였습니다" -#: src/multiint.cpp:2931 +#: src/multiint.cpp:2927 msgid "'Locked Teams' mode enabled" msgstr "'팀 잠금' 모드가 켜졌습니다" -#: src/multiint.cpp:3012 +#: src/multiint.cpp:3008 #, c-format msgid "The host has kicked %s from the game!" msgstr "호스트가 %s를 게임에서 퇴장시켰습니다!" -#: src/multiint.cpp:3082 +#: src/multiint.cpp:3078 msgid "Host is Starting Game" msgstr "호스트가 게임을 시작하고 있습니다" -#: src/multiint.cpp:3648 +#: src/multiint.cpp:3644 msgid "Players" msgstr "플레이어" -#: src/multiint.cpp:3786 +#: src/multiint.cpp:3782 #, c-format msgid "Sending Map: %d%% " msgstr "맵을 보내는 중: %d%% " -#: src/multiint.cpp:3794 +#: src/multiint.cpp:3790 #, c-format msgid "Map: %d%% downloaded" msgstr "맵: %d%% 다운로드 완료" -#: src/multiint.cpp:3820 +#: src/multiint.cpp:3816 msgid "HOST" msgstr "호스트" -#: src/multiint.cpp:3827 +#: src/multiint.cpp:3823 #: src/multimenu.cpp:772 msgid "Ping" msgstr "핑(Ping)" @@ -14626,80 +14622,80 @@ msgstr "플레이어에게 전력 제공하기" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "데이터 무결성 시험을 건너뛰려 했기 때문에 %s가 퇴장당하였습니다!" -#: src/multiplay.cpp:1057 +#: src/multiplay.cpp:1056 msgid "(allies" msgstr "(동맹팀" -#: src/multiplay.cpp:1065 +#: src/multiplay.cpp:1064 msgid "(private to " msgstr "(개인적입니다 " -#: src/multiplay.cpp:1078 +#: src/multiplay.cpp:1077 msgid "[invalid]" msgstr "[인식 불가능]" -#: src/multiplay.cpp:1942 +#: src/multiplay.cpp:1941 msgid "Green" msgstr "녹색" -#: src/multiplay.cpp:1943 +#: src/multiplay.cpp:1942 msgid "Orange" msgstr "주황색" -#: src/multiplay.cpp:1944 +#: src/multiplay.cpp:1943 msgid "Grey" msgstr "회색" -#: src/multiplay.cpp:1945 +#: src/multiplay.cpp:1944 msgid "Black" msgstr "검정색" -#: src/multiplay.cpp:1946 +#: src/multiplay.cpp:1945 msgid "Red" msgstr "빨강색" -#: src/multiplay.cpp:1947 +#: src/multiplay.cpp:1946 msgid "Blue" msgstr "파랑색" -#: src/multiplay.cpp:1948 +#: src/multiplay.cpp:1947 msgid "Pink" msgstr "핑크색" -#: src/multiplay.cpp:1949 +#: src/multiplay.cpp:1948 msgid "Cyan" msgstr "청록색" -#: src/multiplay.cpp:1950 +#: src/multiplay.cpp:1949 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:1951 +#: src/multiplay.cpp:1950 msgid "Purple" msgstr "" -#: src/multiplay.cpp:1952 +#: src/multiplay.cpp:1951 msgid "White" msgstr "" -#: src/multiplay.cpp:1953 +#: src/multiplay.cpp:1952 #, fuzzy msgid "Bright blue" msgstr "마우스 오른쪽 버튼" -#: src/multiplay.cpp:1954 +#: src/multiplay.cpp:1953 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:1955 +#: src/multiplay.cpp:1954 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:1956 +#: src/multiplay.cpp:1955 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:1957 +#: src/multiplay.cpp:1956 msgid "Brown" msgstr "" @@ -14707,16 +14703,16 @@ msgstr "" msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "" -#: src/research.cpp:1737 +#: src/research.cpp:1739 #, c-format msgid "Research completed: %s" msgstr "연구 완료: %s" -#: src/research.cpp:1742 +#: src/research.cpp:1744 msgid "Research Completed" msgstr "연구 완료" -#: src/research.cpp:2563 +#: src/research.cpp:2565 msgid "Research Award" msgstr "연구 상" @@ -14879,62 +14875,62 @@ msgstr "센서 유닛을 찾을 수 없습니다!" msgid "Unable to locate any Commanders!" msgstr "사령관을 찾을 수 없습니다!" -#: src/structure.cpp:2614 +#: src/structure.cpp:2650 #, fuzzy msgid "Command Control Limit Reached - Production Halted" msgstr "제어 한계에 도달하였습니다 - 생산이 중단되었습니다" -#: src/structure.cpp:5806 -#: src/structure.cpp:5831 +#: src/structure.cpp:5888 +#: src/structure.cpp:5913 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" msgstr[0] "%s - 유닛 %u개 할당되었습니다" -#: src/structure.cpp:5836 -#: src/structure.cpp:5904 -#: src/structure.cpp:5920 -#: src/structure.cpp:5934 +#: src/structure.cpp:5918 +#: src/structure.cpp:5986 +#: src/structure.cpp:6002 +#: src/structure.cpp:6016 #, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - 데미지 %3.0f%%" -#: src/structure.cpp:5886 +#: src/structure.cpp:5968 #, c-format msgid "%s - Connected %u of %u" msgstr "%s - %u개 연결 되었습니다 (전체 %u개)" -#: src/structure.cpp:6050 -#: src/structure.cpp:6095 +#: src/structure.cpp:6132 +#: src/structure.cpp:6177 #, c-format msgid "%s - Electronically Damaged" msgstr "%s - 전자적으로 손상됨" -#: src/structure.cpp:6332 +#: src/structure.cpp:6414 msgid "Electronic Reward - Visibility Report" msgstr "전자적 보상 - 시계보고" -#: src/structure.cpp:6372 +#: src/structure.cpp:6454 msgid "Factory Reward - Propulsion" msgstr "공장 보상 - 추진력" -#: src/structure.cpp:6396 +#: src/structure.cpp:6478 msgid "Factory Reward - Body" msgstr "공장 보상 - 차체" -#: src/structure.cpp:6420 +#: src/structure.cpp:6502 msgid "Factory Reward - Weapon" msgstr "공장 보상 - 무기" -#: src/structure.cpp:6429 +#: src/structure.cpp:6511 msgid "Factory Reward - Nothing" msgstr "공장 보상 - 없음" -#: src/structure.cpp:6457 +#: src/structure.cpp:6539 msgid "Repair Facility Award - Repair" msgstr "수리 시설 상 - 수리" -#: src/structure.cpp:6464 +#: src/structure.cpp:6546 msgid "Repair Facility Award - Nothing" msgstr "수리 시설 상 - 없음" @@ -14951,34 +14947,35 @@ msgstr "" msgid "Reinforcements landing" msgstr "지원군이 착륙하고 있습니다" -#: src/version.cpp:143 -msgid " (modified and switched locally)" -msgstr " (로컬 수정 및 전환switch)" - -#: src/version.cpp:145 +#: src/version.cpp:129 msgid " (modified locally)" msgstr " (로컬 수정)" -#: src/version.cpp:147 -msgid " (switched locally)" -msgstr " (로컬 전환switch)" - -#: src/version.cpp:154 +#: src/version.cpp:136 msgid " - DEBUG" msgstr " - 디버그(DEBUG)" -#: src/version.cpp:163 +#: src/version.cpp:145 #, c-format msgid " - Built %s" msgstr " - 빌드 날짜 %s" #. TRANSLATORS: This string looks as follows when expanded. #. "Version " -#: src/version.cpp:173 +#: src/version.cpp:155 #, c-format msgid "Version %s%s%s%s" msgstr "버젼 %s%s%s%s" +#~ msgid "Kick player" +#~ msgstr "플레이어 퇴장시키기" + +#~ msgid " (modified and switched locally)" +#~ msgstr " (로컬 수정 및 전환switch)" + +#~ msgid " (switched locally)" +#~ msgstr " (로컬 전환switch)" + #~ msgid "Infinite Production" #~ msgstr "무한 생산" diff --git a/po/la.po b/po/la.po index 0d2cfeb5c..1f3dac171 100644 --- a/po/la.po +++ b/po/la.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-02-25 23:35+0100\n" +"POT-Creation-Date: 2011-03-08 15:43+0100\n" "PO-Revision-Date: 2008-05-09 16:39+0000\n" "Last-Translator: Giel van Schijndel \n" "Language-Team: Latin\n" @@ -12037,26 +12037,26 @@ msgid "System locale" msgstr "" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1042 +#: lib/netplay/netplay.cpp:1037 msgid "Enter password here" msgstr "" -#: lib/netplay/netplay.cpp:2060 +#: lib/netplay/netplay.cpp:2055 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "" -#: lib/netplay/netplay.cpp:2082 +#: lib/netplay/netplay.cpp:2077 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "" #: src/challenge.cpp:184 #: src/hci.cpp:916 -#: src/hci.cpp:3378 -#: src/hci.cpp:3501 -#: src/hci.cpp:3912 -#: src/hci.cpp:4930 +#: src/hci.cpp:3386 +#: src/hci.cpp:3509 +#: src/hci.cpp:3920 +#: src/hci.cpp:4938 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12363,7 +12363,7 @@ msgid "Player dropped" msgstr "" #: src/display3d.cpp:599 -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2121 msgid "Waiting for other players" msgstr "" @@ -12376,7 +12376,7 @@ msgid "Cannot Build. Oil Resource Burning." msgstr "" #: src/display.cpp:1828 -#: src/display.cpp:2421 +#: src/display.cpp:2420 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "" @@ -12407,80 +12407,80 @@ msgstr "" msgid "Structure Restored" msgstr "" -#: src/droid.cpp:2732 +#: src/droid.cpp:2734 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:2745 +#: src/droid.cpp:2747 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:2758 +#: src/droid.cpp:2760 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:2762 +#: src/droid.cpp:2764 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:3093 +#: src/droid.cpp:3095 msgid "Rookie" msgstr "" -#: src/droid.cpp:3094 +#: src/droid.cpp:3096 msgctxt "rank" msgid "Green" msgstr "" -#: src/droid.cpp:3095 +#: src/droid.cpp:3097 #, fuzzy msgid "Trained" msgstr "Exercitum" -#: src/droid.cpp:3096 +#: src/droid.cpp:3098 msgid "Regular" msgstr "" -#: src/droid.cpp:3097 +#: src/droid.cpp:3099 msgid "Professional" msgstr "" -#: src/droid.cpp:3098 +#: src/droid.cpp:3100 #, fuzzy msgid "Veteran" msgstr "Veteranum" -#: src/droid.cpp:3099 +#: src/droid.cpp:3101 msgid "Elite" msgstr "" -#: src/droid.cpp:3100 +#: src/droid.cpp:3102 msgid "Special" msgstr "" -#: src/droid.cpp:3101 +#: src/droid.cpp:3103 #, fuzzy msgid "Hero" msgstr "Heros" -#: src/droid.cpp:4123 +#: src/droid.cpp:4125 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "" -#: src/droid.cpp:4127 +#: src/droid.cpp:4129 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "" @@ -12499,7 +12499,7 @@ msgid "Tutorial" msgstr "" #: src/frontend.cpp:100 -#: src/hci.cpp:3487 +#: src/hci.cpp:3495 msgid "Options" msgstr "" @@ -12560,8 +12560,8 @@ msgstr "" #: src/frontend.cpp:303 #: src/ingameop.cpp:494 -#: src/mission.cpp:2493 -#: src/mission.cpp:2596 +#: src/mission.cpp:2537 +#: src/mission.cpp:2640 msgid "Load Saved Game" msgstr "" @@ -12844,7 +12844,7 @@ msgid "GAME OPTIONS" msgstr "" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2398 +#: src/multiint.cpp:2394 msgid "Mod: " msgstr "" @@ -12853,8 +12853,8 @@ msgid "MAP SAVED!" msgstr "" #: src/hci.cpp:1573 -#: src/loop.cpp:558 -#: src/loop.cpp:574 +#: src/loop.cpp:561 +#: src/loop.cpp:577 msgid "GAME SAVED: " msgstr "" @@ -12882,153 +12882,153 @@ msgstr "" msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "" -#: src/hci.cpp:3298 +#: src/hci.cpp:3306 msgid "Commanders (F6)" msgstr "" -#: src/hci.cpp:3311 +#: src/hci.cpp:3319 msgid "Intelligence Display (F5)" msgstr "" -#: src/hci.cpp:3324 +#: src/hci.cpp:3332 msgid "Manufacture (F1)" msgstr "" -#: src/hci.cpp:3337 +#: src/hci.cpp:3345 msgid "Design (F4)" msgstr "" -#: src/hci.cpp:3350 +#: src/hci.cpp:3358 #, fuzzy msgid "Research (F2)" msgstr "Invenio" -#: src/hci.cpp:3363 +#: src/hci.cpp:3371 #, fuzzy msgid "Build (F3)" msgstr "Construo" -#: src/hci.cpp:3434 +#: src/hci.cpp:3442 #: src/multiint.cpp:1401 #: src/multimenu.cpp:763 #, fuzzy msgid "Power" msgstr "Vigor" -#: src/hci.cpp:3525 +#: src/hci.cpp:3533 msgid "Map:" msgstr "" -#: src/hci.cpp:3538 +#: src/hci.cpp:3546 msgid "Load" msgstr "" -#: src/hci.cpp:3539 +#: src/hci.cpp:3547 msgid "Load Map File" msgstr "" -#: src/hci.cpp:3546 +#: src/hci.cpp:3554 msgid "Save" msgstr "" -#: src/hci.cpp:3547 +#: src/hci.cpp:3555 msgid "Save Map File" msgstr "" -#: src/hci.cpp:3555 +#: src/hci.cpp:3563 msgid "New" msgstr "" -#: src/hci.cpp:3556 +#: src/hci.cpp:3564 msgid "New Blank Map" msgstr "" -#: src/hci.cpp:3592 +#: src/hci.cpp:3600 #, fuzzy msgid "Tile" msgstr "Exercitum" -#: src/hci.cpp:3593 +#: src/hci.cpp:3601 msgid "Place tiles on map" msgstr "" -#: src/hci.cpp:3602 +#: src/hci.cpp:3610 msgid "Unit" msgstr "" -#: src/hci.cpp:3603 +#: src/hci.cpp:3611 msgid "Place Unit on map" msgstr "" -#: src/hci.cpp:3611 +#: src/hci.cpp:3619 msgid "Struct" msgstr "" -#: src/hci.cpp:3612 +#: src/hci.cpp:3620 msgid "Place Structures on map" msgstr "" -#: src/hci.cpp:3620 +#: src/hci.cpp:3628 msgid "Feat" msgstr "" -#: src/hci.cpp:3621 +#: src/hci.cpp:3629 msgid "Place Features on map" msgstr "" -#: src/hci.cpp:3631 +#: src/hci.cpp:3639 msgid "Pause" msgstr "" -#: src/hci.cpp:3632 +#: src/hci.cpp:3640 msgid "Pause or unpause the game" msgstr "" -#: src/hci.cpp:3646 +#: src/hci.cpp:3654 msgid "Align height of all map objects" msgstr "" -#: src/hci.cpp:3656 +#: src/hci.cpp:3664 msgid "Edit" msgstr "" -#: src/hci.cpp:3657 +#: src/hci.cpp:3665 msgid "Start Edit Mode" msgstr "" -#: src/hci.cpp:3671 +#: src/hci.cpp:3679 #: src/ingameop.cpp:112 #: src/ingameop.cpp:256 #: src/ingameop.cpp:260 msgid "Quit" msgstr "" -#: src/hci.cpp:3672 +#: src/hci.cpp:3680 msgid "Exit Game" msgstr "" -#: src/hci.cpp:3698 +#: src/hci.cpp:3706 msgid "Current Player:" msgstr "" -#: src/hci.cpp:3989 +#: src/hci.cpp:3997 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "" -#: src/hci.cpp:4855 +#: src/hci.cpp:4863 msgid "Factory Delivery Point" msgstr "" -#: src/hci.cpp:4873 +#: src/hci.cpp:4881 msgid "Loop Production" msgstr "" -#: src/hci.cpp:4953 +#: src/hci.cpp:4961 msgid "Tab Scroll left" msgstr "" -#: src/hci.cpp:4968 +#: src/hci.cpp:4976 msgid "Tab Scroll right" msgstr "" @@ -13054,8 +13054,8 @@ msgstr "" #: src/ingameop.cpp:274 #: src/ingameop.cpp:498 -#: src/mission.cpp:2480 -#: src/mission.cpp:2599 +#: src/mission.cpp:2524 +#: src/mission.cpp:2643 msgid "Save Game" msgstr "" @@ -13986,42 +13986,42 @@ msgstr "" msgid "Toggle Driving Mode" msgstr "" -#: src/loop.cpp:565 -#: src/loop.cpp:581 +#: src/loop.cpp:568 +#: src/loop.cpp:584 msgid "Could not save game!" msgstr "" -#: src/mission.cpp:2041 +#: src/mission.cpp:2085 msgid "Load Transport" msgstr "" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED" msgstr "" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED--and you cheated!" msgstr "" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED" msgstr "" -#: src/mission.cpp:2459 -#: src/mission.cpp:2499 -#: src/mission.cpp:2613 +#: src/mission.cpp:2503 +#: src/mission.cpp:2543 +#: src/mission.cpp:2657 msgid "Quit To Main Menu" msgstr "" -#: src/mission.cpp:2467 +#: src/mission.cpp:2511 msgid "Continue Game" msgstr "" -#: src/mission.cpp:2564 +#: src/mission.cpp:2608 msgid "GAME SAVED :" msgstr "" @@ -14309,111 +14309,107 @@ msgstr "" msgid "Player colour" msgstr "" -#: src/multiint.cpp:2071 +#: src/multiint.cpp:2068 msgid "Team" msgstr "" -#: src/multiint.cpp:2083 -msgid "Kick player" -msgstr "" - -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 msgid "Click to change difficulty" msgstr "" -#: src/multiint.cpp:2130 +#: src/multiint.cpp:2126 msgid "Click when ready" msgstr "" -#: src/multiint.cpp:2134 +#: src/multiint.cpp:2130 msgid "READY?" msgstr "" -#: src/multiint.cpp:2178 +#: src/multiint.cpp:2174 msgid "PLAYERS" msgstr "" -#: src/multiint.cpp:2213 +#: src/multiint.cpp:2209 msgid "Click to change to this slot" msgstr "" -#: src/multiint.cpp:2241 +#: src/multiint.cpp:2237 msgid "Choose Team" msgstr "" -#: src/multiint.cpp:2271 +#: src/multiint.cpp:2267 msgid "Click to change player colour" msgstr "" -#: src/multiint.cpp:2299 +#: src/multiint.cpp:2295 msgid "Click to change player position" msgstr "" -#: src/multiint.cpp:2305 +#: src/multiint.cpp:2301 msgid "Click to change AI" msgstr "" -#: src/multiint.cpp:2309 +#: src/multiint.cpp:2305 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2371 +#: src/multiint.cpp:2367 msgid "CHAT" msgstr "" -#: src/multiint.cpp:2403 +#: src/multiint.cpp:2399 msgid "All players need to have the same mods to join your game." msgstr "" -#: src/multiint.cpp:2561 +#: src/multiint.cpp:2557 #, c-format msgid "*** password [%s] is now required! ***" msgstr "" -#: src/multiint.cpp:2569 +#: src/multiint.cpp:2565 msgid "*** password is NOT required! ***" msgstr "" -#: src/multiint.cpp:2810 +#: src/multiint.cpp:2806 msgid "Sorry! Failed to host the game." msgstr "" -#: src/multiint.cpp:2931 +#: src/multiint.cpp:2927 msgid "'Locked Teams' mode enabled" msgstr "" -#: src/multiint.cpp:3012 +#: src/multiint.cpp:3008 #, c-format msgid "The host has kicked %s from the game!" msgstr "" -#: src/multiint.cpp:3082 +#: src/multiint.cpp:3078 msgid "Host is Starting Game" msgstr "" -#: src/multiint.cpp:3648 +#: src/multiint.cpp:3644 msgid "Players" msgstr "" -#: src/multiint.cpp:3786 +#: src/multiint.cpp:3782 #, c-format msgid "Sending Map: %d%% " msgstr "" -#: src/multiint.cpp:3794 +#: src/multiint.cpp:3790 #, c-format msgid "Map: %d%% downloaded" msgstr "" -#: src/multiint.cpp:3820 +#: src/multiint.cpp:3816 msgid "HOST" msgstr "" -#: src/multiint.cpp:3827 +#: src/multiint.cpp:3823 #: src/multimenu.cpp:772 msgid "Ping" msgstr "" @@ -14577,81 +14573,81 @@ msgstr "" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "" -#: src/multiplay.cpp:1057 +#: src/multiplay.cpp:1056 msgid "(allies" msgstr "" -#: src/multiplay.cpp:1065 +#: src/multiplay.cpp:1064 msgid "(private to " msgstr "" -#: src/multiplay.cpp:1078 +#: src/multiplay.cpp:1077 msgid "[invalid]" msgstr "" -#: src/multiplay.cpp:1942 +#: src/multiplay.cpp:1941 #, fuzzy msgid "Green" msgstr "Viridum" -#: src/multiplay.cpp:1943 +#: src/multiplay.cpp:1942 msgid "Orange" msgstr "" -#: src/multiplay.cpp:1944 +#: src/multiplay.cpp:1943 msgid "Grey" msgstr "Canum" -#: src/multiplay.cpp:1945 +#: src/multiplay.cpp:1944 msgid "Black" msgstr "Nĭgrum" -#: src/multiplay.cpp:1946 +#: src/multiplay.cpp:1945 #, fuzzy msgid "Red" msgstr "Rubrum" -#: src/multiplay.cpp:1947 +#: src/multiplay.cpp:1946 msgid "Blue" msgstr "" -#: src/multiplay.cpp:1948 +#: src/multiplay.cpp:1947 msgid "Pink" msgstr "" -#: src/multiplay.cpp:1949 +#: src/multiplay.cpp:1948 msgid "Cyan" msgstr "" -#: src/multiplay.cpp:1950 +#: src/multiplay.cpp:1949 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:1951 +#: src/multiplay.cpp:1950 msgid "Purple" msgstr "" -#: src/multiplay.cpp:1952 +#: src/multiplay.cpp:1951 msgid "White" msgstr "" -#: src/multiplay.cpp:1953 +#: src/multiplay.cpp:1952 msgid "Bright blue" msgstr "" -#: src/multiplay.cpp:1954 +#: src/multiplay.cpp:1953 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:1955 +#: src/multiplay.cpp:1954 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:1956 +#: src/multiplay.cpp:1955 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:1957 +#: src/multiplay.cpp:1956 msgid "Brown" msgstr "" @@ -14659,16 +14655,16 @@ msgstr "" msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "" -#: src/research.cpp:1737 +#: src/research.cpp:1739 #, c-format msgid "Research completed: %s" msgstr "" -#: src/research.cpp:1742 +#: src/research.cpp:1744 msgid "Research Completed" msgstr "" -#: src/research.cpp:2563 +#: src/research.cpp:2565 msgid "Research Award" msgstr "" @@ -14832,62 +14828,62 @@ msgstr "" msgid "Unable to locate any Commanders!" msgstr "" -#: src/structure.cpp:2614 +#: src/structure.cpp:2650 msgid "Command Control Limit Reached - Production Halted" msgstr "" -#: src/structure.cpp:5806 -#: src/structure.cpp:5831 +#: src/structure.cpp:5888 +#: src/structure.cpp:5913 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" msgstr[0] "" msgstr[1] "" -#: src/structure.cpp:5836 -#: src/structure.cpp:5904 -#: src/structure.cpp:5920 -#: src/structure.cpp:5934 +#: src/structure.cpp:5918 +#: src/structure.cpp:5986 +#: src/structure.cpp:6002 +#: src/structure.cpp:6016 #, c-format msgid "%s - Damage %3.0f%%" msgstr "" -#: src/structure.cpp:5886 +#: src/structure.cpp:5968 #, c-format msgid "%s - Connected %u of %u" msgstr "" -#: src/structure.cpp:6050 -#: src/structure.cpp:6095 +#: src/structure.cpp:6132 +#: src/structure.cpp:6177 #, c-format msgid "%s - Electronically Damaged" msgstr "" -#: src/structure.cpp:6332 +#: src/structure.cpp:6414 msgid "Electronic Reward - Visibility Report" msgstr "" -#: src/structure.cpp:6372 +#: src/structure.cpp:6454 msgid "Factory Reward - Propulsion" msgstr "" -#: src/structure.cpp:6396 +#: src/structure.cpp:6478 msgid "Factory Reward - Body" msgstr "" -#: src/structure.cpp:6420 +#: src/structure.cpp:6502 msgid "Factory Reward - Weapon" msgstr "" -#: src/structure.cpp:6429 +#: src/structure.cpp:6511 msgid "Factory Reward - Nothing" msgstr "" -#: src/structure.cpp:6457 +#: src/structure.cpp:6539 msgid "Repair Facility Award - Repair" msgstr "" -#: src/structure.cpp:6464 +#: src/structure.cpp:6546 msgid "Repair Facility Award - Nothing" msgstr "" @@ -14904,30 +14900,22 @@ msgstr "" msgid "Reinforcements landing" msgstr "" -#: src/version.cpp:143 -msgid " (modified and switched locally)" -msgstr "" - -#: src/version.cpp:145 +#: src/version.cpp:129 msgid " (modified locally)" msgstr "" -#: src/version.cpp:147 -msgid " (switched locally)" -msgstr "" - -#: src/version.cpp:154 +#: src/version.cpp:136 msgid " - DEBUG" msgstr "" -#: src/version.cpp:163 +#: src/version.cpp:145 #, c-format msgid " - Built %s" msgstr "" #. TRANSLATORS: This string looks as follows when expanded. #. "Version " -#: src/version.cpp:173 +#: src/version.cpp:155 #, c-format msgid "Version %s%s%s%s" msgstr "" diff --git a/po/lt.po b/po/lt.po index 0124020b9..299f1f8bf 100644 --- a/po/lt.po +++ b/po/lt.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-02-25 23:35+0100\n" +"POT-Creation-Date: 2011-03-08 15:43+0100\n" "PO-Revision-Date: 2008-05-09 16:42+0000\n" "Last-Translator: Roman \n" "Language-Team: Lithuanian \n" @@ -12011,26 +12011,26 @@ msgid "System locale" msgstr "Vietinė sistema" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1042 +#: lib/netplay/netplay.cpp:1037 msgid "Enter password here" msgstr "" -#: lib/netplay/netplay.cpp:2060 +#: lib/netplay/netplay.cpp:2055 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "" -#: lib/netplay/netplay.cpp:2082 +#: lib/netplay/netplay.cpp:2077 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "" #: src/challenge.cpp:184 #: src/hci.cpp:916 -#: src/hci.cpp:3378 -#: src/hci.cpp:3501 -#: src/hci.cpp:3912 -#: src/hci.cpp:4930 +#: src/hci.cpp:3386 +#: src/hci.cpp:3509 +#: src/hci.cpp:3920 +#: src/hci.cpp:4938 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12339,7 +12339,7 @@ msgid "Player dropped" msgstr "Žaidėjas" #: src/display3d.cpp:599 -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2121 msgid "Waiting for other players" msgstr "" @@ -12352,7 +12352,7 @@ msgid "Cannot Build. Oil Resource Burning." msgstr "Negalima statyti. Naftos telkinys dega." #: src/display.cpp:1828 -#: src/display.cpp:2421 +#: src/display.cpp:2420 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - Žala %d%% - Patirtis %d, %s" @@ -12384,7 +12384,7 @@ msgstr "Prarastas karinis vienetas!" msgid "Structure Restored" msgstr "Pastatas atkurtas" -#: src/droid.cpp:2732 +#: src/droid.cpp:2734 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" @@ -12392,7 +12392,7 @@ msgstr[0] "Grupė %u priskirtas - %u Kovinis vienetas" msgstr[1] "Grupė %u priskirti - %u Koviniai vienetai" msgstr[2] "Grupė %u priskirti - %u Koviniai vienetai" -#: src/droid.cpp:2745 +#: src/droid.cpp:2747 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" @@ -12400,63 +12400,63 @@ msgstr[0] "%u kovinis vienetas priskirtas Grupei %u" msgstr[1] "%u Koviniai vienetai priskirti Grupei %u" msgstr[2] "%u Koviniai vienetai priskirti Grupei %u" -#: src/droid.cpp:2758 +#: src/droid.cpp:2760 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:2762 +#: src/droid.cpp:2764 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:3093 +#: src/droid.cpp:3095 msgid "Rookie" msgstr "" -#: src/droid.cpp:3094 +#: src/droid.cpp:3096 msgctxt "rank" msgid "Green" msgstr "" -#: src/droid.cpp:3095 +#: src/droid.cpp:3097 msgid "Trained" msgstr "" -#: src/droid.cpp:3096 +#: src/droid.cpp:3098 msgid "Regular" msgstr "" -#: src/droid.cpp:3097 +#: src/droid.cpp:3099 msgid "Professional" msgstr "" -#: src/droid.cpp:3098 +#: src/droid.cpp:3100 msgid "Veteran" msgstr "" -#: src/droid.cpp:3099 +#: src/droid.cpp:3101 msgid "Elite" msgstr "" -#: src/droid.cpp:3100 +#: src/droid.cpp:3102 msgid "Special" msgstr "" -#: src/droid.cpp:3101 +#: src/droid.cpp:3103 msgid "Hero" msgstr "" -#: src/droid.cpp:4123 +#: src/droid.cpp:4125 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "" -#: src/droid.cpp:4127 +#: src/droid.cpp:4129 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "" @@ -12477,7 +12477,7 @@ msgid "Tutorial" msgstr "" #: src/frontend.cpp:100 -#: src/hci.cpp:3487 +#: src/hci.cpp:3495 msgid "Options" msgstr "" @@ -12538,8 +12538,8 @@ msgstr "" #: src/frontend.cpp:303 #: src/ingameop.cpp:494 -#: src/mission.cpp:2493 -#: src/mission.cpp:2596 +#: src/mission.cpp:2537 +#: src/mission.cpp:2640 msgid "Load Saved Game" msgstr "Pakrauti išsaugotą žaidimą" @@ -12823,7 +12823,7 @@ msgid "GAME OPTIONS" msgstr "" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2398 +#: src/multiint.cpp:2394 msgid "Mod: " msgstr "" @@ -12833,8 +12833,8 @@ msgid "MAP SAVED!" msgstr "Žaidimas išsaugotas" #: src/hci.cpp:1573 -#: src/loop.cpp:558 -#: src/loop.cpp:574 +#: src/loop.cpp:561 +#: src/loop.cpp:577 #, fuzzy msgid "GAME SAVED: " msgstr "Žaidimas išsaugotas" @@ -12863,153 +12863,153 @@ msgstr "Žaidėjas %u sukčiauja (debug meniu) jam/jai naujas droidas: %s." msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "Žaidėjas %u sukčiauja (debug meniu) jam/jai naujas droidas: %s." -#: src/hci.cpp:3298 +#: src/hci.cpp:3306 msgid "Commanders (F6)" msgstr "Kapitonas (F6)" -#: src/hci.cpp:3311 +#: src/hci.cpp:3319 msgid "Intelligence Display (F5)" msgstr "Valdymo skydas (F5)" -#: src/hci.cpp:3324 +#: src/hci.cpp:3332 msgid "Manufacture (F1)" msgstr "Pastatai (F1)" -#: src/hci.cpp:3337 +#: src/hci.cpp:3345 msgid "Design (F4)" msgstr "Kūrimas (F4)" -#: src/hci.cpp:3350 +#: src/hci.cpp:3358 msgid "Research (F2)" msgstr "Išradimas (F2)" -#: src/hci.cpp:3363 +#: src/hci.cpp:3371 msgid "Build (F3)" msgstr "Pastatyti (F3)" -#: src/hci.cpp:3434 +#: src/hci.cpp:3442 #: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Energija" -#: src/hci.cpp:3525 +#: src/hci.cpp:3533 msgid "Map:" msgstr "" -#: src/hci.cpp:3538 +#: src/hci.cpp:3546 msgid "Load" msgstr "" -#: src/hci.cpp:3539 +#: src/hci.cpp:3547 msgid "Load Map File" msgstr "" -#: src/hci.cpp:3546 +#: src/hci.cpp:3554 #, fuzzy msgid "Save" msgstr "Išsaugoti žaidimą" -#: src/hci.cpp:3547 +#: src/hci.cpp:3555 #, fuzzy msgid "Save Map File" msgstr "Išsaugoti žaidimą" -#: src/hci.cpp:3555 +#: src/hci.cpp:3563 msgid "New" msgstr "" -#: src/hci.cpp:3556 +#: src/hci.cpp:3564 msgid "New Blank Map" msgstr "" -#: src/hci.cpp:3592 +#: src/hci.cpp:3600 msgid "Tile" msgstr "" -#: src/hci.cpp:3593 +#: src/hci.cpp:3601 msgid "Place tiles on map" msgstr "" -#: src/hci.cpp:3602 +#: src/hci.cpp:3610 msgid "Unit" msgstr "Karinis vienetas" -#: src/hci.cpp:3603 +#: src/hci.cpp:3611 msgid "Place Unit on map" msgstr "" -#: src/hci.cpp:3611 +#: src/hci.cpp:3619 msgid "Struct" msgstr "Statyti" -#: src/hci.cpp:3612 +#: src/hci.cpp:3620 msgid "Place Structures on map" msgstr "" -#: src/hci.cpp:3620 +#: src/hci.cpp:3628 msgid "Feat" msgstr "Naujovė" -#: src/hci.cpp:3621 +#: src/hci.cpp:3629 msgid "Place Features on map" msgstr "" -#: src/hci.cpp:3631 +#: src/hci.cpp:3639 msgid "Pause" msgstr "" -#: src/hci.cpp:3632 +#: src/hci.cpp:3640 #, fuzzy msgid "Pause or unpause the game" msgstr "Hostas paliko žaidimą" -#: src/hci.cpp:3646 +#: src/hci.cpp:3654 msgid "Align height of all map objects" msgstr "" -#: src/hci.cpp:3656 +#: src/hci.cpp:3664 msgid "Edit" msgstr "" -#: src/hci.cpp:3657 +#: src/hci.cpp:3665 msgid "Start Edit Mode" msgstr "" -#: src/hci.cpp:3671 +#: src/hci.cpp:3679 #: src/ingameop.cpp:112 #: src/ingameop.cpp:256 #: src/ingameop.cpp:260 msgid "Quit" msgstr "Išeiti" -#: src/hci.cpp:3672 +#: src/hci.cpp:3680 msgid "Exit Game" msgstr "Išeiti iš žaidimo" -#: src/hci.cpp:3698 +#: src/hci.cpp:3706 #, fuzzy msgid "Current Player:" msgstr "Žaidėjas" -#: src/hci.cpp:3989 +#: src/hci.cpp:3997 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "Eigos juosta" -#: src/hci.cpp:4855 +#: src/hci.cpp:4863 msgid "Factory Delivery Point" msgstr "Gamyklinis išeities taškas" -#: src/hci.cpp:4873 +#: src/hci.cpp:4881 msgid "Loop Production" msgstr "Nesibaigianti gamyba" -#: src/hci.cpp:4953 +#: src/hci.cpp:4961 msgid "Tab Scroll left" msgstr "Pasukti į kairę" -#: src/hci.cpp:4968 +#: src/hci.cpp:4976 msgid "Tab Scroll right" msgstr "Pasukti į dešinę" @@ -13035,8 +13035,8 @@ msgstr "" #: src/ingameop.cpp:274 #: src/ingameop.cpp:498 -#: src/mission.cpp:2480 -#: src/mission.cpp:2599 +#: src/mission.cpp:2524 +#: src/mission.cpp:2643 msgid "Save Game" msgstr "Išsaugoti žaidimą" @@ -13965,44 +13965,44 @@ msgstr "" msgid "Toggle Driving Mode" msgstr "" -#: src/loop.cpp:565 -#: src/loop.cpp:581 +#: src/loop.cpp:568 +#: src/loop.cpp:584 msgid "Could not save game!" msgstr "" -#: src/mission.cpp:2041 +#: src/mission.cpp:2085 msgid "Load Transport" msgstr "Pakrauti transportą" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 #, fuzzy msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "Užduotis atlikta" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED" msgstr "Užduotis atlikta" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 #, fuzzy msgid "OBJECTIVE FAILED--and you cheated!" msgstr "Užduotis neatlikta" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED" msgstr "Užduotis neatlikta" -#: src/mission.cpp:2459 -#: src/mission.cpp:2499 -#: src/mission.cpp:2613 +#: src/mission.cpp:2503 +#: src/mission.cpp:2543 +#: src/mission.cpp:2657 msgid "Quit To Main Menu" msgstr "Išeiti į pagrindinį meniu" -#: src/mission.cpp:2467 +#: src/mission.cpp:2511 msgid "Continue Game" msgstr "Tęsti žaidimą" -#: src/mission.cpp:2564 +#: src/mission.cpp:2608 #, fuzzy msgid "GAME SAVED :" msgstr "Žaidimas išsaugotas" @@ -14294,115 +14294,110 @@ msgstr "" msgid "Player colour" msgstr "Žaidėjas" -#: src/multiint.cpp:2071 +#: src/multiint.cpp:2068 msgid "Team" msgstr "" -#: src/multiint.cpp:2083 -#, fuzzy -msgid "Kick player" -msgstr "Žaidėjas" - -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 #, fuzzy msgid "Click to change difficulty" msgstr "Žaidėjas" -#: src/multiint.cpp:2130 +#: src/multiint.cpp:2126 msgid "Click when ready" msgstr "" -#: src/multiint.cpp:2134 +#: src/multiint.cpp:2130 msgid "READY?" msgstr "" -#: src/multiint.cpp:2178 +#: src/multiint.cpp:2174 msgid "PLAYERS" msgstr "" -#: src/multiint.cpp:2213 +#: src/multiint.cpp:2209 msgid "Click to change to this slot" msgstr "" -#: src/multiint.cpp:2241 +#: src/multiint.cpp:2237 msgid "Choose Team" msgstr "" -#: src/multiint.cpp:2271 +#: src/multiint.cpp:2267 msgid "Click to change player colour" msgstr "" -#: src/multiint.cpp:2299 +#: src/multiint.cpp:2295 #, fuzzy msgid "Click to change player position" msgstr "Žaidėjas" -#: src/multiint.cpp:2305 +#: src/multiint.cpp:2301 #, fuzzy msgid "Click to change AI" msgstr "Žaidėjas" -#: src/multiint.cpp:2309 +#: src/multiint.cpp:2305 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2371 +#: src/multiint.cpp:2367 msgid "CHAT" msgstr "" -#: src/multiint.cpp:2403 +#: src/multiint.cpp:2399 msgid "All players need to have the same mods to join your game." msgstr "" -#: src/multiint.cpp:2561 +#: src/multiint.cpp:2557 #, c-format msgid "*** password [%s] is now required! ***" msgstr "" -#: src/multiint.cpp:2569 +#: src/multiint.cpp:2565 msgid "*** password is NOT required! ***" msgstr "" -#: src/multiint.cpp:2810 +#: src/multiint.cpp:2806 msgid "Sorry! Failed to host the game." msgstr "" -#: src/multiint.cpp:2931 +#: src/multiint.cpp:2927 msgid "'Locked Teams' mode enabled" msgstr "" -#: src/multiint.cpp:3012 +#: src/multiint.cpp:3008 #, c-format msgid "The host has kicked %s from the game!" msgstr "" -#: src/multiint.cpp:3082 +#: src/multiint.cpp:3078 msgid "Host is Starting Game" msgstr "" -#: src/multiint.cpp:3648 +#: src/multiint.cpp:3644 msgid "Players" msgstr "" -#: src/multiint.cpp:3786 +#: src/multiint.cpp:3782 #, c-format msgid "Sending Map: %d%% " msgstr "" -#: src/multiint.cpp:3794 +#: src/multiint.cpp:3790 #, c-format msgid "Map: %d%% downloaded" msgstr "" -#: src/multiint.cpp:3820 +#: src/multiint.cpp:3816 msgid "HOST" msgstr "" -#: src/multiint.cpp:3827 +#: src/multiint.cpp:3823 #: src/multimenu.cpp:772 msgid "Ping" msgstr "" @@ -14581,79 +14576,79 @@ msgstr "" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "" -#: src/multiplay.cpp:1057 +#: src/multiplay.cpp:1056 msgid "(allies" msgstr "" -#: src/multiplay.cpp:1065 +#: src/multiplay.cpp:1064 msgid "(private to " msgstr "" -#: src/multiplay.cpp:1078 +#: src/multiplay.cpp:1077 msgid "[invalid]" msgstr "" -#: src/multiplay.cpp:1942 +#: src/multiplay.cpp:1941 msgid "Green" msgstr "Žalia" -#: src/multiplay.cpp:1943 +#: src/multiplay.cpp:1942 msgid "Orange" msgstr "Oranžinė" -#: src/multiplay.cpp:1944 +#: src/multiplay.cpp:1943 msgid "Grey" msgstr "Pilka" -#: src/multiplay.cpp:1945 +#: src/multiplay.cpp:1944 msgid "Black" msgstr "Juoda" -#: src/multiplay.cpp:1946 +#: src/multiplay.cpp:1945 msgid "Red" msgstr "Raudona" -#: src/multiplay.cpp:1947 +#: src/multiplay.cpp:1946 msgid "Blue" msgstr "Mėlyna" -#: src/multiplay.cpp:1948 +#: src/multiplay.cpp:1947 msgid "Pink" msgstr "Rožinė" -#: src/multiplay.cpp:1949 +#: src/multiplay.cpp:1948 msgid "Cyan" msgstr "Žydra" -#: src/multiplay.cpp:1950 +#: src/multiplay.cpp:1949 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:1951 +#: src/multiplay.cpp:1950 msgid "Purple" msgstr "" -#: src/multiplay.cpp:1952 +#: src/multiplay.cpp:1951 msgid "White" msgstr "" -#: src/multiplay.cpp:1953 +#: src/multiplay.cpp:1952 msgid "Bright blue" msgstr "" -#: src/multiplay.cpp:1954 +#: src/multiplay.cpp:1953 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:1955 +#: src/multiplay.cpp:1954 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:1956 +#: src/multiplay.cpp:1955 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:1957 +#: src/multiplay.cpp:1956 msgid "Brown" msgstr "" @@ -14661,16 +14656,16 @@ msgstr "" msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "" -#: src/research.cpp:1737 +#: src/research.cpp:1739 #, c-format msgid "Research completed: %s" msgstr "" -#: src/research.cpp:1742 +#: src/research.cpp:1744 msgid "Research Completed" msgstr "" -#: src/research.cpp:2563 +#: src/research.cpp:2565 msgid "Research Award" msgstr "" @@ -14834,62 +14829,62 @@ msgstr "" msgid "Unable to locate any Commanders!" msgstr "" -#: src/structure.cpp:2614 +#: src/structure.cpp:2650 msgid "Command Control Limit Reached - Production Halted" msgstr "" -#: src/structure.cpp:5806 -#: src/structure.cpp:5831 +#: src/structure.cpp:5888 +#: src/structure.cpp:5913 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" msgstr[0] "" msgstr[1] "" -#: src/structure.cpp:5836 -#: src/structure.cpp:5904 -#: src/structure.cpp:5920 -#: src/structure.cpp:5934 +#: src/structure.cpp:5918 +#: src/structure.cpp:5986 +#: src/structure.cpp:6002 +#: src/structure.cpp:6016 #, c-format msgid "%s - Damage %3.0f%%" msgstr "" -#: src/structure.cpp:5886 +#: src/structure.cpp:5968 #, c-format msgid "%s - Connected %u of %u" msgstr "" -#: src/structure.cpp:6050 -#: src/structure.cpp:6095 +#: src/structure.cpp:6132 +#: src/structure.cpp:6177 #, c-format msgid "%s - Electronically Damaged" msgstr "" -#: src/structure.cpp:6332 +#: src/structure.cpp:6414 msgid "Electronic Reward - Visibility Report" msgstr "" -#: src/structure.cpp:6372 +#: src/structure.cpp:6454 msgid "Factory Reward - Propulsion" msgstr "" -#: src/structure.cpp:6396 +#: src/structure.cpp:6478 msgid "Factory Reward - Body" msgstr "" -#: src/structure.cpp:6420 +#: src/structure.cpp:6502 msgid "Factory Reward - Weapon" msgstr "" -#: src/structure.cpp:6429 +#: src/structure.cpp:6511 msgid "Factory Reward - Nothing" msgstr "" -#: src/structure.cpp:6457 +#: src/structure.cpp:6539 msgid "Repair Facility Award - Repair" msgstr "" -#: src/structure.cpp:6464 +#: src/structure.cpp:6546 msgid "Repair Facility Award - Nothing" msgstr "" @@ -14906,34 +14901,30 @@ msgstr "" msgid "Reinforcements landing" msgstr "Pastiprinimas leidžiasi" -#: src/version.cpp:143 -msgid " (modified and switched locally)" -msgstr "" - -#: src/version.cpp:145 +#: src/version.cpp:129 msgid " (modified locally)" msgstr "" -#: src/version.cpp:147 -msgid " (switched locally)" -msgstr "" - -#: src/version.cpp:154 +#: src/version.cpp:136 msgid " - DEBUG" msgstr "" -#: src/version.cpp:163 +#: src/version.cpp:145 #, c-format msgid " - Built %s" msgstr "" #. TRANSLATORS: This string looks as follows when expanded. #. "Version " -#: src/version.cpp:173 +#: src/version.cpp:155 #, c-format msgid "Version %s%s%s%s" msgstr "" +#, fuzzy +#~ msgid "Kick player" +#~ msgstr "Žaidėjas" + #, fuzzy #~ msgid "Infinite Production" #~ msgstr "Nesibaigianti gamyba" diff --git a/po/nb.po b/po/nb.po index 2f93474d8..d82f33510 100644 --- a/po/nb.po +++ b/po/nb.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-02-25 23:35+0100\n" +"POT-Creation-Date: 2011-03-08 15:43+0100\n" "PO-Revision-Date: 2008-05-09 16:54+0000\n" "Last-Translator: Olav Andreas Lindekleiv \n" "Language-Team: none\n" @@ -12041,26 +12041,26 @@ msgid "System locale" msgstr "Systemspråk" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1042 +#: lib/netplay/netplay.cpp:1037 msgid "Enter password here" msgstr "" -#: lib/netplay/netplay.cpp:2060 +#: lib/netplay/netplay.cpp:2055 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "" -#: lib/netplay/netplay.cpp:2082 +#: lib/netplay/netplay.cpp:2077 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "" #: src/challenge.cpp:184 #: src/hci.cpp:916 -#: src/hci.cpp:3378 -#: src/hci.cpp:3501 -#: src/hci.cpp:3912 -#: src/hci.cpp:4930 +#: src/hci.cpp:3386 +#: src/hci.cpp:3509 +#: src/hci.cpp:3920 +#: src/hci.cpp:4938 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12372,7 +12372,7 @@ msgid "Player dropped" msgstr "Spiller" #: src/display3d.cpp:599 -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2121 msgid "Waiting for other players" msgstr "" @@ -12385,7 +12385,7 @@ msgid "Cannot Build. Oil Resource Burning." msgstr "Kan ikke bygge her. Oljeressurs brenner." #: src/display.cpp:1828 -#: src/display.cpp:2421 +#: src/display.cpp:2420 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "" @@ -12416,77 +12416,77 @@ msgstr "Enhet Tapt!" msgid "Structure Restored" msgstr "" -#: src/droid.cpp:2732 +#: src/droid.cpp:2734 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:2745 +#: src/droid.cpp:2747 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:2758 +#: src/droid.cpp:2760 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:2762 +#: src/droid.cpp:2764 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:3093 +#: src/droid.cpp:3095 msgid "Rookie" msgstr "Nybegynner" -#: src/droid.cpp:3094 +#: src/droid.cpp:3096 msgctxt "rank" msgid "Green" msgstr "Grønn" -#: src/droid.cpp:3095 +#: src/droid.cpp:3097 msgid "Trained" msgstr "Trent" -#: src/droid.cpp:3096 +#: src/droid.cpp:3098 msgid "Regular" msgstr "Vanlig" -#: src/droid.cpp:3097 +#: src/droid.cpp:3099 msgid "Professional" msgstr "Profesjonell" -#: src/droid.cpp:3098 +#: src/droid.cpp:3100 msgid "Veteran" msgstr "Veteran" -#: src/droid.cpp:3099 +#: src/droid.cpp:3101 msgid "Elite" msgstr "Elite" -#: src/droid.cpp:3100 +#: src/droid.cpp:3102 msgid "Special" msgstr "Spesiell" -#: src/droid.cpp:3101 +#: src/droid.cpp:3103 msgid "Hero" msgstr "Helt" -#: src/droid.cpp:4123 +#: src/droid.cpp:4125 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "" -#: src/droid.cpp:4127 +#: src/droid.cpp:4129 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "" @@ -12507,7 +12507,7 @@ msgid "Tutorial" msgstr "Introduksjon" #: src/frontend.cpp:100 -#: src/hci.cpp:3487 +#: src/hci.cpp:3495 msgid "Options" msgstr "Alternativer" @@ -12569,8 +12569,8 @@ msgstr "SOLOSPILL" #: src/frontend.cpp:303 #: src/ingameop.cpp:494 -#: src/mission.cpp:2493 -#: src/mission.cpp:2596 +#: src/mission.cpp:2537 +#: src/mission.cpp:2640 msgid "Load Saved Game" msgstr "Last inn spill" @@ -12862,7 +12862,7 @@ msgid "GAME OPTIONS" msgstr "SPILLALTERNATIVER" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2398 +#: src/multiint.cpp:2394 msgid "Mod: " msgstr "" @@ -12872,8 +12872,8 @@ msgid "MAP SAVED!" msgstr "SPILL LAGRET!" #: src/hci.cpp:1573 -#: src/loop.cpp:558 -#: src/loop.cpp:574 +#: src/loop.cpp:561 +#: src/loop.cpp:577 #, fuzzy msgid "GAME SAVED: " msgstr "SPILL LAGRET!" @@ -12902,130 +12902,130 @@ msgstr "" msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "" -#: src/hci.cpp:3298 +#: src/hci.cpp:3306 msgid "Commanders (F6)" msgstr "" -#: src/hci.cpp:3311 +#: src/hci.cpp:3319 msgid "Intelligence Display (F5)" msgstr "" -#: src/hci.cpp:3324 +#: src/hci.cpp:3332 msgid "Manufacture (F1)" msgstr "Produksjon (F1)" -#: src/hci.cpp:3337 +#: src/hci.cpp:3345 #, fuzzy msgid "Design (F4)" msgstr "Design (F4)" -#: src/hci.cpp:3350 +#: src/hci.cpp:3358 #, fuzzy msgid "Research (F2)" msgstr "Forskning (F2)" -#: src/hci.cpp:3363 +#: src/hci.cpp:3371 #, fuzzy msgid "Build (F3)" msgstr "Bygg (F3)" -#: src/hci.cpp:3434 +#: src/hci.cpp:3442 #: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Energi" -#: src/hci.cpp:3525 +#: src/hci.cpp:3533 msgid "Map:" msgstr "" -#: src/hci.cpp:3538 +#: src/hci.cpp:3546 #, fuzzy msgid "Load" msgstr "Last Spill" -#: src/hci.cpp:3539 +#: src/hci.cpp:3547 #, fuzzy msgid "Load Map File" msgstr "Last Spill" -#: src/hci.cpp:3546 +#: src/hci.cpp:3554 #, fuzzy msgid "Save" msgstr "Lagre spill" -#: src/hci.cpp:3547 +#: src/hci.cpp:3555 #, fuzzy msgid "Save Map File" msgstr "Lagre spill" -#: src/hci.cpp:3555 +#: src/hci.cpp:3563 msgid "New" msgstr "" -#: src/hci.cpp:3556 +#: src/hci.cpp:3564 msgid "New Blank Map" msgstr "" -#: src/hci.cpp:3592 +#: src/hci.cpp:3600 msgid "Tile" msgstr "" -#: src/hci.cpp:3593 +#: src/hci.cpp:3601 #, fuzzy msgid "Place tiles on map" msgstr "Sett strukturbegrensninger" -#: src/hci.cpp:3602 +#: src/hci.cpp:3610 msgid "Unit" msgstr "Enhet" -#: src/hci.cpp:3603 +#: src/hci.cpp:3611 #, fuzzy msgid "Place Unit on map" msgstr "Sett strukturbegrensninger" -#: src/hci.cpp:3611 +#: src/hci.cpp:3619 msgid "Struct" msgstr "" -#: src/hci.cpp:3612 +#: src/hci.cpp:3620 #, fuzzy msgid "Place Structures on map" msgstr "Sett strukturbegrensninger" -#: src/hci.cpp:3620 +#: src/hci.cpp:3628 msgid "Feat" msgstr "" -#: src/hci.cpp:3621 +#: src/hci.cpp:3629 #, fuzzy msgid "Place Features on map" msgstr "Sett strukturbegrensninger" -#: src/hci.cpp:3631 +#: src/hci.cpp:3639 msgid "Pause" msgstr "" -#: src/hci.cpp:3632 +#: src/hci.cpp:3640 #, fuzzy msgid "Pause or unpause the game" msgstr "Verten har forlatt spillet!" -#: src/hci.cpp:3646 +#: src/hci.cpp:3654 msgid "Align height of all map objects" msgstr "" -#: src/hci.cpp:3656 +#: src/hci.cpp:3664 msgid "Edit" msgstr "" -#: src/hci.cpp:3657 +#: src/hci.cpp:3665 #, fuzzy msgid "Start Edit Mode" msgstr "Start uten baser" -#: src/hci.cpp:3671 +#: src/hci.cpp:3679 #: src/ingameop.cpp:112 #: src/ingameop.cpp:256 #: src/ingameop.cpp:260 @@ -13033,33 +13033,33 @@ msgstr "Start uten baser" msgid "Quit" msgstr "Avslutt" -#: src/hci.cpp:3672 +#: src/hci.cpp:3680 msgid "Exit Game" msgstr "Avslutt Spill" -#: src/hci.cpp:3698 +#: src/hci.cpp:3706 #, fuzzy msgid "Current Player:" msgstr "Samspill" -#: src/hci.cpp:3989 +#: src/hci.cpp:3997 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "Framdriftslinje" -#: src/hci.cpp:4855 +#: src/hci.cpp:4863 msgid "Factory Delivery Point" msgstr "Leveringsmål for fabrikk" -#: src/hci.cpp:4873 +#: src/hci.cpp:4881 msgid "Loop Production" msgstr "" -#: src/hci.cpp:4953 +#: src/hci.cpp:4961 msgid "Tab Scroll left" msgstr "" -#: src/hci.cpp:4968 +#: src/hci.cpp:4976 msgid "Tab Scroll right" msgstr "" @@ -13086,8 +13086,8 @@ msgstr "" #: src/ingameop.cpp:274 #: src/ingameop.cpp:498 -#: src/mission.cpp:2480 -#: src/mission.cpp:2599 +#: src/mission.cpp:2524 +#: src/mission.cpp:2643 msgid "Save Game" msgstr "Lagre spill" @@ -14027,43 +14027,43 @@ msgstr "" msgid "Toggle Driving Mode" msgstr "" -#: src/loop.cpp:565 -#: src/loop.cpp:581 +#: src/loop.cpp:568 +#: src/loop.cpp:584 #, fuzzy msgid "Could not save game!" msgstr "Last Spill" -#: src/mission.cpp:2041 +#: src/mission.cpp:2085 msgid "Load Transport" msgstr "" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED" msgstr "" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED--and you cheated!" msgstr "" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED" msgstr "" -#: src/mission.cpp:2459 -#: src/mission.cpp:2499 -#: src/mission.cpp:2613 +#: src/mission.cpp:2503 +#: src/mission.cpp:2543 +#: src/mission.cpp:2657 msgid "Quit To Main Menu" msgstr "Tilbake til hovedmeny" -#: src/mission.cpp:2467 +#: src/mission.cpp:2511 msgid "Continue Game" msgstr "Fortsett spill" -#: src/mission.cpp:2564 +#: src/mission.cpp:2608 #, fuzzy msgid "GAME SAVED :" msgstr "SPILL LAGRET!" @@ -14359,119 +14359,114 @@ msgstr "" msgid "Player colour" msgstr "Spiller" -#: src/multiint.cpp:2071 +#: src/multiint.cpp:2068 msgid "Team" msgstr "" -#: src/multiint.cpp:2083 -#, fuzzy -msgid "Kick player" -msgstr "Samspill" - -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 #, fuzzy msgid "Click to change difficulty" msgstr "Trykk for å se kartet" -#: src/multiint.cpp:2130 +#: src/multiint.cpp:2126 msgid "Click when ready" msgstr "" -#: src/multiint.cpp:2134 +#: src/multiint.cpp:2130 msgid "READY?" msgstr "" -#: src/multiint.cpp:2178 +#: src/multiint.cpp:2174 msgid "PLAYERS" msgstr "SPILLERE" -#: src/multiint.cpp:2213 +#: src/multiint.cpp:2209 #, fuzzy msgid "Click to change to this slot" msgstr "Trykk for å se kartet" -#: src/multiint.cpp:2241 +#: src/multiint.cpp:2237 #, fuzzy msgid "Choose Team" msgstr "Låste lag" -#: src/multiint.cpp:2271 +#: src/multiint.cpp:2267 #, fuzzy msgid "Click to change player colour" msgstr "Radar viser spillernes farger" -#: src/multiint.cpp:2299 +#: src/multiint.cpp:2295 #, fuzzy msgid "Click to change player position" msgstr "Spiller" -#: src/multiint.cpp:2305 +#: src/multiint.cpp:2301 #, fuzzy msgid "Click to change AI" msgstr "Trykk for å se kartet" -#: src/multiint.cpp:2309 +#: src/multiint.cpp:2305 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2371 +#: src/multiint.cpp:2367 msgid "CHAT" msgstr "PRAT" -#: src/multiint.cpp:2403 +#: src/multiint.cpp:2399 msgid "All players need to have the same mods to join your game." msgstr "" -#: src/multiint.cpp:2561 +#: src/multiint.cpp:2557 #, c-format msgid "*** password [%s] is now required! ***" msgstr "" -#: src/multiint.cpp:2569 +#: src/multiint.cpp:2565 msgid "*** password is NOT required! ***" msgstr "" -#: src/multiint.cpp:2810 +#: src/multiint.cpp:2806 msgid "Sorry! Failed to host the game." msgstr "" -#: src/multiint.cpp:2931 +#: src/multiint.cpp:2927 #, fuzzy msgid "'Locked Teams' mode enabled" msgstr "Låste lag" -#: src/multiint.cpp:3012 +#: src/multiint.cpp:3008 #, c-format msgid "The host has kicked %s from the game!" msgstr "Verten har kastet ut %s fra spillet!" -#: src/multiint.cpp:3082 +#: src/multiint.cpp:3078 msgid "Host is Starting Game" msgstr "Vert starter spill" -#: src/multiint.cpp:3648 +#: src/multiint.cpp:3644 msgid "Players" msgstr "Spillere" -#: src/multiint.cpp:3786 +#: src/multiint.cpp:3782 #, c-format msgid "Sending Map: %d%% " msgstr "" -#: src/multiint.cpp:3794 +#: src/multiint.cpp:3790 #, c-format msgid "Map: %d%% downloaded" msgstr "" -#: src/multiint.cpp:3820 +#: src/multiint.cpp:3816 msgid "HOST" msgstr "" -#: src/multiint.cpp:3827 +#: src/multiint.cpp:3823 #: src/multimenu.cpp:772 msgid "Ping" msgstr "" @@ -14649,80 +14644,80 @@ msgstr "" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "" -#: src/multiplay.cpp:1057 +#: src/multiplay.cpp:1056 #, fuzzy msgid "(allies" msgstr "Allianser" -#: src/multiplay.cpp:1065 +#: src/multiplay.cpp:1064 msgid "(private to " msgstr "" -#: src/multiplay.cpp:1078 +#: src/multiplay.cpp:1077 msgid "[invalid]" msgstr "" -#: src/multiplay.cpp:1942 +#: src/multiplay.cpp:1941 msgid "Green" msgstr "Grønn" -#: src/multiplay.cpp:1943 +#: src/multiplay.cpp:1942 msgid "Orange" msgstr "Oransje" -#: src/multiplay.cpp:1944 +#: src/multiplay.cpp:1943 msgid "Grey" msgstr "Grå" -#: src/multiplay.cpp:1945 +#: src/multiplay.cpp:1944 msgid "Black" msgstr "Svart" -#: src/multiplay.cpp:1946 +#: src/multiplay.cpp:1945 msgid "Red" msgstr "Rød" -#: src/multiplay.cpp:1947 +#: src/multiplay.cpp:1946 msgid "Blue" msgstr "Blå" -#: src/multiplay.cpp:1948 +#: src/multiplay.cpp:1947 msgid "Pink" msgstr "Rosa" -#: src/multiplay.cpp:1949 +#: src/multiplay.cpp:1948 msgid "Cyan" msgstr "Cyanblå" -#: src/multiplay.cpp:1950 +#: src/multiplay.cpp:1949 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:1951 +#: src/multiplay.cpp:1950 msgid "Purple" msgstr "" -#: src/multiplay.cpp:1952 +#: src/multiplay.cpp:1951 msgid "White" msgstr "" -#: src/multiplay.cpp:1953 +#: src/multiplay.cpp:1952 msgid "Bright blue" msgstr "" -#: src/multiplay.cpp:1954 +#: src/multiplay.cpp:1953 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:1955 +#: src/multiplay.cpp:1954 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:1956 +#: src/multiplay.cpp:1955 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:1957 +#: src/multiplay.cpp:1956 msgid "Brown" msgstr "" @@ -14730,16 +14725,16 @@ msgstr "" msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "" -#: src/research.cpp:1737 +#: src/research.cpp:1739 #, fuzzy, c-format msgid "Research completed: %s" msgstr "Forskning ferdig: %s" -#: src/research.cpp:1742 +#: src/research.cpp:1744 msgid "Research Completed" msgstr "Forskning ferdig" -#: src/research.cpp:2563 +#: src/research.cpp:2565 msgid "Research Award" msgstr "" @@ -14903,62 +14898,62 @@ msgstr "" msgid "Unable to locate any Commanders!" msgstr "" -#: src/structure.cpp:2614 +#: src/structure.cpp:2650 msgid "Command Control Limit Reached - Production Halted" msgstr "" -#: src/structure.cpp:5806 -#: src/structure.cpp:5831 +#: src/structure.cpp:5888 +#: src/structure.cpp:5913 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" msgstr[0] "" msgstr[1] "" -#: src/structure.cpp:5836 -#: src/structure.cpp:5904 -#: src/structure.cpp:5920 -#: src/structure.cpp:5934 +#: src/structure.cpp:5918 +#: src/structure.cpp:5986 +#: src/structure.cpp:6002 +#: src/structure.cpp:6016 #, fuzzy, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - Skade %3.0f%%" -#: src/structure.cpp:5886 +#: src/structure.cpp:5968 #, c-format msgid "%s - Connected %u of %u" msgstr "%s - Forbundet med %u av %u mulige" -#: src/structure.cpp:6050 -#: src/structure.cpp:6095 +#: src/structure.cpp:6132 +#: src/structure.cpp:6177 #, c-format msgid "%s - Electronically Damaged" msgstr "%s - Elektrisk skadet" -#: src/structure.cpp:6332 +#: src/structure.cpp:6414 msgid "Electronic Reward - Visibility Report" msgstr "" -#: src/structure.cpp:6372 +#: src/structure.cpp:6454 msgid "Factory Reward - Propulsion" msgstr "" -#: src/structure.cpp:6396 +#: src/structure.cpp:6478 msgid "Factory Reward - Body" msgstr "" -#: src/structure.cpp:6420 +#: src/structure.cpp:6502 msgid "Factory Reward - Weapon" msgstr "" -#: src/structure.cpp:6429 +#: src/structure.cpp:6511 msgid "Factory Reward - Nothing" msgstr "" -#: src/structure.cpp:6457 +#: src/structure.cpp:6539 msgid "Repair Facility Award - Repair" msgstr "" -#: src/structure.cpp:6464 +#: src/structure.cpp:6546 msgid "Repair Facility Award - Nothing" msgstr "" @@ -14975,34 +14970,30 @@ msgstr "" msgid "Reinforcements landing" msgstr "Forsterkninger lander" -#: src/version.cpp:143 -msgid " (modified and switched locally)" -msgstr "" - -#: src/version.cpp:145 +#: src/version.cpp:129 msgid " (modified locally)" msgstr "" -#: src/version.cpp:147 -msgid " (switched locally)" -msgstr "" - -#: src/version.cpp:154 +#: src/version.cpp:136 msgid " - DEBUG" msgstr " - DEBUG" -#: src/version.cpp:163 +#: src/version.cpp:145 #, c-format msgid " - Built %s" msgstr " - bygd %s" #. TRANSLATORS: This string looks as follows when expanded. #. "Version " -#: src/version.cpp:173 +#: src/version.cpp:155 #, c-format msgid "Version %s%s%s%s" msgstr "Version %s%s%s%s" +#, fuzzy +#~ msgid "Kick player" +#~ msgstr "Samspill" + #, fuzzy #~ msgid "Player number" #~ msgstr "Spiller" diff --git a/po/nl.po b/po/nl.po index 114a0e38a..7740b6f66 100644 --- a/po/nl.po +++ b/po/nl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-02-25 23:35+0100\n" +"POT-Creation-Date: 2011-03-08 15:43+0100\n" "PO-Revision-Date: 2009-10-31 12:10+0100\n" "Last-Translator: \n" "Language-Team: Dutch \n" @@ -12221,27 +12221,27 @@ msgid "System locale" msgstr "Systeemtaal" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1042 +#: lib/netplay/netplay.cpp:1037 #, fuzzy msgid "Enter password here" msgstr "Vul eerst het wachtwoord in" -#: lib/netplay/netplay.cpp:2060 +#: lib/netplay/netplay.cpp:2055 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "" -#: lib/netplay/netplay.cpp:2082 +#: lib/netplay/netplay.cpp:2077 #, fuzzy, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "Kan niet communiceren met de lobby server! is TCP port 9990 open?" #: src/challenge.cpp:184 #: src/hci.cpp:916 -#: src/hci.cpp:3378 -#: src/hci.cpp:3501 -#: src/hci.cpp:3912 -#: src/hci.cpp:4930 +#: src/hci.cpp:3386 +#: src/hci.cpp:3509 +#: src/hci.cpp:3920 +#: src/hci.cpp:4938 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12549,7 +12549,7 @@ msgid "Player dropped" msgstr "Speler gevallen" #: src/display3d.cpp:599 -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2121 msgid "Waiting for other players" msgstr "Op andere spelers wachten" @@ -12562,7 +12562,7 @@ msgid "Cannot Build. Oil Resource Burning." msgstr "Kan niet bouwen. De oliebron staat in brand." #: src/display.cpp:1828 -#: src/display.cpp:2421 +#: src/display.cpp:2420 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - Schade %d%% - Ervaring %d, %s" @@ -12594,77 +12594,77 @@ msgstr "Eenheid verloren!" msgid "Structure Restored" msgstr "Gebouw hersteld" -#: src/droid.cpp:2732 +#: src/droid.cpp:2734 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" msgstr[0] "Groep %u geselecteerd - %u eenheid" msgstr[1] "Groep %u geselecteerd - %u eenheden" -#: src/droid.cpp:2745 +#: src/droid.cpp:2747 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" msgstr[0] "%u eenheid aan groep %u toegewezen" msgstr[1] "%u eenheden aan groep %u toegewezen" -#: src/droid.cpp:2758 +#: src/droid.cpp:2760 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" msgstr[0] "Gecentreerd op groep %u - %u eenheid" msgstr[1] "Gecentreerd op groep %u - %u eenheden" -#: src/droid.cpp:2762 +#: src/droid.cpp:2764 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:3093 +#: src/droid.cpp:3095 msgid "Rookie" msgstr "Rekruut" -#: src/droid.cpp:3094 +#: src/droid.cpp:3096 msgctxt "rank" msgid "Green" msgstr "Groen" -#: src/droid.cpp:3095 +#: src/droid.cpp:3097 msgid "Trained" msgstr "Geoefend" -#: src/droid.cpp:3096 +#: src/droid.cpp:3098 msgid "Regular" msgstr "Beroeps" -#: src/droid.cpp:3097 +#: src/droid.cpp:3099 msgid "Professional" msgstr "Professioneel" -#: src/droid.cpp:3098 +#: src/droid.cpp:3100 msgid "Veteran" msgstr "Veteraan" -#: src/droid.cpp:3099 +#: src/droid.cpp:3101 msgid "Elite" msgstr "Elite" -#: src/droid.cpp:3100 +#: src/droid.cpp:3102 msgid "Special" msgstr "Speciaal" -#: src/droid.cpp:3101 +#: src/droid.cpp:3103 msgid "Hero" msgstr "Held" -#: src/droid.cpp:4123 +#: src/droid.cpp:4125 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "" -#: src/droid.cpp:4127 +#: src/droid.cpp:4129 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "" @@ -12683,7 +12683,7 @@ msgid "Tutorial" msgstr "Oefenpotje" #: src/frontend.cpp:100 -#: src/hci.cpp:3487 +#: src/hci.cpp:3495 msgid "Options" msgstr "Instellingen" @@ -12744,8 +12744,8 @@ msgstr "EEN SPELER" #: src/frontend.cpp:303 #: src/ingameop.cpp:494 -#: src/mission.cpp:2493 -#: src/mission.cpp:2596 +#: src/mission.cpp:2537 +#: src/mission.cpp:2640 msgid "Load Saved Game" msgstr "Opgeslagen spel laden" @@ -13036,7 +13036,7 @@ msgid "GAME OPTIONS" msgstr "SPELINSTELLINGEN" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2398 +#: src/multiint.cpp:2394 msgid "Mod: " msgstr "" @@ -13045,8 +13045,8 @@ msgid "MAP SAVED!" msgstr "MAP OPGESLAGEN!" #: src/hci.cpp:1573 -#: src/loop.cpp:558 -#: src/loop.cpp:574 +#: src/loop.cpp:561 +#: src/loop.cpp:577 #, fuzzy msgid "GAME SAVED: " msgstr "SPEL OPGESLAGEN!" @@ -13075,155 +13075,155 @@ msgstr "Speler %u heeft zichzelf met cheats (debugmenu) een nieuw eenheid gegeve msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "Speler %u heeft zichzelf met cheats (debugmenu) een nieuw eenheid gegeven: %s." -#: src/hci.cpp:3298 +#: src/hci.cpp:3306 msgid "Commanders (F6)" msgstr "Commandanten (F6)" -#: src/hci.cpp:3311 +#: src/hci.cpp:3319 msgid "Intelligence Display (F5)" msgstr "Inlichtingen (F5)" -#: src/hci.cpp:3324 +#: src/hci.cpp:3332 msgid "Manufacture (F1)" msgstr "Produceer (F1)" -#: src/hci.cpp:3337 +#: src/hci.cpp:3345 msgid "Design (F4)" msgstr "Ontwerp (F4)" -#: src/hci.cpp:3350 +#: src/hci.cpp:3358 msgid "Research (F2)" msgstr "Onderzoek (F2)" -#: src/hci.cpp:3363 +#: src/hci.cpp:3371 msgid "Build (F3)" msgstr "Bouw (F3)" -#: src/hci.cpp:3434 +#: src/hci.cpp:3442 #: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Energie" -#: src/hci.cpp:3525 +#: src/hci.cpp:3533 msgid "Map:" msgstr "" -#: src/hci.cpp:3538 +#: src/hci.cpp:3546 #, fuzzy msgid "Load" msgstr "Spel laden" -#: src/hci.cpp:3539 +#: src/hci.cpp:3547 #, fuzzy msgid "Load Map File" msgstr "Spel laden" -#: src/hci.cpp:3546 +#: src/hci.cpp:3554 #, fuzzy msgid "Save" msgstr "Spel opslaan" -#: src/hci.cpp:3547 +#: src/hci.cpp:3555 #, fuzzy msgid "Save Map File" msgstr "Spel opslaan" -#: src/hci.cpp:3555 +#: src/hci.cpp:3563 msgid "New" msgstr "" -#: src/hci.cpp:3556 +#: src/hci.cpp:3564 msgid "New Blank Map" msgstr "" -#: src/hci.cpp:3592 +#: src/hci.cpp:3600 msgid "Tile" msgstr "Tegel" -#: src/hci.cpp:3593 +#: src/hci.cpp:3601 msgid "Place tiles on map" msgstr "Tegels op kaart plaatsen" -#: src/hci.cpp:3602 +#: src/hci.cpp:3610 msgid "Unit" msgstr "Eenheid" -#: src/hci.cpp:3603 +#: src/hci.cpp:3611 msgid "Place Unit on map" msgstr "Eenheid op kaart plaatsen" -#: src/hci.cpp:3611 +#: src/hci.cpp:3619 msgid "Struct" msgstr "Gebouw" -#: src/hci.cpp:3612 +#: src/hci.cpp:3620 msgid "Place Structures on map" msgstr "Gebouwen op kaart plaatsen" -#: src/hci.cpp:3620 +#: src/hci.cpp:3628 msgid "Feat" msgstr "Kenm." -#: src/hci.cpp:3621 +#: src/hci.cpp:3629 msgid "Place Features on map" msgstr "Kenmerken op kaart plaatsen" -#: src/hci.cpp:3631 +#: src/hci.cpp:3639 msgid "Pause" msgstr "" -#: src/hci.cpp:3632 +#: src/hci.cpp:3640 msgid "Pause or unpause the game" msgstr "Spel pauzeren of verdergaan" -#: src/hci.cpp:3646 +#: src/hci.cpp:3654 msgid "Align height of all map objects" msgstr "Hoogte van alle kaartobjecten uitlijnen" -#: src/hci.cpp:3656 +#: src/hci.cpp:3664 msgid "Edit" msgstr "" -#: src/hci.cpp:3657 +#: src/hci.cpp:3665 #, fuzzy msgid "Start Edit Mode" msgstr "Start zonder basis" -#: src/hci.cpp:3671 +#: src/hci.cpp:3679 #: src/ingameop.cpp:112 #: src/ingameop.cpp:256 #: src/ingameop.cpp:260 msgid "Quit" msgstr "Afsluiten" -#: src/hci.cpp:3672 +#: src/hci.cpp:3680 msgid "Exit Game" msgstr "Spel verlaten" -#: src/hci.cpp:3698 +#: src/hci.cpp:3706 #, fuzzy msgid "Current Player:" msgstr "Meerdere spelers" -#: src/hci.cpp:3989 +#: src/hci.cpp:3997 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "Voortgangsbalk" -#: src/hci.cpp:4855 +#: src/hci.cpp:4863 msgid "Factory Delivery Point" msgstr "Fabrieksafleverpunt" -#: src/hci.cpp:4873 +#: src/hci.cpp:4881 msgid "Loop Production" msgstr "Productie herhalen" -#: src/hci.cpp:4953 +#: src/hci.cpp:4961 msgid "Tab Scroll left" msgstr "" -#: src/hci.cpp:4968 +#: src/hci.cpp:4976 msgid "Tab Scroll right" msgstr "" @@ -13249,8 +13249,8 @@ msgstr "" #: src/ingameop.cpp:274 #: src/ingameop.cpp:498 -#: src/mission.cpp:2480 -#: src/mission.cpp:2599 +#: src/mission.cpp:2524 +#: src/mission.cpp:2643 msgid "Save Game" msgstr "Spel opslaan" @@ -14203,42 +14203,42 @@ msgstr "" msgid "Toggle Driving Mode" msgstr "Camera volgen" -#: src/loop.cpp:565 -#: src/loop.cpp:581 +#: src/loop.cpp:568 +#: src/loop.cpp:584 msgid "Could not save game!" msgstr "Kon het spel NIET opslaan!" -#: src/mission.cpp:2041 +#: src/mission.cpp:2085 msgid "Load Transport" msgstr "Vervoer inladen" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "DOEL BEHAALD door vals spelen!" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED" msgstr "DOEL BEHAALD" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED--and you cheated!" msgstr "DOEL MISLUKT-- en je hebt valsgespeeld!" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED" msgstr "DOEL MISLUKT" -#: src/mission.cpp:2459 -#: src/mission.cpp:2499 -#: src/mission.cpp:2613 +#: src/mission.cpp:2503 +#: src/mission.cpp:2543 +#: src/mission.cpp:2657 msgid "Quit To Main Menu" msgstr "Afsluiten naar hoofdmenu" -#: src/mission.cpp:2467 +#: src/mission.cpp:2511 msgid "Continue Game" msgstr "Spel vervolgen" -#: src/mission.cpp:2564 +#: src/mission.cpp:2608 #, fuzzy msgid "GAME SAVED :" msgstr "SPEL OPGESLAGEN!" @@ -14537,118 +14537,113 @@ msgstr "" msgid "Player colour" msgstr "Speler verliet het spel" -#: src/multiint.cpp:2071 +#: src/multiint.cpp:2068 msgid "Team" msgstr "Ploeg" -#: src/multiint.cpp:2083 -#, fuzzy -msgid "Kick player" -msgstr "2 spelers" - -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 #, fuzzy msgid "Click to change difficulty" msgstr "Klik om wachtwoord intevullen" -#: src/multiint.cpp:2130 +#: src/multiint.cpp:2126 msgid "Click when ready" msgstr "Klik zodra klaar" -#: src/multiint.cpp:2134 +#: src/multiint.cpp:2130 msgid "READY?" msgstr "" -#: src/multiint.cpp:2178 +#: src/multiint.cpp:2174 msgid "PLAYERS" msgstr "SPELERS" -#: src/multiint.cpp:2213 +#: src/multiint.cpp:2209 #, fuzzy msgid "Click to change to this slot" msgstr "Klik om wachtwoord intevullen" -#: src/multiint.cpp:2241 +#: src/multiint.cpp:2237 #, fuzzy msgid "Choose Team" msgstr "Vergrendelde ploegen" -#: src/multiint.cpp:2271 +#: src/multiint.cpp:2267 #, fuzzy msgid "Click to change player colour" msgstr "Radar toont spelerskleuren" -#: src/multiint.cpp:2299 +#: src/multiint.cpp:2295 #, fuzzy msgid "Click to change player position" msgstr "Bewaak positie" -#: src/multiint.cpp:2305 +#: src/multiint.cpp:2301 #, fuzzy msgid "Click to change AI" msgstr "Klik om wachtwoord intevullen" -#: src/multiint.cpp:2309 +#: src/multiint.cpp:2305 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2371 +#: src/multiint.cpp:2367 msgid "CHAT" msgstr "BABBEL" -#: src/multiint.cpp:2403 +#: src/multiint.cpp:2399 msgid "All players need to have the same mods to join your game." msgstr "" -#: src/multiint.cpp:2561 +#: src/multiint.cpp:2557 #, fuzzy, c-format msgid "*** password [%s] is now required! ***" msgstr "*** wachtwoord is NU nodig! ***" -#: src/multiint.cpp:2569 +#: src/multiint.cpp:2565 msgid "*** password is NOT required! ***" msgstr "*** Er is GEEN wachtwoord nodig! ***" -#: src/multiint.cpp:2810 +#: src/multiint.cpp:2806 msgid "Sorry! Failed to host the game." msgstr "" -#: src/multiint.cpp:2931 +#: src/multiint.cpp:2927 msgid "'Locked Teams' mode enabled" msgstr "Vergrendelde ploegen" -#: src/multiint.cpp:3012 +#: src/multiint.cpp:3008 #, c-format msgid "The host has kicked %s from the game!" msgstr "De gastheer heeft %s uit het spel verwijderd!" -#: src/multiint.cpp:3082 +#: src/multiint.cpp:3078 msgid "Host is Starting Game" msgstr "Gastheer start spel" -#: src/multiint.cpp:3648 +#: src/multiint.cpp:3644 msgid "Players" msgstr "Spelers" -#: src/multiint.cpp:3786 +#: src/multiint.cpp:3782 #, c-format msgid "Sending Map: %d%% " msgstr "" -#: src/multiint.cpp:3794 +#: src/multiint.cpp:3790 #, c-format msgid "Map: %d%% downloaded" msgstr "" -#: src/multiint.cpp:3820 +#: src/multiint.cpp:3816 msgid "HOST" msgstr "" -#: src/multiint.cpp:3827 +#: src/multiint.cpp:3823 #: src/multimenu.cpp:772 msgid "Ping" msgstr "Ping" @@ -14825,80 +14820,80 @@ msgstr "Geef energie aan speler" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "" -#: src/multiplay.cpp:1057 +#: src/multiplay.cpp:1056 #, fuzzy msgid "(allies" msgstr "Bondgenootschappen toestaan" -#: src/multiplay.cpp:1065 +#: src/multiplay.cpp:1064 msgid "(private to " msgstr "" -#: src/multiplay.cpp:1078 +#: src/multiplay.cpp:1077 msgid "[invalid]" msgstr "" -#: src/multiplay.cpp:1942 +#: src/multiplay.cpp:1941 msgid "Green" msgstr "Groen" -#: src/multiplay.cpp:1943 +#: src/multiplay.cpp:1942 msgid "Orange" msgstr "Oranje" -#: src/multiplay.cpp:1944 +#: src/multiplay.cpp:1943 msgid "Grey" msgstr "Grijs" -#: src/multiplay.cpp:1945 +#: src/multiplay.cpp:1944 msgid "Black" msgstr "Zwart" -#: src/multiplay.cpp:1946 +#: src/multiplay.cpp:1945 msgid "Red" msgstr "Rood" -#: src/multiplay.cpp:1947 +#: src/multiplay.cpp:1946 msgid "Blue" msgstr "Blauw" -#: src/multiplay.cpp:1948 +#: src/multiplay.cpp:1947 msgid "Pink" msgstr "Roze" -#: src/multiplay.cpp:1949 +#: src/multiplay.cpp:1948 msgid "Cyan" msgstr "Cyaan" -#: src/multiplay.cpp:1950 +#: src/multiplay.cpp:1949 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:1951 +#: src/multiplay.cpp:1950 msgid "Purple" msgstr "" -#: src/multiplay.cpp:1952 +#: src/multiplay.cpp:1951 msgid "White" msgstr "" -#: src/multiplay.cpp:1953 +#: src/multiplay.cpp:1952 msgid "Bright blue" msgstr "" -#: src/multiplay.cpp:1954 +#: src/multiplay.cpp:1953 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:1955 +#: src/multiplay.cpp:1954 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:1956 +#: src/multiplay.cpp:1955 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:1957 +#: src/multiplay.cpp:1956 msgid "Brown" msgstr "" @@ -14906,16 +14901,16 @@ msgstr "" msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "" -#: src/research.cpp:1737 +#: src/research.cpp:1739 #, c-format msgid "Research completed: %s" msgstr "Onderzoek voltooid: %s" -#: src/research.cpp:1742 +#: src/research.cpp:1744 msgid "Research Completed" msgstr "Onderzoek voltooid" -#: src/research.cpp:2563 +#: src/research.cpp:2565 msgid "Research Award" msgstr "Onderzoeksonderscheiding" @@ -15079,63 +15074,63 @@ msgstr "Kon geen sensoreenheden vinden!" msgid "Unable to locate any Commanders!" msgstr "Kon geen commandanten vinden!" -#: src/structure.cpp:2614 +#: src/structure.cpp:2650 #, fuzzy msgid "Command Control Limit Reached - Production Halted" msgstr "Commando controlelimiet bereikt - Productie gestopt" -#: src/structure.cpp:5806 -#: src/structure.cpp:5831 +#: src/structure.cpp:5888 +#: src/structure.cpp:5913 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" msgstr[0] "%s - %u Eenheid toegewezen" msgstr[1] "%s - %u Eenheden toegewezen" -#: src/structure.cpp:5836 -#: src/structure.cpp:5904 -#: src/structure.cpp:5920 -#: src/structure.cpp:5934 +#: src/structure.cpp:5918 +#: src/structure.cpp:5986 +#: src/structure.cpp:6002 +#: src/structure.cpp:6016 #, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - Schade %3.0f%%" -#: src/structure.cpp:5886 +#: src/structure.cpp:5968 #, c-format msgid "%s - Connected %u of %u" msgstr "%s - Verbonden met %u van %u" -#: src/structure.cpp:6050 -#: src/structure.cpp:6095 +#: src/structure.cpp:6132 +#: src/structure.cpp:6177 #, c-format msgid "%s - Electronically Damaged" msgstr "%s - Elektronisch beschadigd" -#: src/structure.cpp:6332 +#: src/structure.cpp:6414 msgid "Electronic Reward - Visibility Report" msgstr "Elektronische onderscheiding - Zichtbaarheidsverslag" -#: src/structure.cpp:6372 +#: src/structure.cpp:6454 msgid "Factory Reward - Propulsion" msgstr "Fabrieksonderscheiding - Aandrijving" -#: src/structure.cpp:6396 +#: src/structure.cpp:6478 msgid "Factory Reward - Body" msgstr "Fabrieksonderscheiding - Carrosserie" -#: src/structure.cpp:6420 +#: src/structure.cpp:6502 msgid "Factory Reward - Weapon" msgstr "Fabrieksonderscheiding - Wapen" -#: src/structure.cpp:6429 +#: src/structure.cpp:6511 msgid "Factory Reward - Nothing" msgstr "Fabrieksonderscheiding - Niets" -#: src/structure.cpp:6457 +#: src/structure.cpp:6539 msgid "Repair Facility Award - Repair" msgstr "Reparatie-onderscheiding - Reparatie" -#: src/structure.cpp:6464 +#: src/structure.cpp:6546 msgid "Repair Facility Award - Nothing" msgstr "Reparatie-onderscheiding - Niets" @@ -15152,34 +15147,36 @@ msgstr "" msgid "Reinforcements landing" msgstr "Versterkingen landen" -#: src/version.cpp:143 -msgid " (modified and switched locally)" -msgstr " (lokaal gewijzigd en gewisseld)" - -#: src/version.cpp:145 +#: src/version.cpp:129 msgid " (modified locally)" msgstr " (lokaal gewijzigd)" -#: src/version.cpp:147 -msgid " (switched locally)" -msgstr " (lokaal gewisseld)" - -#: src/version.cpp:154 +#: src/version.cpp:136 msgid " - DEBUG" msgstr " - FOUTEN VERWIJDEREN" -#: src/version.cpp:163 +#: src/version.cpp:145 #, c-format msgid " - Built %s" msgstr " - Gebouwd %s" #. TRANSLATORS: This string looks as follows when expanded. #. "Version " -#: src/version.cpp:173 +#: src/version.cpp:155 #, c-format msgid "Version %s%s%s%s" msgstr "Versie %s%s%s%s" +#, fuzzy +#~ msgid "Kick player" +#~ msgstr "2 spelers" + +#~ msgid " (modified and switched locally)" +#~ msgstr " (lokaal gewijzigd en gewisseld)" + +#~ msgid " (switched locally)" +#~ msgstr " (lokaal gewisseld)" + #, fuzzy #~ msgid "Infinite Production" #~ msgstr "Productie herhalen" diff --git a/po/pl.po b/po/pl.po index ad79cb44b..2c631e1d4 100644 --- a/po/pl.po +++ b/po/pl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-02-25 23:35+0100\n" +"POT-Creation-Date: 2011-03-08 15:43+0100\n" "PO-Revision-Date: 2010-12-11 17:00+0100\n" "Last-Translator: Michał D. aka Emdek \n" "Language-Team: Polish \n" @@ -12023,26 +12023,26 @@ msgid "System locale" msgstr "Język systemu" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1042 +#: lib/netplay/netplay.cpp:1037 msgid "Enter password here" msgstr "Wpisz hasło tutaj" -#: lib/netplay/netplay.cpp:2060 +#: lib/netplay/netplay.cpp:2055 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "Nie można rozwinąć nazwy głównego serwera (%s)!" -#: lib/netplay/netplay.cpp:2082 +#: lib/netplay/netplay.cpp:2077 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "Nie można skomunikować się z serwerem lobby! Czy port %u TCP jest otwarty dla ruchu wychodzącego?" #: src/challenge.cpp:184 #: src/hci.cpp:916 -#: src/hci.cpp:3378 -#: src/hci.cpp:3501 -#: src/hci.cpp:3912 -#: src/hci.cpp:4930 +#: src/hci.cpp:3386 +#: src/hci.cpp:3509 +#: src/hci.cpp:3920 +#: src/hci.cpp:4938 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12349,7 +12349,7 @@ msgid "Player dropped" msgstr "Gracz odrzucony" #: src/display3d.cpp:599 -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2121 msgid "Waiting for other players" msgstr "Oczekiwanie na graczy" @@ -12362,7 +12362,7 @@ msgid "Cannot Build. Oil Resource Burning." msgstr "Nie można budować. Płonie ropa." #: src/display.cpp:1828 -#: src/display.cpp:2421 +#: src/display.cpp:2420 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - Obrażenia %d%% - Doświadczenie %d, %s" @@ -12394,7 +12394,7 @@ msgstr "Jednostka utracona!" msgid "Structure Restored" msgstr "Struktura odbudowana" -#: src/droid.cpp:2732 +#: src/droid.cpp:2734 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" @@ -12402,7 +12402,7 @@ msgstr[0] "Wybrana grupa %u - %u jednostka" msgstr[1] "Wybrana grupa %u - %u jednostki" msgstr[2] "Wybrana grupa %u - %u jednostek" -#: src/droid.cpp:2745 +#: src/droid.cpp:2747 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" @@ -12410,7 +12410,7 @@ msgstr[0] "%u jednostka przypisana do Grupy %u" msgstr[1] "%u jednostki przypisane do Grupy %u" msgstr[2] "%u jednostek przypisano do Grupy %u" -#: src/droid.cpp:2758 +#: src/droid.cpp:2760 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" @@ -12418,7 +12418,7 @@ msgstr[0] "Wyśrodkowano na grupie %u - %u jednostka" msgstr[1] "Wyśrodkowano na grupie %u - %u jednostki" msgstr[2] "Wyśrodkowano na grupie %u - %u jednostek" -#: src/droid.cpp:2762 +#: src/droid.cpp:2764 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" @@ -12427,49 +12427,49 @@ msgstr[1] "Wyrównanie z grupą %u - %u jednostki" msgstr[2] "Wyrównanie z grupą %u - %u jednostek" # I had really trouble with this one. This word has no meaning in Polish so I decided to translate it as 'Newbe' -#: src/droid.cpp:3093 +#: src/droid.cpp:3095 msgid "Rookie" msgstr "Nowicjusz" -#: src/droid.cpp:3094 +#: src/droid.cpp:3096 msgctxt "rank" msgid "Green" msgstr "Zielony" -#: src/droid.cpp:3095 +#: src/droid.cpp:3097 msgid "Trained" msgstr "Wyszkolony" -#: src/droid.cpp:3096 +#: src/droid.cpp:3098 msgid "Regular" msgstr "Zawodowy" -#: src/droid.cpp:3097 +#: src/droid.cpp:3099 msgid "Professional" msgstr "Profesjonalny" -#: src/droid.cpp:3098 +#: src/droid.cpp:3100 msgid "Veteran" msgstr "Weteran" -#: src/droid.cpp:3099 +#: src/droid.cpp:3101 msgid "Elite" msgstr "Elita" -#: src/droid.cpp:3100 +#: src/droid.cpp:3102 msgid "Special" msgstr "Specjalny" -#: src/droid.cpp:3101 +#: src/droid.cpp:3103 msgid "Hero" msgstr "Bohater" -#: src/droid.cpp:4123 +#: src/droid.cpp:4125 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "%s chciał dać ci %s ale masz już ich zbyt wiele!" -#: src/droid.cpp:4127 +#: src/droid.cpp:4129 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "Chciałeś dać %s %s ale ma ich już ich zbyt wiele!" @@ -12488,7 +12488,7 @@ msgid "Tutorial" msgstr "Szkolenie" #: src/frontend.cpp:100 -#: src/hci.cpp:3487 +#: src/hci.cpp:3495 msgid "Options" msgstr "Opcje" @@ -12549,8 +12549,8 @@ msgstr "JEDEN GRACZ" #: src/frontend.cpp:303 #: src/ingameop.cpp:494 -#: src/mission.cpp:2493 -#: src/mission.cpp:2596 +#: src/mission.cpp:2537 +#: src/mission.cpp:2640 msgid "Load Saved Game" msgstr "Załaduj zapisany stan gry" @@ -12835,7 +12835,7 @@ msgid "GAME OPTIONS" msgstr "USTAWIENIA GRY" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2398 +#: src/multiint.cpp:2394 msgid "Mod: " msgstr "Mod: " @@ -12844,8 +12844,8 @@ msgid "MAP SAVED!" msgstr "MAPA ZAPISANA!" #: src/hci.cpp:1573 -#: src/loop.cpp:558 -#: src/loop.cpp:574 +#: src/loop.cpp:561 +#: src/loop.cpp:577 #, fuzzy msgid "GAME SAVED: " msgstr "GRA ZAPISANA :" @@ -12874,149 +12874,149 @@ msgstr "Gracz %u oszukuje (menu odpluskwiania) by zdobyć nową jednostkę: %s." msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "Gracz %u oszukuje (menu odpluskwiania) by zdobyć nową jednostkę: %s." -#: src/hci.cpp:3298 +#: src/hci.cpp:3306 msgid "Commanders (F6)" msgstr "Dowódcy (F6)" -#: src/hci.cpp:3311 +#: src/hci.cpp:3319 msgid "Intelligence Display (F5)" msgstr "Dane wywiadu (F5)" -#: src/hci.cpp:3324 +#: src/hci.cpp:3332 msgid "Manufacture (F1)" msgstr "Produkcja (F1)" -#: src/hci.cpp:3337 +#: src/hci.cpp:3345 msgid "Design (F4)" msgstr "Projekt (F4)" -#: src/hci.cpp:3350 +#: src/hci.cpp:3358 msgid "Research (F2)" msgstr "Badania (F2)" -#: src/hci.cpp:3363 +#: src/hci.cpp:3371 msgid "Build (F3)" msgstr "Buduj (F3)" -#: src/hci.cpp:3434 +#: src/hci.cpp:3442 #: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Energia" -#: src/hci.cpp:3525 +#: src/hci.cpp:3533 msgid "Map:" msgstr "Mapa:" -#: src/hci.cpp:3538 +#: src/hci.cpp:3546 msgid "Load" msgstr "Załaduj" -#: src/hci.cpp:3539 +#: src/hci.cpp:3547 msgid "Load Map File" msgstr "Załaduj plik mapy" -#: src/hci.cpp:3546 +#: src/hci.cpp:3554 msgid "Save" msgstr "Zapisz" -#: src/hci.cpp:3547 +#: src/hci.cpp:3555 msgid "Save Map File" msgstr "Zapisz plik mapy" -#: src/hci.cpp:3555 +#: src/hci.cpp:3563 msgid "New" msgstr "Nowa" -#: src/hci.cpp:3556 +#: src/hci.cpp:3564 msgid "New Blank Map" msgstr "Nowa mapa" -#: src/hci.cpp:3592 +#: src/hci.cpp:3600 msgid "Tile" msgstr "Kafel" -#: src/hci.cpp:3593 +#: src/hci.cpp:3601 msgid "Place tiles on map" msgstr "Umieść kafel na mapie" -#: src/hci.cpp:3602 +#: src/hci.cpp:3610 msgid "Unit" msgstr "Jednostka" -#: src/hci.cpp:3603 +#: src/hci.cpp:3611 msgid "Place Unit on map" msgstr "Umieść jednostkę na mapie" -#: src/hci.cpp:3611 +#: src/hci.cpp:3619 msgid "Struct" msgstr "Struktura" -#: src/hci.cpp:3612 +#: src/hci.cpp:3620 msgid "Place Structures on map" msgstr "Umieść struktury na mapie" -#: src/hci.cpp:3620 +#: src/hci.cpp:3628 msgid "Feat" msgstr "Obiekt" -#: src/hci.cpp:3621 +#: src/hci.cpp:3629 msgid "Place Features on map" msgstr "Umieść obiekty specjalne na mapie" -#: src/hci.cpp:3631 +#: src/hci.cpp:3639 msgid "Pause" msgstr "Pauza" -#: src/hci.cpp:3632 +#: src/hci.cpp:3640 msgid "Pause or unpause the game" msgstr "Spauzuj lub wznów grę" -#: src/hci.cpp:3646 +#: src/hci.cpp:3654 msgid "Align height of all map objects" msgstr "Wyrównaj wysokość wszystkich obiektów mapy" -#: src/hci.cpp:3656 +#: src/hci.cpp:3664 msgid "Edit" msgstr "Edytuj" -#: src/hci.cpp:3657 +#: src/hci.cpp:3665 msgid "Start Edit Mode" msgstr "Rozpocznij tryb edycji" -#: src/hci.cpp:3671 +#: src/hci.cpp:3679 #: src/ingameop.cpp:112 #: src/ingameop.cpp:256 #: src/ingameop.cpp:260 msgid "Quit" msgstr "Wyjdź" -#: src/hci.cpp:3672 +#: src/hci.cpp:3680 msgid "Exit Game" msgstr "Zakończ grę" -#: src/hci.cpp:3698 +#: src/hci.cpp:3706 msgid "Current Player:" msgstr "Aktualny gracz:" -#: src/hci.cpp:3989 +#: src/hci.cpp:3997 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "Pasek postępu" -#: src/hci.cpp:4855 +#: src/hci.cpp:4863 msgid "Factory Delivery Point" msgstr "Punkt dostaw fabryki" -#: src/hci.cpp:4873 +#: src/hci.cpp:4881 msgid "Loop Production" msgstr "Cykl produkcji" -#: src/hci.cpp:4953 +#: src/hci.cpp:4961 msgid "Tab Scroll left" msgstr "Przewiń zakładki w lewo" -#: src/hci.cpp:4968 +#: src/hci.cpp:4976 msgid "Tab Scroll right" msgstr "Przewiń zakładki w prawo" @@ -13042,8 +13042,8 @@ msgstr "" #: src/ingameop.cpp:274 #: src/ingameop.cpp:498 -#: src/mission.cpp:2480 -#: src/mission.cpp:2599 +#: src/mission.cpp:2524 +#: src/mission.cpp:2643 msgid "Save Game" msgstr "Zapisz grę" @@ -13974,42 +13974,42 @@ msgstr "Śledź obiekt gry" msgid "Toggle Driving Mode" msgstr "Przełącz tryb kierowania " -#: src/loop.cpp:565 -#: src/loop.cpp:581 +#: src/loop.cpp:568 +#: src/loop.cpp:584 msgid "Could not save game!" msgstr "Niemożna zapisać gry!" -#: src/mission.cpp:2041 +#: src/mission.cpp:2085 msgid "Load Transport" msgstr "Ładuj transport" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "CEL OSIĄGNIĘTY przez oszukiwanie!" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED" msgstr "CEL OSIĄGNIĘTY" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED--and you cheated!" msgstr "CEL NIE OSIĄGNIĘTY--chociaż oszukiwałeś!" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED" msgstr "CEL NIE OSIĄGNIĘTY" -#: src/mission.cpp:2459 -#: src/mission.cpp:2499 -#: src/mission.cpp:2613 +#: src/mission.cpp:2503 +#: src/mission.cpp:2543 +#: src/mission.cpp:2657 msgid "Quit To Main Menu" msgstr "Wyjdź do menu głównego" -#: src/mission.cpp:2467 +#: src/mission.cpp:2511 msgid "Continue Game" msgstr "Kontynuuj grę" -#: src/mission.cpp:2564 +#: src/mission.cpp:2608 msgid "GAME SAVED :" msgstr "GRA ZAPISANA :" @@ -14298,116 +14298,112 @@ msgstr "" msgid "Player colour" msgstr "Kolor gracza" -#: src/multiint.cpp:2071 +#: src/multiint.cpp:2068 msgid "Team" msgstr "Drużyna" -#: src/multiint.cpp:2083 -msgid "Kick player" -msgstr "Wyrzuć gracza" - -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 #, fuzzy msgid "Click to change difficulty" msgstr "Kliknij aby dostosować poziom sztucznej inteligencji" -#: src/multiint.cpp:2130 +#: src/multiint.cpp:2126 msgid "Click when ready" msgstr "Kliknij kiedy jesteś gotowy" -#: src/multiint.cpp:2134 +#: src/multiint.cpp:2130 msgid "READY?" msgstr "GOTOWY?" -#: src/multiint.cpp:2178 +#: src/multiint.cpp:2174 msgid "PLAYERS" msgstr "GRACZE" -#: src/multiint.cpp:2213 +#: src/multiint.cpp:2209 #, fuzzy msgid "Click to change to this slot" msgstr "Kliknij aby zmienić ustawienia gracza" -#: src/multiint.cpp:2241 +#: src/multiint.cpp:2237 msgid "Choose Team" msgstr "Wybierz drużynę" -#: src/multiint.cpp:2271 +#: src/multiint.cpp:2267 #, fuzzy msgid "Click to change player colour" msgstr "Kliknij aby zmienić ustawienia gracza" -#: src/multiint.cpp:2299 +#: src/multiint.cpp:2295 #, fuzzy msgid "Click to change player position" msgstr "Kliknij aby zmienić ustawienia gracza" -#: src/multiint.cpp:2305 +#: src/multiint.cpp:2301 #, fuzzy msgid "Click to change AI" msgstr "Kliknij aby zmienić ustawienia gracza" -#: src/multiint.cpp:2309 +#: src/multiint.cpp:2305 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2371 +#: src/multiint.cpp:2367 msgid "CHAT" msgstr "CHAT" -#: src/multiint.cpp:2403 +#: src/multiint.cpp:2399 msgid "All players need to have the same mods to join your game." msgstr "Wszyscy gracze muszą mieć takie same mody aby przyłączyć się do twojej gry." -#: src/multiint.cpp:2561 +#: src/multiint.cpp:2557 #, c-format msgid "*** password [%s] is now required! ***" msgstr "*** hasło [%s] jest teraz wymagane! ***" -#: src/multiint.cpp:2569 +#: src/multiint.cpp:2565 msgid "*** password is NOT required! ***" msgstr "*** hasło jest teraz niewymagane! ***" -#: src/multiint.cpp:2810 +#: src/multiint.cpp:2806 msgid "Sorry! Failed to host the game." msgstr "Przepraszamy! Nie udało się utworzyć serwera gry." -#: src/multiint.cpp:2931 +#: src/multiint.cpp:2927 msgid "'Locked Teams' mode enabled" msgstr "Włączono 'zablokowane drużyny'" -#: src/multiint.cpp:3012 +#: src/multiint.cpp:3008 #, c-format msgid "The host has kicked %s from the game!" msgstr "Host wyrzucił %s z gry!" -#: src/multiint.cpp:3082 +#: src/multiint.cpp:3078 msgid "Host is Starting Game" msgstr "Host rozpoczyna grę" -#: src/multiint.cpp:3648 +#: src/multiint.cpp:3644 msgid "Players" msgstr "Gracze" -#: src/multiint.cpp:3786 +#: src/multiint.cpp:3782 #, c-format msgid "Sending Map: %d%% " msgstr "Przesyłanie mapy: %d%%" -#: src/multiint.cpp:3794 +#: src/multiint.cpp:3790 #, c-format msgid "Map: %d%% downloaded" msgstr "Mapa: %d%% pobrane" -#: src/multiint.cpp:3820 +#: src/multiint.cpp:3816 msgid "HOST" msgstr "HOST" -#: src/multiint.cpp:3827 +#: src/multiint.cpp:3823 #: src/multimenu.cpp:772 msgid "Ping" msgstr "Ping" @@ -14579,80 +14575,80 @@ msgstr "Przesyła energię graczowi" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "Gracz %s wyrzucony z powodu próby pominięcia sprawdzenia integralności danych!" -#: src/multiplay.cpp:1057 +#: src/multiplay.cpp:1056 msgid "(allies" msgstr "(sojusznicy" -#: src/multiplay.cpp:1065 +#: src/multiplay.cpp:1064 msgid "(private to " msgstr "(prywatny dla" -#: src/multiplay.cpp:1078 +#: src/multiplay.cpp:1077 msgid "[invalid]" msgstr "[nieprawidłowy]" -#: src/multiplay.cpp:1942 +#: src/multiplay.cpp:1941 msgid "Green" msgstr "Zielony" -#: src/multiplay.cpp:1943 +#: src/multiplay.cpp:1942 msgid "Orange" msgstr "Pomarańczowy" -#: src/multiplay.cpp:1944 +#: src/multiplay.cpp:1943 msgid "Grey" msgstr "Szary" -#: src/multiplay.cpp:1945 +#: src/multiplay.cpp:1944 msgid "Black" msgstr "Czarny" -#: src/multiplay.cpp:1946 +#: src/multiplay.cpp:1945 msgid "Red" msgstr "Czerwony" -#: src/multiplay.cpp:1947 +#: src/multiplay.cpp:1946 msgid "Blue" msgstr "Niebieski" -#: src/multiplay.cpp:1948 +#: src/multiplay.cpp:1947 msgid "Pink" msgstr "Różowy" -#: src/multiplay.cpp:1949 +#: src/multiplay.cpp:1948 msgid "Cyan" msgstr "Turkusowy" -#: src/multiplay.cpp:1950 +#: src/multiplay.cpp:1949 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:1951 +#: src/multiplay.cpp:1950 msgid "Purple" msgstr "" -#: src/multiplay.cpp:1952 +#: src/multiplay.cpp:1951 msgid "White" msgstr "" -#: src/multiplay.cpp:1953 +#: src/multiplay.cpp:1952 #, fuzzy msgid "Bright blue" msgstr "Prawy przycisk" -#: src/multiplay.cpp:1954 +#: src/multiplay.cpp:1953 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:1955 +#: src/multiplay.cpp:1954 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:1956 +#: src/multiplay.cpp:1955 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:1957 +#: src/multiplay.cpp:1956 msgid "Brown" msgstr "" @@ -14660,16 +14656,16 @@ msgstr "" msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "Nie możemy tego zrobić! Tylko cyborgi mogą korzystać Transportowca cyborgów!" -#: src/research.cpp:1737 +#: src/research.cpp:1739 #, c-format msgid "Research completed: %s" msgstr "Badania ukończone: %s" -#: src/research.cpp:1742 +#: src/research.cpp:1744 msgid "Research Completed" msgstr "Badania ukończone" -#: src/research.cpp:2563 +#: src/research.cpp:2565 msgid "Research Award" msgstr "Technologia skradziona" @@ -14834,13 +14830,13 @@ msgstr "Niemożna odnaleźć jednostek z radarami!" msgid "Unable to locate any Commanders!" msgstr "Niemożna odnaleźć dowódców!" -#: src/structure.cpp:2614 +#: src/structure.cpp:2650 #, fuzzy msgid "Command Control Limit Reached - Production Halted" msgstr "Limit kontrolny osiągnięty - produkcja wstrzymana" -#: src/structure.cpp:5806 -#: src/structure.cpp:5831 +#: src/structure.cpp:5888 +#: src/structure.cpp:5913 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" @@ -14848,51 +14844,51 @@ msgstr[0] "%s - %u Jednostka przydzielona" msgstr[1] "%s - %u Jednostki przydzielone" msgstr[2] "%s - %u Jednostek przydzielonych" -#: src/structure.cpp:5836 -#: src/structure.cpp:5904 -#: src/structure.cpp:5920 -#: src/structure.cpp:5934 +#: src/structure.cpp:5918 +#: src/structure.cpp:5986 +#: src/structure.cpp:6002 +#: src/structure.cpp:6016 #, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - Uszkodzenia %3.0f%%" -#: src/structure.cpp:5886 +#: src/structure.cpp:5968 #, c-format msgid "%s - Connected %u of %u" msgstr "%s - Połączony %u z %u" -#: src/structure.cpp:6050 -#: src/structure.cpp:6095 +#: src/structure.cpp:6132 +#: src/structure.cpp:6177 #, c-format msgid "%s - Electronically Damaged" msgstr "%s - Uszkodzony elektronicznie" # This maybe sound weird, but I translated this as 'stolen technology' -#: src/structure.cpp:6332 +#: src/structure.cpp:6414 msgid "Electronic Reward - Visibility Report" msgstr "Technologia skradziona - raport widoczności" -#: src/structure.cpp:6372 +#: src/structure.cpp:6454 msgid "Factory Reward - Propulsion" msgstr "Technologia skradziona - Napęd" -#: src/structure.cpp:6396 +#: src/structure.cpp:6478 msgid "Factory Reward - Body" msgstr "Technologia skradziona - Kadłub" -#: src/structure.cpp:6420 +#: src/structure.cpp:6502 msgid "Factory Reward - Weapon" msgstr "Technologia skradziona - Broń" -#: src/structure.cpp:6429 +#: src/structure.cpp:6511 msgid "Factory Reward - Nothing" msgstr "Technologia skradziona - Brak" -#: src/structure.cpp:6457 +#: src/structure.cpp:6539 msgid "Repair Facility Award - Repair" msgstr "Technologia skradziona - Naprawa" -#: src/structure.cpp:6464 +#: src/structure.cpp:6546 msgid "Repair Facility Award - Nothing" msgstr "Technologia skradziona - Brak" @@ -14909,34 +14905,35 @@ msgstr "Nie ma dość miejsca w Transportowcu!" msgid "Reinforcements landing" msgstr "Posiłki lądują" -#: src/version.cpp:143 -msgid " (modified and switched locally)" -msgstr " (zmodyfikowany i zamieniony lokalnie)" - -#: src/version.cpp:145 +#: src/version.cpp:129 msgid " (modified locally)" msgstr " (zmodyfikowany lokalnie)" -#: src/version.cpp:147 -msgid " (switched locally)" -msgstr " (zamieniony lokalnie)" - -#: src/version.cpp:154 +#: src/version.cpp:136 msgid " - DEBUG" msgstr " - DEBUG" -#: src/version.cpp:163 +#: src/version.cpp:145 #, c-format msgid " - Built %s" msgstr " - Zbudowana %s" #. TRANSLATORS: This string looks as follows when expanded. #. "Version " -#: src/version.cpp:173 +#: src/version.cpp:155 #, c-format msgid "Version %s%s%s%s" msgstr "Wersja %s%s%s%s" +#~ msgid "Kick player" +#~ msgstr "Wyrzuć gracza" + +#~ msgid " (modified and switched locally)" +#~ msgstr " (zmodyfikowany i zamieniony lokalnie)" + +#~ msgid " (switched locally)" +#~ msgstr " (zamieniony lokalnie)" + #~ msgid "Infinite Production" #~ msgstr "Produkcja ciągła" diff --git a/po/pt.po b/po/pt.po index a4dfaa4d2..a01fbc72d 100644 --- a/po/pt.po +++ b/po/pt.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-02-25 23:35+0100\n" +"POT-Creation-Date: 2011-03-08 15:43+0100\n" "PO-Revision-Date: 2011-02-16 12:57-0300\n" "Last-Translator: Artur Filipe \n" "Language-Team: Portugese \n" @@ -12170,27 +12170,27 @@ msgid "System locale" msgstr "Linguagem do sistema" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1042 +#: lib/netplay/netplay.cpp:1037 #, fuzzy msgid "Enter password here" msgstr "Insere Primeiro a Palavra-passe" -#: lib/netplay/netplay.cpp:2060 +#: lib/netplay/netplay.cpp:2055 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "Não pode ser obtido o nome do masterserver (%s)!" -#: lib/netplay/netplay.cpp:2082 +#: lib/netplay/netplay.cpp:2077 #, fuzzy, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "Não foi possível comunicar com o servidor de lobby! A porta TCP %u está aberta para tráfego outgoing?" #: src/challenge.cpp:184 #: src/hci.cpp:916 -#: src/hci.cpp:3378 -#: src/hci.cpp:3501 -#: src/hci.cpp:3912 -#: src/hci.cpp:4930 +#: src/hci.cpp:3386 +#: src/hci.cpp:3509 +#: src/hci.cpp:3920 +#: src/hci.cpp:4938 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12499,7 +12499,7 @@ msgid "Player dropped" msgstr "Jogador caiu" #: src/display3d.cpp:599 -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2121 msgid "Waiting for other players" msgstr "À espera dos outros jogadores" @@ -12512,7 +12512,7 @@ msgid "Cannot Build. Oil Resource Burning." msgstr "Impossível construir. Fonte de petróleo a arder." #: src/display.cpp:1828 -#: src/display.cpp:2421 +#: src/display.cpp:2420 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - Dano %d%% - Experiência %d, %s" @@ -12544,77 +12544,77 @@ msgstr "Unidade Destruída!" msgid "Structure Restored" msgstr "Estrutura reparada" -#: src/droid.cpp:2732 +#: src/droid.cpp:2734 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" msgstr[0] "Grupo %u seleccionado - %u Unidade" msgstr[1] "Grupo %u seleccionado - %u Unidades" -#: src/droid.cpp:2745 +#: src/droid.cpp:2747 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" msgstr[0] "%u unidade atribuída do ao Grupo %u" msgstr[1] "%u unidades designadas ao Grupo %u" -#: src/droid.cpp:2758 +#: src/droid.cpp:2760 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" msgstr[0] "Centrado no Grupo %u - %u Unidade" msgstr[1] "Centrado no Grupo %u - %u Unidades" -#: src/droid.cpp:2762 +#: src/droid.cpp:2764 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" msgstr[0] "A Alinhar com o Grupo %u - %u Unidade" msgstr[1] "A Alinhar com o Grupo %u - %u Unidades" -#: src/droid.cpp:3093 +#: src/droid.cpp:3095 msgid "Rookie" msgstr "Novato" -#: src/droid.cpp:3094 +#: src/droid.cpp:3096 msgctxt "rank" msgid "Green" msgstr "Inexperiente" -#: src/droid.cpp:3095 +#: src/droid.cpp:3097 msgid "Trained" msgstr "Treinado" -#: src/droid.cpp:3096 +#: src/droid.cpp:3098 msgid "Regular" msgstr "Regular" -#: src/droid.cpp:3097 +#: src/droid.cpp:3099 msgid "Professional" msgstr "Profissional" -#: src/droid.cpp:3098 +#: src/droid.cpp:3100 msgid "Veteran" msgstr "Veterano" -#: src/droid.cpp:3099 +#: src/droid.cpp:3101 msgid "Elite" msgstr "Elite" -#: src/droid.cpp:3100 +#: src/droid.cpp:3102 msgid "Special" msgstr "Especial" -#: src/droid.cpp:3101 +#: src/droid.cpp:3103 msgid "Hero" msgstr "Herói" -#: src/droid.cpp:4123 +#: src/droid.cpp:4125 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "" -#: src/droid.cpp:4127 +#: src/droid.cpp:4129 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "" @@ -12633,7 +12633,7 @@ msgid "Tutorial" msgstr "Tutorial" #: src/frontend.cpp:100 -#: src/hci.cpp:3487 +#: src/hci.cpp:3495 msgid "Options" msgstr "Opções" @@ -12695,8 +12695,8 @@ msgstr "UM JOGADOR" #: src/frontend.cpp:303 #: src/ingameop.cpp:494 -#: src/mission.cpp:2493 -#: src/mission.cpp:2596 +#: src/mission.cpp:2537 +#: src/mission.cpp:2640 msgid "Load Saved Game" msgstr "Carregar Jogo Gravado" @@ -12986,7 +12986,7 @@ msgid "GAME OPTIONS" msgstr "OPÇÕES DE JOGO" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2398 +#: src/multiint.cpp:2394 msgid "Mod: " msgstr "" @@ -12995,8 +12995,8 @@ msgid "MAP SAVED!" msgstr "MAPA GRAVADO!" #: src/hci.cpp:1573 -#: src/loop.cpp:558 -#: src/loop.cpp:574 +#: src/loop.cpp:561 +#: src/loop.cpp:577 msgid "GAME SAVED: " msgstr "JOGO GRAVADO!" @@ -13024,156 +13024,156 @@ msgstr "Jogador %u está a fazer batota (menu debug) para obter um novo droid %s msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "Jogador %u está a fazer batota (menu debug) para obter um novo droid %s." -#: src/hci.cpp:3298 +#: src/hci.cpp:3306 msgid "Commanders (F6)" msgstr "Comandantes (F6)" -#: src/hci.cpp:3311 +#: src/hci.cpp:3319 msgid "Intelligence Display (F5)" msgstr "Ecrã de Informação" -#: src/hci.cpp:3324 +#: src/hci.cpp:3332 msgid "Manufacture (F1)" msgstr "Produção (F1)" -#: src/hci.cpp:3337 +#: src/hci.cpp:3345 msgid "Design (F4)" msgstr "Desenho (F4)" -#: src/hci.cpp:3350 +#: src/hci.cpp:3358 msgid "Research (F2)" msgstr "Investigação (F2)" -#: src/hci.cpp:3363 +#: src/hci.cpp:3371 msgid "Build (F3)" msgstr "Construir (F3)" -#: src/hci.cpp:3434 +#: src/hci.cpp:3442 #: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Energia" -#: src/hci.cpp:3525 +#: src/hci.cpp:3533 msgid "Map:" msgstr "" -#: src/hci.cpp:3538 +#: src/hci.cpp:3546 #, fuzzy msgid "Load" msgstr "Carregar Jogo" -#: src/hci.cpp:3539 +#: src/hci.cpp:3547 #, fuzzy msgid "Load Map File" msgstr "Carregar Jogo" -#: src/hci.cpp:3546 +#: src/hci.cpp:3554 #, fuzzy msgid "Save" msgstr "Gravar Jogo" -#: src/hci.cpp:3547 +#: src/hci.cpp:3555 #, fuzzy msgid "Save Map File" msgstr "Gravar Jogo" -#: src/hci.cpp:3555 +#: src/hci.cpp:3563 msgid "New" msgstr "" -#: src/hci.cpp:3556 +#: src/hci.cpp:3564 msgid "New Blank Map" msgstr "" -#: src/hci.cpp:3592 +#: src/hci.cpp:3600 msgid "Tile" msgstr "Mosaico" -#: src/hci.cpp:3593 +#: src/hci.cpp:3601 msgid "Place tiles on map" msgstr "Coloca mosaicos no mapa" -#: src/hci.cpp:3602 +#: src/hci.cpp:3610 msgid "Unit" msgstr "Unidade" -#: src/hci.cpp:3603 +#: src/hci.cpp:3611 msgid "Place Unit on map" msgstr "Colocar Unidade no mapa" -#: src/hci.cpp:3611 +#: src/hci.cpp:3619 msgid "Struct" msgstr "Estrutura" -#: src/hci.cpp:3612 +#: src/hci.cpp:3620 msgid "Place Structures on map" msgstr "Colocar Estruturas no mapa" -#: src/hci.cpp:3620 +#: src/hci.cpp:3628 msgid "Feat" msgstr "Característica" -#: src/hci.cpp:3621 +#: src/hci.cpp:3629 #, fuzzy msgid "Place Features on map" msgstr "Colocar ?recursos/características? no mapa" -#: src/hci.cpp:3631 +#: src/hci.cpp:3639 msgid "Pause" msgstr "" -#: src/hci.cpp:3632 +#: src/hci.cpp:3640 msgid "Pause or unpause the game" msgstr "Pausa ou retira de pausa o jogo" -#: src/hci.cpp:3646 +#: src/hci.cpp:3654 msgid "Align height of all map objects" msgstr "Alinhar altura de todos os objectos do mapa" -#: src/hci.cpp:3656 +#: src/hci.cpp:3664 msgid "Edit" msgstr "" -#: src/hci.cpp:3657 +#: src/hci.cpp:3665 #, fuzzy msgid "Start Edit Mode" msgstr "Começar sem Bases" -#: src/hci.cpp:3671 +#: src/hci.cpp:3679 #: src/ingameop.cpp:112 #: src/ingameop.cpp:256 #: src/ingameop.cpp:260 msgid "Quit" msgstr "Sair" -#: src/hci.cpp:3672 +#: src/hci.cpp:3680 msgid "Exit Game" msgstr "Sair do Jogo" -#: src/hci.cpp:3698 +#: src/hci.cpp:3706 #, fuzzy msgid "Current Player:" msgstr "Multijogador" -#: src/hci.cpp:3989 +#: src/hci.cpp:3997 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "Barra de Progresso" -#: src/hci.cpp:4855 +#: src/hci.cpp:4863 msgid "Factory Delivery Point" msgstr "Ponto de Destino da Fábrica" -#: src/hci.cpp:4873 +#: src/hci.cpp:4881 msgid "Loop Production" msgstr "Produção Pontínua" -#: src/hci.cpp:4953 +#: src/hci.cpp:4961 msgid "Tab Scroll left" msgstr "Tab Scroll esquerda" -#: src/hci.cpp:4968 +#: src/hci.cpp:4976 msgid "Tab Scroll right" msgstr "Tab Scroll direita" @@ -13199,8 +13199,8 @@ msgstr "" #: src/ingameop.cpp:274 #: src/ingameop.cpp:498 -#: src/mission.cpp:2480 -#: src/mission.cpp:2599 +#: src/mission.cpp:2524 +#: src/mission.cpp:2643 msgid "Save Game" msgstr "Gravar Jogo" @@ -14151,42 +14151,42 @@ msgstr "" msgid "Toggle Driving Mode" msgstr "Activar/Desactivar câmara de localização" -#: src/loop.cpp:565 -#: src/loop.cpp:581 +#: src/loop.cpp:568 +#: src/loop.cpp:584 msgid "Could not save game!" msgstr "O jogo não pôde ser gravado" -#: src/mission.cpp:2041 +#: src/mission.cpp:2085 msgid "Load Transport" msgstr "Carregar Transporte" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "OBJECTIVO ALCANÇADO por batotice" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED" msgstr "OBJECTIVO ALCANÇADO" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED--and you cheated!" msgstr "OBJECTIVO FALHADO-- e fizeste batotice!" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED" msgstr "OBJECTIVO FALHADO" -#: src/mission.cpp:2459 -#: src/mission.cpp:2499 -#: src/mission.cpp:2613 +#: src/mission.cpp:2503 +#: src/mission.cpp:2543 +#: src/mission.cpp:2657 msgid "Quit To Main Menu" msgstr "Sair para o Menu Principal" -#: src/mission.cpp:2467 +#: src/mission.cpp:2511 msgid "Continue Game" msgstr "Continuar Jogo" -#: src/mission.cpp:2564 +#: src/mission.cpp:2608 msgid "GAME SAVED :" msgstr "JOGO GRAVADO :" @@ -14481,116 +14481,111 @@ msgstr "" msgid "Player colour" msgstr "Jogador Saiu" -#: src/multiint.cpp:2071 +#: src/multiint.cpp:2068 msgid "Team" msgstr "Equipa" -#: src/multiint.cpp:2083 -#, fuzzy -msgid "Kick player" -msgstr "2 jogadores" - -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 msgid "Click to change difficulty" msgstr "" -#: src/multiint.cpp:2130 +#: src/multiint.cpp:2126 msgid "Click when ready" msgstr "Clica quando estiveres pronto" -#: src/multiint.cpp:2134 +#: src/multiint.cpp:2130 msgid "READY?" msgstr "" -#: src/multiint.cpp:2178 +#: src/multiint.cpp:2174 msgid "PLAYERS" msgstr "JOGADORES" -#: src/multiint.cpp:2213 +#: src/multiint.cpp:2209 #, fuzzy msgid "Click to change to this slot" msgstr "Clica para definir Palavra-passe" -#: src/multiint.cpp:2241 +#: src/multiint.cpp:2237 #, fuzzy msgid "Choose Team" msgstr "Equipas Fixas" -#: src/multiint.cpp:2271 +#: src/multiint.cpp:2267 #, fuzzy msgid "Click to change player colour" msgstr "Radar a mostrar cores de jogador" -#: src/multiint.cpp:2299 +#: src/multiint.cpp:2295 msgid "Click to change player position" msgstr "" -#: src/multiint.cpp:2305 +#: src/multiint.cpp:2301 #, fuzzy msgid "Click to change AI" msgstr "Clica para ver o mapa" -#: src/multiint.cpp:2309 +#: src/multiint.cpp:2305 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2371 +#: src/multiint.cpp:2367 msgid "CHAT" msgstr "CHAT" -#: src/multiint.cpp:2403 +#: src/multiint.cpp:2399 msgid "All players need to have the same mods to join your game." msgstr "" -#: src/multiint.cpp:2561 +#: src/multiint.cpp:2557 #, fuzzy, c-format msgid "*** password [%s] is now required! ***" msgstr "*** É agora necessária uma Palavra-passe! ***" -#: src/multiint.cpp:2569 +#: src/multiint.cpp:2565 msgid "*** password is NOT required! ***" msgstr "*** NÃO é necessária Palavra-passe ***" -#: src/multiint.cpp:2810 +#: src/multiint.cpp:2806 msgid "Sorry! Failed to host the game." msgstr "Desculpa! Não foi possível criar o jogo." -#: src/multiint.cpp:2931 +#: src/multiint.cpp:2927 msgid "'Locked Teams' mode enabled" msgstr "Modo \"Equipas Fixas\" activado" -#: src/multiint.cpp:3012 +#: src/multiint.cpp:3008 #, c-format msgid "The host has kicked %s from the game!" msgstr "O servidor kickou %s do jogo!" -#: src/multiint.cpp:3082 +#: src/multiint.cpp:3078 msgid "Host is Starting Game" msgstr "O servidor está a começar o jogo" -#: src/multiint.cpp:3648 +#: src/multiint.cpp:3644 msgid "Players" msgstr "Jogadores" -#: src/multiint.cpp:3786 +#: src/multiint.cpp:3782 #, c-format msgid "Sending Map: %d%% " msgstr "" -#: src/multiint.cpp:3794 +#: src/multiint.cpp:3790 #, c-format msgid "Map: %d%% downloaded" msgstr "" -#: src/multiint.cpp:3820 +#: src/multiint.cpp:3816 msgid "HOST" msgstr "" -#: src/multiint.cpp:3827 +#: src/multiint.cpp:3823 #: src/multimenu.cpp:772 msgid "Ping" msgstr "Ping" @@ -14768,80 +14763,80 @@ msgstr "Dar Energia ao Jogador" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "" -#: src/multiplay.cpp:1057 +#: src/multiplay.cpp:1056 #, fuzzy msgid "(allies" msgstr "Alianças" -#: src/multiplay.cpp:1065 +#: src/multiplay.cpp:1064 msgid "(private to " msgstr "" -#: src/multiplay.cpp:1078 +#: src/multiplay.cpp:1077 msgid "[invalid]" msgstr "" -#: src/multiplay.cpp:1942 +#: src/multiplay.cpp:1941 msgid "Green" msgstr "Verde" -#: src/multiplay.cpp:1943 +#: src/multiplay.cpp:1942 msgid "Orange" msgstr "Laranja" -#: src/multiplay.cpp:1944 +#: src/multiplay.cpp:1943 msgid "Grey" msgstr "Cinzento" -#: src/multiplay.cpp:1945 +#: src/multiplay.cpp:1944 msgid "Black" msgstr "Preto" -#: src/multiplay.cpp:1946 +#: src/multiplay.cpp:1945 msgid "Red" msgstr "Vermelho" -#: src/multiplay.cpp:1947 +#: src/multiplay.cpp:1946 msgid "Blue" msgstr "Azul" -#: src/multiplay.cpp:1948 +#: src/multiplay.cpp:1947 msgid "Pink" msgstr "Rosa" -#: src/multiplay.cpp:1949 +#: src/multiplay.cpp:1948 msgid "Cyan" msgstr "Ciano" -#: src/multiplay.cpp:1950 +#: src/multiplay.cpp:1949 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:1951 +#: src/multiplay.cpp:1950 msgid "Purple" msgstr "" -#: src/multiplay.cpp:1952 +#: src/multiplay.cpp:1951 msgid "White" msgstr "" -#: src/multiplay.cpp:1953 +#: src/multiplay.cpp:1952 msgid "Bright blue" msgstr "" -#: src/multiplay.cpp:1954 +#: src/multiplay.cpp:1953 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:1955 +#: src/multiplay.cpp:1954 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:1956 +#: src/multiplay.cpp:1955 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:1957 +#: src/multiplay.cpp:1956 msgid "Brown" msgstr "" @@ -14849,16 +14844,16 @@ msgstr "" msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "" -#: src/research.cpp:1737 +#: src/research.cpp:1739 #, c-format msgid "Research completed: %s" msgstr "Investigação completa: %s" -#: src/research.cpp:1742 +#: src/research.cpp:1744 msgid "Research Completed" msgstr "Investigação Completa" -#: src/research.cpp:2563 +#: src/research.cpp:2565 msgid "Research Award" msgstr "Prémio de Investigação" @@ -15022,63 +15017,63 @@ msgstr "Incapaz de localizar qualquer unidade de Sensor" msgid "Unable to locate any Commanders!" msgstr "Incapaz de localizar qualquer Comandante!" -#: src/structure.cpp:2614 +#: src/structure.cpp:2650 #, fuzzy msgid "Command Control Limit Reached - Production Halted" msgstr "Limite de Controlo de Comando Alcançado - Produção Parada" -#: src/structure.cpp:5806 -#: src/structure.cpp:5831 +#: src/structure.cpp:5888 +#: src/structure.cpp:5913 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" msgstr[0] "%s - %u unidade atribuída" msgstr[1] "%s - %u unidades atribuídas" -#: src/structure.cpp:5836 -#: src/structure.cpp:5904 -#: src/structure.cpp:5920 -#: src/structure.cpp:5934 +#: src/structure.cpp:5918 +#: src/structure.cpp:5986 +#: src/structure.cpp:6002 +#: src/structure.cpp:6016 #, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - Dano %3.0f%%" -#: src/structure.cpp:5886 +#: src/structure.cpp:5968 #, c-format msgid "%s - Connected %u of %u" msgstr "%s - Ligado a %u de %u" -#: src/structure.cpp:6050 -#: src/structure.cpp:6095 +#: src/structure.cpp:6132 +#: src/structure.cpp:6177 #, c-format msgid "%s - Electronically Damaged" msgstr "%s - Danificado Electronicamente" -#: src/structure.cpp:6332 +#: src/structure.cpp:6414 msgid "Electronic Reward - Visibility Report" msgstr "Recompensa Electrónica - Relatório de Visibilidade" -#: src/structure.cpp:6372 +#: src/structure.cpp:6454 msgid "Factory Reward - Propulsion" msgstr "Recompensa de Fábrica - Propulsão" -#: src/structure.cpp:6396 +#: src/structure.cpp:6478 msgid "Factory Reward - Body" msgstr "Recompensa de Fábrica - Corpo" -#: src/structure.cpp:6420 +#: src/structure.cpp:6502 msgid "Factory Reward - Weapon" msgstr "Recompensa de Fábrica - Arma" -#: src/structure.cpp:6429 +#: src/structure.cpp:6511 msgid "Factory Reward - Nothing" msgstr "Recompensa de Fábrica - Nada" -#: src/structure.cpp:6457 +#: src/structure.cpp:6539 msgid "Repair Facility Award - Repair" msgstr "Recompensa de Posto de Reparação - Reparações" -#: src/structure.cpp:6464 +#: src/structure.cpp:6546 msgid "Repair Facility Award - Nothing" msgstr "Recompensa de Posto de Reparação - Nada" @@ -15095,34 +15090,36 @@ msgstr "" msgid "Reinforcements landing" msgstr "Reforços a aterrar" -#: src/version.cpp:143 -msgid " (modified and switched locally)" -msgstr " (modificado e trocado localmente)" - -#: src/version.cpp:145 +#: src/version.cpp:129 msgid " (modified locally)" msgstr " (modificado localmente)" -#: src/version.cpp:147 -msgid " (switched locally)" -msgstr " (trocado localmente)" - -#: src/version.cpp:154 +#: src/version.cpp:136 msgid " - DEBUG" msgstr " - DEBUG" -#: src/version.cpp:163 +#: src/version.cpp:145 #, c-format msgid " - Built %s" msgstr " - Construído %s" #. TRANSLATORS: This string looks as follows when expanded. #. "Version " -#: src/version.cpp:173 +#: src/version.cpp:155 #, c-format msgid "Version %s%s%s%s" msgstr "Versão %s%s%s%s" +#, fuzzy +#~ msgid "Kick player" +#~ msgstr "2 jogadores" + +#~ msgid " (modified and switched locally)" +#~ msgstr " (modificado e trocado localmente)" + +#~ msgid " (switched locally)" +#~ msgstr " (trocado localmente)" + #~ msgid "Cobra Hover Heavy-Repair" #~ msgstr "Cobra Hovercraft Reparação pesada" diff --git a/po/pt_BR.po b/po/pt_BR.po index aa243d4d7..26ebafff0 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-02-25 23:35+0100\n" +"POT-Creation-Date: 2011-03-08 15:43+0100\n" "PO-Revision-Date: 2011-02-16 12:57-0300\n" "Last-Translator: Artur Filipe \n" "Language-Team: Brazilian Portugese \n" @@ -12004,26 +12004,26 @@ msgid "System locale" msgstr "Localização do Sistema" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1042 +#: lib/netplay/netplay.cpp:1037 msgid "Enter password here" msgstr "Entre a senha aqui" -#: lib/netplay/netplay.cpp:2060 +#: lib/netplay/netplay.cpp:2055 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "Não foi possível resolver o nome do servidor mestre (%s)!" -#: lib/netplay/netplay.cpp:2082 +#: lib/netplay/netplay.cpp:2077 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "Não foi possível communicar com o servidor de lobby! A porta TCP %u está aberta para tráfego saindo?" #: src/challenge.cpp:184 #: src/hci.cpp:916 -#: src/hci.cpp:3378 -#: src/hci.cpp:3501 -#: src/hci.cpp:3912 -#: src/hci.cpp:4930 +#: src/hci.cpp:3386 +#: src/hci.cpp:3509 +#: src/hci.cpp:3920 +#: src/hci.cpp:4938 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12330,7 +12330,7 @@ msgid "Player dropped" msgstr "Jogador desconectou-se" #: src/display3d.cpp:599 -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2121 msgid "Waiting for other players" msgstr "Aguardando outros jogadores" @@ -12343,7 +12343,7 @@ msgid "Cannot Build. Oil Resource Burning." msgstr "Não pode construir. Poço em chamas." #: src/display.cpp:1828 -#: src/display.cpp:2421 +#: src/display.cpp:2420 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - Danos %d%% - Experiência %d, %s" @@ -12374,77 +12374,77 @@ msgstr "Unidade Perdida!" msgid "Structure Restored" msgstr "Estrutura Restaurada" -#: src/droid.cpp:2732 +#: src/droid.cpp:2734 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" msgstr[0] "Grupo %u selecionado - %u Unidade" msgstr[1] "Grupo %u selecionado - %u Unidades" -#: src/droid.cpp:2745 +#: src/droid.cpp:2747 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" msgstr[0] "%u unidade atribuída ao Grupo %u" msgstr[1] "%u unidades atribuídas ao Grupo %u" -#: src/droid.cpp:2758 +#: src/droid.cpp:2760 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" msgstr[0] "Centrado no Grupo %u - %u Unidade" msgstr[1] "Centrado no Grupo %u - %u Unidades" -#: src/droid.cpp:2762 +#: src/droid.cpp:2764 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" msgstr[0] "Alinhamento com o grupo %u - %u Unidade" msgstr[1] "Alinhamento com o grupo %u - %u Unidades" -#: src/droid.cpp:3093 +#: src/droid.cpp:3095 msgid "Rookie" msgstr "Recruta" -#: src/droid.cpp:3094 +#: src/droid.cpp:3096 msgctxt "rank" msgid "Green" msgstr "Soldado" -#: src/droid.cpp:3095 +#: src/droid.cpp:3097 msgid "Trained" msgstr "Treinado" -#: src/droid.cpp:3096 +#: src/droid.cpp:3098 msgid "Regular" msgstr "Regular" -#: src/droid.cpp:3097 +#: src/droid.cpp:3099 msgid "Professional" msgstr "Tenente" -#: src/droid.cpp:3098 +#: src/droid.cpp:3100 msgid "Veteran" msgstr "Veterano" -#: src/droid.cpp:3099 +#: src/droid.cpp:3101 msgid "Elite" msgstr "Elite" -#: src/droid.cpp:3100 +#: src/droid.cpp:3102 msgid "Special" msgstr "Força Especial" -#: src/droid.cpp:3101 +#: src/droid.cpp:3103 msgid "Hero" msgstr "Herói" -#: src/droid.cpp:4123 +#: src/droid.cpp:4125 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "%s quis te dar um %s mas você já tem demais!" -#: src/droid.cpp:4127 +#: src/droid.cpp:4129 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "Você tentou dar %s para %s, mas eles já têm demais!" @@ -12463,7 +12463,7 @@ msgid "Tutorial" msgstr "Aprendendo a Jogar" #: src/frontend.cpp:100 -#: src/hci.cpp:3487 +#: src/hci.cpp:3495 msgid "Options" msgstr "Opções" @@ -12524,8 +12524,8 @@ msgstr "UM JOGADOR" #: src/frontend.cpp:303 #: src/ingameop.cpp:494 -#: src/mission.cpp:2493 -#: src/mission.cpp:2596 +#: src/mission.cpp:2537 +#: src/mission.cpp:2640 msgid "Load Saved Game" msgstr "Carregar Jogo Salvo" @@ -12810,7 +12810,7 @@ msgid "GAME OPTIONS" msgstr "OPÇÕES DE JOGO" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2398 +#: src/multiint.cpp:2394 msgid "Mod: " msgstr "Mod:" @@ -12819,8 +12819,8 @@ msgid "MAP SAVED!" msgstr "MAPA SALVO!" #: src/hci.cpp:1573 -#: src/loop.cpp:558 -#: src/loop.cpp:574 +#: src/loop.cpp:561 +#: src/loop.cpp:577 msgid "GAME SAVED: " msgstr "JOGO SALVO:" @@ -12848,149 +12848,149 @@ msgstr "Jogador %u trapaceia (menu debug) a ele mesmo uma nova droide: %s." msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "Jogador %u está trapaceando (debug menu)! Ele/ela ganhou um novo droide." -#: src/hci.cpp:3298 +#: src/hci.cpp:3306 msgid "Commanders (F6)" msgstr "Comandos (F6)" -#: src/hci.cpp:3311 +#: src/hci.cpp:3319 msgid "Intelligence Display (F5)" msgstr "Mostrar Inteligência (F5)" -#: src/hci.cpp:3324 +#: src/hci.cpp:3332 msgid "Manufacture (F1)" msgstr "Desenvolvedor (F1)" -#: src/hci.cpp:3337 +#: src/hci.cpp:3345 msgid "Design (F4)" msgstr "Padrão (F4)" -#: src/hci.cpp:3350 +#: src/hci.cpp:3358 msgid "Research (F2)" msgstr "Pesquisa (F2)" -#: src/hci.cpp:3363 +#: src/hci.cpp:3371 msgid "Build (F3)" msgstr "Construir (F3)" -#: src/hci.cpp:3434 +#: src/hci.cpp:3442 #: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Energia" -#: src/hci.cpp:3525 +#: src/hci.cpp:3533 msgid "Map:" msgstr "Mapa:" -#: src/hci.cpp:3538 +#: src/hci.cpp:3546 msgid "Load" msgstr "Carregar" -#: src/hci.cpp:3539 +#: src/hci.cpp:3547 msgid "Load Map File" msgstr "Carregar Mapa" -#: src/hci.cpp:3546 +#: src/hci.cpp:3554 msgid "Save" msgstr "Salvar" -#: src/hci.cpp:3547 +#: src/hci.cpp:3555 msgid "Save Map File" msgstr "Salvar Mapa" -#: src/hci.cpp:3555 +#: src/hci.cpp:3563 msgid "New" msgstr "Novo" -#: src/hci.cpp:3556 +#: src/hci.cpp:3564 msgid "New Blank Map" msgstr "Novo Mapa Vazio" -#: src/hci.cpp:3592 +#: src/hci.cpp:3600 msgid "Tile" msgstr "Espaço" -#: src/hci.cpp:3593 +#: src/hci.cpp:3601 msgid "Place tiles on map" msgstr "Colocar Espaços no mapa" -#: src/hci.cpp:3602 +#: src/hci.cpp:3610 msgid "Unit" msgstr "Unidade" -#: src/hci.cpp:3603 +#: src/hci.cpp:3611 msgid "Place Unit on map" msgstr "Colocar Unidade no mapa" -#: src/hci.cpp:3611 +#: src/hci.cpp:3619 msgid "Struct" msgstr "Estrutura" -#: src/hci.cpp:3612 +#: src/hci.cpp:3620 msgid "Place Structures on map" msgstr "Colocar estruturas no mapa" -#: src/hci.cpp:3620 +#: src/hci.cpp:3628 msgid "Feat" msgstr "Feito" -#: src/hci.cpp:3621 +#: src/hci.cpp:3629 msgid "Place Features on map" msgstr "Colocar Artefatos no mapa" -#: src/hci.cpp:3631 +#: src/hci.cpp:3639 msgid "Pause" msgstr "Pausa" -#: src/hci.cpp:3632 +#: src/hci.cpp:3640 msgid "Pause or unpause the game" msgstr "Pausar ou resumir o jogo" -#: src/hci.cpp:3646 +#: src/hci.cpp:3654 msgid "Align height of all map objects" msgstr "Alinhar a altitude dos objetos e do mapa" -#: src/hci.cpp:3656 +#: src/hci.cpp:3664 msgid "Edit" msgstr "Editar" -#: src/hci.cpp:3657 +#: src/hci.cpp:3665 msgid "Start Edit Mode" msgstr "Modo Editar Início" -#: src/hci.cpp:3671 +#: src/hci.cpp:3679 #: src/ingameop.cpp:112 #: src/ingameop.cpp:256 #: src/ingameop.cpp:260 msgid "Quit" msgstr "Sair" -#: src/hci.cpp:3672 +#: src/hci.cpp:3680 msgid "Exit Game" msgstr "Sair do Jogo" -#: src/hci.cpp:3698 +#: src/hci.cpp:3706 msgid "Current Player:" msgstr "Jogador Atual:" -#: src/hci.cpp:3989 +#: src/hci.cpp:3997 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "Barra de Progresso" -#: src/hci.cpp:4855 +#: src/hci.cpp:4863 msgid "Factory Delivery Point" msgstr "Ponto de Entrega da Fábrica" -#: src/hci.cpp:4873 +#: src/hci.cpp:4881 msgid "Loop Production" msgstr "Repetir Produção" -#: src/hci.cpp:4953 +#: src/hci.cpp:4961 msgid "Tab Scroll left" msgstr "Tab mover para esquerda" -#: src/hci.cpp:4968 +#: src/hci.cpp:4976 msgid "Tab Scroll right" msgstr "Tab mover para direita" @@ -13016,8 +13016,8 @@ msgstr "Interface de Usuário Tática (Icone de Origem do Alvo): Esconder" #: src/ingameop.cpp:274 #: src/ingameop.cpp:498 -#: src/mission.cpp:2480 -#: src/mission.cpp:2599 +#: src/mission.cpp:2524 +#: src/mission.cpp:2643 msgid "Save Game" msgstr "Salvar" @@ -13946,42 +13946,42 @@ msgstr "Localizar um objeto do jogo" msgid "Toggle Driving Mode" msgstr "Liga/Desliga Modo Dirigir" -#: src/loop.cpp:565 -#: src/loop.cpp:581 +#: src/loop.cpp:568 +#: src/loop.cpp:584 msgid "Could not save game!" msgstr "Impossível salvar o jogo!" -#: src/mission.cpp:2041 +#: src/mission.cpp:2085 msgid "Load Transport" msgstr "Carregar Transportes" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "OBJETIVO ARQUIVADO por trapaça!" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED" msgstr "OBJETIVO ARQUIVADO" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED--and you cheated!" msgstr "FALHA NO OBJETIVO--e você trapaçeou!" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED" msgstr "FALHA NO OBJETIVO" -#: src/mission.cpp:2459 -#: src/mission.cpp:2499 -#: src/mission.cpp:2613 +#: src/mission.cpp:2503 +#: src/mission.cpp:2543 +#: src/mission.cpp:2657 msgid "Quit To Main Menu" msgstr "Sair para o Menu Principal" -#: src/mission.cpp:2467 +#: src/mission.cpp:2511 msgid "Continue Game" msgstr "Continuar o Jogo" -#: src/mission.cpp:2564 +#: src/mission.cpp:2608 msgid "GAME SAVED :" msgstr "JOGO SALVO :" @@ -14270,116 +14270,112 @@ msgstr "" msgid "Player colour" msgstr "Cor do jogador" -#: src/multiint.cpp:2071 +#: src/multiint.cpp:2068 msgid "Team" msgstr "Time" -#: src/multiint.cpp:2083 -msgid "Kick player" -msgstr "Expulsar jogador" - -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 #, fuzzy msgid "Click to change difficulty" msgstr "Clique para ajustar a dificuldade da IA" -#: src/multiint.cpp:2130 +#: src/multiint.cpp:2126 msgid "Click when ready" msgstr "Clique quando estiver pronto" -#: src/multiint.cpp:2134 +#: src/multiint.cpp:2130 msgid "READY?" msgstr "PRONTO?" -#: src/multiint.cpp:2178 +#: src/multiint.cpp:2174 msgid "PLAYERS" msgstr "JOGADORES" -#: src/multiint.cpp:2213 +#: src/multiint.cpp:2209 #, fuzzy msgid "Click to change to this slot" msgstr "Clique para alterar as configs. de jogador" -#: src/multiint.cpp:2241 +#: src/multiint.cpp:2237 msgid "Choose Team" msgstr "Escolher Time" -#: src/multiint.cpp:2271 +#: src/multiint.cpp:2267 #, fuzzy msgid "Click to change player colour" msgstr "Clique para alterar as configs. de jogador" -#: src/multiint.cpp:2299 +#: src/multiint.cpp:2295 #, fuzzy msgid "Click to change player position" msgstr "Clique para alterar as configs. de jogador" -#: src/multiint.cpp:2305 +#: src/multiint.cpp:2301 #, fuzzy msgid "Click to change AI" msgstr "Clique para alterar as configs. de jogador" -#: src/multiint.cpp:2309 +#: src/multiint.cpp:2305 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2371 +#: src/multiint.cpp:2367 msgid "CHAT" msgstr "BATE-PAPO" -#: src/multiint.cpp:2403 +#: src/multiint.cpp:2399 msgid "All players need to have the same mods to join your game." msgstr "Todos os jogadores devem ter os mesmos mods para entrar no seu jogo." -#: src/multiint.cpp:2561 +#: src/multiint.cpp:2557 #, c-format msgid "*** password [%s] is now required! ***" msgstr "*** senha [%s] agora é necessária! ***" -#: src/multiint.cpp:2569 +#: src/multiint.cpp:2565 msgid "*** password is NOT required! ***" msgstr "*** a sessão NÃO está protegida por senha ***" -#: src/multiint.cpp:2810 +#: src/multiint.cpp:2806 msgid "Sorry! Failed to host the game." msgstr "Desculpe! Falha ao hospedar uma sessão." -#: src/multiint.cpp:2931 +#: src/multiint.cpp:2927 msgid "'Locked Teams' mode enabled" msgstr "Modo 'Times Fixos' ativado" -#: src/multiint.cpp:3012 +#: src/multiint.cpp:3008 #, c-format msgid "The host has kicked %s from the game!" msgstr "O Hosp. chutou %s do jogo!" -#: src/multiint.cpp:3082 +#: src/multiint.cpp:3078 msgid "Host is Starting Game" msgstr "O Hosp. iniciou o Jogo" -#: src/multiint.cpp:3648 +#: src/multiint.cpp:3644 msgid "Players" msgstr "Jogadores" -#: src/multiint.cpp:3786 +#: src/multiint.cpp:3782 #, c-format msgid "Sending Map: %d%% " msgstr "Enviando mapa: %d%%" -#: src/multiint.cpp:3794 +#: src/multiint.cpp:3790 #, c-format msgid "Map: %d%% downloaded" msgstr "Mapa: %d%% baixado" -#: src/multiint.cpp:3820 +#: src/multiint.cpp:3816 msgid "HOST" msgstr "HOSPEDEIRO" -#: src/multiint.cpp:3827 +#: src/multiint.cpp:3823 #: src/multimenu.cpp:772 msgid "Ping" msgstr "Ping" @@ -14551,79 +14547,79 @@ msgstr "Fornecer Energia" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "Expulsando jogador %s porque tentou evitar a checagem de integridade de dados!" -#: src/multiplay.cpp:1057 +#: src/multiplay.cpp:1056 msgid "(allies" msgstr "(alliados" -#: src/multiplay.cpp:1065 +#: src/multiplay.cpp:1064 msgid "(private to " msgstr "(pessoal para" -#: src/multiplay.cpp:1078 +#: src/multiplay.cpp:1077 msgid "[invalid]" msgstr "[inválido]" -#: src/multiplay.cpp:1942 +#: src/multiplay.cpp:1941 msgid "Green" msgstr "Verde" -#: src/multiplay.cpp:1943 +#: src/multiplay.cpp:1942 msgid "Orange" msgstr "Laranja" -#: src/multiplay.cpp:1944 +#: src/multiplay.cpp:1943 msgid "Grey" msgstr "Cinza" -#: src/multiplay.cpp:1945 +#: src/multiplay.cpp:1944 msgid "Black" msgstr "Preto" -#: src/multiplay.cpp:1946 +#: src/multiplay.cpp:1945 msgid "Red" msgstr "Vermelho" -#: src/multiplay.cpp:1947 +#: src/multiplay.cpp:1946 msgid "Blue" msgstr "Azul" -#: src/multiplay.cpp:1948 +#: src/multiplay.cpp:1947 msgid "Pink" msgstr "Rosa" -#: src/multiplay.cpp:1949 +#: src/multiplay.cpp:1948 msgid "Cyan" msgstr "Ciano" -#: src/multiplay.cpp:1950 +#: src/multiplay.cpp:1949 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:1951 +#: src/multiplay.cpp:1950 msgid "Purple" msgstr "" -#: src/multiplay.cpp:1952 +#: src/multiplay.cpp:1951 msgid "White" msgstr "" -#: src/multiplay.cpp:1953 +#: src/multiplay.cpp:1952 msgid "Bright blue" msgstr "" -#: src/multiplay.cpp:1954 +#: src/multiplay.cpp:1953 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:1955 +#: src/multiplay.cpp:1954 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:1956 +#: src/multiplay.cpp:1955 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:1957 +#: src/multiplay.cpp:1956 msgid "Brown" msgstr "" @@ -14631,16 +14627,16 @@ msgstr "" msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "Não podemos fazer isso! Devemos ser um Ciborgue para usar um Transporte Ciborgue!" -#: src/research.cpp:1737 +#: src/research.cpp:1739 #, c-format msgid "Research completed: %s" msgstr "Pesquisa concluída: %s" -#: src/research.cpp:1742 +#: src/research.cpp:1744 msgid "Research Completed" msgstr "Pesquisa Concluída" -#: src/research.cpp:2563 +#: src/research.cpp:2565 msgid "Research Award" msgstr "Prêmio - Pesquisa" @@ -14804,63 +14800,63 @@ msgstr "Impossível localizar Unidades de Sensor!" msgid "Unable to locate any Commanders!" msgstr "Impossível localizar Comandantes!" -#: src/structure.cpp:2614 +#: src/structure.cpp:2650 #, fuzzy msgid "Command Control Limit Reached - Production Halted" msgstr "Limite de Unidade Alcançado - Produção Interrompida" -#: src/structure.cpp:5806 -#: src/structure.cpp:5831 +#: src/structure.cpp:5888 +#: src/structure.cpp:5913 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" msgstr[0] "%s - %u Unidade designada" msgstr[1] "%s - %u Unidades designadas" -#: src/structure.cpp:5836 -#: src/structure.cpp:5904 -#: src/structure.cpp:5920 -#: src/structure.cpp:5934 +#: src/structure.cpp:5918 +#: src/structure.cpp:5986 +#: src/structure.cpp:6002 +#: src/structure.cpp:6016 #, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - Dano %3.0f%%" -#: src/structure.cpp:5886 +#: src/structure.cpp:5968 #, c-format msgid "%s - Connected %u of %u" msgstr "%s - %u de %u conectados" -#: src/structure.cpp:6050 -#: src/structure.cpp:6095 +#: src/structure.cpp:6132 +#: src/structure.cpp:6177 #, c-format msgid "%s - Electronically Damaged" msgstr "%s - Danificado Eletronicamente" -#: src/structure.cpp:6332 +#: src/structure.cpp:6414 msgid "Electronic Reward - Visibility Report" msgstr "Prêmio - Eletrônico - Relatório de Visibilidade" -#: src/structure.cpp:6372 +#: src/structure.cpp:6454 msgid "Factory Reward - Propulsion" msgstr "Prêmio - Fábrica - Propulsão" -#: src/structure.cpp:6396 +#: src/structure.cpp:6478 msgid "Factory Reward - Body" msgstr "Prêmio - Fábrica - Chassis" -#: src/structure.cpp:6420 +#: src/structure.cpp:6502 msgid "Factory Reward - Weapon" msgstr "Prêmio - Fábrica - Arma" -#: src/structure.cpp:6429 +#: src/structure.cpp:6511 msgid "Factory Reward - Nothing" msgstr "Prêmio - Fábrica - Nada" -#: src/structure.cpp:6457 +#: src/structure.cpp:6539 msgid "Repair Facility Award - Repair" msgstr "Prêmio - Centro de Reparos - Reparo" -#: src/structure.cpp:6464 +#: src/structure.cpp:6546 msgid "Repair Facility Award - Nothing" msgstr "Prêmio - Centro de Reparos - Nada" @@ -14877,34 +14873,35 @@ msgstr "Não há espaço o bastante no Transporte!" msgid "Reinforcements landing" msgstr "Reforços pousando" -#: src/version.cpp:143 -msgid " (modified and switched locally)" -msgstr " (modificado e definido localmente)" - -#: src/version.cpp:145 +#: src/version.cpp:129 msgid " (modified locally)" msgstr " (modificado localmente)" -#: src/version.cpp:147 -msgid " (switched locally)" -msgstr " (definido localmente)" - -#: src/version.cpp:154 +#: src/version.cpp:136 msgid " - DEBUG" msgstr " - DEBUG" -#: src/version.cpp:163 +#: src/version.cpp:145 #, c-format msgid " - Built %s" msgstr " - Finalizado em %s" #. TRANSLATORS: This string looks as follows when expanded. #. "Version " -#: src/version.cpp:173 +#: src/version.cpp:155 #, c-format msgid "Version %s%s%s%s" msgstr "Versão %s%s%s%s" +#~ msgid "Kick player" +#~ msgstr "Expulsar jogador" + +#~ msgid " (modified and switched locally)" +#~ msgstr " (modificado e definido localmente)" + +#~ msgid " (switched locally)" +#~ msgstr " (definido localmente)" + #~ msgid "Cobra Hover Heavy-Repair" #~ msgstr "Hovercraft Reparo Pesado Cobra" diff --git a/po/ro.po b/po/ro.po index 7e880849e..af819b4f8 100644 --- a/po/ro.po +++ b/po/ro.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-02-25 23:35+0100\n" +"POT-Creation-Date: 2011-03-08 15:43+0100\n" "PO-Revision-Date: 2010-10-24 13:31+0200\n" "Last-Translator: Adrian Mos \n" "Language-Team: Romanian \n" @@ -12011,26 +12011,26 @@ msgid "System locale" msgstr "Limba sistemului" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1042 +#: lib/netplay/netplay.cpp:1037 msgid "Enter password here" msgstr "Introdu parola aici" -#: lib/netplay/netplay.cpp:2060 +#: lib/netplay/netplay.cpp:2055 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "" -#: lib/netplay/netplay.cpp:2082 +#: lib/netplay/netplay.cpp:2077 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "" #: src/challenge.cpp:184 #: src/hci.cpp:916 -#: src/hci.cpp:3378 -#: src/hci.cpp:3501 -#: src/hci.cpp:3912 -#: src/hci.cpp:4930 +#: src/hci.cpp:3386 +#: src/hci.cpp:3509 +#: src/hci.cpp:3920 +#: src/hci.cpp:4938 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12337,7 +12337,7 @@ msgid "Player dropped" msgstr "Jucătorul s-a deconectat" #: src/display3d.cpp:599 -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2121 msgid "Waiting for other players" msgstr "Așteptare pentru alți jucători" @@ -12350,7 +12350,7 @@ msgid "Cannot Build. Oil Resource Burning." msgstr "Nu se poate construi. Puțul de petrol e în flăcări." #: src/display.cpp:1828 -#: src/display.cpp:2421 +#: src/display.cpp:2420 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - Avarii %d%% - Experiență %d, %s" @@ -12382,77 +12382,77 @@ msgstr "Unitate pierdută!" msgid "Structure Restored" msgstr "Clădire reconstruită" -#: src/droid.cpp:2732 +#: src/droid.cpp:2734 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:2745 +#: src/droid.cpp:2747 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:2758 +#: src/droid.cpp:2760 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:2762 +#: src/droid.cpp:2764 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:3093 +#: src/droid.cpp:3095 msgid "Rookie" msgstr "Recrut" -#: src/droid.cpp:3094 +#: src/droid.cpp:3096 msgctxt "rank" msgid "Green" msgstr "Soldat" -#: src/droid.cpp:3095 +#: src/droid.cpp:3097 msgid "Trained" msgstr "Antrenat" -#: src/droid.cpp:3096 +#: src/droid.cpp:3098 msgid "Regular" msgstr "Armată regulată" -#: src/droid.cpp:3097 +#: src/droid.cpp:3099 msgid "Professional" msgstr "Profesionist" -#: src/droid.cpp:3098 +#: src/droid.cpp:3100 msgid "Veteran" msgstr "Veteran" -#: src/droid.cpp:3099 +#: src/droid.cpp:3101 msgid "Elite" msgstr "Elită" -#: src/droid.cpp:3100 +#: src/droid.cpp:3102 msgid "Special" msgstr "Special" -#: src/droid.cpp:3101 +#: src/droid.cpp:3103 msgid "Hero" msgstr "Erou" -#: src/droid.cpp:4123 +#: src/droid.cpp:4125 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "" -#: src/droid.cpp:4127 +#: src/droid.cpp:4129 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "" @@ -12471,7 +12471,7 @@ msgid "Tutorial" msgstr "Tutorial" #: src/frontend.cpp:100 -#: src/hci.cpp:3487 +#: src/hci.cpp:3495 msgid "Options" msgstr "Opțiuni" @@ -12532,8 +12532,8 @@ msgstr "JOC INDIVIDUAL" #: src/frontend.cpp:303 #: src/ingameop.cpp:494 -#: src/mission.cpp:2493 -#: src/mission.cpp:2596 +#: src/mission.cpp:2537 +#: src/mission.cpp:2640 msgid "Load Saved Game" msgstr "Încarcă joc salvat" @@ -12818,7 +12818,7 @@ msgid "GAME OPTIONS" msgstr "OPȚIUNI DE JOC" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2398 +#: src/multiint.cpp:2394 msgid "Mod: " msgstr "Modificare:" @@ -12827,8 +12827,8 @@ msgid "MAP SAVED!" msgstr "HARTĂ SALVATĂ!" #: src/hci.cpp:1573 -#: src/loop.cpp:558 -#: src/loop.cpp:574 +#: src/loop.cpp:561 +#: src/loop.cpp:577 #, fuzzy msgid "GAME SAVED: " msgstr "JOC SALVAT :" @@ -12857,149 +12857,149 @@ msgstr "" msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "" -#: src/hci.cpp:3298 +#: src/hci.cpp:3306 msgid "Commanders (F6)" msgstr "Comandanți (F6)" -#: src/hci.cpp:3311 +#: src/hci.cpp:3319 msgid "Intelligence Display (F5)" msgstr "Informații (F5)" -#: src/hci.cpp:3324 +#: src/hci.cpp:3332 msgid "Manufacture (F1)" msgstr "Producție (F1)" -#: src/hci.cpp:3337 +#: src/hci.cpp:3345 msgid "Design (F4)" msgstr "Scheme (F4)" -#: src/hci.cpp:3350 +#: src/hci.cpp:3358 msgid "Research (F2)" msgstr "Cercetare (F2)" -#: src/hci.cpp:3363 +#: src/hci.cpp:3371 msgid "Build (F3)" msgstr "Construcție (F3)" -#: src/hci.cpp:3434 +#: src/hci.cpp:3442 #: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Energie" -#: src/hci.cpp:3525 +#: src/hci.cpp:3533 msgid "Map:" msgstr "Hartă:" -#: src/hci.cpp:3538 +#: src/hci.cpp:3546 msgid "Load" msgstr "Încarcă" -#: src/hci.cpp:3539 +#: src/hci.cpp:3547 msgid "Load Map File" msgstr "Încarcă fișierul hărții" -#: src/hci.cpp:3546 +#: src/hci.cpp:3554 msgid "Save" msgstr "Salvează" -#: src/hci.cpp:3547 +#: src/hci.cpp:3555 msgid "Save Map File" msgstr "Salvează fișierul hărții" -#: src/hci.cpp:3555 +#: src/hci.cpp:3563 msgid "New" msgstr "Nou" -#: src/hci.cpp:3556 +#: src/hci.cpp:3564 msgid "New Blank Map" msgstr "Nouă hartă goală" -#: src/hci.cpp:3592 +#: src/hci.cpp:3600 msgid "Tile" msgstr "Titlu" -#: src/hci.cpp:3593 +#: src/hci.cpp:3601 msgid "Place tiles on map" msgstr "" -#: src/hci.cpp:3602 +#: src/hci.cpp:3610 msgid "Unit" msgstr "" -#: src/hci.cpp:3603 +#: src/hci.cpp:3611 msgid "Place Unit on map" msgstr "" -#: src/hci.cpp:3611 +#: src/hci.cpp:3619 msgid "Struct" msgstr "" -#: src/hci.cpp:3612 +#: src/hci.cpp:3620 msgid "Place Structures on map" msgstr "" -#: src/hci.cpp:3620 +#: src/hci.cpp:3628 msgid "Feat" msgstr "" -#: src/hci.cpp:3621 +#: src/hci.cpp:3629 msgid "Place Features on map" msgstr "" -#: src/hci.cpp:3631 +#: src/hci.cpp:3639 msgid "Pause" msgstr "Pauză" -#: src/hci.cpp:3632 +#: src/hci.cpp:3640 msgid "Pause or unpause the game" msgstr "Pauză sau Continuare a Jocului" -#: src/hci.cpp:3646 +#: src/hci.cpp:3654 msgid "Align height of all map objects" msgstr "" -#: src/hci.cpp:3656 +#: src/hci.cpp:3664 msgid "Edit" msgstr "" -#: src/hci.cpp:3657 +#: src/hci.cpp:3665 msgid "Start Edit Mode" msgstr "" -#: src/hci.cpp:3671 +#: src/hci.cpp:3679 #: src/ingameop.cpp:112 #: src/ingameop.cpp:256 #: src/ingameop.cpp:260 msgid "Quit" msgstr "Ieșire" -#: src/hci.cpp:3672 +#: src/hci.cpp:3680 msgid "Exit Game" msgstr "Ieșire din joc" -#: src/hci.cpp:3698 +#: src/hci.cpp:3706 msgid "Current Player:" msgstr "Jucătorul Curent:" -#: src/hci.cpp:3989 +#: src/hci.cpp:3997 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "" -#: src/hci.cpp:4855 +#: src/hci.cpp:4863 msgid "Factory Delivery Point" msgstr "" -#: src/hci.cpp:4873 +#: src/hci.cpp:4881 msgid "Loop Production" msgstr "" -#: src/hci.cpp:4953 +#: src/hci.cpp:4961 msgid "Tab Scroll left" msgstr "" -#: src/hci.cpp:4968 +#: src/hci.cpp:4976 msgid "Tab Scroll right" msgstr "" @@ -13025,8 +13025,8 @@ msgstr "" #: src/ingameop.cpp:274 #: src/ingameop.cpp:498 -#: src/mission.cpp:2480 -#: src/mission.cpp:2599 +#: src/mission.cpp:2524 +#: src/mission.cpp:2643 msgid "Save Game" msgstr "" @@ -13957,42 +13957,42 @@ msgstr "" msgid "Toggle Driving Mode" msgstr "" -#: src/loop.cpp:565 -#: src/loop.cpp:581 +#: src/loop.cpp:568 +#: src/loop.cpp:584 msgid "Could not save game!" msgstr "Nu s-a putut salva jocul!" -#: src/mission.cpp:2041 +#: src/mission.cpp:2085 msgid "Load Transport" msgstr "Încarcă Transportorul" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "OBIECTIV ATINS prin trișare" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED" msgstr "OBIECTIV ATINS" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED--and you cheated!" msgstr "OBIECTIV EȘUAT--și ai trișat!" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED" msgstr "OBIECTIV EȘUAT" -#: src/mission.cpp:2459 -#: src/mission.cpp:2499 -#: src/mission.cpp:2613 +#: src/mission.cpp:2503 +#: src/mission.cpp:2543 +#: src/mission.cpp:2657 msgid "Quit To Main Menu" msgstr "Ieșire în meniul principal" -#: src/mission.cpp:2467 +#: src/mission.cpp:2511 msgid "Continue Game" msgstr "Continuă Jocul" -#: src/mission.cpp:2564 +#: src/mission.cpp:2608 msgid "GAME SAVED :" msgstr "JOC SALVAT :" @@ -14281,116 +14281,112 @@ msgstr "" msgid "Player colour" msgstr "Culoarea jucătorului" -#: src/multiint.cpp:2071 +#: src/multiint.cpp:2068 msgid "Team" msgstr "Echipă" -#: src/multiint.cpp:2083 -msgid "Kick player" -msgstr "Eliminare jucător" - -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 #, fuzzy msgid "Click to change difficulty" msgstr "Click pentru a ajusta dificultatea IA" -#: src/multiint.cpp:2130 +#: src/multiint.cpp:2126 msgid "Click when ready" msgstr "Click când ești pregătit" -#: src/multiint.cpp:2134 +#: src/multiint.cpp:2130 msgid "READY?" msgstr "PREGĂTIT?" -#: src/multiint.cpp:2178 +#: src/multiint.cpp:2174 msgid "PLAYERS" msgstr "JUCĂTORI" -#: src/multiint.cpp:2213 +#: src/multiint.cpp:2209 #, fuzzy msgid "Click to change to this slot" msgstr "Click pentru a schimba setările jucătorului" -#: src/multiint.cpp:2241 +#: src/multiint.cpp:2237 msgid "Choose Team" msgstr "Alege Echipa" -#: src/multiint.cpp:2271 +#: src/multiint.cpp:2267 #, fuzzy msgid "Click to change player colour" msgstr "Click pentru a schimba setările jucătorului" -#: src/multiint.cpp:2299 +#: src/multiint.cpp:2295 #, fuzzy msgid "Click to change player position" msgstr "Click pentru a schimba setările jucătorului" -#: src/multiint.cpp:2305 +#: src/multiint.cpp:2301 #, fuzzy msgid "Click to change AI" msgstr "Click pentru a schimba setările jucătorului" -#: src/multiint.cpp:2309 +#: src/multiint.cpp:2305 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2371 +#: src/multiint.cpp:2367 msgid "CHAT" msgstr "CONVERSAȚIE" -#: src/multiint.cpp:2403 +#: src/multiint.cpp:2399 msgid "All players need to have the same mods to join your game." msgstr "Toți jucătorii trebuie să aibă aceleași modificări pentru a putea juca." -#: src/multiint.cpp:2561 +#: src/multiint.cpp:2557 #, c-format msgid "*** password [%s] is now required! ***" msgstr "*** parola [%s] este de acum necesară! ***" -#: src/multiint.cpp:2569 +#: src/multiint.cpp:2565 msgid "*** password is NOT required! ***" msgstr "*** parola NU este necesară! ***" -#: src/multiint.cpp:2810 +#: src/multiint.cpp:2806 msgid "Sorry! Failed to host the game." msgstr "Scuze! Jocul nu s-a putut găzdui." -#: src/multiint.cpp:2931 +#: src/multiint.cpp:2927 msgid "'Locked Teams' mode enabled" msgstr "Modul „Echipe Blocate” activat" -#: src/multiint.cpp:3012 +#: src/multiint.cpp:3008 #, c-format msgid "The host has kicked %s from the game!" msgstr "Gazda l-a eliminat pe %s din joc!" -#: src/multiint.cpp:3082 +#: src/multiint.cpp:3078 msgid "Host is Starting Game" msgstr "Gazda Începe Jocul" -#: src/multiint.cpp:3648 +#: src/multiint.cpp:3644 msgid "Players" msgstr "Jucători" -#: src/multiint.cpp:3786 +#: src/multiint.cpp:3782 #, c-format msgid "Sending Map: %d%% " msgstr "Trimitere de hartă: %d%%" -#: src/multiint.cpp:3794 +#: src/multiint.cpp:3790 #, c-format msgid "Map: %d%% downloaded" msgstr "Harta: %d%% descărcată" -#: src/multiint.cpp:3820 +#: src/multiint.cpp:3816 msgid "HOST" msgstr "GAZDĂ" -#: src/multiint.cpp:3827 +#: src/multiint.cpp:3823 #: src/multimenu.cpp:772 msgid "Ping" msgstr "Ping" @@ -14566,80 +14562,80 @@ msgstr "Dă energie jucătorului" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "Eliminat jucătorul %s, deoarece a încercat să înșele verificarea de integritate a datelor!" -#: src/multiplay.cpp:1057 +#: src/multiplay.cpp:1056 msgid "(allies" msgstr "(aliați" -#: src/multiplay.cpp:1065 +#: src/multiplay.cpp:1064 msgid "(private to " msgstr "(privat către " -#: src/multiplay.cpp:1078 +#: src/multiplay.cpp:1077 msgid "[invalid]" msgstr "[invalid]" -#: src/multiplay.cpp:1942 +#: src/multiplay.cpp:1941 msgid "Green" msgstr "Verde" -#: src/multiplay.cpp:1943 +#: src/multiplay.cpp:1942 msgid "Orange" msgstr "Portocaliu" -#: src/multiplay.cpp:1944 +#: src/multiplay.cpp:1943 msgid "Grey" msgstr "Gri" -#: src/multiplay.cpp:1945 +#: src/multiplay.cpp:1944 msgid "Black" msgstr "Negru" -#: src/multiplay.cpp:1946 +#: src/multiplay.cpp:1945 msgid "Red" msgstr "Roşu" -#: src/multiplay.cpp:1947 +#: src/multiplay.cpp:1946 msgid "Blue" msgstr "Albastru" -#: src/multiplay.cpp:1948 +#: src/multiplay.cpp:1947 msgid "Pink" msgstr "Roz" -#: src/multiplay.cpp:1949 +#: src/multiplay.cpp:1948 msgid "Cyan" msgstr "Azuriu" -#: src/multiplay.cpp:1950 +#: src/multiplay.cpp:1949 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:1951 +#: src/multiplay.cpp:1950 msgid "Purple" msgstr "" -#: src/multiplay.cpp:1952 +#: src/multiplay.cpp:1951 msgid "White" msgstr "" -#: src/multiplay.cpp:1953 +#: src/multiplay.cpp:1952 #, fuzzy msgid "Bright blue" msgstr "Butonul din dreapta" -#: src/multiplay.cpp:1954 +#: src/multiplay.cpp:1953 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:1955 +#: src/multiplay.cpp:1954 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:1956 +#: src/multiplay.cpp:1955 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:1957 +#: src/multiplay.cpp:1956 msgid "Brown" msgstr "" @@ -14647,16 +14643,16 @@ msgstr "" msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "" -#: src/research.cpp:1737 +#: src/research.cpp:1739 #, c-format msgid "Research completed: %s" msgstr "Cercetare complată: %s" -#: src/research.cpp:1742 +#: src/research.cpp:1744 msgid "Research Completed" msgstr "Cercetare completă" -#: src/research.cpp:2563 +#: src/research.cpp:2565 msgid "Research Award" msgstr "Răsplată de Cercetare" @@ -14821,13 +14817,13 @@ msgstr "Imposibil de localizat Senzori!" msgid "Unable to locate any Commanders!" msgstr "Imposibil de localizat Comandanți!" -#: src/structure.cpp:2614 +#: src/structure.cpp:2650 #, fuzzy msgid "Command Control Limit Reached - Production Halted" msgstr "Limita de control atinsă - Producția oprită" -#: src/structure.cpp:5806 -#: src/structure.cpp:5831 +#: src/structure.cpp:5888 +#: src/structure.cpp:5913 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" @@ -14835,50 +14831,50 @@ msgstr[0] "%s - %u unitate asociată" msgstr[1] "%s - %u unități asociate" msgstr[2] "%s - %u unități asociate" -#: src/structure.cpp:5836 -#: src/structure.cpp:5904 -#: src/structure.cpp:5920 -#: src/structure.cpp:5934 +#: src/structure.cpp:5918 +#: src/structure.cpp:5986 +#: src/structure.cpp:6002 +#: src/structure.cpp:6016 #, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - Avarii %3.0f%%" -#: src/structure.cpp:5886 +#: src/structure.cpp:5968 #, c-format msgid "%s - Connected %u of %u" msgstr "%s - Conectate %u din %u" -#: src/structure.cpp:6050 -#: src/structure.cpp:6095 +#: src/structure.cpp:6132 +#: src/structure.cpp:6177 #, c-format msgid "%s - Electronically Damaged" msgstr "%s - Avariat electronic" -#: src/structure.cpp:6332 +#: src/structure.cpp:6414 msgid "Electronic Reward - Visibility Report" msgstr "Răsplată Electronică - Raport de Vizibilitate" -#: src/structure.cpp:6372 +#: src/structure.cpp:6454 msgid "Factory Reward - Propulsion" msgstr "Răsplată de Fabrică - Propulsie" -#: src/structure.cpp:6396 +#: src/structure.cpp:6478 msgid "Factory Reward - Body" msgstr "Răsplată de Fabrică - Șasiu" -#: src/structure.cpp:6420 +#: src/structure.cpp:6502 msgid "Factory Reward - Weapon" msgstr "Răsplată de Fabrică - Armă" -#: src/structure.cpp:6429 +#: src/structure.cpp:6511 msgid "Factory Reward - Nothing" msgstr "Răsplată de Fabrică - Nimic" -#: src/structure.cpp:6457 +#: src/structure.cpp:6539 msgid "Repair Facility Award - Repair" msgstr "Răsplată de Reparații - Reparație" -#: src/structure.cpp:6464 +#: src/structure.cpp:6546 msgid "Repair Facility Award - Nothing" msgstr "Răsplată de Reparații - Nimic" @@ -14895,34 +14891,35 @@ msgstr "" msgid "Reinforcements landing" msgstr "Întăririle aterizează" -#: src/version.cpp:143 -msgid " (modified and switched locally)" -msgstr "(modificat și comutat local)" - -#: src/version.cpp:145 +#: src/version.cpp:129 msgid " (modified locally)" msgstr "(modificat local)" -#: src/version.cpp:147 -msgid " (switched locally)" -msgstr "(comutat local)" - -#: src/version.cpp:154 +#: src/version.cpp:136 msgid " - DEBUG" msgstr " - TESTARE" -#: src/version.cpp:163 +#: src/version.cpp:145 #, c-format msgid " - Built %s" msgstr " - Compilare %s" #. TRANSLATORS: This string looks as follows when expanded. #. "Version " -#: src/version.cpp:173 +#: src/version.cpp:155 #, c-format msgid "Version %s%s%s%s" msgstr "Versiunea %s%s%s%s" +#~ msgid "Kick player" +#~ msgstr "Eliminare jucător" + +#~ msgid " (modified and switched locally)" +#~ msgstr "(modificat și comutat local)" + +#~ msgid " (switched locally)" +#~ msgstr "(comutat local)" + #, fuzzy #~ msgid "Player position" #~ msgstr "Păzește poziția" diff --git a/po/ru.po b/po/ru.po index e9109c169..a3ef9db74 100644 --- a/po/ru.po +++ b/po/ru.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-02-25 23:35+0100\n" +"POT-Creation-Date: 2011-03-08 15:43+0100\n" "PO-Revision-Date: 2011-01-15 09:57+0300\n" "Last-Translator: \n" "Language-Team: Russian <>\n" @@ -12013,26 +12013,26 @@ msgid "System locale" msgstr "Системная локализация" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1042 +#: lib/netplay/netplay.cpp:1037 msgid "Enter password here" msgstr "Введите пароль" -#: lib/netplay/netplay.cpp:2060 +#: lib/netplay/netplay.cpp:2055 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "Не могу получить имя основного сервера (%s)!" -#: lib/netplay/netplay.cpp:2082 +#: lib/netplay/netplay.cpp:2077 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "Не удалось соединиться с лобби-сервером. проверьте, открыт-ли TCP-порт %u для исходящего траффика." #: src/challenge.cpp:184 #: src/hci.cpp:916 -#: src/hci.cpp:3378 -#: src/hci.cpp:3501 -#: src/hci.cpp:3912 -#: src/hci.cpp:4930 +#: src/hci.cpp:3386 +#: src/hci.cpp:3509 +#: src/hci.cpp:3920 +#: src/hci.cpp:4938 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12339,7 +12339,7 @@ msgid "Player dropped" msgstr "Игрок исчез" #: src/display3d.cpp:599 -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2121 msgid "Waiting for other players" msgstr "Ожидание других игроков" @@ -12352,7 +12352,7 @@ msgid "Cannot Build. Oil Resource Burning." msgstr "Строительство невозможно. Горит нефть." #: src/display.cpp:1828 -#: src/display.cpp:2421 +#: src/display.cpp:2420 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - повреждение %d%% - опыт %d, %s" @@ -12384,7 +12384,7 @@ msgstr "Юнит потерян!" msgid "Structure Restored" msgstr "Постройка восстановлена" -#: src/droid.cpp:2732 +#: src/droid.cpp:2734 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" @@ -12392,7 +12392,7 @@ msgstr[0] "Выбрана группа %u - %u юнит" msgstr[1] "Выбрана группа %u - %u юнита" msgstr[2] "Выбрана группа %u - %u юнитов" -#: src/droid.cpp:2745 +#: src/droid.cpp:2747 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" @@ -12400,7 +12400,7 @@ msgstr[0] "%u юнит назначен группе %u" msgstr[1] "%u юнита назначено группе %u" msgstr[2] "%u юнитов назначено группе %u" -#: src/droid.cpp:2758 +#: src/droid.cpp:2760 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" @@ -12408,7 +12408,7 @@ msgstr[0] "Фокус на группе %u - %u юнит" msgstr[1] "Фокус на группе %u - %u юнита" msgstr[2] "Фокус на группе %u - %u юнитов" -#: src/droid.cpp:2762 +#: src/droid.cpp:2764 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" @@ -12416,49 +12416,49 @@ msgstr[0] "Соединить с группой %u - %u юнит" msgstr[1] "Соединить с группой %u - %u юнита" msgstr[2] "Соединить с группой %u - %u юнитов" -#: src/droid.cpp:3093 +#: src/droid.cpp:3095 msgid "Rookie" msgstr "Новобранец" -#: src/droid.cpp:3094 +#: src/droid.cpp:3096 msgctxt "rank" msgid "Green" msgstr "Молодой" -#: src/droid.cpp:3095 +#: src/droid.cpp:3097 msgid "Trained" msgstr "Тренированный" -#: src/droid.cpp:3096 +#: src/droid.cpp:3098 msgid "Regular" msgstr "Опытный" -#: src/droid.cpp:3097 +#: src/droid.cpp:3099 msgid "Professional" msgstr "Профессионал" -#: src/droid.cpp:3098 +#: src/droid.cpp:3100 msgid "Veteran" msgstr "Ветеран" -#: src/droid.cpp:3099 +#: src/droid.cpp:3101 msgid "Elite" msgstr "Элита" -#: src/droid.cpp:3100 +#: src/droid.cpp:3102 msgid "Special" msgstr "Специалист" -#: src/droid.cpp:3101 +#: src/droid.cpp:3103 msgid "Hero" msgstr "Герой" -#: src/droid.cpp:4123 +#: src/droid.cpp:4125 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "%s хочет дать вам %s но у вас их слишком много" -#: src/droid.cpp:4127 +#: src/droid.cpp:4129 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "Вы хотите дать %s %s но у их их слишком много" @@ -12477,7 +12477,7 @@ msgid "Tutorial" msgstr "Обучение" #: src/frontend.cpp:100 -#: src/hci.cpp:3487 +#: src/hci.cpp:3495 msgid "Options" msgstr "Параметры" @@ -12538,8 +12538,8 @@ msgstr "ОДИНОЧНАЯ ИГРА" #: src/frontend.cpp:303 #: src/ingameop.cpp:494 -#: src/mission.cpp:2493 -#: src/mission.cpp:2596 +#: src/mission.cpp:2537 +#: src/mission.cpp:2640 msgid "Load Saved Game" msgstr "Загрузить Игру" @@ -12824,7 +12824,7 @@ msgid "GAME OPTIONS" msgstr "НАСТРОЙКИ ИГРЫ" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2398 +#: src/multiint.cpp:2394 msgid "Mod: " msgstr "Мод:" @@ -12833,8 +12833,8 @@ msgid "MAP SAVED!" msgstr "КАРТА СОХРАНЕНА!" #: src/hci.cpp:1573 -#: src/loop.cpp:558 -#: src/loop.cpp:574 +#: src/loop.cpp:561 +#: src/loop.cpp:577 #, fuzzy msgid "GAME SAVED: " msgstr "ИГРА СОХРАНЕНА:" @@ -12863,149 +12863,149 @@ msgstr "Игрок %u начитерил себе нового дроида: %s. msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "Игрок %u начитерил себе нового дроида: %s." -#: src/hci.cpp:3298 +#: src/hci.cpp:3306 msgid "Commanders (F6)" msgstr "Командиры (F6)" -#: src/hci.cpp:3311 +#: src/hci.cpp:3319 msgid "Intelligence Display (F5)" msgstr "Дисплей разведки (F5)" -#: src/hci.cpp:3324 +#: src/hci.cpp:3332 msgid "Manufacture (F1)" msgstr "Производство (F1)" -#: src/hci.cpp:3337 +#: src/hci.cpp:3345 msgid "Design (F4)" msgstr "Дизайн (F4)" -#: src/hci.cpp:3350 +#: src/hci.cpp:3358 msgid "Research (F2)" msgstr "Исследования (F2)" -#: src/hci.cpp:3363 +#: src/hci.cpp:3371 msgid "Build (F3)" msgstr "Строить (F3)" -#: src/hci.cpp:3434 +#: src/hci.cpp:3442 #: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Энергия" -#: src/hci.cpp:3525 +#: src/hci.cpp:3533 msgid "Map:" msgstr "Карта:" -#: src/hci.cpp:3538 +#: src/hci.cpp:3546 msgid "Load" msgstr "Загрузить " -#: src/hci.cpp:3539 +#: src/hci.cpp:3547 msgid "Load Map File" msgstr "Загрузить карту." -#: src/hci.cpp:3546 +#: src/hci.cpp:3554 msgid "Save" msgstr "Сохранить " -#: src/hci.cpp:3547 +#: src/hci.cpp:3555 msgid "Save Map File" msgstr "Сохранить карту." -#: src/hci.cpp:3555 +#: src/hci.cpp:3563 msgid "New" msgstr "Новый" -#: src/hci.cpp:3556 +#: src/hci.cpp:3564 msgid "New Blank Map" msgstr "Новая пустая карта." -#: src/hci.cpp:3592 +#: src/hci.cpp:3600 msgid "Tile" msgstr "Плитка" -#: src/hci.cpp:3593 +#: src/hci.cpp:3601 msgid "Place tiles on map" msgstr "Поместить эемент изображения на карту" -#: src/hci.cpp:3602 +#: src/hci.cpp:3610 msgid "Unit" msgstr "Юнит" -#: src/hci.cpp:3603 +#: src/hci.cpp:3611 msgid "Place Unit on map" msgstr "Поместить юнита на карту" -#: src/hci.cpp:3611 +#: src/hci.cpp:3619 msgid "Struct" msgstr "Постройки" -#: src/hci.cpp:3612 +#: src/hci.cpp:3620 msgid "Place Structures on map" msgstr "Расположить постройки на карте" -#: src/hci.cpp:3620 +#: src/hci.cpp:3628 msgid "Feat" msgstr "Разное" -#: src/hci.cpp:3621 +#: src/hci.cpp:3629 msgid "Place Features on map" msgstr "Поместить особый элемент на карту" -#: src/hci.cpp:3631 +#: src/hci.cpp:3639 msgid "Pause" msgstr "Пауза" -#: src/hci.cpp:3632 +#: src/hci.cpp:3640 msgid "Pause or unpause the game" msgstr "Пауза или продолжить игру" -#: src/hci.cpp:3646 +#: src/hci.cpp:3654 msgid "Align height of all map objects" msgstr "Выровнять высоту всех объектов на карте" -#: src/hci.cpp:3656 +#: src/hci.cpp:3664 msgid "Edit" msgstr "Редактировать" -#: src/hci.cpp:3657 +#: src/hci.cpp:3665 msgid "Start Edit Mode" msgstr "Включить режим редактирования" -#: src/hci.cpp:3671 +#: src/hci.cpp:3679 #: src/ingameop.cpp:112 #: src/ingameop.cpp:256 #: src/ingameop.cpp:260 msgid "Quit" msgstr "Выход" -#: src/hci.cpp:3672 +#: src/hci.cpp:3680 msgid "Exit Game" msgstr "Выйти из игры" -#: src/hci.cpp:3698 +#: src/hci.cpp:3706 msgid "Current Player:" msgstr "Текущий игрок" -#: src/hci.cpp:3989 +#: src/hci.cpp:3997 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "Панель прогресса" -#: src/hci.cpp:4855 +#: src/hci.cpp:4863 msgid "Factory Delivery Point" msgstr "Точка прибытия с фабрики" -#: src/hci.cpp:4873 +#: src/hci.cpp:4881 msgid "Loop Production" msgstr "Повторное производство" -#: src/hci.cpp:4953 +#: src/hci.cpp:4961 msgid "Tab Scroll left" msgstr "Таб скрол налево" -#: src/hci.cpp:4968 +#: src/hci.cpp:4976 msgid "Tab Scroll right" msgstr "Таб скрол на право" @@ -13031,8 +13031,8 @@ msgstr "" #: src/ingameop.cpp:274 #: src/ingameop.cpp:498 -#: src/mission.cpp:2480 -#: src/mission.cpp:2599 +#: src/mission.cpp:2524 +#: src/mission.cpp:2643 msgid "Save Game" msgstr "Сохранить игру" @@ -13961,42 +13961,42 @@ msgstr "Трассировка цели игры." msgid "Toggle Driving Mode" msgstr "Переключение на режим вождения." -#: src/loop.cpp:565 -#: src/loop.cpp:581 +#: src/loop.cpp:568 +#: src/loop.cpp:584 msgid "Could not save game!" msgstr "Не удалось сохранить игру!" -#: src/mission.cpp:2041 +#: src/mission.cpp:2085 msgid "Load Transport" msgstr "Загрузить Транспорт" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "ЗАДАНИЕ ВЫПОЛНЕНО с читами!" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED" msgstr "ЗАДАНИЕ ВЫПОЛНЕНО" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED--and you cheated!" msgstr "ЗАДАНИЕ ПРОВАЛЕНО - и читы вам не помогли!" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED" msgstr "ЗАДАНИЕ ПРОВАЛЕНО" -#: src/mission.cpp:2459 -#: src/mission.cpp:2499 -#: src/mission.cpp:2613 +#: src/mission.cpp:2503 +#: src/mission.cpp:2543 +#: src/mission.cpp:2657 msgid "Quit To Main Menu" msgstr "Выйти в главное меню" -#: src/mission.cpp:2467 +#: src/mission.cpp:2511 msgid "Continue Game" msgstr "Продолжить игру" -#: src/mission.cpp:2564 +#: src/mission.cpp:2608 msgid "GAME SAVED :" msgstr "ИГРА СОХРАНЕНА:" @@ -14285,116 +14285,112 @@ msgstr "" msgid "Player colour" msgstr "Цвет игрока" -#: src/multiint.cpp:2071 +#: src/multiint.cpp:2068 msgid "Team" msgstr "Команда" -#: src/multiint.cpp:2083 -msgid "Kick player" -msgstr "Выкинуть игрока" - -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 #, fuzzy msgid "Click to change difficulty" msgstr "Нажмите, чтобы изменить сложность AI." -#: src/multiint.cpp:2130 +#: src/multiint.cpp:2126 msgid "Click when ready" msgstr "Щелкни когда будешь готов" -#: src/multiint.cpp:2134 +#: src/multiint.cpp:2130 msgid "READY?" msgstr "ГОТОВ?" -#: src/multiint.cpp:2178 +#: src/multiint.cpp:2174 msgid "PLAYERS" msgstr "ИГРОКИ" -#: src/multiint.cpp:2213 +#: src/multiint.cpp:2209 #, fuzzy msgid "Click to change to this slot" msgstr "Нажмите, чтобы изменить настройки игрока." -#: src/multiint.cpp:2241 +#: src/multiint.cpp:2237 msgid "Choose Team" msgstr "Выбрать команду." -#: src/multiint.cpp:2271 +#: src/multiint.cpp:2267 #, fuzzy msgid "Click to change player colour" msgstr "Нажмите, чтобы изменить настройки игрока." -#: src/multiint.cpp:2299 +#: src/multiint.cpp:2295 #, fuzzy msgid "Click to change player position" msgstr "Нажмите, чтобы изменить настройки игрока." -#: src/multiint.cpp:2305 +#: src/multiint.cpp:2301 #, fuzzy msgid "Click to change AI" msgstr "Нажмите, чтобы изменить настройки игрока." -#: src/multiint.cpp:2309 +#: src/multiint.cpp:2305 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2371 +#: src/multiint.cpp:2367 msgid "CHAT" msgstr "ЧАТ" -#: src/multiint.cpp:2403 +#: src/multiint.cpp:2399 msgid "All players need to have the same mods to join your game." msgstr "Всем игрокам нужен такой же мод, что и у вас." -#: src/multiint.cpp:2561 +#: src/multiint.cpp:2557 #, fuzzy, c-format msgid "*** password [%s] is now required! ***" msgstr "Требуется пароль! [%s]" -#: src/multiint.cpp:2569 +#: src/multiint.cpp:2565 msgid "*** password is NOT required! ***" msgstr "*** пароль не требуется! ***" -#: src/multiint.cpp:2810 +#: src/multiint.cpp:2806 msgid "Sorry! Failed to host the game." msgstr "Извините! Не удалось создать игру." -#: src/multiint.cpp:2931 +#: src/multiint.cpp:2927 msgid "'Locked Teams' mode enabled" msgstr "Закрытые Команды" -#: src/multiint.cpp:3012 +#: src/multiint.cpp:3008 #, c-format msgid "The host has kicked %s from the game!" msgstr "Хост выкинул %s из игры!" -#: src/multiint.cpp:3082 +#: src/multiint.cpp:3078 msgid "Host is Starting Game" msgstr "Хост стартует" -#: src/multiint.cpp:3648 +#: src/multiint.cpp:3644 msgid "Players" msgstr "Игроки" -#: src/multiint.cpp:3786 +#: src/multiint.cpp:3782 #, c-format msgid "Sending Map: %d%% " msgstr "Отправка карты: %d%%" -#: src/multiint.cpp:3794 +#: src/multiint.cpp:3790 #, c-format msgid "Map: %d%% downloaded" msgstr "карта: %d%% загружена" -#: src/multiint.cpp:3820 +#: src/multiint.cpp:3816 msgid "HOST" msgstr "ХОСТ" -#: src/multiint.cpp:3827 +#: src/multiint.cpp:3823 #: src/multimenu.cpp:772 msgid "Ping" msgstr "Пинг" @@ -14566,79 +14562,79 @@ msgstr "Передать энергию игроку" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "Кик игрока %s за попытку обойти проверку внутренних данных" -#: src/multiplay.cpp:1057 +#: src/multiplay.cpp:1056 msgid "(allies" msgstr "(союзники" -#: src/multiplay.cpp:1065 +#: src/multiplay.cpp:1064 msgid "(private to " msgstr "(приват" -#: src/multiplay.cpp:1078 +#: src/multiplay.cpp:1077 msgid "[invalid]" msgstr "[неверно]" -#: src/multiplay.cpp:1942 +#: src/multiplay.cpp:1941 msgid "Green" msgstr "Зелёный" -#: src/multiplay.cpp:1943 +#: src/multiplay.cpp:1942 msgid "Orange" msgstr "Оранжевый" -#: src/multiplay.cpp:1944 +#: src/multiplay.cpp:1943 msgid "Grey" msgstr "Серый" -#: src/multiplay.cpp:1945 +#: src/multiplay.cpp:1944 msgid "Black" msgstr "Чёрный" -#: src/multiplay.cpp:1946 +#: src/multiplay.cpp:1945 msgid "Red" msgstr "Красный" -#: src/multiplay.cpp:1947 +#: src/multiplay.cpp:1946 msgid "Blue" msgstr "Синий" -#: src/multiplay.cpp:1948 +#: src/multiplay.cpp:1947 msgid "Pink" msgstr "Розовый" -#: src/multiplay.cpp:1949 +#: src/multiplay.cpp:1948 msgid "Cyan" msgstr "Голубой" -#: src/multiplay.cpp:1950 +#: src/multiplay.cpp:1949 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:1951 +#: src/multiplay.cpp:1950 msgid "Purple" msgstr "" -#: src/multiplay.cpp:1952 +#: src/multiplay.cpp:1951 msgid "White" msgstr "" -#: src/multiplay.cpp:1953 +#: src/multiplay.cpp:1952 msgid "Bright blue" msgstr "" -#: src/multiplay.cpp:1954 +#: src/multiplay.cpp:1953 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:1955 +#: src/multiplay.cpp:1954 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:1956 +#: src/multiplay.cpp:1955 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:1957 +#: src/multiplay.cpp:1956 msgid "Brown" msgstr "" @@ -14646,16 +14642,16 @@ msgstr "" msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "Мы не киборги, чтобы использовать Транспорт киборгов." -#: src/research.cpp:1737 +#: src/research.cpp:1739 #, c-format msgid "Research completed: %s" msgstr "Завершено исследование: %s" -#: src/research.cpp:1742 +#: src/research.cpp:1744 msgid "Research Completed" msgstr "Исследование закончено" -#: src/research.cpp:2563 +#: src/research.cpp:2565 msgid "Research Award" msgstr "Награда исследования" @@ -14820,13 +14816,13 @@ msgstr "Не найдено ни одного сенсорного юнита!" msgid "Unable to locate any Commanders!" msgstr "Не найдено ни одного командира!" -#: src/structure.cpp:2614 +#: src/structure.cpp:2650 #, fuzzy msgid "Command Control Limit Reached - Production Halted" msgstr "Достигнут Предел - Производство Остановлено" -#: src/structure.cpp:5806 -#: src/structure.cpp:5831 +#: src/structure.cpp:5888 +#: src/structure.cpp:5913 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" @@ -14834,50 +14830,50 @@ msgstr[0] "%s - %u Юнит назначен" msgstr[1] "%s - %u Юнитов назначено" msgstr[2] "%s - %u Юнита назначено" -#: src/structure.cpp:5836 -#: src/structure.cpp:5904 -#: src/structure.cpp:5920 -#: src/structure.cpp:5934 +#: src/structure.cpp:5918 +#: src/structure.cpp:5986 +#: src/structure.cpp:6002 +#: src/structure.cpp:6016 #, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - повреждение %3.0f%%" -#: src/structure.cpp:5886 +#: src/structure.cpp:5968 #, c-format msgid "%s - Connected %u of %u" msgstr "%s - подключено %u из %u" -#: src/structure.cpp:6050 -#: src/structure.cpp:6095 +#: src/structure.cpp:6132 +#: src/structure.cpp:6177 #, c-format msgid "%s - Electronically Damaged" msgstr "%s - Электронные повреждения" -#: src/structure.cpp:6332 +#: src/structure.cpp:6414 msgid "Electronic Reward - Visibility Report" msgstr "награда - доклад о местоположении" -#: src/structure.cpp:6372 +#: src/structure.cpp:6454 msgid "Factory Reward - Propulsion" msgstr "награда завода - движитель" -#: src/structure.cpp:6396 +#: src/structure.cpp:6478 msgid "Factory Reward - Body" msgstr "награда завода - рама" -#: src/structure.cpp:6420 +#: src/structure.cpp:6502 msgid "Factory Reward - Weapon" msgstr "награда завода - оружие" -#: src/structure.cpp:6429 +#: src/structure.cpp:6511 msgid "Factory Reward - Nothing" msgstr "награда завода - ничего" -#: src/structure.cpp:6457 +#: src/structure.cpp:6539 msgid "Repair Facility Award - Repair" msgstr "награда мастерской - ремонт" -#: src/structure.cpp:6464 +#: src/structure.cpp:6546 msgid "Repair Facility Award - Nothing" msgstr "награда мастерской - ничего" @@ -14894,34 +14890,35 @@ msgstr "Недостаточно места для посадки юнитов msgid "Reinforcements landing" msgstr "Высадка подкрепления" -#: src/version.cpp:143 -msgid " (modified and switched locally)" -msgstr "(модифицировано и включено локально)" - -#: src/version.cpp:145 +#: src/version.cpp:129 msgid " (modified locally)" msgstr "(модифицировано локально)" -#: src/version.cpp:147 -msgid " (switched locally)" -msgstr "(Включено локально)" - -#: src/version.cpp:154 +#: src/version.cpp:136 msgid " - DEBUG" msgstr " - ОТЛАДКА" -#: src/version.cpp:163 +#: src/version.cpp:145 #, c-format msgid " - Built %s" msgstr " - сборка %s" #. TRANSLATORS: This string looks as follows when expanded. #. "Version " -#: src/version.cpp:173 +#: src/version.cpp:155 #, c-format msgid "Version %s%s%s%s" msgstr "Версия %s%s%s%s" +#~ msgid "Kick player" +#~ msgstr "Выкинуть игрока" + +#~ msgid " (modified and switched locally)" +#~ msgstr "(модифицировано и включено локально)" + +#~ msgid " (switched locally)" +#~ msgstr "(Включено локально)" + #~ msgid "Cobra Hover Heavy-Repair" #~ msgstr "Кобра ховер тяжелая ремонтная" diff --git a/po/sk.po b/po/sk.po index c401fbd8b..42e1aa2fa 100644 --- a/po/sk.po +++ b/po/sk.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100 2.3.2\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-02-25 23:35+0100\n" +"POT-Creation-Date: 2011-03-08 15:43+0100\n" "PO-Revision-Date: 2010-07-30 08:44+0100\n" "Last-Translator: Marian Zsemlye \n" "Language-Team: Koapa - Marian Zsemlye \n" @@ -12015,26 +12015,26 @@ msgid "System locale" msgstr "Systémové údaje" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1042 +#: lib/netplay/netplay.cpp:1037 msgid "Enter password here" msgstr "" -#: lib/netplay/netplay.cpp:2060 +#: lib/netplay/netplay.cpp:2055 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "" -#: lib/netplay/netplay.cpp:2082 +#: lib/netplay/netplay.cpp:2077 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "" #: src/challenge.cpp:184 #: src/hci.cpp:916 -#: src/hci.cpp:3378 -#: src/hci.cpp:3501 -#: src/hci.cpp:3912 -#: src/hci.cpp:4930 +#: src/hci.cpp:3386 +#: src/hci.cpp:3509 +#: src/hci.cpp:3920 +#: src/hci.cpp:4938 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12341,7 +12341,7 @@ msgid "Player dropped" msgstr "Hráč spadol" #: src/display3d.cpp:599 -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2121 msgid "Waiting for other players" msgstr "" @@ -12354,7 +12354,7 @@ msgid "Cannot Build. Oil Resource Burning." msgstr "Nemožno stavať. Ropný vrt horí." #: src/display.cpp:1828 -#: src/display.cpp:2421 +#: src/display.cpp:2420 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - Poškodenie %d%% - Zkúsenosti %d, %s" @@ -12386,7 +12386,7 @@ msgstr "Jednotka stratená!" msgid "Structure Restored" msgstr "Budova obnovená" -#: src/droid.cpp:2732 +#: src/droid.cpp:2734 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" @@ -12394,7 +12394,7 @@ msgstr[0] "Skupina %u vybraná - %u jednotka" msgstr[1] "Skupina %u vybraná - %u jednotky" msgstr[2] "Skupina %u vybraná - %u jednotiek" -#: src/droid.cpp:2745 +#: src/droid.cpp:2747 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" @@ -12402,7 +12402,7 @@ msgstr[0] "%u jednotka pripojená ku skupine %u" msgstr[1] "%u jednotky pripojené ku skupine %u" msgstr[2] "%u jednotiek pripojených ku skupine %u" -#: src/droid.cpp:2758 +#: src/droid.cpp:2760 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" @@ -12410,7 +12410,7 @@ msgstr[0] "Zamerané na skupinu %u - %u jednotka" msgstr[1] "Zamerané na skupinu %u - %u jednotky" msgstr[2] "Zamerané na skupinu %u - %u jednotiek" -#: src/droid.cpp:2762 +#: src/droid.cpp:2764 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" @@ -12418,49 +12418,49 @@ msgstr[0] "Vyrovananý so skupinou %u - %u jednotka" msgstr[1] "Vyrovnané so skupinou %u - %u jednotky" msgstr[2] "Vyrovnaných so skupinou %u - %u jednotiek" -#: src/droid.cpp:3093 +#: src/droid.cpp:3095 msgid "Rookie" msgstr "Nováčik" -#: src/droid.cpp:3094 +#: src/droid.cpp:3096 msgctxt "rank" msgid "Green" msgstr "Zelenáč" -#: src/droid.cpp:3095 +#: src/droid.cpp:3097 msgid "Trained" msgstr "Trénovaný" -#: src/droid.cpp:3096 +#: src/droid.cpp:3098 msgid "Regular" msgstr "Bežný" -#: src/droid.cpp:3097 +#: src/droid.cpp:3099 msgid "Professional" msgstr "Profesionál" -#: src/droid.cpp:3098 +#: src/droid.cpp:3100 msgid "Veteran" msgstr "Veterán" -#: src/droid.cpp:3099 +#: src/droid.cpp:3101 msgid "Elite" msgstr "Elita" -#: src/droid.cpp:3100 +#: src/droid.cpp:3102 msgid "Special" msgstr "Špecialista" -#: src/droid.cpp:3101 +#: src/droid.cpp:3103 msgid "Hero" msgstr "Hrdina" -#: src/droid.cpp:4123 +#: src/droid.cpp:4125 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "" -#: src/droid.cpp:4127 +#: src/droid.cpp:4129 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "" @@ -12479,7 +12479,7 @@ msgid "Tutorial" msgstr "Výcvik" #: src/frontend.cpp:100 -#: src/hci.cpp:3487 +#: src/hci.cpp:3495 msgid "Options" msgstr "Nastavenia" @@ -12540,8 +12540,8 @@ msgstr "HRA JEDNÉHO HRÁČA" #: src/frontend.cpp:303 #: src/ingameop.cpp:494 -#: src/mission.cpp:2493 -#: src/mission.cpp:2596 +#: src/mission.cpp:2537 +#: src/mission.cpp:2640 msgid "Load Saved Game" msgstr "Nahrať uloženú hru" @@ -12824,7 +12824,7 @@ msgid "GAME OPTIONS" msgstr "NASTAVENIA HRY" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2398 +#: src/multiint.cpp:2394 msgid "Mod: " msgstr "" @@ -12833,8 +12833,8 @@ msgid "MAP SAVED!" msgstr "MAPA ULOŽENÁ!" #: src/hci.cpp:1573 -#: src/loop.cpp:558 -#: src/loop.cpp:574 +#: src/loop.cpp:561 +#: src/loop.cpp:577 #, fuzzy msgid "GAME SAVED: " msgstr "HRA ULOŽENÁ!" @@ -12863,155 +12863,155 @@ msgstr "" msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "Hráč %u podvádza (ladiace menu) novou budovou: %s" -#: src/hci.cpp:3298 +#: src/hci.cpp:3306 msgid "Commanders (F6)" msgstr "Velitelia (F6)" -#: src/hci.cpp:3311 +#: src/hci.cpp:3319 msgid "Intelligence Display (F5)" msgstr "Spravodajské okno (F5)" -#: src/hci.cpp:3324 +#: src/hci.cpp:3332 msgid "Manufacture (F1)" msgstr "Výroba (F1)" -#: src/hci.cpp:3337 +#: src/hci.cpp:3345 msgid "Design (F4)" msgstr "Konštrukcia (F4)" -#: src/hci.cpp:3350 +#: src/hci.cpp:3358 msgid "Research (F2)" msgstr "Výzkum (F2)" -#: src/hci.cpp:3363 +#: src/hci.cpp:3371 msgid "Build (F3)" msgstr "Stavba (F3)" -#: src/hci.cpp:3434 +#: src/hci.cpp:3442 #: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Energia" -#: src/hci.cpp:3525 +#: src/hci.cpp:3533 msgid "Map:" msgstr "" -#: src/hci.cpp:3538 +#: src/hci.cpp:3546 #, fuzzy msgid "Load" msgstr "Nahraj Hru" -#: src/hci.cpp:3539 +#: src/hci.cpp:3547 #, fuzzy msgid "Load Map File" msgstr "Nahraj Hru" -#: src/hci.cpp:3546 +#: src/hci.cpp:3554 #, fuzzy msgid "Save" msgstr "Uložiť hru" -#: src/hci.cpp:3547 +#: src/hci.cpp:3555 #, fuzzy msgid "Save Map File" msgstr "Uložiť hru" -#: src/hci.cpp:3555 +#: src/hci.cpp:3563 msgid "New" msgstr "" -#: src/hci.cpp:3556 +#: src/hci.cpp:3564 msgid "New Blank Map" msgstr "" -#: src/hci.cpp:3592 +#: src/hci.cpp:3600 msgid "Tile" msgstr "dlaždica" -#: src/hci.cpp:3593 +#: src/hci.cpp:3601 msgid "Place tiles on map" msgstr "Umiestni dlaždice na mapu" -#: src/hci.cpp:3602 +#: src/hci.cpp:3610 msgid "Unit" msgstr "Jednotka" -#: src/hci.cpp:3603 +#: src/hci.cpp:3611 msgid "Place Unit on map" msgstr "Umiestni na mapu jednotky" -#: src/hci.cpp:3611 +#: src/hci.cpp:3619 msgid "Struct" msgstr "Stavba" -#: src/hci.cpp:3612 +#: src/hci.cpp:3620 msgid "Place Structures on map" msgstr "Umiestni na mapu budovy" -#: src/hci.cpp:3620 +#: src/hci.cpp:3628 msgid "Feat" msgstr "" -#: src/hci.cpp:3621 +#: src/hci.cpp:3629 msgid "Place Features on map" msgstr "Umiestni na mapu črty" -#: src/hci.cpp:3631 +#: src/hci.cpp:3639 msgid "Pause" msgstr "" -#: src/hci.cpp:3632 +#: src/hci.cpp:3640 msgid "Pause or unpause the game" msgstr "Pauzni alebo odpauzni hru" -#: src/hci.cpp:3646 +#: src/hci.cpp:3654 msgid "Align height of all map objects" msgstr "" -#: src/hci.cpp:3656 +#: src/hci.cpp:3664 msgid "Edit" msgstr "" -#: src/hci.cpp:3657 +#: src/hci.cpp:3665 #, fuzzy msgid "Start Edit Mode" msgstr "Začni bez základní" -#: src/hci.cpp:3671 +#: src/hci.cpp:3679 #: src/ingameop.cpp:112 #: src/ingameop.cpp:256 #: src/ingameop.cpp:260 msgid "Quit" msgstr "Ukončiť" -#: src/hci.cpp:3672 +#: src/hci.cpp:3680 msgid "Exit Game" msgstr "Ukončiť hru" -#: src/hci.cpp:3698 +#: src/hci.cpp:3706 #, fuzzy msgid "Current Player:" msgstr "Hra viacerých hráčov" -#: src/hci.cpp:3989 +#: src/hci.cpp:3997 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "Panel priebehu" -#: src/hci.cpp:4855 +#: src/hci.cpp:4863 msgid "Factory Delivery Point" msgstr "" -#: src/hci.cpp:4873 +#: src/hci.cpp:4881 msgid "Loop Production" msgstr "Opakovať výrobu" -#: src/hci.cpp:4953 +#: src/hci.cpp:4961 msgid "Tab Scroll left" msgstr "" -#: src/hci.cpp:4968 +#: src/hci.cpp:4976 msgid "Tab Scroll right" msgstr "" @@ -13037,8 +13037,8 @@ msgstr "" #: src/ingameop.cpp:274 #: src/ingameop.cpp:498 -#: src/mission.cpp:2480 -#: src/mission.cpp:2599 +#: src/mission.cpp:2524 +#: src/mission.cpp:2643 msgid "Save Game" msgstr "Uložiť hru" @@ -13973,42 +13973,42 @@ msgstr "" msgid "Toggle Driving Mode" msgstr "" -#: src/loop.cpp:565 -#: src/loop.cpp:581 +#: src/loop.cpp:568 +#: src/loop.cpp:584 msgid "Could not save game!" msgstr "Nemožno uložiť hru!" -#: src/mission.cpp:2041 +#: src/mission.cpp:2085 msgid "Load Transport" msgstr "Naložit transport" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "CIEL SPLNENÝ podvádzaním!" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED" msgstr "CIEĽ BOL SPLNENÝ" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED--and you cheated!" msgstr "CIEL NESPLNENÝ-a podvádzal si!" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED" msgstr "CIEĽ NEBOL SPLNENÝ" -#: src/mission.cpp:2459 -#: src/mission.cpp:2499 -#: src/mission.cpp:2613 +#: src/mission.cpp:2503 +#: src/mission.cpp:2543 +#: src/mission.cpp:2657 msgid "Quit To Main Menu" msgstr "Skončiť do hlavého menu" -#: src/mission.cpp:2467 +#: src/mission.cpp:2511 msgid "Continue Game" msgstr "Pokračovat v hre" -#: src/mission.cpp:2564 +#: src/mission.cpp:2608 msgid "GAME SAVED :" msgstr "HRA ULOŽENÁ!" @@ -14298,116 +14298,112 @@ msgstr "" msgid "Player colour" msgstr "Farba hráča" -#: src/multiint.cpp:2071 +#: src/multiint.cpp:2068 msgid "Team" msgstr "" -#: src/multiint.cpp:2083 -msgid "Kick player" -msgstr "Protihráč" - -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 #, fuzzy msgid "Click to change difficulty" msgstr "Radar ukazuje farby hráčov" -#: src/multiint.cpp:2130 +#: src/multiint.cpp:2126 msgid "Click when ready" msgstr "" -#: src/multiint.cpp:2134 +#: src/multiint.cpp:2130 msgid "READY?" msgstr "" -#: src/multiint.cpp:2178 +#: src/multiint.cpp:2174 msgid "PLAYERS" msgstr "HRÁČI" -#: src/multiint.cpp:2213 +#: src/multiint.cpp:2209 msgid "Click to change to this slot" msgstr "" -#: src/multiint.cpp:2241 +#: src/multiint.cpp:2237 #, fuzzy msgid "Choose Team" msgstr "Pevné týmy" -#: src/multiint.cpp:2271 +#: src/multiint.cpp:2267 #, fuzzy msgid "Click to change player colour" msgstr "Radar ukazuje farby hráčov" -#: src/multiint.cpp:2299 +#: src/multiint.cpp:2295 #, fuzzy msgid "Click to change player position" msgstr "Bráň pozíciu" -#: src/multiint.cpp:2305 +#: src/multiint.cpp:2301 #, fuzzy msgid "Click to change AI" msgstr "Radar ukazuje farby hráčov" -#: src/multiint.cpp:2309 +#: src/multiint.cpp:2305 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2371 +#: src/multiint.cpp:2367 msgid "CHAT" msgstr "CHAT" -#: src/multiint.cpp:2403 +#: src/multiint.cpp:2399 msgid "All players need to have the same mods to join your game." msgstr "" -#: src/multiint.cpp:2561 +#: src/multiint.cpp:2557 #, c-format msgid "*** password [%s] is now required! ***" msgstr "" -#: src/multiint.cpp:2569 +#: src/multiint.cpp:2565 msgid "*** password is NOT required! ***" msgstr "" -#: src/multiint.cpp:2810 +#: src/multiint.cpp:2806 msgid "Sorry! Failed to host the game." msgstr "" -#: src/multiint.cpp:2931 +#: src/multiint.cpp:2927 msgid "'Locked Teams' mode enabled" msgstr "Zapnutý mód 'Pevných týmov'" -#: src/multiint.cpp:3012 +#: src/multiint.cpp:3008 #, c-format msgid "The host has kicked %s from the game!" msgstr "Hostiteľ vyhodil %s z hry!" -#: src/multiint.cpp:3082 +#: src/multiint.cpp:3078 msgid "Host is Starting Game" msgstr "Hostiteľ začíná hru" -#: src/multiint.cpp:3648 +#: src/multiint.cpp:3644 msgid "Players" msgstr "Hráči" -#: src/multiint.cpp:3786 +#: src/multiint.cpp:3782 #, c-format msgid "Sending Map: %d%% " msgstr "" -#: src/multiint.cpp:3794 +#: src/multiint.cpp:3790 #, c-format msgid "Map: %d%% downloaded" msgstr "" -#: src/multiint.cpp:3820 +#: src/multiint.cpp:3816 msgid "HOST" msgstr "" -#: src/multiint.cpp:3827 +#: src/multiint.cpp:3823 #: src/multimenu.cpp:772 msgid "Ping" msgstr "" @@ -14583,79 +14579,79 @@ msgstr "" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "" -#: src/multiplay.cpp:1057 +#: src/multiplay.cpp:1056 msgid "(allies" msgstr "(spojenectvo" -#: src/multiplay.cpp:1065 +#: src/multiplay.cpp:1064 msgid "(private to " msgstr "" -#: src/multiplay.cpp:1078 +#: src/multiplay.cpp:1077 msgid "[invalid]" msgstr "[chybné]" -#: src/multiplay.cpp:1942 +#: src/multiplay.cpp:1941 msgid "Green" msgstr "Zelená" -#: src/multiplay.cpp:1943 +#: src/multiplay.cpp:1942 msgid "Orange" msgstr "Oranžová" -#: src/multiplay.cpp:1944 +#: src/multiplay.cpp:1943 msgid "Grey" msgstr "Šedá" -#: src/multiplay.cpp:1945 +#: src/multiplay.cpp:1944 msgid "Black" msgstr "Čierna" -#: src/multiplay.cpp:1946 +#: src/multiplay.cpp:1945 msgid "Red" msgstr "Červená" -#: src/multiplay.cpp:1947 +#: src/multiplay.cpp:1946 msgid "Blue" msgstr "Modrá" -#: src/multiplay.cpp:1948 +#: src/multiplay.cpp:1947 msgid "Pink" msgstr "Ružová" -#: src/multiplay.cpp:1949 +#: src/multiplay.cpp:1948 msgid "Cyan" msgstr "Azurová" -#: src/multiplay.cpp:1950 +#: src/multiplay.cpp:1949 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:1951 +#: src/multiplay.cpp:1950 msgid "Purple" msgstr "" -#: src/multiplay.cpp:1952 +#: src/multiplay.cpp:1951 msgid "White" msgstr "" -#: src/multiplay.cpp:1953 +#: src/multiplay.cpp:1952 msgid "Bright blue" msgstr "" -#: src/multiplay.cpp:1954 +#: src/multiplay.cpp:1953 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:1955 +#: src/multiplay.cpp:1954 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:1956 +#: src/multiplay.cpp:1955 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:1957 +#: src/multiplay.cpp:1956 msgid "Brown" msgstr "" @@ -14663,16 +14659,16 @@ msgstr "" msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "" -#: src/research.cpp:1737 +#: src/research.cpp:1739 #, c-format msgid "Research completed: %s" msgstr "Výzkum dokončený: %s" -#: src/research.cpp:1742 +#: src/research.cpp:1744 msgid "Research Completed" msgstr "Výzkum dokončený" -#: src/research.cpp:2563 +#: src/research.cpp:2565 msgid "Research Award" msgstr "" @@ -14837,12 +14833,12 @@ msgstr "Nemožno nájsť žiadnu senzorovú jednotku!" msgid "Unable to locate any Commanders!" msgstr "Nemožno nájsť žiadneho velitela!" -#: src/structure.cpp:2614 +#: src/structure.cpp:2650 msgid "Command Control Limit Reached - Production Halted" msgstr "" -#: src/structure.cpp:5806 -#: src/structure.cpp:5831 +#: src/structure.cpp:5888 +#: src/structure.cpp:5913 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" @@ -14850,50 +14846,50 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/structure.cpp:5836 -#: src/structure.cpp:5904 -#: src/structure.cpp:5920 -#: src/structure.cpp:5934 +#: src/structure.cpp:5918 +#: src/structure.cpp:5986 +#: src/structure.cpp:6002 +#: src/structure.cpp:6016 #, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - Poškodenie %3.0f%%" -#: src/structure.cpp:5886 +#: src/structure.cpp:5968 #, c-format msgid "%s - Connected %u of %u" msgstr "%s - Pripojených %u z %u" -#: src/structure.cpp:6050 -#: src/structure.cpp:6095 +#: src/structure.cpp:6132 +#: src/structure.cpp:6177 #, c-format msgid "%s - Electronically Damaged" msgstr "" -#: src/structure.cpp:6332 +#: src/structure.cpp:6414 msgid "Electronic Reward - Visibility Report" msgstr "" -#: src/structure.cpp:6372 +#: src/structure.cpp:6454 msgid "Factory Reward - Propulsion" msgstr "" -#: src/structure.cpp:6396 +#: src/structure.cpp:6478 msgid "Factory Reward - Body" msgstr "" -#: src/structure.cpp:6420 +#: src/structure.cpp:6502 msgid "Factory Reward - Weapon" msgstr "" -#: src/structure.cpp:6429 +#: src/structure.cpp:6511 msgid "Factory Reward - Nothing" msgstr "" -#: src/structure.cpp:6457 +#: src/structure.cpp:6539 msgid "Repair Facility Award - Repair" msgstr "" -#: src/structure.cpp:6464 +#: src/structure.cpp:6546 msgid "Repair Facility Award - Nothing" msgstr "" @@ -14910,34 +14906,29 @@ msgstr "" msgid "Reinforcements landing" msgstr "Pristály posily" -#: src/version.cpp:143 -msgid " (modified and switched locally)" -msgstr "" - -#: src/version.cpp:145 +#: src/version.cpp:129 msgid " (modified locally)" msgstr "" -#: src/version.cpp:147 -msgid " (switched locally)" -msgstr "" - -#: src/version.cpp:154 +#: src/version.cpp:136 msgid " - DEBUG" msgstr "- LADENIE" -#: src/version.cpp:163 +#: src/version.cpp:145 #, c-format msgid " - Built %s" msgstr "- Build %s" #. TRANSLATORS: This string looks as follows when expanded. #. "Version " -#: src/version.cpp:173 +#: src/version.cpp:155 #, c-format msgid "Version %s%s%s%s" msgstr "Verzia %s%s%s%s" +#~ msgid "Kick player" +#~ msgstr "Protihráč" + #, fuzzy #~ msgid "Infinite Production" #~ msgstr "Opakovať výrobu" diff --git a/po/sl.po b/po/sl.po index b11bb4b79..41c61667f 100644 --- a/po/sl.po +++ b/po/sl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-02-25 23:35+0100\n" +"POT-Creation-Date: 2011-03-08 15:43+0100\n" "PO-Revision-Date: 2009-06-10 14:43+0100\n" "Last-Translator: Tomaž Povšin \n" "Language-Team: Slovenian \n" @@ -12157,27 +12157,27 @@ msgid "System locale" msgstr "Lokalni sistem" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1042 +#: lib/netplay/netplay.cpp:1037 #, fuzzy msgid "Enter password here" msgstr "Najprej vnesite geslo" -#: lib/netplay/netplay.cpp:2060 +#: lib/netplay/netplay.cpp:2055 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "Ni bilo mogoče razrešiti imena glavnega strežnika (%s)!" -#: lib/netplay/netplay.cpp:2082 +#: lib/netplay/netplay.cpp:2077 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "Ni bilo mogoče komunicirati z vežnim strežnikom! Je TCP prehod %u odprt za izhodni promet?" #: src/challenge.cpp:184 #: src/hci.cpp:916 -#: src/hci.cpp:3378 -#: src/hci.cpp:3501 -#: src/hci.cpp:3912 -#: src/hci.cpp:4930 +#: src/hci.cpp:3386 +#: src/hci.cpp:3509 +#: src/hci.cpp:3920 +#: src/hci.cpp:4938 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12484,7 +12484,7 @@ msgid "Player dropped" msgstr "Igralec izpadel" #: src/display3d.cpp:599 -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2121 msgid "Waiting for other players" msgstr "Čakanje ostalih igralcev" @@ -12497,7 +12497,7 @@ msgid "Cannot Build. Oil Resource Burning." msgstr "Gradnja ni možna. Vir nafte gori." #: src/display.cpp:1828 -#: src/display.cpp:2421 +#: src/display.cpp:2420 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - Poškodbe %d%% - Izkušenj %d %s" @@ -12529,7 +12529,7 @@ msgstr "Enota izgubljena!" msgid "Structure Restored" msgstr "Zgradba obnovljena" -#: src/droid.cpp:2732 +#: src/droid.cpp:2734 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" @@ -12538,7 +12538,7 @@ msgstr[1] "Skupina %u izbrana - %u enota" msgstr[2] "Skupina %u izbrana - %u enoti" msgstr[3] "Skupina %u izbrana - %u enote" -#: src/droid.cpp:2745 +#: src/droid.cpp:2747 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" @@ -12547,7 +12547,7 @@ msgstr[1] "%u enota dodeljena skupini %u" msgstr[2] "%u enoti dodeljeni skupini %u" msgstr[3] "%u enote dodeljene skupini %u" -#: src/droid.cpp:2758 +#: src/droid.cpp:2760 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" @@ -12556,7 +12556,7 @@ msgstr[1] "Centriran na skupino %u - %u enota" msgstr[2] "Centriran na skupino %u - %u enoti" msgstr[3] "Centriran na skupino %u - %u enote" -#: src/droid.cpp:2762 +#: src/droid.cpp:2764 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" @@ -12565,49 +12565,49 @@ msgstr[1] "Poravnava s skupino %u - %u enota" msgstr[2] "Poravnava s skupino %u - %u enoti" msgstr[3] "Poravnava s skupino %u - %u enote" -#: src/droid.cpp:3093 +#: src/droid.cpp:3095 msgid "Rookie" msgstr "Novinec" -#: src/droid.cpp:3094 +#: src/droid.cpp:3096 msgctxt "rank" msgid "Green" msgstr "Zelen" -#: src/droid.cpp:3095 +#: src/droid.cpp:3097 msgid "Trained" msgstr "Izurjen" -#: src/droid.cpp:3096 +#: src/droid.cpp:3098 msgid "Regular" msgstr "Navaden" -#: src/droid.cpp:3097 +#: src/droid.cpp:3099 msgid "Professional" msgstr "Poklicni" -#: src/droid.cpp:3098 +#: src/droid.cpp:3100 msgid "Veteran" msgstr "Veteran" -#: src/droid.cpp:3099 +#: src/droid.cpp:3101 msgid "Elite" msgstr "Elita" -#: src/droid.cpp:3100 +#: src/droid.cpp:3102 msgid "Special" msgstr "Poseben" -#: src/droid.cpp:3101 +#: src/droid.cpp:3103 msgid "Hero" msgstr "Junak" -#: src/droid.cpp:4123 +#: src/droid.cpp:4125 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "" -#: src/droid.cpp:4127 +#: src/droid.cpp:4129 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "" @@ -12626,7 +12626,7 @@ msgid "Tutorial" msgstr "Učna vaja" #: src/frontend.cpp:100 -#: src/hci.cpp:3487 +#: src/hci.cpp:3495 msgid "Options" msgstr "Možnosti" @@ -12688,8 +12688,8 @@ msgstr "EN IGRALEC" #: src/frontend.cpp:303 #: src/ingameop.cpp:494 -#: src/mission.cpp:2493 -#: src/mission.cpp:2596 +#: src/mission.cpp:2537 +#: src/mission.cpp:2640 msgid "Load Saved Game" msgstr "Naloži shranjeno igro" @@ -12980,7 +12980,7 @@ msgid "GAME OPTIONS" msgstr "MOŽNOSTI IGRE" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2398 +#: src/multiint.cpp:2394 msgid "Mod: " msgstr "" @@ -12989,8 +12989,8 @@ msgid "MAP SAVED!" msgstr "MAPA SHRANJENA!" #: src/hci.cpp:1573 -#: src/loop.cpp:558 -#: src/loop.cpp:574 +#: src/loop.cpp:561 +#: src/loop.cpp:577 #, fuzzy msgid "GAME SAVED: " msgstr "IGRA SHRANJENA:" @@ -13019,155 +13019,155 @@ msgstr "Igralec/ka %u si je prigoljufal/a (razhroščevalni meni) novega droida: msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "Igralec/ka %u si je prigoljufal/a (razhroščevalni meni) novega droida: %s." -#: src/hci.cpp:3298 +#: src/hci.cpp:3306 msgid "Commanders (F6)" msgstr "Poveljniki (F6)" -#: src/hci.cpp:3311 +#: src/hci.cpp:3319 msgid "Intelligence Display (F5)" msgstr "Obveščevalni zaslon (F5)" -#: src/hci.cpp:3324 +#: src/hci.cpp:3332 msgid "Manufacture (F1)" msgstr "Izdelava (F1)" -#: src/hci.cpp:3337 +#: src/hci.cpp:3345 msgid "Design (F4)" msgstr "Načrtovanje (F4)" -#: src/hci.cpp:3350 +#: src/hci.cpp:3358 msgid "Research (F2)" msgstr "Raziskave (F2)" -#: src/hci.cpp:3363 +#: src/hci.cpp:3371 msgid "Build (F3)" msgstr "Gradnja (F3)" -#: src/hci.cpp:3434 +#: src/hci.cpp:3442 #: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Moč" -#: src/hci.cpp:3525 +#: src/hci.cpp:3533 msgid "Map:" msgstr "" -#: src/hci.cpp:3538 +#: src/hci.cpp:3546 #, fuzzy msgid "Load" msgstr "Naloži igro" -#: src/hci.cpp:3539 +#: src/hci.cpp:3547 #, fuzzy msgid "Load Map File" msgstr "Naloži igro" -#: src/hci.cpp:3546 +#: src/hci.cpp:3554 #, fuzzy msgid "Save" msgstr "Shrani igro" -#: src/hci.cpp:3547 +#: src/hci.cpp:3555 #, fuzzy msgid "Save Map File" msgstr "Shrani igro" -#: src/hci.cpp:3555 +#: src/hci.cpp:3563 msgid "New" msgstr "" -#: src/hci.cpp:3556 +#: src/hci.cpp:3564 msgid "New Blank Map" msgstr "" -#: src/hci.cpp:3592 +#: src/hci.cpp:3600 msgid "Tile" msgstr "Plošča" -#: src/hci.cpp:3593 +#: src/hci.cpp:3601 msgid "Place tiles on map" msgstr "Položi plošče na mapo" -#: src/hci.cpp:3602 +#: src/hci.cpp:3610 msgid "Unit" msgstr "Enota" -#: src/hci.cpp:3603 +#: src/hci.cpp:3611 msgid "Place Unit on map" msgstr "Položi enote na mapo" -#: src/hci.cpp:3611 +#: src/hci.cpp:3619 msgid "Struct" msgstr "Zgradba" -#: src/hci.cpp:3612 +#: src/hci.cpp:3620 msgid "Place Structures on map" msgstr "Položi zgradbe na mapo" -#: src/hci.cpp:3620 +#: src/hci.cpp:3628 msgid "Feat" msgstr "Odlika" -#: src/hci.cpp:3621 +#: src/hci.cpp:3629 msgid "Place Features on map" msgstr "Položi odlike na mapo" -#: src/hci.cpp:3631 +#: src/hci.cpp:3639 msgid "Pause" msgstr "" -#: src/hci.cpp:3632 +#: src/hci.cpp:3640 msgid "Pause or unpause the game" msgstr "Ustavi ali nadaljuj igro" -#: src/hci.cpp:3646 +#: src/hci.cpp:3654 msgid "Align height of all map objects" msgstr "Uskladi višino vseh predmetov na mapi" -#: src/hci.cpp:3656 +#: src/hci.cpp:3664 msgid "Edit" msgstr "" -#: src/hci.cpp:3657 +#: src/hci.cpp:3665 #, fuzzy msgid "Start Edit Mode" msgstr "Začnite brez baz" -#: src/hci.cpp:3671 +#: src/hci.cpp:3679 #: src/ingameop.cpp:112 #: src/ingameop.cpp:256 #: src/ingameop.cpp:260 msgid "Quit" msgstr "Končaj" -#: src/hci.cpp:3672 +#: src/hci.cpp:3680 msgid "Exit Game" msgstr "Zapusti igro" -#: src/hci.cpp:3698 +#: src/hci.cpp:3706 #, fuzzy msgid "Current Player:" msgstr "Več igralcev" -#: src/hci.cpp:3989 +#: src/hci.cpp:3997 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "Črta napredka" -#: src/hci.cpp:4855 +#: src/hci.cpp:4863 msgid "Factory Delivery Point" msgstr "Dostavna točka tovarne" -#: src/hci.cpp:4873 +#: src/hci.cpp:4881 msgid "Loop Production" msgstr "Ponavljaj izdelavo" -#: src/hci.cpp:4953 +#: src/hci.cpp:4961 msgid "Tab Scroll left" msgstr "Tab premakni levo" -#: src/hci.cpp:4968 +#: src/hci.cpp:4976 msgid "Tab Scroll right" msgstr "Tab premakni desno" @@ -13193,8 +13193,8 @@ msgstr "" #: src/ingameop.cpp:274 #: src/ingameop.cpp:498 -#: src/mission.cpp:2480 -#: src/mission.cpp:2599 +#: src/mission.cpp:2524 +#: src/mission.cpp:2643 msgid "Save Game" msgstr "Shrani igro" @@ -14144,42 +14144,42 @@ msgstr "" msgid "Toggle Driving Mode" msgstr "Nastavi sledilno kamero" -#: src/loop.cpp:565 -#: src/loop.cpp:581 +#: src/loop.cpp:568 +#: src/loop.cpp:584 msgid "Could not save game!" msgstr "Ni bilo mogoče shraniti igre!" -#: src/mission.cpp:2041 +#: src/mission.cpp:2085 msgid "Load Transport" msgstr "Naloži prevoz" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "CILJ DOSEŽEN z goljufanjem!" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED" msgstr "CILJ DOSEŽEN" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED--and you cheated!" msgstr "CILJ SPODLETEL--in vi ste goljufali!" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED" msgstr "CILJ SPODLETEL" -#: src/mission.cpp:2459 -#: src/mission.cpp:2499 -#: src/mission.cpp:2613 +#: src/mission.cpp:2503 +#: src/mission.cpp:2543 +#: src/mission.cpp:2657 msgid "Quit To Main Menu" msgstr "Končaj v glavni meni" -#: src/mission.cpp:2467 +#: src/mission.cpp:2511 msgid "Continue Game" msgstr "Nadaljuj igro" -#: src/mission.cpp:2564 +#: src/mission.cpp:2608 msgid "GAME SAVED :" msgstr "IGRA SHRANJENA:" @@ -14476,118 +14476,113 @@ msgstr "" msgid "Player colour" msgstr "Igralec odšel" -#: src/multiint.cpp:2071 +#: src/multiint.cpp:2068 msgid "Team" msgstr "Skupina" -#: src/multiint.cpp:2083 -#, fuzzy -msgid "Kick player" -msgstr "2 igralca" - -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 #, fuzzy msgid "Click to change difficulty" msgstr "Kliknite za nastavitev gesla" -#: src/multiint.cpp:2130 +#: src/multiint.cpp:2126 msgid "Click when ready" msgstr "Kliknite, ko boste pripravljeni" -#: src/multiint.cpp:2134 +#: src/multiint.cpp:2130 msgid "READY?" msgstr "" -#: src/multiint.cpp:2178 +#: src/multiint.cpp:2174 msgid "PLAYERS" msgstr "IGRALCI" -#: src/multiint.cpp:2213 +#: src/multiint.cpp:2209 #, fuzzy msgid "Click to change to this slot" msgstr "Kliknite za nastavitev gesla" -#: src/multiint.cpp:2241 +#: src/multiint.cpp:2237 #, fuzzy msgid "Choose Team" msgstr "Zaklenjene skupine" -#: src/multiint.cpp:2271 +#: src/multiint.cpp:2267 #, fuzzy msgid "Click to change player colour" msgstr "Radar kaže barve igralca" -#: src/multiint.cpp:2299 +#: src/multiint.cpp:2295 #, fuzzy msgid "Click to change player position" msgstr "Straži položaj" -#: src/multiint.cpp:2305 +#: src/multiint.cpp:2301 #, fuzzy msgid "Click to change AI" msgstr "Kliknite za nastavitev gesla" -#: src/multiint.cpp:2309 +#: src/multiint.cpp:2305 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2371 +#: src/multiint.cpp:2367 msgid "CHAT" msgstr "POGOVOR" -#: src/multiint.cpp:2403 +#: src/multiint.cpp:2399 msgid "All players need to have the same mods to join your game." msgstr "" -#: src/multiint.cpp:2561 +#: src/multiint.cpp:2557 #, fuzzy, c-format msgid "*** password [%s] is now required! ***" msgstr "*** geslo je sedaj potrebno! ***" -#: src/multiint.cpp:2569 +#: src/multiint.cpp:2565 msgid "*** password is NOT required! ***" msgstr "*** geslo NI potrebno! ***" -#: src/multiint.cpp:2810 +#: src/multiint.cpp:2806 msgid "Sorry! Failed to host the game." msgstr "" -#: src/multiint.cpp:2931 +#: src/multiint.cpp:2927 msgid "'Locked Teams' mode enabled" msgstr "Omogočen način 'zaklenjene skupine'" -#: src/multiint.cpp:3012 +#: src/multiint.cpp:3008 #, c-format msgid "The host has kicked %s from the game!" msgstr "Gostitelj je brcnil %s iz igre!" -#: src/multiint.cpp:3082 +#: src/multiint.cpp:3078 msgid "Host is Starting Game" msgstr "Gostitelj začenja igro" -#: src/multiint.cpp:3648 +#: src/multiint.cpp:3644 msgid "Players" msgstr "Igralci" -#: src/multiint.cpp:3786 +#: src/multiint.cpp:3782 #, c-format msgid "Sending Map: %d%% " msgstr "" -#: src/multiint.cpp:3794 +#: src/multiint.cpp:3790 #, c-format msgid "Map: %d%% downloaded" msgstr "" -#: src/multiint.cpp:3820 +#: src/multiint.cpp:3816 msgid "HOST" msgstr "" -#: src/multiint.cpp:3827 +#: src/multiint.cpp:3823 #: src/multimenu.cpp:772 msgid "Ping" msgstr "Ping" @@ -14764,80 +14759,80 @@ msgstr "Daj igralcu moč" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "" -#: src/multiplay.cpp:1057 +#: src/multiplay.cpp:1056 #, fuzzy msgid "(allies" msgstr "Zavezništva" -#: src/multiplay.cpp:1065 +#: src/multiplay.cpp:1064 msgid "(private to " msgstr "" -#: src/multiplay.cpp:1078 +#: src/multiplay.cpp:1077 msgid "[invalid]" msgstr "" -#: src/multiplay.cpp:1942 +#: src/multiplay.cpp:1941 msgid "Green" msgstr "Zelena" -#: src/multiplay.cpp:1943 +#: src/multiplay.cpp:1942 msgid "Orange" msgstr "Oranžna" -#: src/multiplay.cpp:1944 +#: src/multiplay.cpp:1943 msgid "Grey" msgstr "Siva" -#: src/multiplay.cpp:1945 +#: src/multiplay.cpp:1944 msgid "Black" msgstr "Črna" -#: src/multiplay.cpp:1946 +#: src/multiplay.cpp:1945 msgid "Red" msgstr "Rdeča" -#: src/multiplay.cpp:1947 +#: src/multiplay.cpp:1946 msgid "Blue" msgstr "Modra" -#: src/multiplay.cpp:1948 +#: src/multiplay.cpp:1947 msgid "Pink" msgstr "Roza" -#: src/multiplay.cpp:1949 +#: src/multiplay.cpp:1948 msgid "Cyan" msgstr "Cijan" -#: src/multiplay.cpp:1950 +#: src/multiplay.cpp:1949 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:1951 +#: src/multiplay.cpp:1950 msgid "Purple" msgstr "" -#: src/multiplay.cpp:1952 +#: src/multiplay.cpp:1951 msgid "White" msgstr "" -#: src/multiplay.cpp:1953 +#: src/multiplay.cpp:1952 msgid "Bright blue" msgstr "" -#: src/multiplay.cpp:1954 +#: src/multiplay.cpp:1953 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:1955 +#: src/multiplay.cpp:1954 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:1956 +#: src/multiplay.cpp:1955 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:1957 +#: src/multiplay.cpp:1956 msgid "Brown" msgstr "" @@ -14845,16 +14840,16 @@ msgstr "" msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "" -#: src/research.cpp:1737 +#: src/research.cpp:1739 #, c-format msgid "Research completed: %s" msgstr "Raziskava dokončana: %s" -#: src/research.cpp:1742 +#: src/research.cpp:1744 msgid "Research Completed" msgstr "Raziskava dokončana" -#: src/research.cpp:2563 +#: src/research.cpp:2565 msgid "Research Award" msgstr "Raziskovalna nagrada" @@ -15020,12 +15015,12 @@ msgstr "Ni mogoče najti nobenih senzorskih enot!" msgid "Unable to locate any Commanders!" msgstr "Ni mogoče najti nobenih poveljnikov!" -#: src/structure.cpp:2614 +#: src/structure.cpp:2650 msgid "Command Control Limit Reached - Production Halted" msgstr "Meja poveljniškega nadzora dosežena - izdelava ustavljena" -#: src/structure.cpp:5806 -#: src/structure.cpp:5831 +#: src/structure.cpp:5888 +#: src/structure.cpp:5913 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" @@ -15034,50 +15029,50 @@ msgstr[1] "%s - %u enota dodeljena" msgstr[2] "%s - %u enoti dodeljeni" msgstr[3] "%s - %u enote dodeljene" -#: src/structure.cpp:5836 -#: src/structure.cpp:5904 -#: src/structure.cpp:5920 -#: src/structure.cpp:5934 +#: src/structure.cpp:5918 +#: src/structure.cpp:5986 +#: src/structure.cpp:6002 +#: src/structure.cpp:6016 #, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - Poškodbe %3.0f%%" -#: src/structure.cpp:5886 +#: src/structure.cpp:5968 #, c-format msgid "%s - Connected %u of %u" msgstr "%s - povezane %u od %u" -#: src/structure.cpp:6050 -#: src/structure.cpp:6095 +#: src/structure.cpp:6132 +#: src/structure.cpp:6177 #, c-format msgid "%s - Electronically Damaged" msgstr "%s - elektronsko poškodovan" -#: src/structure.cpp:6332 +#: src/structure.cpp:6414 msgid "Electronic Reward - Visibility Report" msgstr "Elektronska nagrada - poročilo o vidljivosti" -#: src/structure.cpp:6372 +#: src/structure.cpp:6454 msgid "Factory Reward - Propulsion" msgstr "Nagrada tovarne - pogon" -#: src/structure.cpp:6396 +#: src/structure.cpp:6478 msgid "Factory Reward - Body" msgstr "Nagrada tovarne - telo" -#: src/structure.cpp:6420 +#: src/structure.cpp:6502 msgid "Factory Reward - Weapon" msgstr "Nagrada tovarne - orožje" -#: src/structure.cpp:6429 +#: src/structure.cpp:6511 msgid "Factory Reward - Nothing" msgstr "Nagrada tovarne - nič" -#: src/structure.cpp:6457 +#: src/structure.cpp:6539 msgid "Repair Facility Award - Repair" msgstr "Nagrada stavbe za popravila - popravilo" -#: src/structure.cpp:6464 +#: src/structure.cpp:6546 msgid "Repair Facility Award - Nothing" msgstr "Nagrada stavbe za popravila - nič" @@ -15094,34 +15089,36 @@ msgstr "" msgid "Reinforcements landing" msgstr "Okrepitve pristajajo" -#: src/version.cpp:143 -msgid " (modified and switched locally)" -msgstr "(lokalno spremenjeno in menjano)" - -#: src/version.cpp:145 +#: src/version.cpp:129 msgid " (modified locally)" msgstr "(lokalno spremenjeno)" -#: src/version.cpp:147 -msgid " (switched locally)" -msgstr "(lokalno menjano)" - -#: src/version.cpp:154 +#: src/version.cpp:136 msgid " - DEBUG" msgstr "- RAZHROŠČI" -#: src/version.cpp:163 +#: src/version.cpp:145 #, c-format msgid " - Built %s" msgstr "- Zgrajen %s" #. TRANSLATORS: This string looks as follows when expanded. #. "Version " -#: src/version.cpp:173 +#: src/version.cpp:155 #, c-format msgid "Version %s%s%s%s" msgstr "Verzija %s%s%s%s" +#, fuzzy +#~ msgid "Kick player" +#~ msgstr "2 igralca" + +#~ msgid " (modified and switched locally)" +#~ msgstr "(lokalno spremenjeno in menjano)" + +#~ msgid " (switched locally)" +#~ msgstr "(lokalno menjano)" + #, fuzzy #~ msgid "Infinite Production" #~ msgstr "Ponavljaj izdelavo" diff --git a/po/tr.po b/po/tr.po index a76cc5cdc..0b1c7a561 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-02-25 23:35+0100\n" +"POT-Creation-Date: 2011-03-08 15:43+0100\n" "PO-Revision-Date: 2011-01-19 18:01+0200\n" "Last-Translator: Ayhan GORGULU \n" "Language-Team: Turkey \n" @@ -12031,26 +12031,26 @@ msgid "System locale" msgstr "Yerel Sistem" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1042 +#: lib/netplay/netplay.cpp:1037 msgid "Enter password here" msgstr "Parolayı buraya gir" -#: lib/netplay/netplay.cpp:2060 +#: lib/netplay/netplay.cpp:2055 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "Konnte Lobbyserver-Namen nicht auflösen (%s)!" -#: lib/netplay/netplay.cpp:2082 +#: lib/netplay/netplay.cpp:2077 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "Lobi Sunucusu ile iletişim kurulamadı! TCP-Port %u u açıkmı?" #: src/challenge.cpp:184 #: src/hci.cpp:916 -#: src/hci.cpp:3378 -#: src/hci.cpp:3501 -#: src/hci.cpp:3912 -#: src/hci.cpp:4930 +#: src/hci.cpp:3386 +#: src/hci.cpp:3509 +#: src/hci.cpp:3920 +#: src/hci.cpp:4938 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12358,7 +12358,7 @@ msgid "Player dropped" msgstr "Oyuncu Düştü" #: src/display3d.cpp:599 -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2121 msgid "Waiting for other players" msgstr "Diğer oyuncular bekleniyor" @@ -12371,7 +12371,7 @@ msgid "Cannot Build. Oil Resource Burning." msgstr "İnşa edilemiyor. Petrol Kaynağı Yanıyor." #: src/display.cpp:1828 -#: src/display.cpp:2421 +#: src/display.cpp:2420 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - Hasar %d%% - Tecrübe %d, %s" @@ -12402,77 +12402,77 @@ msgstr "Birim Kaybı!" msgid "Structure Restored" msgstr "Bina Yenilendi" -#: src/droid.cpp:2732 +#: src/droid.cpp:2734 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" msgstr[0] "Grup %u Seçildi - %u Birim" msgstr[1] "Grup %u Seçildi - %u Birimler" -#: src/droid.cpp:2745 +#: src/droid.cpp:2747 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" msgstr[0] "%u Birim şu Gruba Atandı: %u " msgstr[1] "%u Birimler şu Gruba Atandı: %u " -#: src/droid.cpp:2758 +#: src/droid.cpp:2760 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" msgstr[0] "%u Numaralı Grup Merkezde - %u Birim" msgstr[1] "%u Numaralı Grup Merkezde - %u Birimler" -#: src/droid.cpp:2762 +#: src/droid.cpp:2764 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" msgstr[0] "Grup %u 'e - %u Birim atandı" msgstr[1] "Grup %u 'e - %u Birimler Atandı" -#: src/droid.cpp:3093 +#: src/droid.cpp:3095 msgid "Rookie" msgstr "Er" -#: src/droid.cpp:3094 +#: src/droid.cpp:3096 msgctxt "rank" msgid "Green" msgstr "Onbaşı" -#: src/droid.cpp:3095 +#: src/droid.cpp:3097 msgid "Trained" msgstr "Çavuş" -#: src/droid.cpp:3096 +#: src/droid.cpp:3098 msgid "Regular" msgstr "Teğmen" -#: src/droid.cpp:3097 +#: src/droid.cpp:3099 msgid "Professional" msgstr "Üsteğmen" -#: src/droid.cpp:3098 +#: src/droid.cpp:3100 msgid "Veteran" msgstr "Albay" -#: src/droid.cpp:3099 +#: src/droid.cpp:3101 msgid "Elite" msgstr "Korgeneral" -#: src/droid.cpp:3100 +#: src/droid.cpp:3102 msgid "Special" msgstr "Orgeneral" -#: src/droid.cpp:3101 +#: src/droid.cpp:3103 msgid "Hero" msgstr "Mareşal" -#: src/droid.cpp:4123 +#: src/droid.cpp:4125 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "%s Sana vermek istedi %s ama, Sende daha çok var!" -#: src/droid.cpp:4127 +#: src/droid.cpp:4129 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "Sen %s 'a %s vermek istedin ama, Onda daha çok var!" @@ -12491,7 +12491,7 @@ msgid "Tutorial" msgstr "Öğretici" #: src/frontend.cpp:100 -#: src/hci.cpp:3487 +#: src/hci.cpp:3495 msgid "Options" msgstr "Ayarlar" @@ -12552,8 +12552,8 @@ msgstr "TEK OYUNCU" #: src/frontend.cpp:303 #: src/ingameop.cpp:494 -#: src/mission.cpp:2493 -#: src/mission.cpp:2596 +#: src/mission.cpp:2537 +#: src/mission.cpp:2640 msgid "Load Saved Game" msgstr "Kayıtlı Oyun Yükle" @@ -12836,7 +12836,7 @@ msgid "GAME OPTIONS" msgstr "OYUN AYARLARI" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2398 +#: src/multiint.cpp:2394 msgid "Mod: " msgstr "Mod: " @@ -12845,8 +12845,8 @@ msgid "MAP SAVED!" msgstr "HARİTAN KAYDEDİLDİ!" #: src/hci.cpp:1573 -#: src/loop.cpp:558 -#: src/loop.cpp:574 +#: src/loop.cpp:561 +#: src/loop.cpp:577 msgid "GAME SAVED: " msgstr "OYUN KAYDEDİLDİ :" @@ -12875,150 +12875,150 @@ msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "Oyuncu %u (debug menü) Yeni birimini oluşturdu." # Commander kann als Eigenname im Deutschen allerdings mit deutschem Plural stehen bleiben -Kreuvf -#: src/hci.cpp:3298 +#: src/hci.cpp:3306 msgid "Commanders (F6)" msgstr "Komutanlar (F6)" -#: src/hci.cpp:3311 +#: src/hci.cpp:3319 msgid "Intelligence Display (F5)" msgstr "Görev Ekranı (F5)" -#: src/hci.cpp:3324 +#: src/hci.cpp:3332 msgid "Manufacture (F1)" msgstr "Üretim (F1)" -#: src/hci.cpp:3337 +#: src/hci.cpp:3345 msgid "Design (F4)" msgstr "Tasarım (F4)" -#: src/hci.cpp:3350 +#: src/hci.cpp:3358 msgid "Research (F2)" msgstr "Araştırma (F2)" -#: src/hci.cpp:3363 +#: src/hci.cpp:3371 msgid "Build (F3)" msgstr "İnşa (F3)" -#: src/hci.cpp:3434 +#: src/hci.cpp:3442 #: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Güç" -#: src/hci.cpp:3525 +#: src/hci.cpp:3533 msgid "Map:" msgstr "Harita:" -#: src/hci.cpp:3538 +#: src/hci.cpp:3546 msgid "Load" msgstr "Yükle" -#: src/hci.cpp:3539 +#: src/hci.cpp:3547 msgid "Load Map File" msgstr "Harita Dosyası Yükle" -#: src/hci.cpp:3546 +#: src/hci.cpp:3554 msgid "Save" msgstr "Kaydet" -#: src/hci.cpp:3547 +#: src/hci.cpp:3555 msgid "Save Map File" msgstr "Harita dosyası kaydet" -#: src/hci.cpp:3555 +#: src/hci.cpp:3563 msgid "New" msgstr "Yeni" -#: src/hci.cpp:3556 +#: src/hci.cpp:3564 msgid "New Blank Map" msgstr "Yeni Boş Harita" -#: src/hci.cpp:3592 +#: src/hci.cpp:3600 msgid "Tile" msgstr "Harita Ö." -#: src/hci.cpp:3593 +#: src/hci.cpp:3601 msgid "Place tiles on map" msgstr "Haritaya yeni öğeler yerleştir" -#: src/hci.cpp:3602 +#: src/hci.cpp:3610 msgid "Unit" msgstr "Birim" -#: src/hci.cpp:3603 +#: src/hci.cpp:3611 msgid "Place Unit on map" msgstr "Haritaya yeni birimler yerleştir" -#: src/hci.cpp:3611 +#: src/hci.cpp:3619 msgid "Struct" msgstr "Bina" -#: src/hci.cpp:3612 +#: src/hci.cpp:3620 msgid "Place Structures on map" msgstr "Haritaya yeni binalar yerleştir" # gemäß: http://dict.leo.org/ende?search=Feat -Kreuvf -#: src/hci.cpp:3620 +#: src/hci.cpp:3628 msgid "Feat" msgstr "Özellik" -#: src/hci.cpp:3621 +#: src/hci.cpp:3629 msgid "Place Features on map" msgstr "Haritaya Özel Öğeler ekle" -#: src/hci.cpp:3631 +#: src/hci.cpp:3639 msgid "Pause" msgstr "Durdur" -#: src/hci.cpp:3632 +#: src/hci.cpp:3640 msgid "Pause or unpause the game" msgstr "Oyunu durdur yada başlat" -#: src/hci.cpp:3646 +#: src/hci.cpp:3654 msgid "Align height of all map objects" msgstr "Tüm harita yüksekliğini objelere uygun hale getir" -#: src/hci.cpp:3656 +#: src/hci.cpp:3664 msgid "Edit" msgstr "Düzenle" -#: src/hci.cpp:3657 +#: src/hci.cpp:3665 msgid "Start Edit Mode" msgstr "Düzenleme Modunu Aç" -#: src/hci.cpp:3671 +#: src/hci.cpp:3679 #: src/ingameop.cpp:112 #: src/ingameop.cpp:256 #: src/ingameop.cpp:260 msgid "Quit" msgstr "Çıkış" -#: src/hci.cpp:3672 +#: src/hci.cpp:3680 msgid "Exit Game" msgstr "Oyundan Çık" -#: src/hci.cpp:3698 +#: src/hci.cpp:3706 msgid "Current Player:" msgstr "Geçerli Oyuncu:" -#: src/hci.cpp:3989 +#: src/hci.cpp:3997 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "İlerleme Çubuğu" -#: src/hci.cpp:4855 +#: src/hci.cpp:4863 msgid "Factory Delivery Point" msgstr "Fabrika Teslim Noktası" -#: src/hci.cpp:4873 +#: src/hci.cpp:4881 msgid "Loop Production" msgstr "Üretimi Tekrarla" -#: src/hci.cpp:4953 +#: src/hci.cpp:4961 msgid "Tab Scroll left" msgstr "Tabloyu Sola Kaydır" -#: src/hci.cpp:4968 +#: src/hci.cpp:4976 msgid "Tab Scroll right" msgstr "Tabloyu Sağa Kaydır" @@ -13044,8 +13044,8 @@ msgstr "Taktiksel UI (Hedef Kaynak Simgesi): Gizle" #: src/ingameop.cpp:274 #: src/ingameop.cpp:498 -#: src/mission.cpp:2480 -#: src/mission.cpp:2599 +#: src/mission.cpp:2524 +#: src/mission.cpp:2643 msgid "Save Game" msgstr "Oyunu Kaydet" @@ -13978,42 +13978,42 @@ msgstr "Bir oyun objesini izle" msgid "Toggle Driving Mode" msgstr "Sürüş Moduna" -#: src/loop.cpp:565 -#: src/loop.cpp:581 +#: src/loop.cpp:568 +#: src/loop.cpp:584 msgid "Could not save game!" msgstr "Oyun Kaydedilemedi!" -#: src/mission.cpp:2041 +#: src/mission.cpp:2085 msgid "Load Transport" msgstr "Taşımaya Yükle" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "GÖREV BAŞARILI--hileci seni!" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED" msgstr "GÖREV BAŞARILI" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED--and you cheated!" msgstr "GÖREV BAŞARISIZ--ve sen hile yaptın!" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED" msgstr "GÖREV BAŞARISIZ" -#: src/mission.cpp:2459 -#: src/mission.cpp:2499 -#: src/mission.cpp:2613 +#: src/mission.cpp:2503 +#: src/mission.cpp:2543 +#: src/mission.cpp:2657 msgid "Quit To Main Menu" msgstr "Ana Menüye Dön" -#: src/mission.cpp:2467 +#: src/mission.cpp:2511 msgid "Continue Game" msgstr "Oyuna Devam" -#: src/mission.cpp:2564 +#: src/mission.cpp:2608 msgid "GAME SAVED :" msgstr "OYUN KAYDEDİLDİ :" @@ -14302,112 +14302,108 @@ msgstr "Bu slotu kullanılmaz olarak belirle" msgid "Player colour" msgstr "Oyuncu rengi" -#: src/multiint.cpp:2071 +#: src/multiint.cpp:2068 msgid "Team" msgstr "Takım" -#: src/multiint.cpp:2083 -msgid "Kick player" -msgstr "Oyundan at" - -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 msgid "You cannot change difficulty in a challenge" msgstr "Mücadele modunda zorluğu değiştiremezsin" -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 msgid "Click to change difficulty" msgstr "Zorluğu değiştirmek için tıkla" -#: src/multiint.cpp:2130 +#: src/multiint.cpp:2126 msgid "Click when ready" msgstr "Hazırsan tıkla" -#: src/multiint.cpp:2134 +#: src/multiint.cpp:2130 msgid "READY?" msgstr "HAZIR?" -#: src/multiint.cpp:2178 +#: src/multiint.cpp:2174 msgid "PLAYERS" msgstr "OYUNCULAR" -#: src/multiint.cpp:2213 +#: src/multiint.cpp:2209 msgid "Click to change to this slot" msgstr "Bu slotu değiştirmek için tıkla" -#: src/multiint.cpp:2241 +#: src/multiint.cpp:2237 msgid "Choose Team" msgstr "Takım seç" -#: src/multiint.cpp:2271 +#: src/multiint.cpp:2267 msgid "Click to change player colour" msgstr "Oyuncu renklerini değiştirmek için tıkla" -#: src/multiint.cpp:2299 +#: src/multiint.cpp:2295 msgid "Click to change player position" msgstr "Oyuncu pozisyonunu değiştirmek için tıkla" -#: src/multiint.cpp:2305 +#: src/multiint.cpp:2301 msgid "Click to change AI" msgstr "Yapay zekayı ayarlamak için tıkla" -#: src/multiint.cpp:2309 +#: src/multiint.cpp:2305 msgid "You cannot change AI in a challenge" msgstr "Mücadele modunda Y.Z değiştiremezsin" -#: src/multiint.cpp:2371 +#: src/multiint.cpp:2367 msgid "CHAT" msgstr "SOHBET" -#: src/multiint.cpp:2403 +#: src/multiint.cpp:2399 msgid "All players need to have the same mods to join your game." msgstr "TÜm oyuncular oyununa girebilmek için aynı moda ihtiyaç duyar." -#: src/multiint.cpp:2561 +#: src/multiint.cpp:2557 #, c-format msgid "*** password [%s] is now required! ***" msgstr "*** Şifre [%s] şimdi isteniyor ! ***" -#: src/multiint.cpp:2569 +#: src/multiint.cpp:2565 msgid "*** password is NOT required! ***" msgstr "*** Şifreye gerek yok! ***" -#: src/multiint.cpp:2810 +#: src/multiint.cpp:2806 msgid "Sorry! Failed to host the game." msgstr "Üzgünüm! Oyun kurulurken bir hata oldu." # festgelegt ungleich fest -Kreuvf -#: src/multiint.cpp:2931 +#: src/multiint.cpp:2927 msgid "'Locked Teams' mode enabled" msgstr "\"Takım Kilidi\"-Modu Aktif" -#: src/multiint.cpp:3012 +#: src/multiint.cpp:3008 #, c-format msgid "The host has kicked %s from the game!" msgstr "Kurucu %s isimli oyuncuyu oyundan attı!" -#: src/multiint.cpp:3082 +#: src/multiint.cpp:3078 msgid "Host is Starting Game" msgstr "Kurucu oyunu başlatıyor" -#: src/multiint.cpp:3648 +#: src/multiint.cpp:3644 msgid "Players" msgstr "Oyuncular" -#: src/multiint.cpp:3786 +#: src/multiint.cpp:3782 #, c-format msgid "Sending Map: %d%% " msgstr "Harita Gönderiliyor: %d%%" -#: src/multiint.cpp:3794 +#: src/multiint.cpp:3790 #, c-format msgid "Map: %d%% downloaded" msgstr "Harita: %d%% indirildi" -#: src/multiint.cpp:3820 +#: src/multiint.cpp:3816 msgid "HOST" msgstr "KURUCU" -#: src/multiint.cpp:3827 +#: src/multiint.cpp:3823 #: src/multimenu.cpp:772 msgid "Ping" msgstr "Ping" @@ -14571,79 +14567,79 @@ msgstr "Oyuncuya güç ver" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "Oyuncu atılıyor %s veri bütünlüğünü korumak için!" -#: src/multiplay.cpp:1057 +#: src/multiplay.cpp:1056 msgid "(allies" msgstr "(Müttefikler" -#: src/multiplay.cpp:1065 +#: src/multiplay.cpp:1064 msgid "(private to " msgstr "(bir direk" -#: src/multiplay.cpp:1078 +#: src/multiplay.cpp:1077 msgid "[invalid]" msgstr "[gereksiz]" -#: src/multiplay.cpp:1942 +#: src/multiplay.cpp:1941 msgid "Green" msgstr "Yeşil" -#: src/multiplay.cpp:1943 +#: src/multiplay.cpp:1942 msgid "Orange" msgstr "Portakal Sarısı" -#: src/multiplay.cpp:1944 +#: src/multiplay.cpp:1943 msgid "Grey" msgstr "Gri" -#: src/multiplay.cpp:1945 +#: src/multiplay.cpp:1944 msgid "Black" msgstr "Siyah" -#: src/multiplay.cpp:1946 +#: src/multiplay.cpp:1945 msgid "Red" msgstr "Kırmızı" -#: src/multiplay.cpp:1947 +#: src/multiplay.cpp:1946 msgid "Blue" msgstr "Koyu Mavi" -#: src/multiplay.cpp:1948 +#: src/multiplay.cpp:1947 msgid "Pink" msgstr "Pembe" -#: src/multiplay.cpp:1949 +#: src/multiplay.cpp:1948 msgid "Cyan" msgstr "Mavi" -#: src/multiplay.cpp:1950 +#: src/multiplay.cpp:1949 msgid "Yellow" msgstr "Sarı" -#: src/multiplay.cpp:1951 +#: src/multiplay.cpp:1950 msgid "Purple" msgstr "Mor" -#: src/multiplay.cpp:1952 +#: src/multiplay.cpp:1951 msgid "White" msgstr "Beyaz" -#: src/multiplay.cpp:1953 +#: src/multiplay.cpp:1952 msgid "Bright blue" msgstr "Açık Mavi" -#: src/multiplay.cpp:1954 +#: src/multiplay.cpp:1953 msgid "Neon green" msgstr "Neon yeşili" -#: src/multiplay.cpp:1955 +#: src/multiplay.cpp:1954 msgid "Infrared" msgstr "Kızılötesi" -#: src/multiplay.cpp:1956 +#: src/multiplay.cpp:1955 msgid "Ultraviolet" msgstr "Morötesi" -#: src/multiplay.cpp:1957 +#: src/multiplay.cpp:1956 msgid "Brown" msgstr "Kahverengi" @@ -14651,16 +14647,16 @@ msgstr "Kahverengi" msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "Bunu Yapamıyoruz! Biz Cyborg Taşıma Gemisi'ni kullanmak için bir Cyborg birimine sahip olmalıyız!" -#: src/research.cpp:1737 +#: src/research.cpp:1739 #, c-format msgid "Research completed: %s" msgstr "Araştırma Tamamlandı: %s" -#: src/research.cpp:1742 +#: src/research.cpp:1744 msgid "Research Completed" msgstr "Araştırma Tamamlandı" -#: src/research.cpp:2563 +#: src/research.cpp:2565 msgid "Research Award" msgstr "Araştırma Ödülü" @@ -14824,64 +14820,64 @@ msgstr "Hiç Algılayıcı birimi bulunamadı!" msgid "Unable to locate any Commanders!" msgstr "Hiç Komutan birimi bulunamadı!" -#: src/structure.cpp:2614 +#: src/structure.cpp:2650 msgid "Command Control Limit Reached - Production Halted" msgstr "Komuta Kontrol Limitine Ulaştın - Üretim Durduruldu" # nix Gruppe! -Kreuvf -#: src/structure.cpp:5806 -#: src/structure.cpp:5831 +#: src/structure.cpp:5888 +#: src/structure.cpp:5913 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" msgstr[0] "%s - %u Birim Atandı" msgstr[1] "%s - %u Birimler Atandı" -#: src/structure.cpp:5836 -#: src/structure.cpp:5904 -#: src/structure.cpp:5920 -#: src/structure.cpp:5934 +#: src/structure.cpp:5918 +#: src/structure.cpp:5986 +#: src/structure.cpp:6002 +#: src/structure.cpp:6016 #, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - Hasar %3.0f%%" -#: src/structure.cpp:5886 +#: src/structure.cpp:5968 #, c-format msgid "%s - Connected %u of %u" msgstr "%s - %u de %u 'e Bağlandı" -#: src/structure.cpp:6050 -#: src/structure.cpp:6095 +#: src/structure.cpp:6132 +#: src/structure.cpp:6177 #, c-format msgid "%s - Electronically Damaged" msgstr "%s - Elektronik Hasar Aldı" # Reward ist zwar nicht Beute, aber im Krieg erbeutet man eben Dinge -Kreuvf -#: src/structure.cpp:6332 +#: src/structure.cpp:6414 msgid "Electronic Reward - Visibility Report" msgstr "Elektronik Ödül - Görünebilirlik Raporu" -#: src/structure.cpp:6372 +#: src/structure.cpp:6454 msgid "Factory Reward - Propulsion" msgstr "Fabrika Ödülü - Yürütücü" -#: src/structure.cpp:6396 +#: src/structure.cpp:6478 msgid "Factory Reward - Body" msgstr "Fabrika Ödülü - Beden" -#: src/structure.cpp:6420 +#: src/structure.cpp:6502 msgid "Factory Reward - Weapon" msgstr "Fabrika Ödülü - Silah" -#: src/structure.cpp:6429 +#: src/structure.cpp:6511 msgid "Factory Reward - Nothing" msgstr "Fabrika Ödülü - Sıfır" -#: src/structure.cpp:6457 +#: src/structure.cpp:6539 msgid "Repair Facility Award - Repair" msgstr "Tamir Tesisi Ödülü - Tamir" -#: src/structure.cpp:6464 +#: src/structure.cpp:6546 msgid "Repair Facility Award - Nothing" msgstr "Tamir Tesisi Ödülü - Sıfır" @@ -14898,34 +14894,35 @@ msgstr "Taşıma Gemisinde yeterince yer yok!" msgid "Reinforcements landing" msgstr "Destek kuvvetler iniyor" -#: src/version.cpp:143 -msgid " (modified and switched locally)" -msgstr " (duzenlenmis ve anahtarlanmis yerel dil dosyasi)" - -#: src/version.cpp:145 +#: src/version.cpp:129 msgid " (modified locally)" msgstr " (duzenlenmis yerel)" -#: src/version.cpp:147 -msgid " (switched locally)" -msgstr " (yerel anahtarli)" - -#: src/version.cpp:154 +#: src/version.cpp:136 msgid " - DEBUG" msgstr " - DEBUG" -#: src/version.cpp:163 +#: src/version.cpp:145 #, c-format msgid " - Built %s" msgstr " - %s İnşa" #. TRANSLATORS: This string looks as follows when expanded. #. "Version " -#: src/version.cpp:173 +#: src/version.cpp:155 #, c-format msgid "Version %s%s%s%s" msgstr "Sürüm %s%s%s%s" +#~ msgid "Kick player" +#~ msgstr "Oyundan at" + +#~ msgid " (modified and switched locally)" +#~ msgstr " (duzenlenmis ve anahtarlanmis yerel dil dosyasi)" + +#~ msgid " (switched locally)" +#~ msgstr " (yerel anahtarli)" + #~ msgid "Player position" #~ msgstr "Oyuncu pozisyonu" diff --git a/po/uk_UA.po b/po/uk_UA.po index 6c2b1df0a..7649059d4 100644 --- a/po/uk_UA.po +++ b/po/uk_UA.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Warzone 2100 version 2.2.3\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-02-25 23:35+0100\n" +"POT-Creation-Date: 2011-03-08 15:43+0100\n" "PO-Revision-Date: \n" "Last-Translator: Меденцій Олександр \n" "Language-Team: \n" @@ -12046,26 +12046,26 @@ msgid "System locale" msgstr "Мова локалізації системи" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1042 +#: lib/netplay/netplay.cpp:1037 msgid "Enter password here" msgstr "Визначте Пароль" -#: lib/netplay/netplay.cpp:2060 +#: lib/netplay/netplay.cpp:2055 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "Неможливо отримати ім'я основного сервера (%s)!" -#: lib/netplay/netplay.cpp:2082 +#: lib/netplay/netplay.cpp:2077 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "Неможливо зв'язатись з сервером лоббі! Чи відкритий TCP порт %u для вихідного трафіку?" #: src/challenge.cpp:184 #: src/hci.cpp:916 -#: src/hci.cpp:3378 -#: src/hci.cpp:3501 -#: src/hci.cpp:3912 -#: src/hci.cpp:4930 +#: src/hci.cpp:3386 +#: src/hci.cpp:3509 +#: src/hci.cpp:3920 +#: src/hci.cpp:4938 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12372,7 +12372,7 @@ msgid "Player dropped" msgstr "Гравець здався" #: src/display3d.cpp:599 -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2121 msgid "Waiting for other players" msgstr "Чекаємо інших гравців" @@ -12385,7 +12385,7 @@ msgid "Cannot Build. Oil Resource Burning." msgstr "Будівництво Неможливе. Через пожежу на Нафтовому Родовищі" #: src/display.cpp:1828 -#: src/display.cpp:2421 +#: src/display.cpp:2420 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - Пошкоджень %d%% - Вбито %d, %s" @@ -12417,77 +12417,77 @@ msgstr "Втрачено Бойову Одиницю!" msgid "Structure Restored" msgstr "Будівлю Відновлено" -#: src/droid.cpp:2732 +#: src/droid.cpp:2734 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" msgstr[0] "Групу %u обрано - %u Підрозділ" msgstr[1] "Групу %u обрано - %u Підрозділів" -#: src/droid.cpp:2745 +#: src/droid.cpp:2747 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" msgstr[0] "%u підрозділ призначено у Групу %u" msgstr[1] "%u підрозділів призначено у Групу %u" -#: src/droid.cpp:2758 +#: src/droid.cpp:2760 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" msgstr[0] "Центр екрану на Групі %u - %u Підрозділ" msgstr[1] "Центр екрану на Групі %u - %u Підрозділів" -#: src/droid.cpp:2762 +#: src/droid.cpp:2764 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" msgstr[0] "Вирівнювання з Групою %u - %u Підрозділ" msgstr[1] "Вирівнювання з Групою %u - %u Підрозділів" -#: src/droid.cpp:3093 +#: src/droid.cpp:3095 msgid "Rookie" msgstr "Новобранець" -#: src/droid.cpp:3094 +#: src/droid.cpp:3096 msgctxt "rank" msgid "Green" msgstr "Зелений" -#: src/droid.cpp:3095 +#: src/droid.cpp:3097 msgid "Trained" msgstr "Рекрут" -#: src/droid.cpp:3096 +#: src/droid.cpp:3098 msgid "Regular" msgstr "Досвідчений" -#: src/droid.cpp:3097 +#: src/droid.cpp:3099 msgid "Professional" msgstr "Професіонал" -#: src/droid.cpp:3098 +#: src/droid.cpp:3100 msgid "Veteran" msgstr "Ветеран" -#: src/droid.cpp:3099 +#: src/droid.cpp:3101 msgid "Elite" msgstr "Елітний" -#: src/droid.cpp:3100 +#: src/droid.cpp:3102 msgid "Special" msgstr "Особливий" -#: src/droid.cpp:3101 +#: src/droid.cpp:3103 msgid "Hero" msgstr "Герой" -#: src/droid.cpp:4123 +#: src/droid.cpp:4125 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "" -#: src/droid.cpp:4127 +#: src/droid.cpp:4129 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "" @@ -12506,7 +12506,7 @@ msgid "Tutorial" msgstr "Навчання" #: src/frontend.cpp:100 -#: src/hci.cpp:3487 +#: src/hci.cpp:3495 msgid "Options" msgstr "Опції" @@ -12567,8 +12567,8 @@ msgstr "РЕЖИМ ОДНОГО ГРАВЦЯ" #: src/frontend.cpp:303 #: src/ingameop.cpp:494 -#: src/mission.cpp:2493 -#: src/mission.cpp:2596 +#: src/mission.cpp:2537 +#: src/mission.cpp:2640 msgid "Load Saved Game" msgstr "Завантажити Збережену Гру" @@ -12853,7 +12853,7 @@ msgid "GAME OPTIONS" msgstr "ІГРОВІ ОПЦІЇ" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2398 +#: src/multiint.cpp:2394 msgid "Mod: " msgstr ", моди: " @@ -12862,8 +12862,8 @@ msgid "MAP SAVED!" msgstr "МАПУ ЗБЕРЕЖЕНО!" #: src/hci.cpp:1573 -#: src/loop.cpp:558 -#: src/loop.cpp:574 +#: src/loop.cpp:561 +#: src/loop.cpp:577 msgid "GAME SAVED: " msgstr "ГРУ ЗБЕРЕЖЕНО:" @@ -12891,155 +12891,155 @@ msgstr "Гравець %u за допомогою шахрайства (меню msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "Гравець %u за допомогою шахрайства (меню налагодження) здобув(ла) нову одиницю : %s." -#: src/hci.cpp:3298 +#: src/hci.cpp:3306 msgid "Commanders (F6)" msgstr "Командири (F6)" -#: src/hci.cpp:3311 +#: src/hci.cpp:3319 msgid "Intelligence Display (F5)" msgstr "Показати Розвіддані (F5)" -#: src/hci.cpp:3324 +#: src/hci.cpp:3332 msgid "Manufacture (F1)" msgstr "Виробництво (F1)" -#: src/hci.cpp:3337 +#: src/hci.cpp:3345 msgid "Design (F4)" msgstr "Конструювання (F4)" -#: src/hci.cpp:3350 +#: src/hci.cpp:3358 msgid "Research (F2)" msgstr "Дослідження (F2)" -#: src/hci.cpp:3363 +#: src/hci.cpp:3371 msgid "Build (F3)" msgstr "Будівництво (F3)" -#: src/hci.cpp:3434 +#: src/hci.cpp:3442 #: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "Енергія" -#: src/hci.cpp:3525 +#: src/hci.cpp:3533 msgid "Map:" msgstr "" -#: src/hci.cpp:3538 +#: src/hci.cpp:3546 #, fuzzy msgid "Load" msgstr "Завнтажити Гру" -#: src/hci.cpp:3539 +#: src/hci.cpp:3547 #, fuzzy msgid "Load Map File" msgstr "Завнтажити Гру" -#: src/hci.cpp:3546 +#: src/hci.cpp:3554 #, fuzzy msgid "Save" msgstr "Зберегти Гру" -#: src/hci.cpp:3547 +#: src/hci.cpp:3555 #, fuzzy msgid "Save Map File" msgstr "Зберегти Гру" -#: src/hci.cpp:3555 +#: src/hci.cpp:3563 msgid "New" msgstr "" -#: src/hci.cpp:3556 +#: src/hci.cpp:3564 msgid "New Blank Map" msgstr "" -#: src/hci.cpp:3592 +#: src/hci.cpp:3600 msgid "Tile" msgstr "Клітинка" -#: src/hci.cpp:3593 +#: src/hci.cpp:3601 msgid "Place tiles on map" msgstr "Розмістити клітинки на мапі" -#: src/hci.cpp:3602 +#: src/hci.cpp:3610 msgid "Unit" msgstr "Підрозділ" -#: src/hci.cpp:3603 +#: src/hci.cpp:3611 msgid "Place Unit on map" msgstr "Розмістити Підрозділ на мапі" -#: src/hci.cpp:3611 +#: src/hci.cpp:3619 msgid "Struct" msgstr "Struct" -#: src/hci.cpp:3612 +#: src/hci.cpp:3620 msgid "Place Structures on map" msgstr "Розмістити Будівлі на мапі" -#: src/hci.cpp:3620 +#: src/hci.cpp:3628 msgid "Feat" msgstr "Feat" -#: src/hci.cpp:3621 +#: src/hci.cpp:3629 msgid "Place Features on map" msgstr "Розмістити Особливості на мапі" -#: src/hci.cpp:3631 +#: src/hci.cpp:3639 msgid "Pause" msgstr "" -#: src/hci.cpp:3632 +#: src/hci.cpp:3640 msgid "Pause or unpause the game" msgstr "Поставити гру на паузу, або зняти з паузи" -#: src/hci.cpp:3646 +#: src/hci.cpp:3654 msgid "Align height of all map objects" msgstr "Вирівняти висоту усіх об'єктів на мапі" -#: src/hci.cpp:3656 +#: src/hci.cpp:3664 msgid "Edit" msgstr "" -#: src/hci.cpp:3657 +#: src/hci.cpp:3665 #, fuzzy msgid "Start Edit Mode" msgstr "Старт без Баз" -#: src/hci.cpp:3671 +#: src/hci.cpp:3679 #: src/ingameop.cpp:112 #: src/ingameop.cpp:256 #: src/ingameop.cpp:260 msgid "Quit" msgstr "Вийти" -#: src/hci.cpp:3672 +#: src/hci.cpp:3680 msgid "Exit Game" msgstr "Покинути Гру" -#: src/hci.cpp:3698 +#: src/hci.cpp:3706 #, fuzzy msgid "Current Player:" msgstr "Кілька Гравців" -#: src/hci.cpp:3989 +#: src/hci.cpp:3997 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "Індикатор Прогресу" -#: src/hci.cpp:4855 +#: src/hci.cpp:4863 msgid "Factory Delivery Point" msgstr "Точка Доставки Фабрики" -#: src/hci.cpp:4873 +#: src/hci.cpp:4881 msgid "Loop Production" msgstr "Зациклити Виробництво" -#: src/hci.cpp:4953 +#: src/hci.cpp:4961 msgid "Tab Scroll left" msgstr "Прогорнути Вкладку ліворуч" -#: src/hci.cpp:4968 +#: src/hci.cpp:4976 msgid "Tab Scroll right" msgstr "Прогорнути Вкладку праворуч" @@ -13067,8 +13067,8 @@ msgstr "Тактична UI (Іконка Походження Цілі): При #: src/ingameop.cpp:274 #: src/ingameop.cpp:498 -#: src/mission.cpp:2480 -#: src/mission.cpp:2599 +#: src/mission.cpp:2524 +#: src/mission.cpp:2643 msgid "Save Game" msgstr "Зберегти Гру" @@ -14018,42 +14018,42 @@ msgstr "" msgid "Toggle Driving Mode" msgstr "Задіяти Відслідковувальну Камеру" -#: src/loop.cpp:565 -#: src/loop.cpp:581 +#: src/loop.cpp:568 +#: src/loop.cpp:584 msgid "Could not save game!" msgstr "Не вдалося зберегти гру!" -#: src/mission.cpp:2041 +#: src/mission.cpp:2085 msgid "Load Transport" msgstr "Завантажити Транспорт" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "ЗАВДАННЯ ВИКОНАНО за допомогою шахрайства!" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED" msgstr "ЗАВДАННЯ ВИКОНАНО" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED--and you cheated!" msgstr "ЗАВДАННЯ ПРОВАЛЕНЕ--шахрайство вам не допомогло!" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED" msgstr "ЗАВДАННЯ ПРОВАЛЕНЕ" -#: src/mission.cpp:2459 -#: src/mission.cpp:2499 -#: src/mission.cpp:2613 +#: src/mission.cpp:2503 +#: src/mission.cpp:2543 +#: src/mission.cpp:2657 msgid "Quit To Main Menu" msgstr "Вийти В Головне Меню" -#: src/mission.cpp:2467 +#: src/mission.cpp:2511 msgid "Continue Game" msgstr "Продовжити Гру" -#: src/mission.cpp:2564 +#: src/mission.cpp:2608 msgid "GAME SAVED :" msgstr "ГРУ ЗБЕРЕЖЕНО:" @@ -14343,117 +14343,113 @@ msgstr "" msgid "Player colour" msgstr "Колір гравця" -#: src/multiint.cpp:2071 +#: src/multiint.cpp:2068 msgid "Team" msgstr "Команда" -#: src/multiint.cpp:2083 -msgid "Kick player" -msgstr "Викинути гравця" - -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 #, fuzzy msgid "Click to change difficulty" msgstr "Натисніть аби встановити Пароль" -#: src/multiint.cpp:2130 +#: src/multiint.cpp:2126 msgid "Click when ready" msgstr "Натисни, коли готовий" -#: src/multiint.cpp:2134 +#: src/multiint.cpp:2130 msgid "READY?" msgstr "ГОТОВІ?" -#: src/multiint.cpp:2178 +#: src/multiint.cpp:2174 msgid "PLAYERS" msgstr "ГРАВЦІ" -#: src/multiint.cpp:2213 +#: src/multiint.cpp:2209 #, fuzzy msgid "Click to change to this slot" msgstr "Натисніть аби встановити Пароль" -#: src/multiint.cpp:2241 +#: src/multiint.cpp:2237 #, fuzzy msgid "Choose Team" msgstr "Закріплені Команди" -#: src/multiint.cpp:2271 +#: src/multiint.cpp:2267 #, fuzzy msgid "Click to change player colour" msgstr "Радар показує кольори гравців" -#: src/multiint.cpp:2299 +#: src/multiint.cpp:2295 #, fuzzy msgid "Click to change player position" msgstr "Охороняти Позицію" -#: src/multiint.cpp:2305 +#: src/multiint.cpp:2301 #, fuzzy msgid "Click to change AI" msgstr "Натисніть аби встановити Пароль" -#: src/multiint.cpp:2309 +#: src/multiint.cpp:2305 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2371 +#: src/multiint.cpp:2367 msgid "CHAT" msgstr "ЧАТ" -#: src/multiint.cpp:2403 +#: src/multiint.cpp:2399 msgid "All players need to have the same mods to join your game." msgstr "Всі гравці повинні мати однакові моди щоб приєднатись до гри." -#: src/multiint.cpp:2561 +#: src/multiint.cpp:2557 #, fuzzy, c-format msgid "*** password [%s] is now required! ***" msgstr "*** зараз потрібен пароль! ***" -#: src/multiint.cpp:2569 +#: src/multiint.cpp:2565 msgid "*** password is NOT required! ***" msgstr "*** пароль НЕ потрібен! ***" -#: src/multiint.cpp:2810 +#: src/multiint.cpp:2806 msgid "Sorry! Failed to host the game." msgstr "Вибачте! Не далося створити гру." -#: src/multiint.cpp:2931 +#: src/multiint.cpp:2927 msgid "'Locked Teams' mode enabled" msgstr "'Закріплені Команди' режим активовано" -#: src/multiint.cpp:3012 +#: src/multiint.cpp:3008 #, c-format msgid "The host has kicked %s from the game!" msgstr "Хост викинув %s з гри!" -#: src/multiint.cpp:3082 +#: src/multiint.cpp:3078 msgid "Host is Starting Game" msgstr "Хост Починає Гру" -#: src/multiint.cpp:3648 +#: src/multiint.cpp:3644 msgid "Players" msgstr "Гравці" -#: src/multiint.cpp:3786 +#: src/multiint.cpp:3782 #, c-format msgid "Sending Map: %d%% " msgstr "Відправляється Карта: %d%% " -#: src/multiint.cpp:3794 +#: src/multiint.cpp:3790 #, c-format msgid "Map: %d%% downloaded" msgstr "Мапа: %d%% завантажена" -#: src/multiint.cpp:3820 +#: src/multiint.cpp:3816 msgid "HOST" msgstr "ХОСТ" -#: src/multiint.cpp:3827 +#: src/multiint.cpp:3823 #: src/multimenu.cpp:772 msgid "Ping" msgstr "Пінг" @@ -14629,79 +14625,79 @@ msgstr "Надати Енергію Гравцю" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "Викидуємо гравця %s, тому що він намагався обійти перевірку цілісності даних!" -#: src/multiplay.cpp:1057 +#: src/multiplay.cpp:1056 msgid "(allies" msgstr "(союзники" -#: src/multiplay.cpp:1065 +#: src/multiplay.cpp:1064 msgid "(private to " msgstr "(приватно до" -#: src/multiplay.cpp:1078 +#: src/multiplay.cpp:1077 msgid "[invalid]" msgstr "[невірний]" -#: src/multiplay.cpp:1942 +#: src/multiplay.cpp:1941 msgid "Green" msgstr "Зелений" -#: src/multiplay.cpp:1943 +#: src/multiplay.cpp:1942 msgid "Orange" msgstr "Помаранчовий" -#: src/multiplay.cpp:1944 +#: src/multiplay.cpp:1943 msgid "Grey" msgstr "Сірий" -#: src/multiplay.cpp:1945 +#: src/multiplay.cpp:1944 msgid "Black" msgstr "Чорний" -#: src/multiplay.cpp:1946 +#: src/multiplay.cpp:1945 msgid "Red" msgstr "Червоний" -#: src/multiplay.cpp:1947 +#: src/multiplay.cpp:1946 msgid "Blue" msgstr "Синій" -#: src/multiplay.cpp:1948 +#: src/multiplay.cpp:1947 msgid "Pink" msgstr "Рожевий" -#: src/multiplay.cpp:1949 +#: src/multiplay.cpp:1948 msgid "Cyan" msgstr "Блакитний" -#: src/multiplay.cpp:1950 +#: src/multiplay.cpp:1949 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:1951 +#: src/multiplay.cpp:1950 msgid "Purple" msgstr "" -#: src/multiplay.cpp:1952 +#: src/multiplay.cpp:1951 msgid "White" msgstr "" -#: src/multiplay.cpp:1953 +#: src/multiplay.cpp:1952 msgid "Bright blue" msgstr "" -#: src/multiplay.cpp:1954 +#: src/multiplay.cpp:1953 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:1955 +#: src/multiplay.cpp:1954 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:1956 +#: src/multiplay.cpp:1955 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:1957 +#: src/multiplay.cpp:1956 msgid "Brown" msgstr "" @@ -14709,16 +14705,16 @@ msgstr "" msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "" -#: src/research.cpp:1737 +#: src/research.cpp:1739 #, c-format msgid "Research completed: %s" msgstr "Дослідження Завершено: %s" -#: src/research.cpp:1742 +#: src/research.cpp:1744 msgid "Research Completed" msgstr "Дослідження Завершено" -#: src/research.cpp:2563 +#: src/research.cpp:2565 msgid "Research Award" msgstr "Винагорода Досліджень" @@ -14882,63 +14878,63 @@ msgstr "Не можу знайти жодного Сенсорного Підр msgid "Unable to locate any Commanders!" msgstr "Не можу знайти жодного Командира!" -#: src/structure.cpp:2614 +#: src/structure.cpp:2650 #, fuzzy msgid "Command Control Limit Reached - Production Halted" msgstr "Досягнуто Межі Контролю - Виробництво Призупинене" -#: src/structure.cpp:5806 -#: src/structure.cpp:5831 +#: src/structure.cpp:5888 +#: src/structure.cpp:5913 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" msgstr[0] "%s - %u Підрозділ закріплено" msgstr[1] "%s - %u Підрозділи закріплено" -#: src/structure.cpp:5836 -#: src/structure.cpp:5904 -#: src/structure.cpp:5920 -#: src/structure.cpp:5934 +#: src/structure.cpp:5918 +#: src/structure.cpp:5986 +#: src/structure.cpp:6002 +#: src/structure.cpp:6016 #, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - Пошкоджено %3.0f%%" -#: src/structure.cpp:5886 +#: src/structure.cpp:5968 #, c-format msgid "%s - Connected %u of %u" msgstr "%s - Під'єднано %u з %u" -#: src/structure.cpp:6050 -#: src/structure.cpp:6095 +#: src/structure.cpp:6132 +#: src/structure.cpp:6177 #, c-format msgid "%s - Electronically Damaged" msgstr "%s - Електронних Ушкоджень" -#: src/structure.cpp:6332 +#: src/structure.cpp:6414 msgid "Electronic Reward - Visibility Report" msgstr "Електронна Винагорода - Звіт про Зону Видимості" -#: src/structure.cpp:6372 +#: src/structure.cpp:6454 msgid "Factory Reward - Propulsion" msgstr "Винагорода Фабрики - Ходова" -#: src/structure.cpp:6396 +#: src/structure.cpp:6478 msgid "Factory Reward - Body" msgstr "Винагорода Фабрики - Корпус" -#: src/structure.cpp:6420 +#: src/structure.cpp:6502 msgid "Factory Reward - Weapon" msgstr "Винагорода Фабрики - Озброєння" -#: src/structure.cpp:6429 +#: src/structure.cpp:6511 msgid "Factory Reward - Nothing" msgstr "Винагорода Фабрики - Нічого" -#: src/structure.cpp:6457 +#: src/structure.cpp:6539 msgid "Repair Facility Award - Repair" msgstr "Винагорода Ремонтної Майстерні - Ремонт" -#: src/structure.cpp:6464 +#: src/structure.cpp:6546 msgid "Repair Facility Award - Nothing" msgstr "Винагорода Ремонтної Майстерні - Нічого" @@ -14955,34 +14951,35 @@ msgstr "" msgid "Reinforcements landing" msgstr "Висаджується Підкріплення." -#: src/version.cpp:143 -msgid " (modified and switched locally)" -msgstr " (редагується та перемикається локально)" - -#: src/version.cpp:145 +#: src/version.cpp:129 msgid " (modified locally)" msgstr " (редагується локально)" -#: src/version.cpp:147 -msgid " (switched locally)" -msgstr " (перемикається локально)" - -#: src/version.cpp:154 +#: src/version.cpp:136 msgid " - DEBUG" msgstr " - НАЛАГОДЖЕННЯ " -#: src/version.cpp:163 +#: src/version.cpp:145 #, c-format msgid " - Built %s" msgstr " - Збудовано %s" #. TRANSLATORS: This string looks as follows when expanded. #. "Version " -#: src/version.cpp:173 +#: src/version.cpp:155 #, c-format msgid "Version %s%s%s%s" msgstr "Версія %s%s%s%s" +#~ msgid "Kick player" +#~ msgstr "Викинути гравця" + +#~ msgid " (modified and switched locally)" +#~ msgstr " (редагується та перемикається локально)" + +#~ msgid " (switched locally)" +#~ msgstr " (перемикається локально)" + #, fuzzy #~ msgid "Infinite Production" #~ msgstr "Зациклити Виробництво" diff --git a/po/zh_CN.po b/po/zh_CN.po index ed3f8aa70..3c73eb7ac 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-02-25 23:35+0100\n" +"POT-Creation-Date: 2011-03-08 15:43+0100\n" "PO-Revision-Date: 2009-05-13 16:12+0800\n" "Last-Translator: Terra \n" "Language-Team: Simplified Chinese \n" @@ -12149,26 +12149,26 @@ msgid "System locale" msgstr "系统语言" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1042 +#: lib/netplay/netplay.cpp:1037 msgid "Enter password here" msgstr "" -#: lib/netplay/netplay.cpp:2060 +#: lib/netplay/netplay.cpp:2055 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "" -#: lib/netplay/netplay.cpp:2082 +#: lib/netplay/netplay.cpp:2077 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "" #: src/challenge.cpp:184 #: src/hci.cpp:916 -#: src/hci.cpp:3378 -#: src/hci.cpp:3501 -#: src/hci.cpp:3912 -#: src/hci.cpp:4930 +#: src/hci.cpp:3386 +#: src/hci.cpp:3509 +#: src/hci.cpp:3920 +#: src/hci.cpp:4938 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12478,7 +12478,7 @@ msgid "Player dropped" msgstr "玩家" #: src/display3d.cpp:599 -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2121 msgid "Waiting for other players" msgstr "等待其他玩家" @@ -12491,7 +12491,7 @@ msgid "Cannot Build. Oil Resource Burning." msgstr "油井在燃烧, 无法建造钻油塔" #: src/display.cpp:1828 -#: src/display.cpp:2421 +#: src/display.cpp:2420 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - 损伤 %d%% - 经验 %d, %s" @@ -12523,78 +12523,78 @@ msgstr "单位被摧毁! " msgid "Structure Restored" msgstr "重建建筑物" -#: src/droid.cpp:2732 +#: src/droid.cpp:2734 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" msgstr[0] "已选择 %u 号编队 - %u 单位" -#: src/droid.cpp:2745 +#: src/droid.cpp:2747 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" msgstr[0] "%u 单位已指派为 %u 号编队" -#: src/droid.cpp:2758 +#: src/droid.cpp:2760 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" msgstr[0] "移动视野中心到 %u 号编队 - %u 单位" -#: src/droid.cpp:2762 +#: src/droid.cpp:2764 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" msgstr[0] "" msgstr[1] "" -#: src/droid.cpp:3093 +#: src/droid.cpp:3095 #, fuzzy msgid "Rookie" msgstr "新兵部队: %u" -#: src/droid.cpp:3094 +#: src/droid.cpp:3096 #, fuzzy msgctxt "rank" msgid "Green" msgstr "绿色" -#: src/droid.cpp:3095 +#: src/droid.cpp:3097 #, fuzzy msgid "Trained" msgstr "作训部队: %u" -#: src/droid.cpp:3096 +#: src/droid.cpp:3098 #, fuzzy msgid "Regular" msgstr "标准部队: %u" -#: src/droid.cpp:3097 +#: src/droid.cpp:3099 msgid "Professional" msgstr "专业部队" -#: src/droid.cpp:3098 +#: src/droid.cpp:3100 msgid "Veteran" msgstr "老兵部队" -#: src/droid.cpp:3099 +#: src/droid.cpp:3101 msgid "Elite" msgstr "精锐部队" -#: src/droid.cpp:3100 +#: src/droid.cpp:3102 msgid "Special" msgstr "特种部队" -#: src/droid.cpp:3101 +#: src/droid.cpp:3103 msgid "Hero" msgstr "英雄部队" -#: src/droid.cpp:4123 +#: src/droid.cpp:4125 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "" -#: src/droid.cpp:4127 +#: src/droid.cpp:4129 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "" @@ -12613,7 +12613,7 @@ msgid "Tutorial" msgstr "游戏教程" #: src/frontend.cpp:100 -#: src/hci.cpp:3487 +#: src/hci.cpp:3495 msgid "Options" msgstr "选项设置" @@ -12675,8 +12675,8 @@ msgstr "单人游戏" #: src/frontend.cpp:303 #: src/ingameop.cpp:494 -#: src/mission.cpp:2493 -#: src/mission.cpp:2596 +#: src/mission.cpp:2537 +#: src/mission.cpp:2640 msgid "Load Saved Game" msgstr "载入游戏" @@ -12966,7 +12966,7 @@ msgid "GAME OPTIONS" msgstr "游戏选项" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2398 +#: src/multiint.cpp:2394 msgid "Mod: " msgstr "" @@ -12976,8 +12976,8 @@ msgid "MAP SAVED!" msgstr "游戏已保存! " #: src/hci.cpp:1573 -#: src/loop.cpp:558 -#: src/loop.cpp:574 +#: src/loop.cpp:561 +#: src/loop.cpp:577 #, fuzzy msgid "GAME SAVED: " msgstr "游戏已保存! " @@ -13006,156 +13006,156 @@ msgstr "" msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "" -#: src/hci.cpp:3298 +#: src/hci.cpp:3306 msgid "Commanders (F6)" msgstr "指挥官 (F6)" -#: src/hci.cpp:3311 +#: src/hci.cpp:3319 msgid "Intelligence Display (F5)" msgstr "情报显示 (F5)" -#: src/hci.cpp:3324 +#: src/hci.cpp:3332 msgid "Manufacture (F1)" msgstr "单位生产 (F1)" -#: src/hci.cpp:3337 +#: src/hci.cpp:3345 msgid "Design (F4)" msgstr "单位设计 (F4)" -#: src/hci.cpp:3350 +#: src/hci.cpp:3358 msgid "Research (F2)" msgstr "科技研究 (F2)" -#: src/hci.cpp:3363 +#: src/hci.cpp:3371 msgid "Build (F3)" msgstr "建造建筑 (F3)" -#: src/hci.cpp:3434 +#: src/hci.cpp:3442 #: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "能源" -#: src/hci.cpp:3525 +#: src/hci.cpp:3533 msgid "Map:" msgstr "" -#: src/hci.cpp:3538 +#: src/hci.cpp:3546 #, fuzzy msgid "Load" msgstr "载入游戏" -#: src/hci.cpp:3539 +#: src/hci.cpp:3547 #, fuzzy msgid "Load Map File" msgstr "载入游戏" -#: src/hci.cpp:3546 +#: src/hci.cpp:3554 #, fuzzy msgid "Save" msgstr "保存游戏" -#: src/hci.cpp:3547 +#: src/hci.cpp:3555 #, fuzzy msgid "Save Map File" msgstr "保存游戏" -#: src/hci.cpp:3555 +#: src/hci.cpp:3563 msgid "New" msgstr "" -#: src/hci.cpp:3556 +#: src/hci.cpp:3564 msgid "New Blank Map" msgstr "" -#: src/hci.cpp:3592 +#: src/hci.cpp:3600 msgid "Tile" msgstr "" -#: src/hci.cpp:3593 +#: src/hci.cpp:3601 msgid "Place tiles on map" msgstr "" -#: src/hci.cpp:3602 +#: src/hci.cpp:3610 msgid "Unit" msgstr "单位" -#: src/hci.cpp:3603 +#: src/hci.cpp:3611 msgid "Place Unit on map" msgstr "" -#: src/hci.cpp:3611 +#: src/hci.cpp:3619 msgid "Struct" msgstr "" -#: src/hci.cpp:3612 +#: src/hci.cpp:3620 msgid "Place Structures on map" msgstr "" -#: src/hci.cpp:3620 +#: src/hci.cpp:3628 msgid "Feat" msgstr "" -#: src/hci.cpp:3621 +#: src/hci.cpp:3629 msgid "Place Features on map" msgstr "" -#: src/hci.cpp:3631 +#: src/hci.cpp:3639 msgid "Pause" msgstr "" -#: src/hci.cpp:3632 +#: src/hci.cpp:3640 #, fuzzy msgid "Pause or unpause the game" msgstr "暂停/继续游戏" -#: src/hci.cpp:3646 +#: src/hci.cpp:3654 msgid "Align height of all map objects" msgstr "" -#: src/hci.cpp:3656 +#: src/hci.cpp:3664 msgid "Edit" msgstr "" -#: src/hci.cpp:3657 +#: src/hci.cpp:3665 #, fuzzy msgid "Start Edit Mode" msgstr "开始时没有基地" -#: src/hci.cpp:3671 +#: src/hci.cpp:3679 #: src/ingameop.cpp:112 #: src/ingameop.cpp:256 #: src/ingameop.cpp:260 msgid "Quit" msgstr "退出" -#: src/hci.cpp:3672 +#: src/hci.cpp:3680 msgid "Exit Game" msgstr "退出游戏" -#: src/hci.cpp:3698 +#: src/hci.cpp:3706 #, fuzzy msgid "Current Player:" msgstr "多人游戏" -#: src/hci.cpp:3989 +#: src/hci.cpp:3997 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "进度条" -#: src/hci.cpp:4855 +#: src/hci.cpp:4863 msgid "Factory Delivery Point" msgstr "" -#: src/hci.cpp:4873 +#: src/hci.cpp:4881 msgid "Loop Production" msgstr "循环生产" -#: src/hci.cpp:4953 +#: src/hci.cpp:4961 msgid "Tab Scroll left" msgstr "" -#: src/hci.cpp:4968 +#: src/hci.cpp:4976 msgid "Tab Scroll right" msgstr "" @@ -13181,8 +13181,8 @@ msgstr "" #: src/ingameop.cpp:274 #: src/ingameop.cpp:498 -#: src/mission.cpp:2480 -#: src/mission.cpp:2599 +#: src/mission.cpp:2524 +#: src/mission.cpp:2643 msgid "Save Game" msgstr "保存游戏" @@ -14120,45 +14120,45 @@ msgstr "" msgid "Toggle Driving Mode" msgstr "" -#: src/loop.cpp:565 -#: src/loop.cpp:581 +#: src/loop.cpp:568 +#: src/loop.cpp:584 #, fuzzy msgid "Could not save game!" msgstr "载入游戏" -#: src/mission.cpp:2041 +#: src/mission.cpp:2085 msgid "Load Transport" msgstr "登陆运输飞船" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 #, fuzzy msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "任务目标完成" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED" msgstr "任务目标完成" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 #, fuzzy msgid "OBJECTIVE FAILED--and you cheated!" msgstr "任务目标失败" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED" msgstr "任务目标失败" -#: src/mission.cpp:2459 -#: src/mission.cpp:2499 -#: src/mission.cpp:2613 +#: src/mission.cpp:2503 +#: src/mission.cpp:2543 +#: src/mission.cpp:2657 msgid "Quit To Main Menu" msgstr "退回到主菜单" -#: src/mission.cpp:2467 +#: src/mission.cpp:2511 msgid "Continue Game" msgstr "继续游戏" -#: src/mission.cpp:2564 +#: src/mission.cpp:2608 #, fuzzy msgid "GAME SAVED :" msgstr "游戏已保存! " @@ -14454,118 +14454,113 @@ msgstr "" msgid "Player colour" msgstr "玩家" -#: src/multiint.cpp:2071 +#: src/multiint.cpp:2068 msgid "Team" msgstr "团队" -#: src/multiint.cpp:2083 -#, fuzzy -msgid "Kick player" -msgstr "2个玩家" - -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 #, fuzzy msgid "Click to change difficulty" msgstr "点击查看地图" -#: src/multiint.cpp:2130 +#: src/multiint.cpp:2126 msgid "Click when ready" msgstr "点击准备开始游戏" -#: src/multiint.cpp:2134 +#: src/multiint.cpp:2130 msgid "READY?" msgstr "" -#: src/multiint.cpp:2178 +#: src/multiint.cpp:2174 msgid "PLAYERS" msgstr "玩家" -#: src/multiint.cpp:2213 +#: src/multiint.cpp:2209 #, fuzzy msgid "Click to change to this slot" msgstr "点击查看地图" -#: src/multiint.cpp:2241 +#: src/multiint.cpp:2237 #, fuzzy msgid "Choose Team" msgstr "已锁定团队" -#: src/multiint.cpp:2271 +#: src/multiint.cpp:2267 msgid "Click to change player colour" msgstr "" -#: src/multiint.cpp:2299 +#: src/multiint.cpp:2295 #, fuzzy msgid "Click to change player position" msgstr "保护" -#: src/multiint.cpp:2305 +#: src/multiint.cpp:2301 #, fuzzy msgid "Click to change AI" msgstr "点击查看地图" -#: src/multiint.cpp:2309 +#: src/multiint.cpp:2305 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2371 +#: src/multiint.cpp:2367 msgid "CHAT" msgstr "聊天" -#: src/multiint.cpp:2403 +#: src/multiint.cpp:2399 msgid "All players need to have the same mods to join your game." msgstr "" -#: src/multiint.cpp:2561 +#: src/multiint.cpp:2557 #, c-format msgid "*** password [%s] is now required! ***" msgstr "" -#: src/multiint.cpp:2569 +#: src/multiint.cpp:2565 msgid "*** password is NOT required! ***" msgstr "" -#: src/multiint.cpp:2810 +#: src/multiint.cpp:2806 msgid "Sorry! Failed to host the game." msgstr "" -#: src/multiint.cpp:2931 +#: src/multiint.cpp:2927 #, fuzzy msgid "'Locked Teams' mode enabled" msgstr "已锁定团队" -#: src/multiint.cpp:3012 +#: src/multiint.cpp:3008 #, c-format msgid "The host has kicked %s from the game!" msgstr "主玩家将 %s 踢出游戏!" -#: src/multiint.cpp:3082 +#: src/multiint.cpp:3078 msgid "Host is Starting Game" msgstr "主玩家正在开始游戏" -#: src/multiint.cpp:3648 +#: src/multiint.cpp:3644 msgid "Players" msgstr "玩家" -#: src/multiint.cpp:3786 +#: src/multiint.cpp:3782 #, c-format msgid "Sending Map: %d%% " msgstr "" -#: src/multiint.cpp:3794 +#: src/multiint.cpp:3790 #, c-format msgid "Map: %d%% downloaded" msgstr "" -#: src/multiint.cpp:3820 +#: src/multiint.cpp:3816 msgid "HOST" msgstr "" -#: src/multiint.cpp:3827 +#: src/multiint.cpp:3823 #: src/multimenu.cpp:772 msgid "Ping" msgstr "" @@ -14745,80 +14740,80 @@ msgstr "" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "" -#: src/multiplay.cpp:1057 +#: src/multiplay.cpp:1056 #, fuzzy msgid "(allies" msgstr "同盟" -#: src/multiplay.cpp:1065 +#: src/multiplay.cpp:1064 msgid "(private to " msgstr "" -#: src/multiplay.cpp:1078 +#: src/multiplay.cpp:1077 msgid "[invalid]" msgstr "" -#: src/multiplay.cpp:1942 +#: src/multiplay.cpp:1941 msgid "Green" msgstr "绿色" -#: src/multiplay.cpp:1943 +#: src/multiplay.cpp:1942 msgid "Orange" msgstr "橙色" -#: src/multiplay.cpp:1944 +#: src/multiplay.cpp:1943 msgid "Grey" msgstr "灰色" -#: src/multiplay.cpp:1945 +#: src/multiplay.cpp:1944 msgid "Black" msgstr "黑色" -#: src/multiplay.cpp:1946 +#: src/multiplay.cpp:1945 msgid "Red" msgstr "红色" -#: src/multiplay.cpp:1947 +#: src/multiplay.cpp:1946 msgid "Blue" msgstr "蓝色" -#: src/multiplay.cpp:1948 +#: src/multiplay.cpp:1947 msgid "Pink" msgstr "粉红色" -#: src/multiplay.cpp:1949 +#: src/multiplay.cpp:1948 msgid "Cyan" msgstr "青绿色" -#: src/multiplay.cpp:1950 +#: src/multiplay.cpp:1949 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:1951 +#: src/multiplay.cpp:1950 msgid "Purple" msgstr "" -#: src/multiplay.cpp:1952 +#: src/multiplay.cpp:1951 msgid "White" msgstr "" -#: src/multiplay.cpp:1953 +#: src/multiplay.cpp:1952 msgid "Bright blue" msgstr "" -#: src/multiplay.cpp:1954 +#: src/multiplay.cpp:1953 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:1955 +#: src/multiplay.cpp:1954 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:1956 +#: src/multiplay.cpp:1955 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:1957 +#: src/multiplay.cpp:1956 msgid "Brown" msgstr "" @@ -14826,16 +14821,16 @@ msgstr "" msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "" -#: src/research.cpp:1737 +#: src/research.cpp:1739 #, c-format msgid "Research completed: %s" msgstr "科技研发已完成: %s" -#: src/research.cpp:1742 +#: src/research.cpp:1744 msgid "Research Completed" msgstr "研究已完成" -#: src/research.cpp:2563 +#: src/research.cpp:2565 msgid "Research Award" msgstr "科技研发中心" @@ -14998,61 +14993,61 @@ msgstr "" msgid "Unable to locate any Commanders!" msgstr "未能定位任何指挥官" -#: src/structure.cpp:2614 +#: src/structure.cpp:2650 msgid "Command Control Limit Reached - Production Halted" msgstr "已达到可控制单位总数上限 - 停止生产新单位" -#: src/structure.cpp:5806 -#: src/structure.cpp:5831 +#: src/structure.cpp:5888 +#: src/structure.cpp:5913 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" msgstr[0] "%s - 已指派 %u 单位" -#: src/structure.cpp:5836 -#: src/structure.cpp:5904 -#: src/structure.cpp:5920 -#: src/structure.cpp:5934 +#: src/structure.cpp:5918 +#: src/structure.cpp:5986 +#: src/structure.cpp:6002 +#: src/structure.cpp:6016 #, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - 损伤 %3.0f%%" -#: src/structure.cpp:5886 +#: src/structure.cpp:5968 #, c-format msgid "%s - Connected %u of %u" msgstr "" -#: src/structure.cpp:6050 -#: src/structure.cpp:6095 +#: src/structure.cpp:6132 +#: src/structure.cpp:6177 #, c-format msgid "%s - Electronically Damaged" msgstr "%s - 电子伤害" -#: src/structure.cpp:6332 +#: src/structure.cpp:6414 msgid "Electronic Reward - Visibility Report" msgstr "" -#: src/structure.cpp:6372 +#: src/structure.cpp:6454 msgid "Factory Reward - Propulsion" msgstr "" -#: src/structure.cpp:6396 +#: src/structure.cpp:6478 msgid "Factory Reward - Body" msgstr "" -#: src/structure.cpp:6420 +#: src/structure.cpp:6502 msgid "Factory Reward - Weapon" msgstr "" -#: src/structure.cpp:6429 +#: src/structure.cpp:6511 msgid "Factory Reward - Nothing" msgstr "" -#: src/structure.cpp:6457 +#: src/structure.cpp:6539 msgid "Repair Facility Award - Repair" msgstr "" -#: src/structure.cpp:6464 +#: src/structure.cpp:6546 msgid "Repair Facility Award - Nothing" msgstr "" @@ -15069,34 +15064,30 @@ msgstr "" msgid "Reinforcements landing" msgstr "" -#: src/version.cpp:143 -msgid " (modified and switched locally)" -msgstr "" - -#: src/version.cpp:145 +#: src/version.cpp:129 msgid " (modified locally)" msgstr "" -#: src/version.cpp:147 -msgid " (switched locally)" -msgstr "" - -#: src/version.cpp:154 +#: src/version.cpp:136 msgid " - DEBUG" msgstr "" -#: src/version.cpp:163 +#: src/version.cpp:145 #, c-format msgid " - Built %s" msgstr "" #. TRANSLATORS: This string looks as follows when expanded. #. "Version " -#: src/version.cpp:173 +#: src/version.cpp:155 #, c-format msgid "Version %s%s%s%s" msgstr "" +#, fuzzy +#~ msgid "Kick player" +#~ msgstr "2个玩家" + #, fuzzy #~ msgid "Infinite Production" #~ msgstr "循环生产" diff --git a/po/zh_TW.po b/po/zh_TW.po index 515e621e6..ceed1a1e8 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: warzone2100\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2011-02-25 23:35+0100\n" +"POT-Creation-Date: 2011-03-08 15:43+0100\n" "PO-Revision-Date: 2009-05-11 00:21+0800\n" "Last-Translator: \n" "Language-Team: zh_TW\n" @@ -12202,26 +12202,26 @@ msgid "System locale" msgstr "系統語系" #: lib/netplay/netplay.cpp:203 -#: lib/netplay/netplay.cpp:1042 +#: lib/netplay/netplay.cpp:1037 msgid "Enter password here" msgstr "" -#: lib/netplay/netplay.cpp:2060 +#: lib/netplay/netplay.cpp:2055 #, c-format msgid "Could not resolve masterserver name (%s)!" msgstr "" -#: lib/netplay/netplay.cpp:2082 +#: lib/netplay/netplay.cpp:2077 #, c-format msgid "Could not communicate with lobby server! Is TCP port %u open for outgoing traffic?" msgstr "" #: src/challenge.cpp:184 #: src/hci.cpp:916 -#: src/hci.cpp:3378 -#: src/hci.cpp:3501 -#: src/hci.cpp:3912 -#: src/hci.cpp:4930 +#: src/hci.cpp:3386 +#: src/hci.cpp:3509 +#: src/hci.cpp:3920 +#: src/hci.cpp:4938 #: src/intelmap.cpp:531 #: src/intorder.cpp:727 #: src/loadsave.cpp:253 @@ -12530,7 +12530,7 @@ msgid "Player dropped" msgstr "玩家" #: src/display3d.cpp:599 -#: src/multiint.cpp:2125 +#: src/multiint.cpp:2121 msgid "Waiting for other players" msgstr "等待其他玩家" @@ -12543,7 +12543,7 @@ msgid "Cannot Build. Oil Resource Burning." msgstr "油田燃燒中，無法建築鑽油井" #: src/display.cpp:1828 -#: src/display.cpp:2421 +#: src/display.cpp:2420 #, c-format msgid "%s - Damage %d%% - Experience %d, %s" msgstr "%s - 損傷 %d%% - 經驗值 %d, %s" @@ -12575,73 +12575,73 @@ msgstr "損失單位！" msgid "Structure Restored" msgstr "建築物重建" -#: src/droid.cpp:2732 +#: src/droid.cpp:2734 #, c-format msgid "Group %u selected - %u Unit" msgid_plural "Group %u selected - %u Units" msgstr[0] "第 %u 隊聽令 - 共 %u 單位" -#: src/droid.cpp:2745 +#: src/droid.cpp:2747 #, c-format msgid "%u unit assigned to Group %u" msgid_plural "%u units assigned to Group %u" msgstr[0] "共 %u 單位 被指派為 第 %u 隊" -#: src/droid.cpp:2758 +#: src/droid.cpp:2760 #, c-format msgid "Centered on Group %u - %u Unit" msgid_plural "Centered on Group %u - %u Units" msgstr[0] "視角移動至第 %u 隊 - 共 %u 單位" -#: src/droid.cpp:2762 +#: src/droid.cpp:2764 #, c-format msgid "Aligning with Group %u - %u Unit" msgid_plural "Aligning with Group %u - %u Units" msgstr[0] "Aligning with Group %u - %u 單位" -#: src/droid.cpp:3093 +#: src/droid.cpp:3095 msgid "Rookie" msgstr "菜鳥" -#: src/droid.cpp:3094 +#: src/droid.cpp:3096 msgctxt "rank" msgid "Green" msgstr "青澀" -#: src/droid.cpp:3095 +#: src/droid.cpp:3097 msgid "Trained" msgstr "訓練有素的" -#: src/droid.cpp:3096 +#: src/droid.cpp:3098 msgid "Regular" msgstr "好樣的" -#: src/droid.cpp:3097 +#: src/droid.cpp:3099 msgid "Professional" msgstr "專家" -#: src/droid.cpp:3098 +#: src/droid.cpp:3100 msgid "Veteran" msgstr "老手" -#: src/droid.cpp:3099 +#: src/droid.cpp:3101 msgid "Elite" msgstr "菁英" -#: src/droid.cpp:3100 +#: src/droid.cpp:3102 msgid "Special" msgstr "特務" -#: src/droid.cpp:3101 +#: src/droid.cpp:3103 msgid "Hero" msgstr "英雄" -#: src/droid.cpp:4123 +#: src/droid.cpp:4125 #, c-format msgid "%s wanted to give you a %s but you have too many!" msgstr "" -#: src/droid.cpp:4127 +#: src/droid.cpp:4129 #, c-format msgid "You wanted to give %s a %s but they have too many!" msgstr "" @@ -12660,7 +12660,7 @@ msgid "Tutorial" msgstr "教學模式" #: src/frontend.cpp:100 -#: src/hci.cpp:3487 +#: src/hci.cpp:3495 msgid "Options" msgstr "選項" @@ -12722,8 +12722,8 @@ msgstr "SINGLE PLAYER" #: src/frontend.cpp:303 #: src/ingameop.cpp:494 -#: src/mission.cpp:2493 -#: src/mission.cpp:2596 +#: src/mission.cpp:2537 +#: src/mission.cpp:2640 msgid "Load Saved Game" msgstr "載入已儲存的遊戲" @@ -13014,7 +13014,7 @@ msgid "GAME OPTIONS" msgstr "遊戲選項" #: src/frontend.cpp:1340 -#: src/multiint.cpp:2398 +#: src/multiint.cpp:2394 msgid "Mod: " msgstr "" @@ -13024,8 +13024,8 @@ msgid "MAP SAVED!" msgstr "遊戲已儲存" #: src/hci.cpp:1573 -#: src/loop.cpp:558 -#: src/loop.cpp:574 +#: src/loop.cpp:561 +#: src/loop.cpp:577 #, fuzzy msgid "GAME SAVED: " msgstr "遊戲已儲存" @@ -13054,155 +13054,155 @@ msgstr "玩家 %u 利用作弊（除錯）模式建立了一個新droid: %s." msgid "Player %u is cheating (debug menu) him/herself a new droid." msgstr "玩家 %u 利用作弊（除錯）模式建立了一個新droid: %s." -#: src/hci.cpp:3298 +#: src/hci.cpp:3306 msgid "Commanders (F6)" msgstr "指揮命令 （F6）" -#: src/hci.cpp:3311 +#: src/hci.cpp:3319 msgid "Intelligence Display (F5)" msgstr "顯示任務及情報（F5）" -#: src/hci.cpp:3324 +#: src/hci.cpp:3332 msgid "Manufacture (F1)" msgstr "生產新的單位 （F1）" -#: src/hci.cpp:3337 +#: src/hci.cpp:3345 msgid "Design (F4)" msgstr "設計新的單位（F4）" -#: src/hci.cpp:3350 +#: src/hci.cpp:3358 msgid "Research (F2)" msgstr "研發新科技（F2）" -#: src/hci.cpp:3363 +#: src/hci.cpp:3371 msgid "Build (F3)" msgstr "建造新的建築物 （F3）" -#: src/hci.cpp:3434 +#: src/hci.cpp:3442 #: src/multiint.cpp:1401 #: src/multimenu.cpp:763 msgid "Power" msgstr "能源" -#: src/hci.cpp:3525 +#: src/hci.cpp:3533 msgid "Map:" msgstr "" -#: src/hci.cpp:3538 +#: src/hci.cpp:3546 #, fuzzy msgid "Load" msgstr "載入遊戲" -#: src/hci.cpp:3539 +#: src/hci.cpp:3547 #, fuzzy msgid "Load Map File" msgstr "載入遊戲" -#: src/hci.cpp:3546 +#: src/hci.cpp:3554 #, fuzzy msgid "Save" msgstr "儲存遊戲" -#: src/hci.cpp:3547 +#: src/hci.cpp:3555 #, fuzzy msgid "Save Map File" msgstr "儲存遊戲" -#: src/hci.cpp:3555 +#: src/hci.cpp:3563 msgid "New" msgstr "" -#: src/hci.cpp:3556 +#: src/hci.cpp:3564 msgid "New Blank Map" msgstr "" -#: src/hci.cpp:3592 +#: src/hci.cpp:3600 msgid "Tile" msgstr "貼圖" -#: src/hci.cpp:3593 +#: src/hci.cpp:3601 msgid "Place tiles on map" msgstr "在地圖上加入貼圖" -#: src/hci.cpp:3602 +#: src/hci.cpp:3610 msgid "Unit" msgstr "單位" -#: src/hci.cpp:3603 +#: src/hci.cpp:3611 msgid "Place Unit on map" msgstr "在地圖上加入單位" -#: src/hci.cpp:3611 +#: src/hci.cpp:3619 msgid "Struct" msgstr "建築" -#: src/hci.cpp:3612 +#: src/hci.cpp:3620 msgid "Place Structures on map" msgstr "在地圖上加入建築物" -#: src/hci.cpp:3620 +#: src/hci.cpp:3628 msgid "Feat" msgstr "特徵" -#: src/hci.cpp:3621 +#: src/hci.cpp:3629 msgid "Place Features on map" msgstr "在地圖上加入特徵" -#: src/hci.cpp:3631 +#: src/hci.cpp:3639 msgid "Pause" msgstr "" -#: src/hci.cpp:3632 +#: src/hci.cpp:3640 msgid "Pause or unpause the game" msgstr "暫停（或繼續）遊戲" -#: src/hci.cpp:3646 +#: src/hci.cpp:3654 msgid "Align height of all map objects" msgstr "使地圖上所有物件等高" -#: src/hci.cpp:3656 +#: src/hci.cpp:3664 msgid "Edit" msgstr "" -#: src/hci.cpp:3657 +#: src/hci.cpp:3665 #, fuzzy msgid "Start Edit Mode" msgstr "開始時無基地" -#: src/hci.cpp:3671 +#: src/hci.cpp:3679 #: src/ingameop.cpp:112 #: src/ingameop.cpp:256 #: src/ingameop.cpp:260 msgid "Quit" msgstr "退出" -#: src/hci.cpp:3672 +#: src/hci.cpp:3680 msgid "Exit Game" msgstr "離開遊戲" -#: src/hci.cpp:3698 +#: src/hci.cpp:3706 #, fuzzy msgid "Current Player:" msgstr "多人遊戲" -#: src/hci.cpp:3989 +#: src/hci.cpp:3997 #: src/intdisplay.cpp:276 msgid "Progress Bar" msgstr "進度條" -#: src/hci.cpp:4855 +#: src/hci.cpp:4863 msgid "Factory Delivery Point" msgstr "工廠單位產出點" -#: src/hci.cpp:4873 +#: src/hci.cpp:4881 msgid "Loop Production" msgstr "循環生產" -#: src/hci.cpp:4953 +#: src/hci.cpp:4961 msgid "Tab Scroll left" msgstr "頁簽向左捲動" -#: src/hci.cpp:4968 +#: src/hci.cpp:4976 msgid "Tab Scroll right" msgstr "頁簽向右捲動" @@ -13228,8 +13228,8 @@ msgstr "" #: src/ingameop.cpp:274 #: src/ingameop.cpp:498 -#: src/mission.cpp:2480 -#: src/mission.cpp:2599 +#: src/mission.cpp:2524 +#: src/mission.cpp:2643 msgid "Save Game" msgstr "儲存遊戲" @@ -14185,45 +14185,45 @@ msgstr "" msgid "Toggle Driving Mode" msgstr "開啟或關閉追蹤視角" -#: src/loop.cpp:565 -#: src/loop.cpp:581 +#: src/loop.cpp:568 +#: src/loop.cpp:584 #, fuzzy msgid "Could not save game!" msgstr "載入已儲存的遊戲" -#: src/mission.cpp:2041 +#: src/mission.cpp:2085 msgid "Load Transport" msgstr "送上運輸艦" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 #, fuzzy msgid "OBJECTIVE ACHIEVED by cheating!" msgstr "任務完成" -#: src/mission.cpp:2428 +#: src/mission.cpp:2472 msgid "OBJECTIVE ACHIEVED" msgstr "任務完成" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 #, fuzzy msgid "OBJECTIVE FAILED--and you cheated!" msgstr "任務失敗" -#: src/mission.cpp:2434 +#: src/mission.cpp:2478 msgid "OBJECTIVE FAILED" msgstr "任務失敗" -#: src/mission.cpp:2459 -#: src/mission.cpp:2499 -#: src/mission.cpp:2613 +#: src/mission.cpp:2503 +#: src/mission.cpp:2543 +#: src/mission.cpp:2657 msgid "Quit To Main Menu" msgstr "退出至主選單" -#: src/mission.cpp:2467 +#: src/mission.cpp:2511 msgid "Continue Game" msgstr "繼續遊戲" -#: src/mission.cpp:2564 +#: src/mission.cpp:2608 #, fuzzy msgid "GAME SAVED :" msgstr "遊戲已儲存" @@ -14523,118 +14523,113 @@ msgstr "" msgid "Player colour" msgstr "玩家" -#: src/multiint.cpp:2071 +#: src/multiint.cpp:2068 msgid "Team" msgstr "隊伍" -#: src/multiint.cpp:2083 -#, fuzzy -msgid "Kick player" -msgstr "2 玩家" - -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 msgid "You cannot change difficulty in a challenge" msgstr "" -#: src/multiint.cpp:2113 +#: src/multiint.cpp:2109 #, fuzzy msgid "Click to change difficulty" msgstr "按一下看地圖" -#: src/multiint.cpp:2130 +#: src/multiint.cpp:2126 msgid "Click when ready" msgstr "按一下開始" -#: src/multiint.cpp:2134 +#: src/multiint.cpp:2130 msgid "READY?" msgstr "" -#: src/multiint.cpp:2178 +#: src/multiint.cpp:2174 msgid "PLAYERS" msgstr "玩家" -#: src/multiint.cpp:2213 +#: src/multiint.cpp:2209 #, fuzzy msgid "Click to change to this slot" msgstr "按一下看地圖" -#: src/multiint.cpp:2241 +#: src/multiint.cpp:2237 #, fuzzy msgid "Choose Team" msgstr "鎖定同盟模式" -#: src/multiint.cpp:2271 +#: src/multiint.cpp:2267 #, fuzzy msgid "Click to change player colour" msgstr "雷達顯示玩家顏色" -#: src/multiint.cpp:2299 +#: src/multiint.cpp:2295 #, fuzzy msgid "Click to change player position" msgstr "保持戒備" -#: src/multiint.cpp:2305 +#: src/multiint.cpp:2301 #, fuzzy msgid "Click to change AI" msgstr "按一下看地圖" -#: src/multiint.cpp:2309 +#: src/multiint.cpp:2305 msgid "You cannot change AI in a challenge" msgstr "" -#: src/multiint.cpp:2371 +#: src/multiint.cpp:2367 msgid "CHAT" msgstr "聊天" -#: src/multiint.cpp:2403 +#: src/multiint.cpp:2399 msgid "All players need to have the same mods to join your game." msgstr "" -#: src/multiint.cpp:2561 +#: src/multiint.cpp:2557 #, c-format msgid "*** password [%s] is now required! ***" msgstr "" -#: src/multiint.cpp:2569 +#: src/multiint.cpp:2565 msgid "*** password is NOT required! ***" msgstr "" -#: src/multiint.cpp:2810 +#: src/multiint.cpp:2806 msgid "Sorry! Failed to host the game." msgstr "" -#: src/multiint.cpp:2931 +#: src/multiint.cpp:2927 msgid "'Locked Teams' mode enabled" msgstr "鎖定同盟模式" -#: src/multiint.cpp:3012 +#: src/multiint.cpp:3008 #, c-format msgid "The host has kicked %s from the game!" msgstr "主玩家將 %s 踢出遊戲！" -#: src/multiint.cpp:3082 +#: src/multiint.cpp:3078 msgid "Host is Starting Game" msgstr "主玩家已開始遊戲" -#: src/multiint.cpp:3648 +#: src/multiint.cpp:3644 msgid "Players" msgstr "玩家" -#: src/multiint.cpp:3786 +#: src/multiint.cpp:3782 #, c-format msgid "Sending Map: %d%% " msgstr "" -#: src/multiint.cpp:3794 +#: src/multiint.cpp:3790 #, c-format msgid "Map: %d%% downloaded" msgstr "" -#: src/multiint.cpp:3820 +#: src/multiint.cpp:3816 msgid "HOST" msgstr "" -#: src/multiint.cpp:3827 +#: src/multiint.cpp:3823 #: src/multimenu.cpp:772 msgid "Ping" msgstr "Ping" @@ -14812,80 +14807,80 @@ msgstr "提供玩家能源" msgid "Kicking player %s, because they tried to bypass data integrity check!" msgstr "" -#: src/multiplay.cpp:1057 +#: src/multiplay.cpp:1056 #, fuzzy msgid "(allies" msgstr "同盟" -#: src/multiplay.cpp:1065 +#: src/multiplay.cpp:1064 msgid "(private to " msgstr "" -#: src/multiplay.cpp:1078 +#: src/multiplay.cpp:1077 msgid "[invalid]" msgstr "" -#: src/multiplay.cpp:1942 +#: src/multiplay.cpp:1941 msgid "Green" msgstr "綠色" -#: src/multiplay.cpp:1943 +#: src/multiplay.cpp:1942 msgid "Orange" msgstr "橙色" -#: src/multiplay.cpp:1944 +#: src/multiplay.cpp:1943 msgid "Grey" msgstr "灰色" -#: src/multiplay.cpp:1945 +#: src/multiplay.cpp:1944 msgid "Black" msgstr "黑色" -#: src/multiplay.cpp:1946 +#: src/multiplay.cpp:1945 msgid "Red" msgstr "紅色" -#: src/multiplay.cpp:1947 +#: src/multiplay.cpp:1946 msgid "Blue" msgstr "藍色" -#: src/multiplay.cpp:1948 +#: src/multiplay.cpp:1947 msgid "Pink" msgstr "粉紅色" -#: src/multiplay.cpp:1949 +#: src/multiplay.cpp:1948 msgid "Cyan" msgstr "青綠色" -#: src/multiplay.cpp:1950 +#: src/multiplay.cpp:1949 msgid "Yellow" msgstr "" -#: src/multiplay.cpp:1951 +#: src/multiplay.cpp:1950 msgid "Purple" msgstr "" -#: src/multiplay.cpp:1952 +#: src/multiplay.cpp:1951 msgid "White" msgstr "" -#: src/multiplay.cpp:1953 +#: src/multiplay.cpp:1952 msgid "Bright blue" msgstr "" -#: src/multiplay.cpp:1954 +#: src/multiplay.cpp:1953 msgid "Neon green" msgstr "" -#: src/multiplay.cpp:1955 +#: src/multiplay.cpp:1954 msgid "Infrared" msgstr "" -#: src/multiplay.cpp:1956 +#: src/multiplay.cpp:1955 msgid "Ultraviolet" msgstr "" -#: src/multiplay.cpp:1957 +#: src/multiplay.cpp:1956 msgid "Brown" msgstr "" @@ -14893,16 +14888,16 @@ msgstr "" msgid "We can't do that! We must be a Cyborg unit to use a Cyborg Transport!" msgstr "" -#: src/research.cpp:1737 +#: src/research.cpp:1739 #, c-format msgid "Research completed: %s" msgstr "已研發完成： %s" -#: src/research.cpp:1742 +#: src/research.cpp:1744 msgid "Research Completed" msgstr "已研發完成" -#: src/research.cpp:2563 +#: src/research.cpp:2565 msgid "Research Award" msgstr "研發中心獎勵" @@ -15065,61 +15060,61 @@ msgstr "找不到任何雷達單位！" msgid "Unable to locate any Commanders!" msgstr "找不到任何指揮官車！" -#: src/structure.cpp:2614 +#: src/structure.cpp:2650 msgid "Command Control Limit Reached - Production Halted" msgstr "已達到可控制單位總數上限，停止生產新單位" -#: src/structure.cpp:5806 -#: src/structure.cpp:5831 +#: src/structure.cpp:5888 +#: src/structure.cpp:5913 #, c-format msgid "%s - %u Unit assigned" msgid_plural "%s - %u Units assigned" msgstr[0] "%s - 已指派 %u 單位" -#: src/structure.cpp:5836 -#: src/structure.cpp:5904 -#: src/structure.cpp:5920 -#: src/structure.cpp:5934 +#: src/structure.cpp:5918 +#: src/structure.cpp:5986 +#: src/structure.cpp:6002 +#: src/structure.cpp:6016 #, c-format msgid "%s - Damage %3.0f%%" msgstr "%s - 損傷 %3.0f%%" -#: src/structure.cpp:5886 +#: src/structure.cpp:5968 #, c-format msgid "%s - Connected %u of %u" msgstr "%s - 連接鑽油井數量 %u of %u" -#: src/structure.cpp:6050 -#: src/structure.cpp:6095 +#: src/structure.cpp:6132 +#: src/structure.cpp:6177 #, c-format msgid "%s - Electronically Damaged" msgstr "%s -電子傷害" -#: src/structure.cpp:6332 +#: src/structure.cpp:6414 msgid "Electronic Reward - Visibility Report" msgstr "電子回饋—可檢視報告" -#: src/structure.cpp:6372 +#: src/structure.cpp:6454 msgid "Factory Reward - Propulsion" msgstr "工廠獎勵—推進動力" -#: src/structure.cpp:6396 +#: src/structure.cpp:6478 msgid "Factory Reward - Body" msgstr "工廠獎勵—車身" -#: src/structure.cpp:6420 +#: src/structure.cpp:6502 msgid "Factory Reward - Weapon" msgstr "工廠獎勵—武器" -#: src/structure.cpp:6429 +#: src/structure.cpp:6511 msgid "Factory Reward - Nothing" msgstr "工廠獎勵—無" -#: src/structure.cpp:6457 +#: src/structure.cpp:6539 msgid "Repair Facility Award - Repair" msgstr "修理中心獎勵—修理" -#: src/structure.cpp:6464 +#: src/structure.cpp:6546 msgid "Repair Facility Award - Nothing" msgstr "修理工廠回饋—無" @@ -15136,34 +15131,36 @@ msgstr "" msgid "Reinforcements landing" msgstr "援軍已降落" -#: src/version.cpp:143 -msgid " (modified and switched locally)" -msgstr " (modified and switched locally)" - -#: src/version.cpp:145 +#: src/version.cpp:129 msgid " (modified locally)" msgstr " (modified locally)" -#: src/version.cpp:147 -msgid " (switched locally)" -msgstr " (switched locally)" - -#: src/version.cpp:154 +#: src/version.cpp:136 msgid " - DEBUG" msgstr " - DEBUG" -#: src/version.cpp:163 +#: src/version.cpp:145 #, c-format msgid " - Built %s" msgstr " - Built %s" #. TRANSLATORS: This string looks as follows when expanded. #. "Version " -#: src/version.cpp:173 +#: src/version.cpp:155 #, c-format msgid "Version %s%s%s%s" msgstr "版本 %s%s%s%s" +#, fuzzy +#~ msgid "Kick player" +#~ msgstr "2 玩家" + +#~ msgid " (modified and switched locally)" +#~ msgstr " (modified and switched locally)" + +#~ msgid " (switched locally)" +#~ msgstr " (switched locally)" + #, fuzzy #~ msgid "Infinite Production" #~ msgstr "循環生產" From 34d9c07b63e4d554c6c79a106beea50f7ab52bae Mon Sep 17 00:00:00 2001 From: cybersphinx Date: Wed, 9 Mar 2011 00:39:14 +0100 Subject: [PATCH 50/59] Make sure autorevision.h is up to date. Use a temporary file so the timestamp isn't updated when the file hasn't changed. --- src/Makefile.am | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index dfefabac7..bde780d11 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,8 +10,11 @@ AM_CXXFLAGS = $(WZ_CXXFLAGS) AM_LFLAGS = $(FLEX_FLAGS) AM_YFLAGS = -d -autorevision.h: $(top_srcdir)/build_tools/autorevision.sh - $(top_srcdir)/build_tools/autorevision.sh $(abs_top_builddir)/src/autorevision.h +.PHONY: autorevision.h + +autorevision.h: + $(top_srcdir)/build_tools/autorevision.sh $(abs_top_builddir)/src/autorevision.h.new + diff -q $(abs_top_builddir)/src/autorevision.h.new $(abs_top_builddir)/src/autorevision.h && rm $(abs_top_builddir)/src/autorevision.h.new || mv $(abs_top_builddir)/src/autorevision.h.new $(abs_top_builddir)/src/autorevision.h BUILT_SOURCES = \ autorevision.h \ From adc6999799824e669ff857780edfa11c90d4d2e4 Mon Sep 17 00:00:00 2001 From: cybersphinx Date: Wed, 9 Mar 2011 02:03:47 +0100 Subject: [PATCH 51/59] Make autorevision.h generation more robust (though uglier). --- src/Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index bde780d11..cc43d26b4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -13,8 +13,9 @@ AM_YFLAGS = -d .PHONY: autorevision.h autorevision.h: - $(top_srcdir)/build_tools/autorevision.sh $(abs_top_builddir)/src/autorevision.h.new - diff -q $(abs_top_builddir)/src/autorevision.h.new $(abs_top_builddir)/src/autorevision.h && rm $(abs_top_builddir)/src/autorevision.h.new || mv $(abs_top_builddir)/src/autorevision.h.new $(abs_top_builddir)/src/autorevision.h + $(top_srcdir)/build_tools/autorevision.sh $(abs_top_builddir)/src/autorevision.h.new && \ + (diff -q $(abs_top_builddir)/src/autorevision.h.new $(abs_top_builddir)/src/autorevision.h && rm $(abs_top_builddir)/src/autorevision.h.new || \ + mv $(abs_top_builddir)/src/autorevision.h.new $(abs_top_builddir)/src/autorevision.h) || true BUILT_SOURCES = \ autorevision.h \ From e50b650c6c57e0510695b786a6269c8b3c19da64 Mon Sep 17 00:00:00 2001 From: cybersphinx Date: Wed, 9 Mar 2011 23:07:21 +0100 Subject: [PATCH 52/59] Just run autorevision unconditionally. --- src/Makefile.am | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index cc43d26b4..511c519fd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -13,9 +13,7 @@ AM_YFLAGS = -d .PHONY: autorevision.h autorevision.h: - $(top_srcdir)/build_tools/autorevision.sh $(abs_top_builddir)/src/autorevision.h.new && \ - (diff -q $(abs_top_builddir)/src/autorevision.h.new $(abs_top_builddir)/src/autorevision.h && rm $(abs_top_builddir)/src/autorevision.h.new || \ - mv $(abs_top_builddir)/src/autorevision.h.new $(abs_top_builddir)/src/autorevision.h) || true + $(top_srcdir)/build_tools/autorevision.sh $(abs_top_builddir)/src/autorevision.h || true BUILT_SOURCES = \ autorevision.h \ From c024ef4df225e8b8e816a26dc1055c467a8411ba Mon Sep 17 00:00:00 2001 From: cybersphinx Date: Wed, 9 Mar 2011 23:24:03 +0100 Subject: [PATCH 53/59] Beautify. --- src/Makefile.am | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 511c519fd..26703048d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -36,8 +36,10 @@ CLEANFILES = \ EXTRA_DIST = \ autorevision.h \ - message_lexer.l message_parser.y \ - scriptvals_lexer.l scriptvals_parser.y \ + message_lexer.l \ + message_parser.y \ + scriptvals_lexer.l \ + scriptvals_parser.y \ level_lexer.l bin_PROGRAMS = warzone2100 From cce4f76dfc2f0d865af2de518dbbf2adc36ca464 Mon Sep 17 00:00:00 2001 From: cybersphinx Date: Wed, 9 Mar 2011 23:29:29 +0100 Subject: [PATCH 54/59] Proper dependencies for rebuilding of version.o. --- src/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 26703048d..f7e7fe695 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,9 +10,9 @@ AM_CXXFLAGS = $(WZ_CXXFLAGS) AM_LFLAGS = $(FLEX_FLAGS) AM_YFLAGS = -d -.PHONY: autorevision.h +version.o: autorevision.h -autorevision.h: +autorevision.h: $(warzone2100_SOURCES) $(warzone2100_LDADD) $(top_srcdir)/build_tools/autorevision.sh $(abs_top_builddir)/src/autorevision.h || true BUILT_SOURCES = \ From f1ab1f092a1ee1f0dbd69a37cf1975d406d182e0 Mon Sep 17 00:00:00 2001 From: Cyp Date: Fri, 11 Mar 2011 21:10:17 +0100 Subject: [PATCH 55/59] Don't assert when firing lassat. --- src/visibility.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/visibility.cpp b/src/visibility.cpp index 4b2d03aee..b0caaee17 100644 --- a/src/visibility.cpp +++ b/src/visibility.cpp @@ -790,6 +790,11 @@ bool lineOfFire(const SIMPLE_OBJECT* psViewer, const BASE_OBJECT* psTarget, int /* Check how much of psTarget is hitable from psViewer's gun position */ int areaOfFire(const SIMPLE_OBJECT* psViewer, const BASE_OBJECT* psTarget, int weapon_slot, bool wallsBlock) { + if (psViewer == NULL) + { + return 0; // Lassat special case, avoid assertion. + } + return checkFireLine(psViewer, psTarget, weapon_slot, wallsBlock, true); } From 8ce810cda3a09501c1ce94f1c9e7c2adc294ce40 Mon Sep 17 00:00:00 2001 From: safety0ff Date: Sat, 12 Mar 2011 11:33:50 -0500 Subject: [PATCH 56/59] Use %u in printf statements instead of %hhu since Mingw (by default) uses Msvcrt's C99 non-compliant version. Using Mingw's C99 compliant replacement printf is possible but may be slow. --- src/keybind.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/keybind.cpp b/src/keybind.cpp index bdcc0f775..b0d3ca191 100644 --- a/src/keybind.cpp +++ b/src/keybind.cpp @@ -674,7 +674,7 @@ void kf_TileInfo(void) { MAPTILE *psTile = mapTile(mouseTileX, mouseTileY); - debug(LOG_ERROR, "Tile position=(%d, %d) Terrain=%d Texture=%u Height=%d Illumination=%hhu", + debug(LOG_ERROR, "Tile position=(%d, %d) Terrain=%d Texture=%u Height=%d Illumination=%u", mouseTileX, mouseTileY, (int)terrainType(psTile), TileNumber_tile(psTile->texture), psTile->height, psTile->illumination); addConsoleMessage("Tile info dumped into log", DEFAULT_JUSTIFY, SYSTEM_MESSAGE); From 5ac26462f17c779fa59474e558d283beb81bcf90 Mon Sep 17 00:00:00 2001 From: safety0ff Date: Sat, 12 Mar 2011 12:23:56 -0500 Subject: [PATCH 57/59] Fix use of uninitialized variable in exception handler. --- lib/exceptionhandler/exceptionhandler.cpp | 2 -- lib/exceptionhandler/exchndl.cpp | 4 ---- 2 files changed, 6 deletions(-) diff --git a/lib/exceptionhandler/exceptionhandler.cpp b/lib/exceptionhandler/exceptionhandler.cpp index d4988b748..b3d51397c 100644 --- a/lib/exceptionhandler/exceptionhandler.cpp +++ b/lib/exceptionhandler/exceptionhandler.cpp @@ -782,7 +782,6 @@ bool OverrideRPTDirectory(char *newPath) //conversion failed-- we won't use the user's directory. LPVOID lpMsgBuf; - LPVOID lpDisplayBuf; DWORD dw = GetLastError(); TCHAR szBuffer[4196]; @@ -800,7 +799,6 @@ bool OverrideRPTDirectory(char *newPath) MessageBox((HWND)MB_ICONEXCLAMATION, szBuffer, _T("Error"), MB_OK); LocalFree(lpMsgBuf); - LocalFree(lpDisplayBuf); return false; } diff --git a/lib/exceptionhandler/exchndl.cpp b/lib/exceptionhandler/exchndl.cpp index 5a53d3ba3..cbe79d8c0 100644 --- a/lib/exceptionhandler/exchndl.cpp +++ b/lib/exceptionhandler/exchndl.cpp @@ -1134,7 +1134,6 @@ LONG WINAPI TopLevelExceptionFilter(PEXCEPTION_POINTERS pExceptionInfo) // Retrieve the system error message for the last-error code LPVOID lpMsgBuf; - LPVOID lpDisplayBuf; DWORD dw = GetLastError(); TCHAR szBuffer[4196]; @@ -1152,7 +1151,6 @@ LONG WINAPI TopLevelExceptionFilter(PEXCEPTION_POINTERS pExceptionInfo) MessageBox((HWND)MB_ICONEXCLAMATION, szBuffer, _T("Error"), MB_OK); LocalFree(lpMsgBuf); - LocalFree(lpDisplayBuf); debug(LOG_ERROR, "Exception handler failed to create file!"); } @@ -1176,7 +1174,6 @@ LONG WINAPI TopLevelExceptionFilter(PEXCEPTION_POINTERS pExceptionInfo) if (err == 0) { LPVOID lpMsgBuf; - LPVOID lpDisplayBuf; DWORD dw = GetLastError(); TCHAR szBuffer[4196]; @@ -1194,7 +1191,6 @@ LONG WINAPI TopLevelExceptionFilter(PEXCEPTION_POINTERS pExceptionInfo) MessageBox((HWND)MB_ICONEXCLAMATION, szBuffer, _T("Error"), MB_OK); LocalFree(lpMsgBuf); - LocalFree(lpDisplayBuf); debug(LOG_ERROR, "Exception handler failed to create file!"); } hReportFile = 0; From 3dd8ff3e4916e238f01f63c40ba1a3ae6418ff28 Mon Sep 17 00:00:00 2001 From: safety0ff Date: Sat, 12 Mar 2011 14:24:10 -0500 Subject: [PATCH 58/59] Add more informative link in pointtree comments. --- src/pointtree.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pointtree.cpp b/src/pointtree.cpp index 536b8ce4e..dab29b683 100644 --- a/src/pointtree.cpp +++ b/src/pointtree.cpp @@ -26,7 +26,8 @@ How this works: Points are sorted by their Morton numbers, which are interleaved x and y coordinate bits. -See: http://en.wikipedia.org/wiki/Morton_number_(number_theory) +See: http://en.wikipedia.org/wiki/Z-order_(curve) +See also: http://en.wikipedia.org/wiki/Morton_number_(number_theory) When looking for points in a particular area, a search square is split up into 4 rectangles of varying sizes, and a quick binary search for point in those ranges is performed. The ranges From a72c41aeec0136c86007739a97ccc9ed508c0283 Mon Sep 17 00:00:00 2001 From: abomination Date: Sat, 12 Mar 2011 20:32:15 -0500 Subject: [PATCH 59/59] fix [s]BOOL[/s] bool by 4B0/\/\1|\|4710|\| [Edit by Cyp: Removed a "typedef int bool;" when building on non-windows.] --- lib/exceptionhandler/exceptionhandler.cpp | 2 +- lib/exceptionhandler/exchndl.cpp | 52 +- lib/framework/types.h | 4 - lib/framework/wzglobal.h | 2 +- lib/gamelib/anim.cpp | 10 +- lib/gamelib/anim.h | 10 +- lib/gamelib/animobj.cpp | 6 +- lib/gamelib/animobj.h | 8 +- lib/gamelib/audp_parser.y | 2 +- lib/gamelib/gtime.cpp | 2 +- lib/gamelib/gtime.h | 2 +- lib/gamelib/hashtable.cpp | 6 +- lib/gamelib/hashtable.h | 4 +- lib/iniparser/iniparser.cpp | 2 +- lib/iniparser/iniparser.h | 2 +- lib/ivis_opengl/imd.h | 2 +- lib/ivis_opengl/imdload.cpp | 10 +- lib/ivis_opengl/pieblitfunc.cpp | 4 +- lib/ivis_opengl/pieblitfunc.h | 4 +- lib/ivis_opengl/pieclip.cpp | 6 +- lib/ivis_opengl/pieclip.h | 6 +- lib/ivis_opengl/piedraw.cpp | 4 +- lib/ivis_opengl/piematrix.cpp | 2 +- lib/ivis_opengl/piemode.cpp | 2 +- lib/ivis_opengl/piemode.h | 2 +- lib/ivis_opengl/piestate.cpp | 16 +- lib/ivis_opengl/piestate.h | 16 +- lib/ivis_opengl/png_util.cpp | 2 +- lib/ivis_opengl/png_util.h | 2 +- lib/ivis_opengl/screen.cpp | 12 +- lib/ivis_opengl/screen.h | 6 +- lib/netplay/netlog.cpp | 10 +- lib/netplay/netlog.h | 8 +- lib/netplay/netplay.cpp | 28 +- lib/netplay/netplay.h | 40 +- lib/netplay/nettypes.cpp | 11 +- lib/netplay/nettypes.h | 8 +- lib/script/chat_parser.y | 8 +- lib/script/chat_processing.h | 6 +- lib/script/codeprint.cpp | 2 +- lib/script/event.cpp | 36 +- lib/script/event.h | 8 +- lib/script/eventsave.cpp | 22 +- lib/script/eventsave.h | 4 +- lib/script/interpreter.cpp | 42 +- lib/script/interpreter.h | 14 +- lib/script/parse.h | 46 +- lib/script/script.cpp | 6 +- lib/script/script.h | 38 +- lib/script/script_lexer.l | 14 +- lib/script/script_parser.y | 44 +- lib/script/stack.cpp | 32 +- lib/script/stack.h | 20 +- lib/sequence/timer.cpp | 2 +- lib/sound/audio.cpp | 32 +- lib/sound/audio.h | 16 +- lib/sound/cdaudio.cpp | 4 +- lib/sound/cdaudio.h | 4 +- lib/sound/oggvorbis.cpp | 6 +- lib/sound/oggvorbis.h | 2 +- lib/sound/openal_track.cpp | 14 +- lib/sound/track.cpp | 18 +- lib/sound/track.h | 24 +- lib/sound/tracklib.h | 14 +- lib/widget/bar.cpp | 2 +- lib/widget/button.cpp | 2 +- lib/widget/button.h | 2 +- lib/widget/editbox.cpp | 2 +- lib/widget/form.cpp | 8 +- lib/widget/form.h | 4 +- lib/widget/slider.cpp | 4 +- lib/widget/widget.cpp | 22 +- lib/widget/widget.h | 20 +- src/action.cpp | 18 +- src/action.h | 10 +- src/advvis.cpp | 6 +- src/advvis.h | 4 +- src/ai.cpp | 32 +- src/ai.h | 16 +- src/bridge.cpp | 4 +- src/bridge.h | 2 +- src/cheat.cpp | 2 +- src/cheat.h | 2 +- src/clparse.cpp | 2 +- src/clparse.h | 2 +- src/cluster.cpp | 2 +- src/cmddroid.cpp | 2 +- src/cmddroid.h | 2 +- src/component.cpp | 22 +- src/component.h | 16 +- src/configuration.cpp | 8 +- src/configuration.h | 6 +- src/console.cpp | 26 +- src/console.h | 14 +- src/design.cpp | 64 +- src/design.h | 6 +- src/display.cpp | 130 ++-- src/display.h | 50 +- src/display3d.cpp | 72 +- src/display3d.h | 26 +- src/drive.cpp | 46 +- src/drive.h | 36 +- src/droid.cpp | 134 ++-- src/droid.h | 110 ++-- src/e3demo.cpp | 8 +- src/e3demo.h | 2 +- src/edit3d.cpp | 12 +- src/edit3d.h | 10 +- src/feature.cpp | 4 +- src/feature.h | 4 +- src/featuredef.h | 8 +- src/fpath.cpp | 12 +- src/fpath.h | 10 +- src/frontend.cpp | 46 +- src/frontend.h | 24 +- src/function.cpp | 50 +- src/function.h | 4 +- src/functiondef.h | 2 +- src/game.cpp | 276 ++++---- src/game.h | 14 +- src/gateway.cpp | 4 +- src/gateway.h | 4 +- src/geometry.cpp | 4 +- src/geometry.h | 4 +- src/hci.cpp | 140 ++-- src/hci.h | 42 +- src/ingameop.cpp | 18 +- src/ingameop.h | 12 +- src/init.cpp | 34 +- src/init.h | 26 +- src/intdisplay.cpp | 70 +- src/intdisplay.h | 42 +- src/intelmap.cpp | 42 +- src/intelmap.h | 14 +- src/intimage.cpp | 6 +- src/intimage.h | 2 +- src/intorder.cpp | 26 +- src/intorder.h | 8 +- src/keybind.cpp | 22 +- src/keybind.h | 2 +- src/keyedit.cpp | 18 +- src/keyedit.h | 8 +- src/keymap.cpp | 36 +- src/keymap.h | 22 +- src/levels.cpp | 14 +- src/levels.h | 10 +- src/loadsave.cpp | 26 +- src/loadsave.h | 16 +- src/loop.cpp | 38 +- src/loop.h | 30 +- src/main.cpp | 4 +- src/main.h | 4 +- src/map.cpp | 18 +- src/map.h | 16 +- src/mapgrid.cpp | 2 +- src/mapgrid.h | 2 +- src/mechanics.cpp | 4 +- src/mechanics.h | 4 +- src/message.cpp | 14 +- src/message.h | 12 +- src/messagedef.h | 2 +- src/miscimd.cpp | 6 +- src/miscimd.h | 2 +- src/mission.cpp | 106 +-- src/mission.h | 42 +- src/move.cpp | 28 +- src/move.h | 12 +- src/multibot.cpp | 26 +- src/multigifts.cpp | 22 +- src/multigifts.h | 18 +- src/multiint.cpp | 60 +- src/multiint.h | 10 +- src/multijoin.cpp | 12 +- src/multijoin.h | 10 +- src/multilimit.cpp | 4 +- src/multilimit.h | 2 +- src/multimenu.cpp | 22 +- src/multimenu.h | 18 +- src/multiopt.cpp | 28 +- src/multiplay.cpp | 92 +-- src/multiplay.h | 112 ++-- src/multirecv.h | 52 +- src/multistat.cpp | 4 +- src/multistat.h | 4 +- src/multistruct.cpp | 16 +- src/multisync.cpp | 34 +- src/objects.cpp | 4 +- src/objects.h | 4 +- src/objmem.cpp | 6 +- src/objmem.h | 6 +- src/order.cpp | 52 +- src/order.h | 30 +- src/power.cpp | 16 +- src/power.h | 14 +- src/projectile.cpp | 8 +- src/projectile.h | 6 +- src/radar.cpp | 12 +- src/radar.h | 12 +- src/research.cpp | 40 +- src/research.h | 28 +- src/scores.cpp | 6 +- src/scores.h | 6 +- src/scriptai.cpp | 104 +-- src/scriptai.h | 84 +-- src/scriptcb.cpp | 102 +-- src/scriptcb.h | 62 +- src/scriptextern.cpp | 12 +- src/scriptextern.h | 12 +- src/scriptfuncs.cpp | 768 +++++++++++----------- src/scriptfuncs.h | 616 ++++++++--------- src/scriptobj.cpp | 18 +- src/scriptobj.h | 18 +- src/scripttabs.cpp | 2 +- src/scripttabs.h | 2 +- src/scriptvals.cpp | 10 +- src/scriptvals.h | 20 +- src/scriptvals_lexer.l | 2 +- src/scriptvals_parser.y | 12 +- src/selection.cpp | 34 +- src/selection.h | 2 +- src/seqdisp.cpp | 44 +- src/seqdisp.h | 18 +- src/stats.cpp | 62 +- src/stats.h | 60 +- src/structure.cpp | 152 ++--- src/structure.h | 112 ++-- src/structuredef.h | 2 +- src/text.cpp | 2 +- src/text.h | 2 +- src/texture.cpp | 2 +- src/transporter.cpp | 52 +- src/transporter.h | 16 +- src/visibility.cpp | 4 +- src/visibility.h | 4 +- src/warcam.cpp | 36 +- src/warcam.h | 8 +- src/warzoneconfig.cpp | 24 +- src/warzoneconfig.h | 20 +- src/wrappers.cpp | 22 +- src/wrappers.h | 16 +- 240 files changed, 3279 insertions(+), 3290 deletions(-) diff --git a/lib/exceptionhandler/exceptionhandler.cpp b/lib/exceptionhandler/exceptionhandler.cpp index b3d51397c..686a54e15 100644 --- a/lib/exceptionhandler/exceptionhandler.cpp +++ b/lib/exceptionhandler/exceptionhandler.cpp @@ -159,7 +159,7 @@ static struct sigaction oldAction[NSIG]; static struct utsname sysInfo; -static BOOL gdbIsAvailable = false, programIsAvailable = false, sysInfoValid = false; +static bool gdbIsAvailable = false, programIsAvailable = false, sysInfoValid = false; static char executionDate[MAX_DATE_STRING] = {'\0'}, programPID[MAX_PID_STRING] = {'\0'}, diff --git a/lib/exceptionhandler/exchndl.cpp b/lib/exceptionhandler/exchndl.cpp index cbe79d8c0..3d5e67e8c 100644 --- a/lib/exceptionhandler/exchndl.cpp +++ b/lib/exceptionhandler/exchndl.cpp @@ -145,7 +145,7 @@ static void find_address_in_section (bfd *abfd, asection *section, PTR data) } static -BOOL BfdDemangleSymName(LPCTSTR lpName, LPTSTR lpDemangledName, DWORD nSize) +bool BfdDemangleSymName(LPCTSTR lpName, LPTSTR lpDemangledName, DWORD nSize) { char *res; @@ -165,7 +165,7 @@ BOOL BfdDemangleSymName(LPCTSTR lpName, LPTSTR lpDemangledName, DWORD nSize) } static -BOOL BfdGetSymFromAddr(bfd *abfd, asymbol **syms, long symcount, DWORD dwAddress, LPTSTR lpSymName, DWORD nSize) +bool BfdGetSymFromAddr(bfd *abfd, asymbol **syms, long symcount, DWORD dwAddress, LPTSTR lpSymName, DWORD nSize) { HMODULE hModule; struct find_handle info; @@ -195,7 +195,7 @@ BOOL BfdGetSymFromAddr(bfd *abfd, asymbol **syms, long symcount, DWORD dwAddress } static -BOOL BfdGetLineFromAddr(bfd *abfd, asymbol **syms, long symcount, DWORD dwAddress, LPTSTR lpFileName, DWORD nSize, LPDWORD lpLineNumber) +bool BfdGetLineFromAddr(bfd *abfd, asymbol **syms, long symcount, DWORD dwAddress, LPTSTR lpFileName, DWORD nSize, LPDWORD lpLineNumber) { HMODULE hModule; struct find_handle info; @@ -227,15 +227,15 @@ BOOL BfdGetLineFromAddr(bfd *abfd, asymbol **syms, long symcount, DWORD dwAddres #include -static BOOL bSymInitialized = FALSE; +static bool bSymInitialized = FALSE; static HMODULE hModule_Imagehlp = NULL; -typedef BOOL (WINAPI *PFNSYMINITIALIZE)(HANDLE, LPSTR, BOOL); +typedef bool (WINAPI *PFNSYMINITIALIZE)(HANDLE, LPSTR, bool); static PFNSYMINITIALIZE pfnSymInitialize = NULL; static -BOOL WINAPI j_SymInitialize(HANDLE hProcess, PSTR UserSearchPath, BOOL fInvadeProcess) +bool WINAPI j_SymInitialize(HANDLE hProcess, PSTR UserSearchPath, bool fInvadeProcess) { if( (hModule_Imagehlp || (hModule_Imagehlp = LoadLibrary(_T("IMAGEHLP.DLL")))) && @@ -246,11 +246,11 @@ BOOL WINAPI j_SymInitialize(HANDLE hProcess, PSTR UserSearchPath, BOOL fInvadePr return FALSE; } -typedef BOOL (WINAPI *PFNSYMCLEANUP)(HANDLE); +typedef bool (WINAPI *PFNSYMCLEANUP)(HANDLE); static PFNSYMCLEANUP pfnSymCleanup = NULL; static -BOOL WINAPI j_SymCleanup(HANDLE hProcess) +bool WINAPI j_SymCleanup(HANDLE hProcess) { if( (hModule_Imagehlp || (hModule_Imagehlp = LoadLibrary(_T("IMAGEHLP.DLL")))) && @@ -276,11 +276,11 @@ DWORD WINAPI j_SymSetOptions(DWORD SymOptions) return FALSE; } -typedef BOOL (WINAPI *PFNSYMUNDNAME)(PIMAGEHLP_SYMBOL, PSTR, DWORD); +typedef bool (WINAPI *PFNSYMUNDNAME)(PIMAGEHLP_SYMBOL, PSTR, DWORD); static PFNSYMUNDNAME pfnSymUnDName = NULL; static -BOOL WINAPI j_SymUnDName(PIMAGEHLP_SYMBOL Symbol, PSTR UnDecName, DWORD UnDecNameLength) +bool WINAPI j_SymUnDName(PIMAGEHLP_SYMBOL Symbol, PSTR UnDecName, DWORD UnDecNameLength) { if( (hModule_Imagehlp || (hModule_Imagehlp = LoadLibrary(_T("IMAGEHLP.DLL")))) && @@ -321,11 +321,11 @@ DWORD WINAPI j_SymGetModuleBase(HANDLE hProcess, DWORD dwAddr) return 0; } -typedef BOOL (WINAPI *PFNSTACKWALK)(DWORD, HANDLE, HANDLE, LPSTACKFRAME, LPVOID, PREAD_PROCESS_MEMORY_ROUTINE, PFUNCTION_TABLE_ACCESS_ROUTINE, PGET_MODULE_BASE_ROUTINE, PTRANSLATE_ADDRESS_ROUTINE); +typedef bool (WINAPI *PFNSTACKWALK)(DWORD, HANDLE, HANDLE, LPSTACKFRAME, LPVOID, PREAD_PROCESS_MEMORY_ROUTINE, PFUNCTION_TABLE_ACCESS_ROUTINE, PGET_MODULE_BASE_ROUTINE, PTRANSLATE_ADDRESS_ROUTINE); static PFNSTACKWALK pfnStackWalk = NULL; static -BOOL WINAPI j_StackWalk( +bool WINAPI j_StackWalk( DWORD MachineType, HANDLE hProcess, HANDLE hThread, @@ -356,11 +356,11 @@ BOOL WINAPI j_StackWalk( return FALSE; } -typedef BOOL (WINAPI *PFNSYMGETSYMFROMADDR)(HANDLE, DWORD, LPDWORD, PIMAGEHLP_SYMBOL); +typedef bool (WINAPI *PFNSYMGETSYMFROMADDR)(HANDLE, DWORD, LPDWORD, PIMAGEHLP_SYMBOL); static PFNSYMGETSYMFROMADDR pfnSymGetSymFromAddr = NULL; static -BOOL WINAPI j_SymGetSymFromAddr(HANDLE hProcess, DWORD Address, PDWORD Displacement, PIMAGEHLP_SYMBOL Symbol) +bool WINAPI j_SymGetSymFromAddr(HANDLE hProcess, DWORD Address, PDWORD Displacement, PIMAGEHLP_SYMBOL Symbol) { if( (hModule_Imagehlp || (hModule_Imagehlp = LoadLibrary(_T("IMAGEHLP.DLL")))) && @@ -371,11 +371,11 @@ BOOL WINAPI j_SymGetSymFromAddr(HANDLE hProcess, DWORD Address, PDWORD Displacem return FALSE; } -typedef BOOL (WINAPI *PFNSYMGETLINEFROMADDR)(HANDLE, DWORD, LPDWORD, PIMAGEHLP_LINE); +typedef bool (WINAPI *PFNSYMGETLINEFROMADDR)(HANDLE, DWORD, LPDWORD, PIMAGEHLP_LINE); static PFNSYMGETLINEFROMADDR pfnSymGetLineFromAddr = NULL; static -BOOL WINAPI j_SymGetLineFromAddr(HANDLE hProcess, DWORD dwAddr, PDWORD pdwDisplacement, PIMAGEHLP_LINE Line) +bool WINAPI j_SymGetLineFromAddr(HANDLE hProcess, DWORD dwAddr, PDWORD pdwDisplacement, PIMAGEHLP_LINE Line) { if( (hModule_Imagehlp || (hModule_Imagehlp = LoadLibrary(_T("IMAGEHLP.DLL")))) && @@ -387,7 +387,7 @@ BOOL WINAPI j_SymGetLineFromAddr(HANDLE hProcess, DWORD dwAddr, PDWORD pdwDispla } static -BOOL ImagehlpDemangleSymName(LPCTSTR lpName, LPTSTR lpDemangledName, DWORD nSize) +bool ImagehlpDemangleSymName(LPCTSTR lpName, LPTSTR lpDemangledName, DWORD nSize) { BYTE symbolBuffer[sizeof(IMAGEHLP_SYMBOL) + 512]; PIMAGEHLP_SYMBOL pSymbol = (PIMAGEHLP_SYMBOL) symbolBuffer; @@ -406,7 +406,7 @@ BOOL ImagehlpDemangleSymName(LPCTSTR lpName, LPTSTR lpDemangledName, DWORD nSize } static -BOOL ImagehlpGetSymFromAddr(HANDLE hProcess, DWORD dwAddress, LPTSTR lpSymName, DWORD nSize) +bool ImagehlpGetSymFromAddr(HANDLE hProcess, DWORD dwAddress, LPTSTR lpSymName, DWORD nSize) { // IMAGEHLP is wacky, and requires you to pass in a pointer to a // IMAGEHLP_SYMBOL structure. The problem is that this structure is @@ -434,7 +434,7 @@ BOOL ImagehlpGetSymFromAddr(HANDLE hProcess, DWORD dwAddress, LPTSTR lpSymName, } static -BOOL ImagehlpGetLineFromAddr(HANDLE hProcess, DWORD dwAddress, LPTSTR lpFileName, DWORD nSize, LPDWORD lpLineNumber) +bool ImagehlpGetLineFromAddr(HANDLE hProcess, DWORD dwAddress, LPTSTR lpFileName, DWORD nSize, LPDWORD lpLineNumber) { IMAGEHLP_LINE Line; DWORD dwDisplacement = 0; // Displacement of the input address, relative to the start of the symbol @@ -477,7 +477,7 @@ BOOL ImagehlpGetLineFromAddr(HANDLE hProcess, DWORD dwAddress, LPTSTR lpFileNam } static -BOOL PEGetSymFromAddr(HANDLE hProcess, DWORD dwAddress, LPTSTR lpSymName, DWORD nSize) +bool PEGetSymFromAddr(HANDLE hProcess, DWORD dwAddress, LPTSTR lpSymName, DWORD nSize) { HMODULE hModule; PIMAGE_NT_HEADERS pNtHdr; @@ -578,7 +578,7 @@ struct ItDoesntMatterIfItsADWORDOrAVoidPointer_JustCompileTheDamnThing }; static -BOOL WINAPI IntelStackWalk( +bool WINAPI IntelStackWalk( DWORD MachineType, HANDLE hProcess, WZ_DECL_UNUSED HANDLE hThread, @@ -607,10 +607,10 @@ BOOL WINAPI IntelStackWalk( StackFrame->AddrFrame.Offset = ContextRecord->Ebp; StackFrame->AddrReturn.Mode = AddrModeFlat; -// Error 26 error C2664: 'BOOL (HANDLE,DWORD,PVOID,DWORD,PDWORD)' : +// Error 26 error C2664: 'bool (HANDLE,DWORD,PVOID,DWORD,PDWORD)' : // cannot convert parameter 2 from 'void *' to 'DWORD' // c:\warzone\lib\exceptionhandler\exchndl.cpp 599 -// ../../../../lib/exceptionhandler/exchndl.cpp: In function ‘BOOL IntelStackWalk(DWORD, void*, void*, _tagSTACKFRAME*, CONTEXT*, BOOL (*)(void*, const void*, void*, DWORD, DWORD*), void* (*)(void*, DWORD), DWORD (*)(void*, DWORD), DWORD (*)(void*, void*, _tagADDRESS*))’: +// ../../../../lib/exceptionhandler/exchndl.cpp: In function ‘bool IntelStackWalk(DWORD, void*, void*, _tagSTACKFRAME*, CONTEXT*, bool (*)(void*, const void*, void*, DWORD, DWORD*), void* (*)(void*, DWORD), DWORD (*)(void*, DWORD), DWORD (*)(void*, void*, _tagADDRESS*))’: // ../../../../lib/exceptionhandler/exchndl.cpp:599: error: invalid conversion from ‘long unsigned int’ to ‘const void*’ if(!ReadMemoryRoutine((HANDLE)hProcess, ItDoesntMatterIfItsADWORDOrAVoidPointer_JustCompileTheDamnThing((void *) (StackFrame->AddrFrame.Offset + sizeof(DWORD))), (void *)&StackFrame->AddrReturn.Offset, sizeof(DWORD), NULL)) return FALSE; @@ -631,7 +631,7 @@ BOOL WINAPI IntelStackWalk( } static -BOOL StackBackTrace(HANDLE hProcess, HANDLE hThread, PCONTEXT pContext) +bool StackBackTrace(HANDLE hProcess, HANDLE hThread, PCONTEXT pContext) { STACKFRAME StackFrame; @@ -668,7 +668,7 @@ BOOL StackBackTrace(HANDLE hProcess, HANDLE hThread, PCONTEXT pContext) while ( 1 ) { - BOOL bSuccess = FALSE; + bool bSuccess = FALSE; #ifdef HAVE_BFD const HMODULE hPrevModule = hModule; #endif /* HAVE_BFD */ @@ -1110,7 +1110,7 @@ void GenerateExceptionReport(PEXCEPTION_POINTERS pExceptionInfo) static LONG WINAPI TopLevelExceptionFilter(PEXCEPTION_POINTERS pExceptionInfo) { - static BOOL bBeenHere = FALSE; + static bool bBeenHere = FALSE; if(!bBeenHere) { diff --git a/lib/framework/types.h b/lib/framework/types.h index 78acad402..b8b5ef1db 100644 --- a/lib/framework/types.h +++ b/lib/framework/types.h @@ -73,8 +73,4 @@ typedef int32_t SDWORD; #define SDWORD_MIN INT32_MIN #define SDWORD_MAX INT32_MAX -#if !defined(WZ_OS_WIN) -typedef int BOOL; -#endif // WZ_OS_WIN - #endif // __INCLUDED_LIB_FRAMEWORK_TYPES_H__ diff --git a/lib/framework/wzglobal.h b/lib/framework/wzglobal.h index c2f4b538a..be66e6290 100644 --- a/lib/framework/wzglobal.h +++ b/lib/framework/wzglobal.h @@ -552,7 +552,7 @@ # pragma warning (disable : 4244) // Shut up: conversion from 'float' to 'int', possible loss of data # pragma warning (disable : 4267) // Shut up: conversion from 'size_t' to 'type', possible loss of data # pragma warning (disable : 4389) // Shut up: '==' : signed/unsigned mismatch -# pragma warning (disable : 4800) // Shut up: 'BOOL' : forcing value to bool 'true' or 'false' (performance warning) +# pragma warning (disable : 4800) // Shut up: 'bool' : forcing value to bool 'true' or 'false' (performance warning) # pragma warning (disable : 4512) // Shut up: 'class' : assignment operator could not be generated # define strcasecmp _stricmp diff --git a/lib/gamelib/anim.cpp b/lib/gamelib/anim.cpp index 145d0efa7..112f9c05d 100644 --- a/lib/gamelib/anim.cpp +++ b/lib/gamelib/anim.cpp @@ -66,7 +66,7 @@ g_animGlobals; /** * Initialise animation subsystem. */ -BOOL anim_Init() +bool anim_Init() { /* init globals */ g_animGlobals.psAnimList = NULL; @@ -105,7 +105,7 @@ void anim_ReleaseAnim(BASEANIM *psAnim) /** * Shut down animation subsystem. */ -BOOL anim_Shutdown() +bool anim_Shutdown() { BASEANIM *psAnim, *psAnimTmp; @@ -143,7 +143,7 @@ static void anim_InitBaseMembers(BASEANIM * psAnim, UWORD uwStates, UWORD uwFram /** * Create animation for a model. Called from animation script. */ -BOOL anim_Create3D(char szPieFileName[], UWORD uwStates, UWORD uwFrameRate, UWORD uwObj, +bool anim_Create3D(char szPieFileName[], UWORD uwStates, UWORD uwFrameRate, UWORD uwObj, ANIM_MODE ubType, UWORD uwID) { ANIM3D *psAnim3D; @@ -210,7 +210,7 @@ void anim_BeginScript() /***************************************************************************/ -BOOL anim_EndScript() +bool anim_EndScript() { BASEANIM *psAnim; @@ -231,7 +231,7 @@ BOOL anim_EndScript() /***************************************************************************/ -BOOL anim_AddFrameToAnim(int iFrame, Vector3i vecPos, Vector3i vecRot, Vector3i vecScale) +bool anim_AddFrameToAnim(int iFrame, Vector3i vecPos, Vector3i vecRot, Vector3i vecScale) { ANIM_STATE *psState; BASEANIM *psAnim; diff --git a/lib/gamelib/anim.h b/lib/gamelib/anim.h index 4357a3ff8..fad06ff8d 100644 --- a/lib/gamelib/anim.h +++ b/lib/gamelib/anim.h @@ -90,16 +90,16 @@ struct ANIM3D : public BASEANIM }; -BOOL anim_Init(void); -BOOL anim_Shutdown(void); +bool anim_Init(void); +bool anim_Shutdown(void); BASEANIM * anim_LoadFromBuffer(char *pBuffer, UDWORD size); BASEANIM * anim_LoadFromFile(PHYSFS_file* fileHandle); void anim_ReleaseAnim(BASEANIM *psAnim); -BOOL anim_Create3D(char szPieFileName[], UWORD uwFrames, UWORD uwFrameRate, UWORD uwObj, +bool anim_Create3D(char szPieFileName[], UWORD uwFrames, UWORD uwFrameRate, UWORD uwObj, ANIM_MODE ubType, UWORD uwID); void anim_BeginScript(void); -BOOL anim_EndScript(void); -BOOL anim_AddFrameToAnim(int iFrame, Vector3i vecPos, Vector3i vecRot, Vector3i vecScale); +bool anim_EndScript(void); +bool anim_AddFrameToAnim(int iFrame, Vector3i vecPos, Vector3i vecRot, Vector3i vecScale); BASEANIM * anim_GetAnim(UWORD uwAnimID); UWORD anim_GetAnimID(char *szName); iIMDShape * anim_GetShapeFromID(UWORD uwID); diff --git a/lib/gamelib/animobj.cpp b/lib/gamelib/animobj.cpp index dafc987db..748117d0f 100644 --- a/lib/gamelib/animobj.cpp +++ b/lib/gamelib/animobj.cpp @@ -70,7 +70,7 @@ static void animObj_HashFreeElementFunc( void * psElement ); */ /***************************************************************************/ -BOOL +bool animObj_Init( ANIMOBJDIEDTESTFUNC pDiedFunc ) { SDWORD iSize = sizeof(ANIM_OBJECT); @@ -91,7 +91,7 @@ animObj_Init( ANIMOBJDIEDTESTFUNC pDiedFunc ) /***************************************************************************/ -BOOL +bool animObj_Shutdown( void ) { /* destroy hash table */ @@ -144,7 +144,7 @@ animObj_Update( void ) { ANIM_OBJECT *psObj; SDWORD dwTime; - BOOL bRemove; + bool bRemove; psObj = (ANIM_OBJECT*)hashTable_GetFirst( g_pAnimObjTable ); diff --git a/lib/gamelib/animobj.h b/lib/gamelib/animobj.h index c3c952ceb..c5dc6f74b 100644 --- a/lib/gamelib/animobj.h +++ b/lib/gamelib/animobj.h @@ -35,7 +35,7 @@ typedef void (* ANIMOBJDONEFUNC) ( struct ANIM_OBJECT *psObj ); -typedef BOOL (* ANIMOBJDIEDTESTFUNC) ( void *psParent ); +typedef bool (* ANIMOBJDIEDTESTFUNC) ( void *psParent ); struct COMPONENT_OBJECT { @@ -55,16 +55,16 @@ struct ANIM_OBJECT UDWORD udwStartTime; UDWORD udwStartDelay; UWORD uwCycles; - BOOL bVisible; + bool bVisible; ANIMOBJDONEFUNC pDoneFunc; /* this must be the last entry in this structure */ COMPONENT_OBJECT apComponents[ANIM_MAX_COMPONENTS]; }; -BOOL animObj_Init( ANIMOBJDIEDTESTFUNC pDiedFunc ); +bool animObj_Init( ANIMOBJDIEDTESTFUNC pDiedFunc ); void animObj_Update( void ); -BOOL animObj_Shutdown( void ); +bool animObj_Shutdown( void ); void animObj_SetDoneFunc( ANIM_OBJECT *psObj, ANIMOBJDONEFUNC pDoneFunc ); diff --git a/lib/gamelib/audp_parser.y b/lib/gamelib/audp_parser.y index 8c49a57e8..1611683f6 100644 --- a/lib/gamelib/audp_parser.y +++ b/lib/gamelib/audp_parser.y @@ -99,7 +99,7 @@ audio_list: audio_list audio_track | audio_track ; /* - * unsigned int audio_SetTrackVals(const char* fileName, BOOL loop, unsigned int volume, unsigned int audibleRadius) + * unsigned int audio_SetTrackVals(const char* fileName, bool loop, unsigned int volume, unsigned int audibleRadius) */ audio_track: AUDIO QTEXT looping INTEGER INTEGER diff --git a/lib/gamelib/gtime.cpp b/lib/gamelib/gtime.cpp index 0b909c2f2..cd44f9826 100644 --- a/lib/gamelib/gtime.cpp +++ b/lib/gamelib/gtime.cpp @@ -295,7 +295,7 @@ void gameTimeGetMod(float *pMod) *pMod = modifier; } -BOOL gameTimeIsStopped(void) +bool gameTimeIsStopped(void) { return (stopCount != 0); } diff --git a/lib/gamelib/gtime.h b/lib/gamelib/gtime.h index 00d503350..55aef1b19 100644 --- a/lib/gamelib/gtime.h +++ b/lib/gamelib/gtime.h @@ -78,7 +78,7 @@ void gameTimeUpdateEnd(void); void realTimeUpdate(void); /* Returns true if gameTime is stopped. */ -extern BOOL gameTimeIsStopped(void); +extern bool gameTimeIsStopped(void); /** Call this to stop the game timer. */ extern void gameTimeStop(void); diff --git a/lib/gamelib/hashtable.cpp b/lib/gamelib/hashtable.cpp index fcf67fb0a..4bb207d35 100644 --- a/lib/gamelib/hashtable.cpp +++ b/lib/gamelib/hashtable.cpp @@ -36,7 +36,7 @@ static UDWORD HashTest(intptr_t iKey1, intptr_t iKey2) /***************************************************************************/ -BOOL +bool hashTable_Create( HASHTABLE **ppsTable, UDWORD udwTableSize, UDWORD udwInitElements, UDWORD udwExtElements, UDWORD udwElementSize ) { @@ -259,7 +259,7 @@ void *hashTable_FindElement(HASHTABLE *psTable, intptr_t iKey1, intptr_t iKey2) /***************************************************************************/ static void -hashTable_SetNextNode( HASHTABLE *psTable, BOOL bMoveToNextNode ) +hashTable_SetNextNode( HASHTABLE *psTable, bool bMoveToNextNode ) { if ( (bMoveToNextNode == true) && (psTable->psNextNode != NULL) ) { @@ -293,7 +293,7 @@ hashTable_SetNextNode( HASHTABLE *psTable, BOOL bMoveToNextNode ) /***************************************************************************/ -BOOL +bool hashTable_RemoveElement(HASHTABLE *psTable, void *psElement, intptr_t iKey1, intptr_t iKey2) { UDWORD udwHashIndex; diff --git a/lib/gamelib/hashtable.h b/lib/gamelib/hashtable.h index dcbf59156..8bd90242c 100644 --- a/lib/gamelib/hashtable.h +++ b/lib/gamelib/hashtable.h @@ -94,7 +94,7 @@ struct HASHTABLE * \param udwExtElements number of elements when extending the heap * \param udwElementSize size of elements to be stored in the hashtable */ -BOOL hashTable_Create( HASHTABLE **ppsTable, UDWORD udwTableSize, +bool hashTable_Create( HASHTABLE **ppsTable, UDWORD udwTableSize, UDWORD udwInitElements, UDWORD udwExtElements, UDWORD udwElementSize ); @@ -139,7 +139,7 @@ void hashTable_InsertElement(HASHTABLE *psTable, void *psElement, intptr_t iKey1 * \param iKey2 second key * \return true, if the element was contained in the hashtable */ -BOOL hashTable_RemoveElement(HASHTABLE *psTable, void *psElement, intptr_t iKey1, intptr_t iKey2); +bool hashTable_RemoveElement(HASHTABLE *psTable, void *psElement, intptr_t iKey1, intptr_t iKey2); /** * Calculates hash index from keys and returns element in hash table diff --git a/lib/iniparser/iniparser.cpp b/lib/iniparser/iniparser.cpp index ce5187949..2428a7785 100644 --- a/lib/iniparser/iniparser.cpp +++ b/lib/iniparser/iniparser.cpp @@ -234,7 +234,7 @@ void inifile_set_current_section(inifile *inif, const char *sec) ASSERT(inif->currsec, "Failed to allocate inifile memory."); } -BOOL inifile_key_exists(inifile *inif, const char *key) +bool inifile_key_exists(inifile *inif, const char *key) { for (unsigned i = 0; i < inif->entry.size(); ++i) { diff --git a/lib/iniparser/iniparser.h b/lib/iniparser/iniparser.h index 0d3fd754f..ccacd9c26 100644 --- a/lib/iniparser/iniparser.h +++ b/lib/iniparser/iniparser.h @@ -89,7 +89,7 @@ void inifile_set_current_section(inifile *inif, const char *sec); * @param key The key to check the existence of. * @return True if the key exists, false otherwise. */ -BOOL inifile_key_exists(inifile *inif, const char *key); +bool inifile_key_exists(inifile *inif, const char *key); /** * Fetches the value of the key specified by key in the inifile inif. If the key diff --git a/lib/ivis_opengl/imd.h b/lib/ivis_opengl/imd.h index 2bec13f56..4cd9898e8 100644 --- a/lib/ivis_opengl/imd.h +++ b/lib/ivis_opengl/imd.h @@ -43,7 +43,7 @@ extern iIMDShape *iV_ProcessIMD(const char **ppFileData, const char *FileDataEnd ); -extern BOOL iV_IMDSave(char *filename, iIMDShape *s, BOOL PieIMD); +extern bool iV_IMDSave(char *filename, iIMDShape *s, bool PieIMD); extern void iV_IMDRelease(iIMDShape *s); // How high up do we want to stop looking diff --git a/lib/ivis_opengl/imdload.cpp b/lib/ivis_opengl/imdload.cpp index b425e3a69..93adabd27 100644 --- a/lib/ivis_opengl/imdload.cpp +++ b/lib/ivis_opengl/imdload.cpp @@ -34,7 +34,7 @@ #include "imd.h" // for imd structures #include "tex.h" // texture page loading -static BOOL AtEndOfFile(const char *CurPos, const char *EndOfFile) +static bool AtEndOfFile(const char *CurPos, const char *EndOfFile) { while ( *CurPos == 0x00 || *CurPos == 0x09 || *CurPos == 0x0a || *CurPos == 0x0d || *CurPos == 0x20 ) { @@ -199,7 +199,7 @@ static bool _imd_load_polys( const char **ppFileData, iIMDShape *s, int pieVersi } -static BOOL ReadPoints( const char **ppFileData, iIMDShape *s ) +static bool ReadPoints( const char **ppFileData, iIMDShape *s ) { const char *pFileData = *ppFileData; unsigned int i; @@ -221,7 +221,7 @@ static BOOL ReadPoints( const char **ppFileData, iIMDShape *s ) } -static BOOL _imd_load_points( const char **ppFileData, iIMDShape *s ) +static bool _imd_load_points( const char **ppFileData, iIMDShape *s ) { Vector3f *p = NULL; int32_t tempXMax, tempXMin, tempZMax, tempZMin; @@ -455,7 +455,7 @@ static BOOL _imd_load_points( const char **ppFileData, iIMDShape *s ) * \pre s->nconnectors set * \post s->connectors allocated */ -static BOOL _imd_load_connectors(const char **ppFileData, iIMDShape *s) +static bool _imd_load_connectors(const char **ppFileData, iIMDShape *s) { const char *pFileData = *ppFileData; int cnt; @@ -639,7 +639,7 @@ iIMDShape *iV_ProcessIMD( const char **ppFileData, const char *FileDataEnd ) UDWORD level; int32_t imd_version; uint32_t imd_flags; - BOOL bTextured = false; + bool bTextured = false; if (sscanf(pFileData, "%255s %d%n", buffer, &imd_version, &cnt) != 2) { diff --git a/lib/ivis_opengl/pieblitfunc.cpp b/lib/ivis_opengl/pieblitfunc.cpp index 00e23fd04..b64257f7b 100644 --- a/lib/ivis_opengl/pieblitfunc.cpp +++ b/lib/ivis_opengl/pieblitfunc.cpp @@ -266,7 +266,7 @@ void pie_UploadDisplayBuffer() screen_Upload(NULL, false); } -BOOL pie_InitRadar(void) +bool pie_InitRadar(void) { radarTexture = _TEX_INDEX; glGenTextures(1, &_TEX_PAGE[_TEX_INDEX].id); @@ -274,7 +274,7 @@ BOOL pie_InitRadar(void) return true; } -BOOL pie_ShutdownRadar(void) +bool pie_ShutdownRadar(void) { glDeleteTextures(1, &_TEX_PAGE[radarTexture].id); return true; diff --git a/lib/ivis_opengl/pieblitfunc.h b/lib/ivis_opengl/pieblitfunc.h index b02b33d6d..40f8625cd 100644 --- a/lib/ivis_opengl/pieblitfunc.h +++ b/lib/ivis_opengl/pieblitfunc.h @@ -70,8 +70,8 @@ extern void iV_DrawImageRect(IMAGEFILE *ImageFile, UWORD ID, int x, int y, int W extern void iV_TransBoxFill(float x0, float y0, float x1, float y1); extern void pie_UniTransBoxFill(float x0, float y0, float x1, float y1, PIELIGHT colour); -extern BOOL pie_InitRadar(void); -extern BOOL pie_ShutdownRadar(void); +extern bool pie_InitRadar(void); +extern bool pie_ShutdownRadar(void); extern void pie_DownLoadRadar(UDWORD *buffer, int width, int height, bool filter); extern void pie_RenderRadar(int x, int y, int width, int height); diff --git a/lib/ivis_opengl/pieclip.cpp b/lib/ivis_opengl/pieclip.cpp index 99ebb1241..bafd60bc6 100644 --- a/lib/ivis_opengl/pieclip.cpp +++ b/lib/ivis_opengl/pieclip.cpp @@ -22,19 +22,19 @@ static UDWORD videoBufferDepth = 32, videoBufferWidth = 0, videoBufferHeight = 0; -BOOL pie_SetVideoBufferDepth(UDWORD depth) +bool pie_SetVideoBufferDepth(UDWORD depth) { videoBufferDepth = depth; return(true); } -BOOL pie_SetVideoBufferWidth(UDWORD width) +bool pie_SetVideoBufferWidth(UDWORD width) { videoBufferWidth = width; return(true); } -BOOL pie_SetVideoBufferHeight(UDWORD height) +bool pie_SetVideoBufferHeight(UDWORD height) { videoBufferHeight = height; return(true); diff --git a/lib/ivis_opengl/pieclip.h b/lib/ivis_opengl/pieclip.h index 742f05e25..d92289013 100644 --- a/lib/ivis_opengl/pieclip.h +++ b/lib/ivis_opengl/pieclip.h @@ -54,9 +54,9 @@ struct CLIP_VERTEX */ /***************************************************************************/ -extern BOOL pie_SetVideoBufferDepth(UDWORD depth); -extern BOOL pie_SetVideoBufferWidth(UDWORD width); -extern BOOL pie_SetVideoBufferHeight(UDWORD height); +extern bool pie_SetVideoBufferDepth(UDWORD depth); +extern bool pie_SetVideoBufferWidth(UDWORD width); +extern bool pie_SetVideoBufferHeight(UDWORD height); extern UDWORD pie_GetVideoBufferDepth( void ) WZ_DECL_PURE; extern UDWORD pie_GetVideoBufferWidth( void ) WZ_DECL_PURE; extern UDWORD pie_GetVideoBufferHeight( void ) WZ_DECL_PURE; diff --git a/lib/ivis_opengl/piedraw.cpp b/lib/ivis_opengl/piedraw.cpp index 89a032d19..7a67232b8 100644 --- a/lib/ivis_opengl/piedraw.cpp +++ b/lib/ivis_opengl/piedraw.cpp @@ -45,7 +45,7 @@ #define TRIANGLES_PER_TILE 2 #define VERTICES_PER_TILE (TRIANGLES_PER_TILE * VERTICES_PER_TRIANGLE) -extern BOOL drawing_interface; +extern bool drawing_interface; /* * Local Variables @@ -270,7 +270,7 @@ static void addToEdgeList(int a, int b, EDGE *edgelist, unsigned int* edge_count { EDGE newEdge = {a, b}; unsigned int i; - BOOL foundMatching = false; + bool foundMatching = false; for(i = 0; i < *edge_count; i++) { diff --git a/lib/ivis_opengl/piematrix.cpp b/lib/ivis_opengl/piematrix.cpp index 1e617eeb6..4457fb66e 100644 --- a/lib/ivis_opengl/piematrix.cpp +++ b/lib/ivis_opengl/piematrix.cpp @@ -54,7 +54,7 @@ struct SDMATRIX static SDMATRIX aMatrixStack[MATRIX_MAX]; static SDMATRIX *psMatrix = &aMatrixStack[0]; -BOOL drawing_interface = true; +bool drawing_interface = true; //************************************************************************* diff --git a/lib/ivis_opengl/piemode.cpp b/lib/ivis_opengl/piemode.cpp index 1ccc54b88..33431a5ba 100644 --- a/lib/ivis_opengl/piemode.cpp +++ b/lib/ivis_opengl/piemode.cpp @@ -49,7 +49,7 @@ iSurface rendSurface; -BOOL pie_Initialise(void) +bool pie_Initialise(void) { pie_TexInit(); diff --git a/lib/ivis_opengl/piemode.h b/lib/ivis_opengl/piemode.h index 2271d8f70..1aaf9890e 100644 --- a/lib/ivis_opengl/piemode.h +++ b/lib/ivis_opengl/piemode.h @@ -50,7 +50,7 @@ extern iSurface rendSurface; * Global ProtoTypes */ /***************************************************************************/ -extern BOOL pie_Initialise(void); +extern bool pie_Initialise(void); extern void pie_ShutDown(void); extern void pie_ScreenFlip(int ClearMode); extern UDWORD pie_GetResScalingFactor( void ); diff --git a/lib/ivis_opengl/piestate.cpp b/lib/ivis_opengl/piestate.cpp index 05cf304cf..0d6256d05 100644 --- a/lib/ivis_opengl/piestate.cpp +++ b/lib/ivis_opengl/piestate.cpp @@ -89,12 +89,12 @@ void pie_SetDefaultStates(void)//Sets all states //*************************************************************************** // -// pie_EnableFog(BOOL val) +// pie_EnableFog(bool val) // // Global enable/disable fog to allow fog to be turned of ingame // //*************************************************************************** -void pie_EnableFog(BOOL val) +void pie_EnableFog(bool val) { if (rendStates.fogEnabled != val) { @@ -115,19 +115,19 @@ void pie_EnableFog(BOOL val) } } -BOOL pie_GetFogEnabled(void) +bool pie_GetFogEnabled(void) { return rendStates.fogEnabled; } //*************************************************************************** // -// pie_SetFogStatus(BOOL val) +// pie_SetFogStatus(bool val) // // Toggle fog on and off for rendering objects inside or outside the 3D world // //*************************************************************************** -BOOL pie_GetFogStatus(void) +bool pie_GetFogStatus(void) { return rendStates.fog; } @@ -449,11 +449,11 @@ void pie_UpdateFogDistance(float begin, float end) } // -// pie_SetFogStatus(BOOL val) +// pie_SetFogStatus(bool val) // // Toggle fog on and off for rendering objects inside or outside the 3D world // -void pie_SetFogStatus(BOOL val) +void pie_SetFogStatus(bool val) { float fog_colour[4]; @@ -523,7 +523,7 @@ void pie_SetTexturePage(SDWORD num) } } -void pie_SetAlphaTest(BOOL keyingOn) +void pie_SetAlphaTest(bool keyingOn) { if (keyingOn != rendStates.keyingOn) { diff --git a/lib/ivis_opengl/piestate.h b/lib/ivis_opengl/piestate.h index 073053292..ef27b17e6 100644 --- a/lib/ivis_opengl/piestate.h +++ b/lib/ivis_opengl/piestate.h @@ -42,12 +42,12 @@ struct RENDER_STATE { - BOOL fogEnabled; - BOOL fog; + bool fogEnabled; + bool fog; PIELIGHT fogColour; SDWORD texPage; REND_MODE rendMode; - BOOL keyingOn; + bool keyingOn; }; /***************************************************************************/ @@ -67,17 +67,17 @@ extern void pie_SetDefaultStates(void);//Sets all states extern void pie_SetDepthBufferStatus(DEPTH_MODE depthMode); extern void pie_SetDepthOffset(float offset); //fog available -extern void pie_EnableFog(BOOL val); -extern BOOL pie_GetFogEnabled(void); +extern void pie_EnableFog(bool val); +extern bool pie_GetFogEnabled(void); //fog currently on -extern void pie_SetFogStatus(BOOL val); -extern BOOL pie_GetFogStatus(void); +extern void pie_SetFogStatus(bool val); +extern bool pie_GetFogStatus(void); extern void pie_SetFogColour(PIELIGHT colour); extern PIELIGHT pie_GetFogColour(void) WZ_DECL_PURE; extern void pie_UpdateFogDistance(float begin, float end); //render states extern void pie_SetTexturePage(SDWORD num); -extern void pie_SetAlphaTest(BOOL keyingOn); +extern void pie_SetAlphaTest(bool keyingOn); extern void pie_SetRendMode(REND_MODE rendMode); extern void pie_InitColourMouse(IMAGEFILE* img, const uint16_t cursorIDs[CURSOR_MAX]); diff --git a/lib/ivis_opengl/png_util.cpp b/lib/ivis_opengl/png_util.cpp index 1868314d9..3d385d522 100644 --- a/lib/ivis_opengl/png_util.cpp +++ b/lib/ivis_opengl/png_util.cpp @@ -70,7 +70,7 @@ static inline void PNGWriteCleanup(png_infop *info_ptr, png_structp *png_ptr, PH PHYSFS_close(fileHandle); } -BOOL iV_loadImage_PNG(const char *fileName, iV_Image *image) +bool iV_loadImage_PNG(const char *fileName, iV_Image *image) { unsigned char PNGheader[PNG_BYTES_TO_CHECK]; PHYSFS_sint64 readSize; diff --git a/lib/ivis_opengl/png_util.h b/lib/ivis_opengl/png_util.h index 6fd0cfa2d..c709de1c3 100644 --- a/lib/ivis_opengl/png_util.h +++ b/lib/ivis_opengl/png_util.h @@ -30,7 +30,7 @@ * \param image Sprite to read into * \return true on success, false otherwise */ -BOOL iV_loadImage_PNG(const char *fileName, iV_Image *image); +bool iV_loadImage_PNG(const char *fileName, iV_Image *image); /*! * Save a PNG from image into file diff --git a/lib/ivis_opengl/screen.cpp b/lib/ivis_opengl/screen.cpp index 6bd29b034..e85bdb01e 100644 --- a/lib/ivis_opengl/screen.cpp +++ b/lib/ivis_opengl/screen.cpp @@ -52,14 +52,14 @@ UDWORD screenDepth = 0; int wz_texture_compression; static SDL_Surface *screen = NULL; -static BOOL bBackDrop = false; +static bool bBackDrop = false; static char screendump_filename[PATH_MAX]; -static BOOL screendump_required = false; +static bool screendump_required = false; static GLuint backDropTexture = ~0; static int preview_width = 0, preview_height = 0; static Vector2i player_pos[MAX_PLAYERS]; -static BOOL mappreview = false; +static bool mappreview = false; static char mapname[256]; /* Initialise the double buffered display */ @@ -349,7 +349,7 @@ void screen_RestartBackDrop(void) bBackDrop = true; } -BOOL screen_GetBackDrop(void) +bool screen_GetBackDrop(void) { return bBackDrop; } @@ -357,7 +357,7 @@ BOOL screen_GetBackDrop(void) //****************************************************************** //slight hack to display maps (or whatever) in background. //bitmap MUST be (BACKDROP_HACK_WIDTH * BACKDROP_HACK_HEIGHT) for now. -void screen_Upload(const char *newBackDropBmp, BOOL preview) +void screen_Upload(const char *newBackDropBmp, bool preview) { static bool processed = false; int x1 = 0, x2 = screenWidth, y1 = 0, y2 = screenHeight, i, scale = 0, w = 0, h = 0; @@ -490,7 +490,7 @@ void screen_disableMapPreview(void) sstrcpy(mapname, "none"); } -BOOL screen_getMapPreview(void) +bool screen_getMapPreview(void) { return mappreview; } diff --git a/lib/ivis_opengl/screen.h b/lib/ivis_opengl/screen.h index 5d15c314d..0eb7b3425 100644 --- a/lib/ivis_opengl/screen.h +++ b/lib/ivis_opengl/screen.h @@ -47,8 +47,8 @@ extern void screenSetTextColour(UBYTE red, UBYTE green, UBYTE blue); extern void screen_SetBackDropFromFile(const char* filename); extern void screen_StopBackDrop(void); extern void screen_RestartBackDrop(void); -extern BOOL screen_GetBackDrop(void); -extern void screen_Upload(const char *newBackDropBmp, BOOL preview); +extern bool screen_GetBackDrop(void); +extern void screen_Upload(const char *newBackDropBmp, bool preview); /* screendump */ extern void screenDumpToDisk(const char* path); @@ -62,6 +62,6 @@ extern void screenDoDumpToDiskIfRequired(void); void screen_enableMapPreview(char *name, int width, int height, Vector2i *playerpositions); void screen_disableMapPreview(void); -BOOL screen_getMapPreview(void); +bool screen_getMapPreview(void); #endif diff --git a/lib/netplay/netlog.cpp b/lib/netplay/netlog.cpp index 04c4416a3..57170a6ad 100644 --- a/lib/netplay/netlog.cpp +++ b/lib/netplay/netlog.cpp @@ -37,7 +37,7 @@ static PHYSFS_file *pFileHandle = NULL; static uint32_t packetcount[2][NUM_GAME_PACKETS]; static uint32_t packetsize[2][NUM_GAME_PACKETS]; -BOOL NETstartLogging(void) +bool NETstartLogging(void) { time_t aclock; struct tm *newtime; @@ -69,7 +69,7 @@ BOOL NETstartLogging(void) return true; } -BOOL NETstopLogging(void) +bool NETstopLogging(void) { static const char dash_line[] = "-----------------------------------------------------------\n"; char buf[256]; @@ -143,16 +143,16 @@ BOOL NETstopLogging(void) /** log packet * \param type, uint8_t, the packet's type. * \param size, uint32_t, the packet's size - * \param received, BOOL, true if we are receiving a packet, false if we are sending a packet. + * \param received, bool, true if we are receiving a packet, false if we are sending a packet. */ -void NETlogPacket(uint8_t type, uint32_t size, BOOL received) +void NETlogPacket(uint8_t type, uint32_t size, bool received) { STATIC_ASSERT((1<<(8*sizeof(type))) == NUM_GAME_PACKETS); // NUM_GAME_PACKETS must be larger than maximum possible type. packetcount[received][type]++; packetsize[received][type] += size; } -BOOL NETlogEntry(const char *str,UDWORD a,UDWORD b) +bool NETlogEntry(const char *str,UDWORD a,UDWORD b) { static const char star_line[] = "************************************************************\n"; static UDWORD lastframe = 0; diff --git a/lib/netplay/netlog.h b/lib/netplay/netlog.h index c80b07743..520a0ed51 100644 --- a/lib/netplay/netlog.h +++ b/lib/netplay/netlog.h @@ -24,9 +24,9 @@ #include "netplay.h" -BOOL NETstartLogging(void); -BOOL NETstopLogging(void); -BOOL NETlogEntry( const char *str, UDWORD a, UDWORD b ); -void NETlogPacket(uint8_t type, uint32_t size, BOOL received); +bool NETstartLogging(void); +bool NETstopLogging(void); +bool NETlogEntry( const char *str, UDWORD a, UDWORD b ); +void NETlogPacket(uint8_t type, uint32_t size, bool received); #endif // _netlog_h diff --git a/lib/netplay/netplay.cpp b/lib/netplay/netplay.cpp index b987fa308..effcd2a47 100644 --- a/lib/netplay/netplay.cpp +++ b/lib/netplay/netplay.cpp @@ -117,7 +117,7 @@ struct NET_PLAYER_DATA NETPLAY NetPlay; PLAYER_IP *IPlist = NULL; -static BOOL allow_joining = false; +static bool allow_joining = false; static bool server_not_there = false; static GAMESTRUCT gamestruct; @@ -507,7 +507,7 @@ void NETplayerKicked(UDWORD index) // //////////////////////////////////////////////////////////////////////// // rename the local player -BOOL NETchangePlayerName(UDWORD index, char *newName) +bool NETchangePlayerName(UDWORD index, char *newName) { if(!NetPlay.bComms) { @@ -595,7 +595,7 @@ static void NETsendGameFlags(void) // //////////////////////////////////////////////////////////////////////// // Set a game flag -BOOL NETsetGameFlags(UDWORD flag, SDWORD value) +bool NETsetGameFlags(UDWORD flag, SDWORD value) { if(!NetPlay.bComms) { @@ -1014,7 +1014,7 @@ void NETdiscoverUPnPDevices(void) // //////////////////////////////////////////////////////////////////////// // setup stuff -int NETinit(BOOL bFirstCall) +int NETinit(bool bFirstCall) { debug(LOG_NET, "NETinit"); NETlogEntry("NETinit!", SYNC_FLAG, selectedPlayer); @@ -1345,7 +1345,7 @@ void NETflush() /////////////////////////////////////////////////////////////////////////// // Check if a message is a system message -static BOOL NETprocessSystemMessage(NETQUEUE playerQueue, uint8_t type) +static bool NETprocessSystemMessage(NETQUEUE playerQueue, uint8_t type) { switch (type) { @@ -1556,7 +1556,7 @@ static BOOL NETprocessSystemMessage(NETQUEUE playerQueue, uint8_t type) debug(LOG_NET, "Broadcast leaving message to everyone else"); NETbeginEncode(NETbroadcastQueue(), NET_PLAYER_LEAVING); { - BOOL host = NetPlay.isHost; + bool host = NetPlay.isHost; uint32_t id = index; NETuint32_t(&id); @@ -1657,7 +1657,7 @@ static void NETcheckPlayers(void) // Receive a message over the current connection. We return true if there // is a message for the higher level code to process, and false otherwise. // We should not block here. -BOOL NETrecvNet(NETQUEUE *queue, uint8_t *type) +bool NETrecvNet(NETQUEUE *queue, uint8_t *type) { uint32_t current; @@ -1734,7 +1734,7 @@ checkMessages: return false; } -BOOL NETrecvGame(NETQUEUE *queue, uint8_t *type) +bool NETrecvGame(NETQUEUE *queue, uint8_t *type) { uint32_t current; for (current = 0; current < MAX_PLAYERS; ++current) @@ -1774,7 +1774,7 @@ BOOL NETrecvGame(NETQUEUE *queue, uint8_t *type) // //////////////////////////////////////////////////////////////////////// // Protocol functions -BOOL NETsetupTCPIP(const char *machine) +bool NETsetupTCPIP(const char *machine) { debug(LOG_NET, "NETsetupTCPIP(%s)", machine ? machine : "NULL"); @@ -1880,7 +1880,7 @@ UBYTE NETrecvFile(NETQUEUE queue) debug(LOG_NET, "We are leaving 'nicely' after a fatal error"); NETbeginEncode(NETnetQueue(NET_HOST_ONLY), NET_PLAYER_LEAVING); { - BOOL host = NetPlay.isHost; + bool host = NetPlay.isHost; uint32_t id = selectedPlayer; NETuint32_t(&id); @@ -2444,7 +2444,7 @@ static void NETallowJoining(void) } } -BOOL NEThostGame(const char* SessionName, const char* PlayerName, +bool NEThostGame(const char* SessionName, const char* PlayerName, SDWORD one, SDWORD two, SDWORD three, SDWORD four, UDWORD plyrs) // # of players. { @@ -2562,7 +2562,7 @@ BOOL NEThostGame(const char* SessionName, const char* PlayerName, // //////////////////////////////////////////////////////////////////////// // Stop the dplay interface from accepting more players. -BOOL NEThaltJoining(void) +bool NEThaltJoining(void) { debug(LOG_NET, "temporarily locking game to prevent more players"); @@ -2574,7 +2574,7 @@ BOOL NEThaltJoining(void) // //////////////////////////////////////////////////////////////////////// // find games on open connection -BOOL NETfindGame(void) +bool NETfindGame(void) { SocketAddress* hosts; unsigned int gamecount = 0; @@ -2717,7 +2717,7 @@ BOOL NETfindGame(void) // //////////////////////////////////////////////////////////////////////// // //////////////////////////////////////////////////////////////////////// // Functions used to setup and join games. -BOOL NETjoinGame(UDWORD gameNumber, const char* playername) +bool NETjoinGame(UDWORD gameNumber, const char* playername) { SocketAddress *hosts = NULL; unsigned int i; diff --git a/lib/netplay/netplay.h b/lib/netplay/netplay.h index c552ecbe3..9ae883a97 100644 --- a/lib/netplay/netplay.h +++ b/lib/netplay/netplay.h @@ -213,8 +213,8 @@ struct WZFile PHYSFS_file *pFileHandle; // handle PHYSFS_sint32 fileSize_32; // size int32_t currPos; // current position - BOOL isSending; // sending to this player - BOOL isCancelled; // player cancelled + bool isSending; // sending to this player + bool isCancelled; // player cancelled int32_t filetype; // future use (1=map 2=mod 3=...) }; @@ -245,16 +245,16 @@ struct PLAYER char name[StringSize]; ///< Player name int32_t position; ///< Map starting position int32_t colour; ///< Which colour slot this player is using - BOOL allocated; ///< Allocated as a human player + bool allocated; ///< Allocated as a human player uint32_t heartattacktime; ///< Time cardiac arrest started - BOOL heartbeat; ///< If we are still alive or not - BOOL kick; ///< If we should kick them + bool heartbeat; ///< If we are still alive or not + bool kick; ///< If we should kick them int32_t connection; ///< Index into connection list int32_t team; ///< Which team we are on - BOOL ready; ///< player ready to start? + bool ready; ///< player ready to start? int8_t ai; ///< index into sorted list of AIs, zero is always default AI int8_t difficulty; ///< difficulty level of AI - BOOL needFile; ///< if We need a file sent to us + bool needFile; ///< if We need a file sent to us WZFile wzFile; ///< for each player, we keep track of map progress char IPtextAddress[40]; ///< IP of this player }; @@ -268,9 +268,9 @@ struct NETPLAY uint32_t playercount; ///< Number of players in game. uint32_t hostPlayer; ///< Index of host in player array uint32_t bComms; ///< Actually do the comms? - BOOL isHost; ///< True if we are hosting the game - BOOL isUPNP; // if we want the UPnP detection routines to run - BOOL isHostAlive; /// if the host is still alive + bool isHost; ///< True if we are hosting the game + bool isUPNP; // if we want the UPnP detection routines to run + bool isHostAlive; /// if the host is still alive PHYSFS_file *pMapFileHandle; char gamePassword[password_string_size]; // bool GamePassworded; // if we have a password or not. @@ -298,10 +298,10 @@ extern char iptoconnect[PATH_MAX]; // holds IP/hostname from command line // //////////////////////////////////////////////////////////////////////// // functions available to you. -extern int NETinit(BOOL bFirstCall); // init +extern int NETinit(bool bFirstCall); // init bool NETsend(uint8_t player, NetMessage const *message); ///< send to player, or broadcast if player == NET_ALL_PLAYERS. -extern BOOL NETrecvNet(NETQUEUE *queue, uint8_t *type); ///< recv a message from the net queues if possible. -extern BOOL NETrecvGame(NETQUEUE *queue, uint8_t *type); ///< recv a message from the game queues which is sceduled to execute by time, if possible. +extern bool NETrecvNet(NETQUEUE *queue, uint8_t *type); ///< recv a message from the net queues if possible. +extern bool NETrecvGame(NETQUEUE *queue, uint8_t *type); ///< recv a message from the game queues which is sceduled to execute by time, if possible. void NETflush(void); ///< Flushes any data stuck in compression buffers. extern UBYTE NETsendFile(char *fileName, UDWORD player); // send file chunk. @@ -327,13 +327,13 @@ extern void NETplayerKicked(UDWORD index); // Cleanup after player has been ki // from netjoin.c extern SDWORD NETgetGameFlags(UDWORD flag); // return one of the four flags(dword) about the game. extern int32_t NETgetGameFlagsUnjoined(unsigned int gameid, unsigned int flag); // return one of the four flags(dword) about the game. -extern BOOL NETsetGameFlags(UDWORD flag, SDWORD value); // set game flag(1-4) to value. -extern BOOL NEThaltJoining(void); // stop new players joining this game -extern BOOL NETfindGame(void); // find games being played(uses GAME_GUID); -extern BOOL NETjoinGame(UDWORD gameNumber, const char* playername); // join game given with playername -extern BOOL NEThostGame(const char* SessionName, const char* PlayerName,// host a game +extern bool NETsetGameFlags(UDWORD flag, SDWORD value); // set game flag(1-4) to value. +extern bool NEThaltJoining(void); // stop new players joining this game +extern bool NETfindGame(void); // find games being played(uses GAME_GUID); +extern bool NETjoinGame(UDWORD gameNumber, const char* playername); // join game given with playername +extern bool NEThostGame(const char* SessionName, const char* PlayerName,// host a game SDWORD one, SDWORD two, SDWORD three, SDWORD four, UDWORD plyrs); -extern BOOL NETchangePlayerName(UDWORD player, char *newName);// change a players name. +extern bool NETchangePlayerName(UDWORD player, char *newName);// change a players name. void NETfixDuplicatePlayerNames(void); // Change a player's name automatically, if there are duplicates. #include "netlog.h" @@ -345,7 +345,7 @@ extern unsigned int NETgetMasterserverPort(void); extern void NETsetGameserverPort(unsigned int port); extern unsigned int NETgetGameserverPort(void); -extern BOOL NETsetupTCPIP(const char *machine); +extern bool NETsetupTCPIP(const char *machine); extern void NETsetGamePassword(const char *password); extern void NETBroadcastPlayerInfo(uint32_t index); void NETBroadcastTwoPlayerInfo(uint32_t index1, uint32_t index2); diff --git a/lib/netplay/nettypes.cpp b/lib/netplay/nettypes.cpp index e8beef69f..fbc52c76b 100644 --- a/lib/netplay/nettypes.cpp +++ b/lib/netplay/nettypes.cpp @@ -373,7 +373,7 @@ void NETinsertMessageFromNet(NETQUEUE queue, NetMessage const *message) receiveQueue(queue)->pushMessage(*message); } -BOOL NETisMessageReady(NETQUEUE queue) +bool NETisMessageReady(NETQUEUE queue) { return receiveQueue(queue)->haveMessage(); } @@ -443,7 +443,7 @@ void NETbeginDecode(NETQUEUE queue, uint8_t type) assert(type == message.type); } -BOOL NETend() +bool NETend() { // If we are encoding just return true if (NETgetPacketDir() == PACKET_ENCODE) @@ -569,13 +569,6 @@ void NETuint64_t(uint64_t *ip) queueAuto(*ip); } -void NETbool(BOOL *bp) -{ - uint8_t i = !!*bp; - queueAuto(i); - *bp = !!i; -} - void NETbool(bool *bp) { uint8_t i = !!*bp; diff --git a/lib/netplay/nettypes.h b/lib/netplay/nettypes.h index e6e987d14..a109aa0e1 100644 --- a/lib/netplay/nettypes.h +++ b/lib/netplay/nettypes.h @@ -46,7 +46,7 @@ enum QueueType struct NETQUEUE { void *queue; ///< Is either a (NetQueuePair **) or a (NetQueue *). (Note different numbers of *.) - BOOL isPair; + bool isPair; uint8_t index; uint8_t queueType; }; @@ -58,7 +58,7 @@ NETQUEUE NETbroadcastQueue(void); ///< The queue for sending data di void NETinsertRawData(NETQUEUE queue, uint8_t *data, size_t dataLen); ///< Dump raw data from sockets and raw data sent via host here. void NETinsertMessageFromNet(NETQUEUE queue, NetMessage const *message); ///< Dump whole NetMessages into the queue. -BOOL NETisMessageReady(NETQUEUE queue); ///< Returns true if there is a complete message ready to deserialise in this queue. +bool NETisMessageReady(NETQUEUE queue); ///< Returns true if there is a complete message ready to deserialise in this queue. NetMessage const *NETgetMessage(NETQUEUE queue);///< Returns the current message in the queue which is ready to be deserialised. Do not delete the message. void NETinitQueue(NETQUEUE queue); ///< Allocates the queue. Deletes the old queue, if there was one. Avoids a crash on NULL pointer deference when trying to use the queue. @@ -67,7 +67,7 @@ void NETmoveQueue(NETQUEUE src, NETQUEUE dst); ///< Used for moving the tmpQueue void NETbeginEncode(NETQUEUE queue, uint8_t type); void NETbeginDecode(NETQUEUE queue, uint8_t type); -BOOL NETend(void); +bool NETend(void); void NETflushGameQueues(void); void NETpop(NETQUEUE queue); @@ -80,7 +80,7 @@ void NETuint32_t(uint32_t *ip); ///< Encodes small values (< 1 672 576) in void NETuint32_tLarge(uint32_t *ip); ///< Encodes all values in exactly 4 bytes. void NETint64_t(int64_t *ip); void NETuint64_t(uint64_t *ip); -void NETbool(BOOL *bp); +void NETbool(bool *bp); void NETbool(bool *bp); void NETstring(char *str, uint16_t maxlen); void NETstring(char const *str, uint16_t maxlen); ///< Encode-only version of NETstring. diff --git a/lib/script/chat_parser.y b/lib/script/chat_parser.y index 1b76a1429..71e07d35c 100644 --- a/lib/script/chat_parser.y +++ b/lib/script/chat_parser.y @@ -44,7 +44,7 @@ extern int chat_lex(void); static void chat_store_command(const char *command); /* Return value of the chat parsing - to be used in scripts */ -static BOOL chat_store_parameter(INTERP_VAL *parameter); +static bool chat_store_parameter(INTERP_VAL *parameter); // Store players that were addressed in a command static void chat_store_player(SDWORD cmdIndex, SDWORD playerIndex); @@ -57,7 +57,7 @@ static void chat_reset_command(SDWORD cmdIndex); //static INTERP_VAL msgParams[MAX_CHAT_ARGUMENTS]; /* Store command parameter extracted from the message */ -static BOOL chat_store_parameter(INTERP_VAL *cmdParam) +static bool chat_store_parameter(INTERP_VAL *cmdParam) { SDWORD numCmdParams, numCommands; @@ -175,7 +175,7 @@ static void yyerror(const char* msg); %name-prefix="chat_" %union { - BOOL bval; + bool bval; SDWORD ival; } @@ -720,7 +720,7 @@ R_WAIT_FOR_ME: _T_WAIT R_EOD /* wait */ %% /* Initialize Bison and start chat processing */ -BOOL chatLoad(char *pData, UDWORD size) +bool chatLoad(char *pData, UDWORD size) { SDWORD cmdIndex,parseResult; diff --git a/lib/script/chat_processing.h b/lib/script/chat_processing.h index 6cb6f8236..2e32acd86 100644 --- a/lib/script/chat_processing.h +++ b/lib/script/chat_processing.h @@ -44,7 +44,7 @@ struct CHAT_CMD_DATA { const char *pCmdDescription; /* String representing a certain command */ - BOOL bPlayerAddressed[MAX_PLAYERS]; /* Flag to indicate whether a command was addressed to a certain player */ + bool bPlayerAddressed[MAX_PLAYERS]; /* Flag to indicate whether a command was addressed to a certain player */ SDWORD numCmdParams; /* Number of extracted parameters associated with each command */ INTERP_VAL parameter[MAX_CHAT_CMD_PARAMS]; /* Parameters extracted from text - to be used with scripts */ }; @@ -59,7 +59,7 @@ struct CHAT_MSG extern CHAT_MSG chat_msg; /* Store parameter extracted from the message - for scripts */ -//extern BOOL chat_store_parameter(INTERP_VAL *parameter); +//extern bool chat_store_parameter(INTERP_VAL *parameter); extern void chatGetErrorData(int *pLine, char **ppText); @@ -67,6 +67,6 @@ extern void chatGetErrorData(int *pLine, char **ppText); extern void chatSetInputBuffer(char *pBuffer, UDWORD size); // Load message -extern BOOL chatLoad(char *pData, UDWORD size); +extern bool chatLoad(char *pData, UDWORD size); #endif diff --git a/lib/script/codeprint.cpp b/lib/script/codeprint.cpp index c5e2329af..0ec5079e1 100644 --- a/lib/script/codeprint.cpp +++ b/lib/script/codeprint.cpp @@ -155,7 +155,7 @@ void cpPrintProgram(SCRIPT_CODE *psProg) OPCODE opcode; UDWORD data, i, dim; SCRIPT_DEBUG *psCurrDebug=NULL; - BOOL debugInfo, triggerCode; + bool debugInfo, triggerCode; UDWORD jumpOffset; VAR_DEBUG *psCurrVar; ARRAY_DATA *psCurrArray; diff --git a/lib/script/event.cpp b/lib/script/event.cpp index 4cfae7d46..3643f5381 100644 --- a/lib/script/event.cpp +++ b/lib/script/event.cpp @@ -88,7 +88,7 @@ static void eventPrintTriggerInfo(ACTIVE_TRIGGER *psTrigger) #endif // Initialise a trigger -static BOOL eventInitTrigger(ACTIVE_TRIGGER **ppsTrigger, SCRIPT_CONTEXT *psContext, +static bool eventInitTrigger(ACTIVE_TRIGGER **ppsTrigger, SCRIPT_CONTEXT *psContext, UDWORD event, SDWORD trigger, UDWORD currTime); // Add a trigger to the list in order @@ -113,7 +113,7 @@ void eventTimeReset(UDWORD initTime) } /* Initialise the event system */ -BOOL eventInitialise() +bool eventInitialise() { psTrigList = NULL; psCallbackList = NULL; @@ -293,7 +293,7 @@ const char *eventGetEventID(SCRIPT_CODE *psCode, SDWORD event) } // Initialise the create/release function array - specify the maximum value type -BOOL eventInitValueFuncs(SDWORD maxType) +bool eventInitValueFuncs(SDWORD maxType) { ASSERT(asReleaseFuncs == NULL, "eventInitValueFuncs: array already initialised"); @@ -316,7 +316,7 @@ BOOL eventInitValueFuncs(SDWORD maxType) } // Add a new value create function -BOOL eventAddValueCreate(INTERP_TYPE type, VAL_CREATE_FUNC create) +bool eventAddValueCreate(INTERP_TYPE type, VAL_CREATE_FUNC create) { if (type >= numFuncs) { @@ -330,7 +330,7 @@ BOOL eventAddValueCreate(INTERP_TYPE type, VAL_CREATE_FUNC create) } // Add a new value release function -BOOL eventAddValueRelease(INTERP_TYPE type, VAL_RELEASE_FUNC release) +bool eventAddValueRelease(INTERP_TYPE type, VAL_RELEASE_FUNC release) { if (type >= numFuncs) { @@ -344,7 +344,7 @@ BOOL eventAddValueRelease(INTERP_TYPE type, VAL_RELEASE_FUNC release) } // Create a new context for a script -BOOL eventNewContext(SCRIPT_CODE *psCode, CONTEXT_RELEASE release, +bool eventNewContext(SCRIPT_CODE *psCode, CONTEXT_RELEASE release, SCRIPT_CONTEXT **ppsContext) { SCRIPT_CONTEXT *psContext; @@ -519,7 +519,7 @@ BOOL eventNewContext(SCRIPT_CODE *psCode, CONTEXT_RELEASE release, // Copy a context, including variable values -BOOL eventCopyContext(SCRIPT_CONTEXT *psContext, SCRIPT_CONTEXT **ppsNew) +bool eventCopyContext(SCRIPT_CONTEXT *psContext, SCRIPT_CONTEXT **ppsNew) { SCRIPT_CONTEXT *psNew; SDWORD val; @@ -555,7 +555,7 @@ BOOL eventCopyContext(SCRIPT_CONTEXT *psContext, SCRIPT_CONTEXT **ppsNew) // Add a new object to the trigger system // Time is the application time at which all the triggers are to be started -BOOL eventRunContext(SCRIPT_CONTEXT *psContext, UDWORD time) +bool eventRunContext(SCRIPT_CONTEXT *psContext, UDWORD time) { SDWORD event; ACTIVE_TRIGGER *psTrigger; @@ -724,7 +724,7 @@ void eventRemoveContext(SCRIPT_CONTEXT *psContext) } // Get the value pointer for a variable index -BOOL eventGetContextVal(SCRIPT_CONTEXT *psContext, UDWORD index, INTERP_VAL **ppsVal) +bool eventGetContextVal(SCRIPT_CONTEXT *psContext, UDWORD index, INTERP_VAL **ppsVal) { VAL_CHUNK *psChunk; @@ -747,7 +747,7 @@ BOOL eventGetContextVal(SCRIPT_CONTEXT *psContext, UDWORD index, INTERP_VAL **pp } // Set a global variable value for a context -BOOL eventSetContextVar(SCRIPT_CONTEXT *psContext, UDWORD index, INTERP_VAL *data) +bool eventSetContextVar(SCRIPT_CONTEXT *psContext, UDWORD index, INTERP_VAL *data) { INTERP_VAL *psVal; @@ -836,7 +836,7 @@ static void eventAddTrigger(ACTIVE_TRIGGER *psTrigger) // Initialise a trigger -static BOOL eventInitTrigger(ACTIVE_TRIGGER **ppsTrigger, SCRIPT_CONTEXT *psContext, +static bool eventInitTrigger(ACTIVE_TRIGGER **ppsTrigger, SCRIPT_CONTEXT *psContext, UDWORD event, SDWORD trigger, UDWORD currTime) { ACTIVE_TRIGGER *psNewTrig; @@ -876,7 +876,7 @@ static BOOL eventInitTrigger(ACTIVE_TRIGGER **ppsTrigger, SCRIPT_CONTEXT *psCont } // Load a trigger into the system from a save game -BOOL eventLoadTrigger(UDWORD time, SCRIPT_CONTEXT *psContext, +bool eventLoadTrigger(UDWORD time, SCRIPT_CONTEXT *psContext, SDWORD type, SDWORD trigger, UDWORD event, UDWORD offset) { ACTIVE_TRIGGER *psNewTrig; @@ -911,7 +911,7 @@ BOOL eventLoadTrigger(UDWORD time, SCRIPT_CONTEXT *psContext, } // add a TR_PAUSE trigger to the event system. -BOOL eventAddPauseTrigger(SCRIPT_CONTEXT *psContext, UDWORD event, UDWORD offset, +bool eventAddPauseTrigger(SCRIPT_CONTEXT *psContext, UDWORD event, UDWORD offset, UDWORD time) { ACTIVE_TRIGGER *psNewTrig; @@ -984,7 +984,7 @@ void eventFireCallbackTrigger(TRIGGER_TYPE callback) { ACTIVE_TRIGGER *psPrev = NULL, *psCurr, *psNext; TRIGGER_DATA *psTrigDat; - BOOL fired; + bool fired; if (interpProcessorActive()) { @@ -1093,9 +1093,9 @@ void eventFireCallbackTrigger(TRIGGER_TYPE callback) // Run a trigger -static BOOL eventFireTrigger(ACTIVE_TRIGGER *psTrigger) +static bool eventFireTrigger(ACTIVE_TRIGGER *psTrigger) { - BOOL fired; + bool fired; INTERP_VAL sResult; fired = false; @@ -1267,7 +1267,7 @@ static void eventMarkTriggerInList(ACTIVE_TRIGGER **ppsList, // Change the trigger assigned to an event - to be called from script functions -BOOL eventSetTrigger(void) +bool eventSetTrigger(void) { ACTIVE_TRIGGER *psTrigger; UDWORD event; @@ -1316,7 +1316,7 @@ BOOL eventSetTrigger(void) // set the event tracing level - to be called from script functions -BOOL eventSetTraceLevel(void) +bool eventSetTraceLevel(void) { SDWORD level; diff --git a/lib/script/event.h b/lib/script/event.h index 266ea4f81..211ac0240 100644 --- a/lib/script/event.h +++ b/lib/script/event.h @@ -83,7 +83,7 @@ struct ACTIVE_TRIGGER SWORD trigger; UWORD event; UWORD offset; - BOOL deactivated; // Whether the trigger is marked for deletion + bool deactivated; // Whether the trigger is marked for deletion ACTIVE_TRIGGER * psNext; }; @@ -138,17 +138,17 @@ extern SCRIPT_CONTEXT *psContList; /* Initialise the event system */ -extern BOOL eventInitialise(void); +extern bool eventInitialise(void); // Shutdown the event system extern void eventShutDown(void); // add a TR_PAUSE trigger to the event system. -extern BOOL eventAddPauseTrigger(SCRIPT_CONTEXT *psContext, UDWORD event, UDWORD offset, +extern bool eventAddPauseTrigger(SCRIPT_CONTEXT *psContext, UDWORD event, UDWORD offset, UDWORD time); // Load a trigger into the system from a save game -extern BOOL eventLoadTrigger(UDWORD time, SCRIPT_CONTEXT *psContext, +extern bool eventLoadTrigger(UDWORD time, SCRIPT_CONTEXT *psContext, SDWORD type, SDWORD trigger, UDWORD event, UDWORD offset); //resets the event timer - updateTime diff --git a/lib/script/eventsave.cpp b/lib/script/eventsave.cpp index c50368756..7a408ca2f 100644 --- a/lib/script/eventsave.cpp +++ b/lib/script/eventsave.cpp @@ -42,7 +42,7 @@ struct EVENT_SAVE_HDR // : public GAME_SAVEHEADER // save the context information for the script system -static BOOL eventSaveContext(char *pBuffer, UDWORD *pSize) +static bool eventSaveContext(char *pBuffer, UDWORD *pSize) { UDWORD size, valSize; SDWORD numVars, i, numContext; @@ -213,7 +213,7 @@ static BOOL eventSaveContext(char *pBuffer, UDWORD *pSize) } // load the context information for the script system -static BOOL eventLoadContext(const SDWORD version, char *pBuffer, UDWORD *pSize) +static bool eventLoadContext(const SDWORD version, char *pBuffer, UDWORD *pSize) { UDWORD size, valSize,stringLen; SDWORD numVars, i, numContext, context; @@ -287,9 +287,9 @@ static BOOL eventLoadContext(const SDWORD version, char *pBuffer, UDWORD *pSize) switch (type) { case VAL_BOOL: - data.v.bval = *((BOOL*)pPos); - pPos += sizeof(BOOL); - size += sizeof(BOOL); + data.v.bval = *((bool*)pPos); + pPos += sizeof(bool); + size += sizeof(bool); break; case VAL_FLOAT: data.v.fval = *((float*)pPos); @@ -389,7 +389,7 @@ static BOOL eventLoadContext(const SDWORD version, char *pBuffer, UDWORD *pSize) } // return the index of a context -static BOOL eventGetContextIndex(SCRIPT_CONTEXT *psContext, SDWORD *pIndex) +static bool eventGetContextIndex(SCRIPT_CONTEXT *psContext, SDWORD *pIndex) { SCRIPT_CONTEXT *psCurr; SDWORD index; @@ -409,7 +409,7 @@ static BOOL eventGetContextIndex(SCRIPT_CONTEXT *psContext, SDWORD *pIndex) } // find a context from it's id number -static BOOL eventFindContext(SDWORD id, SCRIPT_CONTEXT **ppsContext) +static bool eventFindContext(SDWORD id, SCRIPT_CONTEXT **ppsContext) { SCRIPT_CONTEXT *psCurr; @@ -426,7 +426,7 @@ static BOOL eventFindContext(SDWORD id, SCRIPT_CONTEXT **ppsContext) } // save a list of triggers -static BOOL eventSaveTriggerList(ACTIVE_TRIGGER *psList, char *pBuffer, UDWORD *pSize) +static bool eventSaveTriggerList(ACTIVE_TRIGGER *psList, char *pBuffer, UDWORD *pSize) { ACTIVE_TRIGGER *psCurr; UDWORD size; @@ -491,7 +491,7 @@ static BOOL eventSaveTriggerList(ACTIVE_TRIGGER *psList, char *pBuffer, UDWORD * // load a list of triggers -static BOOL eventLoadTriggerList(WZ_DECL_UNUSED const SDWORD version, char *pBuffer, UDWORD *pSize) +static bool eventLoadTriggerList(WZ_DECL_UNUSED const SDWORD version, char *pBuffer, UDWORD *pSize) { UDWORD size, event, offset, time; char *pPos; @@ -554,7 +554,7 @@ static BOOL eventLoadTriggerList(WZ_DECL_UNUSED const SDWORD version, char *pBuf // Save the state of the event system -BOOL eventSaveState(SDWORD version, char **ppBuffer, UDWORD *pFileSize) +bool eventSaveState(SDWORD version, char **ppBuffer, UDWORD *pFileSize) { UDWORD size, totalSize; char *pBuffer, *pPos; @@ -633,7 +633,7 @@ BOOL eventSaveState(SDWORD version, char **ppBuffer, UDWORD *pFileSize) // Load the state of the event system -BOOL eventLoadState(char *pBuffer, UDWORD fileSize) +bool eventLoadState(char *pBuffer, UDWORD fileSize) { UDWORD size, totalSize, version; char *pPos; diff --git a/lib/script/eventsave.h b/lib/script/eventsave.h index 56a72956c..8f9720bb2 100644 --- a/lib/script/eventsave.h +++ b/lib/script/eventsave.h @@ -28,9 +28,9 @@ #define _evntsave_h // Save the state of the event system -extern BOOL eventSaveState(SDWORD version, char **ppBuffer, UDWORD *pFileSize); +extern bool eventSaveState(SDWORD version, char **ppBuffer, UDWORD *pFileSize); // Load the state of the event system -extern BOOL eventLoadState(char *pBuffer, UDWORD fileSize); +extern bool eventLoadState(char *pBuffer, UDWORD fileSize); #endif diff --git a/lib/script/interpreter.cpp b/lib/script/interpreter.cpp index a41356845..ca64dc83b 100644 --- a/lib/script/interpreter.cpp +++ b/lib/script/interpreter.cpp @@ -56,14 +56,14 @@ static inline void retStackReset(void); * * \return True when empty, false otherwise */ -static inline BOOL retStackIsEmpty(void); +static inline bool retStackIsEmpty(void); /** * Check whether the return address stack is full * * \return True when full, false otherwise */ -static inline BOOL retStackIsFull(void); +static inline bool retStackIsFull(void); /** * Push a new address/event pair on the return address stack @@ -72,7 +72,7 @@ static inline BOOL retStackIsFull(void); * \param ReturnAddress Address to return to * \return False on failure (stack full) */ -static BOOL retStackPush(UDWORD CallerIndex, INTERP_VAL *ReturnAddress); +static bool retStackPush(UDWORD CallerIndex, INTERP_VAL *ReturnAddress); /** * Pop an address/event pair from the return address stack @@ -81,7 +81,7 @@ static BOOL retStackPush(UDWORD CallerIndex, INTERP_VAL *ReturnAddress); * \param ReturnAddress Address to return to * \return False on failure (stack empty) */ -static BOOL retStackPop(UDWORD *CallerIndex, INTERP_VAL **ReturnAddress); +static bool retStackPop(UDWORD *CallerIndex, INTERP_VAL **ReturnAddress); /* Creates a new local var environment for a new function call */ static inline void createVarEnvironment(SCRIPT_CONTEXT *psContext, UDWORD eventIndex); @@ -151,13 +151,13 @@ SDWORD aOpSize[] = static TYPE_EQUIV *asInterpTypeEquiv = NULL; // whether the interpreter is running -static BOOL bInterpRunning = false; +static bool bInterpRunning = false; /* Whether to output trace information */ -static BOOL interpTrace = false; +static bool interpTrace = false; static SCRIPT_CODE *psCurProg = NULL; -static BOOL bCurCallerIsEvent = false; +static bool bCurCallerIsEvent = false; /* Print out trace info if tracing is turned on */ #define TRCPRINTF(...) do { if (interpTrace) { fprintf( stderr, __VA_ARGS__ ); } } while (false) @@ -184,7 +184,7 @@ static BOOL bCurCallerIsEvent = false; // true if the interpreter is currently running -BOOL interpProcessorActive(void) +bool interpProcessorActive(void) { return bInterpRunning; } @@ -205,7 +205,7 @@ static inline INTERP_VAL *interpGetVarData(VAL_CHUNK *psGlobals, UDWORD index) } // get the array data for an array operation -static BOOL interpGetArrayVarData(INTERP_VAL **pip, VAL_CHUNK *psGlobals, SCRIPT_CODE *psProg, INTERP_VAL **ppsVal) +static bool interpGetArrayVarData(INTERP_VAL **pip, VAL_CHUNK *psGlobals, SCRIPT_CODE *psProg, INTERP_VAL **ppsVal) { SDWORD i, dimensions, vals[VAR_MAX_DIMENSIONS]; UBYTE *elements; @@ -271,7 +271,7 @@ static BOOL interpGetArrayVarData(INTERP_VAL **pip, VAL_CHUNK *psGlobals, SCRIPT // Initialise the interpreter -BOOL interpInitialise(void) +bool interpInitialise(void) { asInterpTypeEquiv = NULL; @@ -279,7 +279,7 @@ BOOL interpInitialise(void) } /* Run a compiled script */ -BOOL interpRunScript(SCRIPT_CONTEXT *psContext, INTERP_RUNTYPE runType, UDWORD index, UDWORD offset) +bool interpRunScript(SCRIPT_CONTEXT *psContext, INTERP_RUNTYPE runType, UDWORD index, UDWORD offset) { UDWORD data; OPCODE opcode; @@ -293,9 +293,9 @@ BOOL interpRunScript(SCRIPT_CONTEXT *psContext, INTERP_RUNTYPE runType, UDWORD i SDWORD instructionCount = 0; UDWORD CurEvent = 0; - BOOL bStop = false, bEvent = false; + bool bStop = false, bEvent = false; UDWORD callDepth = 0; - BOOL bTraceOn=false; //enable to debug function/event calls + bool bTraceOn=false; //enable to debug function/event calls ASSERT( psContext != NULL, "interpRunScript: invalid context pointer" ); @@ -955,9 +955,9 @@ void scriptSetTypeEquiv(TYPE_EQUIV *psTypeTab) * Means: Their data can be copied without conversion. * I.e. strings are NOT equivalent to anything but strings, even though they can be converted */ -BOOL interpCheckEquiv(INTERP_TYPE to, INTERP_TYPE from) +bool interpCheckEquiv(INTERP_TYPE to, INTERP_TYPE from) { - BOOL toRef = false, fromRef = false; + bool toRef = false, fromRef = false; // check for the VAL_REF flag if (to & VAL_REF) @@ -1010,7 +1010,7 @@ BOOL interpCheckEquiv(INTERP_TYPE to, INTERP_TYPE from) /* Instinct function to turn on tracing */ -BOOL interpTraceOn(void) +bool interpTraceOn(void) { interpTrace = true; @@ -1018,7 +1018,7 @@ BOOL interpTraceOn(void) } /* Instinct function to turn off tracing */ -BOOL interpTraceOff(void) +bool interpTraceOff(void) { interpTrace = false; @@ -1046,21 +1046,21 @@ static inline void retStackReset(void) } -static inline BOOL retStackIsEmpty(void) +static inline bool retStackIsEmpty(void) { if(retStackPos < 0) return true; return false; } -static inline BOOL retStackIsFull(void) +static inline bool retStackIsFull(void) { if(retStackPos >= MAX_FUNC_CALLS) return true; return false; } -static BOOL retStackPush(UDWORD CallerIndex, INTERP_VAL *ReturnAddress) +static bool retStackPush(UDWORD CallerIndex, INTERP_VAL *ReturnAddress) { if (retStackIsFull()) { @@ -1078,7 +1078,7 @@ static BOOL retStackPush(UDWORD CallerIndex, INTERP_VAL *ReturnAddress) } -static BOOL retStackPop(UDWORD *CallerIndex, INTERP_VAL **ReturnAddress) +static bool retStackPop(UDWORD *CallerIndex, INTERP_VAL **ReturnAddress) { if (retStackIsEmpty()) { diff --git a/lib/script/interpreter.h b/lib/script/interpreter.h index 32e3181e5..2d6643b9f 100644 --- a/lib/script/interpreter.h +++ b/lib/script/interpreter.h @@ -26,10 +26,10 @@ #define _interp_h /* The type of function called by an OP_CALL */ -typedef BOOL (*SCRIPT_FUNC)(void); +typedef bool (*SCRIPT_FUNC)(void); /* The type of function called to access an object or in-game variable */ -typedef BOOL (*SCRIPT_VARFUNC)(UDWORD index); +typedef bool (*SCRIPT_VARFUNC)(UDWORD index); /* The possible value types for scripts */ enum INTERP_TYPE @@ -70,7 +70,7 @@ struct INTERP_VAL void *oval; //Object value - any in-game object float fval; //Float value - VAL_FLOAT int ival; // Integer value - VAL_INT - BOOL bval; //Boolean value - VAL_BOOL + bool bval; //Boolean value - VAL_BOOL } v; }; @@ -222,7 +222,7 @@ enum TRIGGER_TYPE struct TRIGGER_DATA { TRIGGER_TYPE type; // Type of trigger - UWORD code; // BOOL - is there code with this trigger + UWORD code; // bool - is there code with this trigger UDWORD time; // How often to check the trigger }; @@ -273,13 +273,13 @@ enum INTERP_RUNTYPE extern SDWORD aOpSize[]; /* Check if two types are equivalent */ -extern BOOL interpCheckEquiv(INTERP_TYPE to, INTERP_TYPE from) WZ_DECL_PURE; +extern bool interpCheckEquiv(INTERP_TYPE to, INTERP_TYPE from) WZ_DECL_PURE; // Initialise the interpreter -extern BOOL interpInitialise(void); +extern bool interpInitialise(void); // true if the interpreter is currently running -extern BOOL interpProcessorActive(void); +extern bool interpProcessorActive(void); /* Output script call stack trace */ extern void scrOutputCallTrace(code_part part); diff --git a/lib/script/parse.h b/lib/script/parse.h index 206d07557..adc5bbf34 100644 --- a/lib/script/parse.h +++ b/lib/script/parse.h @@ -107,9 +107,9 @@ enum ACCESS_TYPE // function pointer for script variable saving // if pBuffer is NULL the script system is just asking how much space the saved variable will require // otherwise pBuffer points to an array to store the value in -typedef BOOL (*SCR_VAL_SAVE)(INTERP_VAL *psVal, char *pBuffer, UDWORD *pSize); +typedef bool (*SCR_VAL_SAVE)(INTERP_VAL *psVal, char *pBuffer, UDWORD *pSize); // function pointer for script variable loading -typedef BOOL (*SCR_VAL_LOAD)(SDWORD version, INTERP_VAL *psVal, char *pBuffer, UDWORD size); +typedef bool (*SCR_VAL_LOAD)(SDWORD version, INTERP_VAL *psVal, char *pBuffer, UDWORD size); /* Type for a user type symbol */ struct TYPE_SYMBOL @@ -167,7 +167,7 @@ struct CONST_SYMBOL * Only one of these will be valid depending on type. * A union is not used as a union cannot be statically initialised */ - BOOL bval; + bool bval; SDWORD ival; void *oval; char *sval; //String values @@ -195,7 +195,7 @@ struct FUNC_SYMBOL UDWORD numParams; // Number of parameters to the function uint32_t/*INTERP_TYPE*/ aParams[INST_MAXPARAMS]; // List of parameter types - BOOL script; // Whether the function is defined in the script + bool script; // Whether the function is defined in the script // or a C instinct function UDWORD size; // The size of script code INTERP_VAL *pCode; // The code for a function if it is defined in the script @@ -265,8 +265,8 @@ struct EVENT_SYMBOL //functions stuff UDWORD numParams; //Number of parameters to the function UDWORD numLocalVars; //local variables - BOOL bFunction; //if this event is defined as a function - BOOL bDeclared; //if function was declared before + bool bFunction; //if this event is defined as a function + bool bDeclared; //if function was declared before INTERP_TYPE retType; //return type if a function INTERP_TYPE aParams[INST_MAXPARAMS]; @@ -296,7 +296,7 @@ extern CALLBACK_SYMBOL *asScrCallbackTab; extern void scriptSetInputFile(PHYSFS_file* fileHandle); /* Initialise the parser ready for a new script */ -extern BOOL scriptInitParser(void); +extern bool scriptInitParser(void); /* Set off the scenario file parser */ extern int scr_parse(void); @@ -307,55 +307,55 @@ void scr_error(const char *pMessage, ...) WZ_DECL_FORMAT(printf, 1, 2); extern void scriptGetErrorData(int *pLine, char **ppText); /* Look up a type symbol */ -extern BOOL scriptLookUpType(const char *pIdent, INTERP_TYPE *pType); +extern bool scriptLookUpType(const char *pIdent, INTERP_TYPE *pType); /* Add a new variable symbol */ -extern BOOL scriptAddVariable(VAR_DECL *psStorage, VAR_IDENT_DECL *psVarIdent); +extern bool scriptAddVariable(VAR_DECL *psStorage, VAR_IDENT_DECL *psVarIdent); /* Add a new trigger symbol */ -extern BOOL scriptAddTrigger(const char *pIdent, TRIGGER_DECL *psDecl, UDWORD line); +extern bool scriptAddTrigger(const char *pIdent, TRIGGER_DECL *psDecl, UDWORD line); /* Add a new event symbol */ -extern BOOL scriptDeclareEvent(const char *pIdent, EVENT_SYMBOL **ppsEvent, SDWORD numArgs); +extern bool scriptDeclareEvent(const char *pIdent, EVENT_SYMBOL **ppsEvent, SDWORD numArgs); // Add the code to a defined event -extern BOOL scriptDefineEvent(EVENT_SYMBOL *psEvent, CODE_BLOCK *psCode, SDWORD trigger); +extern bool scriptDefineEvent(EVENT_SYMBOL *psEvent, CODE_BLOCK *psCode, SDWORD trigger); /* Look up a variable symbol */ -extern BOOL scriptLookUpVariable(const char *pIdent, VAR_SYMBOL **ppsSym); +extern bool scriptLookUpVariable(const char *pIdent, VAR_SYMBOL **ppsSym); /* Look up a constant variable symbol */ -extern BOOL scriptLookUpConstant(const char *pIdent, CONST_SYMBOL **ppsSym); +extern bool scriptLookUpConstant(const char *pIdent, CONST_SYMBOL **ppsSym); /* Lookup a trigger symbol */ -extern BOOL scriptLookUpTrigger(const char *pIdent, TRIGGER_SYMBOL **ppsTrigger); +extern bool scriptLookUpTrigger(const char *pIdent, TRIGGER_SYMBOL **ppsTrigger); /* Lookup a callback trigger symbol */ -extern BOOL scriptLookUpCallback(const char *pIdent, CALLBACK_SYMBOL **ppsCallback); +extern bool scriptLookUpCallback(const char *pIdent, CALLBACK_SYMBOL **ppsCallback); /* Lookup an event symbol */ -extern BOOL scriptLookUpEvent(const char *pIdent, EVENT_SYMBOL **ppsEvent); +extern bool scriptLookUpEvent(const char *pIdent, EVENT_SYMBOL **ppsEvent); /* Add a new function symbol */ -extern BOOL scriptStartFunctionDef(const char *pIdent, // Functions name +extern bool scriptStartFunctionDef(const char *pIdent, // Functions name INTERP_TYPE type); // return type /* Store the parameter types for the current script function definition */ -extern BOOL scriptSetParameters(UDWORD numParams, // number of parameters +extern bool scriptSetParameters(UDWORD numParams, // number of parameters INTERP_TYPE *pParams); // parameter types /* Store the code for a script function definition. * Clean up the local variable list for this function definition. */ -extern BOOL scriptSetCode(CODE_BLOCK *psBlock); // The code block +extern bool scriptSetCode(CODE_BLOCK *psBlock); // The code block /* Look up a function symbol */ -extern BOOL scriptLookUpFunction(const char *pIdent, FUNC_SYMBOL **ppsSym); +extern bool scriptLookUpFunction(const char *pIdent, FUNC_SYMBOL **ppsSym); /* Look up an in-script custom function symbol */ -extern BOOL scriptLookUpCustomFunction(const char *pIdent, EVENT_SYMBOL **ppsSym); +extern bool scriptLookUpCustomFunction(const char *pIdent, EVENT_SYMBOL **ppsSym); -extern BOOL popArguments(INTERP_VAL **ip_temp, SDWORD numParams); +extern bool popArguments(INTERP_VAL **ip_temp, SDWORD numParams); extern void widgCopyString(char *pDest, const char *pSrc); // FIXME Duplicate declaration of internal widget function diff --git a/lib/script/script.cpp b/lib/script/script.cpp index 4b64e7889..40ac60a79 100644 --- a/lib/script/script.cpp +++ b/lib/script/script.cpp @@ -39,7 +39,7 @@ // Initialise the script library -BOOL scriptInitialise() +bool scriptInitialise() { if (!stackInitialise()) { @@ -148,7 +148,7 @@ void scriptFreeCode(SCRIPT_CODE *psCode) /* Lookup a script variable */ -BOOL scriptGetVarIndex(SCRIPT_CODE *psCode, char *pID, UDWORD *pIndex) +bool scriptGetVarIndex(SCRIPT_CODE *psCode, char *pID, UDWORD *pIndex) { UDWORD index; @@ -173,7 +173,7 @@ BOOL scriptGetVarIndex(SCRIPT_CODE *psCode, char *pID, UDWORD *pIndex) all types are listed explicitly, with asserts/warnings for invalid/unrecognised types, as getting this wrong will cause segfaults if sizeof(void*) != sizeof(SDWORD) (eg. amd64). a lot of these aren't currently checked for, but it's a lot clearer what's going on if they're all here */ -BOOL scriptTypeIsPointer(INTERP_TYPE type) +bool scriptTypeIsPointer(INTERP_TYPE type) { ASSERT((SCR_USER_TYPES)type < ST_MAXTYPE || type >= VAL_REF, "Invalid type: %d", type); // any value or'ed with VAL_REF is a pointer diff --git a/lib/script/script.h b/lib/script/script.h index 6ae8271de..7f92cd860 100644 --- a/lib/script/script.h +++ b/lib/script/script.h @@ -43,7 +43,7 @@ enum SCR_DEBUGTYPE #define SCRIPTTYPE SCR_DEBUGINFO // Initialise the script library -extern BOOL scriptInitialise(void); +extern bool scriptInitialise(void); // Shutdown the script library extern void scriptShutDown(void); @@ -108,17 +108,17 @@ extern SCRIPT_CODE* scriptCompile(PHYSFS_file* fileHandle, SCR_DEBUGTYPE debugTy extern void scriptFreeCode(SCRIPT_CODE *psCode); /* Lookup a script variable */ -extern BOOL scriptGetVarIndex(SCRIPT_CODE *psCode, char *pID, UDWORD *pIndex); +extern bool scriptGetVarIndex(SCRIPT_CODE *psCode, char *pID, UDWORD *pIndex); /* returns true if passed INTERP_TYPE is used as a pointer in INTERP_VAL, false otherwise */ -extern BOOL scriptTypeIsPointer(INTERP_TYPE type); +extern bool scriptTypeIsPointer(INTERP_TYPE type); extern const char *scriptTypeToString(INTERP_TYPE type) WZ_DECL_PURE; extern const char *scriptOpcodeToString(OPCODE opcode) WZ_DECL_PURE; extern const char *scriptFunctionToString(SCRIPT_FUNC function) WZ_DECL_PURE; /* Run a compiled script */ -extern BOOL interpRunScript(SCRIPT_CONTEXT *psContext, INTERP_RUNTYPE runType, +extern bool interpRunScript(SCRIPT_CONTEXT *psContext, INTERP_RUNTYPE runType, UDWORD index, UDWORD offset); @@ -131,40 +131,40 @@ extern BOOL interpRunScript(SCRIPT_CONTEXT *psContext, INTERP_RUNTYPE runType, extern void eventReset(void); // Initialise the create/release function array - specify the maximum value type -extern BOOL eventInitValueFuncs(SDWORD maxType); +extern bool eventInitValueFuncs(SDWORD maxType); // a create function for data stored in an INTERP_VAL -typedef BOOL (*VAL_CREATE_FUNC)(INTERP_VAL *psVal); +typedef bool (*VAL_CREATE_FUNC)(INTERP_VAL *psVal); // a release function for data stored in an INTERP_VAL typedef void (*VAL_RELEASE_FUNC)(INTERP_VAL *psVal); // Add a new value create function -extern BOOL eventAddValueCreate(INTERP_TYPE type, VAL_CREATE_FUNC create); +extern bool eventAddValueCreate(INTERP_TYPE type, VAL_CREATE_FUNC create); // Add a new value release function -extern BOOL eventAddValueRelease(INTERP_TYPE type, VAL_RELEASE_FUNC release); +extern bool eventAddValueRelease(INTERP_TYPE type, VAL_RELEASE_FUNC release); // Create a new context for a script -extern BOOL eventNewContext(SCRIPT_CODE *psCode, +extern bool eventNewContext(SCRIPT_CODE *psCode, CONTEXT_RELEASE release, SCRIPT_CONTEXT **ppsContext); // Copy a context, including variable values -extern BOOL eventCopyContext(SCRIPT_CONTEXT *psContext, SCRIPT_CONTEXT **ppsNew); +extern bool eventCopyContext(SCRIPT_CONTEXT *psContext, SCRIPT_CONTEXT **ppsNew); // Add a new object to the trigger system // Time is the application time at which all the triggers are to be started -extern BOOL eventRunContext(SCRIPT_CONTEXT *psContext, UDWORD time); +extern bool eventRunContext(SCRIPT_CONTEXT *psContext, UDWORD time); // Remove a context from the event system extern void eventRemoveContext(SCRIPT_CONTEXT *psContext); // Set a global variable value for a context -extern BOOL eventSetContextVar(SCRIPT_CONTEXT *psContext, UDWORD index, +extern bool eventSetContextVar(SCRIPT_CONTEXT *psContext, UDWORD index, INTERP_VAL *data); // Get the value pointer for a variable index -extern BOOL eventGetContextVal(SCRIPT_CONTEXT *psContext, UDWORD index, +extern bool eventGetContextVal(SCRIPT_CONTEXT *psContext, UDWORD index, INTERP_VAL **ppsVal); // Process all the currently active triggers @@ -184,10 +184,10 @@ extern void eventFireCallbackTrigger(TRIGGER_TYPE callback); * The varargs part is a set of INTERP_TYPE, UDWORD * pairs. * The value of the parameter is stored in the DWORD pointed to by the UDWORD * */ -extern BOOL stackPopParams(unsigned int numParams, ...); +extern bool stackPopParams(unsigned int numParams, ...); /* Push a value onto the stack without using a value structure */ -extern BOOL stackPushResult(INTERP_TYPE type, INTERP_VAL *result); +extern bool stackPushResult(INTERP_TYPE type, INTERP_VAL *result); /*********************************************************************************** * @@ -207,20 +207,20 @@ extern BOOL stackPushResult(INTERP_TYPE type, INTERP_VAL *result); */ /* Instinct function to turn on tracing */ -extern BOOL interpTraceOn(void); +extern bool interpTraceOn(void); /* Instinct function to turn off tracing */ -extern BOOL interpTraceOff(void); +extern bool interpTraceOff(void); // Change the trigger assigned to an event // This is an instinct function that takes a VAL_EVENT and VAL_TRIGGER as parameters -extern BOOL eventSetTrigger(void); +extern bool eventSetTrigger(void); // set the event tracing level // 0 - no tracing // 1 - only fired triggers // 2 - added and fired triggers // 3 - as 2 but show tested but not fired triggers as well -extern BOOL eventSetTraceLevel(void); +extern bool eventSetTraceLevel(void); #endif diff --git a/lib/script/script_lexer.l b/lib/script/script_lexer.l index d4d25279e..fada463ba 100644 --- a/lib/script/script_lexer.l +++ b/lib/script/script_lexer.l @@ -61,7 +61,7 @@ static char aText[TEXT_BUFFERS][YYLMAX]; static UDWORD currText=0; // Note if we are in a comment -static BOOL inComment = false; +static bool inComment = false; /* FLEX include buffer stack */ static YY_BUFFER_STATE include_stack[MAX_SCR_INCLUDE_DEPTH]; @@ -106,7 +106,7 @@ static YYSTYPE dummy; /* Get the token type for a variable symbol */ static SDWORD scriptGetVarToken(VAR_SYMBOL *psVar) { - BOOL object; + bool object; // See if this is an object pointer if (!asScrTypeTab || psVar->type < VAL_USERTYPESTART) @@ -220,7 +220,7 @@ static SDWORD scriptGetVarToken(VAR_SYMBOL *psVar) /* Get the token type for a constant symbol */ static SDWORD scriptGetConstToken(CONST_SYMBOL *psConst) { - BOOL object; + bool object; // See if this is an object constant if (!asScrTypeTab || psConst->type < VAL_USERTYPESTART) @@ -261,7 +261,7 @@ static SDWORD scriptGetConstToken(CONST_SYMBOL *psConst) /* Get the token type for a function symbol */ static SDWORD scriptGetFuncToken(FUNC_SYMBOL *psFunc) { - BOOL object; + bool object; // See if this is an object pointer if(psFunc->type >= VAL_USERTYPESTART) @@ -299,7 +299,7 @@ static SDWORD scriptGetFuncToken(FUNC_SYMBOL *psFunc) /* Get the token type for a custom function symbol */ static SDWORD scriptGetCustomFuncToken(EVENT_SYMBOL *psFunc) { - BOOL object; + bool object; // See if this is an object pointer if (!asScrTypeTab || psFunc->retType < VAL_USERTYPESTART) @@ -348,7 +348,7 @@ static SDWORD scriptGetCustomFuncToken(EVENT_SYMBOL *psFunc) } /* Look up defined macro and return new define buffer */ -static BOOL scriptLoopUpMacro(const char *pMacro, char **ppMacroBody) +static bool scriptLoopUpMacro(const char *pMacro, char **ppMacroBody) { unsigned int i; @@ -498,7 +498,7 @@ pause return PAUSE; /* Match type keywords */ void|VOID { scr_lval.tval = VAL_VOID; return _VOID; } string|STRING { scr_lval.tval = VAL_STRING; return TYPE; } -bool|BOOL { scr_lval.tval = VAL_BOOL; return TYPE; } +bool|bool { scr_lval.tval = VAL_BOOL; return TYPE; } int|INT { scr_lval.tval = VAL_INT; return TYPE; } float|FLOAT { scr_lval.tval = VAL_FLOAT; return TYPE; } diff --git a/lib/script/script_parser.y b/lib/script/script_parser.y index b4314f462..1322e3456 100644 --- a/lib/script/script_parser.y +++ b/lib/script/script_parser.y @@ -67,7 +67,7 @@ static OBJVAR_BLOCK *psObjVarBlock=NULL; static PARAM_BLOCK *psCurrPBlock=NULL; /* Any errors occured? */ -static BOOL bError=false; +static bool bError=false; //String support //----------------------------- @@ -111,7 +111,7 @@ EVENT_SYMBOL *psCurEvent = NULL; /* stores current event: for local var declar static INTERP_TYPE objVarContext = (INTERP_TYPE)0; /* Control whether debug info is generated */ -static BOOL genDebugInfo = true; +static bool genDebugInfo = true; /* Currently defined triggers */ static TRIGGER_SYMBOL *psTriggers; @@ -124,7 +124,7 @@ static UDWORD numEvents; /* This is true when local variables are being defined. * (So local variables can have the same name as global ones) */ -static BOOL localVariableDef=false; +static bool localVariableDef=false; /* The identifier for the current script function being defined */ //static char *pCurrFuncIdent=NULL; @@ -531,7 +531,7 @@ static void freeVARIDENTDECL(VAR_IDENT_DECL* psDcl) /* Macros to store a value in a code block */ #define PUT_DATA_BOOL(ip, value) \ (ip)->type = VAL_BOOL; \ - (ip)->v.bval = (BOOL)(value); \ + (ip)->v.bval = (bool)(value); \ (ip)++ #define PUT_DATA_INT(ip, value) \ @@ -714,13 +714,13 @@ void script_debug(const char *pFormat, ...) */ static CODE_ERROR scriptCodeFunction(FUNC_SYMBOL *psFSymbol, // The function being called PARAM_BLOCK *psPBlock, // The functions parameters - BOOL expContext, // Whether the function is being + bool expContext, // Whether the function is being // called in an expression context CODE_BLOCK **ppsCBlock) // The generated code block { UDWORD size, i; INTERP_VAL *ip; - BOOL typeError = false; + bool typeError = false; char aErrorString[255]; INTERP_TYPE type1,type2; @@ -853,7 +853,7 @@ static CODE_ERROR scriptCodeCallbackParams( { UDWORD size, i; INTERP_VAL *ip; - BOOL typeError = false; + bool typeError = false; char aErrorString[255]; ASSERT( psPBlock != NULL, @@ -1256,7 +1256,7 @@ static CODE_ERROR scriptCodeBinaryOperator(CODE_BLOCK *psFirst, // Code for firs /* check if the arguments in the function definition body match the argument types and names from function declaration (if there was any) */ -static BOOL checkFuncParamType(UDWORD argIndex, UDWORD argType) +static bool checkFuncParamType(UDWORD argIndex, UDWORD argType) { VAR_SYMBOL *psCurr; SDWORD i,j; @@ -1557,7 +1557,7 @@ static CODE_ERROR scriptCodeVarRef(VAR_SYMBOL *psVariable, // The object variab %union { /* Types returned by the lexer */ - BOOL bval; + bool bval; float fval; SDWORD ival; char *sval; @@ -5706,7 +5706,7 @@ void scr_error(const char *pMessage, ...) /* Look up a type symbol */ -BOOL scriptLookUpType(const char *pIdent, INTERP_TYPE *pType) +bool scriptLookUpType(const char *pIdent, INTERP_TYPE *pType) { UDWORD i; @@ -5730,7 +5730,7 @@ BOOL scriptLookUpType(const char *pIdent, INTERP_TYPE *pType) } /* pop passed arguments (if any) */ -BOOL popArguments(INTERP_VAL **ip_temp, SDWORD numParams) +bool popArguments(INTERP_VAL **ip_temp, SDWORD numParams) { SDWORD i; @@ -5748,7 +5748,7 @@ BOOL popArguments(INTERP_VAL **ip_temp, SDWORD numParams) * If localVariableDef is true a local variable symbol is defined, * otherwise a global variable symbol is defined. */ -BOOL scriptAddVariable(VAR_DECL *psStorage, VAR_IDENT_DECL *psVarIdent) +bool scriptAddVariable(VAR_DECL *psStorage, VAR_IDENT_DECL *psVarIdent) { VAR_SYMBOL *psNew; unsigned int i; @@ -5838,7 +5838,7 @@ BOOL scriptAddVariable(VAR_DECL *psStorage, VAR_IDENT_DECL *psVarIdent) } /* Look up a variable symbol */ -BOOL scriptLookUpVariable(const char *pIdent, VAR_SYMBOL **ppsSym) +bool scriptLookUpVariable(const char *pIdent, VAR_SYMBOL **ppsSym) { VAR_SYMBOL *psCurr; UDWORD i; @@ -5945,7 +5945,7 @@ BOOL scriptLookUpVariable(const char *pIdent, VAR_SYMBOL **ppsSym) /* Add a new trigger symbol */ -BOOL scriptAddTrigger(const char *pIdent, TRIGGER_DECL *psDecl, UDWORD line) +bool scriptAddTrigger(const char *pIdent, TRIGGER_DECL *psDecl, UDWORD line) { TRIGGER_SYMBOL *psTrigger, *psCurr, *psPrev; @@ -6018,7 +6018,7 @@ BOOL scriptAddTrigger(const char *pIdent, TRIGGER_DECL *psDecl, UDWORD line) /* Lookup a trigger symbol */ -BOOL scriptLookUpTrigger(const char *pIdent, TRIGGER_SYMBOL **ppsTrigger) +bool scriptLookUpTrigger(const char *pIdent, TRIGGER_SYMBOL **ppsTrigger) { TRIGGER_SYMBOL *psCurr; @@ -6041,7 +6041,7 @@ BOOL scriptLookUpTrigger(const char *pIdent, TRIGGER_SYMBOL **ppsTrigger) /* Lookup a callback trigger symbol */ -BOOL scriptLookUpCallback(const char *pIdent, CALLBACK_SYMBOL **ppsCallback) +bool scriptLookUpCallback(const char *pIdent, CALLBACK_SYMBOL **ppsCallback) { CALLBACK_SYMBOL *psCurr; @@ -6067,7 +6067,7 @@ BOOL scriptLookUpCallback(const char *pIdent, CALLBACK_SYMBOL **ppsCallback) } /* Add a new event symbol */ -BOOL scriptDeclareEvent(const char *pIdent, EVENT_SYMBOL **ppsEvent, SDWORD numArgs) +bool scriptDeclareEvent(const char *pIdent, EVENT_SYMBOL **ppsEvent, SDWORD numArgs) { EVENT_SYMBOL *psEvent, *psCurr, *psPrev; @@ -6119,7 +6119,7 @@ BOOL scriptDeclareEvent(const char *pIdent, EVENT_SYMBOL **ppsEvent, SDWORD numA } // Add the code to a defined event -BOOL scriptDefineEvent(EVENT_SYMBOL *psEvent, CODE_BLOCK *psCode, SDWORD trigger) +bool scriptDefineEvent(EVENT_SYMBOL *psEvent, CODE_BLOCK *psCode, SDWORD trigger) { ASSERT(psCode != NULL, "scriptDefineEvent: psCode == NULL"); ASSERT(psCode->size > 0, @@ -6172,7 +6172,7 @@ BOOL scriptDefineEvent(EVENT_SYMBOL *psEvent, CODE_BLOCK *psCode, SDWORD trigger } /* Lookup an event symbol */ -BOOL scriptLookUpEvent(const char *pIdent, EVENT_SYMBOL **ppsEvent) +bool scriptLookUpEvent(const char *pIdent, EVENT_SYMBOL **ppsEvent) { EVENT_SYMBOL *psCurr; //debug(LOG_SCRIPT, "scriptLookUpEvent"); @@ -6192,7 +6192,7 @@ BOOL scriptLookUpEvent(const char *pIdent, EVENT_SYMBOL **ppsEvent) /* Look up a constant variable symbol */ -BOOL scriptLookUpConstant(const char *pIdent, CONST_SYMBOL **ppsSym) +bool scriptLookUpConstant(const char *pIdent, CONST_SYMBOL **ppsSym) { CONST_SYMBOL *psCurr; @@ -6218,7 +6218,7 @@ BOOL scriptLookUpConstant(const char *pIdent, CONST_SYMBOL **ppsSym) /* Look up a function symbol */ -BOOL scriptLookUpFunction(const char *pIdent, FUNC_SYMBOL **ppsSym) +bool scriptLookUpFunction(const char *pIdent, FUNC_SYMBOL **ppsSym) { UDWORD i; @@ -6245,7 +6245,7 @@ BOOL scriptLookUpFunction(const char *pIdent, FUNC_SYMBOL **ppsSym) } /* Look up a function symbol defined in script */ -BOOL scriptLookUpCustomFunction(const char *pIdent, EVENT_SYMBOL **ppsSym) +bool scriptLookUpCustomFunction(const char *pIdent, EVENT_SYMBOL **ppsSym) { EVENT_SYMBOL *psCurr; diff --git a/lib/script/stack.cpp b/lib/script/stack.cpp index 1f277aedc..4a28bcf1c 100644 --- a/lib/script/stack.cpp +++ b/lib/script/stack.cpp @@ -60,18 +60,18 @@ static STACK_CHUNK *psCurrChunk=NULL; static UDWORD currEntry=0; /* Get rid of the top value without returning it */ -static inline BOOL stackRemoveTop(void); +static inline bool stackRemoveTop(void); /* Check if the stack is empty */ -BOOL stackEmpty(void) +bool stackEmpty(void) { return (psCurrChunk->psPrev == NULL && currEntry == 0); } /* Allocate a new chunk for the stack */ -static BOOL stackNewChunk(UDWORD size) +static bool stackNewChunk(UDWORD size) { /* see if a chunk has already been allocated */ if (psCurrChunk->psNext != NULL) @@ -107,7 +107,7 @@ static BOOL stackNewChunk(UDWORD size) /* Push a value onto the stack */ -BOOL stackPush(INTERP_VAL *psVal) +bool stackPush(INTERP_VAL *psVal) { /* Store the value in the stack - psCurrChunk/currEntry always point to valid space */ @@ -156,7 +156,7 @@ BOOL stackPush(INTERP_VAL *psVal) /* Pop a value off the stack */ -BOOL stackPop(INTERP_VAL *psVal) +bool stackPop(INTERP_VAL *psVal) { if (stackEmpty()) { @@ -184,7 +184,7 @@ BOOL stackPop(INTERP_VAL *psVal) } /* Return pointer to the top value without poping it */ -BOOL stackPeekTop(INTERP_VAL **ppsVal) +bool stackPeekTop(INTERP_VAL **ppsVal) { if ((psCurrChunk->psPrev == NULL) && (currEntry == 0)) { @@ -214,7 +214,7 @@ BOOL stackPeekTop(INTERP_VAL **ppsVal) /* Pop a value off the stack, checking that the type matches what is passed in */ -BOOL stackPopType(INTERP_VAL *psVal) +bool stackPopType(INTERP_VAL *psVal) { INTERP_VAL *psTop; @@ -287,7 +287,7 @@ BOOL stackPopType(INTERP_VAL *psVal) /* Pop a number of values off the stack checking their types * This is used by instinct functions to get their parameters */ -BOOL stackPopParams(unsigned int numParams, ...) +bool stackPopParams(unsigned int numParams, ...) { va_list args; unsigned int i, index; @@ -342,7 +342,7 @@ BOOL stackPopParams(unsigned int numParams, ...) switch (type) { case VAL_BOOL: - *(BOOL*)pData = psVal->v.bval; + *(bool*)pData = psVal->v.bval; break; case VAL_INT: *(int*)pData = psVal->v.ival; @@ -414,7 +414,7 @@ BOOL stackPopParams(unsigned int numParams, ...) /* Push a value onto the stack without using a value structure NOTE: result->type is _not_ set yet - use 'type' instead */ -BOOL stackPushResult(INTERP_TYPE type, INTERP_VAL *result) +bool stackPushResult(INTERP_TYPE type, INTERP_VAL *result) { /* assign type, wasn't done before */ result->type = type; @@ -464,7 +464,7 @@ BOOL stackPushResult(INTERP_TYPE type, INTERP_VAL *result) * index is how far down the stack to look. * Index 0 is the top entry on the stack. */ -BOOL stackPeek(INTERP_VAL *psVal, UDWORD index) +bool stackPeek(INTERP_VAL *psVal, UDWORD index) { STACK_CHUNK *psCurr; @@ -518,7 +518,7 @@ void stackPrintTop(void) /* Do binary operations on the top of the stack * This effectively pops two values and pushes the result */ -BOOL stackBinaryOp(OPCODE opcode) +bool stackBinaryOp(OPCODE opcode) { STACK_CHUNK *psChunk; INTERP_VAL *psV1, *psV2; @@ -773,7 +773,7 @@ BOOL stackBinaryOp(OPCODE opcode) /* Perform a unary operation on the top of the stack * This effectively pops a value and pushes the result */ -BOOL stackUnaryOp(OPCODE opcode) +bool stackUnaryOp(OPCODE opcode) { STACK_CHUNK *psChunk; INTERP_VAL *psVal; @@ -885,7 +885,7 @@ BOOL stackUnaryOp(OPCODE opcode) return true; } -BOOL stackCastTop(INTERP_TYPE neededType) +bool stackCastTop(INTERP_TYPE neededType) { INTERP_VAL *pTop; @@ -947,7 +947,7 @@ BOOL stackCastTop(INTERP_TYPE neededType) /* Initialise the stack */ -BOOL stackInitialise(void) +bool stackInitialise(void) { psStackBase = (STACK_CHUNK *)calloc(1, sizeof(*psStackBase)); if (psStackBase == NULL) @@ -1017,7 +1017,7 @@ void stackShutDown(void) } /* Get rid of the top value without returning it */ -static inline BOOL stackRemoveTop(void) +static inline bool stackRemoveTop(void) { if ((psCurrChunk->psPrev == NULL) && (currEntry == 0)) { diff --git a/lib/script/stack.h b/lib/script/stack.h index 42508729f..12c9518f4 100644 --- a/lib/script/stack.h +++ b/lib/script/stack.h @@ -33,47 +33,47 @@ #define MAXSTACKLEN 8000 /* Initialise the stack */ -extern BOOL stackInitialise(void); +extern bool stackInitialise(void); /* Shutdown the stack */ extern void stackShutDown(void); /* Push a value onto the stack */ -extern BOOL stackPush(INTERP_VAL *psVal); +extern bool stackPush(INTERP_VAL *psVal); /* Pop a value off the stack */ -extern BOOL stackPop(INTERP_VAL *psVal); +extern bool stackPop(INTERP_VAL *psVal); /* Return pointer to the top value without poping it */ -extern BOOL stackPeekTop(INTERP_VAL **ppsVal); +extern bool stackPeekTop(INTERP_VAL **ppsVal); /* Pop a value off the stack, checking that the type matches what is passed in */ -extern BOOL stackPopType(INTERP_VAL *psVal); +extern bool stackPopType(INTERP_VAL *psVal); /* Look at a value on the stack without removing it. * index is how far down the stack to look. * Index 0 is the top entry on the stack. */ -extern BOOL stackPeek(INTERP_VAL *psVal, UDWORD index); +extern bool stackPeek(INTERP_VAL *psVal, UDWORD index); /* Print the top value on the stack */ extern void stackPrintTop(void); /* Check if the stack is empty */ -extern BOOL stackEmpty(void); +extern bool stackEmpty(void); /* Do binary operations on the top of the stack * This effectively pops two values and pushes the result */ -extern BOOL stackBinaryOp(OPCODE opcode); +extern bool stackBinaryOp(OPCODE opcode); /* Perform a unary operation on the top of the stack * This effectively pops a value and pushes the result */ -extern BOOL stackUnaryOp(OPCODE opcode); +extern bool stackUnaryOp(OPCODE opcode); /* casts top of the stack to some other data type */ -extern BOOL stackCastTop(INTERP_TYPE neededType); +extern bool stackCastTop(INTERP_TYPE neededType); /* Reset the stack to an empty state */ extern void stackReset(void); diff --git a/lib/sequence/timer.cpp b/lib/sequence/timer.cpp index b27f0b5bf..ec41e2a33 100644 --- a/lib/sequence/timer.cpp +++ b/lib/sequence/timer.cpp @@ -26,7 +26,7 @@ static double startTimeInMicroSec = 0; // starting time in microseconds static double endTimeInMicroSec = 0; // ending time in microseconds -static BOOL stopped = false; // stop flag +static bool stopped = false; // stop flag static struct timeval startCount; static struct timeval endCount; diff --git a/lib/sound/audio.cpp b/lib/sound/audio.cpp index 30ba57386..f0df8cab8 100644 --- a/lib/sound/audio.cpp +++ b/lib/sound/audio.cpp @@ -35,8 +35,8 @@ // global variables static AUDIO_SAMPLE *g_psSampleList = NULL; static AUDIO_SAMPLE *g_psSampleQueue = NULL; -static BOOL g_bAudioEnabled = false; -static BOOL g_bAudioPaused = false; +static bool g_bAudioEnabled = false; +static bool g_bAudioPaused = false; static AUDIO_SAMPLE g_sPreviousSample; static int g_iPreviousSampleTime; @@ -85,7 +85,7 @@ unsigned int audio_GetSampleListCount() // ======================================================================================================================= // ======================================================================================================================= // -BOOL audio_Disabled( void ) +bool audio_Disabled( void ) { return !g_bAudioEnabled; } @@ -94,7 +94,7 @@ BOOL audio_Disabled( void ) // ======================================================================================================================= // ======================================================================================================================= // -BOOL audio_Init( AUDIO_CALLBACK pStopTrackCallback ) +bool audio_Init( AUDIO_CALLBACK pStopTrackCallback ) { // init audio system g_sPreviousSample.iTrack = NO_SAMPLE; @@ -113,11 +113,11 @@ BOOL audio_Init( AUDIO_CALLBACK pStopTrackCallback ) // ======================================================================================================================= // ======================================================================================================================= // -BOOL audio_Shutdown( void ) +bool audio_Shutdown( void ) { //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ AUDIO_SAMPLE *psSample = NULL, *psSampleTemp = NULL; - BOOL bOK; + bool bOK; //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // if audio not enabled return true to carry on game without audio @@ -158,7 +158,7 @@ BOOL audio_Shutdown( void ) // ======================================================================================================================= // ======================================================================================================================= // -BOOL audio_GetPreviousQueueTrackPos( SDWORD *iX, SDWORD *iY, SDWORD *iZ ) +bool audio_GetPreviousQueueTrackPos( SDWORD *iX, SDWORD *iY, SDWORD *iZ ) { if (g_sPreviousSample.x == SAMPLE_COORD_INVALID || g_sPreviousSample.y == SAMPLE_COORD_INVALID @@ -174,7 +174,7 @@ BOOL audio_GetPreviousQueueTrackPos( SDWORD *iX, SDWORD *iY, SDWORD *iZ ) return true; } -BOOL audio_GetPreviousQueueTrackRadarBlipPos( SDWORD *iX, SDWORD *iY ) +bool audio_GetPreviousQueueTrackRadarBlipPos( SDWORD *iX, SDWORD *iY ) { if (g_sPreviousSample.x == SAMPLE_COORD_INVALID || g_sPreviousSample.y == SAMPLE_COORD_INVALID) @@ -281,12 +281,12 @@ static void audio_RemoveSample( AUDIO_SAMPLE **ppsSampleList, AUDIO_SAMPLE *psSa // ======================================================================================================================= // ======================================================================================================================= // -static BOOL audio_CheckSameQueueTracksPlaying( SDWORD iTrack ) +static bool audio_CheckSameQueueTracksPlaying( SDWORD iTrack ) { //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ SDWORD iCount; AUDIO_SAMPLE *psSample = NULL; - BOOL bOK = true; + bool bOK = true; //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // return if audio not enabled @@ -618,7 +618,7 @@ void audio_Update() * \param audibleRadius the radius from the source of sound where it can be heard * \return a non-zero value when successful or audio is disabled, zero when the file is not found or no more tracks can be loaded (i.e. the limit is reached) */ -unsigned int audio_SetTrackVals(const char* fileName, BOOL loop, unsigned int volume, unsigned int audibleRadius) +unsigned int audio_SetTrackVals(const char* fileName, bool loop, unsigned int volume, unsigned int audibleRadius) { // if audio not enabled return a random non-zero value to carry on game without audio if ( g_bAudioEnabled == false ) @@ -640,12 +640,12 @@ unsigned int audio_SetTrackVals(const char* fileName, BOOL loop, unsigned int vo // ======================================================================================================================= // ======================================================================================================================= // -static BOOL audio_CheckSame3DTracksPlaying( SDWORD iTrack, SDWORD iX, SDWORD iY, SDWORD iZ ) +static bool audio_CheckSame3DTracksPlaying( SDWORD iTrack, SDWORD iX, SDWORD iY, SDWORD iZ ) { //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ SDWORD iCount, iDx, iDy, iDz, iDistSq, iMaxDistSq, iRad; AUDIO_SAMPLE *psSample = NULL; - BOOL bOK = true; + bool bOK = true; //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // return if audio not enabled @@ -690,7 +690,7 @@ static BOOL audio_CheckSame3DTracksPlaying( SDWORD iTrack, SDWORD iX, SDWORD iY, // ======================================================================================================================= // ======================================================================================================================= // -static BOOL audio_Play3DTrack( SDWORD iX, SDWORD iY, SDWORD iZ, int iTrack, SIMPLE_OBJECT *psObj, AUDIO_CALLBACK pUserCallback ) +static bool audio_Play3DTrack( SDWORD iX, SDWORD iY, SDWORD iZ, int iTrack, SIMPLE_OBJECT *psObj, AUDIO_CALLBACK pUserCallback ) { //~~~~~~~~~~~~~~~~~~~~~~ AUDIO_SAMPLE *psSample; @@ -778,7 +778,7 @@ static BOOL audio_Play3DTrack( SDWORD iX, SDWORD iY, SDWORD iZ, int iTrack, SIMP // ======================================================================================================================= // ======================================================================================================================= // -BOOL audio_PlayStaticTrack( SDWORD iMapX, SDWORD iMapY, int iTrack ) +bool audio_PlayStaticTrack( SDWORD iMapX, SDWORD iMapY, int iTrack ) { //~~~~~~~~~~~~~~~ SDWORD iX, iY, iZ; @@ -1187,7 +1187,7 @@ void audio_RemoveObj(SIMPLE_OBJECT const *psObj) debug(LOG_MEMORY, "audio_RemoveObj: ***Warning! psOBJ %p was found %u times in the list of playing audio samples", psObj, count); } -static BOOL dummyCB(WZ_DECL_UNUSED void* dummy) +static bool dummyCB(WZ_DECL_UNUSED void* dummy) { return true; } diff --git a/lib/sound/audio.h b/lib/sound/audio.h index fcfae9710..6c0775edf 100644 --- a/lib/sound/audio.h +++ b/lib/sound/audio.h @@ -23,15 +23,15 @@ #include "track.h" -extern BOOL audio_Init( AUDIO_CALLBACK pStopTrackCallback ); +extern bool audio_Init( AUDIO_CALLBACK pStopTrackCallback ); extern void audio_Update(void); -extern BOOL audio_Shutdown(void); -extern BOOL audio_Disabled( void ); +extern bool audio_Shutdown(void); +extern bool audio_Disabled( void ); -extern BOOL audio_LoadTrackFromFile( char szFileName[] ); -extern unsigned int audio_SetTrackVals(const char* fileName, BOOL loop, unsigned int volume, unsigned int audibleRadius); +extern bool audio_LoadTrackFromFile( char szFileName[] ); +extern unsigned int audio_SetTrackVals(const char* fileName, bool loop, unsigned int volume, unsigned int audibleRadius); -extern BOOL audio_PlayStaticTrack( SDWORD iX, SDWORD iY, int iTrack ); +extern bool audio_PlayStaticTrack( SDWORD iX, SDWORD iY, int iTrack ); bool audio_PlayObjStaticTrack(SIMPLE_OBJECT *psObj, int iTrack); bool audio_PlayObjStaticTrackCallback(SIMPLE_OBJECT *psObj, int iTrack, AUDIO_CALLBACK pUserCallback); bool audio_PlayObjDynamicTrack(SIMPLE_OBJECT *psObj, int iTrack, AUDIO_CALLBACK pUserCallback ); @@ -49,9 +49,9 @@ extern void audio_QueueTrackPos( SDWORD iTrack, SDWORD iX, SDWORD iY, SDWORD iZ ); extern void audio_QueueTrackGroupPos( SDWORD iTrack, SDWORD iGroup, SDWORD iX, SDWORD iY, SDWORD iZ ); -extern BOOL audio_GetPreviousQueueTrackPos( SDWORD *iX, SDWORD *iY, +extern bool audio_GetPreviousQueueTrackPos( SDWORD *iX, SDWORD *iY, SDWORD *iZ ); -extern BOOL audio_GetPreviousQueueTrackRadarBlipPos( SDWORD *iX, SDWORD *iY); +extern bool audio_GetPreviousQueueTrackRadarBlipPos( SDWORD *iX, SDWORD *iY); extern void audio_PauseAll( void ); extern void audio_ResumeAll( void ); extern void audio_StopAll( void ); diff --git a/lib/sound/cdaudio.cpp b/lib/sound/cdaudio.cpp index 6f917d2b2..e021cd219 100644 --- a/lib/sound/cdaudio.cpp +++ b/lib/sound/cdaudio.cpp @@ -41,7 +41,7 @@ static bool stopping = true; static AUDIO_STREAM* cdStream = NULL; #endif -BOOL cdAudio_Open(const char* user_musicdir) +bool cdAudio_Open(const char* user_musicdir) { PlayList_Init(); @@ -133,7 +133,7 @@ static void cdAudio_TrackFinished(void* user_data) } #endif -BOOL cdAudio_PlayTrack(SONG_CONTEXT context) +bool cdAudio_PlayTrack(SONG_CONTEXT context) { debug(LOG_SOUND, "called(%d)", (int)context); diff --git a/lib/sound/cdaudio.h b/lib/sound/cdaudio.h index 48d027173..fa2810dff 100644 --- a/lib/sound/cdaudio.h +++ b/lib/sound/cdaudio.h @@ -27,9 +27,9 @@ enum SONG_CONTEXT SONG_INGAME, }; -BOOL cdAudio_Open(const char* user_musicdir); +bool cdAudio_Open(const char* user_musicdir); void cdAudio_Close(void); -BOOL cdAudio_PlayTrack(SONG_CONTEXT context); +bool cdAudio_PlayTrack(SONG_CONTEXT context); void cdAudio_Stop(void); void cdAudio_Pause(void); void cdAudio_Resume(void); diff --git a/lib/sound/oggvorbis.cpp b/lib/sound/oggvorbis.cpp index b1d48391f..6520d12e3 100644 --- a/lib/sound/oggvorbis.cpp +++ b/lib/sound/oggvorbis.cpp @@ -42,7 +42,7 @@ struct OggVorbisDecoderState PHYSFS_file* fileHandle; // Wether to allow seeking or not - BOOL allowSeeking; + bool allowSeeking; #ifndef WZ_NOSOUND // Internal identifier towards libVorbisFile @@ -100,7 +100,7 @@ static size_t wz_oggVorbis_read(void *ptr, size_t size, size_t nmemb, void *data static int wz_oggVorbis_seek(void *datasource, ogg_int64_t offset, int whence) { PHYSFS_file* fileHandle; - BOOL allowSeeking; + bool allowSeeking; int newPos; ASSERT(datasource != NULL, "NULL decoder passed!"); @@ -181,7 +181,7 @@ static const ov_callbacks wz_oggVorbis_callbacks = }; #endif -struct OggVorbisDecoderState* sound_CreateOggVorbisDecoder(PHYSFS_file* PHYSFS_fileHandle, BOOL allowSeeking) +struct OggVorbisDecoderState* sound_CreateOggVorbisDecoder(PHYSFS_file* PHYSFS_fileHandle, bool allowSeeking) { #ifndef WZ_NOSOUND int error; diff --git a/lib/sound/oggvorbis.h b/lib/sound/oggvorbis.h index fd55750a2..4a0440ccb 100644 --- a/lib/sound/oggvorbis.h +++ b/lib/sound/oggvorbis.h @@ -42,7 +42,7 @@ struct soundDataBuffer // Forward declaration so we can take pointers to this type struct OggVorbisDecoderState; -struct OggVorbisDecoderState* sound_CreateOggVorbisDecoder(PHYSFS_file* PHYSFS_fileHandle, BOOL allowSeeking); +struct OggVorbisDecoderState* sound_CreateOggVorbisDecoder(PHYSFS_file* PHYSFS_fileHandle, bool allowSeeking); void sound_DestroyOggVorbisDecoder(struct OggVorbisDecoderState* decoder); soundDataBuffer* sound_DecodeOggVorbis(struct OggVorbisDecoderState* decoder, size_t bufferSize); diff --git a/lib/sound/openal_track.cpp b/lib/sound/openal_track.cpp index 3b14426d6..4dcff85aa 100644 --- a/lib/sound/openal_track.cpp +++ b/lib/sound/openal_track.cpp @@ -53,7 +53,7 @@ ALuint current_queue_sample = -1; #endif -static BOOL openal_initialized = false; +static bool openal_initialized = false; struct AUDIO_STREAM { @@ -122,7 +122,7 @@ static void sound_RemoveSample(SAMPLE_LIST* previous, SAMPLE_LIST* to_remove) // ======================================================================================================================= // ======================================================================================================================= // -BOOL sound_InitLibrary( void ) +bool sound_InitLibrary( void ) { #ifndef WZ_NOSOUND int err; @@ -408,7 +408,7 @@ void sound_Update() // ======================================================================================================================= // ======================================================================================================================= // -BOOL sound_QueueSamplePlaying( void ) +bool sound_QueueSamplePlaying( void ) { #ifndef WZ_NOSOUND ALenum state; @@ -653,7 +653,7 @@ static bool sound_SetupChannel( AUDIO_SAMPLE *psSample ) // ======================================================================================================================= // ======================================================================================================================= // -BOOL sound_Play2DSample( TRACK *psTrack, AUDIO_SAMPLE *psSample, BOOL bQueued ) +bool sound_Play2DSample( TRACK *psTrack, AUDIO_SAMPLE *psSample, bool bQueued ) { #ifndef WZ_NOSOUND ALfloat zero[3] = { 0.0, 0.0, 0.0 }; @@ -727,7 +727,7 @@ BOOL sound_Play2DSample( TRACK *psTrack, AUDIO_SAMPLE *psSample, BOOL bQueued ) // ======================================================================================================================= // ======================================================================================================================= // -BOOL sound_Play3DSample( TRACK *psTrack, AUDIO_SAMPLE *psSample ) +bool sound_Play3DSample( TRACK *psTrack, AUDIO_SAMPLE *psSample ) { #ifndef WZ_NOSOUND ALfloat zero[3] = { 0.0, 0.0, 0.0 }; @@ -961,7 +961,7 @@ AUDIO_STREAM* sound_PlayStreamWithBuf(PHYSFS_file* fileHandle, float volume, voi * \post true if playing, false otherwise. * */ -BOOL sound_isStreamPlaying(AUDIO_STREAM *stream) +bool sound_isStreamPlaying(AUDIO_STREAM *stream) { #if !defined(WZ_NOSOUND) ALint state; @@ -1423,7 +1423,7 @@ void sound_StopAll( void ) // ======================================================================================================================= // ======================================================================================================================= // -BOOL sound_SampleIsFinished( AUDIO_SAMPLE *psSample ) +bool sound_SampleIsFinished( AUDIO_SAMPLE *psSample ) { #ifndef WZ_NOSOUND //~~~~~~~~~~ diff --git a/lib/sound/track.cpp b/lib/sound/track.cpp index c35ee0ab5..1014a36ad 100644 --- a/lib/sound/track.cpp +++ b/lib/sound/track.cpp @@ -39,14 +39,14 @@ static TRACK *g_apTrack[MAX_TRACKS]; static SDWORD g_iCurTracks = 0; // flag set when system is active (for callbacks etc) -static BOOL g_bSystemActive = false; +static bool g_bSystemActive = false; static AUDIO_CALLBACK g_pStopTrackCallback = NULL; //* // ======================================================================================================================= // ======================================================================================================================= // -BOOL sound_Init() +bool sound_Init() { g_iCurTracks = 0; if (!sound_InitLibrary()) @@ -67,7 +67,7 @@ BOOL sound_Init() // ======================================================================================================================= // ======================================================================================================================= // -BOOL sound_Shutdown( void ) +bool sound_Shutdown( void ) { // set inactive flag to prevent callbacks coming after shutdown g_bSystemActive = false; @@ -79,7 +79,7 @@ BOOL sound_Shutdown( void ) // ======================================================================================================================= // ======================================================================================================================= // -BOOL sound_GetSystemActive( void ) +bool sound_GetSystemActive( void ) { return g_bSystemActive; } @@ -91,7 +91,7 @@ BOOL sound_GetSystemActive( void ) * \param audibleRadius the radius from the source of sound where it can be heard * \return a non-zero value representing the track id number when successful, zero when the file is not found or no more tracks can be loaded (i.e. the limit is reached) */ -unsigned int sound_SetTrackVals(const char* fileName, BOOL loop, unsigned int volume, unsigned int audibleRadius) +unsigned int sound_SetTrackVals(const char* fileName, bool loop, unsigned int volume, unsigned int audibleRadius) { unsigned int trackID; TRACK* psTrack; @@ -187,7 +187,7 @@ void sound_CheckAllUnloaded( void ) // ======================================================================================================================= // ======================================================================================================================= // -BOOL sound_TrackLooped( SDWORD iTrack ) +bool sound_TrackLooped( SDWORD iTrack ) { sound_CheckTrack( iTrack ); return g_apTrack[iTrack]->bLoop; @@ -207,7 +207,7 @@ SDWORD sound_GetNumPlaying( SDWORD iTrack ) // ======================================================================================================================= // ======================================================================================================================= // -BOOL sound_CheckTrack( SDWORD iTrack ) +bool sound_CheckTrack( SDWORD iTrack ) { if ( iTrack < 0 || iTrack > g_iCurTracks - 1 ) { @@ -278,7 +278,7 @@ const char *sound_GetTrackName( SDWORD iTrack ) // ======================================================================================================================= // ======================================================================================================================= // -BOOL sound_Play2DTrack( AUDIO_SAMPLE *psSample, BOOL bQueued ) +bool sound_Play2DTrack( AUDIO_SAMPLE *psSample, bool bQueued ) { TRACK *psTrack; @@ -296,7 +296,7 @@ BOOL sound_Play2DTrack( AUDIO_SAMPLE *psSample, BOOL bQueued ) // ======================================================================================================================= // ======================================================================================================================= // -BOOL sound_Play3DTrack( AUDIO_SAMPLE *psSample ) +bool sound_Play3DTrack( AUDIO_SAMPLE *psSample ) { TRACK *psTrack; diff --git a/lib/sound/track.h b/lib/sound/track.h index e7e822c58..62d69ce8e 100644 --- a/lib/sound/track.h +++ b/lib/sound/track.h @@ -43,7 +43,7 @@ /* typedefs */ -typedef BOOL (* AUDIO_CALLBACK) ( void *psObj ); +typedef bool (* AUDIO_CALLBACK) ( void *psObj ); struct AUDIO_STREAM; /* structs */ @@ -63,7 +63,7 @@ struct AUDIO_SAMPLE #endif SDWORD x, y, z; float fVol; // computed volume of sample - BOOL bFinishedPlaying; + bool bFinishedPlaying; AUDIO_CALLBACK pCallback; SIMPLE_OBJECT * psObj; AUDIO_SAMPLE * psPrev; @@ -72,7 +72,7 @@ struct AUDIO_SAMPLE struct TRACK { - BOOL bLoop; + bool bLoop; SDWORD iVol; SDWORD iAudibleRadius; SDWORD iTime; // duration in milliseconds @@ -87,11 +87,11 @@ struct TRACK /* functions */ -BOOL sound_Init(void); -BOOL sound_Shutdown(void); +bool sound_Init(void); +bool sound_Shutdown(void); TRACK * sound_LoadTrackFromFile(const char *fileName); -unsigned int sound_SetTrackVals(const char* fileName, BOOL loop, unsigned int volume, unsigned int audibleRadius); +unsigned int sound_SetTrackVals(const char* fileName, bool loop, unsigned int volume, unsigned int audibleRadius); void sound_ReleaseTrack( TRACK * psTrack ); void sound_StopTrack( AUDIO_SAMPLE *psSample ); @@ -99,22 +99,22 @@ void sound_PauseTrack( AUDIO_SAMPLE *psSample ); void sound_UpdateSample( AUDIO_SAMPLE *psSample ); void sound_CheckAllUnloaded( void ); void sound_RemoveActiveSample( AUDIO_SAMPLE *psSample ); -BOOL sound_CheckTrack( SDWORD iTrack ); +bool sound_CheckTrack( SDWORD iTrack ); SDWORD sound_GetTrackTime( SDWORD iTrack ); SDWORD sound_GetTrackAudibleRadius( SDWORD iTrack ); SDWORD sound_GetTrackVolume( SDWORD iTrack ); const char * sound_GetTrackName( SDWORD iTrack ); -BOOL sound_TrackLooped( SDWORD iTrack ); +bool sound_TrackLooped( SDWORD iTrack ); void sound_SetCallbackFunction( void * fn ); -BOOL sound_Play2DTrack( AUDIO_SAMPLE *psSample, BOOL bQueued ); -BOOL sound_Play3DTrack( AUDIO_SAMPLE *psSample ); +bool sound_Play2DTrack( AUDIO_SAMPLE *psSample, bool bQueued ); +bool sound_Play3DTrack( AUDIO_SAMPLE *psSample ); void sound_PlayWithCallback( AUDIO_SAMPLE *psSample, SDWORD iCurTime, AUDIO_CALLBACK pDoneFunc ); void sound_FinishedCallback( AUDIO_SAMPLE *psSample ); -BOOL sound_GetSystemActive( void ); +bool sound_GetSystemActive( void ); SDWORD sound_GetTrackID( TRACK *psTrack ); SDWORD sound_GetAvailableID( void ); SDWORD sound_GetNumPlaying( SDWORD iTrack ); @@ -127,7 +127,7 @@ void sound_SetStoppedCallback( AUDIO_CALLBACK pStopTrackCallback ); UDWORD sound_GetTrackTimeLastFinished( SDWORD iTrack ); void sound_SetTrackTimeLastFinished( SDWORD iTrack, UDWORD iTime ); -extern BOOL sound_isStreamPlaying(AUDIO_STREAM *stream); +extern bool sound_isStreamPlaying(AUDIO_STREAM *stream); extern void sound_StopStream(AUDIO_STREAM* stream); extern void sound_PauseStream(AUDIO_STREAM* stream); extern void sound_ResumeStream(AUDIO_STREAM* stream); diff --git a/lib/sound/tracklib.h b/lib/sound/tracklib.h index f9305cf75..10c0a16d9 100644 --- a/lib/sound/tracklib.h +++ b/lib/sound/tracklib.h @@ -28,14 +28,14 @@ #include "track.h" #include "lib/framework/vector.h" -BOOL sound_InitLibrary( void ); +bool sound_InitLibrary( void ); void sound_ShutdownLibrary( void ); void sound_FreeTrack( TRACK * psTrack ); -BOOL sound_Play2DSample( TRACK * psTrack, AUDIO_SAMPLE * psSample, - BOOL bQueued ); -BOOL sound_Play3DSample( TRACK * psTrack, AUDIO_SAMPLE * psSample ); +bool sound_Play2DSample( TRACK * psTrack, AUDIO_SAMPLE * psSample, + bool bQueued ); +bool sound_Play3DSample( TRACK * psTrack, AUDIO_SAMPLE * psSample ); void sound_StopSample(AUDIO_SAMPLE* psSample); void sound_PauseSample( AUDIO_SAMPLE * psSample ); void sound_ResumeSample( AUDIO_SAMPLE * psSample ); @@ -44,11 +44,11 @@ AUDIO_STREAM* sound_PlayStream(PHYSFS_file* PHYSFS_fileHandle, float volume, voi void sound_SetSampleFreq( AUDIO_SAMPLE * psSample, SDWORD iFreq ); void sound_SetSampleVol( AUDIO_SAMPLE * psSample, SDWORD iVol, - BOOL bScale3D ); + bool bScale3D ); int sound_GetNumSamples( void ); -BOOL sound_SampleIsFinished( AUDIO_SAMPLE * psSample ); -BOOL sound_QueueSamplePlaying( void ); +bool sound_SampleIsFinished( AUDIO_SAMPLE * psSample ); +bool sound_QueueSamplePlaying( void ); void sound_SetPlayerPos(Vector3f pos); void sound_SetPlayerOrientationVector(Vector3f forward, Vector3f up); diff --git a/lib/widget/bar.cpp b/lib/widget/bar.cpp index f0588739b..8c4988778 100644 --- a/lib/widget/bar.cpp +++ b/lib/widget/bar.cpp @@ -343,7 +343,7 @@ void barGraphDisplayTrough(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, PIE { SDWORD x0 = 0, y0 = 0, x1 = 0, y1 = 0; // Position of the bar SDWORD tx0 = 0, ty0 = 0, tx1 = 0, ty1 = 0; // Position of the trough - BOOL showBar=true, showTrough=true; + bool showBar=true, showTrough=true; W_BARGRAPH *psBGraph = (W_BARGRAPH *)psWidget; /* figure out which way the bar graph fills */ diff --git a/lib/widget/button.cpp b/lib/widget/button.cpp index edea8e9de..14b843b97 100644 --- a/lib/widget/button.cpp +++ b/lib/widget/button.cpp @@ -33,7 +33,7 @@ /* Initialise the button module */ -BOOL buttonStartUp(void) +bool buttonStartUp(void) { return true; } diff --git a/lib/widget/button.h b/lib/widget/button.h index 2cd5eb71f..a0c8c0451 100644 --- a/lib/widget/button.h +++ b/lib/widget/button.h @@ -57,7 +57,7 @@ struct W_BUTTON : public WIDGET }; /* Initialise the button module */ -extern BOOL buttonStartUp(void); +extern bool buttonStartUp(void); /* Create a button widget data structure */ extern W_BUTTON* buttonCreate(const W_BUTINIT* psInit); diff --git a/lib/widget/editbox.cpp b/lib/widget/editbox.cpp index 70c8c77be..80d784a19 100644 --- a/lib/widget/editbox.cpp +++ b/lib/widget/editbox.cpp @@ -556,7 +556,7 @@ void editBoxDisplay(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, PIELIGHT * enum iV_fonts CurrFontID; #if CURSOR_BLINK - BOOL blink; + bool blink; #endif psEdBox = (W_EDITBOX *)psWidget; diff --git a/lib/widget/form.cpp b/lib/widget/form.cpp index 986389354..ea53642ef 100644 --- a/lib/widget/form.cpp +++ b/lib/widget/form.cpp @@ -357,7 +357,7 @@ void formFree(W_FORM *psWidget) /* Add a widget to a form */ -BOOL formAddWidget(W_FORM *psForm, WIDGET *psWidget, W_INIT *psInit) +bool formAddWidget(W_FORM *psForm, WIDGET *psWidget, W_INIT *psInit) { W_TABFORM *psTabForm; WIDGET **ppsList; @@ -688,7 +688,7 @@ void formGetOrigin(W_FORM *psWidget, SDWORD *pXOrigin, SDWORD *pYOrigin) // So ONLY this routine was modified. Will have to modify the vert. tab // routine if we ever use it. // Choose a horizontal tab from a coordinate -static BOOL formPickHTab(TAB_POS *psTabPos, +static bool formPickHTab(TAB_POS *psTabPos, SDWORD x0, SDWORD y0, UDWORD width, UDWORD height, UDWORD gap, UDWORD number, SDWORD fx, SDWORD fy, unsigned maxTabsShown) @@ -758,7 +758,7 @@ static BOOL formPickHTab(TAB_POS *psTabPos, // NOTE: This routine is NOT modified to use the tab scroll buttons. // Choose a vertical tab from a coordinate -static BOOL formPickVTab(TAB_POS *psTabPos, +static bool formPickVTab(TAB_POS *psTabPos, SDWORD x0, SDWORD y0, UDWORD width, UDWORD height, UDWORD gap, UDWORD number, SDWORD fx, SDWORD fy) @@ -800,7 +800,7 @@ static BOOL formPickVTab(TAB_POS *psTabPos, /* Find which tab is under a form coordinate */ -static BOOL formPickTab(W_TABFORM *psForm, UDWORD fx, UDWORD fy, +static bool formPickTab(W_TABFORM *psForm, UDWORD fx, UDWORD fy, TAB_POS *psTabPos) { SDWORD x0,y0, x1,y1; diff --git a/lib/widget/form.h b/lib/widget/form.h index 0d76745b2..15c260487 100644 --- a/lib/widget/form.h +++ b/lib/widget/form.h @@ -37,7 +37,7 @@ struct W_FORM : public WIDGET void clicked(W_CONTEXT *, WIDGET_KEY key) { formClicked(this, key); } - BOOL disableChildren; ///< Disable all child widgets if true + bool disableChildren; ///< Disable all child widgets if true UWORD Ax0,Ay0,Ax1,Ay1; ///< Working coords for animations. UDWORD animCount; ///< Animation counter. UDWORD startTime; ///< Animation start time @@ -127,7 +127,7 @@ extern W_FORM* formCreate(const W_FORMINIT* psInit); extern void formFree(W_FORM *psWidget); /* Add a widget to a form */ -extern BOOL formAddWidget(W_FORM *psForm, WIDGET *psWidget, W_INIT *psInit); +extern bool formAddWidget(W_FORM *psForm, WIDGET *psWidget, W_INIT *psInit); /* Return the widgets currently displayed by a form */ extern WIDGET *formGetWidgets(W_FORM *psWidget); diff --git a/lib/widget/slider.cpp b/lib/widget/slider.cpp index 4314da3af..16b5a1c38 100644 --- a/lib/widget/slider.cpp +++ b/lib/widget/slider.cpp @@ -27,9 +27,9 @@ // FIXME Direct iVis implementation include! #include "lib/ivis_opengl/pieblitfunc.h" -static BOOL DragEnabled = true; +static bool DragEnabled = true; -void sliderEnableDrag(BOOL Enable) +void sliderEnableDrag(bool Enable) { DragEnabled = Enable; } diff --git a/lib/widget/widget.cpp b/lib/widget/widget.cpp index a75b87d75..d350a61e3 100644 --- a/lib/widget/widget.cpp +++ b/lib/widget/widget.cpp @@ -38,7 +38,7 @@ #include "slider.h" #include "tip.h" -static BOOL bWidgetsActive = true; +static bool bWidgetsActive = true; /* The widget the mouse is over this update */ static WIDGET *psMouseOverWidget = NULL; @@ -217,7 +217,7 @@ static void widgRelease(WIDGET *psWidget) } /* Check whether an ID has been used on a form */ -static BOOL widgCheckIDForm(W_FORM *psForm, UDWORD id) +static bool widgCheckIDForm(W_FORM *psForm, UDWORD id) { WIDGET *psCurr; W_FORMGETALL sGetAll; @@ -262,7 +262,7 @@ void widgSetTipFont(W_SCREEN *psScreen, enum iV_fonts FontID) } /* Add a form to the widget screen */ -BOOL widgAddForm(W_SCREEN *psScreen, const W_FORMINIT* psInit) +bool widgAddForm(W_SCREEN *psScreen, const W_FORMINIT* psInit) { W_FORM *psParent, *psForm; @@ -306,7 +306,7 @@ BOOL widgAddForm(W_SCREEN *psScreen, const W_FORMINIT* psInit) /* Add a label to the widget screen */ -BOOL widgAddLabel(W_SCREEN *psScreen, const W_LABINIT* psInit) +bool widgAddLabel(W_SCREEN *psScreen, const W_LABINIT* psInit) { W_LABEL *psLabel; W_FORM *psForm; @@ -350,7 +350,7 @@ BOOL widgAddLabel(W_SCREEN *psScreen, const W_LABINIT* psInit) /* Add a button to the widget screen */ -BOOL widgAddButton(W_SCREEN *psScreen, const W_BUTINIT* psInit) +bool widgAddButton(W_SCREEN *psScreen, const W_BUTINIT* psInit) { W_BUTTON *psButton; W_FORM *psForm; @@ -394,7 +394,7 @@ BOOL widgAddButton(W_SCREEN *psScreen, const W_BUTINIT* psInit) /* Add an edit box to the widget screen */ -BOOL widgAddEditBox(W_SCREEN *psScreen, const W_EDBINIT* psInit) +bool widgAddEditBox(W_SCREEN *psScreen, const W_EDBINIT* psInit) { W_EDITBOX *psEdBox; W_FORM *psForm; @@ -438,7 +438,7 @@ BOOL widgAddEditBox(W_SCREEN *psScreen, const W_EDBINIT* psInit) /* Add a bar graph to the widget screen */ -BOOL widgAddBarGraph(W_SCREEN *psScreen, const W_BARINIT* psInit) +bool widgAddBarGraph(W_SCREEN *psScreen, const W_BARINIT* psInit) { W_BARGRAPH *psBarGraph; W_FORM *psForm; @@ -482,7 +482,7 @@ BOOL widgAddBarGraph(W_SCREEN *psScreen, const W_BARINIT* psInit) /* Add a slider to a form */ -BOOL widgAddSlider(W_SCREEN *psScreen, const W_SLDINIT* psInit) +bool widgAddSlider(W_SCREEN *psScreen, const W_SLDINIT* psInit) { W_SLIDER *psSlider; W_FORM *psForm; @@ -526,7 +526,7 @@ BOOL widgAddSlider(W_SCREEN *psScreen, const W_SLDINIT* psInit) /* Delete a widget from a form */ -static BOOL widgDeleteFromForm(W_FORM *psForm, UDWORD id, W_CONTEXT *psContext) +static bool widgDeleteFromForm(W_FORM *psForm, UDWORD id, W_CONTEXT *psContext) { WIDGET *psPrev = NULL, *psCurr, *psNext; W_TABFORM *psTabForm; @@ -1737,12 +1737,12 @@ SWORD WidgGetClickedAudioID(void) } -void setWidgetsStatus(BOOL var) +void setWidgetsStatus(bool var) { bWidgetsActive = var; } -BOOL getWidgetsStatus( void ) +bool getWidgetsStatus( void ) { return(bWidgetsActive); } diff --git a/lib/widget/widget.h b/lib/widget/widget.h index 59c2c947e..313927a3d 100644 --- a/lib/widget/widget.h +++ b/lib/widget/widget.h @@ -143,7 +143,7 @@ struct W_INIT #define TAB_MINOR 0 // Tab types passed into tab display callbacks. #define TAB_MAJOR 1 -typedef void (*TAB_DISPLAY)(WIDGET *psWidget, UDWORD TabType, UDWORD Position, UDWORD Number, BOOL Selected, BOOL Hilight, UDWORD x, UDWORD y, UDWORD Width, UDWORD Height); +typedef void (*TAB_DISPLAY)(WIDGET *psWidget, UDWORD TabType, UDWORD Position, UDWORD Number, bool Selected, bool Hilight, UDWORD x, UDWORD y, UDWORD Width, UDWORD Height); typedef void (*FONT_DISPLAY)(UDWORD x, UDWORD y, char *String); /** Form initialisation structure */ @@ -280,22 +280,22 @@ extern void widgReleaseScreen(W_SCREEN *psScreen); extern void widgSetTipFont(W_SCREEN *psScreen, enum iV_fonts FontID); /** Add a form to the widget screen */ -extern BOOL widgAddForm(W_SCREEN *psScreen, const W_FORMINIT* psInit); +extern bool widgAddForm(W_SCREEN *psScreen, const W_FORMINIT* psInit); /** Add a label to the widget screen */ -extern BOOL widgAddLabel(W_SCREEN *psScreen, const W_LABINIT* psInit); +extern bool widgAddLabel(W_SCREEN *psScreen, const W_LABINIT* psInit); /** Add a button to a form */ -extern BOOL widgAddButton(W_SCREEN *psScreen, const W_BUTINIT* psInit); +extern bool widgAddButton(W_SCREEN *psScreen, const W_BUTINIT* psInit); /** Add an edit box to a form */ -extern BOOL widgAddEditBox(W_SCREEN *psScreen, const W_EDBINIT* psInit); +extern bool widgAddEditBox(W_SCREEN *psScreen, const W_EDBINIT* psInit); /** Add a bar graph to a form */ -extern BOOL widgAddBarGraph(W_SCREEN *psScreen, const W_BARINIT* psInit); +extern bool widgAddBarGraph(W_SCREEN *psScreen, const W_BARINIT* psInit); /** Add a slider to a form */ -extern BOOL widgAddSlider(W_SCREEN *psScreen, const W_SLDINIT* psInit); +extern bool widgAddSlider(W_SCREEN *psScreen, const W_SLDINIT* psInit); /** Delete a widget from the screen */ extern void widgDelete(W_SCREEN *psScreen, UDWORD id); @@ -444,10 +444,10 @@ extern SWORD WidgGetHilightAudioID(void); extern SWORD WidgGetClickedAudioID(void); /** Enable or disable all sliders. */ -extern void sliderEnableDrag(BOOL Enable); +extern void sliderEnableDrag(bool Enable); -extern void setWidgetsStatus( BOOL var ); -extern BOOL getWidgetsStatus( void ); +extern void setWidgetsStatus( bool var ); +extern bool getWidgetsStatus( void ); extern void CheckpsMouseOverWidget( void *psWidget ); /** @} */ diff --git a/src/action.cpp b/src/action.cpp index 5cd18475e..79d9408fd 100644 --- a/src/action.cpp +++ b/src/action.cpp @@ -154,7 +154,7 @@ const char* getDroidActionName(DROID_ACTION action) } /* Check if a target is at correct range to attack */ -static BOOL actionInAttackRange(DROID *psDroid, BASE_OBJECT *psObj, int weapon_slot) +static bool actionInAttackRange(DROID *psDroid, BASE_OBJECT *psObj, int weapon_slot) { SDWORD dx, dy, radSq, rangeSq, longRange; WEAPON_STATS *psStats; @@ -228,7 +228,7 @@ static BOOL actionInAttackRange(DROID *psDroid, BASE_OBJECT *psObj, int weapon_s // check if a target is within weapon range -BOOL actionInRange(DROID *psDroid, BASE_OBJECT *psObj, int weapon_slot) +bool actionInRange(DROID *psDroid, BASE_OBJECT *psObj, int weapon_slot) { SDWORD dx, dy, radSq, rangeSq, longRange; WEAPON_STATS *psStats; @@ -269,7 +269,7 @@ BOOL actionInRange(DROID *psDroid, BASE_OBJECT *psObj, int weapon_slot) // check if a target is inside minimum weapon range -BOOL actionInsideMinRange(DROID *psDroid, BASE_OBJECT *psObj, WEAPON_STATS *psStats) +bool actionInsideMinRange(DROID *psDroid, BASE_OBJECT *psObj, WEAPON_STATS *psStats) { SDWORD dx, dy, radSq, rangeSq, minRange; @@ -359,7 +359,7 @@ void actionAlignTurret(BASE_OBJECT *psObj, int weapon_slot) } /* returns true if on target */ -BOOL actionTargetTurret(BASE_OBJECT *psAttacker, BASE_OBJECT *psTarget, WEAPON *psWeapon) +bool actionTargetTurret(BASE_OBJECT *psAttacker, BASE_OBJECT *psTarget, WEAPON *psWeapon) { WEAPON_STATS *psWeapStats = asWeaponStats + psWeapon->nStat; uint16_t tRotation, tPitch; @@ -483,7 +483,7 @@ BOOL actionTargetTurret(BASE_OBJECT *psAttacker, BASE_OBJECT *psTarget, WEAPON * // return whether a droid can see a target to fire on it -BOOL actionVisibleTarget(DROID *psDroid, BASE_OBJECT *psTarget, int weapon_slot) +bool actionVisibleTarget(DROID *psDroid, BASE_OBJECT *psTarget, int weapon_slot) { WEAPON_STATS *psStats; int compIndex; @@ -714,7 +714,7 @@ static void actionCalcPullBackPoint(BASE_OBJECT *psObj, BASE_OBJECT *psTarget, S // check whether a droid is in the neighboring tile to a build position -BOOL actionReachedBuildPos(DROID *psDroid, SDWORD x, SDWORD y, BASE_STATS *psStats) +bool actionReachedBuildPos(DROID *psDroid, SDWORD x, SDWORD y, BASE_STATS *psStats) { SDWORD width, breadth, tx,ty, dx,dy; @@ -767,7 +767,7 @@ BOOL actionReachedBuildPos(DROID *psDroid, SDWORD x, SDWORD y, BASE_STATS *psSta // check if a droid is on the foundations of a new building -static BOOL actionDroidOnBuildPos(DROID *psDroid, SDWORD x, SDWORD y, BASE_STATS *psStats) +static bool actionDroidOnBuildPos(DROID *psDroid, SDWORD x, SDWORD y, BASE_STATS *psStats) { SDWORD width, breadth, tx,ty, dx,dy; @@ -829,7 +829,7 @@ void actionUpdateDroid(DROID *psDroid) { BASE_OBJECT *psTarget; PROPULSION_STATS *psPropStats; - BOOL (*actionUpdateFunc)(DROID *psDroid) = NULL; + bool (*actionUpdateFunc)(DROID *psDroid) = NULL; unsigned i; //this is a bit field bool nonNullWeapon[DROID_MAXWEAPS] = { false }; @@ -2766,7 +2766,7 @@ void moveToRearm(DROID *psDroid) // whether a tile is suitable for a vtol to land on -static BOOL vtolLandingTile(SDWORD x, SDWORD y) +static bool vtolLandingTile(SDWORD x, SDWORD y) { MAPTILE *psTile; diff --git a/src/action.h b/src/action.h index fa46ed04c..30c6b99b2 100644 --- a/src/action.h +++ b/src/action.h @@ -72,22 +72,22 @@ void actionDroid(DROID *psDroid, DROID_ACTION action, BASE_OBJECT *psObj, UDWORD x, UDWORD y); /** Rotate turret toward target return True if locked on (Droid and Structure). */ -BOOL actionTargetTurret(BASE_OBJECT *psAttacker, BASE_OBJECT *psTarget, WEAPON *psWeapon); +bool actionTargetTurret(BASE_OBJECT *psAttacker, BASE_OBJECT *psTarget, WEAPON *psWeapon); /** Realign turret. */ void actionAlignTurret(BASE_OBJECT *psObj, int weapon_slot); /** Check if a target is within weapon range. */ -BOOL actionInRange(DROID *psDroid, BASE_OBJECT *psObj, int weapon_slot); +bool actionInRange(DROID *psDroid, BASE_OBJECT *psObj, int weapon_slot); /** Check if a target is inside minimum weapon range. */ -BOOL actionInsideMinRange(DROID *psDroid, BASE_OBJECT *psObj, WEAPON_STATS *psWeapStats); +bool actionInsideMinRange(DROID *psDroid, BASE_OBJECT *psObj, WEAPON_STATS *psWeapStats); /** Return whether a droid can see a target to fire on it. */ -BOOL actionVisibleTarget(DROID *psDroid, BASE_OBJECT *psTarget, int weapon_slot); +bool actionVisibleTarget(DROID *psDroid, BASE_OBJECT *psTarget, int weapon_slot); /** Check whether a droid is in the neighboring tile to a build position. */ -BOOL actionReachedBuildPos(DROID *psDroid, SDWORD x, SDWORD y, BASE_STATS *psStats); +bool actionReachedBuildPos(DROID *psDroid, SDWORD x, SDWORD y, BASE_STATS *psStats); /** Send the vtol droid back to the nearest rearming pad - if there is one, otherwise return to base. */ void moveToRearm(DROID *psDroid); diff --git a/src/advvis.cpp b/src/advvis.cpp index 1798f04b8..a116cc851 100644 --- a/src/advvis.cpp +++ b/src/advvis.cpp @@ -32,7 +32,7 @@ #define FADE_IN_TIME (GAME_TICKS_PER_SEC/10) #define START_DIVIDE (8) -static BOOL bRevealActive = false; +static bool bRevealActive = false; // ------------------------------------------------------------------------------------ @@ -86,13 +86,13 @@ UDWORD avGetObjLightLevel(BASE_OBJECT *psObj,UDWORD origLevel) } // ------------------------------------------------------------------------------------ -BOOL getRevealStatus( void ) +bool getRevealStatus( void ) { return(bRevealActive); } // ------------------------------------------------------------------------------------ -void setRevealStatus( BOOL val ) +void setRevealStatus( bool val ) { debug(LOG_FOG, "avSetRevealStatus: Setting reveal to %s", val ? "ON" : "OFF"); bRevealActive = val; diff --git a/src/advvis.h b/src/advvis.h index 11e7ba3fe..c171475b0 100644 --- a/src/advvis.h +++ b/src/advvis.h @@ -25,8 +25,8 @@ void avUpdateTiles(void); UDWORD avGetObjLightLevel(BASE_OBJECT *psObj, UDWORD origLevel); -void setRevealStatus(BOOL val); -BOOL getRevealStatus(void); +void setRevealStatus(bool val); +bool getRevealStatus(void); void preProcessVisibility(void); #endif // __INCLUDED_SRC_ADVVIS_H__ diff --git a/src/ai.cpp b/src/ai.cpp index 356d896d0..6922fa301 100644 --- a/src/ai.cpp +++ b/src/ai.cpp @@ -131,7 +131,7 @@ static bool aiObjHasRange(BASE_OBJECT *psObj, BASE_OBJECT *psTarget, int weapon_ } /* Initialise the AI system */ -BOOL aiInitialise(void) +bool aiInitialise(void) { SDWORD i,j; @@ -152,7 +152,7 @@ BOOL aiInitialise(void) } /* Shutdown the AI system */ -BOOL aiShutdown(void) +bool aiShutdown(void) { return true; } @@ -162,7 +162,7 @@ static BASE_OBJECT *aiSearchSensorTargets(BASE_OBJECT *psObj, int weapon_slot, W { int longRange = proj_GetLongRange(psWStats); int tarDist = longRange * longRange; - BOOL foundCB = false; + bool foundCB = false; int minDist = psWStats->minRange * psWStats->minRange; BASE_OBJECT *psSensor, *psTarget = NULL; @@ -250,7 +250,7 @@ static SDWORD targetAttackWeight(BASE_OBJECT *psTarget, BASE_OBJECT *psAttacker, STRUCTURE *targetStructure=NULL; WEAPON_EFFECT weaponEffect; WEAPON_STATS *attackerWeapon; - BOOL bEmpWeap=false,bCmdAttached=false,bTargetingCmd=false; + bool bEmpWeap=false,bCmdAttached=false,bTargetingCmd=false; if (psTarget == NULL || psAttacker == NULL || aiObjectIsProbablyDoomed(psTarget)) { @@ -484,7 +484,7 @@ int aiBestNearestTarget(DROID *psDroid, BASE_OBJECT **ppsObj, int weapon_slot, i { SDWORD bestMod = 0,newMod, failure = -1; BASE_OBJECT *psTarget = NULL, *friendlyObj, *bestTarget = NULL, *iter, *targetInQuestion, *tempTarget; - BOOL electronic = false; + bool electronic = false; STRUCTURE *targetStructure; WEAPON_EFFECT weaponEffect; UWORD tmpOrigin = ORIGIN_UNKNOWN; @@ -662,21 +662,21 @@ int aiBestNearestTarget(DROID *psDroid, BASE_OBJECT **ppsObj, int weapon_slot, i } // Are there a lot of bullets heading towards the droid? -static BOOL aiDroidIsProbablyDoomed(DROID *psDroid) +static bool aiDroidIsProbablyDoomed(DROID *psDroid) { return psDroid->expectedDamage > psDroid->body && psDroid->expectedDamage - psDroid->body > psDroid->body/5; // Doomed if projectiles will damage 120% of remaining body points. } // Are there a lot of bullets heading towards the structure? -static BOOL aiStructureIsProbablyDoomed(STRUCTURE *psStructure) +static bool aiStructureIsProbablyDoomed(STRUCTURE *psStructure) { return psStructure->expectedDamage > psStructure->body && psStructure->expectedDamage - psStructure->body > psStructure->body/15; // Doomed if projectiles will damage 106.6666666667% of remaining body points. } // Are there a lot of bullets heading towards the object? -BOOL aiObjectIsProbablyDoomed(BASE_OBJECT *psObject) +bool aiObjectIsProbablyDoomed(BASE_OBJECT *psObject) { if (psObject->died) return true; // Was definitely doomed. @@ -714,7 +714,7 @@ void aiObjectAddExpectedDamage(BASE_OBJECT *psObject, SDWORD damage) } // see if an object is a wall -static BOOL aiObjIsWall(BASE_OBJECT *psObj) +static bool aiObjIsWall(BASE_OBJECT *psObj) { if (psObj->type != OBJ_STRUCTURE) { @@ -732,7 +732,7 @@ static BOOL aiObjIsWall(BASE_OBJECT *psObj) /* See if there is a target in range */ -BOOL aiChooseTarget(BASE_OBJECT *psObj, BASE_OBJECT **ppsTarget, int weapon_slot, BOOL bUpdateTarget, UWORD *targetOrigin) +bool aiChooseTarget(BASE_OBJECT *psObj, BASE_OBJECT **ppsTarget, int weapon_slot, bool bUpdateTarget, UWORD *targetOrigin) { BASE_OBJECT *psTarget = NULL; DROID *psCommander; @@ -801,7 +801,7 @@ BOOL aiChooseTarget(BASE_OBJECT *psObj, BASE_OBJECT **ppsTarget, int weapon_slot else if (psObj->type == OBJ_STRUCTURE) { WEAPON_STATS *psWStats = NULL; - BOOL bCommanderBlock = false; + bool bCommanderBlock = false; ASSERT(((STRUCTURE *)psObj)->asWeaps[weapon_slot].nStat > 0, "no weapons on structure"); @@ -897,7 +897,7 @@ BOOL aiChooseTarget(BASE_OBJECT *psObj, BASE_OBJECT **ppsTarget, int weapon_slot /* See if there is a target in range for Sensor objects*/ -BOOL aiChooseSensorTarget(BASE_OBJECT *psObj, BASE_OBJECT **ppsTarget) +bool aiChooseSensorTarget(BASE_OBJECT *psObj, BASE_OBJECT **ppsTarget) { int sensorRange = objSensorRange(psObj); unsigned int radSquared = sensorRange * sensorRange; @@ -1013,7 +1013,7 @@ BOOL aiChooseSensorTarget(BASE_OBJECT *psObj, BASE_OBJECT **ppsTarget) } /* Make droid/structure look for a better target */ -static BOOL updateAttackTarget(BASE_OBJECT * psAttacker, SDWORD weapon_slot) +static bool updateAttackTarget(BASE_OBJECT * psAttacker, SDWORD weapon_slot) { BASE_OBJECT *psBetterTarget=NULL; UWORD tmpOrigin = ORIGIN_UNKNOWN; @@ -1053,7 +1053,7 @@ static BOOL updateAttackTarget(BASE_OBJECT * psAttacker, SDWORD weapon_slot) void aiUpdateDroid(DROID *psDroid) { BASE_OBJECT *psTarget; - BOOL lookForTarget,updateTarget; + bool lookForTarget,updateTarget; ASSERT(psDroid != NULL, "Invalid droid pointer"); if (!psDroid || isDead((BASE_OBJECT *)psDroid)) @@ -1193,9 +1193,9 @@ void aiUpdateDroid(DROID *psDroid) } /* Set of rules which determine whether the weapon associated with the object can fire on the propulsion type of the target. */ -BOOL validTarget(BASE_OBJECT *psObject, BASE_OBJECT *psTarget, int weapon_slot) +bool validTarget(BASE_OBJECT *psObject, BASE_OBJECT *psTarget, int weapon_slot) { - BOOL bTargetInAir = false, bValidTarget = false; + bool bTargetInAir = false, bValidTarget = false; UBYTE surfaceToAir = 0; if (!psTarget) diff --git a/src/ai.h b/src/ai.h index f6c4d8da2..d36ea4c01 100644 --- a/src/ai.h +++ b/src/ai.h @@ -45,13 +45,13 @@ extern PlayerMask satuplinkbits; #define aiCheckAlliances(_s1, _s2) (alliances[_s1][_s2] == ALLIANCE_FORMED) /* Initialise the AI system */ -BOOL aiInitialise(void); +bool aiInitialise(void); /* Shutdown the AI system */ -BOOL aiShutdown(void); +bool aiShutdown(void); /* Initialise a droid structure for AI */ -//extern BOOL aiInitDroid(DROID *psDroid); +//extern bool aiInitDroid(DROID *psDroid); /* Do the AI for a droid */ void aiUpdateDroid(DROID *psDroid); @@ -62,20 +62,20 @@ int aiBestNearestTarget(DROID *psDroid, BASE_OBJECT **ppsObj, int weapon_slot, i int aiBestNearestTarget(DROID *psDroid, BASE_OBJECT **ppsObj, int weapon_slot, void const *extraRange); // Are there a lot of bullets heading towards the structure? -BOOL aiObjectIsProbablyDoomed(BASE_OBJECT *psObject); +bool aiObjectIsProbablyDoomed(BASE_OBJECT *psObject); // Update the expected damage of the object. void aiObjectAddExpectedDamage(BASE_OBJECT *psObject, SDWORD damage); /* See if there is a target in range added int weapon_slot*/ -BOOL aiChooseTarget(BASE_OBJECT *psObj, - BASE_OBJECT **ppsTarget, int weapon_slot, BOOL bUpdateTarget, UWORD *targetOrigin); +bool aiChooseTarget(BASE_OBJECT *psObj, + BASE_OBJECT **ppsTarget, int weapon_slot, bool bUpdateTarget, UWORD *targetOrigin); /** See if there is a target in range for Sensor objects. */ -BOOL aiChooseSensorTarget(BASE_OBJECT *psObj, BASE_OBJECT **ppsTarget); +bool aiChooseSensorTarget(BASE_OBJECT *psObj, BASE_OBJECT **ppsTarget); /*set of rules which determine whether the weapon associated with the object can fire on the propulsion type of the target*/ -BOOL validTarget(BASE_OBJECT *psObject, BASE_OBJECT *psTarget, int weapon_slot); +bool validTarget(BASE_OBJECT *psObject, BASE_OBJECT *psTarget, int weapon_slot); #endif // __INCLUDED_SRC_AI_H__ diff --git a/src/bridge.cpp b/src/bridge.cpp index 770940352..23124e5ed 100644 --- a/src/bridge.cpp +++ b/src/bridge.cpp @@ -52,7 +52,7 @@ one of the axes must share the same values. */ bool bridgeValid(int startX, int startY, int endX, int endY) { - BOOL xBridge, yBridge; + bool xBridge, yBridge; int bridgeLength, i, minX, minY, maxX, maxY; /* Establish axes allignment */ @@ -112,7 +112,7 @@ bool bridgeValid(int startX, int startY, int endX, int endY) at a height stored in their structure - as they're above the ground and wouldn't be much use if they weren't, bridge wise. */ -BOOL renderBridgeSection(STRUCTURE *psStructure) +bool renderBridgeSection(STRUCTURE *psStructure) { SDWORD rx, rz; Vector3i dv; diff --git a/src/bridge.h b/src/bridge.h index f1fa51d69..473fba433 100644 --- a/src/bridge.h +++ b/src/bridge.h @@ -36,7 +36,7 @@ struct BRIDGE_INFO bool bridgeValid(int startX, int startY, int endX, int endY); /* Draws a wall section - got to be in world matrix context though! */ -BOOL renderBridgeSection(STRUCTURE *psStructure); +bool renderBridgeSection(STRUCTURE *psStructure); /* Will provide you with everything you ever wanted to know about your bridge but were afraid to ask */ void getBridgeInfo(int startX, int startY, int endX, int endY, BRIDGE_INFO *info); diff --git a/src/cheat.cpp b/src/cheat.cpp index 255bc6a0c..8373563ad 100644 --- a/src/cheat.cpp +++ b/src/cheat.cpp @@ -79,7 +79,7 @@ static CHEAT_ENTRY cheatCodes[] = {"desync me", kf_ForceDesync}, }; -BOOL attemptCheatCode(const char* cheat_name) +bool attemptCheatCode(const char* cheat_name) { const CHEAT_ENTRY * curCheat; static const CHEAT_ENTRY * const EndCheat = &cheatCodes[ARRAY_SIZE(cheatCodes)]; diff --git a/src/cheat.h b/src/cheat.h index 7e7f0d62d..594d05579 100644 --- a/src/cheat.h +++ b/src/cheat.h @@ -21,6 +21,6 @@ #ifndef __INCLUDED_SRC_CHEAT_H__ #define __INCLUDED_SRC_CHEAT_H__ -BOOL attemptCheatCode(const char* cheat_name); +bool attemptCheatCode(const char* cheat_name); #endif // __INCLUDED_SRC_CHEAT_H__ diff --git a/src/clparse.cpp b/src/clparse.cpp index 5610351a4..322a99d6a 100644 --- a/src/clparse.cpp +++ b/src/clparse.cpp @@ -39,7 +39,7 @@ #include "wrappers.h" //! Let the end user into debug mode.... -BOOL bAllowDebugMode = false; +bool bAllowDebugMode = false; ////// // Our fine replacement for the popt abomination follows diff --git a/src/clparse.h b/src/clparse.h index e3c2238a0..c4cef4e94 100644 --- a/src/clparse.h +++ b/src/clparse.h @@ -28,6 +28,6 @@ bool ParseCommandLine(int argc, const char** argv); bool ParseCommandLineEarly(int argc, const char** argv); -extern BOOL bAllowDebugMode; +extern bool bAllowDebugMode; #endif // __INCLUDED_SRC_CLPARSE_H__ diff --git a/src/cluster.cpp b/src/cluster.cpp index 372e8aa52..db623e1bb 100644 --- a/src/cluster.cpp +++ b/src/cluster.cpp @@ -315,7 +315,7 @@ static SDWORD clustFindUnused(void) void clustUpdateObject(BASE_OBJECT * psObj) { SDWORD newCluster, oldCluster, i; - BOOL found; + bool found; SDWORD player; newCluster = clustFindUnused(); diff --git a/src/cmddroid.cpp b/src/cmddroid.cpp index c553cc354..2d8241589 100644 --- a/src/cmddroid.cpp +++ b/src/cmddroid.cpp @@ -156,7 +156,7 @@ SDWORD cmdDroidGetIndex(DROID *psCommander) // note that commander experience should be increased -void cmdDroidMultiExpBoost(BOOL bDoit) +void cmdDroidMultiExpBoost(bool bDoit) { bMultiExpBoost = bDoit; } diff --git a/src/cmddroid.h b/src/cmddroid.h index 21d6dfa32..54d7ab248 100644 --- a/src/cmddroid.h +++ b/src/cmddroid.h @@ -67,7 +67,7 @@ extern unsigned int cmdGetCommanderLevel(const DROID* psDroid); extern bool hasCommander(const DROID* psDroid); // note that commander experience should be increased -extern void cmdDroidMultiExpBoost(BOOL bDoit); +extern void cmdDroidMultiExpBoost(bool bDoit); // check whether commander experience should be increased extern bool cmdGetDroidMultiExpBoost(void); diff --git a/src/component.cpp b/src/component.cpp index b76529eda..774a30d74 100644 --- a/src/component.cpp +++ b/src/component.cpp @@ -49,11 +49,11 @@ //VTOL weapon connector start #define VTOL_CONNECTOR_START 5 -static BOOL leftFirst; +static bool leftFirst; // Colour Lookups // use col = MAX_PLAYERS for anycolour (see multiint.c) -BOOL setPlayerColour(UDWORD player, UDWORD col) +bool setPlayerColour(UDWORD player, UDWORD col) { ASSERT(player < MAX_PLAYERS && col < MAX_PLAYERS, "Bad colour setting"); NetPlay.players[player].colour = col; @@ -66,7 +66,7 @@ UBYTE getPlayerColour(UDWORD pl) } -static void setMatrix(Vector3i *Position, Vector3i *Rotation, BOOL RotXYZ) +static void setMatrix(Vector3i *Position, Vector3i *Rotation, bool RotXYZ) { pie_PerspectiveBegin(); pie_MatBegin(); @@ -175,7 +175,7 @@ UDWORD getStructureStatHeight(STRUCTURE_STATS *psStat) } -void displayIMDButton(iIMDShape *IMDShape, Vector3i *Rotation, Vector3i *Position, BOOL RotXYZ, SDWORD scale) +void displayIMDButton(iIMDShape *IMDShape, Vector3i *Rotation, Vector3i *Position, bool RotXYZ, SDWORD scale) { setMatrix(Position, Rotation, RotXYZ); pie_MatScale(scale / 100.f); @@ -187,7 +187,7 @@ void displayIMDButton(iIMDShape *IMDShape, Vector3i *Rotation, Vector3i *Positio //changed it to loop thru and draw all weapons -void displayStructureButton(STRUCTURE *psStructure, Vector3i *rotation, Vector3i *Position, BOOL RotXYZ, SDWORD scale) +void displayStructureButton(STRUCTURE *psStructure, Vector3i *rotation, Vector3i *Position, bool RotXYZ, SDWORD scale) { iIMDShape *baseImd,*strImd;//*mountImd,*weaponImd; iIMDShape *mountImd[STRUCT_MAXWEAPS]; @@ -284,7 +284,7 @@ void displayStructureButton(STRUCTURE *psStructure, Vector3i *rotation, Vector3i unsetMatrix(); } -void displayStructureStatButton(STRUCTURE_STATS *Stats, Vector3i *Rotation, Vector3i *Position, BOOL RotXYZ, SDWORD scale) +void displayStructureStatButton(STRUCTURE_STATS *Stats, Vector3i *Rotation, Vector3i *Position, bool RotXYZ, SDWORD scale) { iIMDShape *baseImd,*strImd;//*mountImd,*weaponImd; iIMDShape *mountImd[STRUCT_MAXWEAPS]; @@ -392,7 +392,7 @@ void displayStructureStatButton(STRUCTURE_STATS *Stats, Vector3i *Rotation, Vect // Render a component given a BASE_STATS structure. // void displayComponentButton(BASE_STATS *Stat, Vector3i *Rotation, Vector3i *Position, - BOOL RotXYZ, SDWORD scale) + bool RotXYZ, SDWORD scale) { iIMDShape *ComponentIMD = NULL; iIMDShape *MountIMD = NULL; @@ -440,7 +440,7 @@ void displayComponentButton(BASE_STATS *Stat, Vector3i *Rotation, Vector3i *Posi // Render a research item given a BASE_STATS structure. // -void displayResearchButton(BASE_STATS *Stat, Vector3i *Rotation, Vector3i *Position, BOOL RotXYZ, SDWORD scale) +void displayResearchButton(BASE_STATS *Stat, Vector3i *Rotation, Vector3i *Position, bool RotXYZ, SDWORD scale) { iIMDShape *ResearchIMD = ((RESEARCH *)Stat)->pIMD; iIMDShape *MountIMD = ((RESEARCH *)Stat)->pIMD2; @@ -498,7 +498,7 @@ static iIMDShape *getRightPropulsionIMD(DROID *psDroid) /* Assumes matrix context is already set */ // this is able to handle multiple weapon graphics now // removed mountRotation,they get such stuff from psObj directly now -static void displayCompObj(DROID *psDroid, BOOL bButton) +static void displayCompObj(DROID *psDroid, bool bButton) { iIMDShape *psShape, *psJet, *psShapeTemp = NULL, *psMountShape; Vector3i zero(0, 0, 0); @@ -943,7 +943,7 @@ static void displayCompObj(DROID *psDroid, BOOL bButton) // Render a composite droid given a DROID_TEMPLATE structure. // -void displayComponentButtonTemplate(DROID_TEMPLATE *psTemplate, Vector3i *Rotation, Vector3i *Position, BOOL RotXYZ, SDWORD scale) +void displayComponentButtonTemplate(DROID_TEMPLATE *psTemplate, Vector3i *Rotation, Vector3i *Position, bool RotXYZ, SDWORD scale) { setMatrix(Position, Rotation, RotXYZ); pie_MatScale(scale / 100.f); @@ -966,7 +966,7 @@ void displayComponentButtonTemplate(DROID_TEMPLATE *psTemplate, Vector3i *Rotati // Render a composite droid given a DROID structure. // -void displayComponentButtonObject(DROID *psDroid, Vector3i *Rotation, Vector3i *Position, BOOL RotXYZ, SDWORD scale) +void displayComponentButtonObject(DROID *psDroid, Vector3i *Rotation, Vector3i *Position, bool RotXYZ, SDWORD scale) { SDWORD difference; diff --git a/src/component.h b/src/component.h index 41336736f..091025c7b 100644 --- a/src/component.h +++ b/src/component.h @@ -29,7 +29,7 @@ Pumpkin Studios, EIDOS Interactive. */ -BOOL setPlayerColour(UDWORD player, UDWORD col); +bool setPlayerColour(UDWORD player, UDWORD col); UBYTE getPlayerColour(UDWORD pl); UDWORD getComponentDroidRadius(DROID *psDroid); @@ -53,13 +53,13 @@ UDWORD getStructureStatSize(STRUCTURE_STATS *Stats); #define TOWER_HEIGHT 100 UDWORD getStructureStatHeight(STRUCTURE_STATS *psStat); -void displayIMDButton(iIMDShape *IMDShape, Vector3i *Rotation, Vector3i *Position, BOOL RotXYZ, SDWORD scale); -void displayStructureButton(STRUCTURE *psStructure, Vector3i *Rotation, Vector3i *Position, BOOL RotXYZ, SDWORD scale); -void displayStructureStatButton(STRUCTURE_STATS *Stats, Vector3i *Rotation, Vector3i *Position, BOOL RotXYZ, SDWORD scale); -void displayComponentButton(BASE_STATS *Stat, Vector3i *Rotation, Vector3i *Position, BOOL RotXYZ, SDWORD scale); -void displayResearchButton(BASE_STATS *Stat, Vector3i *Rotation, Vector3i *Position, BOOL RotXYZ, SDWORD scale); -void displayComponentButtonTemplate(DROID_TEMPLATE *psTemplate, Vector3i *Rotation, Vector3i *Position, BOOL RotXYZ, SDWORD scale); -void displayComponentButtonObject(DROID *psDroid, Vector3i *Rotation, Vector3i *Position, BOOL RotXYZ, SDWORD scale); +void displayIMDButton(iIMDShape *IMDShape, Vector3i *Rotation, Vector3i *Position, bool RotXYZ, SDWORD scale); +void displayStructureButton(STRUCTURE *psStructure, Vector3i *Rotation, Vector3i *Position, bool RotXYZ, SDWORD scale); +void displayStructureStatButton(STRUCTURE_STATS *Stats, Vector3i *Rotation, Vector3i *Position, bool RotXYZ, SDWORD scale); +void displayComponentButton(BASE_STATS *Stat, Vector3i *Rotation, Vector3i *Position, bool RotXYZ, SDWORD scale); +void displayResearchButton(BASE_STATS *Stat, Vector3i *Rotation, Vector3i *Position, bool RotXYZ, SDWORD scale); +void displayComponentButtonTemplate(DROID_TEMPLATE *psTemplate, Vector3i *Rotation, Vector3i *Position, bool RotXYZ, SDWORD scale); +void displayComponentButtonObject(DROID *psDroid, Vector3i *Rotation, Vector3i *Position, bool RotXYZ, SDWORD scale); void displayComponentObject(DROID *psDroid); void compPersonToBits(DROID *psDroid); diff --git a/src/configuration.cpp b/src/configuration.cpp index e805465b4..b6b1eb488 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -53,7 +53,7 @@ #define GAMESERVERPORT 2100 // //////////////////////////////////////////////////////////////////////////// -BOOL loadConfig(void) +bool loadConfig(void) { int val; char sBuf[255]; @@ -488,7 +488,7 @@ BOOL loadConfig(void) // enemy/allies radar view if(getWarzoneKeyNumeric("radarObjectMode", &val)) { - bEnemyAllyRadarColor =(BOOL)val; + bEnemyAllyRadarColor =(bool)val; } else { bEnemyAllyRadarColor = false; setWarzoneKeyNumeric("radarObjectMode", (SDWORD)bEnemyAllyRadarColor); @@ -625,7 +625,7 @@ BOOL loadConfig(void) } // //////////////////////////////////////////////////////////////////////////// -BOOL saveConfig(void) +bool saveConfig(void) { debug( LOG_WZ, "Writing prefs to registry\n" ); @@ -712,7 +712,7 @@ BOOL saveConfig(void) // Saves and loads the relevant part of the config files for MP games // Ensures that others' games don't change our own configuration settings -BOOL reloadMPConfig(void) +bool reloadMPConfig(void) { int val; char sBuf[255]; diff --git a/src/configuration.h b/src/configuration.h index f89c52ee6..aa87fefea 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -24,9 +24,9 @@ #ifndef __INCLUDED_SRC_CONFIGURATION_H__ #define __INCLUDED_SRC_CONFIGURATION_H__ -BOOL loadConfig(void); -BOOL saveConfig(void); -BOOL reloadMPConfig(void); +bool loadConfig(void); +bool saveConfig(void); +bool reloadMPConfig(void); void closeConfig( void ); /// Default map for Skirmish diff --git a/src/console.cpp b/src/console.cpp index f5d7e648d..2d1f27649 100644 --- a/src/console.cpp +++ b/src/console.cpp @@ -49,7 +49,7 @@ struct CONSOLE UDWORD topY; UDWORD width; UDWORD textDepth; - BOOL permanent; + bool permanent; }; /* Definition of a message */ @@ -64,7 +64,7 @@ struct CONSOLE_MESSAGE }; /** Is the console history on or off? */ -static BOOL bConsoleDropped = false; +static bool bConsoleDropped = false; /** Stores the console dimensions and states */ static CONSOLE mainConsole; @@ -105,10 +105,10 @@ static UDWORD messageDuration; static UDWORD lastDropChange = 0; /** Is there a box under the console text? */ -static BOOL bTextBoxActive; +static bool bTextBoxActive; /** Is the console being displayed? */ -static BOOL bConsoleDisplayEnabled; +static bool bConsoleDisplayEnabled; /** How many lines are displayed? */ static UDWORD consoleVisibleLines; @@ -212,7 +212,7 @@ void toggleConsoleDrop( void ) } /** Add a string to the console. */ -BOOL addConsoleMessage(const char *messageText, CONSOLE_TEXT_JUSTIFICATION jusType, +bool addConsoleMessage(const char *messageText, CONSOLE_TEXT_JUSTIFICATION jusType, SDWORD player) { int textLength; @@ -455,8 +455,8 @@ static void setConsoleTextColor(SDWORD player) static int displayOldMessages(void) { int i; - BOOL bGotIt; - BOOL bQuit; + bool bGotIt; + bool bQuit; int marker = 0; int linePitch; int MesY; @@ -659,7 +659,7 @@ void displayConsoleMessages( void ) } /** Allows toggling of the box under the console text */ -void setConsoleBackdropStatus(BOOL state) +void setConsoleBackdropStatus(bool state) { bTextBoxActive = state; } @@ -670,7 +670,7 @@ void setConsoleBackdropStatus(BOOL state) to make sure that when it's turned back on again, there are no messages, the call flushConsoleMessages first. */ -void enableConsoleDisplay(BOOL state) +void enableConsoleDisplay(bool state) { bConsoleDisplayEnabled = state; } @@ -705,7 +705,7 @@ void setConsoleSizePos(UDWORD x, UDWORD y, UDWORD width) } /** Establishes whether the console messages stay there */ -void setConsolePermanence(BOOL state, BOOL bClearOld) +void setConsolePermanence(bool state, bool bClearOld) { if(mainConsole.permanent == true && state == false) { @@ -726,7 +726,7 @@ void setConsolePermanence(BOOL state, BOOL bClearOld) } /** true or false as to whether the mouse is presently over the console window */ -BOOL mouseOverConsoleBox( void ) +bool mouseOverConsoleBox( void ) { if ( ((UDWORD)mouseX() > mainConsole.topX) // condition 1 @@ -773,13 +773,13 @@ void consolePrintf(char *layout, ...) } /// Set if new messages may be added to the console -void permitNewConsoleMessages(BOOL allow) +void permitNewConsoleMessages(bool allow) { allowNewMessages = allow; } /// \return the visibility of the console -BOOL getConsoleDisplayStatus( void ) +bool getConsoleDisplayStatus( void ) { return(bConsoleDisplayEnabled); } diff --git a/src/console.h b/src/console.h index 6752e0a12..29b99d189 100644 --- a/src/console.h +++ b/src/console.h @@ -40,23 +40,23 @@ enum CONSOLE_TEXT_JUSTIFICATION extern char ConsoleString[MAX_CONSOLE_TMP_STRING_LENGTH]; void consolePrintf(char *layout, ...); -BOOL addConsoleMessage(const char *messageText, CONSOLE_TEXT_JUSTIFICATION jusType, SDWORD player); +bool addConsoleMessage(const char *messageText, CONSOLE_TEXT_JUSTIFICATION jusType, SDWORD player); void updateConsoleMessages(void); void initConsoleMessages(void); void removeTopConsoleMessage(void); void displayConsoleMessages(void); void flushConsoleMessages(void); -void setConsoleBackdropStatus(BOOL state); -void enableConsoleDisplay(BOOL state); -BOOL getConsoleDisplayStatus(void); +void setConsoleBackdropStatus(bool state); +void enableConsoleDisplay(bool state); +bool getConsoleDisplayStatus(void); void setDefaultConsoleJust(CONSOLE_TEXT_JUSTIFICATION defJ); void setConsoleSizePos(UDWORD x, UDWORD y, UDWORD width); -void setConsolePermanence(BOOL state, BOOL bClearOld); -BOOL mouseOverConsoleBox(void); +void setConsolePermanence(bool state, bool bClearOld); +bool mouseOverConsoleBox(void); UDWORD getNumberConsoleMessages(void); void setConsoleLineInfo(UDWORD vis); UDWORD getConsoleLineInfo(void); -void permitNewConsoleMessages(BOOL allow); +void permitNewConsoleMessages(bool allow); void toggleConsoleDrop(void); #if defined(DEBUG) diff --git a/src/design.cpp b/src/design.cpp index 64f15237a..f8c3e0c7b 100644 --- a/src/design.cpp +++ b/src/design.cpp @@ -283,25 +283,25 @@ static void intSetDesignMode(DES_COMPMODE newCompMode); /* Set all the design bar graphs from a design template */ static void intSetDesignStats(DROID_TEMPLATE *psTemplate); /* Set up the system clickable form of the design screen given a set of stats */ -static BOOL intSetSystemForm(COMPONENT_STATS *psStats); +static bool intSetSystemForm(COMPONENT_STATS *psStats); /* Set up the propulsion clickable form of the design screen given a set of stats */ -static BOOL intSetPropulsionForm(PROPULSION_STATS *psStats); +static bool intSetPropulsionForm(PROPULSION_STATS *psStats); /* Add the component tab form to the design screen */ -static BOOL intAddComponentForm(UDWORD numButtons); +static bool intAddComponentForm(UDWORD numButtons); /* Add the template tab form to the design screen */ -static BOOL intAddTemplateForm(DROID_TEMPLATE *psSelected); +static bool intAddTemplateForm(DROID_TEMPLATE *psSelected); /* Add the Major system tab form to the design screen */ // count the number of available components static UDWORD intNumAvailable(UBYTE *aAvailable, UDWORD numEntries, COMPONENT_STATS *asStats, UDWORD size); /* Add the system buttons (weapons, command droid, etc) to the design screen */ -static BOOL intAddSystemButtons(DES_COMPMODE mode); +static bool intAddSystemButtons(DES_COMPMODE mode); /* Add the component buttons to the main tab of the system or component form */ -static BOOL intAddComponentButtons(COMPONENT_STATS *psStats, UDWORD size, +static bool intAddComponentButtons(COMPONENT_STATS *psStats, UDWORD size, UBYTE *aAvailable, UDWORD numEntries, UDWORD compID,UDWORD WhichTab); /* Add the component buttons to the main tab of the component form */ -static BOOL intAddExtraSystemButtons(UDWORD sensorIndex, UDWORD ecmIndex, +static bool intAddExtraSystemButtons(UDWORD sensorIndex, UDWORD ecmIndex, UDWORD constIndex, UDWORD repairIndex, UDWORD brainIndex); /* Set the bar graphs for the system clickable */ static void intSetSystemStats(COMPONENT_STATS *psStats); @@ -336,7 +336,7 @@ static void intSetPropulsionStats(PROPULSION_STATS *psStats); /* Set the shadow bar graphs for the Propulsion stats */ static void intSetPropulsionShadowStats(PROPULSION_STATS *psStats); /* Check whether a droid template is valid */ -BOOL intValidTemplate(DROID_TEMPLATE *psTempl, const char *newName); +bool intValidTemplate(DROID_TEMPLATE *psTempl, const char *newName); /* General display window for the design form */ void intDisplayDesignForm(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, PIELIGHT *pColours); /* Sets the Design Power Bar for a given Template */ @@ -348,14 +348,14 @@ static void intSetBodyPoints(DROID_TEMPLATE *psTemplate); /* Sets the Body Points shadow Bar for the current Template with new stat*/ static void intSetTemplateBodyShadowStats(COMPONENT_STATS *psStats); /* set flashing flag for button */ -static void intSetButtonFlash( UDWORD id, BOOL bFlash ); +static void intSetButtonFlash( UDWORD id, bool bFlash ); /*Function to set the shadow bars for all the stats when the mouse is over the Template buttons*/ static void runTemplateShadowStats(UDWORD id); -static BOOL intCheckValidWeaponForProp(void); +static bool intCheckValidWeaponForProp(void); -static BOOL checkTemplateIsVtol(DROID_TEMPLATE *psTemplate); +static bool checkTemplateIsVtol(DROID_TEMPLATE *psTemplate); /* save the current Template if valid. Return true if stored */ static bool saveTemplate(); @@ -386,11 +386,11 @@ static void intDisplayViewForm(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, void intDisplayTemplateButton(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, PIELIGHT *pColours); static void intDisplayComponentButton(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, PIELIGHT *pColours); -extern BOOL bRender3DOnly; +extern bool bRender3DOnly; /* Add the design widgets to the widget screen */ -static BOOL _intAddDesign( BOOL bShowCentreScreen ) +static bool _intAddDesign( bool bShowCentreScreen ) { W_FORMINIT sFormInit; W_LABINIT sLabInit; @@ -405,7 +405,7 @@ static BOOL _intAddDesign( BOOL bShowCentreScreen ) if((GetGameMode() == GS_NORMAL) && !bMultiPlayer) { // Only do this in main game. - BOOL radOnScreen = radarOnScreen; + bool radOnScreen = radarOnScreen; bRender3DOnly = true; radarOnScreen = false; @@ -874,7 +874,7 @@ void desSetupDesignTemplates(void) } /* Add the design template form */ -static BOOL _intAddTemplateForm(DROID_TEMPLATE *psSelected) +static bool _intAddTemplateForm(DROID_TEMPLATE *psSelected) { UDWORD numButtons, butPerForm; UDWORD i; @@ -959,7 +959,7 @@ static BOOL _intAddTemplateForm(DROID_TEMPLATE *psSelected) /* Add the droid template buttons to a form */ -BOOL intAddTemplateButtons(UDWORD formID, UDWORD formWidth, UDWORD formHeight, +bool intAddTemplateButtons(UDWORD formID, UDWORD formWidth, UDWORD formHeight, UDWORD butWidth, UDWORD butHeight, UDWORD gap, DROID_TEMPLATE *psSelected) { @@ -1370,7 +1370,7 @@ static void intSetDesignStats( DROID_TEMPLATE *psTemplate ) } /* Set up the system clickable form of the design screen given a set of stats */ -static BOOL _intSetSystemForm(COMPONENT_STATS *psStats) +static bool _intSetSystemForm(COMPONENT_STATS *psStats) { DES_SYSMODE newSysMode=(DES_SYSMODE)0; @@ -1730,7 +1730,7 @@ static BOOL _intSetSystemForm(COMPONENT_STATS *psStats) /* Set up the propulsion clickable form of the design screen given a set of stats */ -static BOOL intSetPropulsionForm(PROPULSION_STATS *psStats) +static bool intSetPropulsionForm(PROPULSION_STATS *psStats) { DES_PROPMODE newPropMode=(DES_PROPMODE)0; @@ -1959,7 +1959,7 @@ static UDWORD intNumAvailable(UBYTE *aAvailable, UDWORD numEntries, /* Add the component tab form to the design screen */ -static BOOL intAddComponentForm(UDWORD numButtons) +static bool intAddComponentForm(UDWORD numButtons) { UDWORD i, butPerForm, numFrm; @@ -2018,7 +2018,7 @@ static BOOL intAddComponentForm(UDWORD numButtons) } /* Add the system buttons (weapons, command droid, etc) to the design screen */ -static BOOL intAddSystemButtons(DES_COMPMODE mode) +static bool intAddSystemButtons(DES_COMPMODE mode) { // add the weapon button W_BUTINIT sButInit; @@ -2081,7 +2081,7 @@ static BOOL intAddSystemButtons(DES_COMPMODE mode) /* Add the component buttons to the main tab of the component form */ -static BOOL intAddComponentButtons(COMPONENT_STATS *psStats, UDWORD size, +static bool intAddComponentButtons(COMPONENT_STATS *psStats, UDWORD size, UBYTE *aAvailable, UDWORD numEntries, UDWORD compID,UDWORD WhichTab) { @@ -2091,7 +2091,7 @@ static BOOL intAddComponentButtons(COMPONENT_STATS *psStats, UDWORD size, char aButText[DES_COMPBUTMAXCHAR + 1]; SDWORD BufferID; PROPULSION_STATS *psPropStats; - BOOL bVTol, bWeapon, bVtolWeapon; + bool bVTol, bWeapon, bVtolWeapon; UWORD numTabs; ClearObjectBuffers(); @@ -2292,7 +2292,7 @@ static BOOL intAddComponentButtons(COMPONENT_STATS *psStats, UDWORD size, } /* Add the component buttons to the main tab of the component form */ -static BOOL intAddExtraSystemButtons(UDWORD sensorIndex, UDWORD ecmIndex, +static bool intAddExtraSystemButtons(UDWORD sensorIndex, UDWORD ecmIndex, UDWORD constIndex, UDWORD repairIndex, UDWORD brainIndex) { @@ -3263,7 +3263,7 @@ static void intSetPropulsionShadowStats(PROPULSION_STATS *psStats) /* Check whether a droid template is valid */ -BOOL intValidTemplate(DROID_TEMPLATE *psTempl, const char *newName) +bool intValidTemplate(DROID_TEMPLATE *psTempl, const char *newName) { UDWORD i; @@ -3398,7 +3398,7 @@ void intRemoveDesign(void) } /* set flashing flag for button */ -static void intSetButtonFlash( UDWORD id, BOOL bFlash ) +static void intSetButtonFlash( UDWORD id, bool bFlash ) { #ifdef FLASH_BUTTONS WIDGET *psWidget = widgGetFromID( psWScreen, id ); @@ -3422,7 +3422,7 @@ static void intSetButtonFlash( UDWORD id, BOOL bFlash ) * Checks whether user has customised template name : template not * customised if not complete or if generated name same as current. */ -static BOOL desTemplateNameCustomised( DROID_TEMPLATE *psTemplate ) +static bool desTemplateNameCustomised( DROID_TEMPLATE *psTemplate ) { if ( (psTemplate->droidType == DROID_DEFAULT) || (strcmp( getTemplateName(psTemplate), @@ -4237,7 +4237,7 @@ void intRunDesign(void) { UDWORD statID; COMPONENT_STATS *psStats; - BOOL templateButton; + bool templateButton; int compIndex; /* Find out which button was hilited */ @@ -4593,7 +4593,7 @@ void resetDesignPauseState(void) /*this is called when a new propulsion type is added to the current design to check the weapon is 'allowed'. Check if VTOL, the weapon is direct fire. Also check numVTOLattackRuns for the weapon is not zero - return true if valid weapon*/ -static BOOL intCheckValidWeaponForProp(void) +static bool intCheckValidWeaponForProp(void) { if (asPropulsionTypes[((PROPULSION_STATS *)(asPropulsionStats + sCurrDesign.asParts[COMP_PROPULSION]))->propulsionType].travel != AIR) { @@ -4610,26 +4610,26 @@ static BOOL intCheckValidWeaponForProp(void) return checkValidWeaponForProp(&sCurrDesign); } -BOOL intAddDesign( BOOL bShowCentreScreen ) +bool intAddDesign( bool bShowCentreScreen ) { return _intAddDesign(bShowCentreScreen); } /* Set up the system clickable form of the design screen given a set of stats */ -static BOOL intSetSystemForm(COMPONENT_STATS *psStats) +static bool intSetSystemForm(COMPONENT_STATS *psStats) { return _intSetSystemForm(psStats); } -static BOOL intAddTemplateForm(DROID_TEMPLATE *psSelected) +static bool intAddTemplateForm(DROID_TEMPLATE *psSelected) { return _intAddTemplateForm(psSelected); } //checks if the template has PROPULSION_TYPE_LIFT propulsion attached - returns true if it does -BOOL checkTemplateIsVtol(DROID_TEMPLATE *psTemplate) +bool checkTemplateIsVtol(DROID_TEMPLATE *psTemplate) { if (asPropulsionStats[psTemplate->asParts[COMP_PROPULSION]]. propulsionType == PROPULSION_TYPE_LIFT) diff --git a/src/design.h b/src/design.h index 8bb2dcfc5..f2523f562 100644 --- a/src/design.h +++ b/src/design.h @@ -132,9 +132,9 @@ #define IDDES_WPABUTTON 5903 // WeaponA button #define IDDES_WPBBUTTON 5904 // WeaponB button -extern BOOL intAddDesign( BOOL bShowCentreScreen ); +extern bool intAddDesign( bool bShowCentreScreen ); /* Add the droid template buttons to a form */ -BOOL intAddTemplateButtons(UDWORD formID, UDWORD formWidth, UDWORD formHeight, UDWORD butWidth, +bool intAddTemplateButtons(UDWORD formID, UDWORD formWidth, UDWORD formHeight, UDWORD butWidth, UDWORD butHeight, UDWORD gap, DROID_TEMPLATE *psSelected); void intDisplayTemplateButton(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, PIELIGHT *pColours); @@ -156,6 +156,6 @@ extern void reverseTemplateList(DROID_TEMPLATE **ppsList); extern const char *GetDefaultTemplateName(DROID_TEMPLATE *psTemplate); -extern BOOL intValidTemplate(DROID_TEMPLATE *psTempl, const char *newName); +extern bool intValidTemplate(DROID_TEMPLATE *psTempl, const char *newName); #endif // __INCLUDED_SRC_DESIGN_H__ diff --git a/src/display.cpp b/src/display.cpp index 798a4527a..619f64b44 100644 --- a/src/display.cpp +++ b/src/display.cpp @@ -170,24 +170,24 @@ static const CURSOR arnMPointers[POSSIBLE_TARGETS][POSSIBLE_SELECTIONS] = /// acceleration on scrolling. Game Option. UDWORD scroll_speed_accel; -static BOOL buildingDamaged(STRUCTURE *psStructure); -static BOOL repairDroidSelected(UDWORD player); +static bool buildingDamaged(STRUCTURE *psStructure); +static bool repairDroidSelected(UDWORD player); static DROID *constructorDroidSelected(UDWORD player); -static BOOL vtolDroidSelected(UDWORD player); -static BOOL anyDroidSelected(UDWORD player); -static BOOL cyborgDroidSelected(UDWORD player); -static BOOL bInvertMouse = true; -static BOOL bRightClickOrders = false; -static BOOL bMiddleClickRotate = false; -static BOOL bDrawShadows = true; +static bool vtolDroidSelected(UDWORD player); +static bool anyDroidSelected(UDWORD player); +static bool cyborgDroidSelected(UDWORD player); +static bool bInvertMouse = true; +static bool bRightClickOrders = false; +static bool bMiddleClickRotate = false; +static bool bDrawShadows = true; static SELECTION_TYPE establishSelection(UDWORD selectedPlayer); static void dealWithLMB( void ); static void dealWithLMBDClick( void ); static void dealWithRMB( void ); -static BOOL mouseInBox(SDWORD x0, SDWORD y0, SDWORD x1, SDWORD y1); +static bool mouseInBox(SDWORD x0, SDWORD y0, SDWORD x1, SDWORD y1); static OBJECT_POSITION *checkMouseLoc(void); -static BOOL bInstantRadarJump = false; +static bool bInstantRadarJump = false; static SDWORD desiredPitch = 340; static UDWORD currentFrame; static UDWORD StartOfLastFrame; @@ -197,23 +197,23 @@ static UDWORD rotInitial; static UDWORD rotInitialUp; static UDWORD xMoved, yMoved; static STRUCTURE *psBuilding; -static BOOL edgeOfMap = false; +static bool edgeOfMap = false; static uint32_t scrollRefTime; static float scrollSpeedLeftRight; //use two directions and add them because its simple static float scrollStepLeftRight; static float scrollSpeedUpDown; static float scrollStepUpDown; -static BOOL mouseOverRadar = false; -static BOOL mouseOverConsole = false; -static BOOL ignoreOrder = false; -static BOOL ignoreRMBC = true; +static bool mouseOverRadar = false; +static bool mouseOverConsole = false; +static bool ignoreOrder = false; +static bool ignoreRMBC = true; static DROID *psSelectedVtol; static DROID *psDominantSelected; -static BOOL bRadarDragging = false; +static bool bRadarDragging = false; static bool mouseScroll = true; -BOOL rotActive = false; -BOOL gameStats = false; +bool rotActive = false; +bool gameStats = false; /* Hackety hack hack hack */ SDWORD screenShakeTable[100] = @@ -230,43 +230,43 @@ SDWORD screenShakeTable[100] = 1,0,-1,-1,-2,-1,1,0,1,0 }; -static BOOL bScreenShakeActive = false; +static bool bScreenShakeActive = false; static UDWORD screenShakeStarted; static UDWORD screenShakeLength; //used to determine is a weapon droid is assigned to a sensor tower or sensor droid -static BOOL bSensorAssigned; +static bool bSensorAssigned; //used to determine if the player has selected a Las Sat structure -static BOOL bLasSatStruct; +static bool bLasSatStruct; // Local prototypes static MOUSE_TARGET itemUnderMouse(BASE_OBJECT **ppObjUnderCursor); -static BOOL bShakingPermitted = true; +static bool bShakingPermitted = true; void setMouseScroll(bool scroll) { mouseScroll = scroll; } -void setRadarJump(BOOL val) +void setRadarJump(bool val) { bInstantRadarJump = val; } -BOOL getRadarJumpStatus( void ) +bool getRadarJumpStatus( void ) { return(bInstantRadarJump); } -BOOL getShakeStatus( void ) +bool getShakeStatus( void ) { return(bShakingPermitted); } -BOOL getInvertMouseStatus( void ) +bool getInvertMouseStatus( void ) { return(bInvertMouse); } -void setInvertMouseStatus( BOOL val ) +void setInvertMouseStatus( bool val ) { bInvertMouse = val; } @@ -276,40 +276,40 @@ void setInvertMouseStatus( BOOL val ) #define MOUSE_SELECT (bRightClickOrders?MOUSE_LMB:MOUSE_RMB) #define MOUSE_ROTATE (bMiddleClickRotate?MOUSE_MMB:MOUSE_RMB) -BOOL getRightClickOrders( void ) +bool getRightClickOrders( void ) { return bRightClickOrders; } -void setRightClickOrders( BOOL val ) +void setRightClickOrders( bool val ) { bRightClickOrders = val; } -BOOL getMiddleClickRotate( void ) +bool getMiddleClickRotate( void ) { return bMiddleClickRotate; } -void setMiddleClickRotate( BOOL val ) +void setMiddleClickRotate( bool val ) { bMiddleClickRotate = val; } -BOOL getDrawShadows( void ) +bool getDrawShadows( void ) { return(bDrawShadows); } -void setDrawShadows( BOOL val ) +void setDrawShadows( bool val ) { bDrawShadows = val; } -void setShakeStatus( BOOL val ) +void setShakeStatus( bool val ) { bShakingPermitted = val; } @@ -368,7 +368,7 @@ static void shakeUpdate(void) /* Initialise the display system */ -BOOL dispInitialise(void) +bool dispInitialise(void) { return true; } @@ -473,8 +473,8 @@ void resetInput(void) /* Process the user input. This just processes the key input and jumping around the radar*/ void processInput(void) { - BOOL mOverRadar = false; - BOOL mOverConstruction = false; + bool mOverRadar = false; + bool mOverConstruction = false; if (InGameOpUp || isInGamePopupUp) { @@ -569,9 +569,9 @@ void processInput(void) } -static BOOL OverRadarAndNotDragging(void) +static bool OverRadarAndNotDragging(void) { - BOOL OverRadar = mouseOverRadar; + bool OverRadar = mouseOverRadar; if(getHQExists(selectedPlayer)==false) { @@ -670,9 +670,9 @@ static void CheckStartWallDrag(void) } //this function is called when a location has been chosen to place a structure or a DP -static BOOL CheckFinishedFindPosition(void) +static bool CheckFinishedFindPosition(void) { - BOOL OverRadar = OverRadarAndNotDragging(); + bool OverRadar = OverRadarAndNotDragging(); /* Do not let the player position buildings 'under' the radar */ if(mouseReleased(MOUSE_LMB) && !OverRadar) @@ -770,7 +770,7 @@ void processMouseClickInput(void) UDWORD i; SELECTION_TYPE selection; MOUSE_TARGET item=MT_NOTARGET; - BOOL OverRadar = OverRadarAndNotDragging(); + bool OverRadar = OverRadarAndNotDragging(); // These four functions were embedded in this function but I moved them out for readability. In the // absense of any comments I had a guess as to there use and named them accordingly PD 28/05/98. @@ -1200,9 +1200,9 @@ void resetScroll(void) // Check a coordinate is within the scroll limits, SDWORD version. // Returns true if edge hit. // -BOOL CheckInScrollLimits(SDWORD *xPos,SDWORD *zPos) +bool CheckInScrollLimits(SDWORD *xPos,SDWORD *zPos) { - BOOL EdgeHit = false; + bool EdgeHit = false; SDWORD minX,minY,maxX,maxY; //always view that little bit more than the scroll limits... @@ -1268,11 +1268,11 @@ BOOL CheckInScrollLimits(SDWORD *xPos,SDWORD *zPos) // Check the view is within the scroll limits, // Returns true if edge hit. // -BOOL CheckScrollLimits(void) +bool CheckScrollLimits(void) { SDWORD xp = player.p.x; SDWORD zp = player.p.z; - BOOL ret = CheckInScrollLimits(&xp,&zp); + bool ret = CheckInScrollLimits(&xp,&zp); player.p.x = xp; player.p.z = zp; @@ -1353,12 +1353,12 @@ void displayWorld(void) draw3DScene(); } -static BOOL mouseInBox(SDWORD x0, SDWORD y0, SDWORD x1, SDWORD y1) +static bool mouseInBox(SDWORD x0, SDWORD y0, SDWORD x1, SDWORD y1) { return mouseX() > x0 && mouseX() < x1 && mouseY() > y0 && mouseY() < y1; } -BOOL DrawnInLastFrame(int32_t frame) +bool DrawnInLastFrame(int32_t frame) { return frame >= (int32_t)StartOfLastFrame; } @@ -1433,12 +1433,12 @@ UDWORD dispX,dispY,dispR; // Dummy structure stats used for positioning delivery points. static STRUCTURE_STATS ReposStats; -static BOOL ReposValid = false; -static BOOL BVReposValid = false; +static bool ReposValid = false; +static bool BVReposValid = false; static FLAG_POSITION *ReposFlag; FLAG_POSITION *deliveryPointToMove = NULL; -void StartTacticalScrollObj(WZ_DECL_UNUSED BOOL driveActive, WZ_DECL_UNUSED BASE_OBJECT* psObj) +void StartTacticalScrollObj(WZ_DECL_UNUSED bool driveActive, WZ_DECL_UNUSED BASE_OBJECT* psObj) { } @@ -1515,7 +1515,7 @@ void FinishDeliveryPosition(UDWORD xPos,UDWORD yPos,void *UserData) // Is there a valid delivery point repositioning going on. // -BOOL DeliveryReposValid(void) +bool DeliveryReposValid(void) { if(driveModeActive()) { return ReposValid && (ReposFlag !=NULL); @@ -1550,7 +1550,7 @@ void CancelDeliveryRepos(void) // check whether a clicked on droid is in a command group or assigned to a sensor -static BOOL droidHasLeader(DROID *psDroid) +static bool droidHasLeader(DROID *psDroid) { BASE_OBJECT *psLeader; @@ -1586,10 +1586,10 @@ static BOOL droidHasLeader(DROID *psDroid) // deal with selecting a droid -void dealWithDroidSelect(DROID *psDroid, BOOL bDragBox) +void dealWithDroidSelect(DROID *psDroid, bool bDragBox) { DROID *psD; - BOOL bGotGroup; + bool bGotGroup; /* Toggle selection on and off - allows you drag around a big area of droids and then exclude certain individuals */ @@ -1638,7 +1638,7 @@ static void FeedbackOrderGiven(void) } // check whether the queue order keys are pressed -BOOL ctrlShiftDown(void) +bool ctrlShiftDown(void) { return keyDown(KEY_LCTRL) || keyDown(KEY_RCTRL) || keyDown(KEY_LSHIFT) || keyDown(KEY_RSHIFT); } @@ -2230,7 +2230,7 @@ void dealWithLMB( void ) } -BOOL getRotActive( void ) +bool getRotActive( void ) { return(rotActive); } @@ -2889,9 +2889,9 @@ static SELECTION_TYPE establishSelection(UDWORD selectedPlayer) { DROID *psDroid,*psDominant=NULL; UBYTE CurrWeight; -//BOOL gotWeapon = false; +//bool gotWeapon = false; //DROID *psWeapDroid = NULL; -BOOL atLeastOne; +bool atLeastOne; SELECTION_TYPE selectionClass; atLeastOne = false; @@ -3007,13 +3007,13 @@ SELECTION_TYPE selectionClass; } /* Just returns true if the building's present body points aren't 100 percent */ -static BOOL buildingDamaged(STRUCTURE *psStructure) +static bool buildingDamaged(STRUCTURE *psStructure) { return psStructure->body < structureBody(psStructure); } /*Looks through the list of selected players droids to see if one is a repair droid*/ -BOOL repairDroidSelected(UDWORD player) +bool repairDroidSelected(UDWORD player) { DROID *psCurr; @@ -3055,7 +3055,7 @@ static DROID *constructorDroidSelected(UDWORD player) } /*Looks through the list of selected players droids to see if one is a VTOL droid*/ -BOOL vtolDroidSelected(UDWORD player) +bool vtolDroidSelected(UDWORD player) { DROID *psCurr; @@ -3075,7 +3075,7 @@ BOOL vtolDroidSelected(UDWORD player) } /*Looks through the list of selected players droids to see if any is selected*/ -BOOL anyDroidSelected(UDWORD player) +bool anyDroidSelected(UDWORD player) { DROID *psCurr; @@ -3093,7 +3093,7 @@ BOOL anyDroidSelected(UDWORD player) } /*Looks through the list of selected players droids to see if one is a cyborg droid*/ -BOOL cyborgDroidSelected(UDWORD player) +bool cyborgDroidSelected(UDWORD player) { DROID *psCurr; diff --git a/src/display.h b/src/display.h index cd2433ef7..796dc0724 100644 --- a/src/display.h +++ b/src/display.h @@ -28,7 +28,7 @@ #include "structure.h" /* Initialise the display system */ -extern BOOL dispInitialise(void); +extern bool dispInitialise(void); extern void shakeStart(void); extern void shakeStop(void); @@ -43,29 +43,29 @@ extern void scroll(void); extern void resetScroll(void); extern void setMouseScroll(bool); -extern BOOL DrawnInLastFrame(SDWORD Frame); +extern bool DrawnInLastFrame(SDWORD Frame); // Clear all selections. extern void clearSel(void); // Clear all selections and stop driver mode. extern void clearSelection(void); // deal with selecting a droid -extern void dealWithDroidSelect(DROID *psDroid, BOOL bDragBox); +extern void dealWithDroidSelect(DROID *psDroid, bool bDragBox); -extern void setInvertMouseStatus( BOOL val ); -extern BOOL getInvertMouseStatus( void ); +extern void setInvertMouseStatus( bool val ); +extern bool getInvertMouseStatus( void ); -extern void setRightClickOrders( BOOL val ); -extern BOOL getRightClickOrders( void ); +extern void setRightClickOrders( bool val ); +extern bool getRightClickOrders( void ); -extern void setMiddleClickRotate( BOOL val ); -extern BOOL getMiddleClickRotate( void ); +extern void setMiddleClickRotate( bool val ); +extern bool getMiddleClickRotate( void ); -extern void setDrawShadows( BOOL val ); -extern BOOL getDrawShadows( void ); +extern void setDrawShadows( bool val ); +extern bool getDrawShadows( void ); -extern BOOL getRadarJumpStatus( void ); -extern void setRadarJump(BOOL val); +extern bool getRadarJumpStatus( void ); +extern void setRadarJump(bool val); /* Do the 3D display */ @@ -165,31 +165,31 @@ MT_SENSORSTRUCTDAM, MT_NOTARGET //leave as last one }; -extern BOOL gameStats; -extern BOOL godMode; +extern bool gameStats; +extern bool godMode; // reset the input state void resetInput(void); -BOOL CheckInScrollLimits(SDWORD *xPos,SDWORD *zPos); -extern BOOL CheckScrollLimits(void); -extern BOOL rotActive; +bool CheckInScrollLimits(SDWORD *xPos,SDWORD *zPos); +extern bool CheckScrollLimits(void); +extern bool rotActive; BASE_OBJECT *mouseTarget( void ); -BOOL StartObjectOrbit(BASE_OBJECT *psObj); +bool StartObjectOrbit(BASE_OBJECT *psObj); void CancelObjectOrbit(void); extern void FinishDeliveryPosition(UDWORD xPos,UDWORD yPos,void *UserData); extern void CancelDeliveryRepos(void); extern void StartDeliveryPosition( OBJECT_POSITION *psLocation ); -extern BOOL DeliveryReposValid(void); +extern bool DeliveryReposValid(void); extern FLAG_POSITION *deliveryPointToMove; -extern void StartTacticalScrollObj(BOOL driveActive,BASE_OBJECT *psObj); +extern void StartTacticalScrollObj(bool driveActive,BASE_OBJECT *psObj); extern void CancelTacticalScroll(void); extern void MoveTacticalScroll(SDWORD xVel,SDWORD yVel); -extern BOOL getRotActive( void ); +extern bool getRotActive( void ); extern SDWORD getDesiredPitch( void ); extern void setDesiredPitch(SDWORD pitch); @@ -212,15 +212,15 @@ extern void setDesiredPitch(SDWORD pitch); //access function for bSensorAssigned variable extern void setSensorAssigned(void); -extern void setShakeStatus( BOOL val ); -extern BOOL getShakeStatus( void ); +extern void setShakeStatus( bool val ); +extern bool getShakeStatus( void ); extern void displayInitVars(void); void AddDerrickBurningMessage(void); // check whether the queue order keys are pressed -extern BOOL ctrlShiftDown(void); +extern bool ctrlShiftDown(void); extern UDWORD getTargetType(void); diff --git a/src/display3d.cpp b/src/display3d.cpp index a170f7dd2..b04bec2b7 100644 --- a/src/display3d.cpp +++ b/src/display3d.cpp @@ -101,7 +101,7 @@ static void drawDroidGroupNumber(DROID *psDroid); static void trackHeight(float desiredHeight); static void renderSurroundings(void); static void locateMouse(void); -static BOOL renderWallSection(STRUCTURE *psStructure); +static bool renderWallSection(STRUCTURE *psStructure); static void drawDragBox(void); static void calcFlagPosScreenCoords(SDWORD *pX, SDWORD *pY, SDWORD *pR); static void displayTerrain(void); @@ -110,11 +110,11 @@ static void drawTiles(iView *player); static void display3DProjectiles(void); static void drawDroidSelections(void); static void drawStructureSelections(void); -static void displayAnimation(ANIM_OBJECT * psAnimObj, BOOL bHoldOnFirstFrame); +static void displayAnimation(ANIM_OBJECT * psAnimObj, bool bHoldOnFirstFrame); static void displayBlueprints(void); static void processSensorTarget(void); static void processDestinationTarget(void); -static BOOL eitherSelected(DROID *psDroid); +static bool eitherSelected(DROID *psDroid); static void structureEffects(void); static void showDroidSensorRanges(void); static void showSensorRange2(BASE_OBJECT *psObj); @@ -125,7 +125,7 @@ static void drawDroidCmndNo(DROID *psDroid); static void drawDroidRank(DROID *psDroid); static void drawDroidSensorLock(DROID *psDroid); static void calcAverageTerrainHeight(iView *player); -BOOL doWeDrawProximitys(void); +bool doWeDrawProximitys(void); static PIELIGHT getBlueprintColour(STRUCT_STATES state); static void NetworkDisplayPlainForm(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, WZ_DECL_UNUSED PIELIGHT *pColours); @@ -134,13 +134,13 @@ void NotifyUserOfError(char *msg); /******************** Variables ********************/ // Should be cleaned up properly and be put in structures. -BOOL bRender3DOnly; -static BOOL bRangeDisplay = false; +bool bRender3DOnly; +static bool bRangeDisplay = false; static SDWORD rangeCenterX,rangeCenterY,rangeRadius; -static BOOL bDrawProximitys = true; -BOOL godMode; -BOOL showGateways = false; -BOOL showPath = false; +static bool bDrawProximitys = true; +bool godMode; +bool showGateways = false; +bool showPath = false; /// The name of the texture page used to draw the skybox static char skyboxPageName[PATH_MAX] = "page-25"; @@ -149,7 +149,7 @@ static char skyboxPageName[PATH_MAX] = "page-25"; UWORD barMode; /// Have we made a selection by clicking the mouse? - used for dragging etc -BOOL selectAttempt = false; +bool selectAttempt = false; /// Vectors that hold the player and camera directions and positions iView player; @@ -168,7 +168,7 @@ SDWORD mouseTileX, mouseTileY; Vector2i mousePos(0, 0); /// Do we want the radar to be rendered -BOOL radarOnScreen=false; +bool radarOnScreen=false; /// Show unit/building gun/sensor range bool rangeOnScreen = false; // For now, most likely will change later! -Q 5-10-05 A very nice effect - Per @@ -180,7 +180,7 @@ bool tuiTargetOrigin = false; static int playerXTile, playerZTile; /// Have we located the mouse? -static BOOL mouseLocated = true; +static bool mouseLocated = true; /// The cached value of frameGetFrameNumber() static UDWORD currentGameFrame; @@ -253,8 +253,8 @@ static UDWORD lastTargetAssignation = 0; * Used to draw a visual effect. */ static UDWORD lastDestAssignation = 0; -static BOOL bSensorTargetting = false; -static BOOL bDestTargetting = false; +static bool bSensorTargetting = false; +static bool bDestTargetting = false; static BASE_OBJECT *psSensorObj = NULL; static UDWORD destTargetX,destTargetY; static UDWORD destTileX=0,destTileY=0; @@ -621,7 +621,7 @@ static void setupConnectionStatusForm(void) /// Render the 3D world void draw3DScene( void ) { - BOOL bPlayerHasHQ = false; + bool bPlayerHasHQ = false; // the world centre - used for decaying lighting etc gridCentreX = player.p.x + world_coord(visibleTiles.x / 2); @@ -835,12 +835,12 @@ static void displayTerrain(void) } /***************************************************************************/ -BOOL doWeDrawProximitys( void ) +bool doWeDrawProximitys( void ) { return(bDrawProximitys); } /***************************************************************************/ -void setProximityDraw(BOOL val) +void setProximityDraw(bool val) { bDrawProximitys = val; } @@ -1033,7 +1033,7 @@ static void drawTiles(iView *player) } /// Initialise the fog, skybox and some other stuff -BOOL init3DView(void) +bool init3DView(void) { /* Arbitrary choice - from direct read! */ Vector3f theSun(225.0f, -600.0f, 450.0f); @@ -1110,7 +1110,7 @@ void disp3d_getView(iView *newView) } /// Are the current tile coordinates visible on screen? -BOOL clipXY(SDWORD x, SDWORD y) +bool clipXY(SDWORD x, SDWORD y) { if (x > (SDWORD)player.p.x && x < (SDWORD)(player.p.x+(visibleTiles.x * TILE_UNITS)) && y > (SDWORD)player.p.z && y < (SDWORD)(player.p.z+(visibleTiles.y*TILE_UNITS))) @@ -1711,7 +1711,7 @@ void displayProximityMsgs( void ) } /// Display an animation -static void displayAnimation( ANIM_OBJECT * psAnimObj, BOOL bHoldOnFirstFrame ) +static void displayAnimation( ANIM_OBJECT * psAnimObj, bool bHoldOnFirstFrame ) { UWORD i, uwFrame; Vector3i vecPos, vecRot, vecScale; @@ -1801,7 +1801,7 @@ void displayDynamicObjects( void ) } // end Fn /// Sets the player's position and view angle - defaults player rotations as well -void setViewPos( UDWORD x, UDWORD y, WZ_DECL_UNUSED BOOL Pan ) +void setViewPos( UDWORD x, UDWORD y, WZ_DECL_UNUSED bool Pan ) { SDWORD midX,midY; @@ -1870,7 +1870,7 @@ void renderFeature(FEATURE *psFeature) SDWORD rotation, rx, rz; PIELIGHT brightness; Vector3i dv; - BOOL bForceDraw = ( !getRevealStatus() && psFeature->psStats->visibleAtStart); + bool bForceDraw = ( !getRevealStatus() && psFeature->psStats->visibleAtStart); int shadowFlags = 0; if (!psFeature->visible[selectedPlayer] && !demoGetStatus() && !bForceDraw) @@ -2083,8 +2083,8 @@ void renderStructure(STRUCTURE *psStructure) int i, structX, structY, rx, rz, colour, rotation, frame, animFrame, pieFlag, pieFlagData; PIELIGHT buildingBrightness; Vector3i dv; - BOOL bHitByElectronic = false; - BOOL defensive = false; + bool bHitByElectronic = false; + bool defensive = false; iIMDShape *strImd = psStructure->sDisplay.imd; if (psStructure->pStructureType->type == REF_WALL || psStructure->pStructureType->type == REF_WALLCORNER @@ -2448,7 +2448,7 @@ void renderStructure(STRUCTURE *psStructure) } /// draw the delivery points -void renderDeliveryPoint(FLAG_POSITION *psPosition, BOOL blueprint) +void renderDeliveryPoint(FLAG_POSITION *psPosition, bool blueprint) { Vector3i dv; SDWORD x, y, r, rx, rz; @@ -2516,7 +2516,7 @@ void renderDeliveryPoint(FLAG_POSITION *psPosition, BOOL blueprint) } /// Draw a piece of wall -static BOOL renderWallSection(STRUCTURE *psStructure) +static bool renderWallSection(STRUCTURE *psStructure) { SDWORD structX, structY, rx, rz, height; PIELIGHT brightness; @@ -2741,7 +2741,7 @@ static void drawDragBox( void ) static void drawWeaponReloadBar(BASE_OBJECT *psObj, WEAPON *psWeap, int weapon_slot) { WEAPON_STATS *psStats; - BOOL bSalvo; + bool bSalvo; UDWORD firingStage, interval, damLevel; SDWORD scrX,scrY, scrR, scale; STRUCTURE *psStruct; @@ -2995,8 +2995,8 @@ static void drawStructureSelections( void ) SDWORD scrX,scrY; UDWORD i; BASE_OBJECT *psClickedOn; - BOOL bMouseOverStructure = false; - BOOL bMouseOverOwnStructure = false; + bool bMouseOverStructure = false; + bool bMouseOverOwnStructure = false; psClickedOn = mouseTarget(); if(psClickedOn!=NULL && psClickedOn->type == OBJ_STRUCTURE) @@ -3103,9 +3103,9 @@ UDWORD index; } /// Is the droid, its commander or its sensor tower selected? -BOOL eitherSelected(DROID *psDroid) +bool eitherSelected(DROID *psDroid) { -BOOL retVal; +bool retVal; BASE_OBJECT *psObj; retVal = false; @@ -3144,8 +3144,8 @@ static void drawDroidSelections( void ) PIELIGHT powerCol = WZCOL_BLACK, powerColShadow = WZCOL_BLACK; PIELIGHT boxCol; BASE_OBJECT *psClickedOn; - BOOL bMouseOverDroid = false; - BOOL bMouseOverOwnDroid = false; + bool bMouseOverDroid = false; + bool bMouseOverOwnDroid = false; UDWORD i,index; FEATURE *psFeature; float mulH; @@ -3387,7 +3387,7 @@ static void drawDroidGroupNumber(DROID *psDroid) { UWORD id; UDWORD id2; -BOOL bDraw; +bool bDraw; SDWORD xShift,yShift; bDraw = true; @@ -3458,7 +3458,7 @@ static void drawDroidCmndNo(DROID *psDroid) { UWORD id; UDWORD id2; -BOOL bDraw; +bool bDraw; SDWORD xShift,yShift, index; bDraw = true; diff --git a/src/display3d.h b/src/display3d.h index b33b11df0..3fe3e1e58 100644 --- a/src/display3d.h +++ b/src/display3d.h @@ -56,10 +56,10 @@ extern bool showLevelName; extern void setViewAngle(SDWORD angle); extern UDWORD getViewDistance(void); extern void setViewDistance(UDWORD dist); -extern BOOL radarOnScreen; +extern bool radarOnScreen; extern bool rangeOnScreen; // Added to get sensor/gun range on screen. -Q 5-10-05 extern void scaleMatrix( UDWORD percent ); -extern void setViewPos( UDWORD x, UDWORD y, BOOL Pan); +extern void setViewPos( UDWORD x, UDWORD y, bool Pan); Vector2i getPlayerPos(); extern void setPlayerPos(SDWORD x, SDWORD y); extern void disp3d_setView(iView *newView); @@ -73,7 +73,7 @@ extern void renderFeature ( FEATURE *psFeature ); extern void renderProximityMsg ( PROXIMITY_DISPLAY *psProxDisp); extern void renderProjectile ( PROJECTILE *psCurr); extern void renderAnimComponent ( const COMPONENT_OBJECT *psObj ); -extern void renderDeliveryPoint ( FLAG_POSITION *psPosition, BOOL blueprint ); +extern void renderDeliveryPoint ( FLAG_POSITION *psPosition, bool blueprint ); extern void debugToggleSensorDisplay ( void ); extern void displayFeatures( void ); @@ -84,20 +84,20 @@ extern void displayDelivPoints(void); extern void calcScreenCoords(DROID *psDroid); extern ENERGY_BAR toggleEnergyBars( void ); -extern BOOL doWeDrawProximitys( void ); -extern void setProximityDraw(BOOL val); +extern bool doWeDrawProximitys( void ); +extern void setProximityDraw(bool val); extern void renderShadow( DROID *psDroid, iIMDShape *psShadowIMD ); -extern BOOL clipXY ( SDWORD x, SDWORD y); +extern bool clipXY ( SDWORD x, SDWORD y); -extern BOOL init3DView(void); +extern bool init3DView(void); extern void initViewPosition(void); extern iView player; extern UDWORD distance; -extern BOOL selectAttempt; -extern BOOL draggingTile; +extern bool selectAttempt; +extern bool draggingTile; extern iIMDShape *g_imd; -extern BOOL droidSelected; +extern bool droidSelected; extern UDWORD terrainMidX,terrainMidY; extern SDWORD scrollSpeed; @@ -117,9 +117,9 @@ STRUCTURE *getTileBlueprint(int mapX, int mapY); ///< Gets the blueprint at tho extern SDWORD mouseTileX, mouseTileY; extern Vector2i mousePos; -extern BOOL bRender3DOnly; -extern BOOL showGateways; -extern BOOL showPath; +extern bool bRender3DOnly; +extern bool showGateways; +extern bool showPath; extern Vector2i visibleTiles; /*returns the graphic ID for a droid rank*/ diff --git a/src/drive.cpp b/src/drive.cpp index 30fc7212b..572bfd8cf 100644 --- a/src/drive.cpp +++ b/src/drive.cpp @@ -69,7 +69,7 @@ static SWORD DrivingAudioTrack=-1; // Which hardware channel are we using for the car driving noise extern UDWORD selectedPlayer; -extern BOOL DirectControl; +extern bool DirectControl; // Driving characteristics. #define DRIVE_TURNSPEED (4) @@ -81,18 +81,18 @@ extern BOOL DirectControl; #define MAX_IDLE (GAME_TICKS_PER_SEC*60) // Start to orbit if idle for 60 seconds. DROID *psDrivenDroid = NULL; // The droid that's being driven. -static BOOL bDriveMode = false; +static bool bDriveMode = false; static SDWORD driveDir; // Driven droid's direction. static SDWORD driveSpeed; // Driven droid's speed. static UDWORD driveBumpTime; // Time that followers get a kick up the ass. -static BOOL DoFollowRangeCheck = true; -static BOOL AllInRange = true; -static BOOL ClearFollowRangeCheck = false; -static BOOL DriveControlEnabled = false; -static BOOL DriveInterfaceEnabled = false; +static bool DoFollowRangeCheck = true; +static bool AllInRange = true; +static bool ClearFollowRangeCheck = false; +static bool DriveControlEnabled = false; +static bool DriveInterfaceEnabled = false; static UDWORD IdleTime; -static BOOL TacticalActive = false; -static BOOL WasDriving = false; +static bool TacticalActive = false; +static bool WasDriving = false; enum { CONTROLMODE_POINTNCLICK, @@ -100,12 +100,12 @@ enum { }; static UWORD ControlMode = CONTROLMODE_DRIVE; -static BOOL TargetFeatures = false; +static bool TargetFeatures = false; // Intialise drive statics, call with true if coming from frontend, false if // coming from a mission. // -void driveInitVars(BOOL Restart) +void driveInitVars(bool Restart) { if(WasDriving && !Restart) { @@ -141,12 +141,12 @@ void driveInitVars(BOOL Restart) } -void setDrivingStatus( BOOL val ) +void setDrivingStatus( bool val ) { bDriveMode = val; } -BOOL getDrivingStatus( void ) +bool getDrivingStatus( void ) { return(bDriveMode); } @@ -154,7 +154,7 @@ BOOL getDrivingStatus( void ) // Start droid driving mode. // -BOOL StartDriverMode(DROID *psOldDroid) +bool StartDriverMode(DROID *psOldDroid) { DROID *psDroid; DROID *psLastDriven; @@ -295,7 +295,7 @@ void StopDriverMode(void) // returns true if ok, returns false if resulted in driving mode being stopped, ie could'nt find // a selected droid to drive. // -BOOL driveDroidKilled(DROID *psDroid) +bool driveDroidKilled(DROID *psDroid) { if(driveModeActive()) { if(psDroid == psDrivenDroid) { @@ -369,9 +369,9 @@ static void driveNextDriver(void) } -static BOOL driveControl(DROID *psDroid) +static bool driveControl(DROID *psDroid) { - BOOL Input = false; + bool Input = false; SDWORD MaxSpeed = moveCalcDroidSpeed(psDroid); if(!DriveControlEnabled) { @@ -439,7 +439,7 @@ static BOOL driveControl(DROID *psDroid) } -static BOOL driveInDriverRange(DROID *psDroid) +static bool driveInDriverRange(DROID *psDroid) { if( (abs(psDroid->pos.x-psDrivenDroid->pos.x) < FOLLOW_STOP_RANGE) && (abs(psDroid->pos.y-psDrivenDroid->pos.y) < FOLLOW_STOP_RANGE) ) { @@ -617,7 +617,7 @@ void driveEnableControl(void) // Return true if drive control is enabled. // -BOOL driveControlEnabled(void) +bool driveControlEnabled(void) { return DriveControlEnabled; } @@ -625,7 +625,7 @@ BOOL driveControlEnabled(void) // Bring up the reticule. // -void driveEnableInterface(BOOL AddReticule) +void driveEnableInterface(bool AddReticule) { if(AddReticule) { intAddReticule(); @@ -648,7 +648,7 @@ void driveDisableInterface(void) // Return true if the reticule is up. // -BOOL driveInterfaceEnabled(void) +bool driveInterfaceEnabled(void) { return DriveInterfaceEnabled; } @@ -682,7 +682,7 @@ void driveStartBuild(void) // Return true if all the conditions for allowing user control of the droid are met. // -BOOL driveAllowControl(void) +bool driveAllowControl(void) { if (TacticalActive || DriveInterfaceEnabled || !DriveControlEnabled) { @@ -707,7 +707,7 @@ void driveDisableTactical(void) // Return true if Tactical order mode is active. // -BOOL driveTacticalActive(void) +bool driveTacticalActive(void) { return TacticalActive; } diff --git a/src/drive.h b/src/drive.h index 89da4c67e..bf5b60a13 100644 --- a/src/drive.h +++ b/src/drive.h @@ -23,10 +23,10 @@ #include "droid.h" -extern BOOL DirectControl; +extern bool DirectControl; extern DROID *psDrivenDroid; -static inline BOOL driveHasDriven(void) +static inline bool driveHasDriven(void) { return (DirectControl) && (psDrivenDroid != NULL) ? true : false; } @@ -34,7 +34,7 @@ static inline BOOL driveHasDriven(void) // Returns true if drive mode is active. // -static inline BOOL driveModeActive(void) +static inline bool driveModeActive(void) { return DirectControl; } @@ -42,13 +42,13 @@ static inline BOOL driveModeActive(void) // Return true if the specified droid is the driven droid. // -static inline BOOL driveIsDriven(DROID *psDroid) +static inline bool driveIsDriven(DROID *psDroid) { return (DirectControl) && (psDrivenDroid != NULL) && (psDroid == psDrivenDroid) ? true : false; } -static inline BOOL driveIsFollower(DROID *psDroid) +static inline bool driveIsFollower(DROID *psDroid) { return (DirectControl) && (psDrivenDroid != NULL) && (psDroid != psDrivenDroid) && psDroid->selected ? true : false; } @@ -60,38 +60,38 @@ static inline DROID *driveGetDriven(void) } -void driveInitVars(BOOL Restart); -BOOL StartDriverMode(DROID *psOldDroid); +void driveInitVars(bool Restart); +bool StartDriverMode(DROID *psOldDroid); void StopDriverMode(void); -BOOL driveDroidKilled(DROID *psDroid); +bool driveDroidKilled(DROID *psDroid); void driveSelectionChanged(void); void driveUpdate(void); void driveSetDroidMove(DROID *psDroid); -void setDrivingStatus( BOOL val ); -BOOL getDrivingStatus( void ); +void setDrivingStatus( bool val ); +bool getDrivingStatus( void ); void driveDisableControl(void); void driveEnableControl(void); -void driveEnableInterface(BOOL AddReticule); +void driveEnableInterface(bool AddReticule); void driveDisableInterface(void); -BOOL driveInterfaceEnabled(void); -BOOL driveControlEnabled(void); +bool driveInterfaceEnabled(void); +bool driveControlEnabled(void); void driveProcessInterfaceButtons(void); void driveAutoToggle(void); void driveProcessAquireButton(void); void driveProcessAquireTarget(void); void driveMarkTarget(void); void driveStartBuild(void); -BOOL driveAllowControl(void); +bool driveAllowControl(void); void driveDisableTactical(void); -BOOL driveTacticalActive(void); +bool driveTacticalActive(void); void driveTacticalSelectionChanged(void); void driveProcessRadarInput(int x,int y); -BOOL driveWasDriving(void); +bool driveWasDriving(void); void driveDisableDriving(void); void driveRestoreDriving(void); SDWORD driveGetMoveSpeed(void); SDWORD driveGetMoveDir(void); -BOOL driveSetDirectControl(BOOL Control); -BOOL driveSetWasDriving(BOOL Driving); +bool driveSetDirectControl(bool Control); +bool driveSetWasDriving(bool Driving); #endif // __INCLUDED_SRC_DRIVE_H__ diff --git a/src/droid.cpp b/src/droid.cpp index ff2c23271..a4c358300 100644 --- a/src/droid.cpp +++ b/src/droid.cpp @@ -140,7 +140,7 @@ void cancelBuild(DROID *psDroid) } // initialise droid module -BOOL droidInit(void) +bool droidInit(void) { memset(aDroidExperience, 0, sizeof(UWORD) * MAX_PLAYERS * MAX_RECYCLED_DROIDS); psLastDroidHit = NULL; @@ -253,7 +253,7 @@ int32_t droidDamage(DROID *psDroid, uint32_t damage, WEAPON_CLASS weaponClass, W #else #define DROIDREF(func, line) "Illegal reference to droid" #endif -BOOL droidCheckReferences(DROID *psVictimDroid) +bool droidCheckReferences(DROID *psVictimDroid) { int plr; @@ -581,7 +581,7 @@ void vanishDroid(DROID *psDel) /* Remove a droid from the List so doesn't update or get drawn etc TAKE CARE with removeDroid() - usually want droidRemove since it deal with cluster and grid code*/ //returns false if the droid wasn't removed - because it died! -BOOL droidRemove(DROID *psDroid, DROID *pList[MAX_PLAYERS]) +bool droidRemove(DROID *psDroid, DROID *pList[MAX_PLAYERS]) { CHECK_DROID(psDroid); @@ -900,7 +900,7 @@ void droidUpdate(DROID *psDroid) } /* See if a droid is next to a structure */ -static BOOL droidNextToStruct(DROID *psDroid, BASE_OBJECT *psStruct) +static bool droidNextToStruct(DROID *psDroid, BASE_OBJECT *psStruct) { SDWORD minX, maxX, maxY, x,y; @@ -942,7 +942,7 @@ static BOOL droidNextToStruct(DROID *psDroid, BASE_OBJECT *psStruct) return false; } -static BOOL +static bool droidCheckBuildStillInProgress( void *psObj ) { DROID *psDroid; @@ -965,7 +965,7 @@ droidCheckBuildStillInProgress( void *psObj ) } } -static BOOL +static bool droidBuildStartAudioCallback( void *psObj ) { DROID *psDroid; @@ -987,7 +987,7 @@ droidBuildStartAudioCallback( void *psObj ) /* Set up a droid to build a structure - returns true if successful */ -BOOL droidStartBuild(DROID *psDroid) +bool droidStartBuild(DROID *psDroid) { STRUCTURE *psStruct; @@ -1089,7 +1089,7 @@ static void addConstructorEffect(STRUCTURE *psStruct) /* Update a construction droid while it is building returns true while building continues */ -BOOL droidUpdateBuild(DROID *psDroid) +bool droidUpdateBuild(DROID *psDroid) { UDWORD pointsToAdd, constructPoints; STRUCTURE *psStruct; @@ -1146,14 +1146,14 @@ BOOL droidUpdateBuild(DROID *psDroid) return true; } -BOOL droidStartDemolishing( DROID *psDroid ) +bool droidStartDemolishing( DROID *psDroid ) { psDroid->actionStarted = gameTime; psDroid->actionPoints = 0; return true; } -BOOL droidUpdateDemolishing( DROID *psDroid ) +bool droidUpdateDemolishing( DROID *psDroid ) { STRUCTURE *psStruct; UDWORD pointsToAdd, constructPoints; @@ -1185,7 +1185,7 @@ BOOL droidUpdateDemolishing( DROID *psDroid ) } /* Set up a droid to clear a wrecked building feature - returns true if successful */ -BOOL droidStartClearing( DROID *psDroid ) +bool droidStartClearing( DROID *psDroid ) { FEATURE *psFeature; @@ -1206,7 +1206,7 @@ BOOL droidStartClearing( DROID *psDroid ) /* Update a construction droid while it is clearing returns true while continues */ -BOOL droidUpdateClearing( DROID *psDroid ) +bool droidUpdateClearing( DROID *psDroid ) { FEATURE *psFeature; UDWORD pointsToAdd, constructPoints; @@ -1251,7 +1251,7 @@ BOOL droidUpdateClearing( DROID *psDroid ) return true; } -BOOL droidStartRepair( DROID *psDroid ) +bool droidStartRepair( DROID *psDroid ) { STRUCTURE *psStruct; @@ -1270,7 +1270,7 @@ BOOL droidStartRepair( DROID *psDroid ) /*Start a Repair Droid working on a damaged droid*/ -BOOL droidStartDroidRepair( DROID *psDroid ) +bool droidStartDroidRepair( DROID *psDroid ) { DROID *psDroidToRepair; @@ -1311,7 +1311,7 @@ void droidSelfRepair(DROID *psDroid) /*Start a EW weapon droid working on a low resistance structure*/ -BOOL droidStartRestore( DROID *psDroid ) +bool droidStartRestore( DROID *psDroid ) { STRUCTURE *psStruct; @@ -1330,7 +1330,7 @@ BOOL droidStartRestore( DROID *psDroid ) } /*continue restoring a structure*/ -BOOL droidUpdateRestore( DROID *psDroid ) +bool droidUpdateRestore( DROID *psDroid ) { STRUCTURE *psStruct; UDWORD pointsToAdd, restorePoints; @@ -1452,7 +1452,7 @@ void droidUpdateRecoil( DROID *psDroid ) } -BOOL droidUpdateRepair( DROID *psDroid ) +bool droidUpdateRepair( DROID *psDroid ) { STRUCTURE *psStruct; UDWORD iPointsToAdd, iRepairPoints; @@ -1490,7 +1490,7 @@ BOOL droidUpdateRepair( DROID *psDroid ) } /*Updates a Repair Droid working on a damaged droid*/ -BOOL droidUpdateDroidRepair(DROID *psRepairDroid) +bool droidUpdateDroidRepair(DROID *psRepairDroid) { DROID *psDroidToRepair; UDWORD iPointsToAdd, iRepairPoints; @@ -1613,9 +1613,9 @@ DROID_TEMPLATE::DROID_TEMPLATE(LineView line) } /* load the Droid stats for the components from the Access database */ -BOOL loadDroidTemplates(const char *pDroidData, UDWORD bufferSize) +bool loadDroidTemplates(const char *pDroidData, UDWORD bufferSize) { - BOOL bDefaultTemplateFound = false; + bool bDefaultTemplateFound = false; TableView table(pDroidData, bufferSize); @@ -1721,7 +1721,7 @@ void initTemplatePoints(void) // return whether a droid is IDF -BOOL idfDroid(DROID *psDroid) +bool idfDroid(DROID *psDroid) { //add Cyborgs //if (psDroid->droidType != DROID_WEAPON) @@ -1740,7 +1740,7 @@ BOOL idfDroid(DROID *psDroid) } // return whether a template is for an IDF droid -BOOL templateIsIDF(DROID_TEMPLATE *psTemplate) +bool templateIsIDF(DROID_TEMPLATE *psTemplate) { //add Cyborgs if (!(psTemplate->droidType == DROID_WEAPON || psTemplate->droidType == DROID_CYBORG || @@ -1812,7 +1812,7 @@ DROID_TYPE droidTemplateType(DROID_TEMPLATE *psTemplate) } //Load the weapons assigned to Droids in the Access database -BOOL loadDroidWeapons(const char *pWeaponData, UDWORD bufferSize) +bool loadDroidWeapons(const char *pWeaponData, UDWORD bufferSize) { TableView table(pWeaponData, bufferSize); @@ -1887,7 +1887,7 @@ BOOL loadDroidWeapons(const char *pWeaponData, UDWORD bufferSize) } //free the storage for the droid templates -BOOL droidTemplateShutDown(void) +bool droidTemplateShutDown(void) { unsigned int player; DROID_TEMPLATE *pTemplate, *pNext; @@ -2208,7 +2208,7 @@ UDWORD calcDroidPoints(DROID *psDroid) } //Builds an instance of a Droid - the x/y passed in are in world coords. -DROID *reallyBuildDroid(DROID_TEMPLATE *pTemplate, UDWORD x, UDWORD y, UDWORD player, BOOL onMission) +DROID *reallyBuildDroid(DROID_TEMPLATE *pTemplate, UDWORD x, UDWORD y, UDWORD player, bool onMission) { DROID *psDroid; DROID_GROUP *psGrp; @@ -2394,7 +2394,7 @@ DROID *reallyBuildDroid(DROID_TEMPLATE *pTemplate, UDWORD x, UDWORD y, UDWORD pl return psDroid; } -DROID *buildDroid(DROID_TEMPLATE *pTemplate, UDWORD x, UDWORD y, UDWORD player, BOOL onMission, const INITIAL_DROID_ORDERS *initialOrders) +DROID *buildDroid(DROID_TEMPLATE *pTemplate, UDWORD x, UDWORD y, UDWORD player, bool onMission, const INITIAL_DROID_ORDERS *initialOrders) { // ajl. droid will be created, so inform others if (bMultiMessages) @@ -2581,7 +2581,7 @@ void fillTemplateList(std::vector &pList, STRUCTURE *psFactory void assignDroidsToGroup(UDWORD playerNumber, UDWORD groupNumber) { DROID *psDroid; -BOOL bAtLeastOne = false; +bool bAtLeastOne = false; FLAG_POSITION *psFlagPos; if(groupNumberpStructureType != NULL, "Invalid structure pointer"); @@ -3538,7 +3538,7 @@ const char* getTemplateName(const DROID_TEMPLATE *psTemplate) } /* Just returns true if the droid's present body points aren't as high as the original*/ -BOOL droidIsDamaged(DROID *psDroid) +bool droidIsDamaged(DROID *psDroid) { if(psDroid->body < psDroid->originalBody) { @@ -3568,7 +3568,7 @@ char const *getDroidResourceName(char const *pName) /*checks to see if an electronic warfare weapon is attached to the droid*/ -BOOL electronicDroid(DROID *psDroid) +bool electronicDroid(DROID *psDroid) { DROID *psCurr; @@ -3598,7 +3598,7 @@ BOOL electronicDroid(DROID *psDroid) } /*checks to see if the droid is currently being repaired by another*/ -BOOL droidUnderRepair(DROID *psDroid) +bool droidUnderRepair(DROID *psDroid) { DROID *psCurr; @@ -3639,21 +3639,21 @@ UBYTE checkCommandExist(UBYTE player) } //access functions for vtols -BOOL isVtolDroid(const DROID* psDroid) +bool isVtolDroid(const DROID* psDroid) { return asPropulsionStats[psDroid->asBits[COMP_PROPULSION].nStat].propulsionType == PROPULSION_TYPE_LIFT && psDroid->droidType != DROID_TRANSPORTER; } /* returns true if the droid has lift propulsion and is moving */ -BOOL isFlying(const DROID* psDroid) +bool isFlying(const DROID* psDroid) { return (asPropulsionStats + psDroid->asBits[COMP_PROPULSION].nStat)->propulsionType == PROPULSION_TYPE_LIFT && ( psDroid->sMove.Status != MOVEINACTIVE || psDroid->droidType == DROID_TRANSPORTER ); } /* returns true if it's a VTOL weapon droid which has completed all runs */ -BOOL vtolEmpty(DROID *psDroid) +bool vtolEmpty(DROID *psDroid) { UBYTE i; @@ -3681,7 +3681,7 @@ BOOL vtolEmpty(DROID *psDroid) } /* returns true if it's a VTOL weapon droid which still has full ammo */ -BOOL vtolFull(DROID *psDroid) +bool vtolFull(DROID *psDroid) { UBYTE i; @@ -3709,7 +3709,7 @@ BOOL vtolFull(DROID *psDroid) } // true if a vtol is waiting to be rearmed by a particular rearm pad -BOOL vtolReadyToRearm(DROID *psDroid, STRUCTURE *psStruct) +bool vtolReadyToRearm(DROID *psDroid, STRUCTURE *psStruct) { BASE_OBJECT *psRearmPad; @@ -3750,7 +3750,7 @@ BOOL vtolReadyToRearm(DROID *psDroid, STRUCTURE *psStruct) } // true if a vtol droid currently returning to be rearmed -BOOL vtolRearming(DROID *psDroid) +bool vtolRearming(DROID *psDroid) { CHECK_DROID(psDroid); @@ -3775,7 +3775,7 @@ BOOL vtolRearming(DROID *psDroid) } // true if a droid is currently attacking -BOOL droidAttacking(DROID *psDroid) +bool droidAttacking(DROID *psDroid) { CHECK_DROID(psDroid); @@ -3800,10 +3800,10 @@ BOOL droidAttacking(DROID *psDroid) // see if there are any other vtols attacking the same target // but still rearming -BOOL allVtolsRearmed(DROID *psDroid) +bool allVtolsRearmed(DROID *psDroid) { DROID *psCurr; - BOOL stillRearming; + bool stillRearming; CHECK_DROID(psDroid); @@ -3854,7 +3854,7 @@ UWORD getNumAttackRuns(DROID *psDroid, int weapon_slot) /*Checks a vtol for being fully armed and fully repaired to see if ready to leave reArm pad */ -BOOL vtolHappy(const DROID* psDroid) +bool vtolHappy(const DROID* psDroid) { unsigned int i; @@ -3951,7 +3951,7 @@ void assignVTOLPad(DROID *psNewDroid, STRUCTURE *psReArmPad) /*compares the droid sensor type with the droid weapon type to see if the FIRE_SUPPORT order can be assigned*/ -BOOL droidSensorDroidWeapon(BASE_OBJECT *psObj, DROID *psDroid) +bool droidSensorDroidWeapon(BASE_OBJECT *psObj, DROID *psDroid) { SENSOR_STATS *psStats = NULL; int compIndex; @@ -4037,7 +4037,7 @@ BOOL droidSensorDroidWeapon(BASE_OBJECT *psObj, DROID *psDroid) } // return whether a droid has a CB sensor on it -BOOL cbSensorDroid(DROID *psDroid) +bool cbSensorDroid(DROID *psDroid) { if (psDroid->droidType != DROID_SENSOR) { @@ -4059,7 +4059,7 @@ BOOL cbSensorDroid(DROID *psDroid) } // return whether a droid has a standard sensor on it (standard, VTOL strike, or wide spectrum) -BOOL standardSensorDroid(DROID *psDroid) +bool standardSensorDroid(DROID *psDroid) { if (psDroid->droidType != DROID_SENSOR) { @@ -4311,7 +4311,7 @@ true if valid weapon*/ /* this will be buggy if the droid being checked has both AA weapon and non-AA weapon Cannot think of a solution without adding additional return value atm. */ -BOOL checkValidWeaponForProp(DROID_TEMPLATE *psTemplate) +bool checkValidWeaponForProp(DROID_TEMPLATE *psTemplate) { PROPULSION_STATS *psPropStats; @@ -4474,7 +4474,7 @@ UWORD repairPowerPoint(DROID *psDroid) * Sets the droid's current track id to NO_SOUND * \return true on success, false on failure */ -BOOL droidAudioTrackStopped( void *psObj ) +bool droidAudioTrackStopped( void *psObj ) { DROID *psDroid; @@ -4496,7 +4496,7 @@ BOOL droidAudioTrackStopped( void *psObj ) /*returns true if droid type is one of the Cyborg types*/ -BOOL cyborgDroid(const DROID* psDroid) +bool cyborgDroid(const DROID* psDroid) { return (psDroid->droidType == DROID_CYBORG || psDroid->droidType == DROID_CYBORG_CONSTRUCT @@ -4514,7 +4514,7 @@ bool isConstructionDroid(BASE_OBJECT const *psObject) return isDroid(psObject) && isConstructionDroid(castDroid(psObject)); } -BOOL droidOnMap(const DROID *psDroid) +bool droidOnMap(const DROID *psDroid) { if (psDroid->died == NOT_CURRENT_LIST || psDroid->droidType == DROID_TRANSPORTER || psDroid->pos.x == INVALID_XY || psDroid->pos.y == INVALID_XY || missionIsOffworld() diff --git a/src/droid.h b/src/droid.h index 3b069ecd8..b5c45e13c 100644 --- a/src/droid.h +++ b/src/droid.h @@ -80,12 +80,12 @@ extern UWORD aDroidExperience[MAX_PLAYERS][MAX_RECYCLED_DROIDS]; // initialise droid module -extern BOOL droidInit(void); +extern bool droidInit(void); extern void removeDroidBase(DROID *psDel); -extern BOOL loadDroidTemplates(const char *pDroidData, UDWORD bufferSize); -extern BOOL loadDroidWeapons(const char *pWeaponData, UDWORD bufferSize); +extern bool loadDroidTemplates(const char *pDroidData, UDWORD bufferSize); +extern bool loadDroidWeapons(const char *pWeaponData, UDWORD bufferSize); /*initialise the template build and power points */ extern void initTemplatePoints(void); @@ -99,9 +99,9 @@ struct INITIAL_DROID_ORDERS }; /*Builds an instance of a Structure - the x/y passed in are in world coords.*/ /// Sends a GAME_DROID message if bMultiMessages is true, or actually creates it if false. Only uses initialOrders if sending a GAME_DROID message. -extern DROID* buildDroid(DROID_TEMPLATE *pTemplate, UDWORD x, UDWORD y, UDWORD player, BOOL onMission, const INITIAL_DROID_ORDERS *initialOrders); +extern DROID* buildDroid(DROID_TEMPLATE *pTemplate, UDWORD x, UDWORD y, UDWORD player, bool onMission, const INITIAL_DROID_ORDERS *initialOrders); /// Creates a droid locally, instead of sending a message, even if the bMultiMessages HACK is set to true. -DROID *reallyBuildDroid(DROID_TEMPLATE *pTemplate, UDWORD x, UDWORD y, UDWORD player, BOOL onMission); +DROID *reallyBuildDroid(DROID_TEMPLATE *pTemplate, UDWORD x, UDWORD y, UDWORD player, bool onMission); /* Set the asBits in a DROID structure given it's template. */ extern void droidSetBits(DROID_TEMPLATE *pTemplate,DROID *psDroid); @@ -134,10 +134,10 @@ extern UDWORD calcTemplateBuild(DROID_TEMPLATE *psTemplate); extern UDWORD calcTemplatePower(DROID_TEMPLATE *psTemplate); // return whether a template is for an IDF droid -BOOL templateIsIDF(DROID_TEMPLATE *psTemplate); +bool templateIsIDF(DROID_TEMPLATE *psTemplate); // return whether a droid is IDF -BOOL idfDroid(DROID *psDroid); +bool idfDroid(DROID *psDroid); /* Do damage to a droid */ int32_t droidDamage(DROID *psDroid, uint32_t damage, WEAPON_CLASS weaponClass, WEAPON_SUBCLASS weaponSubClass, HIT_SIDE impactSide); @@ -146,40 +146,40 @@ int32_t droidDamage(DROID *psDroid, uint32_t damage, WEAPON_CLASS weaponClass, W extern void droidUpdate(DROID *psDroid); /* Set up a droid to build a structure - returns true if successful */ -extern BOOL droidStartBuild(DROID *psDroid); +extern bool droidStartBuild(DROID *psDroid); /* Sets a droid to start demolishing - returns true if successful */ -extern BOOL droidStartDemolishing( DROID *psDroid ); +extern bool droidStartDemolishing( DROID *psDroid ); /* Update a construction droid while it is demolishing returns true while demolishing */ -extern BOOL droidUpdateDemolishing( DROID *psDroid ); +extern bool droidUpdateDemolishing( DROID *psDroid ); /* Sets a droid to start repairing - returns true if successful */ -extern BOOL droidStartRepair( DROID *psDroid ); +extern bool droidStartRepair( DROID *psDroid ); /* Update a construction droid while it is repairing returns true while repairing */ -extern BOOL droidUpdateRepair( DROID *psDroid ); +extern bool droidUpdateRepair( DROID *psDroid ); /*Start a Repair Droid working on a damaged droid - returns true if successful*/ -extern BOOL droidStartDroidRepair( DROID *psDroid ); +extern bool droidStartDroidRepair( DROID *psDroid ); /*Updates a Repair Droid working on a damaged droid - returns true whilst repairing*/ -extern BOOL droidUpdateDroidRepair(DROID *psRepairDroid); +extern bool droidUpdateDroidRepair(DROID *psRepairDroid); /*checks a droids current body points to see if need to self repair*/ extern void droidSelfRepair(DROID *psDroid); /* Update a construction droid while it is building returns true while building continues */ -extern BOOL droidUpdateBuild(DROID *psDroid); +extern bool droidUpdateBuild(DROID *psDroid); /*Start a EW weapon droid working on a low resistance structure*/ -extern BOOL droidStartRestore( DROID *psDroid ); +extern bool droidStartRestore( DROID *psDroid ); /*continue restoring a structure*/ -extern BOOL droidUpdateRestore( DROID *psDroid ); +extern bool droidUpdateRestore( DROID *psDroid ); // recycle a droid (retain it's experience and some of it's cost) extern void recycleDroid(DROID *psDel); @@ -195,10 +195,10 @@ extern void droidBurn( DROID * psDroid ); /* Remove a droid from the apsDroidLists so doesn't update or get drawn etc*/ //returns true if successfully removed from the list -extern BOOL droidRemove(DROID *psDroid, DROID *pList[MAX_PLAYERS]); +extern bool droidRemove(DROID *psDroid, DROID *pList[MAX_PLAYERS]); //free the storage for the droid templates -extern BOOL droidTemplateShutDown(void); +extern bool droidTemplateShutDown(void); /* Return the type of a droid */ extern DROID_TYPE droidType(DROID *psDroid); @@ -211,11 +211,11 @@ void fillTemplateList(std::vector &pList, STRUCTURE *psFactory extern void assignDroidsToGroup(UDWORD playerNumber, UDWORD groupNumber); -extern BOOL activateGroup(UDWORD playerNumber, UDWORD groupNumber); +extern bool activateGroup(UDWORD playerNumber, UDWORD groupNumber); extern UDWORD getNumDroidsForLevel(UDWORD level); -extern BOOL activateGroupAndMove(UDWORD playerNumber, UDWORD groupNumber); +extern bool activateGroupAndMove(UDWORD playerNumber, UDWORD groupNumber); /* calculate muzzle tip location in 3d world added int weapon_slot to fix the always slot 0 hack*/ bool calcDroidMuzzleLocation(DROID *psDroid, Vector3i *muzzle, int weapon_slot); /* calculate muzzle base location in 3d world added int weapon_slot to fix the always slot 0 hack*/ @@ -232,7 +232,7 @@ extern DROID_TEMPLATE* getTemplateFromTranslatedNameNoPlayer(char const *pName); extern DROID_TEMPLATE* getTemplateFromMultiPlayerID(UDWORD multiPlayerID); // finds a droid for the player and sets it to be the current selected droid -extern BOOL selectDroidByID(UDWORD id, UDWORD player); +extern bool selectDroidByID(UDWORD id, UDWORD player); /* Droid experience stuff */ extern unsigned int getDroidLevel(const DROID* psDroid); @@ -246,16 +246,16 @@ extern const char *droidGetName(const DROID *psDroid); extern void droidSetName(DROID *psDroid, const char *pName); // returns true when no droid on x,y square. -extern BOOL noDroid (UDWORD x, UDWORD y); // true if no droid at x,y +extern bool noDroid (UDWORD x, UDWORD y); // true if no droid at x,y // returns an x/y coord to place a droid -extern BOOL pickATile (UDWORD *x0,UDWORD *y0, UBYTE numIterations); +extern bool pickATile (UDWORD *x0,UDWORD *y0, UBYTE numIterations); extern PICKTILE pickHalfATile (UDWORD *x, UDWORD *y, UBYTE numIterations); -extern BOOL pickATile2 (UDWORD *x, UDWORD *y, UDWORD numIterations); -extern BOOL zonedPAT(UDWORD x, UDWORD y); -extern BOOL pickATileGen(UDWORD *x, UDWORD *y, UBYTE numIterations, - BOOL (*function)(UDWORD x, UDWORD y)); -extern BOOL pickATileGenThreat(UDWORD *x, UDWORD *y, UBYTE numIterations, SDWORD threatRange, - SDWORD player, BOOL (*function)(UDWORD x, UDWORD y)); +extern bool pickATile2 (UDWORD *x, UDWORD *y, UDWORD numIterations); +extern bool zonedPAT(UDWORD x, UDWORD y); +extern bool pickATileGen(UDWORD *x, UDWORD *y, UBYTE numIterations, + bool (*function)(UDWORD x, UDWORD y)); +extern bool pickATileGenThreat(UDWORD *x, UDWORD *y, UBYTE numIterations, SDWORD threatRange, + SDWORD player, bool (*function)(UDWORD x, UDWORD y)); //initialises the droid movement model @@ -263,15 +263,15 @@ extern void initDroidMovement(DROID *psDroid); /* Looks through the players list of droids to see if any of them are building the specified structure - returns true if finds one*/ -extern BOOL checkDroidsBuilding(STRUCTURE *psStructure); +extern bool checkDroidsBuilding(STRUCTURE *psStructure); /* Looks through the players list of droids to see if any of them are demolishing the specified structure - returns true if finds one*/ -extern BOOL checkDroidsDemolishing(STRUCTURE *psStructure); +extern bool checkDroidsDemolishing(STRUCTURE *psStructure); /* checks the structure for type and capacity and orders the droid to build a module if it can - returns true if order is set */ -extern BOOL buildModule(STRUCTURE *psStruct); +extern bool buildModule(STRUCTURE *psStruct); /*Deals with building a module - checking if any droid is currently doing this - if so, helping to build the current one*/ @@ -282,7 +282,7 @@ a string ID or something the user types in*/ extern const char* getTemplateName(const DROID_TEMPLATE *psTemplate); /* Just returns true if the droid's present body points aren't as high as the original*/ -extern BOOL droidIsDamaged(DROID *psDroid); +extern bool droidIsDamaged(DROID *psDroid); /* Returns currently active (selected) group */ extern UDWORD getSelectedGroup( void ); @@ -295,35 +295,35 @@ extern char const *getDroidResourceName(char const *pName); /*checks to see if an electronic warfare weapon is attached to the droid*/ -extern BOOL electronicDroid(DROID *psDroid); +extern bool electronicDroid(DROID *psDroid); /*checks to see if the droid is currently being repaired by another*/ -extern BOOL droidUnderRepair(DROID *psDroid); +extern bool droidUnderRepair(DROID *psDroid); //count how many Command Droids exist in the world at any one moment extern UBYTE checkCommandExist(UBYTE player); /* Set up a droid to clear a wrecked building feature - returns true if successful */ -extern BOOL droidStartClearing( DROID *psDroid ); +extern bool droidStartClearing( DROID *psDroid ); /* Update a construction droid while it is clearing returns true while continues */ -extern BOOL droidUpdateClearing( DROID *psDroid ); +extern bool droidUpdateClearing( DROID *psDroid ); /*For a given repair droid, check if there are any damaged droids within a defined range*/ extern BASE_OBJECT * checkForRepairRange(DROID *psDroid,DROID *psTarget); /// Returns true iff the droid has VTOL propulsion, and is not a transport. -extern BOOL isVtolDroid(const DROID* psDroid); +extern bool isVtolDroid(const DROID* psDroid); /// Returns true iff the droid has VTOL propulsion and is moving. -extern BOOL isFlying(const DROID* psDroid); +extern bool isFlying(const DROID* psDroid); /*returns true if a VTOL weapon droid which has completed all runs*/ -extern BOOL vtolEmpty(DROID *psDroid); +extern bool vtolEmpty(DROID *psDroid); /*returns true if a VTOL weapon droid which still has full ammo*/ -extern BOOL vtolFull(DROID *psDroid); +extern bool vtolFull(DROID *psDroid); /*Checks a vtol for being fully armed and fully repaired to see if ready to leave reArm pad */ -extern BOOL vtolHappy(const DROID* psDroid); +extern bool vtolHappy(const DROID* psDroid); /*this mends the VTOL when it has been returned to home base whilst on an offworld mission*/ extern void mendVtol(DROID *psDroid); @@ -334,23 +334,23 @@ extern UWORD getNumAttackRuns(DROID *psDroid, int weapon_slot); //assign rearmPad to the VTOL extern void assignVTOLPad(DROID *psNewDroid, STRUCTURE *psReArmPad); // true if a vtol is waiting to be rearmed by a particular rearm pad -extern BOOL vtolReadyToRearm(DROID *psDroid, STRUCTURE *psStruct); +extern bool vtolReadyToRearm(DROID *psDroid, STRUCTURE *psStruct); // true if a vtol droid currently returning to be rearmed -extern BOOL vtolRearming(DROID *psDroid); +extern bool vtolRearming(DROID *psDroid); // true if a droid is currently attacking -extern BOOL droidAttacking(DROID *psDroid); +extern bool droidAttacking(DROID *psDroid); // see if there are any other vtols attacking the same target // but still rearming -extern BOOL allVtolsRearmed(DROID *psDroid); +extern bool allVtolsRearmed(DROID *psDroid); /*compares the droid sensor type with the droid weapon type to see if the FIRE_SUPPORT order can be assigned*/ -extern BOOL droidSensorDroidWeapon(BASE_OBJECT *psObj, DROID *psDroid); +extern bool droidSensorDroidWeapon(BASE_OBJECT *psObj, DROID *psDroid); // return whether a droid has a CB sensor on it -extern BOOL cbSensorDroid(DROID *psDroid); +extern bool cbSensorDroid(DROID *psDroid); // return whether a droid has a standard sensor on it (standard, VTOL strike, or wide spectrum) -extern BOOL standardSensorDroid(DROID *psDroid); +extern bool standardSensorDroid(DROID *psDroid); // give a droid from one player to another - used in Electronic Warfare and multiplayer extern DROID * giftSingleDroid(DROID *psD, UDWORD to); @@ -360,7 +360,7 @@ extern SWORD droidResistance(DROID *psDroid); /*this is called to check the weapon is 'allowed'. Check if VTOL, the weapon is direct fire. Also check numVTOLattackRuns for the weapon is not zero - return true if valid weapon*/ -extern BOOL checkValidWeaponForProp(DROID_TEMPLATE *psTemplate); +extern bool checkValidWeaponForProp(DROID_TEMPLATE *psTemplate); extern const char *getDroidNameForRank(UDWORD rank); @@ -380,19 +380,19 @@ extern UWORD powerReqForDroidRepair(DROID *psDroid); extern UWORD repairPowerPoint(DROID *psDroid); /* audio finished callback */ -extern BOOL droidAudioTrackStopped( void *psObj ); +extern bool droidAudioTrackStopped( void *psObj ); /*returns true if droid type is one of the Cyborg types*/ -extern BOOL cyborgDroid(const DROID* psDroid); +extern bool cyborgDroid(const DROID* psDroid); bool isConstructionDroid(DROID const *psDroid); bool isConstructionDroid(BASE_OBJECT const *psObject); // check for illegal references to droid we want to release -BOOL droidCheckReferences(DROID *psVictimDroid); +bool droidCheckReferences(DROID *psVictimDroid); /** Check if droid is in a legal world position and is not on its way to drive off the map. */ -BOOL droidOnMap(const DROID *psDroid); +bool droidOnMap(const DROID *psDroid); void droidSetPosition(DROID *psDroid, int x, int y); diff --git a/src/e3demo.cpp b/src/e3demo.cpp index 0956dbd84..59cd8b48c 100644 --- a/src/e3demo.cpp +++ b/src/e3demo.cpp @@ -76,9 +76,9 @@ static void findSomethingInteresting(void) UDWORD player,otherPlayer; DROID *psDroid; UDWORD numWith; -BOOL bSeekOnlyLocations; +bool bSeekOnlyLocations; UDWORD i; -BOOL bHaveHuman = false; +bool bHaveHuman = false; PROPULSION_STATS *psPropStats; //--- @@ -209,7 +209,7 @@ void processDemoCam( void ) { UDWORD firstPlayer,otherPlayer; DROID *psDroid; -BOOL bSkipOrder = false; +bool bSkipOrder = false; UDWORD i,numWith; /* Is the demo camera actually active? */ @@ -312,7 +312,7 @@ void toggleDemoStatus( void ) // ------------------------------------------------------------------------- /* Returns status */ -BOOL demoGetStatus( void ) +bool demoGetStatus( void ) { if(presentStatus == DC_ISACTIVE) { diff --git a/src/e3demo.h b/src/e3demo.h index be73dabaa..331627ffe 100644 --- a/src/e3demo.h +++ b/src/e3demo.h @@ -24,7 +24,7 @@ void initDemoCamera(void); void processDemoCam(void); void toggleDemoStatus(void); -BOOL demoGetStatus(void); +bool demoGetStatus(void); void setFindNewTarget(void); #endif //__INCLUDED_SRC_E3DEMO_H__ diff --git a/src/edit3d.cpp b/src/edit3d.cpp index ef1af9411..b611a7635 100644 --- a/src/edit3d.cpp +++ b/src/edit3d.cpp @@ -102,9 +102,9 @@ void adjustTileHeight(MAPTILE *psTile, SDWORD adjust) } } -BOOL inHighlight(UDWORD realX, UDWORD realY) +bool inHighlight(UDWORD realX, UDWORD realY) { - BOOL retVal = false; + bool retVal = false; if (realX>=buildSite.xTL && realX<=buildSite.xBR) { @@ -167,7 +167,7 @@ void kill3DBuilding ( void ) // Call once per frame to handle structure positioning and callbacks. // -BOOL process3DBuilding(void) +bool process3DBuilding(void) { UDWORD bX,bY; @@ -267,7 +267,7 @@ BOOL process3DBuilding(void) /* See if a structure location has been found */ -BOOL found3DBuilding(UDWORD *x, UDWORD *y) +bool found3DBuilding(UDWORD *x, UDWORD *y) { if (buildState != BUILD3D_FINISHED || x == NULL || y == NULL) { @@ -291,7 +291,7 @@ BOOL found3DBuilding(UDWORD *x, UDWORD *y) } /* See if a second position for a build has been found */ -BOOL found3DBuildLocTwo(UDWORD *px1, UDWORD *py1, UDWORD *px2, UDWORD *py2) +bool found3DBuildLocTwo(UDWORD *px1, UDWORD *py1, UDWORD *px2, UDWORD *py2) { if ( (((STRUCTURE_STATS *)sBuildDetails.psStats)->type != REF_WALL && ((STRUCTURE_STATS *)sBuildDetails.psStats)->type != REF_GATE && @@ -324,7 +324,7 @@ BOOL found3DBuildLocTwo(UDWORD *px1, UDWORD *py1, UDWORD *px2, UDWORD *py2) } /*returns true if the build state is not equal to BUILD3D_NONE*/ -BOOL tryingToGetLocation(void) +bool tryingToGetLocation(void) { if (buildState == BUILD3D_NONE) { diff --git a/src/edit3d.h b/src/edit3d.h index a4cf24491..b002e1f9e 100644 --- a/src/edit3d.h +++ b/src/edit3d.h @@ -31,16 +31,16 @@ typedef void (*BUILDCALLBACK)(UDWORD xPos, UDWORD yPos,void *UserData); extern void Edit3DInitVars(void); -extern BOOL found3DBuilding ( UDWORD *x, UDWORD *y ); -extern BOOL found3DBuildLocTwo ( UDWORD *px1, UDWORD *py1, UDWORD *px2, UDWORD *py2); +extern bool found3DBuilding ( UDWORD *x, UDWORD *y ); +extern bool found3DBuildLocTwo ( UDWORD *px1, UDWORD *py1, UDWORD *px2, UDWORD *py2); extern void init3DBuilding(BASE_STATS *psStats,BUILDCALLBACK CallBack,void *UserData); extern void kill3DBuilding ( void ); -extern BOOL process3DBuilding(void); +extern bool process3DBuilding(void); extern void adjustTileHeight ( MAPTILE *psTile, SDWORD adjust ); extern void raiseTile(int tile3dX, int tile3dY); extern void lowerTile(int tile3dX, int tile3dY); -BOOL inHighlight ( UDWORD realX, UDWORD realY ); +bool inHighlight ( UDWORD realX, UDWORD realY ); struct HIGHLIGHT { @@ -75,6 +75,6 @@ extern bool editMode; extern bool quickQueueMode; /*returns true if the build state is not equal to BUILD3D_NONE*/ -extern BOOL tryingToGetLocation(void); +extern bool tryingToGetLocation(void); #endif // __INCLUDED_SRC_EDIT3D_H__ diff --git a/src/feature.cpp b/src/feature.cpp index 892603237..0b488c848 100644 --- a/src/feature.cpp +++ b/src/feature.cpp @@ -117,7 +117,7 @@ FEATURE_STATS::FEATURE_STATS(LineView line) } /* Load the feature stats */ -BOOL loadFeatureStats(const char *pFeatureData, UDWORD bufferSize) +bool loadFeatureStats(const char *pFeatureData, UDWORD bufferSize) { // Skip descriptive header if (strncmp(pFeatureData,"Feature ",8)==0) @@ -194,7 +194,7 @@ int32_t featureDamage(FEATURE *psFeature, UDWORD damage, WEAPON_CLASS weaponClas /* Create a feature on the map */ -FEATURE * buildFeature(FEATURE_STATS *psStats, UDWORD x, UDWORD y,BOOL FromSave) +FEATURE * buildFeature(FEATURE_STATS *psStats, UDWORD x, UDWORD y,bool FromSave) { UDWORD mapX, mapY; UDWORD width,breadth, foundationMin,foundationMax, height; diff --git a/src/feature.h b/src/feature.h index 30799ea0a..809d6ddb7 100644 --- a/src/feature.h +++ b/src/feature.h @@ -34,13 +34,13 @@ extern UDWORD numFeatureStats; extern FEATURE_STATS* oilResFeature; /* Load the feature stats */ -extern BOOL loadFeatureStats(const char *pFeatureData, UDWORD bufferSize); +extern bool loadFeatureStats(const char *pFeatureData, UDWORD bufferSize); /* Release the feature stats memory */ extern void featureStatsShutDown(void); /* Create a feature on the map */ -extern FEATURE * buildFeature(FEATURE_STATS *psStats, UDWORD x, UDWORD y,BOOL FromSave); +extern FEATURE * buildFeature(FEATURE_STATS *psStats, UDWORD x, UDWORD y,bool FromSave); /* Update routine for features */ extern void featureUpdate(FEATURE *psFeat); diff --git a/src/featuredef.h b/src/featuredef.h index ae857e716..46efe8a53 100644 --- a/src/featuredef.h +++ b/src/featuredef.h @@ -69,10 +69,10 @@ struct FEATURE_STATS : public BASE_STATS UWORD baseWidth; ///< The width of the base in tiles UWORD baseBreadth; ///< The breadth of the base in tiles - BOOL tileDraw; ///< Whether the tile needs to be drawn - BOOL allowLOS; ///< Whether the feature allows the LOS. true = can see through the feature - BOOL visibleAtStart; ///< Whether the feature is visible at the start of the mission - BOOL damageable; ///< Whether the feature can be destroyed + bool tileDraw; ///< Whether the tile needs to be drawn + bool allowLOS; ///< Whether the feature allows the LOS. true = can see through the feature + bool visibleAtStart; ///< Whether the feature is visible at the start of the mission + bool damageable; ///< Whether the feature can be destroyed UDWORD body; ///< Number of body points UDWORD armourValue; ///< Feature armour }; diff --git a/src/fpath.cpp b/src/fpath.cpp index 3dc63cb42..bbb9ac18a 100644 --- a/src/fpath.cpp +++ b/src/fpath.cpp @@ -122,7 +122,7 @@ static int fpathThreadFunc(void *) // initialise the findpath module -BOOL fpathInitialise(void) +bool fpathInitialise(void) { // The path system is up fpathQuit = false; @@ -231,7 +231,7 @@ static uint8_t prop2bits(PROPULSION_TYPE propulsion) } // Check if the map tile at a location blocks a droid -BOOL fpathBaseBlockingTile(SDWORD x, SDWORD y, PROPULSION_TYPE propulsion, int mapIndex, FPATH_MOVETYPE moveType) +bool fpathBaseBlockingTile(SDWORD x, SDWORD y, PROPULSION_TYPE propulsion, int mapIndex, FPATH_MOVETYPE moveType) { /* All tiles outside of the map and on map border are blocking. */ if (x < 1 || y < 1 || x > mapWidth - 1 || y > mapHeight - 1) @@ -265,13 +265,13 @@ BOOL fpathBaseBlockingTile(SDWORD x, SDWORD y, PROPULSION_TYPE propulsion, int m return (blockTile(x, y, MAX(0, mapIndex - MAX_PLAYERS)) & unitbits) != 0; // finally check if move is blocked by propulsion related factors } -BOOL fpathDroidBlockingTile(DROID *psDroid, int x, int y, FPATH_MOVETYPE moveType) +bool fpathDroidBlockingTile(DROID *psDroid, int x, int y, FPATH_MOVETYPE moveType) { return fpathBaseBlockingTile(x, y, getPropulsionStats(psDroid)->propulsionType, psDroid->player, moveType); } // Check if the map tile at a location blocks a droid -BOOL fpathBlockingTile(SDWORD x, SDWORD y, PROPULSION_TYPE propulsion) +bool fpathBlockingTile(SDWORD x, SDWORD y, PROPULSION_TYPE propulsion) { return fpathBaseBlockingTile(x, y, propulsion, 0, FMT_BLOCK); // with FMT_BLOCK, it is irrelevant which player is passed in } @@ -530,7 +530,7 @@ static void fpathExecute(PATHJOB *psJob, PATHRESULT *psResult) } // Variables for the callback -static BOOL obstruction; +static bool obstruction; /** The visibility ray callback */ @@ -548,7 +548,7 @@ static bool fpathVisCallback(Vector3i pos, int32_t dist, void *data) return true; } -BOOL fpathTileLOS(DROID *psDroid, Vector3i dest) +bool fpathTileLOS(DROID *psDroid, Vector3i dest) { Vector2i dir = removeZ(dest - psDroid->pos); diff --git a/src/fpath.h b/src/fpath.h index 2556e95be..0b8167486 100644 --- a/src/fpath.h +++ b/src/fpath.h @@ -64,7 +64,7 @@ enum FPATH_RETVAL /** Initialise the path-finding module. */ -extern BOOL fpathInitialise(void); +extern bool fpathInitialise(void); /** Shutdown the path-finding module. */ @@ -92,9 +92,9 @@ bool fpathIsEquivalentBlocking(PROPULSION_TYPE propulsion1, int player1, FPATH_M * * @return true if the given tile is blocking for this droid */ -BOOL fpathBlockingTile(SDWORD x, SDWORD y, PROPULSION_TYPE propulsion); -BOOL fpathDroidBlockingTile(DROID *psDroid, int x, int y, FPATH_MOVETYPE moveType); -BOOL fpathBaseBlockingTile(SDWORD x, SDWORD y, PROPULSION_TYPE propulsion, int player, FPATH_MOVETYPE moveType); +bool fpathBlockingTile(SDWORD x, SDWORD y, PROPULSION_TYPE propulsion); +bool fpathDroidBlockingTile(DROID *psDroid, int x, int y, FPATH_MOVETYPE moveType); +bool fpathBaseBlockingTile(SDWORD x, SDWORD y, PROPULSION_TYPE propulsion, int player, FPATH_MOVETYPE moveType); /** Set a direct path to position. * @@ -110,7 +110,7 @@ extern void fpathRemoveDroidData(int id); /** Check LOS (Line Of Sight) between two world positions. */ -extern BOOL fpathTileLOS(DROID *psDroid, Vector3i dest); +extern bool fpathTileLOS(DROID *psDroid, Vector3i dest); /** Quick O(1) test of whether it is theoretically possible to go from origin to destination * using the given propulsion type. orig and dest are in world coordinates. */ diff --git a/src/frontend.cpp b/src/frontend.cpp index 8da1d3a3d..98a9faf7a 100644 --- a/src/frontend.cpp +++ b/src/frontend.cpp @@ -70,7 +70,7 @@ tMode lastTitleMode; // Since skirmish and multiplayer setup use the same functi char aLevelName[MAX_LEVEL_NAME_SIZE+1]; //256]; // vital! the wrf file to use. -BOOL bLimiterLoaded = false; +bool bLimiterLoaded = false; #define DEFAULT_LEVEL "CAM_1A" #define TUTORIAL_LEVEL "TUTORIAL3" @@ -78,7 +78,7 @@ BOOL bLimiterLoaded = false; // Returns true if escape key pressed. // -BOOL CancelPressed(void) +bool CancelPressed(void) { return keyPressed(KEY_ESC); } @@ -86,7 +86,7 @@ BOOL CancelPressed(void) // //////////////////////////////////////////////////////////////////////////// // Title Screen -static BOOL startTitleMenu(void) +static bool startTitleMenu(void) { intRemoveReticule(); @@ -107,7 +107,7 @@ static BOOL startTitleMenu(void) return true; } -BOOL runTitleMenu(void) +bool runTitleMenu(void) { UDWORD id; @@ -145,7 +145,7 @@ BOOL runTitleMenu(void) // //////////////////////////////////////////////////////////////////////////// // Tutorial Menu -static BOOL startTutorialMenu(void) +static bool startTutorialMenu(void) { addBackdrop(); addTopForm(); @@ -161,7 +161,7 @@ static BOOL startTutorialMenu(void) return true; } -BOOL runTutorialMenu(void) +bool runTutorialMenu(void) { UDWORD id; @@ -259,7 +259,7 @@ static void SPinit(void) setPlayerColour(0, playercolor); } -BOOL runSinglePlayerMenu(void) +bool runSinglePlayerMenu(void) { UDWORD id; @@ -348,7 +348,7 @@ BOOL runSinglePlayerMenu(void) // //////////////////////////////////////////////////////////////////////////// // Multi Player Menu -static BOOL startMultiPlayerMenu(void) +static bool startMultiPlayerMenu(void) { addBackdrop(); addTopForm(); @@ -364,7 +364,7 @@ static BOOL startMultiPlayerMenu(void) return true; } -BOOL runMultiPlayerMenu(void) +bool runMultiPlayerMenu(void) { UDWORD id; @@ -411,7 +411,7 @@ BOOL runMultiPlayerMenu(void) // //////////////////////////////////////////////////////////////////////////// // Options Menu -static BOOL startOptionsMenu(void) +static bool startOptionsMenu(void) { sliderEnableDrag(true); @@ -431,7 +431,7 @@ static BOOL startOptionsMenu(void) return true; } -BOOL runOptionsMenu(void) +bool runOptionsMenu(void) { UDWORD id; @@ -478,7 +478,7 @@ BOOL runOptionsMenu(void) // //////////////////////////////////////////////////////////////////////////// // Graphics Options -static BOOL startGraphicsOptionsMenu(void) +static bool startGraphicsOptionsMenu(void) { addBackdrop(); addTopForm(); @@ -564,7 +564,7 @@ static BOOL startGraphicsOptionsMenu(void) return true; } -BOOL runGraphicsOptionsMenu(void) +bool runGraphicsOptionsMenu(void) { UDWORD id; int mode = 0; @@ -676,7 +676,7 @@ BOOL runGraphicsOptionsMenu(void) // //////////////////////////////////////////////////////////////////////////// // Audio Options Menu -static BOOL startAudioOptionsMenu(void) +static bool startAudioOptionsMenu(void) { addBackdrop(); addTopForm(); @@ -704,7 +704,7 @@ static BOOL startAudioOptionsMenu(void) return true; } -BOOL runAudioOptionsMenu(void) +bool runAudioOptionsMenu(void) { UDWORD id; @@ -750,7 +750,7 @@ BOOL runAudioOptionsMenu(void) // //////////////////////////////////////////////////////////////////////////// // Video Options -static BOOL startVideoOptionsMenu(void) +static bool startVideoOptionsMenu(void) { // Generate the resolution string snprintf(resolution, WIDG_MAXSTR, "%d x %d", @@ -807,7 +807,7 @@ static BOOL startVideoOptionsMenu(void) return true; } -BOOL runVideoOptionsMenu(void) +bool runVideoOptionsMenu(void) { SDL_Rect **modes = SDL_ListModes(NULL, SDL_FULLSCREEN | SDL_HWSURFACE); UDWORD id = widgRunScreen(psWScreen); @@ -949,7 +949,7 @@ BOOL runVideoOptionsMenu(void) // //////////////////////////////////////////////////////////////////////////// // Mouse Options -static BOOL startMouseOptionsMenu(void) +static bool startMouseOptionsMenu(void) { addBackdrop(); addTopForm(); @@ -1026,7 +1026,7 @@ static BOOL startMouseOptionsMenu(void) return true; } -BOOL runMouseOptionsMenu(void) +bool runMouseOptionsMenu(void) { UDWORD id = widgRunScreen(psWScreen); @@ -1123,7 +1123,7 @@ BOOL runMouseOptionsMenu(void) // //////////////////////////////////////////////////////////////////////////// // Game Options Menu -static BOOL startGameOptionsMenu(void) +static bool startGameOptionsMenu(void) { UDWORD w, h; int playercolor; @@ -1190,7 +1190,7 @@ static BOOL startGameOptionsMenu(void) return true; } -BOOL runGameOptionsMenu(void) +bool runGameOptionsMenu(void) { UDWORD id; @@ -1442,8 +1442,8 @@ void displayTextOption(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, WZ_DECL { SDWORD fx,fy, fw; W_BUTTON *psBut; - BOOL hilight = false; - BOOL greyOut = psWidget->UserData; // if option is unavailable. + bool hilight = false; + bool greyOut = psWidget->UserData; // if option is unavailable. psBut = (W_BUTTON *)psWidget; iV_SetFont(psBut->FontID); diff --git a/src/frontend.h b/src/frontend.h index 9053d264a..a41c2d198 100644 --- a/src/frontend.h +++ b/src/frontend.h @@ -56,20 +56,20 @@ extern tMode lastTitleMode; extern char aLevelName[MAX_LEVEL_NAME_SIZE+1]; //256]; // vital! the wrf file to use. -extern BOOL bLimiterLoaded; +extern bool bLimiterLoaded; void changeTitleMode(tMode mode); -BOOL runTitleMenu(void); -BOOL runSinglePlayerMenu(void); -BOOL runMultiPlayerMenu(void); -BOOL runGameOptionsMenu(void); -BOOL runOptionsMenu(void); -BOOL runGraphicsOptionsMenu(void); -BOOL runAudioOptionsMenu(void); -BOOL runVideoOptionsMenu(void); -BOOL runMouseOptionsMenu(void); -BOOL runTutorialMenu(void); +bool runTitleMenu(void); +bool runSinglePlayerMenu(void); +bool runMultiPlayerMenu(void); +bool runGameOptionsMenu(void); +bool runOptionsMenu(void); +bool runGraphicsOptionsMenu(void); +bool runAudioOptionsMenu(void); +bool runVideoOptionsMenu(void); +bool runMouseOptionsMenu(void); +bool runTutorialMenu(void); void addTopForm(void); void addBottomForm(void); @@ -83,7 +83,7 @@ void addFEAISlider(UDWORD id, UDWORD parent, UDWORD x, UDWORD y, UDWORD stops, U void displayTextOption(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, PIELIGHT *pColours); -BOOL CancelPressed(void); +bool CancelPressed(void); // //////////////////////////////////////////////////////////////////////////// diff --git a/src/function.cpp b/src/function.cpp index 404829aa9..8cbfb4d33 100644 --- a/src/function.cpp +++ b/src/function.cpp @@ -42,7 +42,7 @@ FUNCTION **asFunctions; UDWORD numFunctions; -typedef BOOL (*LoadFunction)(const char *pData); +typedef bool (*LoadFunction)(const char *pData); /*Returns the Function type based on the string - used for reading in data */ @@ -134,7 +134,7 @@ static UDWORD functionType(const char* pType) } // Allocate storage for the name -static BOOL storeName(FUNCTION* pFunction, const char* pNameToStore) +static bool storeName(FUNCTION* pFunction, const char* pNameToStore) { pFunction->pName = strdup(pNameToStore); if (pFunction->pName == NULL) @@ -148,7 +148,7 @@ static BOOL storeName(FUNCTION* pFunction, const char* pNameToStore) } -static BOOL loadProduction(const char *pData) +static bool loadProduction(const char *pData) { PRODUCTION_FUNCTION* psFunction; char functionName[MAX_STR_LENGTH], bodySize[MAX_STR_LENGTH]; @@ -204,7 +204,7 @@ static BOOL loadProduction(const char *pData) return true; } -static BOOL loadProductionUpgradeFunction(const char *pData) +static bool loadProductionUpgradeFunction(const char *pData) { PRODUCTION_UPGRADE_FUNCTION* psFunction; char functionName[MAX_STR_LENGTH]; @@ -272,7 +272,7 @@ static BOOL loadProductionUpgradeFunction(const char *pData) return true; } -static BOOL loadResearchFunction(const char *pData) +static bool loadResearchFunction(const char *pData) { RESEARCH_FUNCTION* psFunction; char functionName[MAX_STR_LENGTH]; @@ -306,7 +306,7 @@ static BOOL loadResearchFunction(const char *pData) return true; } -static BOOL loadReArmFunction(const char *pData) +static bool loadReArmFunction(const char *pData) { REARM_FUNCTION* psFunction; char functionName[MAX_STR_LENGTH]; @@ -342,7 +342,7 @@ static BOOL loadReArmFunction(const char *pData) //generic load function for upgrade type -static BOOL loadUpgradeFunction(const char *pData, UBYTE type) +static bool loadUpgradeFunction(const char *pData, UBYTE type) { char functionName[MAX_STR_LENGTH]; UDWORD modifier; @@ -388,43 +388,43 @@ static BOOL loadUpgradeFunction(const char *pData, UBYTE type) -static BOOL loadResearchUpgradeFunction(const char *pData) +static bool loadResearchUpgradeFunction(const char *pData) { return loadUpgradeFunction(pData, RESEARCH_UPGRADE_TYPE); } -static BOOL loadPowerUpgradeFunction(const char *pData) +static bool loadPowerUpgradeFunction(const char *pData) { return loadUpgradeFunction(pData, POWER_UPGRADE_TYPE); } -static BOOL loadRepairUpgradeFunction(const char *pData) +static bool loadRepairUpgradeFunction(const char *pData) { return loadUpgradeFunction(pData, REPAIR_UPGRADE_TYPE); } -static BOOL loadDroidRepairUpgradeFunction(const char *pData) +static bool loadDroidRepairUpgradeFunction(const char *pData) { return loadUpgradeFunction(pData, DROIDREPAIR_UPGRADE_TYPE); } -static BOOL loadDroidECMUpgradeFunction(const char *pData) +static bool loadDroidECMUpgradeFunction(const char *pData) { return loadUpgradeFunction(pData, DROIDECM_UPGRADE_TYPE); } -static BOOL loadDroidConstUpgradeFunction(const char *pData) +static bool loadDroidConstUpgradeFunction(const char *pData) { return loadUpgradeFunction(pData, DROIDCONST_UPGRADE_TYPE); } -static BOOL loadReArmUpgradeFunction(const char *pData) +static bool loadReArmUpgradeFunction(const char *pData) { return loadUpgradeFunction(pData, REARM_UPGRADE_TYPE); } -static BOOL loadDroidBodyUpgradeFunction(const char *pData) +static bool loadDroidBodyUpgradeFunction(const char *pData) { DROIDBODY_UPGRADE_FUNCTION *psFunction; char functionName[MAX_STR_LENGTH]; @@ -492,7 +492,7 @@ static BOOL loadDroidBodyUpgradeFunction(const char *pData) return true; } -static BOOL loadDroidSensorUpgradeFunction(const char *pData) +static bool loadDroidSensorUpgradeFunction(const char *pData) { DROIDSENSOR_UPGRADE_FUNCTION *psFunction; char functionName[MAX_STR_LENGTH]; @@ -539,7 +539,7 @@ static BOOL loadDroidSensorUpgradeFunction(const char *pData) return true; } -static BOOL loadWeaponUpgradeFunction(const char *pData) +static bool loadWeaponUpgradeFunction(const char *pData) { WEAPON_UPGRADE_FUNCTION* psFunction; char functionName[MAX_STR_LENGTH], @@ -611,7 +611,7 @@ static BOOL loadWeaponUpgradeFunction(const char *pData) return true; } -static BOOL loadStructureUpgradeFunction(const char *pData) +static bool loadStructureUpgradeFunction(const char *pData) { STRUCTURE_UPGRADE_FUNCTION *psFunction; char functionName[MAX_STR_LENGTH]; @@ -662,7 +662,7 @@ static BOOL loadStructureUpgradeFunction(const char *pData) return true; } -static BOOL loadWallDefenceUpgradeFunction(const char *pData) +static bool loadWallDefenceUpgradeFunction(const char *pData) { WALLDEFENCE_UPGRADE_FUNCTION *psFunction; char functionName[MAX_STR_LENGTH]; @@ -712,7 +712,7 @@ static BOOL loadWallDefenceUpgradeFunction(const char *pData) } -static BOOL loadPowerGenFunction(const char *pData) +static bool loadPowerGenFunction(const char *pData) { POWER_GEN_FUNCTION* psFunction; char functionName[MAX_STR_LENGTH]; @@ -774,7 +774,7 @@ static BOOL loadPowerGenFunction(const char *pData) return true; } -static BOOL loadResourceFunction(const char *pData) +static bool loadResourceFunction(const char *pData) { RESOURCE_FUNCTION *psFunction; char functionName[MAX_STR_LENGTH]; @@ -810,7 +810,7 @@ static BOOL loadResourceFunction(const char *pData) } -static BOOL loadRepairDroidFunction(const char *pData) +static bool loadRepairDroidFunction(const char *pData) { REPAIR_DROID_FUNCTION* psFunction; char functionName[MAX_STR_LENGTH]; @@ -848,7 +848,7 @@ static BOOL loadRepairDroidFunction(const char *pData) /*loads the corner stat to use for a particular wall stat */ -static BOOL loadWallFunction(const char *pData) +static bool loadWallFunction(const char *pData) { WALL_FUNCTION *psFunction; // UDWORD i; @@ -1472,7 +1472,7 @@ void upgradeTransporterDroids(DROID *psTransporter, } } -BOOL FunctionShutDown(void) +bool FunctionShutDown(void) { UDWORD inc;//, player; FUNCTION *pFunction, **pStartList = asFunctions; @@ -1489,7 +1489,7 @@ BOOL FunctionShutDown(void) return true; } -BOOL loadFunctionStats(const char *pFunctionData, UDWORD bufferSize) +bool loadFunctionStats(const char *pFunctionData, UDWORD bufferSize) { //array of functions pointers for each load function static const LoadFunction pLoadFunction[NUMFUNCTIONS] = diff --git a/src/function.h b/src/function.h index 939398029..79bcd9dc4 100644 --- a/src/function.h +++ b/src/function.h @@ -30,7 +30,7 @@ extern FUNCTION **asFunctions; extern UDWORD numFunctions; -extern BOOL loadFunctionStats(const char *pFunctionData, UDWORD bufferSize); +extern bool loadFunctionStats(const char *pFunctionData, UDWORD bufferSize); extern void productionUpgrade(FUNCTION *pFunction, UBYTE player); extern void researchUpgrade(FUNCTION *pFunction, UBYTE player); @@ -61,6 +61,6 @@ extern void droidBodyUpgrade(FUNCTION *pFunction, DROID *psDroid); extern void upgradeTransporterDroids(DROID *psTransporter, void(*pUpgradeFunction)(DROID *psDroid)); -extern BOOL FunctionShutDown(void); +extern bool FunctionShutDown(void); #endif // __INCLUDED_SRC_FUNCTION_H__ diff --git a/src/functiondef.h b/src/functiondef.h index e29263c82..4a375beac 100644 --- a/src/functiondef.h +++ b/src/functiondef.h @@ -206,7 +206,7 @@ struct DROIDSENSOR_UPGRADE_FUNCTION : public UPGRADE_FUNCTION typedef struct _function_upgrade { UDWORD functionInc; /*The index of the function in asFunctions */ - BOOL available; /*Flag to indicate whether this Upgrade is available*/ + bool available; /*Flag to indicate whether this Upgrade is available*/ } FUNCTION_UPGRADE; #endif /*function used by HQ to input power values*/ diff --git a/src/game.cpp b/src/game.cpp index 857e8384e..72ed27e73 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -262,7 +262,7 @@ struct COMMAND_SAVEHEADER : public GAME_SAVEHEADER UDWORD x,y,z; \ UDWORD direction; \ UDWORD player; \ - BOOL inFire; \ + bool inFire; \ UDWORD burnStart; \ UDWORD burnDamage @@ -272,7 +272,7 @@ struct COMMAND_SAVEHEADER : public GAME_SAVEHEADER UDWORD x,y,z; \ UDWORD direction; \ UDWORD player; \ - BOOL inFire; \ + bool inFire; \ UDWORD burnStart; \ UDWORD burnDamage @@ -852,7 +852,7 @@ static bool deserializeSaveGameV14Data(PHYSFS_file* fileHandle, SAVE_GAME_V14* s struct SAVE_GAME_V15 : public SAVE_GAME_V14 { - BOOL offWorldKeepLists; + bool offWorldKeepLists; uint8_t aDroidExperience[MAX_PLAYERS][MAX_RECYCLED_DROIDS]; uint32_t RubbleTile; uint32_t WaterTile; @@ -1272,7 +1272,7 @@ struct SAVE_GAME_V33 : public SAVE_GAME_V31 NETPLAY sNetPlay; uint32_t savePlayer; char sPName[32]; - BOOL multiPlayer; + bool multiPlayer; uint32_t sPlayerIndex[MAX_PLAYERS]; }; @@ -1444,7 +1444,7 @@ struct SAVE_MOVE_CONTROL UWORD pauseTime; // when MOVEPAUSE started - relative to bumpTime UWORD bumpX,bumpY; // position of last bump UDWORD shuffleStart; // when a shuffle started - BOOL isInFormation; // Indicates wether this droid is a member of a formation + bool isInFormation; // Indicates wether this droid is a member of a formation SWORD iVertSpeed; UDWORD iAttackRuns[DROID_MAXWEAPS]; float fz; @@ -1947,10 +1947,10 @@ struct SAVE_RESEARCH struct SAVE_MESSAGE { MESSAGE_TYPE type; //The type of message - BOOL bObj; + bool bObj; char name[MAX_GAME_STR_SIZE]; UDWORD objId; //Id for Proximity messages! - BOOL read; //flag to indicate whether message has been read + bool read; //flag to indicate whether message has been read UDWORD player; //which player this message belongs to }; @@ -1958,10 +1958,10 @@ struct SAVE_MESSAGE struct SAVE_MESSAGE_36 { MESSAGE_TYPE type; //The type of message - BOOL bObj; + bool bObj; char name[MAX_GAME_STR_SIZE]; UDWORD objId; //Id for Proximity messages! - BOOL read; //flag to indicate whether message has been read + bool read; //flag to indicate whether message has been read UDWORD player; //which player this message belongs to MSG_DATA_TYPE dataType; //actual type of pViewData UDWORD locX,locY; @@ -1976,7 +1976,7 @@ struct SAVE_FLAG_V18 UDWORD screenY; UDWORD screenR; UDWORD player; /*which player the Position belongs to*/ - BOOL selected; /*flag to indicate whether the Position */ + bool selected; /*flag to indicate whether the Position */ Vector3i coords; //the world coords of the Position UBYTE factoryInc; //indicates whether the first, second etc factory UBYTE factoryType; //indicates whether standard, cyborg or vtol factory @@ -1992,7 +1992,7 @@ struct SAVE_FLAG UDWORD screenY; UDWORD screenR; UDWORD player; /*which player the Position belongs to*/ - BOOL selected; /*flag to indicate whether the Position */ + bool selected; /*flag to indicate whether the Position */ Vector3i coords; //the world coords of the Position UBYTE factoryInc; //indicates whether the first, second etc factory UBYTE factoryType; //indicates whether standard, cyborg or vtol factory @@ -2046,7 +2046,7 @@ extern uint32_t unsynchObjID; // unique ID creation thing.. extern uint32_t synchObjID; // unique ID creation thing.. static UDWORD saveGameVersion = 0; -static BOOL saveGameOnMission = false; +static bool saveGameOnMission = false; static SAVE_GAME saveGameData; static UDWORD oldestSaveGameVersion = CURRENT_VERSION_NUM; static UDWORD validityKey = 0; @@ -2061,7 +2061,7 @@ static UDWORD savedObjId; static SDWORD startX, startY; static UDWORD width, height; static UDWORD gameType; -static BOOL IsScenario; +static bool IsScenario; /***************************************************************************/ /* * Local ProtoTypes @@ -2072,74 +2072,74 @@ static bool gameLoadV(PHYSFS_file* fileHandle, unsigned int version); static bool writeGameFile(const char* fileName, SDWORD saveType); static bool writeMapFile(const char* fileName); -static BOOL loadSaveDroidInitV2(char *pFileData, UDWORD filesize,UDWORD quantity); +static bool loadSaveDroidInitV2(char *pFileData, UDWORD filesize,UDWORD quantity); -static BOOL loadSaveDroidInit(char *pFileData, UDWORD filesize); +static bool loadSaveDroidInit(char *pFileData, UDWORD filesize); -static BOOL loadSaveDroid(char *pFileData, UDWORD filesize, DROID **ppsCurrentDroidLists); -static BOOL loadSaveDroidV(char *pFileData, UDWORD filesize, UDWORD numDroids, UDWORD version, DROID **ppsCurrentDroidLists); -static BOOL loadDroidSetPointers(void); -static BOOL writeDroidFile(char *pFileName, DROID **ppsCurrentDroidLists); +static bool loadSaveDroid(char *pFileData, UDWORD filesize, DROID **ppsCurrentDroidLists); +static bool loadSaveDroidV(char *pFileData, UDWORD filesize, UDWORD numDroids, UDWORD version, DROID **ppsCurrentDroidLists); +static bool loadDroidSetPointers(void); +static bool writeDroidFile(char *pFileName, DROID **ppsCurrentDroidLists); -static BOOL loadSaveStructure(char *pFileData, UDWORD filesize); -static BOOL loadSaveStructureV7(char *pFileData, UDWORD filesize, UDWORD numStructures); -static BOOL loadSaveStructureV(char *pFileData, UDWORD filesize, UDWORD numStructures, UDWORD version); -static BOOL loadStructSetPointers(void); -static BOOL writeStructFile(char *pFileName); +static bool loadSaveStructure(char *pFileData, UDWORD filesize); +static bool loadSaveStructureV7(char *pFileData, UDWORD filesize, UDWORD numStructures); +static bool loadSaveStructureV(char *pFileData, UDWORD filesize, UDWORD numStructures, UDWORD version); +static bool loadStructSetPointers(void); +static bool writeStructFile(char *pFileName); -static BOOL loadSaveTemplate(char *pFileData, UDWORD filesize); -static BOOL loadSaveTemplateV7(char *pFileData, UDWORD filesize, UDWORD numTemplates); -static BOOL loadSaveTemplateV14(char *pFileData, UDWORD filesize, UDWORD numTemplates); -static BOOL loadSaveTemplateV(char *pFileData, UDWORD filesize, UDWORD numTemplates); -static BOOL writeTemplateFile(char *pFileName); +static bool loadSaveTemplate(char *pFileData, UDWORD filesize); +static bool loadSaveTemplateV7(char *pFileData, UDWORD filesize, UDWORD numTemplates); +static bool loadSaveTemplateV14(char *pFileData, UDWORD filesize, UDWORD numTemplates); +static bool loadSaveTemplateV(char *pFileData, UDWORD filesize, UDWORD numTemplates); +static bool writeTemplateFile(char *pFileName); -static BOOL loadSaveFeature(char *pFileData, UDWORD filesize); -static BOOL loadSaveFeatureV14(char *pFileData, UDWORD filesize, UDWORD numFeatures, UDWORD version); -static BOOL loadSaveFeatureV(char *pFileData, UDWORD filesize, UDWORD numFeatures, UDWORD version); -static BOOL writeFeatureFile(char *pFileName); +static bool loadSaveFeature(char *pFileData, UDWORD filesize); +static bool loadSaveFeatureV14(char *pFileData, UDWORD filesize, UDWORD numFeatures, UDWORD version); +static bool loadSaveFeatureV(char *pFileData, UDWORD filesize, UDWORD numFeatures, UDWORD version); +static bool writeFeatureFile(char *pFileName); -static BOOL writeTerrainTypeMapFile(char *pFileName); +static bool writeTerrainTypeMapFile(char *pFileName); -static BOOL loadSaveCompList(char *pFileData, UDWORD filesize); -static BOOL loadSaveCompListV9(char *pFileData, UDWORD filesize, UDWORD numRecords, UDWORD version); -static BOOL loadSaveCompListV(char *pFileData, UDWORD filesize, UDWORD numRecords, UDWORD version); -static BOOL writeCompListFile(char *pFileName); +static bool loadSaveCompList(char *pFileData, UDWORD filesize); +static bool loadSaveCompListV9(char *pFileData, UDWORD filesize, UDWORD numRecords, UDWORD version); +static bool loadSaveCompListV(char *pFileData, UDWORD filesize, UDWORD numRecords, UDWORD version); +static bool writeCompListFile(char *pFileName); -static BOOL loadSaveStructTypeList(char *pFileData, UDWORD filesize); -static BOOL loadSaveStructTypeListV7(char *pFileData, UDWORD filesize, UDWORD numRecords); -static BOOL loadSaveStructTypeListV(char *pFileData, UDWORD filesize, UDWORD numRecords); -static BOOL writeStructTypeListFile(char *pFileName); +static bool loadSaveStructTypeList(char *pFileData, UDWORD filesize); +static bool loadSaveStructTypeListV7(char *pFileData, UDWORD filesize, UDWORD numRecords); +static bool loadSaveStructTypeListV(char *pFileData, UDWORD filesize, UDWORD numRecords); +static bool writeStructTypeListFile(char *pFileName); -static BOOL loadSaveResearch(char *pFileData, UDWORD filesize); -static BOOL loadSaveResearchV8(char *pFileData, UDWORD filesize, UDWORD numRecords); -static BOOL loadSaveResearchV(char *pFileData, UDWORD filesize, UDWORD numRecords); -static BOOL writeResearchFile(char *pFileName); +static bool loadSaveResearch(char *pFileData, UDWORD filesize); +static bool loadSaveResearchV8(char *pFileData, UDWORD filesize, UDWORD numRecords); +static bool loadSaveResearchV(char *pFileData, UDWORD filesize, UDWORD numRecords); +static bool writeResearchFile(char *pFileName); -static BOOL loadSaveMessage(char *pFileData, UDWORD filesize, SWORD levelType); -static BOOL loadSaveMessage36(char *pFileData, UDWORD filesize, UDWORD numMessages, UDWORD version, SWORD levelType); -static BOOL writeMessageFile(char *pFileName); +static bool loadSaveMessage(char *pFileData, UDWORD filesize, SWORD levelType); +static bool loadSaveMessage36(char *pFileData, UDWORD filesize, UDWORD numMessages, UDWORD version, SWORD levelType); +static bool writeMessageFile(char *pFileName); -static BOOL loadSaveFlag(char *pFileData, UDWORD filesize); -static BOOL loadSaveFlagV(char *pFileData, UDWORD filesize, UDWORD numFlags, UDWORD version); -static BOOL writeFlagFile(char *pFileName); +static bool loadSaveFlag(char *pFileData, UDWORD filesize); +static bool loadSaveFlagV(char *pFileData, UDWORD filesize, UDWORD numFlags, UDWORD version); +static bool writeFlagFile(char *pFileName); -static BOOL loadSaveProduction(char *pFileData, UDWORD filesize); -static BOOL loadSaveProductionV(char *pFileData, UDWORD filesize, UDWORD version); -static BOOL writeProductionFile(char *pFileName); +static bool loadSaveProduction(char *pFileData, UDWORD filesize); +static bool loadSaveProductionV(char *pFileData, UDWORD filesize, UDWORD version); +static bool writeProductionFile(char *pFileName); -static BOOL loadSaveStructLimits(char *pFileData, UDWORD filesize); -static BOOL loadSaveStructLimitsV(char *pFileData, UDWORD filesize, UDWORD numLimits); -static BOOL writeStructLimitsFile(char *pFileName); +static bool loadSaveStructLimits(char *pFileData, UDWORD filesize); +static bool loadSaveStructLimitsV(char *pFileData, UDWORD filesize, UDWORD numLimits); +static bool writeStructLimitsFile(char *pFileName); -static BOOL readFiresupportDesignators(char *pFileName); -static BOOL writeFiresupportDesignators(char *pFileName); +static bool readFiresupportDesignators(char *pFileName); +static bool writeFiresupportDesignators(char *pFileName); -static BOOL writeScriptState(char *pFileName); +static bool writeScriptState(char *pFileName); -static BOOL getNameFromComp(UDWORD compType, char *pDest, UDWORD compIndex); +static bool getNameFromComp(UDWORD compType, char *pDest, UDWORD compIndex); //adjust the name depending on type of save game and whether resourceNames are used -static BOOL getSaveObjectName(char *pName); +static bool getSaveObjectName(char *pName); static bool gameLoad(const char* fileName); /* set the global scroll values to use for the save game */ @@ -2183,7 +2183,7 @@ bool loadGameInit(const char* fileName) // // if it is a level loaded up from CD then UserSaveGame will by false // UserSaveGame ... Extra stuff to load after scripts -BOOL loadMissionExtras(const char *pGameToLoad, SWORD levelType) +bool loadMissionExtras(const char *pGameToLoad, SWORD levelType) { char aFileName[256]; UDWORD fileExten, fileSize; @@ -2227,7 +2227,7 @@ BOOL loadMissionExtras(const char *pGameToLoad, SWORD levelType) // ----------------------------------------------------------------------------------------- // UserSaveGame ... this is true when you are loading a players save game -BOOL loadGame(const char *pGameToLoad, BOOL keepObjects, BOOL freeMem, BOOL UserSaveGame) +bool loadGame(const char *pGameToLoad, bool keepObjects, bool freeMem, bool UserSaveGame) { char aFileName[256]; UDWORD fileExten, fileSize, pl; @@ -3363,7 +3363,7 @@ error: // ----------------------------------------------------------------------------------------- // Modified by AlexL , now takes a filename, with no popup.... -BOOL saveGame(char *aFileName, GAME_TYPE saveType) +bool saveGame(char *aFileName, GAME_TYPE saveType) { UDWORD fileExtension; DROID *psDroid, *psNext; @@ -4859,7 +4859,7 @@ static bool writeGameFile(const char* fileName, SDWORD saveType) // Process the droid initialisation file (dinit.bjo). Creates droids for // the scenario being loaded. This is *NEVER* called for a user save game // -BOOL loadSaveDroidInit(char *pFileData, UDWORD filesize) +bool loadSaveDroidInit(char *pFileData, UDWORD filesize) { DROIDINIT_SAVEHEADER *psHeader; @@ -4906,7 +4906,7 @@ BOOL loadSaveDroidInit(char *pFileData, UDWORD filesize) } // ----------------------------------------------------------------------------------------- -BOOL loadSaveDroidInitV2(char *pFileData, UDWORD filesize,UDWORD quantity) +bool loadSaveDroidInitV2(char *pFileData, UDWORD filesize,UDWORD quantity) { SAVE_DROIDINIT *pDroidInit; DROID_TEMPLATE *psTemplate; @@ -5000,7 +5000,7 @@ static UDWORD RemapPlayerNumber(UDWORD OldNumber) // ----------------------------------------------------------------------------------------- /*This is *ALWAYS* called by a User Save Game */ -BOOL loadSaveDroid(char *pFileData, UDWORD filesize, DROID **ppsCurrentDroidLists) +bool loadSaveDroid(char *pFileData, UDWORD filesize, DROID **ppsCurrentDroidLists) { DROID_SAVEHEADER *psHeader; @@ -5168,7 +5168,7 @@ static DROID* buildDroidFromSaveDroid(SAVE_DROID* psSaveDroid, UDWORD version) { DROID_TEMPLATE *psTemplate, sTemplate; DROID *psDroid; - BOOL found; + bool found; UDWORD i, id; SDWORD compInc; UDWORD burnTime; @@ -5377,7 +5377,7 @@ static DROID* buildDroidFromSaveDroid(SAVE_DROID* psSaveDroid, UDWORD version) // ----------------------------------------------------------------------------------------- -static BOOL loadDroidSetPointers(void) +static bool loadDroidSetPointers(void) { UDWORD player,list; DROID *psDroid, *psCommander; @@ -5502,7 +5502,7 @@ static BOOL loadDroidSetPointers(void) // ----------------------------------------------------------------------------------------- /* code for all versions after save name change v19*/ -BOOL loadSaveDroidV(char *pFileData, UDWORD filesize, UDWORD numDroids, UDWORD version, DROID **ppsCurrentDroidLists) +bool loadSaveDroidV(char *pFileData, UDWORD filesize, UDWORD numDroids, UDWORD version, DROID **ppsCurrentDroidLists) { SAVE_DROID sSaveDroid, *psSaveDroid = &sSaveDroid; DROID *psDroid; @@ -5643,7 +5643,7 @@ BOOL loadSaveDroidV(char *pFileData, UDWORD filesize, UDWORD numDroids, UDWORD v } // ----------------------------------------------------------------------------------------- -static BOOL buildSaveDroidFromDroid(SAVE_DROID* psSaveDroid, DROID* psCurr, DROID_SAVE_TYPE saveType) +static bool buildSaveDroidFromDroid(SAVE_DROID* psSaveDroid, DROID* psCurr, DROID_SAVE_TYPE saveType) { UDWORD i; @@ -5847,7 +5847,7 @@ static BOOL buildSaveDroidFromDroid(SAVE_DROID* psSaveDroid, DROID* psCurr, DROI /* Writes the linked list of droids for each player to a file */ -BOOL writeDroidFile(char *pFileName, DROID **ppsCurrentDroidLists) +bool writeDroidFile(char *pFileName, DROID **ppsCurrentDroidLists) { char *pFileData = NULL; UDWORD fileSize, player, totalDroids=0; @@ -5855,7 +5855,7 @@ BOOL writeDroidFile(char *pFileName, DROID **ppsCurrentDroidLists) DROID *psTrans; DROID_SAVEHEADER *psHeader; SAVE_DROID *psSaveDroid; - BOOL status = true; + bool status = true; //total all the droids in the world for (player = 0; player < MAX_PLAYERS; player++) @@ -5963,7 +5963,7 @@ BOOL writeDroidFile(char *pFileName, DROID **ppsCurrentDroidLists) // ----------------------------------------------------------------------------------------- -BOOL loadSaveStructure(char *pFileData, UDWORD filesize) +bool loadSaveStructure(char *pFileData, UDWORD filesize) { STRUCT_SAVEHEADER *psHeader; @@ -6019,14 +6019,14 @@ BOOL loadSaveStructure(char *pFileData, UDWORD filesize) // ----------------------------------------------------------------------------------------- /* code specific to version 7 of a save structure */ -BOOL loadSaveStructureV7(char *pFileData, UDWORD filesize, UDWORD numStructures) +bool loadSaveStructureV7(char *pFileData, UDWORD filesize, UDWORD numStructures) { SAVE_STRUCTURE_V2 *psSaveStructure, sSaveStructure; STRUCTURE *psStructure; REPAIR_FACILITY *psRepair; STRUCTURE_STATS *psStats = NULL; UDWORD count, statInc; - BOOL found; + bool found; UDWORD NumberOfSkippedStructures=0; UDWORD burnTime; @@ -6249,7 +6249,7 @@ static UDWORD getResearchIdFromName(char *pName) // ----------------------------------------------------------------------------------------- /* code for versions after version 20 of a save structure */ -BOOL loadSaveStructureV(char *pFileData, UDWORD filesize, UDWORD numStructures, UDWORD version) +bool loadSaveStructureV(char *pFileData, UDWORD filesize, UDWORD numStructures, UDWORD version) { SAVE_STRUCTURE *psSaveStructure, sSaveStructure; STRUCTURE *psStructure; @@ -6261,7 +6261,7 @@ BOOL loadSaveStructureV(char *pFileData, UDWORD filesize, UDWORD numStructures, STRUCTURE_STATS *psModule; UDWORD capacity; UDWORD count, statInc; - BOOL found; + bool found; UDWORD NumberOfSkippedStructures=0; UDWORD burnTime; UDWORD i; @@ -6648,7 +6648,7 @@ BOOL loadSaveStructureV(char *pFileData, UDWORD filesize, UDWORD numStructures, /* Writes the linked list of structure for each player to a file */ -BOOL writeStructFile(char *pFileName) +bool writeStructFile(char *pFileName) { char *pFileData = NULL; UDWORD fileSize, player, i, totalStructs=0; @@ -6661,7 +6661,7 @@ BOOL writeStructFile(char *pFileName) SAVE_STRUCTURE *psSaveStruct; FLAG_POSITION *psFlag; UDWORD researchId; - BOOL status = true; + bool status = true; //total all the structures in the world for (player = 0; player < MAX_PLAYERS; player++) @@ -6922,7 +6922,7 @@ BOOL writeStructFile(char *pFileName) } // ----------------------------------------------------------------------------------------- -BOOL loadStructSetPointers(void) +bool loadStructSetPointers(void) { UDWORD player,list; FACTORY *psFactory; @@ -7038,7 +7038,7 @@ BOOL loadStructSetPointers(void) } // ----------------------------------------------------------------------------------------- -BOOL loadSaveFeature(char *pFileData, UDWORD filesize) +bool loadSaveFeature(char *pFileData, UDWORD filesize) { FEATURE_SAVEHEADER *psHeader; @@ -7094,13 +7094,13 @@ BOOL loadSaveFeature(char *pFileData, UDWORD filesize) // ----------------------------------------------------------------------------------------- /* code for all version 8 - 14 save features */ -BOOL loadSaveFeatureV14(char *pFileData, UDWORD filesize, UDWORD numFeatures, UDWORD version) +bool loadSaveFeatureV14(char *pFileData, UDWORD filesize, UDWORD numFeatures, UDWORD version) { SAVE_FEATURE_V14 *psSaveFeature; FEATURE *pFeature; UDWORD count, i, statInc; FEATURE_STATS *psStats = NULL; - BOOL found; + bool found; UDWORD sizeOfSaveFeature; if (version < VERSION_14) @@ -7199,13 +7199,13 @@ BOOL loadSaveFeatureV14(char *pFileData, UDWORD filesize, UDWORD numFeatures, UD // ----------------------------------------------------------------------------------------- /* code for all post version 7 save features */ -BOOL loadSaveFeatureV(char *pFileData, UDWORD filesize, UDWORD numFeatures, UDWORD version) +bool loadSaveFeatureV(char *pFileData, UDWORD filesize, UDWORD numFeatures, UDWORD version) { SAVE_FEATURE *psSaveFeature; FEATURE *pFeature; UDWORD count, i, statInc; FEATURE_STATS *psStats = NULL; - BOOL found; + bool found; UDWORD sizeOfSaveFeature; sizeOfSaveFeature = sizeof(SAVE_FEATURE); @@ -7288,14 +7288,14 @@ BOOL loadSaveFeatureV(char *pFileData, UDWORD filesize, UDWORD numFeatures, UDWO /* Writes the linked list of features to a file */ -BOOL writeFeatureFile(char *pFileName) +bool writeFeatureFile(char *pFileName) { char *pFileData = NULL; UDWORD fileSize, i, totalFeatures=0; FEATURE *psCurr; FEATURE_SAVEHEADER *psHeader; SAVE_FEATURE *psSaveFeature; - BOOL status = true; + bool status = true; //total all the features in the world for (psCurr = apsFeatureLists[0]; psCurr != NULL; psCurr = psCurr->psNext) @@ -7374,7 +7374,7 @@ BOOL writeFeatureFile(char *pFileName) // ----------------------------------------------------------------------------------------- -BOOL loadSaveTemplate(char *pFileData, UDWORD filesize) +bool loadSaveTemplate(char *pFileData, UDWORD filesize) { TEMPLATE_SAVEHEADER *psHeader; @@ -7435,13 +7435,13 @@ BOOL loadSaveTemplate(char *pFileData, UDWORD filesize) // ----------------------------------------------------------------------------------------- /* code specific to version 7 of a save template */ -BOOL loadSaveTemplateV7(char *pFileData, UDWORD filesize, UDWORD numTemplates) +bool loadSaveTemplateV7(char *pFileData, UDWORD filesize, UDWORD numTemplates) { SAVE_TEMPLATE_V2 *psSaveTemplate, sSaveTemplate; DROID_TEMPLATE *psTemplate; UDWORD count, i; SDWORD compInc; - BOOL found; + bool found; psSaveTemplate = &sSaveTemplate; @@ -7561,13 +7561,13 @@ error: // ----------------------------------------------------------------------------------------- /* none specific version of a save template */ -BOOL loadSaveTemplateV14(char *pFileData, UDWORD filesize, UDWORD numTemplates) +bool loadSaveTemplateV14(char *pFileData, UDWORD filesize, UDWORD numTemplates) { SAVE_TEMPLATE_V14 *psSaveTemplate, sSaveTemplate; DROID_TEMPLATE *psTemplate, *psDestTemplate; UDWORD count, i; SDWORD compInc; - BOOL found; + bool found; psSaveTemplate = &sSaveTemplate; @@ -7715,13 +7715,13 @@ error: // ----------------------------------------------------------------------------------------- /* none specific version of a save template */ -BOOL loadSaveTemplateV(char *pFileData, UDWORD filesize, UDWORD numTemplates) +bool loadSaveTemplateV(char *pFileData, UDWORD filesize, UDWORD numTemplates) { SAVE_TEMPLATE *psSaveTemplate, sSaveTemplate; DROID_TEMPLATE *psTemplate, *psDestTemplate; UDWORD count, i; SDWORD compInc; - BOOL found; + bool found; psSaveTemplate = &sSaveTemplate; @@ -7890,7 +7890,7 @@ error: /* Writes the linked list of templates for each player to a file */ -BOOL writeTemplateFile(char *pFileName) +bool writeTemplateFile(char *pFileName) { char *pFileData = NULL; UDWORD fileSize, player, totalTemplates=0; @@ -7898,7 +7898,7 @@ BOOL writeTemplateFile(char *pFileName) TEMPLATE_SAVEHEADER *psHeader; SAVE_TEMPLATE *psSaveTemplate; UDWORD i; - BOOL status = true; + bool status = true; //total all the droids in the world for (player = 0; player < MAX_PLAYERS; player++) @@ -7993,7 +7993,7 @@ BOOL writeTemplateFile(char *pFileName) // ----------------------------------------------------------------------------------------- // load up a terrain tile type map file -BOOL loadTerrainTypeMap(const char *pFileData, UDWORD filesize) +bool loadTerrainTypeMap(const char *pFileData, UDWORD filesize) { TILETYPE_SAVEHEADER *psHeader; UDWORD i; @@ -8049,7 +8049,7 @@ BOOL loadTerrainTypeMap(const char *pFileData, UDWORD filesize) // ----------------------------------------------------------------------------------------- // Write out the terrain type map -static BOOL writeTerrainTypeMapFile(char *pFileName) +static bool writeTerrainTypeMapFile(char *pFileName) { TILETYPE_SAVEHEADER *psHeader; char *pFileData; @@ -8098,7 +8098,7 @@ static BOOL writeTerrainTypeMapFile(char *pFileName) // ----------------------------------------------------------------------------------------- // load up component list file -BOOL loadSaveCompList(char *pFileData, UDWORD filesize) +bool loadSaveCompList(char *pFileData, UDWORD filesize) { COMPLIST_SAVEHEADER *psHeader; @@ -8152,7 +8152,7 @@ BOOL loadSaveCompList(char *pFileData, UDWORD filesize) } // ----------------------------------------------------------------------------------------- -BOOL loadSaveCompListV9(char *pFileData, UDWORD filesize, UDWORD numRecords, UDWORD version) +bool loadSaveCompListV9(char *pFileData, UDWORD filesize, UDWORD numRecords, UDWORD version) { SAVE_COMPLIST_V6 *psSaveCompList; UDWORD i; @@ -8219,7 +8219,7 @@ BOOL loadSaveCompListV9(char *pFileData, UDWORD filesize, UDWORD numRecords, UDW } // ----------------------------------------------------------------------------------------- -BOOL loadSaveCompListV(char *pFileData, UDWORD filesize, UDWORD numRecords, UDWORD version) +bool loadSaveCompListV(char *pFileData, UDWORD filesize, UDWORD numRecords, UDWORD version) { SAVE_COMPLIST *psSaveCompList; UDWORD i; @@ -8272,7 +8272,7 @@ BOOL loadSaveCompListV(char *pFileData, UDWORD filesize, UDWORD numRecords, UDWO // ----------------------------------------------------------------------------------------- // Write out the current state of the Comp lists per player -static BOOL writeCompListFile(char *pFileName) +static bool writeCompListFile(char *pFileName) { COMPLIST_SAVEHEADER *psHeader; char *pFileData; @@ -8412,7 +8412,7 @@ static BOOL writeCompListFile(char *pFileName) // ----------------------------------------------------------------------------------------- // load up structure type list file -BOOL loadSaveStructTypeList(char *pFileData, UDWORD filesize) +bool loadSaveStructTypeList(char *pFileData, UDWORD filesize) { STRUCTLIST_SAVEHEADER *psHeader; @@ -8466,12 +8466,12 @@ BOOL loadSaveStructTypeList(char *pFileData, UDWORD filesize) } // ----------------------------------------------------------------------------------------- -BOOL loadSaveStructTypeListV7(char *pFileData, UDWORD filesize, UDWORD numRecords) +bool loadSaveStructTypeListV7(char *pFileData, UDWORD filesize, UDWORD numRecords) { SAVE_STRUCTLIST_V6 *psSaveStructList; UDWORD i, statInc; STRUCTURE_STATS *psStats; - BOOL found; + bool found; if ((sizeof(SAVE_STRUCTLIST_V6) * numRecords + STRUCTLIST_HEADER_SIZE) > filesize) @@ -8525,12 +8525,12 @@ BOOL loadSaveStructTypeListV7(char *pFileData, UDWORD filesize, UDWORD numRecord } // ----------------------------------------------------------------------------------------- -BOOL loadSaveStructTypeListV(char *pFileData, UDWORD filesize, UDWORD numRecords) +bool loadSaveStructTypeListV(char *pFileData, UDWORD filesize, UDWORD numRecords) { SAVE_STRUCTLIST *psSaveStructList; UDWORD i, statInc; STRUCTURE_STATS *psStats; - BOOL found; + bool found; if ((sizeof(SAVE_STRUCTLIST) * numRecords + STRUCTLIST_HEADER_SIZE) > filesize) @@ -8585,7 +8585,7 @@ BOOL loadSaveStructTypeListV(char *pFileData, UDWORD filesize, UDWORD numRecords // ----------------------------------------------------------------------------------------- // Write out the current state of the Struct Type List per player -static BOOL writeStructTypeListFile(char *pFileName) +static bool writeStructTypeListFile(char *pFileName) { STRUCTLIST_SAVEHEADER *psHeader; SAVE_STRUCTLIST *psSaveStructList; @@ -8647,7 +8647,7 @@ static BOOL writeStructTypeListFile(char *pFileName) // ----------------------------------------------------------------------------------------- // load up saved research file -BOOL loadSaveResearch(char *pFileData, UDWORD filesize) +bool loadSaveResearch(char *pFileData, UDWORD filesize) { RESEARCH_SAVEHEADER *psHeader; @@ -8701,12 +8701,12 @@ BOOL loadSaveResearch(char *pFileData, UDWORD filesize) } // ----------------------------------------------------------------------------------------- -BOOL loadSaveResearchV8(char *pFileData, UDWORD filesize, UDWORD numRecords) +bool loadSaveResearchV8(char *pFileData, UDWORD filesize, UDWORD numRecords) { SAVE_RESEARCH_V8 *psSaveResearch; UDWORD i, statInc; RESEARCH *psStats; - BOOL found; + bool found; UBYTE playerInc; if ((sizeof(SAVE_RESEARCH_V8) * numRecords + RESEARCH_HEADER_SIZE) > @@ -8774,12 +8774,12 @@ BOOL loadSaveResearchV8(char *pFileData, UDWORD filesize, UDWORD numRecords) } // ----------------------------------------------------------------------------------------- -BOOL loadSaveResearchV(char *pFileData, UDWORD filesize, UDWORD numRecords) +bool loadSaveResearchV(char *pFileData, UDWORD filesize, UDWORD numRecords) { SAVE_RESEARCH *psSaveResearch; UDWORD i, statInc; RESEARCH *psStats; - BOOL found; + bool found; UBYTE playerInc; if ((sizeof(SAVE_RESEARCH) * numRecords + RESEARCH_HEADER_SIZE) > @@ -8852,7 +8852,7 @@ BOOL loadSaveResearchV(char *pFileData, UDWORD filesize, UDWORD numRecords) // ----------------------------------------------------------------------------------------- // Write out the current state of the Research per player -static BOOL writeResearchFile(char *pFileName) +static bool writeResearchFile(char *pFileName) { RESEARCH_SAVEHEADER *psHeader; SAVE_RESEARCH *psSaveResearch; @@ -8919,7 +8919,7 @@ static BOOL writeResearchFile(char *pFileName) // ----------------------------------------------------------------------------------------- // load up saved message file -BOOL loadSaveMessage(char *pFileData, UDWORD filesize, SWORD levelType) +bool loadSaveMessage(char *pFileData, UDWORD filesize, SWORD levelType) { MESSAGE_SAVEHEADER *psHeader; @@ -8956,7 +8956,7 @@ BOOL loadSaveMessage(char *pFileData, UDWORD filesize, SWORD levelType) return true; } -BOOL loadSaveMessage36(char *pFileData, UDWORD filesize, UDWORD numMessages, UDWORD version, SWORD levelType) +bool loadSaveMessage36(char *pFileData, UDWORD filesize, UDWORD numMessages, UDWORD version, SWORD levelType) { SAVE_MESSAGE_36 *psSaveMessage; MESSAGE *psMessage; @@ -9109,7 +9109,7 @@ BOOL loadSaveMessage36(char *pFileData, UDWORD filesize, UDWORD numMessages, UDW // ----------------------------------------------------------------------------------------- // Write out the current messages per player -static BOOL writeMessageFile(char *pFileName) +static bool writeMessageFile(char *pFileName) { MESSAGE_SAVEHEADER *psHeader; SAVE_MESSAGE_36 *psSaveMessage; @@ -9239,7 +9239,7 @@ static BOOL writeMessageFile(char *pFileName) // ----------------------------------------------------------------------------------------- // load up saved flag file -BOOL loadSaveFlag(char *pFileData, UDWORD filesize) +bool loadSaveFlag(char *pFileData, UDWORD filesize) { FLAG_SAVEHEADER *psHeader; @@ -9269,7 +9269,7 @@ BOOL loadSaveFlag(char *pFileData, UDWORD filesize) } // ----------------------------------------------------------------------------------------- -BOOL loadSaveFlagV(char *pFileData, UDWORD filesize, UDWORD numflags, UDWORD version) +bool loadSaveFlagV(char *pFileData, UDWORD filesize, UDWORD numflags, UDWORD version) { SAVE_FLAG *psSaveflag; FLAG_POSITION *psflag; @@ -9410,7 +9410,7 @@ BOOL loadSaveFlagV(char *pFileData, UDWORD filesize, UDWORD numflags, UDWORD ver // ----------------------------------------------------------------------------------------- // Write out the current flags per player -static BOOL writeFlagFile(char *pFileName) +static bool writeFlagFile(char *pFileName) { FLAG_SAVEHEADER *psHeader; SAVE_FLAG *psSaveflag; @@ -9595,7 +9595,7 @@ static BOOL writeFlagFile(char *pFileName) } // ----------------------------------------------------------------------------------------- -BOOL loadSaveProduction(char *pFileData, UDWORD filesize) +bool loadSaveProduction(char *pFileData, UDWORD filesize) { PRODUCTION_SAVEHEADER *psHeader; @@ -9624,7 +9624,7 @@ BOOL loadSaveProduction(char *pFileData, UDWORD filesize) } // ----------------------------------------------------------------------------------------- -BOOL loadSaveProductionV(char *pFileData, UDWORD filesize, UDWORD version) +bool loadSaveProductionV(char *pFileData, UDWORD filesize, UDWORD version) { SAVE_PRODUCTION *psSaveProduction; UDWORD factoryType,factoryNum,runNum; @@ -9672,7 +9672,7 @@ BOOL loadSaveProductionV(char *pFileData, UDWORD filesize, UDWORD version) // ----------------------------------------------------------------------------------------- // Write out the current production figures for factories -static BOOL writeProductionFile(char *pFileName) +static bool writeProductionFile(char *pFileName) { PRODUCTION_SAVEHEADER *psHeader; SAVE_PRODUCTION *psSaveProduction; @@ -9734,7 +9734,7 @@ static BOOL writeProductionFile(char *pFileName) } // ----------------------------------------------------------------------------------------- -BOOL loadSaveStructLimits(char *pFileData, UDWORD filesize) +bool loadSaveStructLimits(char *pFileData, UDWORD filesize) { STRUCTLIMITS_SAVEHEADER *psHeader; @@ -9774,11 +9774,11 @@ BOOL loadSaveStructLimits(char *pFileData, UDWORD filesize) } // ----------------------------------------------------------------------------------------- -BOOL loadSaveStructLimitsV(char *pFileData, UDWORD filesize, UDWORD numLimits) +bool loadSaveStructLimitsV(char *pFileData, UDWORD filesize, UDWORD numLimits) { SAVE_STRUCTLIMITS *psSaveLimits; UDWORD count, statInc; - BOOL found; + bool found; STRUCTURE_STATS *psStats; int SkippedRecords=0; @@ -9849,14 +9849,14 @@ BOOL loadSaveStructLimitsV(char *pFileData, UDWORD filesize, UDWORD numLimits) /* Writes the list of structure limits to a file */ -BOOL writeStructLimitsFile(char *pFileName) +bool writeStructLimitsFile(char *pFileName) { char *pFileData = NULL; UDWORD fileSize, totalLimits=0, i, player; STRUCTLIMITS_SAVEHEADER *psHeader; SAVE_STRUCTLIMITS *psSaveLimit; STRUCTURE_STATS *psStructStats; - BOOL status = true; + bool status = true; totalLimits = numStructureStats * MAX_PLAYERS; @@ -9913,7 +9913,7 @@ static const char FireSupport_file_identifier[] = "FIRESUPPORT"; /*! * Load the current fire-support designated commanders (the one who has fire-support enabled) */ -BOOL readFiresupportDesignators(char *pFileName) +bool readFiresupportDesignators(char *pFileName) { unsigned int numPlayers, player; char formatIdentifier[12] = ""; @@ -9953,7 +9953,7 @@ BOOL readFiresupportDesignators(char *pFileName) /*! * Save the current fire-support designated commanders (the one who has fire-support enabled) */ -BOOL writeFiresupportDesignators(char *pFileName) +bool writeFiresupportDesignators(char *pFileName) { unsigned int player; @@ -9989,7 +9989,7 @@ BOOL writeFiresupportDesignators(char *pFileName) // ----------------------------------------------------------------------------------------- // write the event state to a file on disk -static BOOL writeScriptState(char *pFileName) +static bool writeScriptState(char *pFileName) { static const int32_t current_event_version = 4; @@ -10011,7 +10011,7 @@ static BOOL writeScriptState(char *pFileName) // ----------------------------------------------------------------------------------------- // load the script state given a .gam name -BOOL loadScriptState(char *pFileName) +bool loadScriptState(char *pFileName) { char *pFileData; UDWORD fileSize; @@ -10074,7 +10074,7 @@ static void setMapScroll(void) // ----------------------------------------------------------------------------------------- -BOOL getSaveObjectName(char *pName) +bool getSaveObjectName(char *pName) { return true; } @@ -10089,7 +10089,7 @@ UDWORD getSaveGameType(void) // ----------------------------------------------------------------------------------------- //copies a Stat name into a destination string for a given stat type and index -static BOOL getNameFromComp(UDWORD compType, char *pDest, UDWORD compIndex) +static bool getNameFromComp(UDWORD compType, char *pDest, UDWORD compIndex) { BASE_STATS *psStats; @@ -10153,7 +10153,7 @@ static BOOL getNameFromComp(UDWORD compType, char *pDest, UDWORD compIndex) * present. Additionally we load the player's HQ location into playeridpos so * we know the player's starting location. */ -BOOL plotStructurePreview16(char *backDropSprite, Vector2i playeridpos[]) +bool plotStructurePreview16(char *backDropSprite, Vector2i playeridpos[]) { foundScavengerPlayerInMap = false; diff --git a/src/game.h b/src/game.h index 81c72e6c9..91e0eec81 100644 --- a/src/game.h +++ b/src/game.h @@ -112,27 +112,27 @@ struct VIS_SAVEHEADER */ /***************************************************************************/ -extern BOOL loadGame(const char *pGameToLoad, BOOL keepObjects, BOOL freeMem, BOOL UserSaveGame); // UserSaveGame is true when the save game is not a new level (User Save Game) +extern bool loadGame(const char *pGameToLoad, bool keepObjects, bool freeMem, bool UserSaveGame); // UserSaveGame is true when the save game is not a new level (User Save Game) /*This just loads up the .gam file to determine which level data to set up - split up so can be called in levLoadData when starting a game from a load save game*/ extern bool loadGameInit(const char* fileName); -extern BOOL loadMissionExtras(const char *pGameToLoad, SWORD levelType); +extern bool loadMissionExtras(const char *pGameToLoad, SWORD levelType); // load the script state given a .gam name -extern BOOL loadScriptState(char *pFileName); +extern bool loadScriptState(char *pFileName); /// Load the terrain types -extern BOOL loadTerrainTypeMap(const char *pFileData, UDWORD filesize); +extern bool loadTerrainTypeMap(const char *pFileData, UDWORD filesize); -extern BOOL saveGame(char *aFileName, GAME_TYPE saveType); +extern bool saveGame(char *aFileName, GAME_TYPE saveType); // Get the campaign number for loadGameInit game extern UDWORD getCampaign(const char* fileName); /*calls windows find file tree*/ -extern BOOL getSaveGameName(char *pName); +extern bool getSaveGameName(char *pName); /*set validty keys for save game debugging*/ extern void game_SetValidityKey(UDWORD keys); @@ -140,7 +140,7 @@ extern void game_SetValidityKey(UDWORD keys); /*returns the current type of save game being loaded*/ extern UDWORD getSaveGameType(void); -BOOL plotStructurePreview16(char *backDropSprite, Vector2i playeridpos[]); +bool plotStructurePreview16(char *backDropSprite, Vector2i playeridpos[]); extern bool foundScavengerPlayerInMap; #endif // __INCLUDED_SRC_GAME_H__ diff --git a/src/gateway.cpp b/src/gateway.cpp index 10c89842a..8b3580fbd 100644 --- a/src/gateway.cpp +++ b/src/gateway.cpp @@ -66,7 +66,7 @@ static void gwClearGatewayFlag(SDWORD x, SDWORD y) /* Gateway functions */ // Initialise the gateway system -BOOL gwInitialise(void) +bool gwInitialise(void) { ASSERT( psGateways == NULL, "gwInitialise: gateway list has not been reset" ); @@ -91,7 +91,7 @@ void gwShutDown(void) // Add a gateway to the system -BOOL gwNewGateway(SDWORD x1, SDWORD y1, SDWORD x2, SDWORD y2) +bool gwNewGateway(SDWORD x1, SDWORD y1, SDWORD x2, SDWORD y2) { GATEWAY *psNew; SDWORD pos, temp; diff --git a/src/gateway.h b/src/gateway.h index ee333ca15..c46a3aafe 100644 --- a/src/gateway.h +++ b/src/gateway.h @@ -31,13 +31,13 @@ struct GATEWAY }; /// Initialise the gateway system -BOOL gwInitialise(void); +bool gwInitialise(void); /// Shutdown the gateway system void gwShutDown(void); /// Add a gateway to the system -BOOL gwNewGateway(SDWORD x1, SDWORD y1, SDWORD x2, SDWORD y2); +bool gwNewGateway(SDWORD x1, SDWORD y1, SDWORD x2, SDWORD y2); /// Release a gateway void gwFreeGateway(GATEWAY *psDel); diff --git a/src/geometry.cpp b/src/geometry.cpp index d3a3f7547..8c3e800bb 100644 --- a/src/geometry.cpp +++ b/src/geometry.cpp @@ -47,7 +47,7 @@ uint16_t calcDirection(int32_t x0, int32_t y0, int32_t x1, int32_t y1) NB*****THIS WON'T PICK A VTOL DROID***** */ -DROID *getNearestDroid(UDWORD x, UDWORD y, BOOL bSelected) +DROID *getNearestDroid(UDWORD x, UDWORD y, bool bSelected) { DROID *psDroid,*psBestUnit; UDWORD bestSoFar; @@ -120,7 +120,7 @@ Vector2i positionInQuad(Vector2i const &pt, QUAD const &quad) } //----------------------------------------------------------------------------------- -BOOL droidOnScreen( DROID *psDroid, SDWORD tolerance ) +bool droidOnScreen( DROID *psDroid, SDWORD tolerance ) { SDWORD dX,dY; diff --git a/src/geometry.h b/src/geometry.h index 281f80499..770e5ea55 100644 --- a/src/geometry.h +++ b/src/geometry.h @@ -32,8 +32,8 @@ struct QUAD extern uint16_t calcDirection(int32_t x0, int32_t y0, int32_t x1, int32_t y1); bool inQuad(const Vector2i *pt, const QUAD *quad); Vector2i positionInQuad(Vector2i const &pt, QUAD const &quad); -extern DROID *getNearestDroid( UDWORD x, UDWORD y, BOOL bSelected ); -extern BOOL droidOnScreen( DROID *psDroid, SDWORD tolerance ); +extern DROID *getNearestDroid( UDWORD x, UDWORD y, bool bSelected ); +extern bool droidOnScreen( DROID *psDroid, SDWORD tolerance ); static inline STRUCTURE *getTileStructure(UDWORD x, UDWORD y) { diff --git a/src/hci.cpp b/src/hci.cpp index df97cfe92..e2960d403 100644 --- a/src/hci.cpp +++ b/src/hci.cpp @@ -102,8 +102,8 @@ enum { // Reticule button indecies. struct BUTSTATE { UDWORD id; - BOOL Enabled; - BOOL Hidden; + bool Enabled; + bool Hidden; }; struct BUTOFFSET @@ -144,17 +144,17 @@ static void SetReticuleButPos(UWORD ButId, W_BUTINIT *sButInit) } -static BOOL ClosingObject = false; -static BOOL ClosingStats = false; +static bool ClosingObject = false; +static bool ClosingStats = false; static UDWORD keyButtonMapping = 0; -BOOL ClosingMessageView = false; -BOOL ClosingIntelMap = false; -BOOL ClosingOrder = false; -BOOL ClosingTrans = false; -BOOL ClosingTransCont = false; -BOOL ClosingTransDroids = false; -BOOL ReticuleUp = false; -BOOL Refreshing = false; +bool ClosingMessageView = false; +bool ClosingIntelMap = false; +bool ClosingOrder = false; +bool ClosingTrans = false; +bool ClosingTransCont = false; +bool ClosingTransDroids = false; +bool ReticuleUp = false; +bool Refreshing = false; /***************************************************************************************/ @@ -314,11 +314,11 @@ enum _obj_mode } objMode; /* Function type for selecting a base object while building the object screen */ -typedef BOOL (* OBJ_SELECT)(BASE_OBJECT *psObj); +typedef bool (* OBJ_SELECT)(BASE_OBJECT *psObj); /* Function type for getting the appropriate stats for an object */ typedef BASE_STATS *(* OBJ_GETSTATS)(BASE_OBJECT *psObj); /* Function type for setting the appropriate stats for an object */ -typedef BOOL (* OBJ_SETSTATS)(BASE_OBJECT *psObj, BASE_STATS *psStats); +typedef bool (* OBJ_SETSTATS)(BASE_OBJECT *psObj, BASE_STATS *psStats); /* The current object list being used by the object screen */ static BASE_OBJECT *psObjList; @@ -329,7 +329,7 @@ OBJ_GETSTATS objGetStatsFunc; static OBJ_SETSTATS objSetStatsFunc; /* Whether the objects that are on the object screen have changed this frame */ -static BOOL objectsChanged; +static bool objectsChanged; /* The current stats list being used by the stats screen */ static BASE_STATS **ppsStatsList; @@ -385,8 +385,8 @@ std::vector apsObjectList; extern DROID_TEMPLATE sCurrDesign; /* Flags to check whether the power bars are currently on the screen */ -static BOOL powerBarUp = false; -static BOOL StatsUp = false; +static bool powerBarUp = false; +static bool StatsUp = false; static BASE_OBJECT *psStatsScreenOwner = NULL; /* The previous object for each object bar */ @@ -397,7 +397,7 @@ static std::vector asJumpPos; /***************************************************************************************/ /* Function Prototypes */ -static BOOL intUpdateObject(BASE_OBJECT *psObjects, BASE_OBJECT *psSelected,BOOL bForceStats); +static bool intUpdateObject(BASE_OBJECT *psObjects, BASE_OBJECT *psSelected,bool bForceStats); /* Remove the object widgets from the widget screen */ void intRemoveObject(void); static void intRemoveObjectNoAnim(void); @@ -412,7 +412,7 @@ static void intSetStats(UDWORD id, BASE_STATS *psStats); /* Add the stats widgets to the widget screen */ /* If psSelected != NULL it specifies which stat should be hilited */ -static BOOL intAddStats(BASE_STATS **ppsStatsList, UDWORD numStats, +static bool intAddStats(BASE_STATS **ppsStatsList, UDWORD numStats, BASE_STATS *psSelected, BASE_OBJECT *psOwner); /* Process return codes from the stats screen */ static void intProcessStats(UDWORD id); @@ -421,16 +421,16 @@ static void intObjectDied(UDWORD objID); /* Add the build widgets to the widget screen */ /* If psSelected != NULL it specifies which droid should be hilited */ -static BOOL intAddBuild(DROID *psSelected); +static bool intAddBuild(DROID *psSelected); /* Add the manufacture widgets to the widget screen */ /* If psSelected != NULL it specifies which factory should be hilited */ -static BOOL intAddManufacture(STRUCTURE *psSelected); +static bool intAddManufacture(STRUCTURE *psSelected); /* Add the research widgets to the widget screen */ /* If psSelected != NULL it specifies which droid should be hilited */ -static BOOL intAddResearch(STRUCTURE *psSelected); +static bool intAddResearch(STRUCTURE *psSelected); /* Add the command droid widgets to the widget screen */ /* If psSelected != NULL it specifies which droid should be hilited */ -static BOOL intAddCommand(DROID *psSelected); +static bool intAddCommand(DROID *psSelected); /* Start looking for a structure location */ @@ -445,7 +445,7 @@ static SWORD CurrentDroidType = 0; /******************Power Bar Stuff!**************/ /* Add the power bars */ -static BOOL intAddPower(void); +static bool intAddPower(void); /* Set the shadow for the PowerBar */ static void intRunPower(void); @@ -476,7 +476,7 @@ static SDWORD intNumSelectedDroids(UDWORD droidType); /***************************GAME CODE ****************************/ /* Initialise the in game interface */ -BOOL intInitialise(void) +bool intInitialise(void) { UDWORD comp, inc; @@ -667,7 +667,7 @@ void interfaceShutDown(void) ReticuleUp = false; } -static BOOL IntRefreshPending = false; +static bool IntRefreshPending = false; // Set widget refresh pending flag. // @@ -677,7 +677,7 @@ void intRefreshScreen(void) } -BOOL intIsRefreshing(void) +bool intIsRefreshing(void) { return Refreshing; } @@ -718,8 +718,8 @@ static void intDoScreenRefresh(void) (widgGetFromID(psWScreen,IDOBJ_FORM) != NULL) && !(widgGetFromID(psWScreen,IDOBJ_FORM)->style & WIDG_HIDDEN) ) { - BOOL StatsWasUp = false; - BOOL OrderWasUp = false; + bool StatsWasUp = false; + bool OrderWasUp = false; // If the stats form is up then remove it, but remember that it was up. if ((intMode == INT_STAT) && widgGetFromID(psWScreen,IDSTAT_FORM) != NULL) @@ -873,7 +873,7 @@ static void intRemoveOptions(void) #ifdef EDIT_OPTIONS /* Add the edit widgets to the widget screen */ -static BOOL intAddEdit(void) +static bool intAddEdit(void) { W_FORMINIT sFormInit; W_LABINIT sLabInit; @@ -936,7 +936,7 @@ static void intGetMapSize(void) SDWORD editWidth, editHeight; char aText[WIDG_MAXSTR]; UDWORD i, tmp, bitCount; - BOOL widthChanged = false, heightChanged = false; + bool widthChanged = false, heightChanged = false; const char *pStr = widgGetString(psWScreen, IDOPT_MAPWIDTH); if (isdigit(*pStr)) @@ -1034,7 +1034,7 @@ static void intGetMapSize(void) /* Reset the widget screen to just the reticule */ -void intResetScreen(BOOL NoAnim) +void intResetScreen(bool NoAnim) { // // Ensure driver mode is turned off. StopDriverMode(); @@ -1473,7 +1473,7 @@ INT_RETVAL intRunWidgets(void) UDWORD retID; INT_RETVAL retCode; - BOOL quitting = false; + bool quitting = false; UDWORD structX,structY, structX2,structY2; UWORD objMajor, objMinor; STRUCTURE *psStructure; @@ -1871,7 +1871,7 @@ INT_RETVAL intRunWidgets(void) if ((psObjSelected == NULL) || !psObjSelected->died) { - BOOL CanBuild = true; + bool CanBuild = true; // Send the droid off to build the structure assuming the droid // can get to the location chosen @@ -2323,7 +2323,7 @@ static void intProcessObject(UDWORD id) { BASE_OBJECT *psObj; STRUCTURE *psStruct; - BOOL IsDeliveryRepos = false; + bool IsDeliveryRepos = false; SDWORD butIndex; UDWORD statButID; @@ -2929,7 +2929,7 @@ static void intStopStructPosition(void) /* Display the widgets for the in game interface */ void intDisplayWidgets(void) { - BOOL bPlayerHasHQ; + bool bPlayerHasHQ; // God only knows... if (ReticuleUp && !bInTutorial) @@ -3084,19 +3084,19 @@ void intBuildStarted(DROID *psDroid) } /* Are we in build select mode*/ -BOOL intBuildSelectMode(void) +bool intBuildSelectMode(void) { return (objMode == IOBJ_BUILDSEL); } /* Are we in demolish select mode*/ -BOOL intDemolishSelectMode(void) +bool intDemolishSelectMode(void) { return (objMode == IOBJ_DEMOLISHSEL); } //is the build interface up? -BOOL intBuildMode(void) +bool intBuildMode(void) { return (objMode == IOBJ_BUILD); } @@ -3268,7 +3268,7 @@ UWORD numForms(UDWORD total, UDWORD perForm) /* Add the reticule widgets to the widget screen */ -BOOL intAddReticule(void) +bool intAddReticule(void) { if (!ReticuleUp) { @@ -3422,7 +3422,7 @@ void togglePowerBar(void) } /* Add the power bars to the screen */ -BOOL intAddPower(void) +bool intAddPower(void) { W_BARINIT sBarInit; @@ -3459,7 +3459,7 @@ void intSetShadowPower(UDWORD quantity) /* Add the options widgets to the widget screen */ -BOOL intAddOptions(void) +bool intAddOptions(void) { W_FORMINIT sFormInit; W_EDBINIT sEdInit; @@ -3762,7 +3762,7 @@ BOOL intAddOptions(void) * for the object. * If psSelected != NULL it specifies which object should be hilited. */ -static BOOL intAddObjectWindow(BASE_OBJECT *psObjects, BASE_OBJECT *psSelected,BOOL bForceStats) +static bool intAddObjectWindow(BASE_OBJECT *psObjects, BASE_OBJECT *psSelected,bool bForceStats) { UDWORD displayForm; UDWORD statID = 0; @@ -3771,8 +3771,8 @@ static BOOL intAddObjectWindow(BASE_OBJECT *psObjects, BASE_OBJECT *psSelected,B SDWORD BufferID; DROID *Droid; STRUCTURE *Structure; - BOOL IsFactory; - BOOL Animate = true; + bool IsFactory; + bool Animate = true; int compIndex; // Is the form already up? @@ -4409,7 +4409,7 @@ static BOOL intAddObjectWindow(BASE_OBJECT *psObjects, BASE_OBJECT *psSelected,B } -static BOOL intUpdateObject(BASE_OBJECT *psObjects, BASE_OBJECT *psSelected,BOOL bForceStats) +static bool intUpdateObject(BASE_OBJECT *psObjects, BASE_OBJECT *psSelected,bool bForceStats) { intAddObjectWindow(psObjects,psSelected,bForceStats); @@ -4781,13 +4781,13 @@ static void intSetStats(UDWORD id, BASE_STATS *psStats) /* Add the stats widgets to the widget screen */ /* If psSelected != NULL it specifies which stat should be hilited psOwner specifies which object is hilighted on the object bar for this stat*/ -static BOOL intAddStats(BASE_STATS **ppsStatsList, UDWORD numStats, +static bool intAddStats(BASE_STATS **ppsStatsList, UDWORD numStats, BASE_STATS *psSelected, BASE_OBJECT *psOwner) { UDWORD i, butPerForm, statForm; SDWORD BufferID; BASE_STATS *Stat; - BOOL Animate = true; + bool Animate = true; FACTORY *psFactory; // should this ever be called with psOwner == NULL? @@ -5260,7 +5260,7 @@ donelab: /* Select a command droid */ -static BOOL selectCommand(BASE_OBJECT *psObj) +static bool selectCommand(BASE_OBJECT *psObj) { DROID *psDroid; @@ -5291,13 +5291,13 @@ static BASE_STATS *getCommandStats(WZ_DECL_UNUSED BASE_OBJECT *psObj) } /* Set the stats for a command droid */ -static BOOL setCommandStats(WZ_DECL_UNUSED BASE_OBJECT *psObj, WZ_DECL_UNUSED BASE_STATS *psStats) +static bool setCommandStats(WZ_DECL_UNUSED BASE_OBJECT *psObj, WZ_DECL_UNUSED BASE_STATS *psStats) { return true; } /* Select a construction droid */ -static BOOL selectConstruction(BASE_OBJECT *psObj) +static bool selectConstruction(BASE_OBJECT *psObj) { DROID *psDroid; @@ -5355,7 +5355,7 @@ static BASE_STATS *getConstructionStats(BASE_OBJECT *psObj) } /* Set the stats for a construction droid */ -static BOOL setConstructionStats(BASE_OBJECT *psObj, BASE_STATS *psStats) +static bool setConstructionStats(BASE_OBJECT *psObj, BASE_STATS *psStats) { DROID *psDroid = castDroid(psObj); ASSERT(psDroid != NULL, "invalid droid pointer"); @@ -5386,7 +5386,7 @@ static BOOL setConstructionStats(BASE_OBJECT *psObj, BASE_STATS *psStats) } /* Select a research facility */ -static BOOL selectResearch(BASE_OBJECT *psObj) +static bool selectResearch(BASE_OBJECT *psObj) { STRUCTURE *psResFacility; @@ -5425,7 +5425,7 @@ static BASE_STATS *getResearchStats(BASE_OBJECT *psObj) } /* Set the stats for a research facility */ -static BOOL setResearchStats(BASE_OBJECT *psObj, BASE_STATS *psStats) +static bool setResearchStats(BASE_OBJECT *psObj, BASE_STATS *psStats) { STRUCTURE *psBuilding; RESEARCH * pResearch = (RESEARCH *)psStats; @@ -5498,7 +5498,7 @@ static BOOL setResearchStats(BASE_OBJECT *psObj, BASE_STATS *psStats) } /* Select a Factory */ -static BOOL selectManufacture(BASE_OBJECT *psObj) +static bool selectManufacture(BASE_OBJECT *psObj) { STRUCTURE *psBuilding; @@ -5533,7 +5533,7 @@ static BASE_STATS *getManufactureStats(BASE_OBJECT *psObj) /* Set the stats for a Factory */ -static BOOL setManufactureStats(BASE_OBJECT *psObj, BASE_STATS *psStats) +static bool setManufactureStats(BASE_OBJECT *psObj, BASE_STATS *psStats) { STRUCTURE *Structure; @@ -5562,7 +5562,7 @@ static BOOL setManufactureStats(BASE_OBJECT *psObj, BASE_STATS *psStats) /* Add the build widgets to the widget screen */ /* If psSelected != NULL it specifies which droid should be hilited */ -static BOOL intAddBuild(DROID *psSelected) +static bool intAddBuild(DROID *psSelected) { /* Store the correct stats list for future reference */ ppsStatsList = (BASE_STATS **)apsStructStatsList; @@ -5583,7 +5583,7 @@ static BOOL intAddBuild(DROID *psSelected) /* Add the manufacture widgets to the widget screen */ /* If psSelected != NULL it specifies which factory should be hilited */ -static BOOL intAddManufacture(STRUCTURE *psSelected) +static bool intAddManufacture(STRUCTURE *psSelected) { /* Store the correct stats list for future reference */ ppsStatsList = (BASE_STATS**)&apsTemplateList[0]; // FIXME Ugly cast, and is undefined behaviour (strict-aliasing violation) in C/C++. @@ -5603,7 +5603,7 @@ static BOOL intAddManufacture(STRUCTURE *psSelected) /* Add the research widgets to the widget screen */ /* If psSelected != NULL it specifies which droid should be hilited */ -static BOOL intAddResearch(STRUCTURE *psSelected) +static bool intAddResearch(STRUCTURE *psSelected) { ppsStatsList = (BASE_STATS **)ppResearchList; @@ -5622,7 +5622,7 @@ static BOOL intAddResearch(STRUCTURE *psSelected) /* Add the command droid widgets to the widget screen */ /* If psSelected != NULL it specifies which droid should be hilited */ -static BOOL intAddCommand(DROID *psSelected) +static bool intAddCommand(DROID *psSelected) { ppsStatsList = NULL;//(BASE_STATS **)ppResearchList; @@ -5774,7 +5774,7 @@ static void intObjStatRMBPressed(UDWORD id) //sets up the Intelligence Screen as far as the interface is concerned void addIntelScreen(void) { - BOOL radOnScreen; + bool radOnScreen; if(driveModeActive() && !driveInterfaceEnabled()) { driveDisableControl(); @@ -5813,7 +5813,7 @@ void addIntelScreen(void) } //sets up the Transporter Screen as far as the interface is concerned -void addTransporterInterface(DROID *psSelected, BOOL onMission) +void addTransporterInterface(DROID *psSelected, bool onMission) { // if psSelected = NULL add interface but if psSelected != NULL make sure its not flying if (!psSelected || (psSelected && !transporterFlying(psSelected))) @@ -5891,7 +5891,7 @@ void forceHidePowerBar(void) /* Add the Proximity message buttons */ -BOOL intAddProximityButton(PROXIMITY_DISPLAY *psProxDisp, UDWORD inc) +bool intAddProximityButton(PROXIMITY_DISPLAY *psProxDisp, UDWORD inc) { PROXIMITY_DISPLAY *psProxDisp2; UDWORD cnt; @@ -6166,7 +6166,7 @@ void intCheckResearchButton(void) { UWORD index, count; STRUCTURE *psStruct; - BOOL resFree = false; + bool resFree = false; for (psStruct = interfaceStructList(); psStruct != NULL; psStruct = psStruct->psNext) @@ -6197,7 +6197,7 @@ void intCheckResearchButton(void) // see if a reticule button is enabled -BOOL intCheckReticuleButEnabled(UDWORD id) +bool intCheckReticuleButEnabled(UDWORD id) { SDWORD i; @@ -6235,10 +6235,10 @@ STRUCTURE *intFindAStructure(void) // Look through the players structures and find the next one of type structType. // -STRUCTURE* intGotoNextStructureType(UDWORD structType,BOOL JumpTo,BOOL CancelDrive) +STRUCTURE* intGotoNextStructureType(UDWORD structType,bool JumpTo,bool CancelDrive) { STRUCTURE *psStruct; - BOOL Found = false; + bool Found = false; if((SWORD)structType != CurrentStructType) { CurrentStruct = NULL; @@ -6303,10 +6303,10 @@ STRUCTURE* intGotoNextStructureType(UDWORD structType,BOOL JumpTo,BOOL CancelDri // Look through the players droids and find the next one of type droidType. // If Current=NULL then start at the beginning overwise start at Current. // -DROID *intGotoNextDroidType(DROID *CurrDroid,UDWORD droidType,BOOL AllowGroup) +DROID *intGotoNextDroidType(DROID *CurrDroid,UDWORD droidType,bool AllowGroup) { DROID *psDroid; - BOOL Found = false; + bool Found = false; if(CurrDroid != NULL) { CurrentDroid = CurrDroid; @@ -6382,7 +6382,7 @@ BASE_OBJECT * getCurrentSelected(void) } // Checks if a coordinate is over the build menu -BOOL CoordInBuild(int x, int y) +bool CoordInBuild(int x, int y) { // This measurement is valid for the menu, so the buildmenu_height // value is used to "nudge" it all upwards from the command menu. diff --git a/src/hci.h b/src/hci.h index 667df5c8b..f51ee0d96 100644 --- a/src/hci.h +++ b/src/hci.h @@ -277,18 +277,18 @@ as big as Pie View in Research Msg now*/ /* pointer to hold the imd to use for a new template in the design screen */ extern iIMDShape *pNewDesignIMD; -extern BOOL ClosingMessageView; -extern BOOL ClosingIntelMap; -extern BOOL ClosingTrans; -extern BOOL ClosingTransCont; -extern BOOL ClosingTransDroids; -extern BOOL ClosingOrder; +extern bool ClosingMessageView; +extern bool ClosingIntelMap; +extern bool ClosingTrans; +extern bool ClosingTransCont; +extern bool ClosingTransDroids; +extern bool ClosingOrder; /* Initialise the in game interface */ -extern BOOL intInitialise(void); +extern bool intInitialise(void); // Check of coordinate is in the build menu -extern BOOL CoordInBuild(int x, int y); +extern bool CoordInBuild(int x, int y); /* Shut down the in game interface */ extern void interfaceShutDown(void); @@ -314,7 +314,7 @@ extern INT_RETVAL intRunWidgets(void); extern void intDisplayWidgets(void); /* Add the reticule widgets to the widget screen */ -extern BOOL intAddReticule(void); +extern bool intAddReticule(void); extern void intRemoveReticule(void); /* Set the map view point to the world coordinates x,y */ @@ -344,9 +344,9 @@ extern void intObjectSelected(BASE_OBJECT *psObj); // add the construction interface if a constructor droid is selected extern void intConstructorSelected(DROID *psDroid); -extern BOOL intBuildSelectMode(void); -extern BOOL intDemolishSelectMode(void); -extern BOOL intBuildMode(void); +extern bool intBuildSelectMode(void); +extern bool intDemolishSelectMode(void); +extern bool intBuildMode(void); // add the construction interface if a constructor droid is selected void intCommanderSelected(DROID *psDroid); @@ -354,20 +354,20 @@ void intCommanderSelected(DROID *psDroid); extern UWORD numForms(UDWORD total, UDWORD perForm); //sets up the Intelligence Screen as far as the interface is concerned -//extern void addIntelScreen(BOOL playImmediate); +//extern void addIntelScreen(bool playImmediate); extern void addIntelScreen(void); // update shadow... extern void intSetShadowPower(UDWORD quantity); /* Reset the widget screen to just the reticule */ -extern void intResetScreen(BOOL NoAnim); +extern void intResetScreen(bool NoAnim); /* Refresh icons on the interface, without disturbing the layout. i.e. smartreset*/ extern void intRefreshScreen(void); /* Add the options widgets to the widget screen */ -extern BOOL intAddOptions(void); +extern bool intAddOptions(void); /* Remove the stats widgets from the widget screen */ extern void intRemoveStats(void); @@ -379,7 +379,7 @@ extern void intRemoveStatsNoAnim(void); extern STRUCTURE* interfaceStructList(void); //sets up the Transporter Screen as far as the interface is concerned -extern void addTransporterInterface(DROID *psSelected, BOOL onMission); +extern void addTransporterInterface(DROID *psSelected, bool onMission); /*causes a reticule button to start flashing*/ extern void flashReticuleButton(UDWORD buttonID); @@ -400,7 +400,7 @@ extern void intShowPowerBar(void); extern void forceHidePowerBar(void); /* Add the Proximity message buttons */ -extern BOOL intAddProximityButton(PROXIMITY_DISPLAY *psProxDisp, UDWORD inc); +extern bool intAddProximityButton(PROXIMITY_DISPLAY *psProxDisp, UDWORD inc); /*Remove a Proximity Button - when the message is deleted*/ extern void intRemoveProximityButton(PROXIMITY_DISPLAY *psProxDisp); @@ -411,14 +411,14 @@ void setKeyButtonMapping( UDWORD val ); STRUCTURE *intFindAStructure(void); -STRUCTURE* intGotoNextStructureType(UDWORD structType,BOOL JumpTo,BOOL CancelDrive); -DROID *intGotoNextDroidType(DROID *CurrDroid,UDWORD droidType,BOOL AllowGroup); +STRUCTURE* intGotoNextStructureType(UDWORD structType,bool JumpTo,bool CancelDrive); +DROID *intGotoNextDroidType(DROID *CurrDroid,UDWORD droidType,bool AllowGroup); /*Checks to see if there are any research topics to do and flashes the button*/ extern void intCheckResearchButton(void); // see if a reticule button is enabled -extern BOOL intCheckReticuleButEnabled(UDWORD id); +extern bool intCheckReticuleButEnabled(UDWORD id); //access function for selected object in the interface extern BASE_OBJECT * getCurrentSelected(void); @@ -428,7 +428,7 @@ extern void intResetPreviousObj(void); extern void HandleClosingWindows(void); -extern BOOL intIsRefreshing(void); +extern bool intIsRefreshing(void); extern void intDemolishCancel(void); diff --git a/src/ingameop.cpp b/src/ingameop.cpp index 801b74096..5f288070d 100644 --- a/src/ingameop.cpp +++ b/src/ingameop.cpp @@ -52,15 +52,15 @@ #include "warzoneconfig.h" //status bools.(for hci.h) -BOOL ClosingInGameOp = false; -BOOL InGameOpUp = false; +bool ClosingInGameOp = false; +bool InGameOpUp = false; bool isInGamePopupUp = false; // //////////////////////////////////////////////////////////////////////////// // functions // //////////////////////////////////////////////////////////////////////////// -static BOOL addIGTextButton(UDWORD id, UWORD y, UWORD width, const char *string, UDWORD Style) +static bool addIGTextButton(UDWORD id, UWORD y, UWORD width, const char *string, UDWORD Style) { W_BUTINIT sButInit; @@ -82,7 +82,7 @@ static BOOL addIGTextButton(UDWORD id, UWORD y, UWORD width, const char *string, return true; } -static BOOL addQuitOptions(void) +static bool addQuitOptions(void) { if (widgGetFromID(psWScreen,INTINGAMEOP)) { @@ -140,7 +140,7 @@ static BOOL addQuitOptions(void) } -static BOOL addSlideOptions(void) +static bool addSlideOptions(void) { if (widgGetFromID(psWScreen,INTINGAMEOP)) { @@ -200,7 +200,7 @@ static BOOL addSlideOptions(void) // //////////////////////////////////////////////////////////////////////////// -static BOOL _intAddInGameOptions(void) +static bool _intAddInGameOptions(void) { audio_StopAll(); @@ -284,7 +284,7 @@ static BOOL _intAddInGameOptions(void) } -BOOL intAddInGameOptions(void) +bool intAddInGameOptions(void) { sliderEnableDrag(true); return _intAddInGameOptions(); @@ -373,7 +373,7 @@ static void ProcessOptionFinished(void) } -void intCloseInGameOptionsNoAnim(BOOL bResetMissionWidgets) +void intCloseInGameOptionsNoAnim(bool bResetMissionWidgets) { if (NetPlay.isHost) { @@ -394,7 +394,7 @@ void intCloseInGameOptionsNoAnim(BOOL bResetMissionWidgets) // //////////////////////////////////////////////////////////////////////////// -BOOL intCloseInGameOptions(BOOL bPutUpLoadSave, BOOL bResetMissionWidgets) +bool intCloseInGameOptions(bool bPutUpLoadSave, bool bResetMissionWidgets) { W_TABFORM *Form; diff --git a/src/ingameop.h b/src/ingameop.h index 5a61fb33e..0be5b29d2 100644 --- a/src/ingameop.h +++ b/src/ingameop.h @@ -25,16 +25,16 @@ #define __INCLUDED_SRC_INGAMEOP_H__ // functions -extern BOOL intAddInGameOptions (void); -extern BOOL intCloseInGameOptions (BOOL bPutUpLoadSave, BOOL bResetMissionWidgets); -extern void intCloseInGameOptionsNoAnim (BOOL bResetMissionWidgets); -extern BOOL intRunInGameOptions (void); +extern bool intAddInGameOptions (void); +extern bool intCloseInGameOptions (bool bPutUpLoadSave, bool bResetMissionWidgets); +extern void intCloseInGameOptionsNoAnim (bool bResetMissionWidgets); +extern bool intRunInGameOptions (void); extern void intProcessInGameOptions (UDWORD); extern void intAddInGamePopup(void); // status bools. -extern BOOL ClosingInGameOp; -extern BOOL InGameOpUp; +extern bool ClosingInGameOp; +extern bool InGameOpUp; extern bool isInGamePopupUp; // //////////////////////////////////////////////////////////////////////////// // defines diff --git a/src/init.cpp b/src/init.cpp index 307453f29..b666cb6c0 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -103,7 +103,7 @@ char fileLoadBuffer[FILE_LOAD_BUFFER_SIZE]; IMAGEFILE *FrontImages; -BOOL DirectControl = false; +bool DirectControl = false; static wzSearchPath * searchPathRegistry = NULL; @@ -112,7 +112,7 @@ static wzSearchPath * searchPathRegistry = NULL; // any globals and statics to there default values each time the game // or frontend restarts. // -static BOOL InitialiseGlobals(void) +static bool InitialiseGlobals(void) { frontendInitVars(); // Initialise frontend globals and statics. statsInitVars(); @@ -135,7 +135,7 @@ static BOOL InitialiseGlobals(void) } -static BOOL loadLevFile(const char* filename, searchPathMode datadir, bool ignoreWrf) +static bool loadLevFile(const char* filename, searchPathMode datadir, bool ignoreWrf) { char *pBuffer; UDWORD size; @@ -228,7 +228,7 @@ void registerSearchPath( const char path[], unsigned int priority ) * Priority: * maps > mods > base > base.wz */ -BOOL rebuildSearchPath( searchPathMode mode, BOOL force ) +bool rebuildSearchPath( searchPathMode mode, bool force ) { static searchPathMode current_mode = mod_clean; wzSearchPath * curSearchPath = searchPathRegistry; @@ -411,7 +411,7 @@ BOOL rebuildSearchPath( searchPathMode mode, BOOL force ) } -BOOL buildMapList(void) +bool buildMapList(void) { char ** filelist, ** file; size_t len; @@ -446,7 +446,7 @@ BOOL buildMapList(void) // //////////////////////////////////////////////////////////////////////////// // Called once on program startup. // -BOOL systemInitialise(void) +bool systemInitialise(void) { if (!widgInitialise()) { @@ -554,7 +554,7 @@ void systemShutdown(void) /***************************************************************************/ -static BOOL +static bool init_ObjectDead( void * psObj ) { BASE_OBJECT *psBaseObj = (BASE_OBJECT *) psObj; @@ -590,7 +590,7 @@ init_ObjectDead( void * psObj ) // //////////////////////////////////////////////////////////////////////////// // Called At Frontend Startup. -BOOL frontendInitialise(const char *ResourceFile) +bool frontendInitialise(const char *ResourceFile) { debug(LOG_MAIN, "Initialising frontend : %s", ResourceFile); @@ -673,7 +673,7 @@ BOOL frontendInitialise(const char *ResourceFile) } -BOOL frontendShutdown(void) +bool frontendShutdown(void) { debug(LOG_WZ, "== Shuting down frontend =="); @@ -722,7 +722,7 @@ BOOL frontendShutdown(void) -BOOL stageOneInitialise(void) +bool stageOneInitialise(void) { debug(LOG_WZ, "== stageOneInitalise =="); @@ -823,7 +823,7 @@ BOOL stageOneInitialise(void) /******************************************************************************/ /* Shutdown after data is released */ -BOOL stageOneShutDown(void) +bool stageOneShutDown(void) { debug(LOG_WZ, "== stageOneShutDown =="); @@ -888,7 +888,7 @@ BOOL stageOneShutDown(void) // //////////////////////////////////////////////////////////////////////////// // Initialise after the base data is loaded but before final level data is loaded -BOOL stageTwoInitialise(void) +bool stageTwoInitialise(void) { int i; @@ -982,7 +982,7 @@ BOOL stageTwoInitialise(void) // //////////////////////////////////////////////////////////////////////////// // Free up after level specific data has been released but before base data is released // -BOOL stageTwoShutDown(void) +bool stageTwoShutDown(void) { debug(LOG_WZ, "== stageTwoShutDown =="); @@ -1023,7 +1023,7 @@ BOOL stageTwoShutDown(void) return true; } -BOOL stageThreeInitialise(void) +bool stageThreeInitialise(void) { STRUCTURE *psStr; UDWORD i; @@ -1137,7 +1137,7 @@ BOOL stageThreeInitialise(void) /*****************************************************************************/ /* Shutdown before any data is released */ -BOOL stageThreeShutDown(void) +bool stageThreeShutDown(void) { debug(LOG_WZ, "== stageThreeShutDown =="); @@ -1185,7 +1185,7 @@ BOOL stageThreeShutDown(void) } // Reset the game between campaigns -BOOL campaignReset(void) +bool campaignReset(void) { debug(LOG_MAIN, "campaignReset"); gwShutDown(); @@ -1199,7 +1199,7 @@ BOOL campaignReset(void) } // Reset the game when loading a save game -BOOL saveGameReset(void) +bool saveGameReset(void) { debug(LOG_MAIN, "saveGameReset"); diff --git a/src/init.h b/src/init.h index c922c44ca..61098d0ae 100644 --- a/src/init.h +++ b/src/init.h @@ -31,21 +31,21 @@ #define FILE_LOAD_BUFFER_SIZE (1024*1024*4) extern char fileLoadBuffer[]; -extern BOOL systemInitialise(void); +extern bool systemInitialise(void); extern void systemShutdown(void); -extern BOOL frontendInitialise(const char *ResourceFile); -extern BOOL frontendShutdown(void); -extern BOOL stageOneInitialise(void); -extern BOOL stageOneShutDown(void); -extern BOOL stageTwoInitialise(void); -extern BOOL stageTwoShutDown(void); -extern BOOL stageThreeInitialise(void); -extern BOOL stageThreeShutDown(void); +extern bool frontendInitialise(const char *ResourceFile); +extern bool frontendShutdown(void); +extern bool stageOneInitialise(void); +extern bool stageOneShutDown(void); +extern bool stageTwoInitialise(void); +extern bool stageTwoShutDown(void); +extern bool stageThreeInitialise(void); +extern bool stageThreeShutDown(void); // Reset the game between campaigns -extern BOOL campaignReset(void); +extern bool campaignReset(void); // Reset the game when loading a save game -extern BOOL saveGameReset(void); +extern bool saveGameReset(void); struct wzSearchPath { @@ -58,9 +58,9 @@ enum searchPathMode { mod_clean, mod_campaign, mod_multiplay, mod_override }; void cleanSearchPath( void ); void registerSearchPath( const char path[], unsigned int priority ); -BOOL rebuildSearchPath( searchPathMode mode, BOOL force ); +bool rebuildSearchPath( searchPathMode mode, bool force ); -BOOL buildMapList(void); +bool buildMapList(void); extern IMAGEFILE *FrontImages; diff --git a/src/intdisplay.cpp b/src/intdisplay.cpp index 4a32e5296..9020964a2 100644 --- a/src/intdisplay.cpp +++ b/src/intdisplay.cpp @@ -673,15 +673,15 @@ void intDisplayStatusButton(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, WZ BASE_OBJECT *psObj; STRUCTURE *Structure; DROID *Droid; - BOOL Down; + bool Down; SDWORD Image; - BOOL Hilight = false; + bool Hilight = false; BASE_STATS *Stats, *psResGraphic; RENDERED_BUTTON *Buffer = (RENDERED_BUTTON*)Form->pUserData; UDWORD IMDType = 0, compID; UDWORD Player = selectedPlayer; // changed by AJL for multiplayer. void *Object; - BOOL bOnHold = false; + bool bOnHold = false; OpenButtonRender((UWORD)(xOffset+Form->x), (UWORD)(yOffset+Form->y),(UWORD)Form->width,(UWORD)Form->height); @@ -880,8 +880,8 @@ void intDisplayObjectButton(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, WZ { W_CLICKFORM *Form = (W_CLICKFORM*)psWidget; BASE_OBJECT *psObj; - BOOL Down; - BOOL Hilight = false; + bool Down; + bool Hilight = false; RENDERED_BUTTON *Buffer = (RENDERED_BUTTON*)Form->pUserData; UDWORD IMDType = 0; void *Object; @@ -959,9 +959,9 @@ void intDisplayStatsButton(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, WZ_ { W_CLICKFORM *Form = (W_CLICKFORM*)psWidget; BASE_STATS *Stat, *psResGraphic; - BOOL Down; + bool Down; SDWORD Image, compID; - BOOL Hilight = false; + bool Hilight = false; RENDERED_BUTTON *Buffer = (RENDERED_BUTTON*)Form->pUserData; UDWORD IMDType = 0; UDWORD Player = selectedPlayer; // ajl, changed for multiplayer (from 0) @@ -1119,17 +1119,17 @@ void intDisplayStatsButton(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, WZ_ void RenderToButton(IMAGEFILE *ImageFile,UWORD ImageID,void *Object,UDWORD Player, - RENDERED_BUTTON *Buffer,BOOL Down, UDWORD IMDType, UDWORD buttonType) + RENDERED_BUTTON *Buffer,bool Down, UDWORD IMDType, UDWORD buttonType) { CreateIMDButton(ImageFile,ImageID,Object,Player,Buffer,Down,IMDType,buttonType); } -void RenderImageToButton(IMAGEFILE *ImageFile,UWORD ImageID,RENDERED_BUTTON *Buffer,BOOL Down, UDWORD buttonType) +void RenderImageToButton(IMAGEFILE *ImageFile,UWORD ImageID,RENDERED_BUTTON *Buffer,bool Down, UDWORD buttonType) { CreateImageButton(ImageFile,ImageID,Buffer,Down,buttonType); } -void RenderBlankToButton(RENDERED_BUTTON *Buffer,BOOL Down, UDWORD buttonType) +void RenderBlankToButton(RENDERED_BUTTON *Buffer,bool Down, UDWORD buttonType) { CreateBlankButton(Buffer,Down,buttonType); } @@ -1353,7 +1353,7 @@ void intDisplayImageHilight(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, WZ UDWORD x = xOffset+psWidget->x; UDWORD y = yOffset+psWidget->y, flash; UWORD ImageID; - BOOL Hilight = false; + bool Hilight = false; switch(psWidget->type) { case WIDG_FORM: @@ -1413,7 +1413,7 @@ void intDisplayImageHilight(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, WZ } -static void GetButtonState(WIDGET *psWidget,BOOL *Hilight,UDWORD *Down,BOOL *Grey) +static void GetButtonState(WIDGET *psWidget,bool *Hilight,UDWORD *Down,bool *Grey) { switch(psWidget->type) { case WIDG_FORM: @@ -1469,8 +1469,8 @@ void intDisplayButtonHilight(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, W { UDWORD x = xOffset+psWidget->x; UDWORD y = yOffset+psWidget->y; - BOOL Hilight = false; - BOOL Grey = false; + bool Hilight = false; + bool Grey = false; UDWORD Down = 0; UWORD ImageID; @@ -1496,7 +1496,7 @@ void intDisplayButtonFlash(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, WZ_ { UDWORD x = xOffset+psWidget->x; UDWORD y = yOffset+psWidget->y; - //BOOL Hilight = false; + //bool Hilight = false; //UDWORD Down = 0; UWORD ImageID; @@ -1528,8 +1528,8 @@ void intDisplayReticuleButton(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, { UDWORD x = xOffset+psWidget->x; UDWORD y = yOffset+psWidget->y; - BOOL Hilight = false; - BOOL Down = false; + bool Hilight = false; + bool Down = false; UBYTE DownTime = UNPACKDWORD_QUAD_C(psWidget->UserData); UBYTE Index = UNPACKDWORD_QUAD_D(psWidget->UserData); UBYTE flashing = UNPACKDWORD_QUAD_A(psWidget->UserData); @@ -1603,7 +1603,7 @@ void intDisplayReticuleButton(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, void intDisplayTab(WIDGET *psWidget,UDWORD TabType, UDWORD Position, - UDWORD Number,BOOL Selected,BOOL Hilight,UDWORD x,UDWORD y,UDWORD Width,UDWORD Height) + UDWORD Number,bool Selected,bool Hilight,UDWORD x,UDWORD y,UDWORD Width,UDWORD Height) { TABDEF *Tab = (TABDEF*)psWidget->pUserData; @@ -2105,7 +2105,7 @@ void CloseButtonRender(void) // Clear a button bitmap. ( copy the button background ). // -void ClearButton(BOOL Down,UDWORD Size, UDWORD buttonType) +void ClearButton(bool Down,UDWORD Size, UDWORD buttonType) { if(Down) { @@ -2119,7 +2119,7 @@ void ClearButton(BOOL Down,UDWORD Size, UDWORD buttonType) // Create a button by rendering an IMD object into it. // -void CreateIMDButton(IMAGEFILE *ImageFile, UWORD ImageID, void *Object, UDWORD Player, RENDERED_BUTTON *Buffer, BOOL Down, UDWORD IMDType, UDWORD buttonType) +void CreateIMDButton(IMAGEFILE *ImageFile, UWORD ImageID, void *Object, UDWORD Player, RENDERED_BUTTON *Buffer, bool Down, UDWORD IMDType, UDWORD buttonType) { UDWORD Size; Vector3i Rotation, Position, NullVector; @@ -2421,7 +2421,7 @@ void CreateIMDButton(IMAGEFILE *ImageFile, UWORD ImageID, void *Object, UDWORD P // Create a button by rendering an image into it. // -void CreateImageButton(IMAGEFILE *ImageFile,UWORD ImageID,RENDERED_BUTTON *Buffer,BOOL Down, UDWORD buttonType) +void CreateImageButton(IMAGEFILE *ImageFile,UWORD ImageID,RENDERED_BUTTON *Buffer,bool Down, UDWORD buttonType) { UDWORD ox,oy; @@ -2440,7 +2440,7 @@ void CreateImageButton(IMAGEFILE *ImageFile,UWORD ImageID,RENDERED_BUTTON *Buffe // Create a blank button. // -void CreateBlankButton(RENDERED_BUTTON *Buffer,BOOL Down, UDWORD buttonType) +void CreateBlankButton(RENDERED_BUTTON *Buffer,bool Down, UDWORD buttonType) { UDWORD ox,oy; @@ -2458,7 +2458,7 @@ void CreateBlankButton(RENDERED_BUTTON *Buffer,BOOL Down, UDWORD buttonType) // Returns true if the droid is currently demolishing something or moving to demolish something. // -BOOL DroidIsDemolishing(DROID *Droid) +bool DroidIsDemolishing(DROID *Droid) { BASE_STATS *Stats; UDWORD x,y; @@ -2483,7 +2483,7 @@ BOOL DroidIsDemolishing(DROID *Droid) } // Returns true if the droid is currently repairing another droid. -BOOL DroidIsRepairing(DROID *Droid) +bool DroidIsRepairing(DROID *Droid) { //if(droidType(Droid) != DROID_REPAIR) if (!(droidType(Droid) == DROID_REPAIR @@ -2502,7 +2502,7 @@ BOOL DroidIsRepairing(DROID *Droid) // Returns true if the droid is currently building something. // -BOOL DroidIsBuilding(DROID *Droid) +bool DroidIsBuilding(DROID *Droid) { BASE_STATS *Stats; UDWORD x,y; @@ -2531,7 +2531,7 @@ BOOL DroidIsBuilding(DROID *Droid) // Returns true if the droid has been ordered build something ( but has'nt started yet ) // -BOOL DroidGoingToBuild(DROID *Droid) +bool DroidGoingToBuild(DROID *Droid) { BASE_STATS *Stats; UDWORD x,y; @@ -2716,13 +2716,13 @@ DROID_TEMPLATE *FactoryGetTemplate(FACTORY *Factory) return (DROID_TEMPLATE *)Factory->psSubject; } -BOOL StatIsStructure(BASE_STATS *Stat) +bool StatIsStructure(BASE_STATS *Stat) { return (Stat->ref >= REF_STRUCTURE_START && Stat->ref < REF_STRUCTURE_START + REF_RANGE); } -BOOL StatIsFeature(BASE_STATS *Stat) +bool StatIsFeature(BASE_STATS *Stat) { return (Stat->ref >= REF_FEATURE_START && Stat->ref < REF_FEATURE_START + REF_RANGE); @@ -2735,7 +2735,7 @@ iIMDShape *StatGetStructureIMD(BASE_STATS *Stat,UDWORD Player) return ((STRUCTURE_STATS*)Stat)->pIMD; } -BOOL StatIsTemplate(BASE_STATS *Stat) +bool StatIsTemplate(BASE_STATS *Stat) { return (Stat->ref >= REF_TEMPLATE_START && Stat->ref < REF_TEMPLATE_START + REF_RANGE); @@ -2795,7 +2795,7 @@ SDWORD StatIsComponent(BASE_STATS *Stat) return COMP_UNKNOWN; } -BOOL StatGetComponentIMD(BASE_STATS *Stat, SDWORD compID,iIMDShape **CompIMD,iIMDShape **MountIMD) +bool StatGetComponentIMD(BASE_STATS *Stat, SDWORD compID,iIMDShape **CompIMD,iIMDShape **MountIMD) { WEAPON_STATS *psWStat; @@ -2858,15 +2858,15 @@ BOOL StatGetComponentIMD(BASE_STATS *Stat, SDWORD compID,iIMDShape **CompIMD,iIM } -BOOL StatIsResearch(BASE_STATS *Stat) +bool StatIsResearch(BASE_STATS *Stat) { return (Stat->ref >= REF_RESEARCH_START && Stat->ref < REF_RESEARCH_START + REF_RANGE); } -//void StatGetResearchImage(BASE_STATS *psStat, SDWORD *Image,iIMDShape **Shape, BOOL drawTechIcon) +//void StatGetResearchImage(BASE_STATS *psStat, SDWORD *Image,iIMDShape **Shape, bool drawTechIcon) void StatGetResearchImage(BASE_STATS *psStat, SDWORD *Image, iIMDShape **Shape, - BASE_STATS **ppGraphicData, BOOL drawTechIcon) + BASE_STATS **ppGraphicData, bool drawTechIcon) { *Image = -1; if (drawTechIcon) @@ -2988,8 +2988,8 @@ void intDisplayTransportButton(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, WZ_DECL_UNUSED PIELIGHT *pColours) { W_CLICKFORM *Form = (W_CLICKFORM*)psWidget; - BOOL Down; - BOOL Hilight = false; + bool Down; + bool Hilight = false; RENDERED_BUTTON *Buffer = (RENDERED_BUTTON*)Form->pUserData; DROID *psDroid = NULL; UDWORD gfxId; diff --git a/src/intdisplay.h b/src/intdisplay.h index 13f1796b9..c828aa892 100644 --- a/src/intdisplay.h +++ b/src/intdisplay.h @@ -78,8 +78,8 @@ struct BUTTON_SURFACE struct RENDERED_BUTTON { - BOOL InUse; // Is it in use. - BOOL Initialised; // Is it initialised. + bool InUse; // Is it in use. + bool Initialised; // Is it initialised. SDWORD ImdRotation; // Rotation if button is an IMD. UDWORD State; // Copy of widget's state so we know if state has changed. void *Data; // Any data we want to attach. @@ -194,7 +194,7 @@ void intDisplayButtonPressed(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, P void intDisplayReticuleButton(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, PIELIGHT *pColours); void intDisplayTab(WIDGET *psWidget,UDWORD TabType, UDWORD Position, - UDWORD Number,BOOL Selected,BOOL Hilight,UDWORD x,UDWORD y,UDWORD Width,UDWORD Height); + UDWORD Number,bool Selected,bool Hilight,UDWORD x,UDWORD y,UDWORD Width,UDWORD Height); void intDisplaySlider(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, PIELIGHT *pColours); void intDisplayNumber(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, PIELIGHT *pColours); @@ -205,31 +205,31 @@ void intDisplayEditBox(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, PIELIGH void OpenButtonRender(UWORD XPos,UWORD YPos,UWORD Width,UWORD Height); void CloseButtonRender(void); -void ClearButton(BOOL Down,UDWORD Size, UDWORD buttonType); +void ClearButton(bool Down,UDWORD Size, UDWORD buttonType); void RenderToButton(IMAGEFILE *ImageFile,UWORD ImageID,void *Object,UDWORD Player,RENDERED_BUTTON *Buffer, - BOOL Down,UDWORD IMDType, UDWORD buttonType); + bool Down,UDWORD IMDType, UDWORD buttonType); void CreateIMDButton(IMAGEFILE *ImageFile,UWORD ImageID,void *Object,UDWORD Player,RENDERED_BUTTON *Buffer, - BOOL Down,UDWORD IMDType,UDWORD buttonType); + bool Down,UDWORD IMDType,UDWORD buttonType); -void CreateImageButton(IMAGEFILE *ImageFile,UWORD ImageID,RENDERED_BUTTON *Buffer,BOOL Down, UDWORD buttonType); +void CreateImageButton(IMAGEFILE *ImageFile,UWORD ImageID,RENDERED_BUTTON *Buffer,bool Down, UDWORD buttonType); -void CreateBlankButton(RENDERED_BUTTON *Buffer,BOOL Down, UDWORD buttonType); +void CreateBlankButton(RENDERED_BUTTON *Buffer,bool Down, UDWORD buttonType); -void RenderImageToButton(IMAGEFILE *ImageFile,UWORD ImageID,RENDERED_BUTTON *Buffer,BOOL Down, UDWORD buttonType); -void RenderBlankToButton(RENDERED_BUTTON *Buffer,BOOL Down, UDWORD buttonType); +void RenderImageToButton(IMAGEFILE *ImageFile,UWORD ImageID,RENDERED_BUTTON *Buffer,bool Down, UDWORD buttonType); +void RenderBlankToButton(RENDERED_BUTTON *Buffer,bool Down, UDWORD buttonType); -extern BOOL DroidIsRepairing(DROID *Droid); +extern bool DroidIsRepairing(DROID *Droid); -BOOL DroidIsBuilding(DROID *Droid); +bool DroidIsBuilding(DROID *Droid); STRUCTURE *DroidGetBuildStructure(DROID *Droid); -BOOL DroidGoingToBuild(DROID *Droid); +bool DroidGoingToBuild(DROID *Droid); BASE_STATS *DroidGetBuildStats(DROID *Droid); iIMDShape *DroidGetIMD(DROID *Droid); UDWORD DroidGetIMDIndex(DROID *Droid); -BOOL DroidIsDemolishing(DROID *Droid); +bool DroidIsDemolishing(DROID *Droid); bool StructureIsManufacturingPending(STRUCTURE *structure); ///< Returns true iff the structure is either manufacturing or on hold (even if not yet synchronised). bool StructureIsOnHoldPending(STRUCTURE *structure); ///< Returns true iff the structure is on hold (even if not yet synchronised). @@ -244,18 +244,18 @@ iIMDShape *StructureGetIMD(STRUCTURE *Structure); //SDWORD ResearchGetImage(RESEARCH_FACILITY *Research); -BOOL StatIsStructure(BASE_STATS *Stat); +bool StatIsStructure(BASE_STATS *Stat); iIMDShape *StatGetStructureIMD(BASE_STATS *Stat,UDWORD Player); -BOOL StatIsTemplate(BASE_STATS *Stat); -BOOL StatIsFeature(BASE_STATS *Stat); +bool StatIsTemplate(BASE_STATS *Stat); +bool StatIsFeature(BASE_STATS *Stat); SDWORD StatIsComponent(BASE_STATS *Stat); -BOOL StatGetComponentIMD(BASE_STATS *Stat, SDWORD compID,iIMDShape **CompIMD,iIMDShape **MountIMD); +bool StatGetComponentIMD(BASE_STATS *Stat, SDWORD compID,iIMDShape **CompIMD,iIMDShape **MountIMD); -BOOL StatIsResearch(BASE_STATS *Stat); -//void StatGetResearchImage(BASE_STATS *Stat,SDWORD *Image,iIMDShape **Shape, BOOL drawTechIcon); +bool StatIsResearch(BASE_STATS *Stat); +//void StatGetResearchImage(BASE_STATS *Stat,SDWORD *Image,iIMDShape **Shape, bool drawTechIcon); void StatGetResearchImage(BASE_STATS *psStat, SDWORD *Image, iIMDShape **Shape, - BASE_STATS **ppGraphicData, BOOL drawTechIcon); + BASE_STATS **ppGraphicData, bool drawTechIcon); /* Draws a stats bar for the design screen */ extern void intDisplayStatsBar(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, diff --git a/src/intelmap.cpp b/src/intelmap.cpp index 390cfe832..c107f3191 100644 --- a/src/intelmap.cpp +++ b/src/intelmap.cpp @@ -159,20 +159,20 @@ extern W_SCREEN *psWScreen; static UDWORD messageID; -static BOOL immediateMessage = false; +static bool immediateMessage = false; //flags whether to open the Intel Screen with a message -static BOOL playCurrent; +static bool playCurrent; /* functions declarations ****************/ -static BOOL intAddMessageForm(BOOL playCurrent); +static bool intAddMessageForm(bool playCurrent); /*Displays the buttons used on the intelligence map */ static void intDisplayMessageButton(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, PIELIGHT *pColours); /*deal with the actual button press - proxMsg is set to true if a proximity button has been pressed*/ -static void intIntelButtonPressed(BOOL proxMsg, UDWORD id); +static void intIntelButtonPressed(bool proxMsg, UDWORD id); static void intDisplayPIEView(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, PIELIGHT *pColours); #ifndef NO_VIDEO @@ -184,10 +184,10 @@ static void addVideoText(SEQ_DISPLAY *psSeqDisplay, UDWORD sequence); static void intDisplaySeqTextView(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, PIELIGHT *pColours); -static BOOL intDisplaySeqTextViewPage(VIEW_REPLAY *psViewReplay, +static bool intDisplaySeqTextViewPage(VIEW_REPLAY *psViewReplay, UDWORD x0, UDWORD y0, UDWORD width, UDWORD height, - BOOL render, + bool render, size_t *major, size_t *minor); @@ -200,9 +200,9 @@ MESSAGE *psCurrentMsg = NULL; /* Add the Intelligence Map widgets to the widget screen */ -BOOL intAddIntelMap(void) +bool intAddIntelMap(void) { - BOOL Animate = true; + bool Animate = true; //check playCurrent with psCurrentMsg if (psCurrentMsg == NULL) @@ -294,7 +294,7 @@ BOOL intAddIntelMap(void) } /* Add the Message sub form */ -static BOOL intAddMessageForm(BOOL playCurrent) +static bool intAddMessageForm(bool playCurrent) { UDWORD numButtons, i; MESSAGE *psMessage; @@ -476,9 +476,9 @@ static BOOL intAddMessageForm(BOOL playCurrent) } /*Add the 3D world view for the particular message (only research nmessages now) */ -BOOL intAddMessageView(MESSAGE * psMessage) +bool intAddMessageView(MESSAGE * psMessage) { - BOOL Animate = true; + bool Animate = true; RESEARCH *psResearch; // Is the form already up? @@ -715,10 +715,10 @@ void intProcessIntelMap(UDWORD id) /** * Draws the text for the intelligence display window. */ -static BOOL intDisplaySeqTextViewPage(VIEW_REPLAY *psViewReplay, +static bool intDisplaySeqTextViewPage(VIEW_REPLAY *psViewReplay, UDWORD x0, UDWORD y0, UDWORD width, UDWORD height, - BOOL render, + bool render, size_t *cur_seq, size_t *cur_seqpage) { UDWORD i, cur_y; @@ -803,9 +803,9 @@ static void intDisplaySeqTextView(WIDGET *psWidget, // Add all the Video Sequences for a message -static void StartMessageSequences(MESSAGE *psMessage, BOOL Start) +static void StartMessageSequences(MESSAGE *psMessage, bool Start) { - BOOL bLoop = false; + bool bLoop = false; debug(LOG_GUI, "StartMessageSequences: start message sequence"); @@ -876,7 +876,7 @@ static void StartMessageSequences(MESSAGE *psMessage, BOOL Start) deal with the actual button press - proxMsg is set to true if a proximity button has been pressed */ -void intIntelButtonPressed(BOOL proxMsg, UDWORD id) +void intIntelButtonPressed(bool proxMsg, UDWORD id) { MESSAGE *psMessage; UDWORD currID;//, i; @@ -1095,7 +1095,7 @@ void intRemoveIntelMapNoAnim(void) } /* Remove the Message View from the Intelligence screen */ -void intRemoveMessageView(BOOL animated) +void intRemoveMessageView(bool animated) { W_TABFORM *Form; VIEW_RESEARCH *psViewResearch; @@ -1138,12 +1138,12 @@ void intDisplayMessageButton(WIDGET *psWidget, UDWORD xOffset, W_CLICKFORM *psButton = (W_CLICKFORM*)psWidget; RENDERED_BUTTON *psBuffer = (RENDERED_BUTTON*)psButton->pUserData; MESSAGE *psMsg; - BOOL Hilight = false; + bool Hilight = false; UDWORD Down = 0, IMDType = 0, compID; SDWORD image = -1; RESEARCH *pResearch = NULL; BASE_STATS *psResGraphic = NULL; - BOOL MovieButton = false; + bool MovieButton = false; OpenButtonRender((UWORD)(xOffset+psButton->x), (UWORD)(yOffset+psButton->y), psButton->width, psButton->height); @@ -1508,13 +1508,13 @@ void displayImmediateMessage(MESSAGE *psMessage) // return whether a message is immediate -BOOL messageIsImmediate(void) +bool messageIsImmediate(void) { return immediateMessage; } /*sets the flag*/ -void setMessageImmediate(BOOL state) +void setMessageImmediate(bool state) { immediateMessage = state; } diff --git a/src/intelmap.h b/src/intelmap.h index 1b4130a4b..415327705 100644 --- a/src/intelmap.h +++ b/src/intelmap.h @@ -42,12 +42,12 @@ extern MESSAGE *psCurrentMsg; /* Add the Intelligence Map widgets to the widget screen */ -//extern BOOL intAddIntelMap(BOOL playCurrent); -extern BOOL intAddIntelMap(void); +//extern bool intAddIntelMap(bool playCurrent); +extern bool intAddIntelMap(void); /*Add the 3D world view for the current message */ -extern BOOL intAddMessageView(MESSAGE *psMessage); +extern bool intAddMessageView(MESSAGE *psMessage); /* Remove the Message View from the Intelligence screen */ -extern void intRemoveMessageView(BOOL animated); +extern void intRemoveMessageView(bool animated); /* Process return codes from the Intelligence Map */ extern void intProcessIntelMap(UDWORD id); @@ -56,7 +56,7 @@ extern void intProcessIntelMap(UDWORD id); /* rotate the view so looking directly down if forward = true or back to previous view if forward = false */ -//extern void intelMapView(BOOL forward); +//extern void intelMapView(bool forward); /* Remove the Intelligence Map widgets from the screen */ extern void intRemoveIntelMap(void); @@ -82,8 +82,8 @@ extern void resetIntelligencePauseState(void); extern void displayImmediateMessage(MESSAGE *psMessage); // return whether a message is immediate -extern BOOL messageIsImmediate(void); +extern bool messageIsImmediate(void); /*sets the flag*/ -extern void setMessageImmediate(BOOL state); +extern void setMessageImmediate(bool state); #endif // __INCLUDED_SRC_INTELMAP_H__ diff --git a/src/intimage.cpp b/src/intimage.cpp index 8e018982f..91a35cc4d 100644 --- a/src/intimage.cpp +++ b/src/intimage.cpp @@ -171,7 +171,7 @@ TABDEF SmallTab = { // Read bitmaps used by the interface. // -BOOL imageInitBitmaps(void) +bool imageInitBitmaps(void) { IntImages = (IMAGEFILE*)resGetData("IMG", "intfac.img"); pie_InitColourMouse(IntImages, MousePointerImageIDs); @@ -181,7 +181,7 @@ BOOL imageInitBitmaps(void) // Render a window frame. // -static void RenderWindow(FRAMETYPE frame, UDWORD x, UDWORD y, UDWORD Width, UDWORD Height, BOOL Opaque) +static void RenderWindow(FRAMETYPE frame, UDWORD x, UDWORD y, UDWORD Width, UDWORD Height, bool Opaque) { SWORD WTopRight = 0; SWORD WTopLeft = 0; @@ -193,7 +193,7 @@ static void RenderWindow(FRAMETYPE frame, UDWORD x, UDWORD y, UDWORD Width, UDWO SWORD HBottomLeft = 0; UWORD RectI; FRAMERECT *Rect; - BOOL Masked = false; + bool Masked = false; IMAGEFRAME *Frame; if (frame == 0) diff --git a/src/intimage.h b/src/intimage.h index 5d06879ba..a43f15758 100644 --- a/src/intimage.h +++ b/src/intimage.h @@ -52,7 +52,7 @@ extern IMAGEFILE *IntImages; //< All the 2d graphics for the user interface. extern TABDEF StandardTab; extern TABDEF SmallTab; -BOOL imageInitBitmaps(void); +bool imageInitBitmaps(void); /** Draws a transparent window. */ void RenderWindowFrame(FRAMETYPE frame, UDWORD x, UDWORD y, UDWORD Width, UDWORD Height); diff --git a/src/intorder.cpp b/src/intorder.cpp index f57c538a7..d606edd90 100644 --- a/src/intorder.cpp +++ b/src/intorder.cpp @@ -462,11 +462,11 @@ static STRUCTURE *psSelectedFactory = NULL; static std::vector AvailableOrders; -BOOL OrderUp = false; +bool OrderUp = false; // update the order interface only if it is already open. -// NOTE: Unused! BOOL intUpdateOrder(DROID *psDroid) -BOOL intUpdateOrder(DROID *psDroid) +// NOTE: Unused! bool intUpdateOrder(DROID *psDroid) +bool intUpdateOrder(DROID *psDroid) { if(widgGetFromID(psWScreen,IDORDER_FORM) != NULL && OrderUp) { @@ -482,7 +482,7 @@ BOOL intUpdateOrder(DROID *psDroid) // Build a list of currently selected droids. // Returns true if droids were selected. // -static BOOL BuildSelectedDroidList(void) +static bool BuildSelectedDroidList(void) { DROID *psDroid; @@ -543,7 +543,7 @@ static std::vector buildStructureOrderList(STRUCTURE *psStructure) static SECONDARY_STATE GetSecondaryStates(SECONDARY_ORDER sec) { SECONDARY_STATE state, currState; - BOOL bFirst; + bool bFirst; state = (SECONDARY_STATE)0; bFirst = true; @@ -590,16 +590,16 @@ static UDWORD GetImageHeight(IMAGEFILE *ImageFile,UDWORD ImageID) // Returns true if the form was displayed ok. // //changed to a BASE_OBJECT to accomodate the factories - AB 21/04/99 -BOOL intAddOrder(BASE_OBJECT *psObj) +bool intAddOrder(BASE_OBJECT *psObj) { - BOOL Animate = true; + bool Animate = true; SECONDARY_STATE State; UWORD OrdIndex; W_FORM *Form; UWORD Height, NumDisplayedOrders; UWORD NumButs; UWORD NumJustifyButs, NumCombineButs, NumCombineBefore; - BOOL bLastCombine, bHidden; + bool bLastCombine, bHidden; DROID *Droid; STRUCTURE *psStructure; @@ -993,7 +993,7 @@ void intRunOrder(void) // Set the secondary order state for all currently selected droids. And Factory (if one selected) // Returns true if successful. // -static BOOL SetSecondaryState(SECONDARY_ORDER sec, unsigned State) +static bool SetSecondaryState(SECONDARY_ORDER sec, unsigned State) { for (unsigned i = 0; i < SelectedDroids.size(); ++i) { @@ -1140,7 +1140,7 @@ void intProcessOrder(UDWORD id) // check whether the order list has changed -static BOOL CheckObjectOrderList(void) +static bool CheckObjectOrderList(void) { std::vector NewAvailableOrders; @@ -1157,7 +1157,7 @@ static BOOL CheckObjectOrderList(void) return NewAvailableOrders == AvailableOrders; } -static BOOL intRefreshOrderButtons(void) +static bool intRefreshOrderButtons(void) { SECONDARY_STATE State; UWORD OrdIndex; @@ -1234,13 +1234,13 @@ static BOOL intRefreshOrderButtons(void) // Call to refresh the Order screen, ie when a droids boards it. // -BOOL intRefreshOrder(void) +bool intRefreshOrder(void) { // Is the Order screen up? if ((intMode == INT_ORDER) && (widgGetFromID(psWScreen,IDORDER_FORM) != NULL)) { - BOOL Ret; + bool Ret; SelectedDroids.clear(); diff --git a/src/intorder.h b/src/intorder.h index 980c9f38f..d4ccf2c56 100644 --- a/src/intorder.h +++ b/src/intorder.h @@ -27,15 +27,15 @@ #define IDORDER_FORM 8000 #define IDORDER_CLOSE 8001 -extern BOOL OrderUp; +extern bool OrderUp; -BOOL intUpdateOrder(DROID *psDroid); // update already open order form -BOOL intAddOrder(BASE_OBJECT *psObj); // create and open order form +bool intUpdateOrder(DROID *psDroid); // update already open order form +bool intAddOrder(BASE_OBJECT *psObj); // create and open order form void intRunOrder(void); void intProcessOrder(UDWORD id); void intRemoveOrder(void); void intRemoveOrderNoAnim(void); -BOOL intRefreshOrder(void); +bool intRefreshOrder(void); //new function added to bring up the RMB order form for Factories as well as droids void intAddFactoryOrder(STRUCTURE *psStructure); diff --git a/src/keybind.cpp b/src/keybind.cpp index b0d3ca191..3a1b5abfc 100644 --- a/src/keybind.cpp +++ b/src/keybind.cpp @@ -105,8 +105,8 @@ extern char ScreenDumpPath[]; -BOOL bMovePause = false; -BOOL bAllowOtherKeyPresses = true; +bool bMovePause = false; +bool bAllowOtherKeyPresses = true; char sTextToSend[MAX_CONSOLE_STRING_LENGTH]; char beaconMsg[MAX_PLAYERS][MAX_CONSOLE_STRING_LENGTH]; //beacon msg for each player @@ -683,7 +683,7 @@ void kf_TileInfo(void) // -------------------------------------------------------------------------- void kf_ToggleBackgroundFog( void ) { - static BOOL bEnabled = true;//start in nicks mode + static bool bEnabled = true;//start in nicks mode if (bEnabled)//true, so go to false { @@ -708,7 +708,7 @@ void kf_ToggleBackgroundFog( void ) extern void kf_ToggleDistanceFog( void ) { - static BOOL bEnabled = true;//start in nicks mode + static bool bEnabled = true;//start in nicks mode if (bEnabled)//true, so go to false { @@ -733,7 +733,7 @@ extern void kf_ToggleDistanceFog( void ) /* Toggles fog on/off */ void kf_ToggleFog( void ) { - static BOOL fogEnabled = false; + static bool fogEnabled = false; const char* cmsg; #ifndef DEBUG @@ -1048,9 +1048,9 @@ void kf_SelectPlayer( void ) /* Selects the player's groups 1..9 */ void kf_SelectGrouping( UDWORD groupNumber) { - BOOL bAlreadySelected; + bool bAlreadySelected; DROID *psDroid; - BOOL Selected; + bool Selected; bAlreadySelected = false; for(psDroid = apsDroidLists[selectedPlayer]; psDroid!=NULL; psDroid = psDroid->psNext) @@ -2416,7 +2416,7 @@ static void kfsf_SetSelectedDroidsState( SECONDARY_ORDER sec, SECONDARY_STATE st void kf_TriggerRayCast( void ) { DROID *psDroid; -BOOL found; +bool found; found = false; for(psDroid = apsDroidLists[selectedPlayer]; psDroid && !found; @@ -2448,7 +2448,7 @@ void kf_ScatterDroids( void ) void kf_CentreOnBase( void ) { STRUCTURE *psStruct; -BOOL bGotHQ; +bool bGotHQ; UDWORD xJump = 0, yJump = 0; /* Got through our buildings */ @@ -2494,7 +2494,7 @@ void kf_ToggleFormationSpeedLimiting( void ) void kf_RightOrderMenu( void ) { DROID *psDroid,*psGotOne = NULL; -BOOL bFound; +bool bFound; // if menu open, then close it! if (widgGetFromID(psWScreen,IDORDER_FORM) != NULL) @@ -2751,7 +2751,7 @@ void kf_AddHelpBlip( void ) UDWORD i; char tempStr[255]; SDWORD x,y; - BOOL mOverR=false; + bool mOverR=false; /* not needed in campaign */ if(!bMultiPlayer) diff --git a/src/keybind.h b/src/keybind.h index 9639b9a5b..0b495c4b1 100644 --- a/src/keybind.h +++ b/src/keybind.h @@ -164,7 +164,7 @@ extern void kf_MoveToLastMessagePos( void ); extern void kf_SelectAllDamaged( void ); extern void kf_RightOrderMenu( void ); -extern BOOL bAllowOtherKeyPresses; +extern bool bAllowOtherKeyPresses; extern void kf_TriggerRayCast( void ); extern void kf_ToggleFormationSpeedLimiting( void ); diff --git a/src/keyedit.cpp b/src/keyedit.cpp index c91186f6e..601dfb37f 100644 --- a/src/keyedit.cpp +++ b/src/keyedit.cpp @@ -71,7 +71,7 @@ static char keymapVersion[8] = "KM_0002"; // //////////////////////////////////////////////////////////////////////////// // funcs -static BOOL pushedKeyMap(UDWORD key) +static bool pushedKeyMap(UDWORD key) { // UDWORD count =0; // id-KM_START @@ -103,7 +103,7 @@ static BOOL pushedKeyMap(UDWORD key) // //////////////////////////////////////////////////////////////////////////// -static BOOL pushedKeyCombo(KEY_CODE subkey) +static bool pushedKeyCombo(KEY_CODE subkey) { KEY_CODE metakey=KEY_IGNORE; KEY_MAPPING *pExist; @@ -228,7 +228,7 @@ static KEY_CODE scanKeyBoardForBinding(void) } // //////////////////////////////////////////////////////////////////////////// -BOOL runKeyMapEditor(void) +bool runKeyMapEditor(void) { UDWORD id; @@ -272,9 +272,9 @@ BOOL runKeyMapEditor(void) // //////////////////////////////////////////////////////////////////////////// // returns key to press given a mapping. -static BOOL keyMapToString(char *pStr, KEY_MAPPING *psMapping) +static bool keyMapToString(char *pStr, KEY_MAPPING *psMapping) { - BOOL onlySub = true; + bool onlySub = true; char asciiSub[20],asciiMeta[20]; if(psMapping->metaKeyCode!=KEY_IGNORE) @@ -338,12 +338,12 @@ static void displayKeyMap(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, WZ_D } // //////////////////////////////////////////////////////////////////////////// -BOOL startKeyMapEditor(BOOL first) +bool startKeyMapEditor(bool first) { KEY_MAPPING *psMapping; UDWORD i,mapcount =0; UDWORD bubbleCount; - BOOL bAtEnd,bGotOne; + bool bAtEnd,bGotOne; KEY_MAPPING *psPresent = NULL, *psNext; char test[255]; addBackdrop(); @@ -499,7 +499,7 @@ BOOL startKeyMapEditor(BOOL first) // //////////////////////////////////////////////////////////////////////////// // save current keymaps to registry // FIXME: Use the endian-safe physfs functions. -BOOL saveKeyMap(void) +bool saveKeyMap(void) { KEY_MAPPING *psMapping; SDWORD count; @@ -567,7 +567,7 @@ BOOL saveKeyMap(void) // //////////////////////////////////////////////////////////////////////////// // load keymaps from registry. -BOOL loadKeyMap(void) +bool loadKeyMap(void) { KEY_STATUS status; KEY_CODE metaCode; diff --git a/src/keyedit.h b/src/keyedit.h index d3355cc3b..87c1a4b76 100644 --- a/src/keyedit.h +++ b/src/keyedit.h @@ -21,9 +21,9 @@ #ifndef __INCLUDED_SRC_KEYEDIT_H__ #define __INCLUDED_SRC_KEYEDIT_H__ -BOOL runKeyMapEditor(void); -BOOL startKeyMapEditor(BOOL first); -BOOL saveKeyMap(void); -BOOL loadKeyMap(void); +bool runKeyMapEditor(void); +bool startKeyMapEditor(bool first); +bool saveKeyMap(void); +bool loadKeyMap(void); #endif // __INCLUDED_SRC_KEYEDIT_H__ diff --git a/src/keymap.cpp b/src/keymap.cpp index 0864c8a67..0dbff9487 100644 --- a/src/keymap.cpp +++ b/src/keymap.cpp @@ -76,7 +76,7 @@ SDWORD spin; static KEYMAP_MARKER qwertyKeyMappings[NUM_QWERTY_KEYS]; -static BOOL bDoingDebugMappings = false; +static bool bDoingDebugMappings = false; // ---------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------- @@ -88,7 +88,7 @@ UDWORD numActiveMappings; /* Last meta and sub key that were recorded */ static KEY_CODE lastMetaKey,lastSubKey; -static BOOL bKeyProcessing = true; +static bool bKeyProcessing = true; static void kf_NOOP(void) {} @@ -264,7 +264,7 @@ _keymapsave keyMapSaveTable[] = these will be read in from a .cfg file customisable by the player from an in-game menu */ -void keyInitMappings( BOOL bForceDefaults ) +void keyInitMappings( bool bForceDefaults ) { UDWORD i; keyMappings = NULL; @@ -492,7 +492,7 @@ void keyInitMappings( BOOL bForceDefaults ) // ---------------------------------------------------------------------------------- /* Adds a new mapping to the list */ -//BOOL keyAddMapping(KEY_CODE metaCode, KEY_CODE subCode, KEY_ACTION action,void *function, char *name) +//bool keyAddMapping(KEY_CODE metaCode, KEY_CODE subCode, KEY_ACTION action,void *function, char *name) KEY_MAPPING *keyAddMapping(KEY_STATUS status,KEY_CODE metaCode, KEY_CODE subCode, KEY_ACTION action, void (*pKeyMapFunc)(void), const char *name) { @@ -550,7 +550,7 @@ KEY_MAPPING *newMapping; // ---------------------------------------------------------------------------------- /* Removes a mapping from the list specified by the key codes */ -BOOL keyRemoveMapping( KEY_CODE metaCode, KEY_CODE subCode ) +bool keyRemoveMapping( KEY_CODE metaCode, KEY_CODE subCode ) { KEY_MAPPING *mapping; @@ -588,7 +588,7 @@ void keyClearMappings( void ) // ---------------------------------------------------------------------------------- /* Removes a mapping specified by a pointer */ -BOOL keyRemoveMappingPt(KEY_MAPPING *psToRemove) +bool keyRemoveMappingPt(KEY_MAPPING *psToRemove) { KEY_MAPPING *psPrev,*psCurr; @@ -648,11 +648,11 @@ UDWORD getNumMappings( void ) // ---------------------------------------------------------------------------------- /* Allows _new_ mappings to be made at runtime */ -static BOOL checkQwertyKeys( void ) +static bool checkQwertyKeys( void ) { KEY_CODE qKey; UDWORD tableEntry; - BOOL aquired = false; + bool aquired = false; /* Are we trying to make a new map marker? */ if (keyDown(KEY_LALT)) @@ -686,10 +686,10 @@ static BOOL checkQwertyKeys( void ) // ---------------------------------------------------------------------------------- /* Manages update of all the active function mappings */ -void keyProcessMappings( BOOL bExclude ) +void keyProcessMappings( bool bExclude ) { KEY_MAPPING *keyToProcess; -BOOL bMetaKeyDown; +bool bMetaKeyDown; SDWORD i; /* Bomb out if there are none */ @@ -856,7 +856,7 @@ SDWORD i; static void keyShowMapping(KEY_MAPPING *psMapping) { char asciiSub[20],asciiMeta[20]; -BOOL onlySub; +bool onlySub; onlySub = true; if(psMapping->metaKeyCode!=KEY_IGNORE) @@ -905,7 +905,7 @@ KEY_CODE getLastMetaKey( void ) // ---------------------------------------------------------------------------------- /* Allows us to enable/disable the whole mapping system */ -void keyEnableProcessing( BOOL val ) +void keyEnableProcessing( bool val ) { bKeyProcessing = val; } @@ -935,7 +935,7 @@ KEY_MAPPING *psMapping; // ---------------------------------------------------------------------------------- /* Allows us to make active/inactive specific mappings */ -void keySetMappingStatus(KEY_MAPPING *psMapping, BOOL state) +void keySetMappingStatus(KEY_MAPPING *psMapping, bool state) { psMapping->active = state; } @@ -1019,23 +1019,23 @@ UDWORD entry; // ---------------------------------------------------------------------------------- /* Defines whether we process debug key mapping stuff */ -void processDebugMappings( BOOL val ) +void processDebugMappings( bool val ) { bDoingDebugMappings = val; } // ---------------------------------------------------------------------------------- /* Returns present status of debug mapping processing */ -BOOL getDebugMappingStatus( void ) +bool getDebugMappingStatus( void ) { return(bDoingDebugMappings); } // ---------------------------------------------------------------------------------- -BOOL keyReAssignMapping( KEY_CODE origMetaCode, KEY_CODE origSubCode, +bool keyReAssignMapping( KEY_CODE origMetaCode, KEY_CODE origSubCode, KEY_CODE newMetaCode, KEY_CODE newSubCode ) { KEY_MAPPING *psMapping; -BOOL bFound; +bool bFound; for(psMapping = keyMappings,bFound = false; psMapping && !bFound; psMapping = psMapping->psNext) @@ -1071,7 +1071,7 @@ KEY_MAPPING *psMapping; } // ---------------------------------------------------------------------------------- -BOOL keyReAssignMappingName(char *pName,KEY_CODE newMetaCode, KEY_CODE newSubCode) +bool keyReAssignMappingName(char *pName,KEY_CODE newMetaCode, KEY_CODE newSubCode) { KEY_MAPPING *psMapping; diff --git a/src/keymap.h b/src/keymap.h index 7f67bb03e..d235556a3 100644 --- a/src/keymap.h +++ b/src/keymap.h @@ -45,7 +45,7 @@ KEYMAP___HIDE struct KEY_MAPPING { void (*function)(void); -BOOL active; +bool active; KEY_STATUS status; UDWORD lastCalled; KEY_CODE metaKeyCode; @@ -58,27 +58,27 @@ KEY_MAPPING * psNext; extern KEY_MAPPING *keyAddMapping ( KEY_STATUS status, KEY_CODE metaCode, KEY_CODE subcode, KEY_ACTION action, void (*pKeyMapFunc)(void), const char *name ); -extern BOOL keyRemoveMapping ( KEY_CODE metaCode, KEY_CODE subCode ); +extern bool keyRemoveMapping ( KEY_CODE metaCode, KEY_CODE subCode ); extern KEY_MAPPING *keyGetMappingFromFunction(void *function); -extern BOOL keyRemoveMappingPt ( KEY_MAPPING *psToRemove ); +extern bool keyRemoveMappingPt ( KEY_MAPPING *psToRemove ); extern KEY_MAPPING *keyFindMapping ( KEY_CODE metaCode, KEY_CODE subCode ); extern void keyClearMappings ( void ); -extern void keyProcessMappings ( BOOL bExclude ); -extern void keyInitMappings ( BOOL bForceDefaults ); +extern void keyProcessMappings ( bool bExclude ); +extern void keyInitMappings ( bool bForceDefaults ); extern UDWORD getNumMappings ( void ); extern KEY_CODE getLastSubKey ( void ); extern KEY_CODE getLastMetaKey ( void ); extern KEY_MAPPING *getLastMapping ( void ); -extern void keyEnableProcessing ( BOOL val ); +extern void keyEnableProcessing ( bool val ); extern void keyStatusAllInactive ( void ); extern void keyAllMappingsInactive(void); extern void keyAllMappingsActive ( void ); -extern void keySetMappingStatus ( KEY_MAPPING *psMapping, BOOL state ); -extern void processDebugMappings ( BOOL val ); -extern BOOL getDebugMappingStatus ( void ); -extern BOOL keyReAssignMappingName(char *pName, KEY_CODE newMetaCode, KEY_CODE newSubCode); +extern void keySetMappingStatus ( KEY_MAPPING *psMapping, bool state ); +extern void processDebugMappings ( bool val ); +extern bool getDebugMappingStatus ( void ); +extern bool keyReAssignMappingName(char *pName, KEY_CODE newMetaCode, KEY_CODE newSubCode); -extern BOOL keyReAssignMapping( KEY_CODE origMetaCode, KEY_CODE origSubCode, +extern bool keyReAssignMapping( KEY_CODE origMetaCode, KEY_CODE origSubCode, KEY_CODE newMetaCode, KEY_CODE newSubCode ); extern KEY_MAPPING *getKeyMapFromName(char *pName); diff --git a/src/levels.cpp b/src/levels.cpp index 7827fbb2d..96351c0d0 100644 --- a/src/levels.cpp +++ b/src/levels.cpp @@ -89,7 +89,7 @@ enum LEVELPARSER_STATE // initialise the level system -BOOL levInitialise(void) +bool levInitialise(void) { psLevels = NULL; psBaseData = NULL; @@ -158,7 +158,7 @@ LEVEL_DATASET* levFindDataSet(const char* name) // parse a level description data file // the ignoreWrf hack is for compatibility with old maps that try to link in various // data files that we have removed -BOOL levParse(const char* buffer, size_t size, searchPathMode datadir, bool ignoreWrf) +bool levParse(const char* buffer, size_t size, searchPathMode datadir, bool ignoreWrf) { lexerinput_t input; LEVELPARSER_STATE state; @@ -455,7 +455,7 @@ BOOL levParse(const char* buffer, size_t size, searchPathMode datadir, bool igno // free the data for the current mission -BOOL levReleaseMissionData(void) +bool levReleaseMissionData(void) { SDWORD i; @@ -492,7 +492,7 @@ BOOL levReleaseMissionData(void) // free the currently loaded dataset -BOOL levReleaseAll(void) +bool levReleaseAll(void) { SDWORD i; @@ -542,7 +542,7 @@ BOOL levReleaseAll(void) } // load up a single wrf file -static BOOL levLoadSingleWRF(const char* name) +static bool levLoadSingleWRF(const char* name) { // free the old data if (!levReleaseAll()) @@ -590,11 +590,11 @@ char *getLevelName( void ) // load up the data for a level -BOOL levLoadData(const char* name, char *pSaveName, GAME_TYPE saveType) +bool levLoadData(const char* name, char *pSaveName, GAME_TYPE saveType) { LEVEL_DATASET *psNewLevel, *psBaseData, *psChangeLevel; SDWORD i; - BOOL bCamChangeSaveGame; + bool bCamChangeSaveGame; debug(LOG_WZ, "Loading level %s (%s, type %d)", name, pSaveName, (int)saveType); if (saveType == GTYPE_SAVE_START || saveType == GTYPE_SAVE_MIDMISSION) diff --git a/src/levels.h b/src/levels.h index 2aef2d034..4e64bedaf 100644 --- a/src/levels.h +++ b/src/levels.h @@ -75,24 +75,24 @@ struct LEVEL_DATASET extern LEVEL_DATASET *psLevels; // parse a level description data file -extern BOOL levParse(const char* buffer, size_t size, searchPathMode datadir, bool ignoreWrf); +extern bool levParse(const char* buffer, size_t size, searchPathMode datadir, bool ignoreWrf); // shutdown the level system extern void levShutDown(void); -extern BOOL levInitialise(void); +extern bool levInitialise(void); // load up the data for a level -extern BOOL levLoadData(const char* name, char *pSaveName, GAME_TYPE saveType); +extern bool levLoadData(const char* name, char *pSaveName, GAME_TYPE saveType); // find the level dataset extern LEVEL_DATASET* levFindDataSet(const char* name); // free the currently loaded dataset -extern BOOL levReleaseAll(void); +extern bool levReleaseAll(void); // free the data for the current mission -extern BOOL levReleaseMissionData(void); +extern bool levReleaseMissionData(void); //get the type of level currently being loaded of GTYPE type extern SDWORD getLevelLoadType(void); diff --git a/src/loadsave.cpp b/src/loadsave.cpp index e68947983..a71bdd8ee 100644 --- a/src/loadsave.cpp +++ b/src/loadsave.cpp @@ -90,19 +90,19 @@ #define SAVEENTRY_EDIT ID_LOADSAVE + totalslots + totalslots // save edit box. must be highest value possible I guess. -Q // //////////////////////////////////////////////////////////////////////////// -static BOOL _addLoadSave (BOOL bLoad, const char *sSearchPath, const char *sExtension, const char *title); +static bool _addLoadSave (bool bLoad, const char *sSearchPath, const char *sExtension, const char *title); static void displayLoadBanner (WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, PIELIGHT *pColours); static void displayLoadSlot (WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, PIELIGHT *pColours); static void displayLoadSaveEdit (WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, PIELIGHT *pColours); static W_SCREEN *psRequestScreen; // Widget screen for requester -static BOOL mode; +static bool mode; static UDWORD chosenSlotId; -BOOL bLoadSaveUp = false; // true when interface is up and should be run. +bool bLoadSaveUp = false; // true when interface is up and should be run. char saveGameName[256]; //the name of the save game to load from the front end char sRequestResult[PATH_MAX]; // filename returned; -BOOL bRequestLoad = false; +bool bRequestLoad = false; LOADSAVE_MODE bLoadSaveMode; static char sPath[255]; @@ -110,22 +110,22 @@ static char sExt[4]; // //////////////////////////////////////////////////////////////////////////// // return whether the save screen was displayed in the mission results screen -BOOL saveInMissionRes(void) +bool saveInMissionRes(void) { return bLoadSaveMode == SAVE_MISSIONEND; } // //////////////////////////////////////////////////////////////////////////// // return whether the save screen was displayed in the middle of a mission -BOOL saveMidMission(void) +bool saveMidMission(void) { return bLoadSaveMode == SAVE_INGAME; } // //////////////////////////////////////////////////////////////////////////// -BOOL addLoadSave(LOADSAVE_MODE mode, const char *sSearchPath, const char *sExtension, const char *title) +bool addLoadSave(LOADSAVE_MODE mode, const char *sSearchPath, const char *sExtension, const char *title) { -BOOL bLoad; +bool bLoad; bLoadSaveMode = mode; @@ -149,7 +149,7 @@ BOOL bLoad; //**************************************************************************************** // Load menu/save menu? //***************************************************************************************** -static BOOL _addLoadSave(BOOL bLoad, const char *sSearchPath, const char *sExtension, const char *title) +static bool _addLoadSave(bool bLoad, const char *sSearchPath, const char *sExtension, const char *title) { UDWORD slotCount; // removed hardcoded values! change with the defines above! -Q @@ -168,7 +168,7 @@ static BOOL _addLoadSave(BOOL bLoad, const char *sSearchPath, const char *sExten gameTimeStop(); if(GetGameMode() == GS_NORMAL) { - BOOL radOnScreen = radarOnScreen; // Only do this in main game. + bool radOnScreen = radarOnScreen; // Only do this in main game. bRender3DOnly = true; radarOnScreen = false; @@ -344,7 +344,7 @@ static BOOL _addLoadSave(BOOL bLoad, const char *sSearchPath, const char *sExten } // //////////////////////////////////////////////////////////////////////////// -BOOL closeLoadSave(void) +bool closeLoadSave(void) { widgDelete(psRequestScreen,LOADSAVE_FORM); bLoadSaveUp = false; @@ -423,7 +423,7 @@ void deleteSaveGame(char* saveGameName) // Returns true if cancel pressed or a valid game slot was selected. // if when returning true strlen(sRequestResult) != 0 then a valid game slot was selected // otherwise cancel was selected.. -BOOL runLoadSave(BOOL bResetMissionWidgets) +bool runLoadSave(bool bResetMissionWidgets) { UDWORD id=0; static char sDelete[PATH_MAX]; @@ -579,7 +579,7 @@ success: // //////////////////////////////////////////////////////////////////////////// // should be done when drawing the other widgets. -BOOL displayLoadSave(void) +bool displayLoadSave(void) { widgDisplayScreen(psRequestScreen); // display widgets. return true; diff --git a/src/loadsave.h b/src/loadsave.h index ed8472c56..d072a0380 100644 --- a/src/loadsave.h +++ b/src/loadsave.h @@ -42,11 +42,11 @@ SAVE_INGAME */ /***************************************************************************/ -extern BOOL bLoadSaveUp; // true when interface is up and should be run. +extern bool bLoadSaveUp; // true when interface is up and should be run. //the name of the save game to load from the front end extern char saveGameName[256]; extern char sRequestResult[PATH_MAX]; -extern BOOL bRequestLoad; +extern bool bRequestLoad; /***************************************************************************/ /* @@ -56,18 +56,18 @@ extern BOOL bRequestLoad; extern void drawBlueBox (UDWORD x,UDWORD y, UDWORD w, UDWORD h); -extern BOOL addLoadSave(LOADSAVE_MODE mode, const char *defaultdir, const char *extension, const char *title); -extern BOOL closeLoadSave (void); -extern BOOL runLoadSave (BOOL bResetMissionWidgets); -extern BOOL displayLoadSave (void); +extern bool addLoadSave(LOADSAVE_MODE mode, const char *defaultdir, const char *extension, const char *title); +extern bool closeLoadSave (void); +extern bool runLoadSave (bool bResetMissionWidgets); +extern bool displayLoadSave (void); extern void removeWildcards (char *pStr); // return whether the save screen was displayed in the mission results screen -BOOL saveInMissionRes(void); +bool saveInMissionRes(void); // return whether the save screen was displayed in the middle of a mission -BOOL saveMidMission(void); +bool saveMidMission(void); extern void deleteSaveGame(char* saveGameName); diff --git a/src/loop.cpp b/src/loop.cpp index 72fe06337..cf3ff99c5 100644 --- a/src/loop.cpp +++ b/src/loop.cpp @@ -104,8 +104,8 @@ unsigned int loopStateChanges; /* * local variables */ -static BOOL paused=false; -static BOOL video=false; +static bool paused=false; +static bool video=false; //holds which pause is valid at any one time struct PAUSE_STATE @@ -142,7 +142,7 @@ GAMECODE gameLoop(void) STRUCTURE *psCBuilding, *psNBuilding; FEATURE *psCFeat, *psNFeat; UDWORD i,widgval; - BOOL quitting=false; + bool quitting=false; INT_RETVAL intRetVal; int clearMode = 0; bool gameTicked; // true iff we are doing a logical update. @@ -802,12 +802,12 @@ SDWORD loop_GetVideoMode(void) return videoMode; } -BOOL loop_GetVideoStatus(void) +bool loop_GetVideoStatus(void) { return video; } -BOOL editPaused(void) +bool editPaused(void) { return pauseState.editPause; } @@ -817,60 +817,60 @@ void setEditPause(bool state) pauseState.editPause = state; } -BOOL gamePaused( void ) +bool gamePaused( void ) { return paused; } -void setGamePauseStatus( BOOL val ) +void setGamePauseStatus( bool val ) { paused = val; } -BOOL gameUpdatePaused(void) +bool gameUpdatePaused(void) { return pauseState.gameUpdatePause; } -BOOL audioPaused(void) +bool audioPaused(void) { return pauseState.audioPause; } -BOOL scriptPaused(void) +bool scriptPaused(void) { return pauseState.scriptPause; } -BOOL scrollPaused(void) +bool scrollPaused(void) { return pauseState.scrollPause; } -BOOL consolePaused(void) +bool consolePaused(void) { return pauseState.consolePause; } -void setGameUpdatePause(BOOL state) +void setGameUpdatePause(bool state) { pauseState.gameUpdatePause = state; } -void setAudioPause(BOOL state) +void setAudioPause(bool state) { pauseState.audioPause = state; } -void setScriptPause(BOOL state) +void setScriptPause(bool state) { pauseState.scriptPause = state; } -void setScrollPause(BOOL state) +void setScrollPause(bool state) { pauseState.scrollPause = state; } -void setConsolePause(BOOL state) +void setConsolePause(bool state) { pauseState.consolePause = state; } //set all the pause states to the state value -void setAllPauseStates(BOOL state) +void setAllPauseStates(bool state) { setGameUpdatePause(state); setAudioPause(state); @@ -922,7 +922,7 @@ void incNumConstructorDroids(UDWORD player) /* Fire waiting beacon messages which we couldn't run before */ static void fireWaitingCallbacks(void) { - BOOL bOK = true; + bool bOK = true; while(!isMsgStackEmpty() && bOK) { diff --git a/src/loop.h b/src/loop.h index 098b2a079..a2fdc1481 100644 --- a/src/loop.h +++ b/src/loop.h @@ -61,27 +61,27 @@ extern GAMECODE gameLoop(void); extern void videoLoop(void); extern void loop_SetVideoPlaybackMode(void); extern void loop_ClearVideoPlaybackMode(void); -extern BOOL loop_GetVideoStatus(void); +extern bool loop_GetVideoStatus(void); extern SDWORD loop_GetVideoMode(void); -extern BOOL gamePaused( void ); -extern void setGamePauseStatus( BOOL val ); +extern bool gamePaused( void ); +extern void setGamePauseStatus( bool val ); extern void loopFastExit(void); -extern BOOL gameUpdatePaused(void); -extern BOOL audioPaused(void); -extern BOOL scriptPaused(void); -extern BOOL scrollPaused(void); -extern BOOL consolePaused(void); -extern BOOL editPaused(void); +extern bool gameUpdatePaused(void); +extern bool audioPaused(void); +extern bool scriptPaused(void); +extern bool scrollPaused(void); +extern bool consolePaused(void); +extern bool editPaused(void); -extern void setGameUpdatePause(BOOL state); +extern void setGameUpdatePause(bool state); extern void setEditPause(bool state); -extern void setAudioPause(BOOL state); -extern void setScriptPause(BOOL state); -extern void setScrollPause(BOOL state); -extern void setConsolePause(BOOL state); +extern void setAudioPause(bool state); +extern void setScriptPause(bool state); +extern void setScrollPause(bool state); +extern void setConsolePause(bool state); //set all the pause states to the state value -extern void setAllPauseStates(BOOL state); +extern void setAllPauseStates(bool state); // Number of units in the current list. extern UDWORD getNumDroids(UDWORD player); diff --git a/src/main.cpp b/src/main.cpp index 55e34fd72..99a8f3505 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -124,7 +124,7 @@ int num_loaded_mods = 0; // Warzone 2100 . Pumpkin Studios //flag to indicate when initialisation is complete -BOOL gameInitialised = false; +bool gameInitialised = false; char SaveGamePath[PATH_MAX]; char ScreenDumpPath[PATH_MAX]; char MultiForcesPath[PATH_MAX]; @@ -141,7 +141,7 @@ static FOCUS_STATE focusState = FOCUS_IN; extern void debug_callback_stderr( void**, const char * ); extern void debug_callback_win32debug( void**, const char * ); -static BOOL inList( char * list[], const char * item ) +static bool inList( char * list[], const char * item ) { int i = 0; #ifdef DEBUG diff --git a/src/main.h b/src/main.h index 58d1bff43..b13f24047 100644 --- a/src/main.h +++ b/src/main.h @@ -29,8 +29,8 @@ enum GS_GAMEMODE }; //flag to indicate when initialisation is complete -extern BOOL gameInitialised; -extern BOOL bDisableLobby; +extern bool gameInitialised; +extern bool bDisableLobby; extern bool customDebugfile; extern GS_GAMEMODE GetGameMode(void) WZ_DECL_PURE; extern void SetGameMode(GS_GAMEMODE status); diff --git a/src/map.cpp b/src/map.cpp index 93969afba..2a8a60001 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -121,7 +121,7 @@ uint8_t *psAuxMap[MAX_PLAYERS + AUX_MAX]; // yes, we waste one element... static void SetGroundForTile(const char *filename, const char *nametype); static int getTextureType(const char *textureType); -static BOOL hasDecals(int i, int j); +static bool hasDecals(int i, int j); static void SetDecals(const char *filename, const char *decal_type); static void init_tileNames(int type); @@ -145,7 +145,7 @@ static int *mapDecals; // array that tells us what tile is a decal UBYTE terrainTypes[MAX_TILE_TEXTURES]; /* Create a new map of a specified size */ -BOOL mapNew(UDWORD width, UDWORD height) +bool mapNew(UDWORD width, UDWORD height) { MAPTILE *psTile; UDWORD i; @@ -312,7 +312,7 @@ static void init_tileNames(int type) // This is the main loading routine to get all the map's parameters set. // Once it figures out what tileset we need, we then parse the files for that tileset. // Currently, we only support 3 tilesets. Arizona, Urban, and Rockie -static BOOL mapLoadGroundTypes(void) +static bool mapLoadGroundTypes(void) { char *pFileData = NULL; char tilename[MAX_STR_LENGTH] = {'\0'}; @@ -570,7 +570,7 @@ static int determineGroundType(int x, int y, const char *tileset) int votes[2][2]; int i,j, tile; int a,b, best; - BOOL arizona, rockies, urban; + bool arizona, rockies, urban; arizona = rockies = urban = false; if (strcmp(tileset, "texpages/tertilesc1hw") == 0) { @@ -712,7 +712,7 @@ static void SetDecals(const char *filename, const char *decal_type) } // hasDecals() // Checks to see if the requested tile has a decal on it or not. -static BOOL hasDecals(int i, int j) +static bool hasDecals(int i, int j) { int index = 0; index = TileNumber_tile(mapTile(i, j)->texture); @@ -725,7 +725,7 @@ static BOOL hasDecals(int i, int j) } // mapSetGroundTypes() // Sets the ground type to be a decal or not -static BOOL mapSetGroundTypes(void) +static bool mapSetGroundTypes(void) { int i,j; @@ -751,7 +751,7 @@ static BOOL mapSetGroundTypes(void) } /* Initialise the map structure */ -BOOL mapLoad(char *filename, BOOL preview) +bool mapLoad(char *filename, bool preview) { UDWORD numGw, width, height; char aFileType[4]; @@ -949,7 +949,7 @@ failure: } /* Save the map data */ -BOOL mapSave(char **ppFileData, UDWORD *pFileSize) +bool mapSave(char **ppFileData, UDWORD *pFileSize) { UDWORD i; MAP_SAVEHEADER *psHeader = NULL; @@ -1058,7 +1058,7 @@ BOOL mapSave(char **ppFileData, UDWORD *pFileSize) } /* Shutdown the map module */ -BOOL mapShutdown(void) +bool mapShutdown(void) { int x; diff --git a/src/map.h b/src/map.h index 303fa01f6..f7a63e244 100644 --- a/src/map.h +++ b/src/map.h @@ -402,16 +402,16 @@ static inline void clip_world_offmap(int* worldX, int* worldY) #define map_round(coord) ((coord) & (TILE_UNITS - 1)) /* Shutdown the map module */ -extern BOOL mapShutdown(void); +extern bool mapShutdown(void); /* Create a new map of a specified size */ -extern BOOL mapNew(UDWORD width, UDWORD height); +extern bool mapNew(UDWORD width, UDWORD height); /* Load the map data */ -extern BOOL mapLoad(char *filename, BOOL preview); +extern bool mapLoad(char *filename, bool preview); /* Save the map data */ -extern BOOL mapSave(char **ppFileData, UDWORD *pFileSize); +extern bool mapSave(char **ppFileData, UDWORD *pFileSize); /** Return a pointer to the tile structure at x,y in map coordinates */ static inline WZ_DECL_PURE MAPTILE *mapTile(int32_t x, int32_t y) @@ -478,25 +478,25 @@ static inline void setTileHeight(int32_t x, int32_t y, int32_t height) } /* Return whether a tile coordinate is on the map */ -WZ_DECL_ALWAYS_INLINE static inline BOOL tileOnMap(SDWORD x, SDWORD y) +WZ_DECL_ALWAYS_INLINE static inline bool tileOnMap(SDWORD x, SDWORD y) { return (x >= 0) && (x < (SDWORD)mapWidth) && (y >= 0) && (y < (SDWORD)mapHeight); } -WZ_DECL_ALWAYS_INLINE static inline BOOL tileOnMap(Vector2i pos) +WZ_DECL_ALWAYS_INLINE static inline bool tileOnMap(Vector2i pos) { return tileOnMap(pos.x, pos.y); } /* Return true if a tile is not too near the map edge and not outside of the map */ -static inline BOOL tileInsideBuildRange(SDWORD x, SDWORD y) +static inline bool tileInsideBuildRange(SDWORD x, SDWORD y) { return (x >= TOO_NEAR_EDGE) && (x < ((SDWORD)mapWidth - TOO_NEAR_EDGE)) && (y >= TOO_NEAR_EDGE) && (y < ((SDWORD)mapHeight - TOO_NEAR_EDGE)); } /* Return whether a world coordinate is on the map */ -WZ_DECL_ALWAYS_INLINE static inline BOOL worldOnMap(int x, int y) +WZ_DECL_ALWAYS_INLINE static inline bool worldOnMap(int x, int y) { return (x >= 0) && (x < ((SDWORD)mapWidth << TILE_SHIFT)) && (y >= 0) && (y < ((SDWORD)mapHeight << TILE_SHIFT)); diff --git a/src/mapgrid.cpp b/src/mapgrid.cpp index 75958a407..faec7c8aa 100644 --- a/src/mapgrid.cpp +++ b/src/mapgrid.cpp @@ -39,7 +39,7 @@ PointTree::Filter *gridFiltersUnseen; PointTree::Filter *gridFiltersDroidsByPlayer; // initialise the grid system -BOOL gridInitialise(void) +bool gridInitialise(void) { ASSERT(gridPointTree == NULL, "gridInitialise already called, without calling gridShutDown."); gridPointTree = new PointTree; diff --git a/src/mapgrid.h b/src/mapgrid.h index 2965ac313..876bd09e8 100644 --- a/src/mapgrid.h +++ b/src/mapgrid.h @@ -28,7 +28,7 @@ extern void **gridIterator; ///< The iterator. // initialise the grid system -extern BOOL gridInitialise(void); +extern bool gridInitialise(void); // shutdown the grid system extern void gridShutDown(void); diff --git a/src/mechanics.cpp b/src/mechanics.cpp index 6b16a1635..27bf268da 100644 --- a/src/mechanics.cpp +++ b/src/mechanics.cpp @@ -51,7 +51,7 @@ bool mechanicsShutdown(void) // Allocate the list for a component -BOOL allocComponentList(COMPONENT_TYPE type, SDWORD number) +bool allocComponentList(COMPONENT_TYPE type, SDWORD number) { SDWORD inc, comp; @@ -133,7 +133,7 @@ void freeComponentLists(void) } //allocate the space for the Players' structure lists -BOOL allocStructLists(void) +bool allocStructLists(void) { SDWORD inc, stat; diff --git a/src/mechanics.h b/src/mechanics.h index 098a57e44..67196c28b 100644 --- a/src/mechanics.h +++ b/src/mechanics.h @@ -30,13 +30,13 @@ bool mechanicsShutdown(void); // Allocate the list for a component -BOOL allocComponentList(COMPONENT_TYPE type, SDWORD number); +bool allocComponentList(COMPONENT_TYPE type, SDWORD number); // release all the component lists void freeComponentLists(void); //allocate the space for the Players' structure lists -BOOL allocStructLists(void); +bool allocStructLists(void); // release the structure lists void freeStructureLists(void); diff --git a/src/message.cpp b/src/message.cpp index abc097990..93b0e834d 100644 --- a/src/message.cpp +++ b/src/message.cpp @@ -236,7 +236,7 @@ static inline void releaseAllMessages(MESSAGE *list[]) } } -BOOL messageInitVars(void) +bool messageInitVars(void) { int i; @@ -254,13 +254,13 @@ BOOL messageInitVars(void) } //allocates the viewdata heap -BOOL initViewData(void) +bool initViewData(void) { return true; } /* Adds a beacon message. A wrapper for addMessage() */ -MESSAGE * addBeaconMessage(MESSAGE_TYPE msgType, BOOL proxPos, UDWORD player) +MESSAGE * addBeaconMessage(MESSAGE_TYPE msgType, bool proxPos, UDWORD player) { MESSAGE* psBeaconMsgToAdd = addMessage(msgType, proxPos, player); @@ -274,7 +274,7 @@ MESSAGE * addBeaconMessage(MESSAGE_TYPE msgType, BOOL proxPos, UDWORD player) /* adds a proximity display - holds variables that enable the message to be displayed in the Intelligence Screen*/ -static void addProximityDisplay(MESSAGE *psMessage, BOOL proxPos, UDWORD player) +static void addProximityDisplay(MESSAGE *psMessage, bool proxPos, UDWORD player) { PROXIMITY_DISPLAY *psToAdd; @@ -324,7 +324,7 @@ static void addProximityDisplay(MESSAGE *psMessage, BOOL proxPos, UDWORD player) } /*Add a message to the list */ -MESSAGE * addMessage(MESSAGE_TYPE msgType, BOOL proxPos, UDWORD player) +MESSAGE * addMessage(MESSAGE_TYPE msgType, bool proxPos, UDWORD player) { //first create a message of the required type MESSAGE* psMsgToAdd = createMessage(msgType, player); @@ -431,7 +431,7 @@ void releaseAllProxDisp(void) } /* Initialise the message heaps */ -BOOL initMessage(void) +bool initMessage(void) { //set up the imd used for proximity messages pProximityMsgIMD = (iIMDShape *)resGetData("IMD", "arrow.pie"); @@ -862,7 +862,7 @@ VIEWDATA * getViewData(const char *pName) } /* Release the message heaps */ -BOOL messageShutdown(void) +bool messageShutdown(void) { freeMessages(); diff --git a/src/message.h b/src/message.h index 9a75d807b..286cc8819 100644 --- a/src/message.h +++ b/src/message.h @@ -39,19 +39,19 @@ extern iIMDShape *pProximityMsgIMD; extern PROXIMITY_DISPLAY *apsProxDisp[MAX_PLAYERS]; /** Allocates the viewdata heap. */ -BOOL initViewData(void); +bool initViewData(void); /** Initialise the message heaps. */ -BOOL initMessage(void); +bool initMessage(void); /** Release the message heaps. */ -BOOL messageShutdown(void); +bool messageShutdown(void); /** Add a message to the list. */ -MESSAGE * addMessage(MESSAGE_TYPE msgType, BOOL proxPos, UDWORD player); +MESSAGE * addMessage(MESSAGE_TYPE msgType, bool proxPos, UDWORD player); /** Add a beacon message to the list. */ -MESSAGE * addBeaconMessage(MESSAGE_TYPE msgType, BOOL proxPos, UDWORD player); +MESSAGE * addBeaconMessage(MESSAGE_TYPE msgType, bool proxPos, UDWORD player); /** Remove a message. */ void removeMessage(MESSAGE *psDel, UDWORD player); @@ -85,6 +85,6 @@ MESSAGE* findMessage(MSG_VIEWDATA *pViewdata, MESSAGE_TYPE type, UDWORD player); /** 'Displays' a proximity display. */ void displayProximityMessage(PROXIMITY_DISPLAY *psProxDisp); -BOOL messageInitVars(void); +bool messageInitVars(void); #endif // __INCLUDED_SRC_MESSAGE_H__ diff --git a/src/messagedef.h b/src/messagedef.h index 17ee49283..6b6d3d7b3 100644 --- a/src/messagedef.h +++ b/src/messagedef.h @@ -124,7 +124,7 @@ struct MESSAGE MESSAGE_TYPE type; //The type of message UDWORD id; //ID number of the message MSG_VIEWDATA *pViewData; //Pointer to view data - if any - should be some! - BOOL read; //flag to indicate whether message has been read + bool read; //flag to indicate whether message has been read UDWORD player; //which player this message belongs to MSG_DATA_TYPE dataType; //stores actual type of data pViewData points to //only relevant for messages of type MSG_PROXIMITY diff --git a/src/miscimd.cpp b/src/miscimd.cpp index 74e919539..e8cb9782b 100644 --- a/src/miscimd.cpp +++ b/src/miscimd.cpp @@ -87,10 +87,10 @@ static MISC_IMD miscImds[] = // ------------------------------------------------------------------------------- // Load up all the imds into an array -static BOOL multiLoadMiscImds( void ) +static bool multiLoadMiscImds( void ) { UDWORD i=0; -BOOL bMoreToProcess=true; +bool bMoreToProcess=true; char name[15]; // hopefully! /* Go thru' the list */ @@ -172,7 +172,7 @@ static bool initMiscImd(unsigned i, unsigned n, const char *nameFormat, unsigned return true; } -BOOL initMiscImds( void ) +bool initMiscImds( void ) { unsigned i; diff --git a/src/miscimd.h b/src/miscimd.h index 6f325790d..1af12fac8 100644 --- a/src/miscimd.h +++ b/src/miscimd.h @@ -25,7 +25,7 @@ #include "structuredef.h" #include "messagedef.h" -extern BOOL initMiscImds( void ); +extern bool initMiscImds( void ); extern iIMDShape *getImdFromIndex(UDWORD index); extern iIMDShape *getRandomWreckageImd( void ); extern iIMDShape *getRandomDebrisImd( void ); diff --git a/src/mission.cpp b/src/mission.cpp index fd0182f8d..0de9b5c8f 100644 --- a/src/mission.cpp +++ b/src/mission.cpp @@ -125,10 +125,10 @@ MISSION mission; -BOOL offWorldKeepLists; +bool offWorldKeepLists; // Set by scrFlyInTransporter. True if were currenly tracking the transporter. -BOOL bTrackingTransporter = false; +bool bTrackingTransporter = false; /*lists of droids that are held seperate over several missions. There should only be selectedPlayer's droids but have possibility for MAX_PLAYERS - @@ -140,10 +140,10 @@ DROID *apsLimboDroids[MAX_PLAYERS]; static LANDING_ZONE sLandingZone[MAX_NOGO_AREAS]; //flag to indicate when the droids in a Transporter are flown to safety and not the next mission -static BOOL bDroidsToSafety; +static bool bDroidsToSafety; /* mission result holder */ -static BOOL g_bMissionResult; +static bool g_bMissionResult; // return positions for vtols Vector2i asVTOLReturnPos[MAX_PLAYERS]; @@ -154,13 +154,13 @@ static UBYTE bPlayCountDown; //FUNCTIONS************** static void addLandingLights( UDWORD x, UDWORD y); -static BOOL startMissionOffClear(char *pGame); -static BOOL startMissionOffKeep(char *pGame); -static BOOL startMissionCampaignStart(char *pGame); -static BOOL startMissionCampaignChange(char *pGame); -static BOOL startMissionCampaignExpand(char *pGame); -static BOOL startMissionCampaignExpandLimbo(char *pGame); -static BOOL startMissionBetween(void); +static bool startMissionOffClear(char *pGame); +static bool startMissionOffKeep(char *pGame); +static bool startMissionCampaignStart(char *pGame); +static bool startMissionCampaignChange(char *pGame); +static bool startMissionCampaignExpand(char *pGame); +static bool startMissionCampaignExpandLimbo(char *pGame); +static bool startMissionBetween(void); static void endMissionCamChange(void); static void endMissionOffClear(void); static void endMissionOffKeep(void); @@ -176,20 +176,20 @@ static void restoreMissionLimboData(void); static void processMissionLimbo(void); static void intUpdateMissionTimer(WIDGET *psWidget, W_CONTEXT *psContext); -static BOOL intAddMissionTimer(void); +static bool intAddMissionTimer(void); static void intUpdateTransporterTimer(WIDGET *psWidget, W_CONTEXT *psContext); static void adjustMissionPower(void); static void saveMissionPower(void); static UDWORD getHomeLandingX(void); static UDWORD getHomeLandingY(void); -static void fillTimeDisplay(char *psText, UDWORD time, BOOL bHours); +static void fillTimeDisplay(char *psText, UDWORD time, bool bHours); static void processPreviousCampDroids(void); -static BOOL intAddTransporterTimer(void); +static bool intAddTransporterTimer(void); static void clearCampaignUnits(void); -static void emptyTransporters(BOOL bOffWorld); +static void emptyTransporters(bool bOffWorld); -BOOL MissionResUp = false; -BOOL ClosingMissionRes = false; +bool MissionResUp = false; +bool ClosingMissionRes = false; static SDWORD g_iReinforceTime = 0; @@ -198,7 +198,7 @@ static UDWORD camNumber = 1; //returns true if on an off world mission -BOOL missionIsOffworld(void) +bool missionIsOffworld(void) { return ((mission.type == LDS_MKEEP) || (mission.type == LDS_MCLEAR) @@ -207,7 +207,7 @@ BOOL missionIsOffworld(void) } //returns true if the correct type of mission for reinforcements -BOOL missionForReInforcements(void) +bool missionForReInforcements(void) { if (mission.type == LDS_CAMSTART || missionIsOffworld() || mission.type == LDS_CAMCHANGE) { @@ -220,7 +220,7 @@ BOOL missionForReInforcements(void) } //returns true if the correct type of mission and a reinforcement time has been set -BOOL missionCanReEnforce(void) +bool missionCanReEnforce(void) { if (mission.ETA >= 0) { @@ -233,7 +233,7 @@ BOOL missionCanReEnforce(void) } //returns true if the mission is a Limbo Expand mission -BOOL missionLimboExpand(void) +bool missionLimboExpand(void) { return (mission.type == LDS_EXPAND_LIMBO); } @@ -305,7 +305,7 @@ void releaseMission(void) } //called to shut down when mid-mission on an offWorld map -BOOL missionShutDown(void) +bool missionShutDown(void) { UDWORD inc; @@ -401,9 +401,9 @@ void setMissionCountDown(void) } -BOOL startMission(LEVEL_TYPE missionType, char *pGame) +bool startMission(LEVEL_TYPE missionType, char *pGame) { - BOOL loaded = true; + bool loaded = true; debug(LOG_SAVE, "type %d", (int)missionType); @@ -539,7 +539,7 @@ BOOL startMission(LEVEL_TYPE missionType, char *pGame) // initialise the mission stuff for a save game -BOOL startMissionSave(SDWORD missionType) +bool startMissionSave(SDWORD missionType) { mission.type = missionType; @@ -569,7 +569,7 @@ adding the timer button*/ void addTransporterTimerInterface(void) { DROID *psDroid, *psTransporter; - BOOL bAddInterface = false; + bool bAddInterface = false; W_CLICKFORM *psForm; //check if reinforcements are allowed @@ -650,7 +650,7 @@ void missionGetNearestCorner( UWORD iX, UWORD iY, UWORD *piOffX, UWORD *piOffY ) } /* fly in transporters at start of level */ -void missionFlyTransportersIn( SDWORD iPlayer, BOOL bTrackTransporter ) +void missionFlyTransportersIn( SDWORD iPlayer, bool bTrackTransporter ) { DROID *psTransporter, *psNext; UWORD iX, iY, iZ; @@ -738,7 +738,7 @@ static void saveMissionData(void) UDWORD inc; DROID *psDroid; STRUCTURE *psStruct, *psStructBeingBuilt; - BOOL bRepairExists; + bool bRepairExists; debug(LOG_SAVE, "called"); @@ -1206,7 +1206,7 @@ void saveCampaignData(void) //start an off world mission - clearing the object lists -BOOL startMissionOffClear(char *pGame) +bool startMissionOffClear(char *pGame) { debug(LOG_SAVE, "called for %s", pGame); @@ -1234,7 +1234,7 @@ BOOL startMissionOffClear(char *pGame) } //start an off world mission - keeping the object lists -BOOL startMissionOffKeep(char *pGame) +bool startMissionOffKeep(char *pGame) { debug(LOG_SAVE, "called for %s", pGame); saveMissionData(); @@ -1260,7 +1260,7 @@ BOOL startMissionOffKeep(char *pGame) return true; } -BOOL startMissionCampaignStart(char *pGame) +bool startMissionCampaignStart(char *pGame) { debug(LOG_SAVE, "called for %s", pGame); @@ -1281,7 +1281,7 @@ BOOL startMissionCampaignStart(char *pGame) return true; } -BOOL startMissionCampaignChange(char *pGame) +bool startMissionCampaignChange(char *pGame) { // Clear out all intelligence screen messages freeMessages(); @@ -1306,7 +1306,7 @@ BOOL startMissionCampaignChange(char *pGame) return true; } -BOOL startMissionCampaignExpand(char *pGame) +bool startMissionCampaignExpand(char *pGame) { //load in the new game details if (!loadGame(pGame, KEEPOBJECTS, !FREEMEM, false)) @@ -1321,7 +1321,7 @@ BOOL startMissionCampaignExpand(char *pGame) return true; } -BOOL startMissionCampaignExpandLimbo(char *pGame) +bool startMissionCampaignExpandLimbo(char *pGame) { saveMissionLimboData(); @@ -1336,7 +1336,7 @@ BOOL startMissionCampaignExpandLimbo(char *pGame) return true; } -static BOOL startMissionBetween(void) +static bool startMissionBetween(void) { offWorldKeepLists = false; @@ -1719,7 +1719,7 @@ static void missionResetDroids(void) for (psDroid = apsDroidLists[selectedPlayer]; psDroid != NULL; psDroid = psDroid->psNext) { - BOOL placed = false; + bool placed = false; psNext = psDroid->psNext; @@ -1835,7 +1835,7 @@ static void missionResetDroids(void) /*unloads the Transporter passed into the mission at the specified x/y goingHome = true when returning from an off World mission*/ -void unloadTransporter(DROID *psTransporter, UDWORD x, UDWORD y, BOOL goingHome) +void unloadTransporter(DROID *psTransporter, UDWORD x, UDWORD y, bool goingHome) { DROID *psDroid, *psNext; DROID **ppCurrentList; @@ -2014,7 +2014,7 @@ void missionMoveTransporterOffWorld( DROID *psTransporter ) //add the Mission timer into the top right hand corner of the screen -BOOL intAddMissionTimer(void) +bool intAddMissionTimer(void) { //check to see if it exists already if (widgGetFromID(psWScreen,IDTIMER_FORM) != NULL) @@ -2062,7 +2062,7 @@ BOOL intAddMissionTimer(void) } //add the Transporter timer into the top left hand corner of the screen -BOOL intAddTransporterTimer(void) +bool intAddTransporterTimer(void) { // Make sure that Transporter Launch button isn't up as well intRemoveTransporterLaunch(); @@ -2135,7 +2135,7 @@ UDWORD missionGetReinforcementTime(void) } //fills in a hours(if bHours = true), minutes and seconds display for a given time in 1000th sec -void fillTimeDisplay(char *psText, UDWORD time, BOOL bHours) +void fillTimeDisplay(char *psText, UDWORD time, bool bHours) { UDWORD calcTime, inc = 0; @@ -2397,7 +2397,7 @@ static void missionResetInGameState( void ) intRemoveMissionTimer(); } -static BOOL _intAddMissionResult(BOOL result, BOOL bPlaySuccess) +static bool _intAddMissionResult(bool result, bool bPlaySuccess) { missionResetInGameState(); @@ -2557,7 +2557,7 @@ static BOOL _intAddMissionResult(BOOL result, BOOL bPlaySuccess) } -BOOL intAddMissionResult(BOOL result, BOOL bPlaySuccess) +bool intAddMissionResult(bool result, bool bPlaySuccess) { /* save result */ g_bMissionResult = result; @@ -2727,7 +2727,7 @@ void launchMission(void) //sets up the game to start a new mission -BOOL setUpMission(UDWORD type) +bool setUpMission(UDWORD type) { // Close the interface intResetScreen(true); @@ -2744,7 +2744,7 @@ BOOL setUpMission(UDWORD type) if (type == LDS_CAMSTART) { // Another one of those lovely hacks!! - BOOL bPlaySuccess = true; + bool bPlaySuccess = true; // We don't want the 'mission accomplished' audio/text message at end of cam1 if (getCampaignNumber() == 2) @@ -2915,7 +2915,7 @@ void setNoGoArea(UBYTE x1, UBYTE y1, UBYTE x2, UBYTE y2, UBYTE area) } } -static inline void addLandingLight(int x, int y, LAND_LIGHT_SPEC spec, BOOL lit) +static inline void addLandingLight(int x, int y, LAND_LIGHT_SPEC spec, bool lit) { // The height the landing lights should be above the ground static const unsigned int AboveGround = 16; @@ -2950,7 +2950,7 @@ static void addLandingLights( UDWORD x, UDWORD y) /* checks the x,y passed in are not within the boundary of any Landing Zone x and y in tile coords*/ -BOOL withinLandingZone(UDWORD x, UDWORD y) +bool withinLandingZone(UDWORD x, UDWORD y) { UDWORD inc; @@ -3214,11 +3214,11 @@ void processPreviousCampDroids(void) } //access functions for droidsToSafety flag - so we don't have to end the mission when a Transporter fly's off world -void setDroidsToSafetyFlag(BOOL set) +void setDroidsToSafetyFlag(bool set) { bDroidsToSafety = set; } -BOOL getDroidsToSafetyFlag(void) +bool getDroidsToSafetyFlag(void) { return bDroidsToSafety; } @@ -3229,17 +3229,17 @@ void setPlayCountDown(UBYTE set) { bPlayCountDown = set; } -BOOL getPlayCountDown(void) +bool getPlayCountDown(void) { return bPlayCountDown; } //checks to see if the player has any droids (except Transporters left) -BOOL missionDroidsRemaining(UDWORD player) +bool missionDroidsRemaining(UDWORD player) { DROID *psDroid; - BOOL bDroidsRemaining = false; + bool bDroidsRemaining = false; for (psDroid = apsDroidLists[player]; psDroid != NULL; psDroid = psDroid->psNext) { if (psDroid->droidType != DROID_TRANSPORTER) @@ -3359,7 +3359,7 @@ UDWORD getCampaignNumber( void ) /*deals with any selectedPlayer's transporters that are flying in when the mission ends. bOffWorld is true if the Mission is currenly offWorld*/ -void emptyTransporters(BOOL bOffWorld) +void emptyTransporters(bool bOffWorld) { DROID *psTransporter, *psDroid, *psNext, *psNextTrans; @@ -3429,7 +3429,7 @@ void emptyTransporters(BOOL bOffWorld) /*bCheating = true == start of cheat bCheating = false == end of cheat */ -void setMissionCheatTime(BOOL bCheating) +void setMissionCheatTime(bool bCheating) { if (bCheating) { diff --git a/src/mission.h b/src/mission.h index 17717502d..bd7b0050a 100644 --- a/src/mission.h +++ b/src/mission.h @@ -38,10 +38,10 @@ #define LIMBO_LANDING MAX_PLAYERS /** Set by scrFlyInTransporter. True if were currenly tracking the transporter. */ -extern BOOL bTrackingTransporter; +extern bool bTrackingTransporter; extern MISSION mission; -extern BOOL offWorldKeepLists; +extern bool offWorldKeepLists; extern DROID *apsLimboDroids[MAX_PLAYERS]; /** Return positions for vtols. */ @@ -49,7 +49,7 @@ extern Vector2i asVTOLReturnPos[MAX_PLAYERS]; extern bool Cheated; extern void initMission(void); -extern BOOL missionShutDown(void); +extern bool missionShutDown(void); extern void missionDestroyObjects(void); /** This is called everytime the game is quit. */ @@ -58,14 +58,14 @@ extern void releaseMission(void); /** On the PC - sets the countdown played flag. */ extern void setMissionCountDown(void); -extern BOOL startMission(LEVEL_TYPE missionType, char *pGame); +extern bool startMission(LEVEL_TYPE missionType, char *pGame); extern void endMission(void); /** Initialise the mission stuff for a save game. */ -extern BOOL startMissionSave(SDWORD missionType); +extern bool startMissionSave(SDWORD missionType); /** Sets up the game to start a new mission. */ -extern BOOL setUpMission(UDWORD type); +extern bool setUpMission(UDWORD type); /** This causes the new mission data to be loaded up. */ extern void launchMission(void); @@ -73,12 +73,12 @@ extern void launchMission(void); /** The update routine for all droids left back at home base. Only interested in Transporters at present. */ extern void missionDroidUpdate(DROID *psDroid); -extern BOOL missionIsOffworld(void); -extern BOOL missionCanReEnforce(void); -extern BOOL missionForReInforcements(void); +extern bool missionIsOffworld(void); +extern bool missionCanReEnforce(void); +extern bool missionForReInforcements(void); /** Returns true if the mission is a Limbo Expand mission. */ -extern BOOL missionLimboExpand(void); +extern bool missionLimboExpand(void); /** This is called mid Limbo mission via the script. */ extern void resetLimboMission(void); @@ -100,8 +100,8 @@ extern void swapMissionPointers(void); #define TIMER_Y 22 // status of the mission result screens. -extern BOOL MissionResUp; -extern BOOL ClosingMissionRes; +extern bool MissionResUp; +extern bool ClosingMissionRes; extern void intRemoveMissionResult (void); extern void intRemoveMissionResultNoAnim (void); @@ -109,7 +109,7 @@ extern void intProcessMissionResult (UDWORD id); extern void intRunMissionResult (void); extern void unloadTransporter(DROID *psTransporter, UDWORD x, UDWORD y, - BOOL goingHome); + bool goingHome); /** Sets the appropriate pause states for when the interface is up but the game needs to be paused. */ extern void setMissionPauseState(void); @@ -137,10 +137,10 @@ extern void intRemoveMissionTimer(void); //access functions for bPlayCountDown flag extern void setPlayCountDown(UBYTE set); -extern BOOL getPlayCountDown(void); +extern bool getPlayCountDown(void); /** Checks the x,y passed in are not within the boundary of the Landing Zone x and y in tile coords. */ -extern BOOL withinLandingZone(UDWORD x, UDWORD y); +extern bool withinLandingZone(UDWORD x, UDWORD y); //sets the coords for the Transporter to land extern void setLandingZone(UBYTE x1, UBYTE y1, UBYTE x2, UBYTE y2); @@ -153,7 +153,7 @@ extern void initNoGoAreas(void); extern void setNoGoArea(UBYTE x1, UBYTE y1, UBYTE x2, UBYTE y2, UBYTE area); /** Fly in transporters at start of level. */ -extern void missionFlyTransportersIn( SDWORD iPlayer, BOOL bTrackTransporter ); +extern void missionFlyTransportersIn( SDWORD iPlayer, bool bTrackTransporter ); /** Move transporter offworld. */ extern void missionMoveTransporterOffWorld( DROID *psTransporter ); @@ -176,11 +176,11 @@ extern void missionGetTransporterEntry( SDWORD iPlayer, UWORD *iX, UWORD *iY ); extern void missionGetTransporterExit( SDWORD iPlayer, UDWORD *iX, UDWORD *iY ); //access functions for droidsToSafety flag -extern void setDroidsToSafetyFlag(BOOL set); -extern BOOL getDroidsToSafetyFlag(void); +extern void setDroidsToSafetyFlag(bool set); +extern bool getDroidsToSafetyFlag(void); /** Checks to see if the player has any droids (except Transporters left). */ -extern BOOL missionDroidsRemaining(UDWORD player); +extern bool missionDroidsRemaining(UDWORD player); /** * Called when a Transporter gets to the edge of the world and the droids are being flown to safety. @@ -196,7 +196,7 @@ extern void resetMissionWidgets(void); extern UDWORD getCampaignNumber( void ); extern void setCampaignNumber( UDWORD number ); -extern BOOL intAddMissionResult(BOOL result, BOOL bPlaySuccess); +extern bool intAddMissionResult(bool result, bool bPlaySuccess); /** Reset the vtol landing pos. */ void resetVTOLLandingPos(void); @@ -205,7 +205,7 @@ void resetVTOLLandingPos(void); extern void placeLimboDroids(void); /** bCheating = true == start of cheat, bCheating = false == end of cheat. */ -extern void setMissionCheatTime(BOOL bCheating); +extern void setMissionCheatTime(bool bCheating); #define MISSIONRES_X 20 // pos & size of box. diff --git a/src/move.cpp b/src/move.cpp index 8eb373a61..56a576fc2 100644 --- a/src/move.cpp +++ b/src/move.cpp @@ -202,7 +202,7 @@ const char *moveDescription(MOVE_STATUS status) /** Initialise the movement system */ -BOOL moveInitialise(void) +bool moveInitialise(void) { oilTimer = 0; drumCount = 0; @@ -221,7 +221,7 @@ void moveUpdateBaseSpeed(void) * should not try to route here again for a while * @todo Document what "should not try to route here again for a while" means. */ -static BOOL moveDroidToBase(DROID *psDroid, UDWORD x, UDWORD y, BOOL bFormation) +static bool moveDroidToBase(DROID *psDroid, UDWORD x, UDWORD y, bool bFormation) { FPATH_RETVAL retVal = FPR_OK; @@ -282,7 +282,7 @@ static BOOL moveDroidToBase(DROID *psDroid, UDWORD x, UDWORD y, BOOL bFormation) /** Move a droid to a location, joining a formation * @see moveDroidToBase() for the parameter and return value specification */ -BOOL moveDroidTo(DROID* psDroid, UDWORD x, UDWORD y) +bool moveDroidTo(DROID* psDroid, UDWORD x, UDWORD y) { return moveDroidToBase(psDroid,x,y, true); } @@ -290,7 +290,7 @@ BOOL moveDroidTo(DROID* psDroid, UDWORD x, UDWORD y) /** Move a droid to a location, not joining a formation * @see moveDroidToBase() for the parameter and return value specification */ -BOOL moveDroidToNoFormation(DROID* psDroid, UDWORD x, UDWORD y) +bool moveDroidToNoFormation(DROID* psDroid, UDWORD x, UDWORD y) { ASSERT(x > 0 && y > 0, "Bad movement position"); return moveDroidToBase(psDroid,x,y, false); @@ -330,7 +330,7 @@ static void moveShuffleDroid(DROID *psDroid, Vector2i s) { DROID *psCurr; SDWORD mx, my; - BOOL frontClear = true, leftClear = true, rightClear = true; + bool frontClear = true, leftClear = true, rightClear = true; SDWORD lvx,lvy, rvx,rvy, svx,svy; SDWORD shuffleMove; SDWORD tarX,tarY; @@ -744,7 +744,7 @@ static void moveCheckSquished(DROID *psDroid, int32_t emx, int32_t emy) // See if the droid has been stopped long enough to give up on the move -static BOOL moveBlocked(DROID *psDroid) +static bool moveBlocked(DROID *psDroid) { SDWORD xdiff,ydiff, diffSq; UDWORD blockTime; @@ -1013,7 +1013,7 @@ static void moveCalcBlockingSlide(DROID *psDroid, int32_t *pmx, int32_t *pmy, ui // on a blocking tile - see if we need to jump off int intx = psDroid->pos.x & TILE_MASK; int inty = psDroid->pos.y & TILE_MASK; - BOOL bJumped = false; + bool bJumped = false; int jumpx = psDroid->pos.x; int jumpy = psDroid->pos.y; @@ -1134,7 +1134,7 @@ static void moveCalcDroidSlide(DROID *psDroid, int *pmx, int *pmy) { int32_t droidR, rad, radSq, objR, xdiff, ydiff, distSq, spmx, spmy; BASE_OBJECT *psObj, *psObst; - BOOL bLegs; + bool bLegs; CHECK_DROID(psDroid); @@ -1415,7 +1415,7 @@ SDWORD moveCalcDroidSpeed(DROID *psDroid) /** Determine whether a droid has stopped moving. * @return true if the droid doesn't move, false if it's moving. */ -static BOOL moveDroidStopped(DROID* psDroid, SDWORD speed) +static bool moveDroidStopped(DROID* psDroid, SDWORD speed) { if (psDroid->sMove.Status == MOVEINACTIVE && speed == 0 && psDroid->sMove.speed == 0) { @@ -2102,7 +2102,7 @@ static void moveDescending( DROID *psDroid ) } -BOOL moveCheckDroidMovingAndVisible( void *psObj ) +bool moveCheckDroidMovingAndVisible( void *psObj ) { DROID *psDroid = (DROID*)psObj; @@ -2169,7 +2169,7 @@ static void movePlayDroidMoveAudio( DROID *psDroid ) } -static BOOL moveDroidStartCallback( void *psObj ) +static bool moveDroidStartCallback( void *psObj ) { DROID *psDroid = (DROID*)psObj; @@ -2184,12 +2184,12 @@ static BOOL moveDroidStartCallback( void *psObj ) } -static void movePlayAudio( DROID *psDroid, BOOL bStarted, BOOL bStoppedBefore, SDWORD iMoveSpeed ) +static void movePlayAudio( DROID *psDroid, bool bStarted, bool bStoppedBefore, SDWORD iMoveSpeed ) { UBYTE propType; PROPULSION_STATS *psPropStats; PROPULSION_TYPES *psPropType; - BOOL bStoppedNow; + bool bStoppedNow; SDWORD iAudioID = NO_SOUND; AUDIO_CALLBACK pAudioCallback = NULL; @@ -2347,7 +2347,7 @@ void moveUpdateDroid(DROID *psDroid) uint16_t moveDir; PROPULSION_STATS *psPropStats; Vector3i pos; - BOOL bStarted = false, bStopped; + bool bStarted = false, bStopped; CHECK_DROID(psDroid); diff --git a/src/move.h b/src/move.h index e63e483b5..b12e1c907 100644 --- a/src/move.h +++ b/src/move.h @@ -27,17 +27,17 @@ #include "objectdef.h" /* Initialise the movement system */ -extern BOOL moveInitialise(void); +extern bool moveInitialise(void); /* Update the base speed for all movement */ extern void moveUpdateBaseSpeed(void); -/* Set a target location for a droid to move to - returns a BOOL based on if there is a path to the destination (true if there is a path)*/ -extern BOOL moveDroidTo(DROID *psDroid, UDWORD x, UDWORD y); +/* Set a target location for a droid to move to - returns a bool based on if there is a path to the destination (true if there is a path)*/ +extern bool moveDroidTo(DROID *psDroid, UDWORD x, UDWORD y); -/* Set a target location for a droid to move to - returns a BOOL based on if there is a path to the destination (true if there is a path)*/ +/* Set a target location for a droid to move to - returns a bool based on if there is a path to the destination (true if there is a path)*/ // the droid will not join a formation when it gets to the location -extern BOOL moveDroidToNoFormation(DROID *psDroid, UDWORD x, UDWORD y); +extern bool moveDroidToNoFormation(DROID *psDroid, UDWORD x, UDWORD y); // move a droid directly to a location (used by vtols only) extern void moveDroidToDirect(DROID *psDroid, UDWORD x, UDWORD y); @@ -63,7 +63,7 @@ extern void moveUpdateTracked(DROID *psDroid); extern void updateDroidOrientation(DROID *psDroid); /* audio callback used to kill movement sounds */ -extern BOOL moveCheckDroidMovingAndVisible( void *psObj ); +extern bool moveCheckDroidMovingAndVisible( void *psObj ); // set a vtol to be hovering in the air void moveMakeVtolHover( DROID *psDroid ); diff --git a/src/multibot.cpp b/src/multibot.cpp index a03d765a3..5815a2a17 100644 --- a/src/multibot.cpp +++ b/src/multibot.cpp @@ -141,7 +141,7 @@ static BASE_OBJECT *const TargetMissing = &TargetMissing_; // Error return valu // Secondary Orders. // Send -BOOL sendDroidSecondary(const DROID* psDroid, SECONDARY_ORDER sec, SECONDARY_STATE state) +bool sendDroidSecondary(const DROID* psDroid, SECONDARY_ORDER sec, SECONDARY_STATE state) { if (!bMultiMessages) return true; @@ -165,7 +165,7 @@ BOOL sendDroidSecondary(const DROID* psDroid, SECONDARY_ORDER sec, SECONDARY_STA * * \sa recvDroidEmbark(),sendDroidDisEmbark(),recvDroidDisEmbark() */ -BOOL sendDroidEmbark(const DROID* psDroid, const DROID* psTransporter) +bool sendDroidEmbark(const DROID* psDroid, const DROID* psTransporter) { if (!bMultiMessages) return true; @@ -187,11 +187,11 @@ BOOL sendDroidEmbark(const DROID* psDroid, const DROID* psTransporter) * * \sa sendDroidEmbark(),sendDroidDisEmbark(),recvDroidDisEmbark() */ -BOOL recvDroidEmbark(NETQUEUE queue) +bool recvDroidEmbark(NETQUEUE queue) { DROID* psDroid; DROID* psTransporterDroid; - BOOL bDroidRemoved; + bool bDroidRemoved; NETbeginDecode(queue, GAME_DROIDEMBARK); { @@ -254,7 +254,7 @@ BOOL recvDroidEmbark(NETQUEUE queue) * * \sa sendDroidEmbark(),recvDroidEmbark(),recvDroidDisEmbark() */ -BOOL sendDroidDisEmbark(const DROID* psDroid, const DROID* psTransporter) +bool sendDroidDisEmbark(const DROID* psDroid, const DROID* psTransporter) { if (!bMultiMessages) return true; @@ -278,7 +278,7 @@ BOOL sendDroidDisEmbark(const DROID* psDroid, const DROID* psTransporter) * * \sa sendDroidEmbark(),recvDroidEmbark(),sendDroidDisEmbark() */ -BOOL recvDroidDisEmbark(NETQUEUE queue) +bool recvDroidDisEmbark(NETQUEUE queue) { DROID *psFoundDroid = NULL, *psTransporterDroid = NULL; DROID *psCheckDroid = NULL; @@ -356,7 +356,7 @@ BOOL recvDroidDisEmbark(NETQUEUE queue) // //////////////////////////////////////////////////////////////////////////// // Send a new Droid to the other players -BOOL SendDroid(const DROID_TEMPLATE* pTemplate, uint32_t x, uint32_t y, uint8_t player, uint32_t id, const INITIAL_DROID_ORDERS *initialOrdersP) +bool SendDroid(const DROID_TEMPLATE* pTemplate, uint32_t x, uint32_t y, uint8_t player, uint32_t id, const INITIAL_DROID_ORDERS *initialOrdersP) { if (!bMultiMessages) return true; @@ -382,7 +382,7 @@ BOOL SendDroid(const DROID_TEMPLATE* pTemplate, uint32_t x, uint32_t y, uint8_t { Position pos(x, y, 0); uint32_t templateID = pTemplate->multiPlayerID; - BOOL haveInitialOrders = initialOrdersP != NULL; + bool haveInitialOrders = initialOrdersP != NULL; NETuint8_t(&player); NETuint32_t(&id); @@ -404,7 +404,7 @@ BOOL SendDroid(const DROID_TEMPLATE* pTemplate, uint32_t x, uint32_t y, uint8_t // //////////////////////////////////////////////////////////////////////////// // receive droid creation information from other players -BOOL recvDroid(NETQUEUE queue) +bool recvDroid(NETQUEUE queue) { DROID_TEMPLATE* pT; DROID* psDroid; @@ -412,7 +412,7 @@ BOOL recvDroid(NETQUEUE queue) uint32_t id; Position pos; uint32_t templateID; - BOOL haveInitialOrders; + bool haveInitialOrders; INITIAL_DROID_ORDERS initialOrders; NETbeginDecode(queue, GAME_DROID); @@ -632,7 +632,7 @@ bool sendDroidInfo(DROID *psDroid, DROID_ORDER order, uint32_t x, uint32_t y, co // //////////////////////////////////////////////////////////////////////////// // receive droid information form other players. -BOOL recvDroidInfo(NETQUEUE queue) +bool recvDroidInfo(NETQUEUE queue) { NETbeginDecode(queue, GAME_DROIDINFO); { @@ -779,7 +779,7 @@ static BASE_OBJECT *processDroidTarget(OBJECT_TYPE desttype, uint32_t destid) // //////////////////////////////////////////////////////////////////////////// // Inform other players that a droid has been destroyed -BOOL SendDestroyDroid(const DROID* psDroid) +bool SendDestroyDroid(const DROID* psDroid) { if (!bMultiMessages) { @@ -799,7 +799,7 @@ BOOL SendDestroyDroid(const DROID* psDroid) // //////////////////////////////////////////////////////////////////////////// // Accept a droid which was destroyed on another machine -BOOL recvDestroyDroid(NETQUEUE queue) +bool recvDestroyDroid(NETQUEUE queue) { DROID* psDroid; diff --git a/src/multigifts.cpp b/src/multigifts.cpp index d5e1c9207..4418fd02c 100644 --- a/src/multigifts.cpp +++ b/src/multigifts.cpp @@ -60,12 +60,12 @@ static void recvGiftDroids (uint8_t from, uint8_t to, uint32_t droidID); static void sendGiftDroids (uint8_t from, uint8_t to); -static void giftResearch (uint8_t from, uint8_t to, BOOL send); +static void giftResearch (uint8_t from, uint8_t to, bool send); /////////////////////////////////////////////////////////////////////////////// // gifts.. -BOOL recvGift(NETQUEUE queue) +bool recvGift(NETQUEUE queue) { uint8_t type, from, to; int audioTrack; @@ -111,7 +111,7 @@ BOOL recvGift(NETQUEUE queue) return true; } -BOOL sendGift(uint8_t type, uint8_t to) +bool sendGift(uint8_t type, uint8_t to) { int audioTrack; @@ -148,7 +148,7 @@ BOOL sendGift(uint8_t type, uint8_t to) // //////////////////////////////////////////////////////////////////////////// // give radar information -void giftRadar(uint8_t from, uint8_t to, BOOL send) +void giftRadar(uint8_t from, uint8_t to, bool send) { uint32_t dummy = 0; @@ -261,7 +261,7 @@ static void sendGiftDroids(uint8_t from, uint8_t to) // //////////////////////////////////////////////////////////////////////////// // give technologies. -static void giftResearch(uint8_t from, uint8_t to, BOOL send) +static void giftResearch(uint8_t from, uint8_t to, bool send) { PLAYER_RESEARCH *pR, *pRto; int i; @@ -304,7 +304,7 @@ static void giftResearch(uint8_t from, uint8_t to, BOOL send) // //////////////////////////////////////////////////////////////////////////// // give Power -void giftPower(uint8_t from, uint8_t to, uint32_t amount, BOOL send) +void giftPower(uint8_t from, uint8_t to, uint32_t amount, bool send) { if (send) { @@ -345,7 +345,7 @@ void giftPower(uint8_t from, uint8_t to, uint32_t amount, BOOL send) // //////////////////////////////////////////////////////////////////////////// // alliance code...... -void requestAlliance(uint8_t from, uint8_t to, BOOL prop, BOOL allowAudio) +void requestAlliance(uint8_t from, uint8_t to, bool prop, bool allowAudio) { if (prop && bMultiMessages) { @@ -380,7 +380,7 @@ void requestAlliance(uint8_t from, uint8_t to, BOOL prop, BOOL allowAudio) } } -void breakAlliance(uint8_t p1, uint8_t p2, BOOL prop, BOOL allowAudio) +void breakAlliance(uint8_t p1, uint8_t p2, bool prop, bool allowAudio) { char tm1[128]; @@ -407,7 +407,7 @@ void breakAlliance(uint8_t p1, uint8_t p2, BOOL prop, BOOL allowAudio) alliancebits[p2] &= ~(1 << p1); } -void formAlliance(uint8_t p1, uint8_t p2, BOOL prop, BOOL allowAudio, BOOL allowNotification) +void formAlliance(uint8_t p1, uint8_t p2, bool prop, bool allowAudio, bool allowNotification) { DROID *psDroid; char tm1[128]; @@ -478,7 +478,7 @@ void sendAlliance(uint8_t from, uint8_t to, uint8_t state, int32_t value) NETend(); } -BOOL recvAlliance(NETQUEUE queue, BOOL allowAudio) +bool recvAlliance(NETQUEUE queue, bool allowAudio) { uint8_t to, from, state; int32_t value; @@ -668,7 +668,7 @@ void addMultiPlayerRandomArtifacts(uint8_t quantity, FEATURE_TYPE type) } // /////////////////////////////////////////////////////////////// -BOOL addOilDrum(uint8_t count) +bool addOilDrum(uint8_t count) { addMultiPlayerRandomArtifacts(count, FEAT_OIL_DRUM); return true; diff --git a/src/multigifts.h b/src/multigifts.h index 8d79cce1d..1dbda23b6 100644 --- a/src/multigifts.h +++ b/src/multigifts.h @@ -24,15 +24,15 @@ #ifndef __INCLUDED_SRC_MULTIGIFTS_H__ #define __INCLUDED_SRC_MULTIGIFTS_H__ -extern void requestAlliance (uint8_t from, uint8_t to, BOOL prop, BOOL allowAudio); -extern void breakAlliance (uint8_t p1, uint8_t p2, BOOL prop, BOOL allowAudio); -extern void formAlliance (uint8_t p1, uint8_t p2, BOOL prop, BOOL allowAudio, BOOL allowNotification); +extern void requestAlliance (uint8_t from, uint8_t to, bool prop, bool allowAudio); +extern void breakAlliance (uint8_t p1, uint8_t p2, bool prop, bool allowAudio); +extern void formAlliance (uint8_t p1, uint8_t p2, bool prop, bool allowAudio, bool allowNotification); extern void sendAlliance (uint8_t from, uint8_t to, uint8_t state, int32_t value); -extern BOOL recvAlliance (NETQUEUE queue, BOOL allowAudio); // Was declared in multirecv.h, too. +extern bool recvAlliance (NETQUEUE queue, bool allowAudio); // Was declared in multirecv.h, too. extern void createTeamAlliances (void); -extern BOOL sendGift (uint8_t type, uint8_t to); -extern BOOL recvGift (NETQUEUE queue); +extern bool sendGift (uint8_t type, uint8_t to); +extern bool recvGift (NETQUEUE queue); extern void technologyGiveAway (const STRUCTURE* pS); extern void recvMultiPlayerRandomArtifacts (NETQUEUE queue); @@ -41,9 +41,9 @@ extern void recvMultiPlayerFeature (NETQUEUE queue); extern void sendMultiPlayerFeature(FEATURE_TYPE type, uint32_t x, uint32_t y, uint32_t id); bool pickupArtefact(int toPlayer, int fromPlayer); -extern BOOL addOilDrum (uint8_t count); -void giftPower (uint8_t from, uint8_t to, uint32_t amount, BOOL send); -extern void giftRadar (uint8_t from, uint8_t to, BOOL send); +extern bool addOilDrum (uint8_t count); +void giftPower (uint8_t from, uint8_t to, uint32_t amount, bool send); +extern void giftRadar (uint8_t from, uint8_t to, bool send); #define RADAR_GIFT 1 #define DROID_GIFT 2 diff --git a/src/multiint.cpp b/src/multiint.cpp index 157ce03dd..ffec78fad 100644 --- a/src/multiint.cpp +++ b/src/multiint.cpp @@ -133,33 +133,33 @@ static const unsigned gnImage[] = {IMAGE_GN_0, IMAGE_GN_1, IMAGE_GN_2, IMAGE_GN_ extern char MultiCustomMapsPath[PATH_MAX]; extern char MultiPlayersPath[PATH_MAX]; extern char VersionString[80]; // from netplay.c -extern BOOL bSendingMap; // used to indicate we are sending a map +extern bool bSendingMap; // used to indicate we are sending a map -BOOL bHosted = false; //we have set up a game +bool bHosted = false; //we have set up a game char sPlayer[128]; // player name (to be used) static int colourChooserUp = -1; static int teamChooserUp = -1; static int aiChooserUp = -1; static int difficultyChooserUp = -1; static int positionChooserUp = -1; -static BOOL SettingsUp = false; +static bool SettingsUp = false; static UBYTE InitialProto = 0; static W_SCREEN *psConScreen; static SDWORD dwSelectedGame =0; //player[] and games[] indexes static UDWORD gameNumber; // index to games icons -static BOOL safeSearch = false; // allow auto game finding. +static bool safeSearch = false; // allow auto game finding. static bool disableLobbyRefresh = false; // if we allow lobby to be refreshed or not. static UDWORD hideTime=0; static bool EnablePasswordPrompt = false; // if we need the password prompt LOBBY_ERROR_TYPES LobbyError = ERROR_NOERROR; -static BOOL allowChangePosition = true; +static bool allowChangePosition = true; static char tooltipbuffer[256] ={'\0'}; /// end of globals. // //////////////////////////////////////////////////////////////////////////// // Function protos // widget functions -static BOOL addMultiEditBox(UDWORD formid, UDWORD id, UDWORD x, UDWORD y, char const *tip, char const *tipres, UDWORD icon, UDWORD iconhi, UDWORD iconid); +static bool addMultiEditBox(UDWORD formid, UDWORD id, UDWORD x, UDWORD y, char const *tip, char const *tipres, UDWORD icon, UDWORD iconhi, UDWORD iconid); static void addBlueForm (UDWORD parent,UDWORD id, const char *txt,UDWORD x,UDWORD y,UDWORD w,UDWORD h); static void drawReadyButton(UDWORD player); static void displayPasswordEditBox(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, WZ_DECL_UNUSED PIELIGHT *pColours); @@ -200,10 +200,10 @@ static void closeTeamChooser (void); static void closePositionChooser (void); static void closeAiChooser (void); static void closeDifficultyChooser (void); -static BOOL SendColourRequest (UBYTE player, UBYTE col); -static BOOL SendPositionRequest (UBYTE player, UBYTE chosenPlayer); -static BOOL safeToUseColour (UDWORD player,UDWORD col); -static BOOL changeReadyStatus (UBYTE player, BOOL bReady); +static bool SendColourRequest (UBYTE player, UBYTE col); +static bool SendPositionRequest (UBYTE player, UBYTE chosenPlayer); +static bool safeToUseColour (UDWORD player,UDWORD col); +static bool changeReadyStatus (UBYTE player, bool bReady); static void stopJoining(void); static int difficultyIcon(int difficulty); // //////////////////////////////////////////////////////////////////////////// @@ -589,7 +589,7 @@ static void decideWRF(void) // //////////////////////////////////////////////////////////////////////////// // Connection Options Screen. -static BOOL OptionsInet(void) //internet options +static bool OptionsInet(void) //internet options { psConScreen = widgCreateScreen(); widgSetTipFont(psConScreen,font_regular); @@ -652,7 +652,7 @@ static BOOL OptionsInet(void) //internet options // //////////////////////////////////////////////////////////////////////////// // Draw the connections screen. -BOOL startConnectionScreen(void) +bool startConnectionScreen(void) { addBackdrop(); //background addTopForm(); // logo @@ -1531,7 +1531,7 @@ static void addGameOptions() // //////////////////////////////////////////////////////////////////////////// // Colour functions -static BOOL safeToUseColour(UDWORD player,UDWORD col) +static bool safeToUseColour(UDWORD player,UDWORD col) { UDWORD i; @@ -1767,7 +1767,7 @@ static void changeTeam(UBYTE player, UBYTE team) netPlayersUpdated = true; } -static BOOL SendTeamRequest(UBYTE player, UBYTE chosenTeam) +static bool SendTeamRequest(UBYTE player, UBYTE chosenTeam) { if(NetPlay.isHost) // do or request the change. { @@ -1786,7 +1786,7 @@ static BOOL SendTeamRequest(UBYTE player, UBYTE chosenTeam) return true; } -BOOL recvTeamRequest(NETQUEUE queue) +bool recvTeamRequest(NETQUEUE queue) { UBYTE player, team; @@ -1816,7 +1816,7 @@ BOOL recvTeamRequest(NETQUEUE queue) return true; } -static BOOL SendReadyRequest(UBYTE player, BOOL bReady) +static bool SendReadyRequest(UBYTE player, bool bReady) { if(NetPlay.isHost) // do or request the change. { @@ -1832,10 +1832,10 @@ static BOOL SendReadyRequest(UBYTE player, BOOL bReady) return true; } -BOOL recvReadyRequest(NETQUEUE queue) +bool recvReadyRequest(NETQUEUE queue) { UBYTE player; - BOOL bReady; + bool bReady; if (!NetPlay.isHost || !bHosted) // Only host should act, and only if the game hasn't started yet. { @@ -1864,7 +1864,7 @@ BOOL recvReadyRequest(NETQUEUE queue) return changeReadyStatus((UBYTE)player, bReady); } -static BOOL changeReadyStatus(UBYTE player, BOOL bReady) +static bool changeReadyStatus(UBYTE player, bool bReady) { drawReadyButton(player); NetPlay.players[player].ready = bReady; @@ -1874,7 +1874,7 @@ static BOOL changeReadyStatus(UBYTE player, BOOL bReady) return true; } -static BOOL changePosition(UBYTE player, UBYTE position) +static bool changePosition(UBYTE player, UBYTE position) { int i; @@ -1903,7 +1903,7 @@ static BOOL changePosition(UBYTE player, UBYTE position) return false; } -BOOL changeColour(UBYTE player, UBYTE col) +bool changeColour(UBYTE player, UBYTE col) { int i; @@ -1935,7 +1935,7 @@ BOOL changeColour(UBYTE player, UBYTE col) return false; } -static BOOL SendColourRequest(UBYTE player, UBYTE col) +static bool SendColourRequest(UBYTE player, UBYTE col) { if(NetPlay.isHost) // do or request the change { @@ -1952,7 +1952,7 @@ static BOOL SendColourRequest(UBYTE player, UBYTE col) return true; } -static BOOL SendPositionRequest(UBYTE player, UBYTE position) +static bool SendPositionRequest(UBYTE player, UBYTE position) { if(NetPlay.isHost) // do or request the change { @@ -1970,7 +1970,7 @@ static BOOL SendPositionRequest(UBYTE player, UBYTE position) return true; } -BOOL recvColourRequest(NETQUEUE queue) +bool recvColourRequest(NETQUEUE queue) { UBYTE player, col; @@ -1996,7 +1996,7 @@ BOOL recvColourRequest(NETQUEUE queue) return changeColour(player, col); } -BOOL recvPositionRequest(NETQUEUE queue) +bool recvPositionRequest(NETQUEUE queue) { UBYTE player, position; @@ -2138,7 +2138,7 @@ static bool canChooseTeamFor(int i) // //////////////////////////////////////////////////////////////////////////// // box for players. -void addPlayerBox(BOOL players) +void addPlayerBox(bool players) { // if background isn't there, then return since were not ready to draw the box yet! if(widgGetFromID(psWScreen,FRONTEND_BACKDROP) == NULL) @@ -3451,7 +3451,7 @@ void runMultiOptions(void) } } -BOOL startMultiOptions(BOOL bReenter) +bool startMultiOptions(bool bReenter) { PLAYERSTATS nullStats; UBYTE i; @@ -3983,7 +3983,7 @@ void displayMultiBut(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, PIELIGHT { UDWORD x = xOffset+psWidget->x; UDWORD y = yOffset+psWidget->y; - BOOL Hilight = false; + bool Hilight = false; UDWORD Down = 0; UDWORD Grey = 0; UWORD im_norm = UNPACKDWORD_TRI_A((UDWORD)psWidget->UserData); @@ -4092,7 +4092,7 @@ void displayMultiBut(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, PIELIGHT ///////////////////////////////////////////////////////////////////////////////////////// // common widgets -static BOOL addMultiEditBox(UDWORD formid, UDWORD id, UDWORD x, UDWORD y, char const *tip, char const *tipres, UDWORD icon, UDWORD iconhi, UDWORD iconid) +static bool addMultiEditBox(UDWORD formid, UDWORD id, UDWORD x, UDWORD y, char const *tip, char const *tipres, UDWORD icon, UDWORD iconhi, UDWORD iconid) { W_EDBINIT sEdInit; // editbox sEdInit.formID = formid; @@ -4114,7 +4114,7 @@ static BOOL addMultiEditBox(UDWORD formid, UDWORD id, UDWORD x, UDWORD y, char c ///////////////////////////////////////////////////////////////////////////////////////// -BOOL addMultiBut(W_SCREEN *screen, UDWORD formid, UDWORD id, UDWORD x, UDWORD y, UDWORD width, UDWORD height, const char* tipres, UDWORD norm, UDWORD down, UDWORD hi) +bool addMultiBut(W_SCREEN *screen, UDWORD formid, UDWORD id, UDWORD x, UDWORD y, UDWORD width, UDWORD height, const char* tipres, UDWORD norm, UDWORD down, UDWORD hi) { W_BUTINIT sButInit; sButInit.formID = formid; diff --git a/src/multiint.h b/src/multiint.h index d61db1ede..9ce4f1a31 100644 --- a/src/multiint.h +++ b/src/multiint.h @@ -42,7 +42,7 @@ extern LOBBY_ERROR_TYPES getLobbyError(void); extern void setLobbyError(LOBBY_ERROR_TYPES error_type); extern void runConnectionScreen (void); -extern BOOL startConnectionScreen (void); +extern bool startConnectionScreen (void); extern void intProcessConnection (UDWORD id); extern void runGameFind (void); @@ -51,15 +51,15 @@ extern void startGameFind (void); void updateLimitFlags(void); extern void runMultiOptions (void); -extern BOOL startMultiOptions (BOOL bReenter); +extern bool startMultiOptions (bool bReenter); extern void frontendMultiMessages (void); -extern BOOL addMultiBut(W_SCREEN *screen, UDWORD formid, UDWORD id, UDWORD x, UDWORD y, UDWORD width, UDWORD height, const char* tipres, UDWORD norm, UDWORD down, UDWORD hi); -extern BOOL changeColour(UBYTE player, UBYTE col); +extern bool addMultiBut(W_SCREEN *screen, UDWORD formid, UDWORD id, UDWORD x, UDWORD y, UDWORD width, UDWORD height, const char* tipres, UDWORD norm, UDWORD down, UDWORD hi); +extern bool changeColour(UBYTE player, UBYTE col); extern char sPlayer[128]; void kickPlayer(uint32_t player_id, const char *reason, LOBBY_ERROR_TYPES type); -void addPlayerBox(BOOL); // players (mid) box +void addPlayerBox(bool); // players (mid) box void loadMapPreview(bool hideInterface); diff --git a/src/multijoin.cpp b/src/multijoin.cpp index 39b1eecbf..fdbcd593e 100644 --- a/src/multijoin.cpp +++ b/src/multijoin.cpp @@ -70,8 +70,8 @@ // //////////////////////////////////////////////////////////////////////////// // External Variables -extern BOOL bHosted; -extern BOOL multiRequestUp; +extern bool bHosted; +extern bool multiRequestUp; // //////////////////////////////////////////////////////////////////////////// //external functions @@ -83,7 +83,7 @@ static void resetMultiVisibility(UDWORD player); // //////////////////////////////////////////////////////////////////////////// // Wait For Players -BOOL intDisplayMultiJoiningStatus(UBYTE joinCount) +bool intDisplayMultiJoiningStatus(UBYTE joinCount) { UDWORD x,y,w,h; char sTmp[6]; @@ -117,7 +117,7 @@ BOOL intDisplayMultiJoiningStatus(UBYTE joinCount) ** @param player -- the one we need to clear ** @param quietly -- true means without any visible effects */ -void clearPlayer(UDWORD player,BOOL quietly) +void clearPlayer(UDWORD player,bool quietly) { UDWORD i; STRUCTURE *psStruct,*psNext; @@ -220,7 +220,7 @@ void recvPlayerLeft(NETQUEUE queue) // //////////////////////////////////////////////////////////////////////////// // A remote player has left the game -BOOL MultiPlayerLeave(UDWORD playerIndex) +bool MultiPlayerLeave(UDWORD playerIndex) { char buf[255]; @@ -274,7 +274,7 @@ BOOL MultiPlayerLeave(UDWORD playerIndex) // //////////////////////////////////////////////////////////////////////////// // A Remote Player has joined the game. -BOOL MultiPlayerJoin(UDWORD playerIndex) +bool MultiPlayerJoin(UDWORD playerIndex) { if(widgGetFromID(psWScreen,IDRET_FORM)) // if ingame. { diff --git a/src/multijoin.h b/src/multijoin.h index 9f641bc26..d585aeb51 100644 --- a/src/multijoin.h +++ b/src/multijoin.h @@ -26,13 +26,13 @@ #include "droiddef.h" -extern BOOL intDisplayMultiJoiningStatus(UBYTE joinCount); +extern bool intDisplayMultiJoiningStatus(UBYTE joinCount); void recvPlayerLeft(NETQUEUE queue); -extern BOOL MultiPlayerLeave (UDWORD playerIndex); // A player has left the game. -extern BOOL MultiPlayerJoin (UDWORD playerIndex); // A Player has joined the game. +extern bool MultiPlayerLeave (UDWORD playerIndex); // A player has left the game. +extern bool MultiPlayerJoin (UDWORD playerIndex); // A Player has joined the game. extern void setupNewPlayer (UDWORD player); // stuff to do when player joins. -extern void clearPlayer (UDWORD player, BOOL quietly);// wipe a player off the face of the earth. -//extern BOOL ProcessDroidOrders (void); +extern void clearPlayer (UDWORD player, bool quietly);// wipe a player off the face of the earth. +//extern bool ProcessDroidOrders (void); //extern UDWORD arenaPlayersReceived; extern void ShowMOTD(void); diff --git a/src/multilimit.cpp b/src/multilimit.cpp index 4dc5605d2..809161866 100644 --- a/src/multilimit.cpp +++ b/src/multilimit.cpp @@ -81,7 +81,7 @@ static void displayStructureBar(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset // //////////////////////////////////////////////////////////////////////////// -static BOOL useStruct(UDWORD count,UDWORD i) +static bool useStruct(UDWORD count,UDWORD i) { ASSERT(i < numStructureStats, "Bad structure for structure limit: %d", (int)i); @@ -112,7 +112,7 @@ static inline void freeLimitSet(void) } // //////////////////////////////////////////////////////////////////////////// -BOOL startLimitScreen(void) +bool startLimitScreen(void) { UDWORD numButtons = 0; UDWORD i; diff --git a/src/multilimit.h b/src/multilimit.h index df0fc9e15..9022f3442 100644 --- a/src/multilimit.h +++ b/src/multilimit.h @@ -24,7 +24,7 @@ #ifndef __INCLUDED_MULTILIMIT_H__ #define __INCLUDED_MULTILIMIT_H__ -extern BOOL startLimitScreen (void); +extern bool startLimitScreen (void); extern void runLimitScreen (void); extern void applyLimitSet (void); extern void createLimitSet (void); diff --git a/src/multimenu.cpp b/src/multimenu.cpp index 0b2b3f845..12710772d 100644 --- a/src/multimenu.cpp +++ b/src/multimenu.cpp @@ -67,9 +67,9 @@ W_SCREEN *psRScreen; // requester stuff. extern char MultiCustomMapsPath[PATH_MAX]; extern void displayMultiBut(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, PIELIGHT *pColours); -BOOL MultiMenuUp = false; -BOOL ClosingMultiMenu = false; -BOOL DebugMenuUp = false; +bool MultiMenuUp = false; +bool ClosingMultiMenu = false; +bool DebugMenuUp = false; static UDWORD context = 0; UDWORD current_tech = 1; UDWORD current_numplayers = 4; @@ -155,8 +155,8 @@ static char const * M_REQUEST_NP_TIPS[] = { N_("2 players"), N_("3 players"), #define R_BUT_W 105//112 #define R_BUT_H 30 -BOOL multiRequestUp = false; //multimenu is up. -static BOOL giftsUp[MAX_PLAYERS] = {true}; //gift buttons for player are up. +bool multiRequestUp = false; //multimenu is up. +static bool giftsUp[MAX_PLAYERS] = {true}; //gift buttons for player are up. char debugMenuEntry[DEBUGMENU_MAX_ENTRIES][MAX_STR_LENGTH]; @@ -661,7 +661,7 @@ static void closeMultiRequester(void) return; } -BOOL runMultiRequester(UDWORD id,UDWORD *mode, char *chosen,UDWORD *chosenValue) +bool runMultiRequester(UDWORD id,UDWORD *mode, char *chosen,UDWORD *chosenValue) { if( id==M_REQUEST_CLOSE) // close { @@ -1196,7 +1196,7 @@ static void addMultiPlayer(UDWORD player,UDWORD pos) /* Output some text to the debug menu */ void setDebugMenuEntry(char *entry, SDWORD index) { - BOOL bAddingNew = false; + bool bAddingNew = false; /* New one? */ if(!strcmp(debugMenuEntry[index],"")) @@ -1226,7 +1226,7 @@ void intCloseDebugMenuNoAnim(void) /* Opens/closes a 'watch' window (Default key combo: Alt+Space), * only available in debug mode */ -BOOL addDebugMenu(BOOL bAdd) +bool addDebugMenu(bool bAdd) { UDWORD i,pos = 0,formHeight=0; @@ -1310,7 +1310,7 @@ BOOL addDebugMenu(BOOL bAdd) return true; } -BOOL intAddMultiMenu(void) +bool intAddMultiMenu(void) { UDWORD i; @@ -1396,7 +1396,7 @@ void intCloseMultiMenuNoAnim(void) // //////////////////////////////////////////////////////////////////////////// -BOOL intCloseMultiMenu(void) +bool intCloseMultiMenu(void) { W_TABFORM *Form; @@ -1426,7 +1426,7 @@ BOOL intCloseMultiMenu(void) // //////////////////////////////////////////////////////////////////////////// // In Game Options house keeping stuff. -BOOL intRunMultiMenu(void) +bool intRunMultiMenu(void) { return true; } diff --git a/src/multimenu.h b/src/multimenu.h index e01483c54..0e746b55c 100644 --- a/src/multimenu.h +++ b/src/multimenu.h @@ -29,26 +29,26 @@ // requester extern void addMultiRequest(const char* searchDir, const char* fileExtension, UDWORD id,UBYTE mapCam, UBYTE numPlayers); -extern BOOL multiRequestUp; +extern bool multiRequestUp; extern W_SCREEN *psRScreen; // requester stuff. -extern BOOL runMultiRequester(UDWORD id,UDWORD *contextmode, char *chosen,UDWORD *chosenValue); +extern bool runMultiRequester(UDWORD id,UDWORD *contextmode, char *chosen,UDWORD *chosenValue); extern void displayRequestOption(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, PIELIGHT *pColours); // multimenu extern void intProcessMultiMenu (UDWORD id); -extern BOOL intRunMultiMenu (void); -extern BOOL intCloseMultiMenu (void); +extern bool intRunMultiMenu (void); +extern bool intCloseMultiMenu (void); extern void intCloseMultiMenuNoAnim (void); -extern BOOL intAddMultiMenu (void); +extern bool intAddMultiMenu (void); -extern BOOL addDebugMenu (BOOL bAdd); +extern bool addDebugMenu (bool bAdd); extern void intCloseDebugMenuNoAnim (void); extern void setDebugMenuEntry(char *entry, SDWORD index); -extern BOOL MultiMenuUp; -extern BOOL ClosingMultiMenu; +extern bool MultiMenuUp; +extern bool ClosingMultiMenu; -extern BOOL DebugMenuUp; +extern bool DebugMenuUp; extern UDWORD current_numplayers; extern UDWORD current_tech; diff --git a/src/multiopt.cpp b/src/multiopt.cpp index 5c8eeca1d..d20712901 100644 --- a/src/multiopt.cpp +++ b/src/multiopt.cpp @@ -122,7 +122,7 @@ void sendOptions() /*! * check the wdg files that are being used. */ -static BOOL checkGameWdg(const char *nm) +static bool checkGameWdg(const char *nm) { LEVEL_DATASET *lev; @@ -242,7 +242,7 @@ void recvOptions(NETQUEUE queue) // //////////////////////////////////////////////////////////////////////////// // Host Campaign. -BOOL hostCampaign(char *sGame, char *sPlayer) +bool hostCampaign(char *sGame, char *sPlayer) { PLAYERSTATS playerStats; UDWORD i; @@ -294,7 +294,7 @@ BOOL hostCampaign(char *sGame, char *sPlayer) // //////////////////////////////////////////////////////////////////////////// // Join Campaign -BOOL joinCampaign(UDWORD gameNumber, char *sPlayer) +bool joinCampaign(UDWORD gameNumber, char *sPlayer) { PLAYERSTATS playerStats; @@ -318,12 +318,12 @@ BOOL joinCampaign(UDWORD gameNumber, char *sPlayer) // //////////////////////////////////////////////////////////////////////////// // Tell the host we are leaving the game 'nicely', (we wanted to) and not // because we have some kind of error. (dropped or disconnected) -BOOL sendLeavingMsg(void) +bool sendLeavingMsg(void) { debug(LOG_NET, "We are leaving 'nicely'"); NETbeginEncode(NETnetQueue(NET_HOST_ONLY), NET_PLAYER_LEAVING); { - BOOL host = NetPlay.isHost; + bool host = NetPlay.isHost; uint32_t id = selectedPlayer; NETuint32_t(&id); @@ -336,7 +336,7 @@ BOOL sendLeavingMsg(void) // //////////////////////////////////////////////////////////////////////////// // called in Init.c to shutdown the whole netgame gubbins. -BOOL multiShutdown(void) +bool multiShutdown(void) { // shut down netplay lib. debug(LOG_MAIN, "shutting down networking"); @@ -355,7 +355,7 @@ BOOL multiShutdown(void) // //////////////////////////////////////////////////////////////////////////// // copy templates from one player to another. -BOOL addTemplateToList(DROID_TEMPLATE *psNew, DROID_TEMPLATE **ppList) +bool addTemplateToList(DROID_TEMPLATE *psNew, DROID_TEMPLATE **ppList) { DROID_TEMPLATE *psTempl = new DROID_TEMPLATE(*psNew); psTempl->pName = NULL; @@ -373,7 +373,7 @@ BOOL addTemplateToList(DROID_TEMPLATE *psNew, DROID_TEMPLATE **ppList) // //////////////////////////////////////////////////////////////////////////// // copy templates from one player to another. -BOOL addTemplate(UDWORD player, DROID_TEMPLATE *psNew) +bool addTemplate(UDWORD player, DROID_TEMPLATE *psNew) { return addTemplateToList(psNew, &apsDroidTemplates[player]); } @@ -390,7 +390,7 @@ void addTemplateBack(unsigned player, DROID_TEMPLATE *psNew) // //////////////////////////////////////////////////////////////////////////// // setup templates -BOOL multiTemplateSetup(void) +bool multiTemplateSetup(void) { // do nothing now return true; @@ -398,11 +398,11 @@ BOOL multiTemplateSetup(void) // //////////////////////////////////////////////////////////////////////////// // remove structures from map before campaign play. -static BOOL cleanMap(UDWORD player) +static bool cleanMap(UDWORD player) { DROID *psD,*psD2; STRUCTURE *psStruct; - BOOL firstFact,firstRes; + bool firstFact,firstRes; bMultiPlayer = false; bMultiMessages = false; @@ -537,7 +537,7 @@ static BOOL cleanMap(UDWORD player) } // //////////////////////////////////////////////////////////////////////////// -static BOOL gameInit(void) +static bool gameInit(void) { UDWORD player; @@ -603,7 +603,7 @@ void playerResponding(void) // //////////////////////////////////////////////////////////////////////////// //called when the game finally gets fired up. -BOOL multiGameInit(void) +bool multiGameInit(void) { UDWORD player; @@ -620,7 +620,7 @@ BOOL multiGameInit(void) //////////////////////////////// // at the end of every game. -BOOL multiGameShutdown(void) +bool multiGameShutdown(void) { PLAYERSTATS st; diff --git a/src/multiplay.cpp b/src/multiplay.cpp index de40bec62..17e5825b5 100644 --- a/src/multiplay.cpp +++ b/src/multiplay.cpp @@ -72,9 +72,9 @@ // //////////////////////////////////////////////////////////////////////////// // //////////////////////////////////////////////////////////////////////////// // globals. -BOOL bMultiPlayer = false; // true when more than 1 player. -BOOL bMultiMessages = false; // == bMultiPlayer unless multimessages are disabled -BOOL openchannels[MAX_PLAYERS]={true}; +bool bMultiPlayer = false; // true when more than 1 player. +bool bMultiMessages = false; // == bMultiPlayer unless multimessages are disabled +bool openchannels[MAX_PLAYERS]={true}; UBYTE bDisplayMultiJoiningStatus; MULTIPLAYERGAME game; //info to describe game. @@ -82,7 +82,7 @@ MULTIPLAYERINGAME ingame; char beaconReceiveMsg[MAX_PLAYERS][MAX_CONSOLE_STRING_LENGTH]; //beacon msg for each player char playerName[MAX_PLAYERS][MAX_STR_LENGTH]; //Array to store all player names (humans and AIs) -BOOL bPlayerReadyGUI[MAX_PLAYERS] = {false}; +bool bPlayerReadyGUI[MAX_PLAYERS] = {false}; ///////////////////////////////////// /* multiplayer message stack stuff */ @@ -105,16 +105,16 @@ extern PLAYER_RESEARCH* asPlayerResList[MAX_PLAYERS]; // //////////////////////////////////////////////////////////////////////////// // Local Prototypes -static BOOL recvBeacon(NETQUEUE queue); -static BOOL recvDestroyTemplate(NETQUEUE queue); -static BOOL recvResearch(NETQUEUE queue); +static bool recvBeacon(NETQUEUE queue); +static bool recvDestroyTemplate(NETQUEUE queue); +static bool recvResearch(NETQUEUE queue); bool multiplayPlayersReady (bool bNotifyStatus); void startMultiplayerGame (void); // //////////////////////////////////////////////////////////////////////////// // temporarily disable multiplayer mode. -void turnOffMultiMsg(BOOL bDoit) +void turnOffMultiMsg(bool bDoit) { if (!bMultiPlayer) { @@ -128,7 +128,7 @@ void turnOffMultiMsg(BOOL bDoit) // //////////////////////////////////////////////////////////////////////////// // throw a party when you win! -BOOL multiplayerWinSequence(BOOL firstCall) +bool multiplayerWinSequence(bool firstCall) { static Position pos; Position pos2; @@ -201,7 +201,7 @@ BOOL multiplayerWinSequence(BOOL firstCall) // //////////////////////////////////////////////////////////////////////////// // //////////////////////////////////////////////////////////////////////////// // MultiPlayer main game loop code. -BOOL multiPlayerLoop(void) +bool multiPlayerLoop(void) { UDWORD i; UBYTE joinCount; @@ -445,7 +445,7 @@ const char* getPlayerName(int player) return NetPlay.players[player].name; } -BOOL setPlayerName(int player, const char *sName) +bool setPlayerName(int player, const char *sName) { ASSERT_OR_RETURN(false, player < MAX_PLAYERS && player >= 0, "Player index (%u) out of range", player); sstrcpy(playerName[player], sName); @@ -454,7 +454,7 @@ BOOL setPlayerName(int player, const char *sName) // //////////////////////////////////////////////////////////////////////////// // to determine human/computer players and responsibilities of each.. -BOOL isHumanPlayer(int player) +bool isHumanPlayer(int player) { if (player >= MAX_PLAYERS || player < 0) { @@ -481,13 +481,13 @@ int whosResponsible(int player) } //returns true if selected player is responsible for 'player' -BOOL myResponsibility(int player) +bool myResponsibility(int player) { return whosResponsible(player) == selectedPlayer; } //returns true if 'player' is responsible for 'playerinquestion' -BOOL responsibleFor(int player, int playerinquestion) +bool responsibleFor(int player, int playerinquestion) { return whosResponsible(playerinquestion) == player; } @@ -506,7 +506,7 @@ int scavengerPlayer() // //////////////////////////////////////////////////////////////////////////// // probably temporary. Places the camera on the players 1st droid or struct. -Vector3i cameraToHome(UDWORD player,BOOL scroll) +Vector3i cameraToHome(UDWORD player,bool scroll) { Vector3i res; UDWORD x,y; @@ -555,7 +555,7 @@ Vector3i cameraToHome(UDWORD player,BOOL scroll) // //////////////////////////////////////////////////////////////////////////// // //////////////////////////////////////////////////////////////////////////// // Recv Messages. Get a message and dispatch to relevant function. -BOOL recvMessage(void) +bool recvMessage(void) { NETQUEUE queue; uint8_t type; @@ -782,7 +782,7 @@ BOOL recvMessage(void) // //////////////////////////////////////////////////////////////////////////// // Research Stuff. Nat games only send the result of research procedures. -BOOL SendResearch(uint8_t player, uint32_t index, bool trigger) +bool SendResearch(uint8_t player, uint32_t index, bool trigger) { // Send the player that is researching the topic and the topic itself NETbeginEncode(NETgameQueue(selectedPlayer), GAME_RESEARCH); @@ -794,7 +794,7 @@ BOOL SendResearch(uint8_t player, uint32_t index, bool trigger) } // recv a research topic that is now complete. -static BOOL recvResearch(NETQUEUE queue) +static bool recvResearch(NETQUEUE queue) { uint8_t player; uint32_t index; @@ -854,7 +854,7 @@ static BOOL recvResearch(NETQUEUE queue) // //////////////////////////////////////////////////////////////////////////// // New research stuff, so you can see what others are up to! // inform others that I'm researching this. -BOOL sendResearchStatus(STRUCTURE *psBuilding, uint32_t index, uint8_t player, BOOL bStart) +bool sendResearchStatus(STRUCTURE *psBuilding, uint32_t index, uint8_t player, bool bStart) { if (!myResponsibility(player) || gameTime < 5) { @@ -886,14 +886,14 @@ BOOL sendResearchStatus(STRUCTURE *psBuilding, uint32_t index, uint8_t player, B return true; } -BOOL recvResearchStatus(NETQUEUE queue) +bool recvResearchStatus(NETQUEUE queue) { STRUCTURE *psBuilding; PLAYER_RESEARCH *pPlayerRes; RESEARCH_FACILITY *psResFacilty; RESEARCH *pResearch; uint8_t player; - BOOL bStart; + bool bStart; uint32_t index, structRef; NETbeginDecode(queue, GAME_RESEARCHSTATUS); @@ -1006,10 +1006,10 @@ BOOL recvResearchStatus(NETQUEUE queue) // //////////////////////////////////////////////////////////////////////////// // Text Messaging between players. proceed string with players to send to. // eg "123hi there" sends "hi there" to players 1,2 and 3. -BOOL sendTextMessage(const char *pStr, BOOL all) +bool sendTextMessage(const char *pStr, bool all) { - BOOL normal = true; - BOOL sendto[MAX_PLAYERS]; + bool normal = true; + bool sendto[MAX_PLAYERS]; int posTable[MAX_PLAYERS]; UDWORD i; char display[MAX_CONSOLE_STRING_LENGTH]; @@ -1162,7 +1162,7 @@ void printConsoleNameChange(const char *oldName, const char *newName) //AI multiplayer message, send from a certain player index to another player index -BOOL sendAIMessage(char *pStr, UDWORD player, UDWORD to) +bool sendAIMessage(char *pStr, UDWORD player, UDWORD to) { UDWORD sendPlayer; @@ -1218,7 +1218,7 @@ BOOL sendAIMessage(char *pStr, UDWORD player, UDWORD to) // // At this time, we do NOT support messages for beacons // -BOOL sendBeacon(int32_t locX, int32_t locY, int32_t forPlayer, int32_t sender, const char* pStr) +bool sendBeacon(int32_t locX, int32_t locY, int32_t forPlayer, int32_t sender, const char* pStr) { int sendPlayer; //debug(LOG_WZ, "sendBeacon: '%s'",pStr); @@ -1264,7 +1264,7 @@ void displayAIMessage(char *pStr, SDWORD from, SDWORD to) } // Write a message to the console. -BOOL recvTextMessage(NETQUEUE queue) +bool recvTextMessage(NETQUEUE queue) { UDWORD playerIndex; char msg[MAX_CONSOLE_STRING_LENGTH]; @@ -1320,7 +1320,7 @@ BOOL recvTextMessage(NETQUEUE queue) } //AI multiplayer message - received message from AI (from scripts) -BOOL recvTextMessageAI(NETQUEUE queue) +bool recvTextMessageAI(NETQUEUE queue) { UDWORD sender, receiver; char msg[MAX_CONSOLE_STRING_LENGTH]; @@ -1393,7 +1393,7 @@ bool sendTemplate(uint32_t player, DROID_TEMPLATE *pTempl) } // receive a template created by another player -BOOL recvTemplate(NETQUEUE queue) +bool recvTemplate(NETQUEUE queue) { uint32_t player; DROID_TEMPLATE *psTempl; @@ -1433,7 +1433,7 @@ BOOL recvTemplate(NETQUEUE queue) // //////////////////////////////////////////////////////////////////////////// // inform others that you no longer have a template -BOOL SendDestroyTemplate(DROID_TEMPLATE *t) +bool SendDestroyTemplate(DROID_TEMPLATE *t) { uint8_t player = selectedPlayer; @@ -1446,7 +1446,7 @@ BOOL SendDestroyTemplate(DROID_TEMPLATE *t) } // acknowledge another player no longer has a template -static BOOL recvDestroyTemplate(NETQUEUE queue) +static bool recvDestroyTemplate(NETQUEUE queue) { uint8_t player; uint32_t templateID; @@ -1502,7 +1502,7 @@ static BOOL recvDestroyTemplate(NETQUEUE queue) // Features // send a destruct feature message. -BOOL SendDestroyFeature(FEATURE *pF) +bool SendDestroyFeature(FEATURE *pF) { NETbeginEncode(NETgameQueue(selectedPlayer), GAME_FEATUREDEST); NETuint32_t(&pF->id); @@ -1510,7 +1510,7 @@ BOOL SendDestroyFeature(FEATURE *pF) } // process a destroy feature msg. -BOOL recvDestroyFeature(NETQUEUE queue) +bool recvDestroyFeature(NETQUEUE queue) { FEATURE *pF; uint32_t id; @@ -1537,7 +1537,7 @@ BOOL recvDestroyFeature(NETQUEUE queue) // //////////////////////////////////////////////////////////////////////////// // Network File packet processor. -BOOL recvMapFileRequested(NETQUEUE queue) +bool recvMapFileRequested(NETQUEUE queue) { char mapStr[256],mapName[256],fixedname[256]; uint32_t player; @@ -1638,7 +1638,7 @@ void sendMap(void) } // Another player is broadcasting a map, recv a chunk. Returns false if not yet done. -BOOL recvMapFileData(NETQUEUE queue) +bool recvMapFileData(NETQUEUE queue) { mapDownloadProgress = NETrecvFile(queue); if (mapDownloadProgress == 100) @@ -1698,13 +1698,13 @@ UDWORD msgStackPush(SDWORD CBtype, SDWORD plFrom, SDWORD plTo, const char *tStr, return true; } -BOOL isMsgStackEmpty(void) +bool isMsgStackEmpty(void) { if(msgStackPos <= (-1)) return true; return false; } -BOOL msgStackGetFrom(SDWORD *psVal) +bool msgStackGetFrom(SDWORD *psVal) { if(msgStackPos < 0) { @@ -1717,7 +1717,7 @@ BOOL msgStackGetFrom(SDWORD *psVal) return true; } -BOOL msgStackGetTo(SDWORD *psVal) +bool msgStackGetTo(SDWORD *psVal) { if(msgStackPos < 0) { @@ -1730,7 +1730,7 @@ BOOL msgStackGetTo(SDWORD *psVal) return true; } -static BOOL msgStackGetCallbackType(SDWORD *psVal) +static bool msgStackGetCallbackType(SDWORD *psVal) { if(msgStackPos < 0) { @@ -1743,7 +1743,7 @@ static BOOL msgStackGetCallbackType(SDWORD *psVal) return true; } -static BOOL msgStackGetXY(SDWORD *psValx, SDWORD *psValy) +static bool msgStackGetXY(SDWORD *psValx, SDWORD *psValy) { if(msgStackPos < 0) { @@ -1758,7 +1758,7 @@ static BOOL msgStackGetXY(SDWORD *psValx, SDWORD *psValy) } -BOOL msgStackGetMsg(char *psVal) +bool msgStackGetMsg(char *psVal) { if(msgStackPos < 0) { @@ -1772,7 +1772,7 @@ BOOL msgStackGetMsg(char *psVal) return true; } -static BOOL msgStackSort(void) +static bool msgStackSort(void) { SDWORD i; @@ -1804,7 +1804,7 @@ static BOOL msgStackSort(void) return true; } -BOOL msgStackPop(void) +bool msgStackPop(void) { debug(LOG_WZ, "msgStackPop: stack size %d", msgStackPos); @@ -1817,7 +1817,7 @@ BOOL msgStackPop(void) return msgStackSort(); //move all elements 1 pos lower } -BOOL msgStackGetDroid(DROID **ppsDroid) +bool msgStackGetDroid(DROID **ppsDroid) { if(msgStackPos < 0) { @@ -1835,7 +1835,7 @@ SDWORD msgStackGetCount(void) return msgStackPos + 1; } -BOOL msgStackFireTop(void) +bool msgStackFireTop(void) { SDWORD _callbackType; char msg[255]; @@ -1913,7 +1913,7 @@ BOOL msgStackFireTop(void) return true; } -static BOOL recvBeacon(NETQUEUE queue) +static bool recvBeacon(NETQUEUE queue) { int32_t sender, receiver,locX, locY; char msg[MAX_CONSOLE_STRING_LENGTH]; diff --git a/src/multiplay.h b/src/multiplay.h index a1878c237..749a822ef 100644 --- a/src/multiplay.h +++ b/src/multiplay.h @@ -34,11 +34,11 @@ struct MULTIPLAYERGAME { uint8_t type; // DMATCH/CAMPAIGN/SKIRMISH/TEAMPLAY etc... - BOOL scavengers; // whether scavengers are on or off + bool scavengers; // whether scavengers are on or off char map[128]; // name of multiplayer map being used. uint8_t maxPlayers; // max players to allow char name[128]; // game name (to be used) - BOOL fog; + bool fog; uint32_t power; // power level for arena game uint8_t base; // clean/base/base&defence uint8_t alliance; // no/yes/AIs vs Humans @@ -55,11 +55,11 @@ struct MULTISTRUCTLIMITS struct MULTIPLAYERINGAME { UDWORD PingTimes[MAX_PLAYERS]; // store for pings. - BOOL localOptionsReceived; // used to show if we have game options yet.. - BOOL localJoiningInProgress; // used before we know our player number. - BOOL JoiningInProgress[MAX_PLAYERS]; - BOOL DataIntegrity[MAX_PLAYERS]; - BOOL bHostSetup; + bool localOptionsReceived; // used to show if we have game options yet.. + bool localJoiningInProgress; // used before we know our player number. + bool JoiningInProgress[MAX_PLAYERS]; + bool DataIntegrity[MAX_PLAYERS]; + bool bHostSetup; int32_t TimeEveryoneIsInGame; bool isAllPlayersDataOK; UDWORD startTime; @@ -102,9 +102,9 @@ struct PACKAGED_CHECK extern MULTIPLAYERGAME game; // the game description. extern MULTIPLAYERINGAME ingame; // the game description. -extern BOOL bMultiPlayer; // true when more than 1 player. -extern BOOL bMultiMessages; // == bMultiPlayer unless multi messages are disabled -extern BOOL openchannels[MAX_PLAYERS]; +extern bool bMultiPlayer; // true when more than 1 player. +extern bool bMultiMessages; // == bMultiPlayer unless multi messages are disabled +extern bool openchannels[MAX_PLAYERS]; extern UBYTE bDisplayMultiJoiningStatus; // draw load progress? // //////////////////////////////////////////////////////////////////////////// @@ -156,99 +156,99 @@ extern WZ_DECL_WARN_UNUSED_RESULT FEATURE *IdToFeature(UDWORD id,UDWORD player) extern WZ_DECL_WARN_UNUSED_RESULT DROID_TEMPLATE *IdToTemplate(UDWORD tempId,UDWORD player); extern const char* getPlayerName(int player); -extern BOOL setPlayerName(int player, const char *sName); +extern bool setPlayerName(int player, const char *sName); extern const char* getPlayerColourName(int player); -extern BOOL isHumanPlayer(int player); //to tell if the player is a computer or not. -extern BOOL myResponsibility(int player); -extern BOOL responsibleFor(int player, int playerinquestion); +extern bool isHumanPlayer(int player); //to tell if the player is a computer or not. +extern bool myResponsibility(int player); +extern bool responsibleFor(int player, int playerinquestion); extern int whosResponsible(int player); int scavengerSlot(); // Returns the player number that scavengers would have if they were enabled. int scavengerPlayer(); // Returns the player number that the scavengers have, or -1 if disabled. -extern Vector3i cameraToHome (UDWORD player,BOOL scroll); +extern Vector3i cameraToHome (UDWORD player,bool scroll); extern char playerName[MAX_PLAYERS][MAX_STR_LENGTH]; //Array to store all player names (humans and AIs) -extern BOOL multiPlayerLoop (void); // for loop.c +extern bool multiPlayerLoop (void); // for loop.c -extern BOOL recvMessage (void); +extern bool recvMessage (void); bool sendTemplate(uint32_t player, DROID_TEMPLATE *t); -extern BOOL SendDestroyTemplate (DROID_TEMPLATE *t); -extern BOOL SendResearch(uint8_t player, uint32_t index, bool trigger); -extern BOOL SendDestroyFeature (FEATURE *pF); // send a destruct feature message. -extern BOOL sendTextMessage (const char *pStr,BOOL cast); // send a text message -extern BOOL sendAIMessage (char *pStr, UDWORD player, UDWORD to); //send AI message +extern bool SendDestroyTemplate (DROID_TEMPLATE *t); +extern bool SendResearch(uint8_t player, uint32_t index, bool trigger); +extern bool SendDestroyFeature (FEATURE *pF); // send a destruct feature message. +extern bool sendTextMessage (const char *pStr,bool cast); // send a text message +extern bool sendAIMessage (char *pStr, UDWORD player, UDWORD to); //send AI message void printConsoleNameChange(const char *oldName, const char *newName); ///< Print message to console saying a name changed. -extern void turnOffMultiMsg (BOOL bDoit); +extern void turnOffMultiMsg (bool bDoit); extern void sendMap(void); -extern BOOL multiplayerWinSequence(BOOL firstCall); +extern bool multiplayerWinSequence(bool firstCall); ///////////////////////////////////////////////////////// // definitions of functions in multiplay's other c files. // Buildings . multistruct -extern BOOL SendDestroyStructure(STRUCTURE *s); -extern BOOL SendBuildFinished (STRUCTURE *psStruct); -extern BOOL sendLasSat (UBYTE player, STRUCTURE *psStruct, BASE_OBJECT *psObj); +extern bool SendDestroyStructure(STRUCTURE *s); +extern bool SendBuildFinished (STRUCTURE *psStruct); +extern bool sendLasSat (UBYTE player, STRUCTURE *psStruct, BASE_OBJECT *psObj); void sendStructureInfo (STRUCTURE *psStruct, STRUCTURE_INFO structureInfo, DROID_TEMPLATE *psTempl); // droids . multibot -extern BOOL SendDroid (const DROID_TEMPLATE* pTemplate, uint32_t x, uint32_t y, uint8_t player, uint32_t id, const INITIAL_DROID_ORDERS *initialOrders); -extern BOOL SendDestroyDroid (const DROID* psDroid); -extern BOOL SendDemolishFinished(STRUCTURE *psS,DROID *psD); +extern bool SendDroid (const DROID_TEMPLATE* pTemplate, uint32_t x, uint32_t y, uint8_t player, uint32_t id, const INITIAL_DROID_ORDERS *initialOrders); +extern bool SendDestroyDroid (const DROID* psDroid); +extern bool SendDemolishFinished(STRUCTURE *psS,DROID *psD); void sendQueuedDroidInfo(void); ///< Actually sends the droid orders which were queued by SendDroidInfo. bool sendDroidInfo(DROID *psDroid, DROID_ORDER order, uint32_t x, uint32_t y, const BASE_OBJECT *psObj, const BASE_STATS *psStats, uint32_t x2, uint32_t y2, uint16_t direction, bool add); -extern BOOL SendCmdGroup (DROID_GROUP *psGroup, UWORD x, UWORD y, BASE_OBJECT *psObj); +extern bool SendCmdGroup (DROID_GROUP *psGroup, UWORD x, UWORD y, BASE_OBJECT *psObj); -extern BOOL sendDroidSecondary (const DROID* psDroid, SECONDARY_ORDER sec, SECONDARY_STATE state); -extern BOOL sendDroidEmbark (const DROID* psDroid, const DROID* psTransporter); -extern BOOL sendDroidDisEmbark (const DROID* psDroid, const DROID* psTransporter); +extern bool sendDroidSecondary (const DROID* psDroid, SECONDARY_ORDER sec, SECONDARY_STATE state); +extern bool sendDroidEmbark (const DROID* psDroid, const DROID* psTransporter); +extern bool sendDroidDisEmbark (const DROID* psDroid, const DROID* psTransporter); // Startup. mulitopt -extern BOOL multiTemplateSetup (void); -extern BOOL multiShutdown (void); -extern BOOL sendLeavingMsg (void); +extern bool multiTemplateSetup (void); +extern bool multiShutdown (void); +extern bool sendLeavingMsg (void); -extern BOOL hostCampaign (char *sGame, char *sPlayer); -extern BOOL joinCampaign (UDWORD gameNumber, char *playername); +extern bool hostCampaign (char *sGame, char *sPlayer); +extern bool joinCampaign (UDWORD gameNumber, char *playername); extern void playerResponding (void); -extern BOOL multiGameInit (void); -extern BOOL multiGameShutdown (void); -extern BOOL addTemplate (UDWORD player,DROID_TEMPLATE *psNew); -extern BOOL addTemplateToList(DROID_TEMPLATE *psNew, DROID_TEMPLATE **ppList); +extern bool multiGameInit (void); +extern bool multiGameShutdown (void); +extern bool addTemplate (UDWORD player,DROID_TEMPLATE *psNew); +extern bool addTemplateToList(DROID_TEMPLATE *psNew, DROID_TEMPLATE **ppList); void addTemplateBack(unsigned player, DROID_TEMPLATE *psNew); // syncing. void sendCheck(); //send/recv check info -extern BOOL sendScoreCheck (void); //score check only(frontend) -extern BOOL sendPing (void); // allow game to request pings. +extern bool sendScoreCheck (void); //score check only(frontend) +extern bool sendPing (void); // allow game to request pings. -extern BOOL ForceDroidSync(const DROID *droidToSend); +extern bool ForceDroidSync(const DROID *droidToSend); // multijoin -extern BOOL sendResearchStatus (STRUCTURE *psBuilding, UDWORD index, UBYTE player, BOOL bStart); +extern bool sendResearchStatus (STRUCTURE *psBuilding, UDWORD index, UBYTE player, bool bStart); extern void displayAIMessage (char *pStr, SDWORD from, SDWORD to); //make AI process a message /* for multiplayer message stack */ extern UDWORD msgStackPush(SDWORD CBtype, SDWORD plFrom, SDWORD plTo, const char *tStr, SDWORD x, SDWORD y, DROID *psDroid); -extern BOOL isMsgStackEmpty(void); -extern BOOL msgStackGetFrom(SDWORD *psVal); -extern BOOL msgStackGetTo(SDWORD *psVal); -extern BOOL msgStackGetMsg(char *psVal); -extern BOOL msgStackPop(void); +extern bool isMsgStackEmpty(void); +extern bool msgStackGetFrom(SDWORD *psVal); +extern bool msgStackGetTo(SDWORD *psVal); +extern bool msgStackGetMsg(char *psVal); +extern bool msgStackPop(void); extern SDWORD msgStackGetCount(void); extern void msgStackReset(void); -extern BOOL msgStackGetDroid(DROID **ppsDroid); +extern bool msgStackGetDroid(DROID **ppsDroid); -extern BOOL sendBeacon(int32_t locX, int32_t locY, int32_t forPlayer, int32_t sender, const char* pStr); -extern BOOL msgStackFireTop(void); +extern bool sendBeacon(int32_t locX, int32_t locY, int32_t forPlayer, int32_t sender, const char* pStr); +extern bool msgStackFireTop(void); extern bool multiplayPlayersReady (bool bNotifyStatus); extern void startMultiplayerGame (void); extern void resetReadyStatus (bool bSendOptions); -extern BOOL bPlayerReadyGUI[MAX_PLAYERS]; +extern bool bPlayerReadyGUI[MAX_PLAYERS]; #endif // __INCLUDED_SRC_MULTIPLAY_H__ diff --git a/src/multirecv.h b/src/multirecv.h index cb9b2c794..c3062123c 100644 --- a/src/multirecv.h +++ b/src/multirecv.h @@ -27,37 +27,37 @@ #ifndef __INCLUDED_SRC_MULTIRECV_H__ #define __INCLUDED_SRC_MULTIRECV_H__ -extern BOOL recvDroid (NETQUEUE queue); -extern BOOL recvDroidInfo (NETQUEUE queue); -extern BOOL recvDestroyDroid (NETQUEUE queue); -extern BOOL recvDroidMove (NETQUEUE queue); -extern BOOL recvDestroyStructure (NETQUEUE queue); -extern BOOL recvBuildFinished (NETQUEUE queue); -extern BOOL recvTemplate (NETQUEUE queue); -extern BOOL recvDestroyFeature (NETQUEUE queue); -extern BOOL recvDemolishFinished (NETQUEUE queue); -extern BOOL recvPing (NETQUEUE queue); -extern BOOL recvRequestDroid (NETQUEUE queue); -extern BOOL recvTextMessage (NETQUEUE queue); -extern BOOL recvDroidEmbark (NETQUEUE queue); -extern BOOL recvDroidDisEmbark (NETQUEUE queue); -extern BOOL recvDroidCheck (NETQUEUE queue); -extern BOOL recvStructureCheck (NETQUEUE queue); -extern BOOL recvPowerCheck (NETQUEUE queue); -extern BOOL recvColourRequest (NETQUEUE queue); -extern BOOL recvPositionRequest (NETQUEUE queue); +extern bool recvDroid (NETQUEUE queue); +extern bool recvDroidInfo (NETQUEUE queue); +extern bool recvDestroyDroid (NETQUEUE queue); +extern bool recvDroidMove (NETQUEUE queue); +extern bool recvDestroyStructure (NETQUEUE queue); +extern bool recvBuildFinished (NETQUEUE queue); +extern bool recvTemplate (NETQUEUE queue); +extern bool recvDestroyFeature (NETQUEUE queue); +extern bool recvDemolishFinished (NETQUEUE queue); +extern bool recvPing (NETQUEUE queue); +extern bool recvRequestDroid (NETQUEUE queue); +extern bool recvTextMessage (NETQUEUE queue); +extern bool recvDroidEmbark (NETQUEUE queue); +extern bool recvDroidDisEmbark (NETQUEUE queue); +extern bool recvDroidCheck (NETQUEUE queue); +extern bool recvStructureCheck (NETQUEUE queue); +extern bool recvPowerCheck (NETQUEUE queue); +extern bool recvColourRequest (NETQUEUE queue); +extern bool recvPositionRequest (NETQUEUE queue); extern void recvOptions (NETQUEUE queue); extern void sendOptions (void); -extern BOOL recvResearchStatus (NETQUEUE queue); -extern BOOL recvLasSat (NETQUEUE queue); +extern bool recvResearchStatus (NETQUEUE queue); +extern bool recvLasSat (NETQUEUE queue); extern void recvStructureInfo (NETQUEUE queue); -extern BOOL recvMapFileData (NETQUEUE queue); -extern BOOL recvMapFileRequested (NETQUEUE queue); +extern bool recvMapFileData (NETQUEUE queue); +extern bool recvMapFileRequested (NETQUEUE queue); -extern BOOL recvTextMessageAI (NETQUEUE queue); //AI multiplayer message -extern BOOL recvTeamRequest (NETQUEUE queue); -extern BOOL recvReadyRequest (NETQUEUE queue); +extern bool recvTextMessageAI (NETQUEUE queue); //AI multiplayer message +extern bool recvTeamRequest (NETQUEUE queue); +extern bool recvReadyRequest (NETQUEUE queue); #endif // __INCLUDED_SRC_MULTIRECV_H__ diff --git a/src/multistat.cpp b/src/multistat.cpp index fd1d59360..aead28d97 100644 --- a/src/multistat.cpp +++ b/src/multistat.cpp @@ -110,7 +110,7 @@ void recvMultiStats(NETQUEUE queue) // //////////////////////////////////////////////////////////////////////////// // Load Player Stats -BOOL loadMultiStats(char *sPlayerName, PLAYERSTATS *st) +bool loadMultiStats(char *sPlayerName, PLAYERSTATS *st) { char fileName[255]; UDWORD size; @@ -173,7 +173,7 @@ BOOL loadMultiStats(char *sPlayerName, PLAYERSTATS *st) // //////////////////////////////////////////////////////////////////////////// // Save Player Stats #define MAX_STA_SIZE 500 -BOOL saveMultiStats(const char *sFileName, const char *sPlayerName, const PLAYERSTATS *st) +bool saveMultiStats(const char *sFileName, const char *sPlayerName, const PLAYERSTATS *st) { char buffer[MAX_STA_SIZE]; char fileName[255] = ""; diff --git a/src/multistat.h b/src/multistat.h index fad55d128..b35fb7c0e 100644 --- a/src/multistat.h +++ b/src/multistat.h @@ -39,8 +39,8 @@ struct PLAYERSTATS uint32_t recentScore; }; -BOOL saveMultiStats(const char *sFName, const char *sPlayerName, const PLAYERSTATS *playerStats); // to disk -BOOL loadMultiStats(char *sPlayerName, PLAYERSTATS *playerStats); // form disk +bool saveMultiStats(const char *sFName, const char *sPlayerName, const PLAYERSTATS *playerStats); // to disk +bool loadMultiStats(char *sPlayerName, PLAYERSTATS *playerStats); // form disk PLAYERSTATS getMultiStats(UDWORD player); // get from net bool setMultiStats(uint32_t player, PLAYERSTATS plStats, bool bLocal); // send to net. void updateMultiStatsDamage(UDWORD attacker, UDWORD defender, UDWORD inflicted); diff --git a/src/multistruct.cpp b/src/multistruct.cpp index 506623259..77acdb7f9 100644 --- a/src/multistruct.cpp +++ b/src/multistruct.cpp @@ -53,7 +53,7 @@ // //////////////////////////////////////////////////////////////////////////// // INFORM others that a building has been completed. -BOOL SendBuildFinished(STRUCTURE *psStruct) +bool SendBuildFinished(STRUCTURE *psStruct) { uint8_t player = psStruct->player; ASSERT( player < MAX_PLAYERS, "invalid player %u", player); @@ -69,7 +69,7 @@ BOOL SendBuildFinished(STRUCTURE *psStruct) } // //////////////////////////////////////////////////////////////////////////// -BOOL recvBuildFinished(NETQUEUE queue) +bool recvBuildFinished(NETQUEUE queue) { uint32_t structId; STRUCTURE *psStruct; @@ -150,7 +150,7 @@ BOOL recvBuildFinished(NETQUEUE queue) // //////////////////////////////////////////////////////////////////////////// // demolish message. -BOOL SendDemolishFinished(STRUCTURE *psStruct, DROID *psDroid) +bool SendDemolishFinished(STRUCTURE *psStruct, DROID *psDroid) { NETbeginEncode(NETgameQueue(selectedPlayer), GAME_DEMOLISH); @@ -161,7 +161,7 @@ BOOL SendDemolishFinished(STRUCTURE *psStruct, DROID *psDroid) return NETend(); } -BOOL recvDemolishFinished(NETQUEUE queue) +bool recvDemolishFinished(NETQUEUE queue) { STRUCTURE *psStruct; DROID *psDroid; @@ -197,7 +197,7 @@ BOOL recvDemolishFinished(NETQUEUE queue) // //////////////////////////////////////////////////////////////////////////// // Inform others that a structure has been destroyed -BOOL SendDestroyStructure(STRUCTURE *s) +bool SendDestroyStructure(STRUCTURE *s) { technologyGiveAway(s); NETbeginEncode(NETgameQueue(selectedPlayer), GAME_STRUCTDEST); @@ -210,7 +210,7 @@ BOOL SendDestroyStructure(STRUCTURE *s) // //////////////////////////////////////////////////////////////////////////// // acknowledge the destruction of a structure, from another player. -BOOL recvDestroyStructure(NETQUEUE queue) +bool recvDestroyStructure(NETQUEUE queue) { uint32_t structID; STRUCTURE *psStruct; @@ -238,7 +238,7 @@ BOOL recvDestroyStructure(NETQUEUE queue) // //////////////////////////////////////////////////////////////////////////// //lassat is firing -BOOL sendLasSat(UBYTE player, STRUCTURE *psStruct, BASE_OBJECT *psObj) +bool sendLasSat(UBYTE player, STRUCTURE *psStruct, BASE_OBJECT *psObj) { NETbeginEncode(NETgameQueue(selectedPlayer), GAME_LASSAT); @@ -251,7 +251,7 @@ BOOL sendLasSat(UBYTE player, STRUCTURE *psStruct, BASE_OBJECT *psObj) } // recv lassat info on the receiving end. -BOOL recvLasSat(NETQUEUE queue) +bool recvLasSat(NETQUEUE queue) { BASE_OBJECT *psObj; UBYTE player,targetplayer; diff --git a/src/multisync.cpp b/src/multisync.cpp index 48568eb3f..09a3c7738 100644 --- a/src/multisync.cpp +++ b/src/multisync.cpp @@ -77,11 +77,11 @@ static void NETauto(PACKAGED_CHECK *v) // //////////////////////////////////////////////////////////////////////////// // function definitions -static BOOL sendStructureCheck (void); //Structure +static bool sendStructureCheck (void); //Structure static PACKAGED_CHECK packageCheck(const DROID *pD); -static BOOL sendDroidCheck (void); //droids +static bool sendDroidCheck (void); //droids -static BOOL sendPowerCheck(void); +static bool sendPowerCheck(void); static UDWORD averagePing(void); #define AV_PING_FREQUENCY 20000 // how often to update average pingtimes. in approx millisecs. @@ -95,7 +95,7 @@ static UDWORD PingSend[MAX_PLAYERS]; //stores the time the ping was called. // //////////////////////////////////////////////////////////////////////////// // test traffic level. -static BOOL okToSend(void) +static bool okToSend(void) { // Update checks and go no further if any exceeded. // removing the received check again ... add NETgetRecentBytesRecvd() to left hand side of equation if this works badly @@ -195,7 +195,7 @@ static DROID* pickADroid(void) * * Call this when you need to update the given droid right now. */ -BOOL ForceDroidSync(const DROID* droidToSend) +bool ForceDroidSync(const DROID* droidToSend) { uint8_t count = 1; // *always* one PACKAGED_CHECK pc = packageCheck(droidToSend); @@ -213,7 +213,7 @@ BOOL ForceDroidSync(const DROID* droidToSend) // /////////////////////////////////////////////////////////////////////////// // send a droid info packet. -static BOOL sendDroidCheck(void) +static bool sendDroidCheck(void) { DROID *pD, **ppD; uint8_t i, count; @@ -318,7 +318,7 @@ static PACKAGED_CHECK packageCheck(const DROID *pD) // //////////////////////////////////////////////////////////////////////////// // receive a check and update the local world state accordingly -BOOL recvDroidCheck(NETQUEUE queue) +bool recvDroidCheck(NETQUEUE queue) { uint8_t count; int i; @@ -482,7 +482,7 @@ static uint32_t structureCheckLastType[MAX_PLAYERS]; // //////////////////////////////////////////////////////////////////////// // Send structure information. -static BOOL sendStructureCheck(void) +static bool sendStructureCheck(void) { uint8_t player; @@ -555,11 +555,11 @@ static BOOL sendStructureCheck(void) } // receive checking info about a structure and update local world state -BOOL recvStructureCheck(NETQUEUE queue) +bool recvStructureCheck(NETQUEUE queue) { uint32_t synchTime; STRUCTURE *pS; - BOOL hasCapacity = true; + bool hasCapacity = true; int j; Rotation rot; uint8_t player, ourCapacity; @@ -683,7 +683,7 @@ static int64_t powerCheckLastPower[MAX_PLAYERS]; // //////////////////////////////////////////////////////////////////////// // //////////////////////////////////////////////////////////////////////// // Power Checking. Send a power level check every now and again. -static BOOL sendPowerCheck() +static bool sendPowerCheck() { uint8_t player; @@ -717,7 +717,7 @@ static BOOL sendPowerCheck() return true; } -BOOL recvPowerCheck(NETQUEUE queue) +bool recvPowerCheck(NETQUEUE queue) { uint8_t player; uint32_t synchTime; @@ -758,7 +758,7 @@ BOOL recvPowerCheck(NETQUEUE queue) // //////////////////////////////////////////////////////////////////////// // Score // We use setMultiStats() to broadcast the score when needed. -BOOL sendScoreCheck(void) +bool sendScoreCheck(void) { static UDWORD lastsent = 0; @@ -812,9 +812,9 @@ static UDWORD averagePing(void) return total / MAX(count, 1); } -BOOL sendPing(void) +bool sendPing(void) { - BOOL isNew = true; + bool isNew = true; uint8_t player = selectedPlayer; int i; static UDWORD lastPing = 0; // Last time we sent a ping @@ -886,9 +886,9 @@ BOOL sendPing(void) } // accept and process incoming ping messages. -BOOL recvPing(NETQUEUE queue) +bool recvPing(NETQUEUE queue) { - BOOL isNew; + bool isNew; uint8_t sender, us = selectedPlayer; NETbeginDecode(queue, NET_PING); diff --git a/src/objects.cpp b/src/objects.cpp index 8afc2b24e..f469b22ea 100644 --- a/src/objects.cpp +++ b/src/objects.cpp @@ -30,7 +30,7 @@ /* Initialise the object system */ -BOOL objInitialise(void) +bool objInitialise(void) { if (!objmemInitialise()) { @@ -42,7 +42,7 @@ BOOL objInitialise(void) /* Shutdown the object system */ -BOOL objShutdown(void) +bool objShutdown(void) { objmemShutdown(); diff --git a/src/objects.h b/src/objects.h index 06b46c5b1..942927591 100644 --- a/src/objects.h +++ b/src/objects.h @@ -36,10 +36,10 @@ #include "stats.h" /* Initialise the object system */ -extern BOOL objInitialise(void); +extern bool objInitialise(void); /* Shutdown the object system */ -extern BOOL objShutdown(void); +extern bool objShutdown(void); /*goes thru' the list passed in reversing the order so the first entry becomes the last and the last entry becomes the first!*/ diff --git a/src/objmem.cpp b/src/objmem.cpp index ee8f24604..dcc621e89 100644 --- a/src/objmem.cpp +++ b/src/objmem.cpp @@ -79,7 +79,7 @@ static void objListIntegCheck(void); /* Initialise the object heaps */ -BOOL objmemInitialise(void) +bool objmemInitialise(void) { // reset the object ID number unsynchObjID = OBJ_ID_INIT/2; // /2 so that object IDs start around OBJ_ID_INIT*8, in case that's important when loading maps. @@ -618,7 +618,7 @@ void freeAllFeatures(void) /************************** FLAG_POSITION ********************************/ /* Create a new Flag Position */ -BOOL createFlagPosition(FLAG_POSITION **ppsNew, UDWORD player) +bool createFlagPosition(FLAG_POSITION **ppsNew, UDWORD player) { ASSERT( playerorder == order; } -BOOL validOrderForLoc(DROID_ORDER order) +bool validOrderForLoc(DROID_ORDER order) { return (order == DORDER_NONE || order == DORDER_MOVE || order == DORDER_GUARD || order == DORDER_SCOUT || order == DORDER_RUN || order == DORDER_PATROL || @@ -2110,7 +2110,7 @@ void orderDroidLoc(DROID *psDroid, DROID_ORDER order, UDWORD x, UDWORD y, QUEUE_ /* Get the state of a droid order with it's location */ -BOOL orderStateLoc(DROID *psDroid, DROID_ORDER order, UDWORD *pX, UDWORD *pY) +bool orderStateLoc(DROID *psDroid, DROID_ORDER order, UDWORD *pX, UDWORD *pY) { if (order != psDroid->order) { @@ -2134,7 +2134,7 @@ BOOL orderStateLoc(DROID *psDroid, DROID_ORDER order, UDWORD *pX, UDWORD *pY) return false; } -BOOL validOrderForObj(DROID_ORDER order) +bool validOrderForObj(DROID_ORDER order) { return (order == DORDER_NONE || order == DORDER_HELPBUILD || order == DORDER_DEMOLISH || order == DORDER_REPAIR || order == DORDER_ATTACK || order == DORDER_FIRESUPPORT || order == DORDER_COMMANDERSUPPORT || @@ -2171,7 +2171,7 @@ void orderDroidObj(DROID *psDroid, DROID_ORDER order, BASE_OBJECT *psObj, QUEUE_ /* Get the state of a droid order with an object */ BASE_OBJECT* orderStateObj(DROID *psDroid, DROID_ORDER order) { - BOOL match = false; + bool match = false; switch (order) { @@ -2333,9 +2333,9 @@ void orderDroidStatsTwoLocDirAdd(DROID *psDroid, DROID_ORDER order, BASE_STATS * /* Get the state of a droid order with a location and a stat */ -BOOL orderStateStatsLoc(DROID *psDroid, DROID_ORDER order, BASE_STATS **ppsStats, UDWORD *pX, UDWORD *pY) +bool orderStateStatsLoc(DROID *psDroid, DROID_ORDER order, BASE_STATS **ppsStats, UDWORD *pX, UDWORD *pY) { - BOOL match = false; + bool match = false; switch (order) { @@ -2445,7 +2445,7 @@ void orderDroidAdd(DROID *psDroid, DROID_ORDER_DATA *psOrder) // do the next order from a droids order list -BOOL orderDroidList(DROID *psDroid) +bool orderDroidList(DROID *psDroid) { DROID_ORDER_DATA sOrder; @@ -2582,7 +2582,7 @@ static bool orderDroidLocAdd(DROID *psDroid, DROID_ORDER order, UDWORD x, UDWORD // add an object order to a droids order list -static BOOL orderDroidObjAdd(DROID *psDroid, DROID_ORDER order, BASE_OBJECT *psObj[DROID_MAXWEAPS]) +static bool orderDroidObjAdd(DROID *psDroid, DROID_ORDER order, BASE_OBJECT *psObj[DROID_MAXWEAPS]) { ASSERT(!isBlueprint(psObj[0]), "Target is a blueprint"); @@ -2606,7 +2606,7 @@ static BOOL orderDroidObjAdd(DROID *psDroid, DROID_ORDER order, BASE_OBJECT *psO } /* Choose an order for a droid from a location */ -DROID_ORDER chooseOrderLoc(DROID *psDroid, UDWORD x,UDWORD y, BOOL altOrder) +DROID_ORDER chooseOrderLoc(DROID *psDroid, UDWORD x,UDWORD y, bool altOrder) { DROID_ORDER order = DORDER_NONE; PROPULSION_TYPE propulsion = getPropulsionStats(psDroid)->propulsionType; @@ -2708,7 +2708,7 @@ void orderSelectedLoc(uint32_t player, uint32_t x, uint32_t y, bool add) /* Choose an order for a droid from an object */ -DROID_ORDER chooseOrderObj(DROID *psDroid, BASE_OBJECT *psObj, BOOL altOrder) +DROID_ORDER chooseOrderObj(DROID *psDroid, BASE_OBJECT *psObj, bool altOrder) { DROID_ORDER order; STRUCTURE *psStruct; @@ -3000,7 +3000,7 @@ static void orderPlayOrderObjAudio( UDWORD player, BASE_OBJECT *psObj ) /* Give selected droids an order from an object target * If add is true the order is queued with the droid */ -void orderSelectedObjAdd(UDWORD player, BASE_OBJECT *psObj, BOOL add) +void orderSelectedObjAdd(UDWORD player, BASE_OBJECT *psObj, bool add) { DROID *psCurr; DROID_ORDER order; @@ -3047,7 +3047,7 @@ void orderSelectedObj(UDWORD player, BASE_OBJECT *psObj) /* order all selected droids with a location and a stat */ -void orderSelectedStatsLocDir(UDWORD player, DROID_ORDER order, BASE_STATS *psStats, UDWORD x, UDWORD y, uint16_t direction, BOOL add) +void orderSelectedStatsLocDir(UDWORD player, DROID_ORDER order, BASE_STATS *psStats, UDWORD x, UDWORD y, uint16_t direction, bool add) { DROID *psCurr; @@ -3074,7 +3074,7 @@ void orderSelectedStatsLocDir(UDWORD player, DROID_ORDER order, BASE_STATS *psSt /* order all selected droids with two a locations and a stat */ -void orderSelectedStatsTwoLocDir(UDWORD player, DROID_ORDER order, BASE_STATS *psStats, UDWORD x1, UDWORD y1, UDWORD x2, UDWORD y2, uint16_t direction, BOOL add) +void orderSelectedStatsTwoLocDir(UDWORD player, DROID_ORDER order, BASE_STATS *psStats, UDWORD x1, UDWORD y1, UDWORD x2, UDWORD y2, uint16_t direction, bool add) { DROID *psCurr; @@ -3156,9 +3156,9 @@ static STRUCTURE *FindARepairFacility(unsigned player) // see if a droid supports a secondary order -BOOL secondarySupported(DROID *psDroid, SECONDARY_ORDER sec) +bool secondarySupported(DROID *psDroid, SECONDARY_ORDER sec) { - BOOL supported; + bool supported; supported = true; // Default to supported. @@ -3383,12 +3383,12 @@ void secondaryCheckDamageLevel(DROID *psDroid) // set the state of a secondary order, return false if failed. -BOOL secondarySetState(DROID *psDroid, SECONDARY_ORDER sec, SECONDARY_STATE State, QUEUE_MODE mode) +bool secondarySetState(DROID *psDroid, SECONDARY_ORDER sec, SECONDARY_STATE State, QUEUE_MODE mode) { UDWORD CurrState, factType, prodType; STRUCTURE *psStruct; SDWORD factoryInc; - BOOL retVal; + bool retVal; DROID *psTransport, *psCurr, *psNext; DROID_ORDER order; @@ -3713,7 +3713,7 @@ BOOL secondarySetState(DROID *psDroid, SECONDARY_ORDER sec, SECONDARY_STATE Stat // deal with a droid receiving a primary order -BOOL secondaryGotPrimaryOrder(DROID *psDroid, DROID_ORDER order) +bool secondaryGotPrimaryOrder(DROID *psDroid, DROID_ORDER order) { UDWORD oldState; @@ -4027,10 +4027,10 @@ void orderHealthCheck(DROID *psDroid) } // set the state of a secondary order for a Factory, return false if failed. -BOOL setFactoryState(STRUCTURE *psStruct, SECONDARY_ORDER sec, SECONDARY_STATE State) +bool setFactoryState(STRUCTURE *psStruct, SECONDARY_ORDER sec, SECONDARY_STATE State) { UDWORD CurrState; - BOOL retVal; + bool retVal; FACTORY *psFactory; @@ -4095,7 +4095,7 @@ BOOL setFactoryState(STRUCTURE *psStruct, SECONDARY_ORDER sec, SECONDARY_STATE S } // get the state of a secondary order for a Factory, return false if unsupported -BOOL getFactoryState(STRUCTURE *psStruct, SECONDARY_ORDER sec, SECONDARY_STATE *pState) +bool getFactoryState(STRUCTURE *psStruct, SECONDARY_ORDER sec, SECONDARY_STATE *pState) { UDWORD state; diff --git a/src/order.h b/src/order.h index 2088c59d3..6f9431182 100644 --- a/src/order.h +++ b/src/order.h @@ -42,19 +42,19 @@ extern void orderUpdateDroid(DROID *psDroid); extern void orderDroid(DROID *psDroid, DROID_ORDER order, QUEUE_MODE mode); /* Check the order state of a droid */ -extern BOOL orderState(DROID *psDroid, DROID_ORDER order); +extern bool orderState(DROID *psDroid, DROID_ORDER order); /** Check if an order is valid for a location. */ -BOOL validOrderForLoc(DROID_ORDER order); +bool validOrderForLoc(DROID_ORDER order); /** Check if an order is valid for an object. */ -BOOL validOrderForObj(DROID_ORDER order); +bool validOrderForObj(DROID_ORDER order); /* Give a droid an order with a location target */ void orderDroidLoc(DROID *psDroid, DROID_ORDER order, UDWORD x, UDWORD y, QUEUE_MODE mode); /* Get the state of a droid order with a location */ -extern BOOL orderStateLoc(DROID *psDroid, DROID_ORDER order, UDWORD *pX, UDWORD *pY); +extern bool orderStateLoc(DROID *psDroid, DROID_ORDER order, UDWORD *pX, UDWORD *pY); /* Give a droid an order with an object target */ void orderDroidObj(DROID *psDroid, DROID_ORDER order, BASE_OBJECT *psObj, QUEUE_MODE mode); @@ -66,7 +66,7 @@ extern BASE_OBJECT* orderStateObj(DROID *psDroid, DROID_ORDER order); void orderDroidStatsLocDir(DROID *psDroid, DROID_ORDER order, BASE_STATS *psStats, UDWORD x, UDWORD y, uint16_t direction, QUEUE_MODE mode); /* Get the state of a droid order with a location and a stat */ -extern BOOL orderStateStatsLoc(DROID *psDroid, DROID_ORDER order, +extern bool orderStateStatsLoc(DROID *psDroid, DROID_ORDER order, BASE_STATS **ppsStats, UDWORD *pX, UDWORD *pY); /* Give a droid an order with a location and a stat */ @@ -80,31 +80,31 @@ extern void orderSelectedLoc(uint32_t player, uint32_t x, uint32_t y, bool add); /* Give selected droids an order with an object target */ extern void orderSelectedObj(UDWORD player, BASE_OBJECT *psObj); -extern void orderSelectedObjAdd(UDWORD player, BASE_OBJECT *psObj, BOOL add); +extern void orderSelectedObjAdd(UDWORD player, BASE_OBJECT *psObj, bool add); // add an order to a droids order list void orderDroidAdd(DROID *psDroid, DROID_ORDER_DATA *psOrder); void orderDroidAddPending(DROID *psDroid, DROID_ORDER_DATA *psOrder); // do the next order from a droids order list -extern BOOL orderDroidList(DROID *psDroid); +extern bool orderDroidList(DROID *psDroid); /* order all selected droids with a location and a stat */ -void orderSelectedStatsLocDir(UDWORD player, DROID_ORDER order, BASE_STATS *psStats, UDWORD x, UDWORD y, uint16_t direction, BOOL add); +void orderSelectedStatsLocDir(UDWORD player, DROID_ORDER order, BASE_STATS *psStats, UDWORD x, UDWORD y, uint16_t direction, bool add); /* add an order with a location and a stat to the droids order list*/ void orderDroidStatsLocDirAdd(DROID *psDroid, DROID_ORDER order, BASE_STATS *psStats, UDWORD x, UDWORD y, uint16_t direction, bool add = true); /* order all selected droids with two a locations and a stat */ -void orderSelectedStatsTwoLocDir(UDWORD player, DROID_ORDER order, BASE_STATS *psStats, UDWORD x1, UDWORD y1, UDWORD x2, UDWORD y2, uint16_t direction, BOOL add); +void orderSelectedStatsTwoLocDir(UDWORD player, DROID_ORDER order, BASE_STATS *psStats, UDWORD x1, UDWORD y1, UDWORD x2, UDWORD y2, uint16_t direction, bool add); // see if a droid supports a secondary order -extern BOOL secondarySupported(DROID *psDroid, SECONDARY_ORDER sec); +extern bool secondarySupported(DROID *psDroid, SECONDARY_ORDER sec); // get the state of a secondary order, return false if unsupported extern SECONDARY_STATE secondaryGetState(DROID *psDroid, SECONDARY_ORDER sec); // set the state of a secondary order, return false if failed. -extern BOOL secondarySetState(DROID *psDroid, SECONDARY_ORDER sec, SECONDARY_STATE State, QUEUE_MODE mode = ModeQueue); +extern bool secondarySetState(DROID *psDroid, SECONDARY_ORDER sec, SECONDARY_STATE State, QUEUE_MODE mode = ModeQueue); // check the damage level of a droid against it's secondary state extern void secondaryCheckDamageLevel(DROID *psDroid); @@ -131,9 +131,9 @@ extern BASE_OBJECT * checkForDamagedStruct(DROID *psDroid, STRUCTURE *psTarget); extern void orderHealthCheck(DROID *psDroid); // set the state of a secondary order for a Factory, return false if failed. -extern BOOL setFactoryState(STRUCTURE *psStruct, SECONDARY_ORDER sec, SECONDARY_STATE State); +extern bool setFactoryState(STRUCTURE *psStruct, SECONDARY_ORDER sec, SECONDARY_STATE State); // get the state of a secondary order for a Factory, return false if unsupported -extern BOOL getFactoryState(STRUCTURE *psStruct, SECONDARY_ORDER sec, SECONDARY_STATE *pState); +extern bool getFactoryState(STRUCTURE *psStruct, SECONDARY_ORDER sec, SECONDARY_STATE *pState); //lasSat structure can select a target extern void orderStructureObj(UDWORD player, BASE_OBJECT *psObj); @@ -142,8 +142,8 @@ extern void orderStructureObj(UDWORD player, BASE_OBJECT *psObj); void orderDroidListEraseRange(DROID *psDroid, unsigned indexBegin, unsigned indexEnd); ///< Pops the order at position index off the beginning of the list. (Even if the order is still pending.) void orderClearTargetFromDroidList(DROID *psDroid, BASE_OBJECT *psTarget); ///< Clear all orders for the given target (including pending orders) from the list -extern DROID_ORDER chooseOrderLoc(DROID *psDroid, UDWORD x,UDWORD y, BOOL altOrder); -extern DROID_ORDER chooseOrderObj(DROID *psDroid, BASE_OBJECT *psObj, BOOL altOrder); +extern DROID_ORDER chooseOrderLoc(DROID *psDroid, UDWORD x,UDWORD y, bool altOrder); +extern DROID_ORDER chooseOrderObj(DROID *psDroid, BASE_OBJECT *psObj, bool altOrder); extern void orderDroidBase(DROID *psDroid, DROID_ORDER_DATA *psOrder); diff --git a/src/power.cpp b/src/power.cpp index 596eb42aa..a589a07f2 100644 --- a/src/power.cpp +++ b/src/power.cpp @@ -54,7 +54,7 @@ #define FP_ONE ((int64_t)1 << 32) //flag used to check for power calculations to be done or not -BOOL powerCalculated; +bool powerCalculated; static UDWORD nextPowerSystemUpdate; /* Updates the current power based on the extracted power and a Power Generator*/ @@ -76,7 +76,7 @@ struct PLAYER_POWER static PLAYER_POWER asPower[MAX_PLAYERS]; /*allocate the space for the playerPower*/ -BOOL allocPlayerPower(void) +bool allocPlayerPower(void) { clearPlayerPower(); powerCalculated = true; @@ -147,7 +147,7 @@ void throttleEconomy(void) } /*check the current power - if enough return true, else return false */ -BOOL checkPower(int player, uint32_t quantity) +bool checkPower(int player, uint32_t quantity) { ASSERT_OR_RETURN(false, player < MAX_PLAYERS, "Bad player (%d)", player); @@ -176,7 +176,7 @@ void addPower(int player, int32_t quantity) } /*resets the power calc flag for all players*/ -void powerCalc(BOOL on) +void powerCalc(bool on) { powerCalculated = on; } @@ -328,9 +328,9 @@ void newGameInitPower(void) } /*defines which structure types draw power - returns true if use power*/ -BOOL structUsesPower(STRUCTURE *psStruct) +bool structUsesPower(STRUCTURE *psStruct) { - BOOL bUsesPower = false; + bool bUsesPower = false; ASSERT( psStruct != NULL, "structUsesPower: Invalid Structure pointer" ); @@ -353,9 +353,9 @@ BOOL structUsesPower(STRUCTURE *psStruct) } /*defines which droid types draw power - returns true if use power*/ -BOOL droidUsesPower(DROID *psDroid) +bool droidUsesPower(DROID *psDroid) { - BOOL bUsesPower = false; + bool bUsesPower = false; ASSERT(psDroid != NULL, "droidUsesPower: Invalid unit pointer" ); diff --git a/src/power.h b/src/power.h index 54437029d..66fdf4d2e 100644 --- a/src/power.h +++ b/src/power.h @@ -35,16 +35,16 @@ #define POWER_FACTOR 100 /** Allocate the space for the playerPower. */ -extern BOOL allocPlayerPower(void); +extern bool allocPlayerPower(void); /** Clear the playerPower. */ extern void clearPlayerPower(void); /** Reset the power levels when a power_gen or resource_extractor is destroyed. */ -extern BOOL resetPlayerPower(UDWORD player, STRUCTURE *psStruct); +extern bool resetPlayerPower(UDWORD player, STRUCTURE *psStruct); /** Check the available power. */ -BOOL checkPower(int player, uint32_t quantity); +bool checkPower(int player, uint32_t quantity); extern int requestPowerFor(int player, int32_t amount, int points); extern int requestPrecisePowerFor(int player, int64_t amount, int points); @@ -65,19 +65,19 @@ int32_t getPower(unsigned player); int64_t getPrecisePower(unsigned player); /** Resets the power levels for all players when power is turned back on. */ -void powerCalc(BOOL on); +void powerCalc(bool on); /** Temp function to give all players some power when a new game has been loaded. */ void newGameInitPower(void); /** Defines which structure types draw power - returns true if use power. */ -extern BOOL structUsesPower(STRUCTURE *psStruct); +extern bool structUsesPower(STRUCTURE *psStruct); /** Defines which droid types draw power - returns true if use power. */ -extern BOOL droidUsesPower(DROID *psDroid); +extern bool droidUsesPower(DROID *psDroid); /** Flag used to check for power calculations to be done or not. */ -extern BOOL powerCalculated; +extern bool powerCalculated; extern void throttleEconomy(void); diff --git a/src/projectile.cpp b/src/projectile.cpp index 1fcb378c2..da049fdb8 100644 --- a/src/projectile.cpp +++ b/src/projectile.cpp @@ -119,7 +119,7 @@ static inline void setProjectileDestination(PROJECTILE *psProj, BASE_OBJECT *psO /***************************************************************************/ -BOOL gfxVisible(PROJECTILE *psObj) +bool gfxVisible(PROJECTILE *psObj) { // Already know it is visible if (psObj->bVisible) @@ -177,7 +177,7 @@ BOOL gfxVisible(PROJECTILE *psObj) /***************************************************************************/ -BOOL +bool proj_InitSystem( void ) { psProjectileList.clear(); @@ -199,7 +199,7 @@ proj_FreeAllProjectiles( void ) /***************************************************************************/ -BOOL +bool proj_Shutdown( void ) { proj_FreeAllProjectiles(); @@ -1718,7 +1718,7 @@ static HIT_SIDE getHitSide(PROJECTILE *psObj, BASE_OBJECT *psTarget) } /* Returns true if an object has just been hit by an electronic warfare weapon*/ -static BOOL justBeenHitByEW(BASE_OBJECT *psObj) +static bool justBeenHitByEW(BASE_OBJECT *psObj) { DROID *psDroid; FEATURE *psFeature; diff --git a/src/projectile.h b/src/projectile.h index 761d61466..a046c6221 100644 --- a/src/projectile.h +++ b/src/projectile.h @@ -47,9 +47,9 @@ extern BASE_OBJECT *g_pProjLastAttacker; ///< The last unit that did damage - us /** How long to display a single electronic warfare shimmmer. */ #define ELEC_DAMAGE_DURATION (GAME_TICKS_PER_SEC/5) -BOOL proj_InitSystem(void); ///< Initialize projectiles subsystem. +bool proj_InitSystem(void); ///< Initialize projectiles subsystem. void proj_UpdateAll(void); ///< Frame update for projectiles. -BOOL proj_Shutdown(void); ///< Shut down projectile subsystem. +bool proj_Shutdown(void); ///< Shut down projectile subsystem. PROJECTILE *proj_GetFirst(void); ///< Get first projectile in the list. PROJECTILE *proj_GetNext(void); ///< Get next projectile in the list. @@ -73,7 +73,7 @@ bool proj_Direct(const WEAPON_STATS* psStats); SDWORD proj_GetLongRange(const WEAPON_STATS* psStats); extern UDWORD calcDamage(UDWORD baseDamage, WEAPON_EFFECT weaponEffect, BASE_OBJECT *psTarget); -extern BOOL gfxVisible(PROJECTILE *psObj); +extern bool gfxVisible(PROJECTILE *psObj); /***************************************************************************/ diff --git a/src/radar.cpp b/src/radar.cpp index 706ea33c5..45ac1a3a0 100644 --- a/src/radar.cpp +++ b/src/radar.cpp @@ -49,9 +49,9 @@ #define HIT_NOTIFICATION (GAME_TICKS_PER_SEC * 2) #define RADAR_FRAME_SKIP 10 -BOOL bEnemyAllyRadarColor = false; /**< Enemy/ally radar color. */ +bool bEnemyAllyRadarColor = false; /**< Enemy/ally radar color. */ RADAR_DRAW_MODE radarDrawMode = RADAR_MODE_DEFAULT; /**< Current mini-map mode. */ -BOOL rotateRadar; ///< Rotate the radar? +bool rotateRadar; ///< Rotate the radar? static PIELIGHT colRadarAlly, colRadarMe, colRadarEnemy; static PIELIGHT tileColours[MAX_TILES]; @@ -143,7 +143,7 @@ void resetRadarRedraw() resizeRadar(); } -BOOL InitRadar(void) +bool InitRadar(void) { // Ally/enemy/me colors colRadarAlly = WZCOL_YELLOW; @@ -155,7 +155,7 @@ BOOL InitRadar(void) return true; } -BOOL resizeRadar(void) +bool resizeRadar(void) { if (radarBuffer) { @@ -186,7 +186,7 @@ BOOL resizeRadar(void) return true; } -BOOL ShutdownRadar(void) +bool ShutdownRadar(void) { pie_ShutdownRadar(); @@ -666,7 +666,7 @@ static void DrawRadarExtras(float radarX, float radarY, float pixSizeH, float pi } /** Does a screen coordinate lie within the radar area? */ -BOOL CoordInRadar(int x,int y) +bool CoordInRadar(int x,int y) { Vector2f pos; pos.x = x - radarCenterX; diff --git a/src/radar.h b/src/radar.h index d38a1d75b..5a0f83570 100644 --- a/src/radar.h +++ b/src/radar.h @@ -36,14 +36,14 @@ void radarColour(UDWORD tileNumber, uint8_t r, uint8_t g, uint8_t b); ///< Set r #define RADARZOOM_STEP (16 * 1/4) // 0.25x extern void resetRadarRedraw(void); -extern BOOL InitRadar(void); ///< Initialize minimap subsystem. -extern BOOL ShutdownRadar(void); ///< Shutdown minimap subsystem. -extern BOOL resizeRadar(void); ///< Recalculate minimap size. For initialization code only. +extern bool InitRadar(void); ///< Initialize minimap subsystem. +extern bool ShutdownRadar(void); ///< Shutdown minimap subsystem. +extern bool resizeRadar(void); ///< Recalculate minimap size. For initialization code only. extern void drawRadar(void); ///< Draw the minimap on the screen. extern void CalcRadarPosition(int mX, int mY, int *PosX, int *PosY); ///< Given a position within the radar, returns a world coordinate. extern void SetRadarZoom(uint8_t ZoomLevel); ///< Set current zoom level. 1.0 is 1:1 resolution. extern uint8_t GetRadarZoom(void); ///< Get current zoom level. -extern BOOL CoordInRadar(int x, int y); ///< Is screen coordinate inside minimap? +extern bool CoordInRadar(int x, int y); ///< Is screen coordinate inside minimap? /** Different mini-map draw modes. */ enum RADAR_DRAW_MODE @@ -57,9 +57,9 @@ enum RADAR_DRAW_MODE NUM_RADAR_MODES }; -extern BOOL bEnemyAllyRadarColor; ///< Enemy/ally minimap color +extern bool bEnemyAllyRadarColor; ///< Enemy/ally minimap color extern RADAR_DRAW_MODE radarDrawMode; ///< Current minimap mode -extern BOOL rotateRadar; +extern bool rotateRadar; extern void radarInitVars(void); ///< Recalculate minimap variables. For initialization code only. extern PIELIGHT clanColours[]; diff --git a/src/research.cpp b/src/research.cpp index 4537d0923..2f9d55061 100644 --- a/src/research.cpp +++ b/src/research.cpp @@ -103,7 +103,7 @@ static UWORD setIconID(char *pIconName, char *pName); static COMPONENT_STATS * getComponentDetails(char *pName, char *pCompName); static void replaceComponent(COMPONENT_STATS *pNewComponent, COMPONENT_STATS *pOldComponent, UBYTE player); -static BOOL checkResearchName(RESEARCH *psRes, UDWORD numStats); +static bool checkResearchName(RESEARCH *psRes, UDWORD numStats); static const char *getResearchName(RESEARCH *pResearch) { @@ -122,7 +122,7 @@ static void replaceTransDroidComponents(DROID *psTransporter, UDWORD oldType, UDWORD oldCompInc, UDWORD newCompInc); -BOOL researchInitVars(void) +bool researchInitVars(void) { int i; @@ -239,7 +239,7 @@ BOOL researchInitVars(void) /*Load the research stats from the file exported from Access*/ -BOOL loadResearch(const char *pResearchData, UDWORD bufferSize) +bool loadResearch(const char *pResearchData, UDWORD bufferSize) { unsigned int researchCount = numCR(pResearchData, bufferSize); RESEARCH *pResearch; @@ -540,14 +540,14 @@ BOOL loadResearch(const char *pResearchData, UDWORD bufferSize) //Load the pre-requisites for a research list -BOOL loadResearchPR(const char *pPRData, UDWORD bufferSize) +bool loadResearchPR(const char *pPRData, UDWORD bufferSize) { const unsigned int NumToAlloc = numCR(pPRData, bufferSize); unsigned int i = 0; char ResearchName[MAX_STR_LENGTH], PRName[MAX_STR_LENGTH]; UWORD incR, incPR; RESEARCH *pResearch = asResearch, *pPRResearch = asResearch; - BOOL recFound; + bool recFound; // Check not going to go over max ASSERT( NumToAlloc <= MAX_RESEARCH_PR, "loadResearchPR: too many!" ); @@ -624,7 +624,7 @@ BOOL loadResearchPR(const char *pPRData, UDWORD bufferSize) } //Load the artefacts for a research list -BOOL loadResearchArtefacts(const char *pArteData, UDWORD bufferSize, UDWORD listNumber) +bool loadResearchArtefacts(const char *pArteData, UDWORD bufferSize, UDWORD listNumber) { const unsigned int NumToAlloc = numCR(pArteData, bufferSize); unsigned int i = 0; @@ -767,7 +767,7 @@ BOOL loadResearchArtefacts(const char *pArteData, UDWORD bufferSize, UDWORD list } //Load the Structures for a research list -BOOL loadResearchStructures(const char *pStructData, UDWORD bufferSize,UDWORD listNumber) +bool loadResearchStructures(const char *pStructData, UDWORD bufferSize,UDWORD listNumber) { const unsigned int NumToAlloc = numCR(pStructData, bufferSize); unsigned int i = 0; @@ -775,7 +775,7 @@ BOOL loadResearchStructures(const char *pStructData, UDWORD bufferSize,UDWORD li UWORD incR, incS; RESEARCH *pResearch = asResearch; STRUCTURE_STATS *pStructure = asStructureStats; - BOOL recFound; + bool recFound; UDWORD numToFind; //initialise the storage flags @@ -904,7 +904,7 @@ BOOL loadResearchStructures(const char *pStructData, UDWORD bufferSize,UDWORD li } //Load the pre-requisites for a research list -BOOL loadResearchFunctions(const char *pFunctionData, UDWORD bufferSize) +bool loadResearchFunctions(const char *pFunctionData, UDWORD bufferSize) { const unsigned int NumToAlloc = numCR(pFunctionData, bufferSize); unsigned int i = 0; @@ -912,7 +912,7 @@ BOOL loadResearchFunctions(const char *pFunctionData, UDWORD bufferSize) UDWORD incR, incF; RESEARCH *pResearch = asResearch; FUNCTION **pFunction = asFunctions; - BOOL recFound; + bool recFound; //initialise the storage flags for (incR = 0; incR < numResearch; incR++) @@ -1017,7 +1017,7 @@ UWORD fillResearchList(UWORD *plist, UDWORD playerID, UWORD topic, UWORD limit) UWORD inc, count=0; UDWORD incPR, incS; PLAYER_RESEARCH *pPlayerRes = asPlayerResList[playerID]; - BOOL bPRFound, bStructFound; + bool bPRFound, bStructFound; ASSERT( numResearch < UWORD_MAX, "fillResearchList: only using a UWORD for storage - need more!" ); @@ -1111,7 +1111,7 @@ add_research: //if passed all the tests - add it to the list } /* process the results of a completed research topic */ -void researchResult(UDWORD researchIndex, UBYTE player, BOOL bDisplay, STRUCTURE *psResearchFacility, BOOL bTrigger) +void researchResult(UDWORD researchIndex, UBYTE player, bool bDisplay, STRUCTURE *psResearchFacility, bool bTrigger) { RESEARCH *pResearch = asResearch + researchIndex; UDWORD type, inc;//, upgrade; @@ -1803,7 +1803,7 @@ void researchResult(UDWORD researchIndex, UBYTE player, BOOL bDisplay, STRUCTURE } /*This function is called when the research files are reloaded*/ -BOOL ResearchShutDown(void) +bool ResearchShutDown(void) { UBYTE i; @@ -2371,7 +2371,7 @@ COMPONENT_STATS * getComponentDetails(char *pName, char *pCompName) } //return a pointer to a research topic based on the name -RESEARCH * getResearch(const char *pName, BOOL resName) +RESEARCH * getResearch(const char *pName, bool resName) { unsigned int inc = 0; @@ -2458,7 +2458,7 @@ static void replaceComponent(COMPONENT_STATS *pNewComponent, COMPONENT_STATS *pO /*Looks through all the currently allocated stats to check the name is not a duplicate*/ -static BOOL checkResearchName(RESEARCH *psResearch, UDWORD numStats) +static bool checkResearchName(RESEARCH *psResearch, UDWORD numStats) { UDWORD inc; @@ -2480,12 +2480,12 @@ static BOOL checkResearchName(RESEARCH *psResearch, UDWORD numStats) /* Sets the 'possible' flag for a player's research so the topic will appear in the research list next time the Research Facilty is selected */ -BOOL enableResearch(RESEARCH *psResearch, UDWORD player) +bool enableResearch(RESEARCH *psResearch, UDWORD player) { UDWORD inc; PLAYER_RESEARCH *pPlayerRes = asPlayerResList[player]; STRUCTURE *psStruct; - BOOL resFree = false; + bool resFree = false; inc = psResearch - asResearch; @@ -2571,7 +2571,7 @@ void researchReward(UBYTE losingPlayer, UBYTE rewardPlayer) /*checks that the research has loaded up as expected - must be done after all research parts have been loaded*/ -BOOL checkResearchStats(void) +bool checkResearchStats(void) { UDWORD resInc, inc; for (resInc = 0; resInc < numResearch; resInc++) @@ -2741,7 +2741,7 @@ void enableSelfRepair(UBYTE player) } /*check to see if any research has been completed that enables self repair*/ -BOOL selfRepairEnabled(UBYTE player) +bool selfRepairEnabled(UBYTE player) { if (bSelfRepair[player]) { @@ -2754,7 +2754,7 @@ BOOL selfRepairEnabled(UBYTE player) } /*checks the stat to see if its of type wall or defence*/ -BOOL wallDefenceStruct(STRUCTURE_STATS *psStats) +bool wallDefenceStruct(STRUCTURE_STATS *psStats) { if (psStats->type == REF_DEFENSE || psStats->type == REF_WALL || psStats->type == REF_GATE || psStats->type == REF_WALLCORNER || psStats->type == REF_BLASTDOOR) diff --git a/src/research.h b/src/research.h index 7ff70d29b..a6b574d37 100644 --- a/src/research.h +++ b/src/research.h @@ -83,16 +83,16 @@ extern UDWORD aDefaultSensor[MAX_PLAYERS]; extern UDWORD aDefaultECM[MAX_PLAYERS]; extern UDWORD aDefaultRepair[MAX_PLAYERS]; -//extern BOOL loadResearch(void); -extern BOOL loadResearch(const char *pResearchData, UDWORD bufferSize); +//extern bool loadResearch(void); +extern bool loadResearch(const char *pResearchData, UDWORD bufferSize); //Load the pre-requisites for a research list -extern BOOL loadResearchPR(const char *pPRData, UDWORD bufferSize); +extern bool loadResearchPR(const char *pPRData, UDWORD bufferSize); //Load the artefacts for a research list -extern BOOL loadResearchArtefacts(const char *pArteData, UDWORD bufferSize, UDWORD listNumber); +extern bool loadResearchArtefacts(const char *pArteData, UDWORD bufferSize, UDWORD listNumber); //Load the pre-requisites for a research list -extern BOOL loadResearchFunctions(const char *pFunctionData, UDWORD bufferSize); +extern bool loadResearchFunctions(const char *pFunctionData, UDWORD bufferSize); //Load the Structures for a research list -extern BOOL loadResearchStructures(const char *pStructData, UDWORD bufferSize, UDWORD listNumber); +extern bool loadResearchStructures(const char *pStructData, UDWORD bufferSize, UDWORD listNumber); /*function to check what can be researched for a particular player at any one instant. Returns the number to research*/ @@ -103,15 +103,15 @@ extern UWORD fillResearchList(UWORD *plist, UDWORD playerID, UWORD topic, UWORD limit); /* process the results of a completed research topic */ -extern void researchResult(UDWORD researchIndex, UBYTE player, BOOL bDisplay, STRUCTURE *psResearchFacility, BOOL bTrigger); +extern void researchResult(UDWORD researchIndex, UBYTE player, bool bDisplay, STRUCTURE *psResearchFacility, bool bTrigger); //this just inits all the research arrays -extern BOOL ResearchShutDown(void); +extern bool ResearchShutDown(void); //this free the memory used for the research extern void ResearchRelease(void); /* For a given view data get the research this is related to */ -extern RESEARCH * getResearch(const char *pName, BOOL resName); +extern RESEARCH * getResearch(const char *pName, bool resName); /* sets the status of the topic to cancelled and stores the current research points accquired */ @@ -123,18 +123,18 @@ RESEARCH *getResearchForMsg(VIEWDATA *pViewData); /* Sets the 'possible' flag for a player's research so the topic will appear in the research list next time the Research Facilty is selected */ -extern BOOL enableResearch(RESEARCH *psResearch, UDWORD player); +extern bool enableResearch(RESEARCH *psResearch, UDWORD player); /*find the last research topic of importance that the losing player did and 'give' the results to the reward player*/ extern void researchReward(UBYTE losingPlayer, UBYTE rewardPlayer); /*check to see if any research has been completed that enables self repair*/ -extern BOOL selfRepairEnabled(UBYTE player); +extern bool selfRepairEnabled(UBYTE player); extern SDWORD mapRIDToIcon( UDWORD rid ); extern SDWORD mapIconToRID(UDWORD iconID); -extern BOOL checkResearchStats(void); +extern bool checkResearchStats(void); /*puts research facility on hold*/ extern void holdResearch(STRUCTURE *psBuilding, QUEUE_MODE mode); @@ -142,12 +142,12 @@ extern void holdResearch(STRUCTURE *psBuilding, QUEUE_MODE mode); extern void releaseResearch(STRUCTURE *psBuilding, QUEUE_MODE mode); /*checks the stat to see if its of type wall or defence*/ -extern BOOL wallDefenceStruct(STRUCTURE_STATS *psStats); +extern bool wallDefenceStruct(STRUCTURE_STATS *psStats); extern void enableSelfRepair(UBYTE player); void CancelAllResearch(UDWORD pl); -extern BOOL researchInitVars(void); +extern bool researchInitVars(void); #endif // __INCLUDED_SRC_RESEARCH_H__ diff --git a/src/scores.cpp b/src/scores.cpp index 436987be2..c74d4aff9 100644 --- a/src/scores.cpp +++ b/src/scores.cpp @@ -184,14 +184,14 @@ static void dispAdditionalInfo( void ); /* The present mission data */ static MISSION_DATA missionData; static UDWORD dispST; -static BOOL bDispStarted = false; +static bool bDispStarted = false; static char text[255]; static char text2[255]; extern bool Cheated; // -------------------------------------------------------------------- /* Initialise the mission data info - done before each mission */ -BOOL scoreInitSystem( void ) +bool scoreInitSystem( void ) { missionData.unitsBuilt = 0; missionData.unitsKilled = 0; @@ -331,7 +331,7 @@ UDWORD hours,minutes,seconds; static void drawStatBars(void) { UDWORD index; -BOOL bMoreBars; +bool bMoreBars; UDWORD x,y; UDWORD width,height; diff --git a/src/scores.h b/src/scores.h index 60d35787d..67d053325 100644 --- a/src/scores.h +++ b/src/scores.h @@ -61,8 +61,8 @@ UDWORD width,height; // Height down screen and width _unfilled_ UDWORD percent; // What percentage full is it? UDWORD stringID; // String resource name to stick next to it. UDWORD queTime; // How many game ticks before it's active? -BOOL bQueued; // Already fired off? -BOOL bActive; // Is this one active? +bool bQueued; // Already fired off? +bool bActive; // Is this one active? UDWORD number; // %d string for the associated text string. }; @@ -89,7 +89,7 @@ STAT_ACE -extern BOOL scoreInitSystem ( void ); +extern bool scoreInitSystem ( void ); extern void scoreUpdateVar ( DATA_INDEX var ); extern void scoreDataToConsole ( void ); extern void scoreDataToScreen ( void ); diff --git a/src/scriptai.cpp b/src/scriptai.cpp index 95e665fb7..ffd65e10a 100644 --- a/src/scriptai.cpp +++ b/src/scriptai.cpp @@ -49,7 +49,7 @@ static INTERP_VAL scrFunctionResult; //function return value to be pushed to stack // Add a droid to a group -BOOL scrGroupAddDroid(void) +bool scrGroupAddDroid(void) { DROID_GROUP *psGroup; DROID *psDroid; @@ -87,7 +87,7 @@ BOOL scrGroupAddDroid(void) // Add droids in an area to a group -BOOL scrGroupAddArea(void) +bool scrGroupAddArea(void) { DROID_GROUP *psGroup; DROID *psDroid; @@ -127,7 +127,7 @@ BOOL scrGroupAddArea(void) // Add groupless droids in an area to a group -BOOL scrGroupAddAreaNoGroup(void) +bool scrGroupAddAreaNoGroup(void) { DROID_GROUP *psGroup; DROID *psDroid; @@ -165,7 +165,7 @@ BOOL scrGroupAddAreaNoGroup(void) // Move the droids from one group to another -BOOL scrGroupAddGroup(void) +bool scrGroupAddGroup(void) { DROID_GROUP *psTo, *psFrom; DROID *psDroid, *psNext; @@ -191,11 +191,11 @@ BOOL scrGroupAddGroup(void) // check if a droid is a member of a group -BOOL scrGroupMember(void) +bool scrGroupMember(void) { DROID_GROUP *psGroup; DROID *psDroid; - BOOL retval; + bool retval; if (!stackPopParams(2, ST_GROUP, &psGroup, ST_DROID, &psDroid)) { @@ -231,7 +231,7 @@ BOOL scrGroupMember(void) // returns number of idle droids in a group. -BOOL scrIdleGroup(void) +bool scrIdleGroup(void) { DROID_GROUP *psGroup; DROID *psDroid; @@ -264,7 +264,7 @@ static DROID_GROUP *psScrIterateGroup; static DROID *psScrIterateGroupDroid; // initialise iterating a groups members -BOOL scrInitIterateGroup(void) +bool scrInitIterateGroup(void) { DROID_GROUP *psGroup; @@ -284,7 +284,7 @@ BOOL scrInitIterateGroup(void) // iterate through a groups members -BOOL scrIterateGroup(void) +bool scrIterateGroup(void) { DROID_GROUP *psGroup; DROID *psDroid; @@ -321,7 +321,7 @@ BOOL scrIterateGroup(void) // initialise iterating a cluster -BOOL scrInitIterateCluster(void) +bool scrInitIterateCluster(void) { SDWORD clusterID; @@ -337,7 +337,7 @@ BOOL scrInitIterateCluster(void) // iterate a cluster -BOOL scrIterateCluster(void) +bool scrIterateCluster(void) { BASE_OBJECT *psObj; @@ -354,7 +354,7 @@ BOOL scrIterateCluster(void) // remove a droid from a group -BOOL scrDroidLeaveGroup(void) +bool scrDroidLeaveGroup(void) { DROID *psDroid; @@ -373,7 +373,7 @@ BOOL scrDroidLeaveGroup(void) // Give a group an order -BOOL scrOrderGroup(void) +bool scrOrderGroup(void) { DROID_GROUP *psGroup; DROID_ORDER order; @@ -406,7 +406,7 @@ BOOL scrOrderGroup(void) // Give a group an order to a location -BOOL scrOrderGroupLoc(void) +bool scrOrderGroupLoc(void) { DROID_GROUP *psGroup; DROID_ORDER order; @@ -445,7 +445,7 @@ BOOL scrOrderGroupLoc(void) // Give a group an order to an object -BOOL scrOrderGroupObj(void) +bool scrOrderGroupObj(void) { DROID_GROUP *psGroup; DROID_ORDER order; @@ -484,7 +484,7 @@ BOOL scrOrderGroupObj(void) } // Give a droid an order -BOOL scrOrderDroid(void) +bool scrOrderDroid(void) { DROID *psDroid; DROID_ORDER order; @@ -521,7 +521,7 @@ BOOL scrOrderDroid(void) // Give a Droid an order to a location -BOOL scrOrderDroidLoc(void) +bool scrOrderDroidLoc(void) { DROID *psDroid; DROID_ORDER order; @@ -563,7 +563,7 @@ BOOL scrOrderDroidLoc(void) // Give a Droid an order to an object -BOOL scrOrderDroidObj(void) +bool scrOrderDroidObj(void) { DROID *psDroid; DROID_ORDER order; @@ -603,7 +603,7 @@ BOOL scrOrderDroidObj(void) } // Give a Droid an order with a stat -BOOL scrOrderDroidStatsLoc(void) +bool scrOrderDroidStatsLoc(void) { DROID *psDroid; DROID_ORDER order; @@ -666,7 +666,7 @@ BOOL scrOrderDroidStatsLoc(void) // set the secondary state for a droid -BOOL scrSetDroidSecondary(void) +bool scrSetDroidSecondary(void) { DROID *psDroid; SECONDARY_ORDER sec; @@ -690,7 +690,7 @@ BOOL scrSetDroidSecondary(void) } // set the secondary state for a droid -BOOL scrSetGroupSecondary(void) +bool scrSetGroupSecondary(void) { DROID_GROUP *psGroup; SECONDARY_ORDER sec; @@ -711,7 +711,7 @@ BOOL scrSetGroupSecondary(void) // add a droid to a commander -BOOL scrCmdDroidAddDroid(void) +bool scrCmdDroidAddDroid(void) { DROID *psDroid, *psCommander; @@ -726,7 +726,7 @@ BOOL scrCmdDroidAddDroid(void) } // returns max number of droids in a commander group -BOOL scrCmdDroidMaxGroup(void) +bool scrCmdDroidMaxGroup(void) { DROID *psCommander; @@ -753,7 +753,7 @@ UDWORD scrDroidPref, scrDroidIgnore; // reset the structure preferences -BOOL scrResetStructTargets(void) +bool scrResetStructTargets(void) { scrStructPref = 0; scrStructIgnore = 0; @@ -763,7 +763,7 @@ BOOL scrResetStructTargets(void) // reset the droid preferences -BOOL scrResetDroidTargets(void) +bool scrResetDroidTargets(void) { scrDroidPref = 0; scrDroidIgnore = 0; @@ -773,7 +773,7 @@ BOOL scrResetDroidTargets(void) // set prefered structure target types -BOOL scrSetStructTarPref(void) +bool scrSetStructTarPref(void) { UDWORD pref; @@ -807,7 +807,7 @@ BOOL scrSetStructTarPref(void) // set structure target ignore types -BOOL scrSetStructTarIgnore(void) +bool scrSetStructTarIgnore(void) { UDWORD pref; @@ -841,7 +841,7 @@ BOOL scrSetStructTarIgnore(void) // set prefered droid target types -BOOL scrSetDroidTarPref(void) +bool scrSetDroidTarPref(void) { UDWORD pref; @@ -878,7 +878,7 @@ BOOL scrSetDroidTarPref(void) } // set droid target ignore types -BOOL scrSetDroidTarIgnore(void) +bool scrSetDroidTarIgnore(void) { UDWORD pref; @@ -1169,7 +1169,7 @@ static BASE_OBJECT *scrTargetInArea(SDWORD tarPlayer, SDWORD visPlayer, SDWORD t { BASE_OBJECT *psTarget, *psCurr; SDWORD temp; - BOOL bVisCheck; + bool bVisCheck; UDWORD tarMask; TARGET_MASK getTargetMask; TARGET_PREF targetPriority; @@ -1263,7 +1263,7 @@ static BASE_OBJECT *scrTargetInArea(SDWORD tarPlayer, SDWORD visPlayer, SDWORD t } // get a structure target in an area using the preferences -BOOL scrStructTargetInArea(void) +bool scrStructTargetInArea(void) { SDWORD x1,y1,x2,y2; SDWORD tarPlayer, visPlayer; @@ -1285,7 +1285,7 @@ BOOL scrStructTargetInArea(void) } // get a structure target on the map using the preferences -BOOL scrStructTargetOnMap(void) +bool scrStructTargetOnMap(void) { SDWORD tarPlayer, visPlayer; STRUCTURE *psTarget; @@ -1309,7 +1309,7 @@ BOOL scrStructTargetOnMap(void) } // get a droid target in an area using the preferences -BOOL scrDroidTargetInArea(void) +bool scrDroidTargetInArea(void) { SDWORD x1,y1,x2,y2; SDWORD tarPlayer, visPlayer; @@ -1333,7 +1333,7 @@ BOOL scrDroidTargetInArea(void) } // get a droid target on the map using the preferences -BOOL scrDroidTargetOnMap(void) +bool scrDroidTargetOnMap(void) { SDWORD tarPlayer, visPlayer; DROID *psTarget; @@ -1357,7 +1357,7 @@ BOOL scrDroidTargetOnMap(void) } // get a target from a cluster using the preferences -BOOL scrTargetInCluster(void) +bool scrTargetInCluster(void) { SDWORD tarPlayer, tarType, visPlayer, clusterID, cluster; BASE_OBJECT *psTarget; @@ -1396,7 +1396,7 @@ BOOL scrTargetInCluster(void) // ******************************************************************************************** // ******************************************************************************************** -BOOL scrSkCanBuildTemplate(void) +bool scrSkCanBuildTemplate(void) { STRUCTURE *psStructure; DROID_TEMPLATE *psTempl; @@ -1517,7 +1517,7 @@ failTempl: // ******************************************************************************************** // locate the enemy // gives a target location given a player to attack. -BOOL scrSkLocateEnemy(void) +bool scrSkLocateEnemy(void) { SDWORD player;//,*x,*y; STRUCTURE *psStruct; @@ -1559,11 +1559,11 @@ BOOL scrSkLocateEnemy(void) // ******************************************************************************************** -BOOL skTopicAvail(UWORD inc, UDWORD player) +bool skTopicAvail(UWORD inc, UDWORD player) { UDWORD incPR, incS; PLAYER_RESEARCH *pPlayerRes = asPlayerResList[player]; - BOOL bPRFound, bStructFound; + bool bPRFound, bStructFound; //if the topic is possible and has not already been researched - add to list @@ -1629,7 +1629,7 @@ BOOL skTopicAvail(UWORD inc, UDWORD player) } // ******************************************************************************************** -BOOL scrSkDoResearch(void) +bool scrSkDoResearch(void) { SDWORD player, bias;//,timeToResearch;//,*x,*y; UWORD i; @@ -1675,7 +1675,7 @@ BOOL scrSkDoResearch(void) } // ******************************************************************************************** -BOOL scrSkVtolEnableCheck(void) +bool scrSkVtolEnableCheck(void) { SDWORD player; UDWORD i; @@ -1715,7 +1715,7 @@ BOOL scrSkVtolEnableCheck(void) } // ******************************************************************************************** -BOOL scrSkGetFactoryCapacity(void) +bool scrSkGetFactoryCapacity(void) { SDWORD count=0; STRUCTURE *psStructure; @@ -1738,7 +1738,7 @@ BOOL scrSkGetFactoryCapacity(void) return true; } // ******************************************************************************************** -BOOL scrSkDifficultyModifier(void) +bool scrSkDifficultyModifier(void) { int player; RESEARCH_FACILITY *psResFacility; @@ -1787,7 +1787,7 @@ BOOL scrSkDifficultyModifier(void) // ******************************************************************************************** // not a direct script function but a helper for scrSkDefenseLocation and scrSkDefenseLocationB -static BOOL defenseLocation(BOOL variantB) +static bool defenseLocation(bool variantB) { SDWORD *pX,*pY,statIndex,statIndex2; UDWORD x,y,gX,gY,dist,player,nearestSoFar,count; @@ -1795,7 +1795,7 @@ static BOOL defenseLocation(BOOL variantB) DROID *psDroid; BASE_STATS *psWStats; UDWORD x1,x2,x3,x4,y1,y2,y3,y4; - BOOL noWater; + bool noWater; UDWORD minCount; UDWORD offset; @@ -2022,19 +2022,19 @@ failed: // return a good place to build a defence, given a starting point -BOOL scrSkDefenseLocation(void) +bool scrSkDefenseLocation(void) { return defenseLocation(false); } // return a good place to build a defence with a min number of clear tiles -BOOL scrSkDefenseLocationB(void) +bool scrSkDefenseLocationB(void) { return defenseLocation(true); } -BOOL scrSkFireLassat(void) +bool scrSkFireLassat(void) { SDWORD player; BASE_OBJECT *psObj; @@ -2055,7 +2055,7 @@ BOOL scrSkFireLassat(void) //----------------------- // New functions //----------------------- -BOOL scrActionDroidObj(void) +bool scrActionDroidObj(void) { DROID *psDroid; DROID_ACTION action; @@ -2095,7 +2095,7 @@ DROID_GROUP *psScrIterateGroupB[MAX_PLAYERS]; DROID *psScrIterateGroupDroidB[MAX_PLAYERS]; // initialise iterating a groups members -BOOL scrInitIterateGroupB(void) +bool scrInitIterateGroupB(void) { DROID_GROUP *psGroup; SDWORD bucket; @@ -2120,7 +2120,7 @@ BOOL scrInitIterateGroupB(void) //script function - improved version // iterate through a groups members -BOOL scrIterateGroupB(void) +bool scrIterateGroupB(void) { DROID_GROUP *psGroup; DROID *psDroid; @@ -2161,7 +2161,7 @@ BOOL scrIterateGroupB(void) return true; } -BOOL scrDroidCanReach(void) +bool scrDroidCanReach(void) { DROID *psDroid; int x, y; diff --git a/src/scriptai.h b/src/scriptai.h index 70b66d838..ba65a3f5b 100644 --- a/src/scriptai.h +++ b/src/scriptai.h @@ -25,73 +25,73 @@ #define __INCLUDED_SRC_SCRIPTAI_H__ // Add a droid to a group -extern BOOL scrGroupAddDroid(void); +extern bool scrGroupAddDroid(void); // Add droids in an area to a group -extern BOOL scrGroupAddArea(void); +extern bool scrGroupAddArea(void); // Add groupless droids in an area to a group -extern BOOL scrGroupAddAreaNoGroup(void); +extern bool scrGroupAddAreaNoGroup(void); // Move the droids from one group to another -extern BOOL scrGroupAddGroup(void); +extern bool scrGroupAddGroup(void); // check if a droid is a member of a group -extern BOOL scrGroupMember(void); +extern bool scrGroupMember(void); // return number of idle droids in group. -extern BOOL scrIdleGroup(void); +extern bool scrIdleGroup(void); // initialise iterating a groups members -extern BOOL scrInitIterateGroup(void); +extern bool scrInitIterateGroup(void); // iterate through a groups members -extern BOOL scrIterateGroup(void); +extern bool scrIterateGroup(void); // remove a droid from a group -extern BOOL scrDroidLeaveGroup(void); +extern bool scrDroidLeaveGroup(void); // Give a group an order -extern BOOL scrOrderGroup(void); +extern bool scrOrderGroup(void); // Give a group an order to a location -extern BOOL scrOrderGroupLoc(void); +extern bool scrOrderGroupLoc(void); // Give a group an order to an object -extern BOOL scrOrderGroupObj(void); +extern bool scrOrderGroupObj(void); // Give a Droid an order -extern BOOL scrOrderDroid(void); +extern bool scrOrderDroid(void); // Give a Droid an order to a location -extern BOOL scrOrderDroidLoc(void); +extern bool scrOrderDroidLoc(void); // Give a Droid an order to an object -extern BOOL scrOrderDroidObj(void); +extern bool scrOrderDroidObj(void); // Give a Droid an order with a stat -extern BOOL scrOrderDroidStatsLoc(void); +extern bool scrOrderDroidStatsLoc(void); // set the secondary state for a droid -extern BOOL scrSetDroidSecondary(void); +extern bool scrSetDroidSecondary(void); // set the secondary state for a droid -extern BOOL scrSetGroupSecondary(void); +extern bool scrSetGroupSecondary(void); // initialise iterating a cluster -extern BOOL scrInitIterateCluster(void); +extern bool scrInitIterateCluster(void); // iterate a cluster -extern BOOL scrIterateCluster(void); +extern bool scrIterateCluster(void); // add a droid to a commander -extern BOOL scrCmdDroidAddDroid(void); +extern bool scrCmdDroidAddDroid(void); // returns max number of droids in a commander group -extern BOOL scrCmdDroidMaxGroup(void); +extern bool scrCmdDroidMaxGroup(void); // return whether a droid can reach given destination -extern BOOL scrDroidCanReach(void); +extern bool scrDroidCanReach(void); // types for structure targets enum SCR_STRUCT_TAR @@ -149,52 +149,52 @@ enum SCR_DROID_TAR // reset the structure preferences -BOOL scrResetStructTargets(void); +bool scrResetStructTargets(void); // reset the droid preferences -BOOL scrResetDroidTargets(void); +bool scrResetDroidTargets(void); // set prefered structure target types -BOOL scrSetStructTarPref(void); +bool scrSetStructTarPref(void); // set structure target ignore types -BOOL scrSetStructTarIgnore(void); +bool scrSetStructTarIgnore(void); // set prefered droid target types -BOOL scrSetDroidTarPref(void); +bool scrSetDroidTarPref(void); // set droid target ignore types -BOOL scrSetDroidTarIgnore(void); +bool scrSetDroidTarIgnore(void); // get a structure target in an area using the preferences -BOOL scrStructTargetInArea(void); +bool scrStructTargetInArea(void); // get a structure target on the map using the preferences -BOOL scrStructTargetOnMap(void); +bool scrStructTargetOnMap(void); // get a droid target in an area using the preferences -BOOL scrDroidTargetInArea(void); +bool scrDroidTargetInArea(void); // get a droid target on the map using the preferences -BOOL scrDroidTargetOnMap(void); +bool scrDroidTargetOnMap(void); // get a target from a cluster using the preferences -BOOL scrTargetInCluster(void); +bool scrTargetInCluster(void); // Skirmish funcs may99 // choose and do research -BOOL scrSkDoResearch(void); +bool scrSkDoResearch(void); // find the human players -BOOL scrSkLocateEnemy(void); +bool scrSkLocateEnemy(void); // check a template -BOOL scrSkCanBuildTemplate(void); +bool scrSkCanBuildTemplate(void); // check for vtol availability -BOOL scrSkVtolEnableCheck(void); +bool scrSkVtolEnableCheck(void); // check capacity -BOOL scrSkGetFactoryCapacity(void); +bool scrSkGetFactoryCapacity(void); // help/hinder player. -BOOL scrSkDifficultyModifier(void); +bool scrSkDifficultyModifier(void); // pick good spots. -BOOL scrSkDefenseLocation(void); +bool scrSkDefenseLocation(void); // line build. -//BOOL scrSkOrderDroidLineBuild(void); +//bool scrSkOrderDroidLineBuild(void); #endif // __INCLUDED_SRC_SCRIPTAI_H__ diff --git a/src/scriptcb.cpp b/src/scriptcb.cpp index 2ef4b41db..f848af090 100644 --- a/src/scriptcb.cpp +++ b/src/scriptcb.cpp @@ -75,10 +75,10 @@ SDWORD MultiMsgPlayerFrom = -2; char ConsoleMsg[MAXSTRLEN]="ERROR!!!\0"; //Last console message char MultiplayMsg[MAXSTRLEN]; //Last multiplayer message -BOOL scrCBDroidTaken(void) +bool scrCBDroidTaken(void) { DROID **ppsDroid; - BOOL triggered = false; + bool triggered = false; if (!stackPopParams(1, VAL_REF|ST_DROID, &ppsDroid)) { @@ -106,12 +106,12 @@ BOOL scrCBDroidTaken(void) } // Deal with a CALL_NEWDROID -BOOL scrCBNewDroid(void) +bool scrCBNewDroid(void) { SDWORD player; DROID **ppsDroid; STRUCTURE **ppsStructure; - BOOL triggered = false; + bool triggered = false; if (!stackPopParams(3, VAL_INT, &player, VAL_REF|ST_DROID, &ppsDroid, VAL_REF|ST_STRUCTURE, &ppsStructure)) { @@ -143,12 +143,12 @@ BOOL scrCBNewDroid(void) } // Deal with a CALL_STRUCT_ATTACKED -BOOL scrCBStructAttacked(void) +bool scrCBStructAttacked(void) { SDWORD player; STRUCTURE **ppsTarget; BASE_OBJECT **ppsAttacker;//, **ppsTarget; - BOOL triggered = false; + bool triggered = false; if (!stackPopParams(3, VAL_INT, &player, VAL_REF|ST_STRUCTURE, &ppsTarget, @@ -186,7 +186,7 @@ BOOL scrCBStructAttacked(void) return true; } -BOOL scrCBVTOLRetarget(void) +bool scrCBVTOLRetarget(void) { SDWORD player; DROID **ppsDroid; @@ -216,12 +216,12 @@ BOOL scrCBVTOLRetarget(void) } // Deal with a CALL_DROID_ATTACKED -BOOL scrCBDroidAttacked(void) +bool scrCBDroidAttacked(void) { SDWORD player; DROID **ppsTarget; BASE_OBJECT **ppsAttacker;//, **ppsTarget; - BOOL triggered = false; + bool triggered = false; if (!stackPopParams(3, VAL_INT, &player, VAL_REF|ST_DROID, &ppsTarget, @@ -260,12 +260,12 @@ BOOL scrCBDroidAttacked(void) } // Deal with a CALL_ATTACKED -BOOL scrCBAttacked(void) +bool scrCBAttacked(void) { SDWORD player; BASE_OBJECT **ppsTarget; BASE_OBJECT **ppsAttacker;//, **ppsTarget; - BOOL triggered = false; + bool triggered = false; if (!stackPopParams(3, VAL_INT, &player, VAL_REF|ST_BASEOBJECT, &ppsTarget, @@ -306,10 +306,10 @@ BOOL scrCBAttacked(void) // The button id // deal with CALL_BUTTON_PRESSED -BOOL scrCBButtonPressed(void) +bool scrCBButtonPressed(void) { UDWORD button; - BOOL triggered = false; + bool triggered = false; if (!stackPopParams(1, VAL_INT, &button)) { @@ -334,7 +334,7 @@ BOOL scrCBButtonPressed(void) DROID *psCBSelectedDroid; // deal with CALL_DROID_SELECTED -BOOL scrCBDroidSelected(void) +bool scrCBDroidSelected(void) { DROID **ppsDroid; @@ -362,11 +362,11 @@ BOOL scrCBDroidSelected(void) BASE_OBJECT *psCBObjDestroyed; // deal with a CALL_OBJ_DESTROYED -BOOL scrCBObjDestroyed(void) +bool scrCBObjDestroyed(void) { SDWORD player; BASE_OBJECT **ppsObj; - BOOL retval; + bool retval; if (!stackPopParams(2, VAL_INT, &player, VAL_REF|ST_BASEOBJECT, &ppsObj)) { @@ -397,11 +397,11 @@ BOOL scrCBObjDestroyed(void) // deal with a CALL_STRUCT_DESTROYED -BOOL scrCBStructDestroyed(void) +bool scrCBStructDestroyed(void) { SDWORD player; BASE_OBJECT **ppsObj; - BOOL retval; + bool retval; if (!stackPopParams(2, VAL_INT, &player, VAL_REF|ST_STRUCTURE, &ppsObj)) { @@ -432,11 +432,11 @@ BOOL scrCBStructDestroyed(void) // deal with a CALL_DROID_DESTROYED -BOOL scrCBDroidDestroyed(void) +bool scrCBDroidDestroyed(void) { SDWORD player; BASE_OBJECT **ppsObj; - BOOL retval; + bool retval; if (!stackPopParams(2, VAL_INT, &player, VAL_REF|ST_DROID, &ppsObj)) { @@ -467,10 +467,10 @@ BOOL scrCBDroidDestroyed(void) // deal with a CALL_FEATURE_DESTROYED -BOOL scrCBFeatureDestroyed(void) +bool scrCBFeatureDestroyed(void) { BASE_OBJECT **ppsObj; - BOOL retval; + bool retval; if (!stackPopParams(1, VAL_REF|ST_FEATURE, &ppsObj)) { @@ -504,12 +504,12 @@ BASE_OBJECT *psScrCBObjSeen; BASE_OBJECT *psScrCBObjViewer; // deal with all the object seen functions -static BOOL scrCBObjectSeen(SDWORD callback) +static bool scrCBObjectSeen(SDWORD callback) { BASE_OBJECT **ppsObj; BASE_OBJECT **ppsViewer; SDWORD player; - BOOL retval; + bool retval; if (!stackPopParams(3, VAL_INT, &player, VAL_REF|ST_BASEOBJECT, &ppsObj, VAL_REF|ST_BASEOBJECT, &ppsViewer)) { @@ -561,33 +561,33 @@ static BOOL scrCBObjectSeen(SDWORD callback) } // deal with a CALL_OBJ_SEEN -BOOL scrCBObjSeen(void) +bool scrCBObjSeen(void) { return scrCBObjectSeen(CALL_OBJ_SEEN); } // deal with a CALL_DROID_SEEN -BOOL scrCBDroidSeen(void) +bool scrCBDroidSeen(void) { return scrCBObjectSeen(CALL_DROID_SEEN); } // deal with a CALL_STRUCT_SEEN -BOOL scrCBStructSeen(void) +bool scrCBStructSeen(void) { return scrCBObjectSeen(CALL_STRUCT_SEEN); } // deal with a CALL_FEATURE_SEEN -BOOL scrCBFeatureSeen(void) +bool scrCBFeatureSeen(void) { return scrCBObjectSeen(CALL_FEATURE_SEEN); } -BOOL scrCBTransporterOffMap( void ) +bool scrCBTransporterOffMap( void ) { SDWORD player; - BOOL retval; + bool retval; DROID *psTransporter; if (!stackPopParams(1, VAL_INT, &player) ) @@ -616,12 +616,12 @@ BOOL scrCBTransporterOffMap( void ) return true; } -BOOL scrCBTransporterLanded( void ) +bool scrCBTransporterLanded( void ) { SDWORD player; DROID_GROUP *psGroup; DROID *psTransporter, *psDroid, *psNext; - BOOL retval; + bool retval; if (!stackPopParams(2, ST_GROUP, &psGroup, VAL_INT, &player)) { @@ -663,12 +663,12 @@ BOOL scrCBTransporterLanded( void ) return true; } -BOOL scrCBTransporterLandedB( void ) +bool scrCBTransporterLandedB( void ) { SDWORD player; DROID_GROUP *psGroup; DROID *psTransporter, *psDroid, *psNext; - BOOL retval; + bool retval; DROID **ppsTransp; if (!stackPopParams(3, ST_GROUP, &psGroup, VAL_INT, &player, @@ -719,7 +719,7 @@ BOOL scrCBTransporterLandedB( void ) // tell the scripts when a cluster is no longer valid SDWORD scrCBEmptyClusterID; -BOOL scrCBClusterEmpty( void ) +bool scrCBClusterEmpty( void ) { SDWORD *pClusterID; @@ -742,11 +742,11 @@ BOOL scrCBClusterEmpty( void ) // note when a vtol has finished returning to base - used to vanish // vtols when they are attacking from off map DROID *psScrCBVtolOffMap; -BOOL scrCBVtolOffMap(void) +bool scrCBVtolOffMap(void) { SDWORD player; DROID **ppsVtol; - BOOL retval; + bool retval; if (!stackPopParams(2, VAL_INT, &player, VAL_REF|ST_DROID, &ppsVtol)) { @@ -777,11 +777,11 @@ BOOL scrCBVtolOffMap(void) } /*called when selectedPlayer completes some research*/ -BOOL scrCBResCompleted(void) +bool scrCBResCompleted(void) { RESEARCH **ppsResearch; STRUCTURE **ppsResFac; - BOOL retVal; + bool retVal; SDWORD resFacOwner; if (!stackPopParams(3, VAL_REF|ST_RESEARCH, &ppsResearch, @@ -819,7 +819,7 @@ BOOL scrCBResCompleted(void) /* when a humna player leaves a game*/ -BOOL scrCBPlayerLeft(void) +bool scrCBPlayerLeft(void) { SDWORD *player; if (!stackPopParams(1, VAL_REF | VAL_INT, &player) ) @@ -840,7 +840,7 @@ BOOL scrCBPlayerLeft(void) // alliance has been offered. -BOOL scrCBAllianceOffer(void) +bool scrCBAllianceOffer(void) { SDWORD *from,*to; @@ -867,7 +867,7 @@ BOOL scrCBAllianceOffer(void) //console callback //--------------------------- -BOOL scrCallConsole(void) +bool scrCallConsole(void) { SDWORD *player; char **ConsoleText = NULL; @@ -900,7 +900,7 @@ BOOL scrCallConsole(void) //multiplayer beacon //--------------------------- -BOOL scrCallBeacon(void) +bool scrCallBeacon(void) { SDWORD *playerFrom, playerTo; char **BeaconText = NULL; @@ -968,7 +968,7 @@ BOOL scrCallBeacon(void) //multiplayer message callback //---------------------------- -BOOL scrCallMultiMsg(void) +bool scrCallMultiMsg(void) { SDWORD *player, playerTo; char **ConsoleText = NULL; @@ -1030,11 +1030,11 @@ STRUCTURE *psScrCBNewStruct = NULL; //for scrCBStructBuilt callback DROID *psScrCBNewStructTruck = NULL; //structure built callback //------------------------------ -BOOL scrCBStructBuilt(void) +bool scrCBStructBuilt(void) { SDWORD player; STRUCTURE **ppsStructure; - BOOL triggered = false; + bool triggered = false; DROID **ppsDroid; if (!stackPopParams(3, VAL_INT, &player, VAL_REF|ST_DROID, &ppsDroid, VAL_REF|ST_STRUCTURE, &ppsStructure) ) @@ -1077,11 +1077,11 @@ BOOL scrCBStructBuilt(void) } /* Droid received stop order */ -BOOL scrCBDorderStop(void) +bool scrCBDorderStop(void) { SDWORD player; DROID **ppsDroid; - BOOL triggered = false; + bool triggered = false; if (!stackPopParams(2, VAL_INT, &player, VAL_REF|ST_DROID, &ppsDroid)) { @@ -1111,12 +1111,12 @@ BOOL scrCBDorderStop(void) } /* Droid reached destination point and stopped on its own */ -BOOL scrCBDorderReachedLocation(void) +bool scrCBDorderReachedLocation(void) { SDWORD player; SDWORD *Order = NULL; DROID **ppsDroid; - BOOL triggered = false; + bool triggered = false; if (!stackPopParams(3, VAL_INT, &player, VAL_REF|ST_DROID, &ppsDroid ,VAL_REF | VAL_INT, &Order)) @@ -1148,7 +1148,7 @@ BOOL scrCBDorderReachedLocation(void) } /* Process key-combo */ -BOOL scrCBProcessKeyPress(void) +bool scrCBProcessKeyPress(void) { SDWORD *key = NULL, *metaKey = NULL; diff --git a/src/scriptcb.h b/src/scriptcb.h index 350504560..28afbbc3e 100644 --- a/src/scriptcb.h +++ b/src/scriptcb.h @@ -54,46 +54,46 @@ extern SDWORD cbPressedMetaKey; extern SDWORD cbPressedKey; // deal with unit takover(2) -extern BOOL scrCBDroidTaken(void); +extern bool scrCBDroidTaken(void); // Deal with a CALL_NEWDROID -extern BOOL scrCBNewDroid(void); +extern bool scrCBNewDroid(void); // the attacker and target for a CALL_ATTACKED extern BASE_OBJECT *psScrCBAttacker, *psScrCBTarget; // Deal with a CALL_STRUCT_ATTACKED -extern BOOL scrCBStructAttacked(void); +extern bool scrCBStructAttacked(void); // Deal with a CALL_DROID_ATTACKED -extern BOOL scrCBDroidAttacked(void); +extern bool scrCBDroidAttacked(void); // Deal with a CALL_ATTACKED -extern BOOL scrCBAttacked(void); +extern bool scrCBAttacked(void); // deal with CALL_BUTTON_PRESSED -extern BOOL scrCBButtonPressed(void); +extern bool scrCBButtonPressed(void); // the Droid that was selected for a CALL_DROID_SELECTED extern DROID *psCBSelectedDroid; // deal with CALL_DROID_SELECTED -extern BOOL scrCBDroidSelected(void); +extern bool scrCBDroidSelected(void); // the object that was last killed for a CALL_OBJ_DESTROYED extern BASE_OBJECT *psCBObjDestroyed; // deal with a CALL_OBJ_DESTROYED -extern BOOL scrCBObjDestroyed(void); +extern bool scrCBObjDestroyed(void); // deal with a CALL_STRUCT_DESTROYED -extern BOOL scrCBStructDestroyed(void); +extern bool scrCBStructDestroyed(void); // deal with a CALL_DROID_DESTROYED -extern BOOL scrCBDroidDestroyed(void); +extern bool scrCBDroidDestroyed(void); // deal with a CALL_FEATURE_DESTROYED -extern BOOL scrCBFeatureDestroyed(void); +extern bool scrCBFeatureDestroyed(void); // the last object to be seen for a CALL_OBJ_SEEN extern BASE_OBJECT *psScrCBObjSeen; @@ -102,57 +102,57 @@ extern BASE_OBJECT *psScrCBObjSeen; extern BASE_OBJECT *psScrCBObjViewer; // deal with a CALL_OBJ_SEEN -extern BOOL scrCBObjSeen(void); +extern bool scrCBObjSeen(void); // deal with a CALL_DROID_SEEN -extern BOOL scrCBDroidSeen(void); +extern bool scrCBDroidSeen(void); // deal with a CALL_STRUCT_SEEN -extern BOOL scrCBStructSeen(void); +extern bool scrCBStructSeen(void); // deal with a CALL_FEATURE_SEEN -extern BOOL scrCBFeatureSeen(void); +extern bool scrCBFeatureSeen(void); // deal with a CALL_TRANSPORTER_OFFMAP -extern BOOL scrCBTransporterOffMap(void); +extern bool scrCBTransporterOffMap(void); // deal with a CALL_TRANSPORTER_LANDED -extern BOOL scrCBTransporterLanded(void); +extern bool scrCBTransporterLanded(void); // tell the scripts when a cluster is no longer valid extern SDWORD scrCBEmptyClusterID; -extern BOOL scrCBClusterEmpty( void ); +extern bool scrCBClusterEmpty( void ); // note when a vtol has finished returning to base - used to vanish // vtols when they are attacking from off map extern DROID *psScrCBVtolOffMap; -extern BOOL scrCBVtolOffMap(void); +extern bool scrCBVtolOffMap(void); /*called when selectedPlayer completes some research*/ -extern BOOL scrCBResCompleted(void); +extern bool scrCBResCompleted(void); /* when a player leaves the game*/ -extern BOOL scrCBPlayerLeft(void); +extern bool scrCBPlayerLeft(void); /* when a VTOL runs out of things to do while mid-air */ -extern BOOL scrCBVTOLRetarget(void); +extern bool scrCBVTOLRetarget(void); // alliance offered. -extern BOOL scrCBAllianceOffer(void); +extern bool scrCBAllianceOffer(void); extern UDWORD CBallFrom,CBallTo; // player number that left the game extern UDWORD CBPlayerLeft; //Console callback -extern BOOL scrCallConsole(void); -extern BOOL scrCBStructBuilt(void); -extern BOOL scrCallMultiMsg(void); -extern BOOL scrCallBeacon(void); -extern BOOL scrCBTransporterLandedB(void); +extern bool scrCallConsole(void); +extern bool scrCBStructBuilt(void); +extern bool scrCallMultiMsg(void); +extern bool scrCallBeacon(void); +extern bool scrCBTransporterLandedB(void); -extern BOOL scrCBDorderStop(void); -extern BOOL scrCBDorderReachedLocation(void); -extern BOOL scrCBProcessKeyPress(void); +extern bool scrCBDorderStop(void); +extern bool scrCBDorderReachedLocation(void); +extern bool scrCBProcessKeyPress(void); #endif // __INCLUDED_SRC_SCRIPTCB_H__ diff --git a/src/scriptextern.cpp b/src/scriptextern.cpp index 972f60ad9..c1826a382 100644 --- a/src/scriptextern.cpp +++ b/src/scriptextern.cpp @@ -45,17 +45,17 @@ SDWORD scrGameLevel = 0; // whether the tutorial is active -BOOL bInTutorial = false; +bool bInTutorial = false; // whether any additional special case victory/failure conditions have been met -BOOL bExtraVictoryFlag = false; -BOOL bExtraFailFlag = false; +bool bExtraVictoryFlag = false; +bool bExtraFailFlag = false; // whether or not to track the player's transporter as it comes // into an offworld mission. -BOOL bTrackTransporter = false; +bool bTrackTransporter = false; // reset the script externals for a new level @@ -69,7 +69,7 @@ void scrExternReset(void) // General function to get some basic game values -BOOL scrGenExternGet(UDWORD index) +bool scrGenExternGet(UDWORD index) { INTERP_TYPE type; INTERP_VAL scrFunctionResult; //function return value to be pushed to stack @@ -163,7 +163,7 @@ BOOL scrGenExternGet(UDWORD index) // General function to set some basic game values -BOOL scrGenExternSet(UDWORD index) +bool scrGenExternSet(UDWORD index) { INTERP_VAL sVal; INTERP_TYPE type; diff --git a/src/scriptextern.h b/src/scriptextern.h index a8fe3a465..babc049af 100644 --- a/src/scriptextern.h +++ b/src/scriptextern.h @@ -27,11 +27,11 @@ // current game level extern SDWORD scrGameLevel; // whether the tutorial is active -extern BOOL bInTutorial; +extern bool bInTutorial; // whether any additional special case victory/failure conditions have been met -extern BOOL bExtraVictoryFlag; -extern BOOL bExtraFailFlag; -extern BOOL bTrackTransporter; +extern bool bExtraVictoryFlag; +extern bool bExtraFailFlag; +extern bool bTrackTransporter; // ID numbers for external variables @@ -60,9 +60,9 @@ enum _externids extern void scrExternReset(void); // General function to get some basic game values -extern BOOL scrGenExternGet(UDWORD index); +extern bool scrGenExternGet(UDWORD index); // General function to set some basic game values -extern BOOL scrGenExternSet(UDWORD index); +extern bool scrGenExternSet(UDWORD index); #endif // __INCLUDED_SRC_SCRIPTEXTERN_H__ diff --git a/src/scriptfuncs.cpp b/src/scriptfuncs.cpp index 058acc427..062cd7db4 100644 --- a/src/scriptfuncs.cpp +++ b/src/scriptfuncs.cpp @@ -106,7 +106,7 @@ static INTERP_VAL scrFunctionResult; //function return value to be pushed to sta static SDWORD bitMask[] = {0x01,0x02,0x04,0x08,0x10,0x20,0x40,0x80}; static char strParam1[MAXSTRLEN], strParam2[MAXSTRLEN]; //these should be used as string parameters for stackPopParams() -static BOOL structHasModule(STRUCTURE *psStruct); +static bool structHasModule(STRUCTURE *psStruct); static DROID_TEMPLATE* scrCheckTemplateExists(SDWORD player, DROID_TEMPLATE *psTempl); @@ -127,7 +127,7 @@ void scriptSetDerrickPos(int x, int y) derricks.push_back(pos); } -BOOL scriptInit() +bool scriptInit() { int i; @@ -140,7 +140,7 @@ BOOL scriptInit() return true; } -BOOL scrScavengersActive() +bool scrScavengersActive() { scrFunctionResult.v.ival = scavengerPlayer(); if (!stackPushResult(VAL_INT, &scrFunctionResult)) @@ -150,7 +150,7 @@ BOOL scrScavengersActive() return true; } -BOOL scrGetDifficulty() +bool scrGetDifficulty() { int player; if (!stackPopParams(1, VAL_INT, &player)) @@ -167,7 +167,7 @@ BOOL scrGetDifficulty() return true; } -BOOL scrGetPlayer() +bool scrGetPlayer() { if (!stackPopParams(1, VAL_STRING, &strParam1)) { @@ -184,7 +184,7 @@ BOOL scrGetPlayer() return true; } -BOOL scrGetDerrick() +bool scrGetDerrick() { int x, y, i; @@ -217,7 +217,7 @@ Vector2i getPlayerStartPosition(int player) return positions[player]; } -BOOL scrSetSunPosition(void) +bool scrSetSunPosition(void) { float x, y, z; @@ -229,7 +229,7 @@ BOOL scrSetSunPosition(void) return true; } -BOOL scrSetSunIntensity(void) +bool scrSetSunIntensity(void) { float ambient[4], diffuse[4], specular[4]; @@ -251,7 +251,7 @@ BOOL scrSetSunIntensity(void) return true; } -BOOL scrSafeDest(void) +bool scrSafeDest(void) { SDWORD x, y, player; @@ -269,7 +269,7 @@ BOOL scrSafeDest(void) return true; } -BOOL scrThreatAt(void) +bool scrThreatAt(void) { SDWORD x, y, player; @@ -287,7 +287,7 @@ BOOL scrThreatAt(void) return true; } -BOOL scrGetPlayerStartPosition(void) +bool scrGetPlayerStartPosition(void) { SDWORD *x, *y, player; @@ -320,7 +320,7 @@ BOOL scrGetPlayerStartPosition(void) // check for a base object being in range of a point -BOOL objectInRange(BASE_OBJECT *psList, SDWORD x, SDWORD y, SDWORD range) +bool objectInRange(BASE_OBJECT *psList, SDWORD x, SDWORD y, SDWORD range) { BASE_OBJECT *psCurr; SDWORD xdiff, ydiff, rangeSq; @@ -357,10 +357,10 @@ BOOL objectInRange(BASE_OBJECT *psList, SDWORD x, SDWORD y, SDWORD range) // ----------------------------------------------------------------------------------------- // Check for any player object being within a certain range of a position -BOOL scrObjectInRange(void) +bool scrObjectInRange(void) { SDWORD range, player, x,y; - BOOL found; + bool found; if (!stackPopParams(4, VAL_INT, &player, VAL_INT, &x, VAL_INT, &y, VAL_INT, &range)) { @@ -387,10 +387,10 @@ BOOL scrObjectInRange(void) // ----------------------------------------------------------------------------------------- // Check for a droid being within a certain range of a position -BOOL scrDroidInRange(void) +bool scrDroidInRange(void) { SDWORD range, player, x,y; - BOOL found; + bool found; if (!stackPopParams(4, VAL_INT, &player, VAL_INT, &x, VAL_INT, &y, VAL_INT, &range)) { @@ -416,10 +416,10 @@ BOOL scrDroidInRange(void) // ----------------------------------------------------------------------------------------- // Check for a struct being within a certain range of a position -BOOL scrStructInRange(void) +bool scrStructInRange(void) { SDWORD range, player, x,y; - BOOL found; + bool found; if (!stackPopParams(4, VAL_INT, &player, VAL_INT, &x, VAL_INT, &y, VAL_INT, &range)) { @@ -444,7 +444,7 @@ BOOL scrStructInRange(void) } // ----------------------------------------------------------------------------------------- -BOOL scrPlayerPower(void) +bool scrPlayerPower(void) { SDWORD player; @@ -469,7 +469,7 @@ BOOL scrPlayerPower(void) // ----------------------------------------------------------------------------------------- // check for a base object being in an area -static BOOL objectInArea(BASE_OBJECT *psList, SDWORD x1, SDWORD y1, SDWORD x2, SDWORD y2) +static bool objectInArea(BASE_OBJECT *psList, SDWORD x1, SDWORD y1, SDWORD x2, SDWORD y2) { BASE_OBJECT *psCurr; SDWORD ox,oy; @@ -498,10 +498,10 @@ static BOOL objectInArea(BASE_OBJECT *psList, SDWORD x1, SDWORD y1, SDWORD x2, S // ----------------------------------------------------------------------------------------- // Check for any player object being within a certain area -BOOL scrObjectInArea(void) +bool scrObjectInArea(void) { SDWORD player, x1,y1, x2,y2; - BOOL found; + bool found; if (!stackPopParams(5, VAL_INT, &player, VAL_INT, &x1, VAL_INT, &y1, VAL_INT, &x2, VAL_INT, &y2)) { @@ -528,10 +528,10 @@ BOOL scrObjectInArea(void) // ----------------------------------------------------------------------------------------- // Check for a droid being within a certain area -BOOL scrDroidInArea(void) +bool scrDroidInArea(void) { SDWORD player, x1,y1, x2,y2; - BOOL found; + bool found; if (!stackPopParams(5, VAL_INT, &player, VAL_INT, &x1, VAL_INT, &y1, VAL_INT, &x2, VAL_INT, &y2)) { @@ -557,10 +557,10 @@ BOOL scrDroidInArea(void) // ----------------------------------------------------------------------------------------- // Check for a struct being within a certain Area of a position -BOOL scrStructInArea(void) +bool scrStructInArea(void) { SDWORD player, x1,y1, x2,y2; - BOOL found; + bool found; if (!stackPopParams(5, VAL_INT, &player, VAL_INT, &x1, VAL_INT, &y1, VAL_INT, &x2, VAL_INT, &y2)) { @@ -586,9 +586,9 @@ BOOL scrStructInArea(void) // ----------------------------------------------------------------------------------------- -BOOL scrSeenStructInArea(void) +bool scrSeenStructInArea(void) { - BOOL walls=false,found = false; + bool walls=false,found = false; SDWORD player,enemy,x1,y1, x2,y2; STRUCTURE *psCurr; SDWORD ox,oy; @@ -643,7 +643,7 @@ BOOL scrSeenStructInArea(void) // ----------------------------------------------------------------------------------------- // Check for a players structures but no walls being within a certain area -BOOL scrStructButNoWallsInArea(void) +bool scrStructButNoWallsInArea(void) { SDWORD player, x1,y1, x2,y2; SDWORD ox,oy; @@ -721,7 +721,7 @@ static SDWORD numObjectsInArea(BASE_OBJECT *psList, SDWORD x1, SDWORD y1, SDWORD // ----------------------------------------------------------------------------------------- // Count the number of player objects within a certain area -BOOL scrNumObjectsInArea(void) +bool scrNumObjectsInArea(void) { SDWORD player, x1,y1, x2,y2; SDWORD count; @@ -752,7 +752,7 @@ BOOL scrNumObjectsInArea(void) // ----------------------------------------------------------------------------------------- // Count the number of player droids within a certain area -BOOL scrNumDroidsInArea(void) +bool scrNumDroidsInArea(void) { SDWORD player, x1,y1, x2,y2; SDWORD count; @@ -782,7 +782,7 @@ BOOL scrNumDroidsInArea(void) // ----------------------------------------------------------------------------------------- // Count the number of player structures within a certain area -BOOL scrNumStructsInArea(void) +bool scrNumStructsInArea(void) { SDWORD player, x1,y1, x2,y2; SDWORD count; @@ -812,7 +812,7 @@ BOOL scrNumStructsInArea(void) // ----------------------------------------------------------------------------------------- // Count the number of player structures but not walls within a certain area -BOOL scrNumStructsButNotWallsInArea(void) +bool scrNumStructsButNotWallsInArea(void) { SDWORD player, x1,y1, x2,y2; SDWORD count, ox,oy; @@ -858,7 +858,7 @@ BOOL scrNumStructsButNotWallsInArea(void) // ----------------------------------------------------------------------------------------- // Count the number of structures in an area of a certain type -BOOL scrNumStructsByTypeInArea(void) +bool scrNumStructsByTypeInArea(void) { SDWORD player, type, x1,y1, x2,y2; SDWORD count, ox,oy; @@ -904,11 +904,11 @@ BOOL scrNumStructsByTypeInArea(void) // ----------------------------------------------------------------------------------------- // Check for a droid having seen a certain object -BOOL scrDroidHasSeen(void) +bool scrDroidHasSeen(void) { SDWORD player; BASE_OBJECT *psObj; - BOOL seen; + bool seen; if (!stackPopParams(2, ST_BASEOBJECT, &psObj, VAL_INT, &player)) { @@ -945,7 +945,7 @@ BOOL scrDroidHasSeen(void) // ----------------------------------------------------------------------------------------- // Enable a component to be researched -BOOL scrEnableComponent(void) +bool scrEnableComponent(void) { SDWORD player; INTERP_VAL sVal; @@ -1002,7 +1002,7 @@ BOOL scrEnableComponent(void) // ----------------------------------------------------------------------------------------- // Make a component available -BOOL scrMakeComponentAvailable(void) +bool scrMakeComponentAvailable(void) { SDWORD player; INTERP_VAL sVal; @@ -1059,7 +1059,7 @@ BOOL scrMakeComponentAvailable(void) // ----------------------------------------------------------------------------------------- // Add a droid -BOOL scrAddDroidToMissionList(void) +bool scrAddDroidToMissionList(void) { SDWORD player; DROID_TEMPLATE *psTemplate; @@ -1101,7 +1101,7 @@ BOOL scrAddDroidToMissionList(void) // ----------------------------------------------------------------------------------------- // Add a droid -BOOL scrAddDroid(void) +bool scrAddDroid(void) { SDWORD x, y, player; DROID_TEMPLATE *psTemplate; @@ -1157,7 +1157,7 @@ BOOL scrAddDroid(void) // ----------------------------------------------------------------------------------------- // Add droid to transporter -BOOL scrAddDroidToTransporter(void) +bool scrAddDroidToTransporter(void) { DROID *psTransporter, *psDroid; @@ -1190,11 +1190,11 @@ BOOL scrAddDroidToTransporter(void) // ----------------------------------------------------------------------------------------- //check for a building to have been destroyed -BOOL scrBuildingDestroyed(void) +bool scrBuildingDestroyed(void) { SDWORD player; UDWORD structureID; - BOOL destroyed; + bool destroyed; STRUCTURE *psCurr; if (!stackPopParams(2, ST_STRUCTUREID, &structureID, VAL_INT, &player)) @@ -1228,7 +1228,7 @@ BOOL scrBuildingDestroyed(void) // ----------------------------------------------------------------------------------------- // Enable a structure to be built -BOOL scrEnableStructure(void) +bool scrEnableStructure(void) { SDWORD player, index; @@ -1259,10 +1259,10 @@ BOOL scrEnableStructure(void) // ----------------------------------------------------------------------------------------- // Check if a structure can be built. // currently PC skirmish only. -BOOL scrIsStructureAvailable(void) +bool scrIsStructureAvailable(void) { SDWORD player, index; - BOOL bResult; + bool bResult; if (!stackPopParams(2, ST_STRUCTURESTAT, &index, VAL_INT, &player)) { @@ -1289,10 +1289,10 @@ BOOL scrIsStructureAvailable(void) // ----------------------------------------------------------------------------------------- //make the droid with the matching id the currently selected droid -BOOL scrSelectDroidByID(void) +bool scrSelectDroidByID(void) { SDWORD player, droidID; - BOOL selected; + bool selected; if (!stackPopParams(2, ST_DROIDID, &droidID, VAL_INT, &player)) { @@ -1322,7 +1322,7 @@ BOOL scrSelectDroidByID(void) // ----------------------------------------------------------------------------------------- // Pop up a message box with a number value in it -BOOL scrNumMB(void) +bool scrNumMB(void) { SDWORD val; @@ -1339,7 +1339,7 @@ BOOL scrNumMB(void) // ----------------------------------------------------------------------------------------- // Do an approximation to a square root -BOOL scrApproxRoot(void) +bool scrApproxRoot(void) { SDWORD val1, val2; @@ -1366,7 +1366,7 @@ BOOL scrApproxRoot(void) // ----------------------------------------------------------------------------------------- // Add a reticule button to the interface -BOOL scrAddReticuleButton(void) +bool scrAddReticuleButton(void) { SDWORD val; @@ -1418,10 +1418,10 @@ BOOL scrAddReticuleButton(void) // ----------------------------------------------------------------------------------------- //Remove a reticule button from the interface -BOOL scrRemoveReticuleButton(void) +bool scrRemoveReticuleButton(void) { SDWORD val; - BOOL bReset; + bool bReset; if (!stackPopParams(2, VAL_INT, &val,VAL_BOOL, &bReset)) { @@ -1477,12 +1477,12 @@ BOOL scrRemoveReticuleButton(void) // ----------------------------------------------------------------------------------------- // add a message to the Intelligence Display -BOOL scrAddMessage(void) +bool scrAddMessage(void) { MESSAGE *psMessage; MESSAGE_TYPE msgType; SDWORD player; - BOOL playImmediate; + bool playImmediate; VIEWDATA *psViewData; UDWORD height; @@ -1529,7 +1529,7 @@ BOOL scrAddMessage(void) // ----------------------------------------------------------------------------------------- // remove a message from the Intelligence Display -BOOL scrRemoveMessage(void) +bool scrRemoveMessage(void) { MESSAGE *psMessage; MESSAGE_TYPE msgType; @@ -1565,7 +1565,7 @@ BOOL scrRemoveMessage(void) // ----------------------------------------------------------------------------------------- /*builds a droid in the specified factory*/ -BOOL scrBuildDroid(void) +bool scrBuildDroid(void) { SDWORD player, productionRun; STRUCTURE *psFactory; @@ -1598,7 +1598,7 @@ BOOL scrBuildDroid(void) // ----------------------------------------------------------------------------------------- // for a specified structure, set the assembly point droids go to when built -BOOL scrSetAssemblyPoint(void) +bool scrSetAssemblyPoint(void) { SDWORD x, y; STRUCTURE *psBuilding; @@ -1630,10 +1630,10 @@ BOOL scrSetAssemblyPoint(void) // ----------------------------------------------------------------------------------------- // test for structure is idle or not -BOOL scrStructureIdle(void) +bool scrStructureIdle(void) { STRUCTURE *psBuilding; - BOOL idle; + bool idle; if (!stackPopParams(1, ST_STRUCTURE, &psBuilding)) { @@ -1657,7 +1657,7 @@ BOOL scrStructureIdle(void) // ----------------------------------------------------------------------------------------- // sends a players droids to a location to attack -BOOL scrAttackLocation(void) +bool scrAttackLocation(void) { SDWORD player, x, y; @@ -1679,7 +1679,7 @@ BOOL scrAttackLocation(void) // ----------------------------------------------------------------------------------------- //Destroy a feature -BOOL scrDestroyFeature(void) +bool scrDestroyFeature(void) { FEATURE *psFeature; // INTERP_VAL sVal; @@ -1709,7 +1709,7 @@ static FEATURE *psCurrEnumFeature[MAX_PLAYERS]; // ----------------------------------------------------------------------------------------- // Init enum visible features. May use player==-1 to ignore visibility check. -BOOL scrInitGetFeature(void) +bool scrInitGetFeature(void) { SDWORD player,iFeat,bucket; @@ -1734,7 +1734,7 @@ BOOL scrInitGetFeature(void) // between calls, Use an index into list instead. // Doesn't return Features sharing a tile with a structure. // Skirmish Only, dunno if kev uses this? -BOOL scrGetFeature(void) +bool scrGetFeature(void) { SDWORD bucket,count; FEATURE *psFeat; @@ -1813,7 +1813,7 @@ BOOL scrGetFeature(void) } /* Faster implementation of scrGetFeature - assumes no features are deleted between calls */ -BOOL scrGetFeatureB(void) +bool scrGetFeatureB(void) { SDWORD bucket; @@ -1873,7 +1873,7 @@ BOOL scrGetFeatureB(void) // ----------------------------------------------------------------------------------------- //Add a feature -BOOL scrAddFeature(void) +bool scrAddFeature(void) { FEATURE_STATS *psStat; FEATURE *psFeat = NULL; @@ -1931,7 +1931,7 @@ BOOL scrAddFeature(void) // ----------------------------------------------------------------------------------------- //Add a structure -BOOL scrAddStructure(void) +bool scrAddStructure(void) { STRUCTURE_STATS *psStat; STRUCTURE *psStruct = NULL; @@ -2002,7 +2002,7 @@ BOOL scrAddStructure(void) // ----------------------------------------------------------------------------------------- //Destroy a structure -BOOL scrDestroyStructure(void) +bool scrDestroyStructure(void) { STRUCTURE *psStruct; @@ -2030,20 +2030,20 @@ BOOL scrDestroyStructure(void) static STRUCTURE_STATS *psStructStatToFind; static UDWORD playerToEnumStruct; static UDWORD enumStructCount; -static BOOL structfindany; +static bool structfindany; static SDWORD playerVisibleStruct; //player whose structures must be visible //for the bucket version static STRUCTURE_STATS *psStructStatToFindB[MAX_PLAYERS]; static UDWORD playerToEnumStructB[MAX_PLAYERS]; static UDWORD enumStructCountB[MAX_PLAYERS]; -static BOOL structfindanyB[MAX_PLAYERS]; +static bool structfindanyB[MAX_PLAYERS]; static SDWORD playerVisibleStructB[MAX_PLAYERS]; //player whose structures must be visible // init enum visible structures. -BOOL scrInitEnumStruct(void) +bool scrInitEnumStruct(void) { SDWORD lookingPlayer,iStat,targetPlayer; - BOOL any; + bool any; if ( !stackPopParams(4,VAL_BOOL,&any, ST_STRUCTURESTAT, &iStat, VAL_INT, &targetPlayer, VAL_INT, &lookingPlayer) ) { @@ -2066,7 +2066,7 @@ BOOL scrInitEnumStruct(void) } // ----------------------------------------------------------------------------------------- -BOOL scrEnumStruct(void) +bool scrEnumStruct(void) { UDWORD count; STRUCTURE *psStruct; @@ -2118,10 +2118,10 @@ BOOL scrEnumStruct(void) } // init enum visible structures - takes bucket as additional parameter -BOOL scrInitEnumStructB(void) +bool scrInitEnumStructB(void) { SDWORD lookingPlayer,iStat,targetPlayer,bucket; - BOOL any; + bool any; if ( !stackPopParams(5,VAL_BOOL,&any, ST_STRUCTURESTAT, &iStat, VAL_INT, &targetPlayer, VAL_INT, &lookingPlayer, VAL_INT, &bucket) ) @@ -2150,7 +2150,7 @@ BOOL scrInitEnumStructB(void) } // Similar to scrEnumStruct, but uses bucket -BOOL scrEnumStructB(void) +bool scrEnumStructB(void) { SDWORD bucket; UDWORD count; @@ -2211,13 +2211,13 @@ BOOL scrEnumStructB(void) // ----------------------------------------------------------------------------------------- /*looks to see if a structure (specified by type) exists and is being built*/ -BOOL scrStructureBeingBuilt(void) +bool scrStructureBeingBuilt(void) { // INTERP_VAL sVal; UDWORD structInc; STRUCTURE_STATS *psStats; SDWORD player; - BOOL beingBuilt; + bool beingBuilt; if (!stackPopParams(2, ST_STRUCTURESTAT, &structInc, VAL_INT, &player)) { @@ -2264,10 +2264,10 @@ BOOL scrStructureBeingBuilt(void) // ----------------------------------------------------------------------------------------- // multiplayer skirmish only for now. // returns true if a specific struct is complete. I know it's like the previous func, -BOOL scrStructureComplete(void) +bool scrStructureComplete(void) { STRUCTURE *psStruct; - BOOL bResult; + bool bResult; if (!stackPopParams(1, ST_STRUCTURE, &psStruct)) { @@ -2295,13 +2295,13 @@ BOOL scrStructureComplete(void) // ----------------------------------------------------------------------------------------- /*looks to see if a structure (specified by type) exists and built*/ -BOOL scrStructureBuilt(void) +bool scrStructureBuilt(void) { // INTERP_VAL sVal; UDWORD structInc; STRUCTURE_STATS *psStats; SDWORD player; - BOOL built; + bool built; if (!stackPopParams(2, ST_STRUCTURESTAT, &structInc, VAL_INT, &player)) { @@ -2345,7 +2345,7 @@ BOOL scrStructureBuilt(void) // ----------------------------------------------------------------------------------------- /*centre the view on an object - can be droid/structure or feature */ -BOOL scrCentreView(void) +bool scrCentreView(void) { BASE_OBJECT *psObj; // INTERP_VAL sVal; @@ -2369,7 +2369,7 @@ BOOL scrCentreView(void) // ----------------------------------------------------------------------------------------- /*centre the view on a position */ -BOOL scrCentreViewPos(void) +bool scrCentreViewPos(void) { SDWORD x,y; @@ -2394,7 +2394,7 @@ BOOL scrCentreViewPos(void) static STRUCTURE *unbuiltIter = NULL; static int unbuiltPlayer = -1; -BOOL scrEnumUnbuilt(void) +bool scrEnumUnbuilt(void) { if (!stackPopParams(1, VAL_INT, &unbuiltPlayer)) { @@ -2405,7 +2405,7 @@ BOOL scrEnumUnbuilt(void) return true; } -BOOL scrIterateUnbuilt(void) +bool scrIterateUnbuilt(void) { for (; unbuiltIter && unbuiltIter->status != SS_BEING_BUILT; unbuiltIter = unbuiltIter->psNext) ; scrFunctionResult.v.oval = unbuiltIter; @@ -2422,12 +2422,12 @@ BOOL scrIterateUnbuilt(void) // ----------------------------------------------------------------------------------------- // Get a pointer to a structure based on a stat - returns NULL if cannot find one -BOOL scrGetStructure(void) +bool scrGetStructure(void) { SDWORD player, index; STRUCTURE *psStruct; UDWORD structType; - BOOL found; + bool found; if (!stackPopParams(2, ST_STRUCTURESTAT, &index, VAL_INT, &player)) { @@ -2471,11 +2471,11 @@ BOOL scrGetStructure(void) // ----------------------------------------------------------------------------------------- // Get a pointer to a template based on a component stat - returns NULL if cannot find one -BOOL scrGetTemplate(void) +bool scrGetTemplate(void) { SDWORD player; DROID_TEMPLATE *psTemplate; - BOOL found; + bool found; INTERP_VAL sVal; UDWORD i; @@ -2576,11 +2576,11 @@ BOOL scrGetTemplate(void) // ----------------------------------------------------------------------------------------- // Get a pointer to a droid based on a component stat - returns NULL if cannot find one -BOOL scrGetDroid(void) +bool scrGetDroid(void) { SDWORD player; DROID *psDroid; - BOOL found; + bool found; INTERP_VAL sVal; UDWORD i; @@ -2681,7 +2681,7 @@ BOOL scrGetDroid(void) // ----------------------------------------------------------------------------------------- // Sets all the scroll params for the map -BOOL scrSetScrollParams(void) +bool scrSetScrollParams(void) { SDWORD minX, minY, maxX, maxY, prevMinX, prevMinY, prevMaxX, prevMaxY; @@ -2720,7 +2720,7 @@ BOOL scrSetScrollParams(void) // ----------------------------------------------------------------------------------------- // Sets the scroll minX separately for the map -BOOL scrSetScrollMinX(void) +bool scrSetScrollMinX(void) { SDWORD minX, prevMinX; @@ -2752,7 +2752,7 @@ BOOL scrSetScrollMinX(void) // ----------------------------------------------------------------------------------------- // Sets the scroll minY separately for the map -BOOL scrSetScrollMinY(void) +bool scrSetScrollMinY(void) { SDWORD minY, prevMinY; @@ -2785,7 +2785,7 @@ BOOL scrSetScrollMinY(void) // ----------------------------------------------------------------------------------------- // Sets the scroll maxX separately for the map -BOOL scrSetScrollMaxX(void) +bool scrSetScrollMaxX(void) { SDWORD maxX, prevMaxX; @@ -2818,7 +2818,7 @@ BOOL scrSetScrollMaxX(void) // ----------------------------------------------------------------------------------------- // Sets the scroll maxY separately for the map -BOOL scrSetScrollMaxY(void) +bool scrSetScrollMaxY(void) { SDWORD maxY, prevMaxY; @@ -2850,7 +2850,7 @@ BOOL scrSetScrollMaxY(void) // ----------------------------------------------------------------------------------------- // Sets which sensor will be used as the default for a player -BOOL scrSetDefaultSensor(void) +bool scrSetDefaultSensor(void) { SDWORD player; UDWORD sensorInc; @@ -2890,7 +2890,7 @@ BOOL scrSetDefaultSensor(void) // ----------------------------------------------------------------------------------------- // Sets which ECM will be used as the default for a player -BOOL scrSetDefaultECM(void) +bool scrSetDefaultECM(void) { SDWORD player; UDWORD ecmInc; @@ -2929,7 +2929,7 @@ BOOL scrSetDefaultECM(void) // ----------------------------------------------------------------------------------------- // Sets which RepairUnit will be used as the default for a player -BOOL scrSetDefaultRepair(void) +bool scrSetDefaultRepair(void) { SDWORD player; UDWORD repairInc; @@ -2968,7 +2968,7 @@ BOOL scrSetDefaultRepair(void) // ----------------------------------------------------------------------------------------- // Sets the structure limits for a player -BOOL scrSetStructureLimits(void) +bool scrSetStructureLimits(void) { SDWORD player, limit; UDWORD structInc; @@ -3016,7 +3016,7 @@ BOOL scrSetStructureLimits(void) // ----------------------------------------------------------------------------------------- // multiplayer limit handler. -BOOL scrApplyLimitSet(void) +bool scrApplyLimitSet(void) { applyLimitSet(); return true; @@ -3027,7 +3027,7 @@ BOOL scrApplyLimitSet(void) // ----------------------------------------------------------------------------------------- // plays a sound for the specified player - only plays the sound if the // specified player = selectedPlayer -BOOL scrPlaySound(void) +bool scrPlaySound(void) { SDWORD player, soundID; @@ -3056,7 +3056,7 @@ BOOL scrPlaySound(void) // ----------------------------------------------------------------------------------------- // plays a sound for the specified player - only plays the sound if the // specified player = selectedPlayer - saves position -BOOL scrPlaySoundPos(void) +bool scrPlaySoundPos(void) { SDWORD player, soundID, iX, iY, iZ; @@ -3082,7 +3082,7 @@ BOOL scrPlaySoundPos(void) // ----------------------------------------------------------------------------------------- /* add a text message to the top of the screen for the selected player*/ -BOOL scrShowConsoleText(void) +bool scrShowConsoleText(void) { char *pText; SDWORD player; @@ -3109,7 +3109,7 @@ BOOL scrShowConsoleText(void) // ----------------------------------------------------------------------------------------- /* add a text message to the top of the screen for the selected player*/ -BOOL scrAddConsoleText(void) +bool scrAddConsoleText(void) { char *pText; SDWORD player; @@ -3140,7 +3140,7 @@ BOOL scrAddConsoleText(void) // ----------------------------------------------------------------------------------------- /* add a text message to the top of the screen for the selected player - without clearing whats there*/ -BOOL scrTagConsoleText(void) +bool scrTagConsoleText(void) { char *pText; SDWORD player; @@ -3170,7 +3170,7 @@ BOOL scrTagConsoleText(void) // ----------------------------------------------------------------------------------------- -BOOL scrClearConsole(void) +bool scrClearConsole(void) { flushConsoleMessages(); return(true); @@ -3178,7 +3178,7 @@ BOOL scrClearConsole(void) // ----------------------------------------------------------------------------------------- //demo functions for turning the power on -BOOL scrTurnPowerOff(void) +bool scrTurnPowerOff(void) { //powerCalculated = false; powerCalc(false); @@ -3188,7 +3188,7 @@ BOOL scrTurnPowerOff(void) // ----------------------------------------------------------------------------------------- //demo functions for turning the power off -BOOL scrTurnPowerOn(void) +bool scrTurnPowerOn(void) { //powerCalculated = true; @@ -3199,7 +3199,7 @@ BOOL scrTurnPowerOn(void) // ----------------------------------------------------------------------------------------- //flags when the tutorial is over so that console messages can be turned on again -BOOL scrTutorialEnd(void) +bool scrTutorialEnd(void) { initConsoleMessages(); return true; @@ -3207,7 +3207,7 @@ BOOL scrTutorialEnd(void) // ----------------------------------------------------------------------------------------- //function to play a full-screen video in the middle of the game for the selected player -BOOL scrPlayVideo(void) +bool scrPlayVideo(void) { char *pVideo, *pText; @@ -3225,10 +3225,10 @@ BOOL scrPlayVideo(void) // ----------------------------------------------------------------------------------------- //checks to see if there are any droids for the specified player -BOOL scrAnyDroidsLeft(void) +bool scrAnyDroidsLeft(void) { SDWORD player; - BOOL droidsLeft; + bool droidsLeft; if (!stackPopParams(1, VAL_INT, &player)) { @@ -3260,9 +3260,9 @@ BOOL scrAnyDroidsLeft(void) // ----------------------------------------------------------------------------------------- //function to call when the game is over, plays a message then does game over stuff. // -BOOL scrGameOverMessage(void) +bool scrGameOverMessage(void) { - BOOL gameWon; + bool gameWon; MESSAGE *psMessage; MESSAGE_TYPE msgType; SDWORD player; @@ -3364,9 +3364,9 @@ BOOL scrGameOverMessage(void) // ----------------------------------------------------------------------------------------- //function to call when the game is over -BOOL scrGameOver(void) +bool scrGameOver(void) { - BOOL gameOver; + bool gameOver; if (!stackPopParams(1, VAL_BOOL, &gameOver)) { @@ -3397,10 +3397,10 @@ BOOL scrGameOver(void) } // ----------------------------------------------------------------------------------------- -BOOL scrAnyFactoriesLeft(void) +bool scrAnyFactoriesLeft(void) { SDWORD player; - BOOL bResult; + bool bResult; STRUCTURE *psCurr; if (!stackPopParams(1, VAL_INT, &player)) @@ -3443,10 +3443,10 @@ BOOL scrAnyFactoriesLeft(void) // ----------------------------------------------------------------------------------------- //checks to see if there are any structures (except walls) for the specified player -BOOL scrAnyStructButWallsLeft(void) +bool scrAnyStructButWallsLeft(void) { SDWORD player; - BOOL structuresLeft; + bool structuresLeft; STRUCTURE *psCurr; if (!stackPopParams(1, VAL_INT, &player)) @@ -3491,7 +3491,7 @@ BOOL scrAnyStructButWallsLeft(void) // ----------------------------------------------------------------------------------------- //defines the background audio to play -BOOL scrPlayBackgroundAudio(void) +bool scrPlayBackgroundAudio(void) { char *pText; SDWORD iVol; @@ -3509,7 +3509,7 @@ BOOL scrPlayBackgroundAudio(void) } -BOOL scrPlayIngameCDAudio(void) +bool scrPlayIngameCDAudio(void) { debug(LOG_SOUND, "Script wanted music to start"); cdAudio_PlayTrack(SONG_INGAME); @@ -3518,7 +3518,7 @@ BOOL scrPlayIngameCDAudio(void) } // ----------------------------------------------------------------------------------------- -BOOL scrStopCDAudio(void) +bool scrStopCDAudio(void) { debug(LOG_SOUND, "Script wanted music to stop"); cdAudio_Stop(); @@ -3526,14 +3526,14 @@ BOOL scrStopCDAudio(void) } // ----------------------------------------------------------------------------------------- -BOOL scrPauseCDAudio(void) +bool scrPauseCDAudio(void) { cdAudio_Pause(); return true; } // ----------------------------------------------------------------------------------------- -BOOL scrResumeCDAudio(void) +bool scrResumeCDAudio(void) { cdAudio_Resume(); return true; @@ -3541,7 +3541,7 @@ BOOL scrResumeCDAudio(void) // ----------------------------------------------------------------------------------------- // set the retreat point for a player -BOOL scrSetRetreatPoint(void) +bool scrSetRetreatPoint(void) { SDWORD player, x,y; @@ -3570,7 +3570,7 @@ BOOL scrSetRetreatPoint(void) // ----------------------------------------------------------------------------------------- // set the retreat force level -BOOL scrSetRetreatForce(void) +bool scrSetRetreatForce(void) { SDWORD player, level, numDroids; DROID *psCurr; @@ -3606,7 +3606,7 @@ BOOL scrSetRetreatForce(void) // ----------------------------------------------------------------------------------------- // set the retreat leadership -BOOL scrSetRetreatLeadership(void) +bool scrSetRetreatLeadership(void) { SDWORD player, level; @@ -3634,7 +3634,7 @@ BOOL scrSetRetreatLeadership(void) // ----------------------------------------------------------------------------------------- // set the retreat point for a group -BOOL scrSetGroupRetreatPoint(void) +bool scrSetGroupRetreatPoint(void) { SDWORD x,y; DROID_GROUP *psGroup; @@ -3658,7 +3658,7 @@ BOOL scrSetGroupRetreatPoint(void) } // ----------------------------------------------------------------------------------------- -BOOL scrSetGroupRetreatForce(void) +bool scrSetGroupRetreatForce(void) { SDWORD level, numDroids; DROID_GROUP *psGroup; @@ -3689,7 +3689,7 @@ BOOL scrSetGroupRetreatForce(void) // ----------------------------------------------------------------------------------------- // set the retreat health level -BOOL scrSetRetreatHealth(void) +bool scrSetRetreatHealth(void) { SDWORD player, health; @@ -3716,7 +3716,7 @@ BOOL scrSetRetreatHealth(void) } // ----------------------------------------------------------------------------------------- -BOOL scrSetGroupRetreatHealth(void) +bool scrSetGroupRetreatHealth(void) { SDWORD health; DROID_GROUP *psGroup; @@ -3739,7 +3739,7 @@ BOOL scrSetGroupRetreatHealth(void) // ----------------------------------------------------------------------------------------- // set the retreat leadership -BOOL scrSetGroupRetreatLeadership(void) +bool scrSetGroupRetreatLeadership(void) { SDWORD level; DROID_GROUP *psGroup; @@ -3762,7 +3762,7 @@ BOOL scrSetGroupRetreatLeadership(void) // ----------------------------------------------------------------------------------------- //start a Mission - the missionType is ignored now - gets it from the level data *********** -BOOL scrStartMission(void) +bool scrStartMission(void) { char *pGame; SDWORD missionType; @@ -3801,9 +3801,9 @@ BOOL scrStartMission(void) // ----------------------------------------------------------------------------------------- //set Snow (enable disable snow) -BOOL scrSetSnow(void) +bool scrSetSnow(void) { - BOOL bState; + bool bState; if (!stackPopParams(1, VAL_BOOL, &bState)) { @@ -3825,9 +3825,9 @@ BOOL scrSetSnow(void) // ----------------------------------------------------------------------------------------- //set Rain (enable disable Rain) -BOOL scrSetRain(void) +bool scrSetRain(void) { - BOOL bState; + bool bState; if (!stackPopParams(1, VAL_BOOL, &bState)) { @@ -3849,9 +3849,9 @@ BOOL scrSetRain(void) // ----------------------------------------------------------------------------------------- //set Background Fog (replace fade out with fog) -BOOL scrSetBackgroundFog(void) +bool scrSetBackgroundFog(void) { - BOOL bState; + bool bState; if (!stackPopParams(1, VAL_BOOL, &bState)) { @@ -3884,9 +3884,9 @@ BOOL scrSetBackgroundFog(void) // ----------------------------------------------------------------------------------------- //set Depth Fog (gradual fog from mid range to edge of world) -BOOL scrSetDepthFog(void) +bool scrSetDepthFog(void) { - BOOL bState; + bool bState; if (!stackPopParams(1, VAL_BOOL, &bState)) { @@ -3917,7 +3917,7 @@ BOOL scrSetDepthFog(void) // ----------------------------------------------------------------------------------------- //set Mission Fog colour, may be modified by weather effects -BOOL scrSetFogColour(void) +bool scrSetFogColour(void) { SDWORD red,green,blue; PIELIGHT scrFogColour; @@ -3942,7 +3942,7 @@ BOOL scrSetFogColour(void) // ----------------------------------------------------------------------------------------- // test function to test variable references -BOOL scrRefTest(void) +bool scrRefTest(void) { SDWORD Num = 0; @@ -3958,7 +3958,7 @@ BOOL scrRefTest(void) // ----------------------------------------------------------------------------------------- // is player a human or computer player? (multiplayer only) -BOOL scrIsHumanPlayer(void) +bool scrIsHumanPlayer(void) { SDWORD player; @@ -3978,7 +3978,7 @@ BOOL scrIsHumanPlayer(void) // ----------------------------------------------------------------------------------------- // Set an alliance between two players -BOOL scrCreateAlliance(void) +bool scrCreateAlliance(void) { SDWORD player1,player2; @@ -4010,7 +4010,7 @@ BOOL scrCreateAlliance(void) // ----------------------------------------------------------------------------------------- // offer an alliance -BOOL scrOfferAlliance(void) +bool scrOfferAlliance(void) { SDWORD player1,player2; if (!stackPopParams(2, VAL_INT, &player1, VAL_INT, &player2)) @@ -4032,7 +4032,7 @@ BOOL scrOfferAlliance(void) // ----------------------------------------------------------------------------------------- // Break an alliance between two players -BOOL scrBreakAlliance(void) +bool scrBreakAlliance(void) { SDWORD player1,player2; @@ -4067,7 +4067,7 @@ BOOL scrBreakAlliance(void) // ----------------------------------------------------------------------------------------- // Multiplayer relevant scriptfuncs // returns true if 2 or more players are in alliance. -BOOL scrAllianceExists(void) +bool scrAllianceExists(void) { UDWORD i,j; @@ -4096,7 +4096,7 @@ BOOL scrAllianceExists(void) return true; } -BOOL scrAllianceExistsBetween(void) +bool scrAllianceExistsBetween(void) { UDWORD i,j; @@ -4126,7 +4126,7 @@ BOOL scrAllianceExistsBetween(void) } // ----------------------------------------------------------------------------------------- -BOOL scrPlayerInAlliance(void) +bool scrPlayerInAlliance(void) { UDWORD player,j; @@ -4158,7 +4158,7 @@ BOOL scrPlayerInAlliance(void) // ----------------------------------------------------------------------------------------- // returns true if a single alliance is dominant. -BOOL scrDominatingAlliance(void) +bool scrDominatingAlliance(void) { UDWORD i,j; @@ -4192,7 +4192,7 @@ BOOL scrDominatingAlliance(void) } -BOOL scrMyResponsibility(void) +bool scrMyResponsibility(void) { SDWORD player; @@ -4227,7 +4227,7 @@ BOOL scrMyResponsibility(void) * Checks to see if a structure of the type specified exists within the specified range of an XY location. * Use player -1 to find structures owned by any player. In this case, ignore if they are completed. */ -BOOL scrStructureBuiltInRange(void) +bool scrStructureBuiltInRange(void) { SDWORD player, index, x, y, range; BASE_OBJECT *psCurr; @@ -4276,7 +4276,7 @@ BOOL scrStructureBuiltInRange(void) // ----------------------------------------------------------------------------------------- // generate a random number -BOOL scrRandom(void) +bool scrRandom(void) { SDWORD range, iResult; @@ -4305,7 +4305,7 @@ BOOL scrRandom(void) // ----------------------------------------------------------------------------------------- // randomise the random number seed -BOOL scrRandomiseSeed(void) +bool scrRandomiseSeed(void) { // Why? What's the point? What on earth were they thinking, exactly? If the numbers don't have enough randominess, just set the random seed again and again until the numbers are double-plus super-duper full of randonomium? debug(LOG_ERROR, "A script is trying to set the random seed with srand(). That just doesn't make sense."); @@ -4317,7 +4317,7 @@ BOOL scrRandomiseSeed(void) // ----------------------------------------------------------------------------------------- //explicitly enables a research topic -BOOL scrEnableResearch(void) +bool scrEnableResearch(void) { SDWORD player; RESEARCH *psResearch; @@ -4342,7 +4342,7 @@ BOOL scrEnableResearch(void) // ----------------------------------------------------------------------------------------- //acts as if the research topic was completed - used to jump into the tree -BOOL scrCompleteResearch(void) +bool scrCompleteResearch(void) { SDWORD player; RESEARCH *psResearch; @@ -4390,7 +4390,7 @@ BOOL scrCompleteResearch(void) // ----------------------------------------------------------------------------------------- // This routine used to start just a reticule button flashing // .. now it starts any button flashing (awaiting implmentation from widget library) -BOOL scrFlashOn(void) +bool scrFlashOn(void) { SDWORD button; @@ -4417,7 +4417,7 @@ BOOL scrFlashOn(void) // ----------------------------------------------------------------------------------------- // stop a generic button flashing -BOOL scrFlashOff(void) +bool scrFlashOff(void) { SDWORD button; @@ -4442,7 +4442,7 @@ BOOL scrFlashOff(void) // ----------------------------------------------------------------------------------------- //set the initial power level settings for a player -BOOL scrSetPowerLevel(void) +bool scrSetPowerLevel(void) { SDWORD player, power; @@ -4464,7 +4464,7 @@ BOOL scrSetPowerLevel(void) // ----------------------------------------------------------------------------------------- //add some power for a player -BOOL scrAddPower(void) +bool scrAddPower(void) { SDWORD player, power; @@ -4487,7 +4487,7 @@ BOOL scrAddPower(void) // ----------------------------------------------------------------------------------------- /*set the landing Zone position for the map - this is for player 0. Can be scrapped and replaced by setNoGoAreas, left in for compatibility*/ -BOOL scrSetLandingZone(void) +bool scrSetLandingZone(void) { SDWORD x1, x2, y1, y2; @@ -4535,7 +4535,7 @@ BOOL scrSetLandingZone(void) /*set the landing Zone position for the Limbo droids and adds the Limbo droids to the world at the location*/ -BOOL scrSetLimboLanding(void) +bool scrSetLimboLanding(void) { SDWORD x1, x2, y1, y2; @@ -4586,7 +4586,7 @@ BOOL scrSetLimboLanding(void) // ----------------------------------------------------------------------------------------- //initialises all the no go areas -BOOL scrInitAllNoGoAreas(void) +bool scrInitAllNoGoAreas(void) { initNoGoAreas(); @@ -4595,7 +4595,7 @@ BOOL scrInitAllNoGoAreas(void) // ----------------------------------------------------------------------------------------- //set a no go area for the map - landing zones for the enemy, or player 0 -BOOL scrSetNoGoArea(void) +bool scrSetNoGoArea(void) { SDWORD x1, x2, y1, y2, area; @@ -4658,7 +4658,7 @@ BOOL scrSetNoGoArea(void) // ----------------------------------------------------------------------------------------- // set the zoom level for the radar // What is the script doing setting radar zoom? Commenting out for now. - Per -BOOL scrSetRadarZoom(void) +bool scrSetRadarZoom(void) { SDWORD level; @@ -4680,7 +4680,7 @@ BOOL scrSetRadarZoom(void) // ----------------------------------------------------------------------------------------- //set how long an offworld mission can last -1 = no limit -BOOL scrSetMissionTime(void) +bool scrSetMissionTime(void) { SDWORD time; @@ -4724,7 +4724,7 @@ BOOL scrSetMissionTime(void) } // this returns how long is left for the current mission time is 1/100th sec - same units as passed in -BOOL scrMissionTimeRemaining(void) +bool scrMissionTimeRemaining(void) { SDWORD timeRemaining; @@ -4749,7 +4749,7 @@ BOOL scrMissionTimeRemaining(void) // ----------------------------------------------------------------------------------------- //set the time delay for reinforcements for an offworld mission -BOOL scrSetReinforcementTime(void) +bool scrSetReinforcementTime(void) { SDWORD time; DROID *psDroid; @@ -4814,7 +4814,7 @@ BOOL scrSetReinforcementTime(void) // ----------------------------------------------------------------------------------------- // Sets all structure limits for a player to a specified value -BOOL scrSetAllStructureLimits(void) +bool scrSetAllStructureLimits(void) { SDWORD player, limit; STRUCTURE_LIMITS *psStructLimits; @@ -4860,7 +4860,7 @@ BOOL scrSetAllStructureLimits(void) // ----------------------------------------------------------------------------------------- // clear all the console messages -BOOL scrFlushConsoleMessages(void) +bool scrFlushConsoleMessages(void) { flushConsoleMessages(); @@ -4869,7 +4869,7 @@ BOOL scrFlushConsoleMessages(void) // ----------------------------------------------------------------------------------------- // Establishes the distance between two points - uses an approximation -BOOL scrDistanceTwoPts( void ) +bool scrDistanceTwoPts( void ) { SDWORD x1,y1,x2,y2; @@ -4891,11 +4891,11 @@ BOOL scrDistanceTwoPts( void ) // ----------------------------------------------------------------------------------------- // Returns whether two objects can see each other -BOOL scrLOSTwoBaseObjects( void ) +bool scrLOSTwoBaseObjects( void ) { BASE_OBJECT *psSource,*psDest; -BOOL bWallsBlock; -BOOL retVal; +bool bWallsBlock; +bool retVal; if(!stackPopParams(3,ST_BASEOBJECT,&psSource,ST_BASEOBJECT,&psDest,VAL_BOOL,&bWallsBlock)) { @@ -4916,14 +4916,14 @@ BOOL retVal; // ----------------------------------------------------------------------------------------- // Destroys all structures within a certain bounding area. -BOOL scrDestroyStructuresInArea( void ) +bool scrDestroyStructuresInArea( void ) { SDWORD x1,y1,x2,y2; UDWORD typeRef; UDWORD player; STRUCTURE *psStructure,*psNextS; FEATURE *psFeature,*psNextF; -BOOL bVisible,bTakeFeatures; +bool bVisible,bTakeFeatures; SDWORD sX,sY; if(!stackPopParams(8, VAL_INT, &player, VAL_INT, &typeRef, VAL_INT, &x1, VAL_INT, &y1, VAL_INT, &x2, @@ -4995,7 +4995,7 @@ SDWORD sX,sY; } // ----------------------------------------------------------------------------------------- // Returns a value representing the threat from droids in a given area -BOOL scrThreatInArea( void ) +bool scrThreatInArea( void ) { SDWORD x1,y1,x2,y2; SDWORD ldThreat,mdThreat,hdThreat; @@ -5003,7 +5003,7 @@ UDWORD playerLooking,playerTarget; SDWORD totalThreat; DROID *psDroid; SDWORD dX,dY; -BOOL bVisible; +bool bVisible; if(!stackPopParams(10,VAL_INT,&playerLooking,VAL_INT,&playerTarget,VAL_INT,&x1,VAL_INT,&y1,VAL_INT,&x2,VAL_INT,&y2, VAL_INT,&ldThreat,VAL_INT,&mdThreat,VAL_INT,&hdThreat, VAL_BOOL, &bVisible)) @@ -5065,7 +5065,7 @@ BOOL bVisible; } // ----------------------------------------------------------------------------------------- // returns the nearest gateway bottleneck to a specified point -BOOL scrGetNearestGateway( void ) +bool scrGetNearestGateway( void ) { SDWORD x,y; UDWORD nearestSoFar; @@ -5073,7 +5073,7 @@ BOOL scrGetNearestGateway( void ) GATEWAY *psGateway; SDWORD retX,retY; SDWORD *rX,*rY; - BOOL success; + bool success; if(!stackPopParams(4, VAL_INT, &x, VAL_INT, &y, VAL_REF|VAL_INT, &rX, VAL_REF|VAL_INT, &rY)) { @@ -5124,7 +5124,7 @@ BOOL scrGetNearestGateway( void ) return(true); } // ----------------------------------------------------------------------------------------- -BOOL scrSetWaterTile(void) +bool scrSetWaterTile(void) { UDWORD tileNum; @@ -5146,7 +5146,7 @@ UDWORD tileNum; return(true); } // ----------------------------------------------------------------------------------------- -BOOL scrSetRubbleTile(void) +bool scrSetRubbleTile(void) { UDWORD tileNum; @@ -5168,7 +5168,7 @@ UDWORD tileNum; return(true); } // ----------------------------------------------------------------------------------------- -BOOL scrSetCampaignNumber(void) +bool scrSetCampaignNumber(void) { UDWORD campaignNumber; @@ -5187,11 +5187,11 @@ UDWORD campaignNumber; // ----------------------------------------------------------------------------------------- // Tests whether a structure has a certain module for a player. Tests whether any structure // has this module if structure is null -BOOL scrTestStructureModule(void) +bool scrTestStructureModule(void) { SDWORD player,refId; STRUCTURE *psStructure,*psStruct; -BOOL bFound; +bool bFound; if(!stackPopParams(3,VAL_INT,&player,ST_STRUCTURE,&psStructure,VAL_INT,&refId)) { @@ -5244,7 +5244,7 @@ BOOL bFound; // ----------------------------------------------------------------------------------------- -BOOL scrForceDamage( void ) +bool scrForceDamage( void ) { DROID *psDroid; STRUCTURE *psStructure; @@ -5305,7 +5305,7 @@ UDWORD newVal; } // Kills of a droid without spawning any explosion effects. // ----------------------------------------------------------------------------------------- -BOOL scrDestroyUnitsInArea( void ) +bool scrDestroyUnitsInArea( void ) { DROID *psDroid,*psNext; SDWORD x1,y1,x2,y2; @@ -5344,7 +5344,7 @@ UDWORD count=0; return(true); } // ----------------------------------------------------------------------------------------- -BOOL scrRemoveDroid( void ) +bool scrRemoveDroid( void ) { DROID *psDroid; @@ -5361,10 +5361,10 @@ DROID *psDroid; return(true); } // ----------------------------------------------------------------------------------------- -static BOOL structHasModule(STRUCTURE *psStruct) +static bool structHasModule(STRUCTURE *psStruct) { STRUCTURE_STATS *psStats; -BOOL bFound; +bool bFound; /* Fail if the structure isn't built yet */ if(psStruct->status != SS_BUILT) @@ -5428,7 +5428,7 @@ BOOL bFound; // ----------------------------------------------------------------------------------------- // give player a template belonging to another. -BOOL scrAddTemplate(void) +bool scrAddTemplate(void) { DROID_TEMPLATE *psTemplate; UDWORD player; @@ -5471,7 +5471,7 @@ BOOL scrAddTemplate(void) // ----------------------------------------------------------------------------------------- // additional structure check -static BOOL structDoubleCheck(BASE_STATS *psStat,UDWORD xx,UDWORD yy, SDWORD maxBlockingTiles) +static bool structDoubleCheck(BASE_STATS *psStat,UDWORD xx,UDWORD yy, SDWORD maxBlockingTiles) { UDWORD x, y, xTL, yTL, xBR, yBR; UBYTE count = 0; @@ -5547,11 +5547,11 @@ static BOOL structDoubleCheck(BASE_STATS *psStat,UDWORD xx,UDWORD yy, SDWORD max return false; } -static BOOL pickStructLocation(DROID *psDroid, int index, int *pX, int *pY, int player, int maxBlockingTiles) +static bool pickStructLocation(DROID *psDroid, int index, int *pX, int *pY, int player, int maxBlockingTiles) { STRUCTURE_STATS *psStat; UDWORD numIterations = 30; - BOOL found = false; + bool found = false; int startX, startY, incX, incY, x, y; ASSERT_OR_RETURN(false, player < MAX_PLAYERS && player >= 0, "Invalid player number %d", player); @@ -5636,7 +5636,7 @@ endstructloc: } // pick a structure location(only used in skirmish game at 27Aug) ajl. -BOOL scrPickStructLocation(void) +bool scrPickStructLocation(void) { SDWORD *pX,*pY; SDWORD index; @@ -5651,7 +5651,7 @@ BOOL scrPickStructLocation(void) } // pick a structure location and check that we can build there (duh!) -BOOL scrPickStructLocationC(void) +bool scrPickStructLocationC(void) { int *pX, *pY, index, player, maxBlockingTiles; DROID *psDroid; @@ -5665,7 +5665,7 @@ BOOL scrPickStructLocationC(void) // pick a structure location(only used in skirmish game at 27Aug) ajl. // Max number of blocking tiles is passed as parameter for this one -BOOL scrPickStructLocationB(void) +bool scrPickStructLocationB(void) { SDWORD *pX,*pY; SDWORD index; @@ -5682,7 +5682,7 @@ BOOL scrPickStructLocationB(void) // ----------------------------------------------------------------------------------------- // Sets the transporter entry and exit points for the map -BOOL scrSetTransporterExit(void) +bool scrSetTransporterExit(void) { SDWORD iPlayer, iExitTileX, iExitTileY; @@ -5698,10 +5698,10 @@ BOOL scrSetTransporterExit(void) // ----------------------------------------------------------------------------------------- // Fly transporters in at start of map -BOOL scrFlyTransporterIn(void) +bool scrFlyTransporterIn(void) { SDWORD iPlayer, iEntryTileX, iEntryTileY; - BOOL bTrackTransporter; + bool bTrackTransporter; if (!stackPopParams(4, VAL_INT, &iPlayer, VAL_INT, &iEntryTileX, VAL_INT, &iEntryTileY, VAL_BOOL, &bTrackTransporter)) @@ -5724,17 +5724,17 @@ BOOL scrFlyTransporterIn(void) * * PARAMETERS: The parameter passed must be one of the STATUS_ variable * - * DESCRIPTION: Returns various BOOL options in the game e.g. If the reticule is open + * DESCRIPTION: Returns various bool options in the game e.g. If the reticule is open * - You should use the externed variable intMode for other game mode options * e.g. in the intelligence screen or desgin screen) * * RETURNS: * */ -BOOL scrGetGameStatus(void) +bool scrGetGameStatus(void) { SDWORD GameChoice; - BOOL bResult; + bool bResult; if (!stackPopParams(1, VAL_INT, &GameChoice)) { @@ -5785,7 +5785,7 @@ BOOL scrGetGameStatus(void) } //get the colour number used by a player -BOOL scrGetPlayerColour(void) +bool scrGetPlayerColour(void) { SDWORD player; @@ -5810,7 +5810,7 @@ BOOL scrGetPlayerColour(void) } //get the colour name of the player ("green", "black" etc) -BOOL scrGetPlayerColourName(void) +bool scrGetPlayerColourName(void) { SDWORD player; @@ -5839,7 +5839,7 @@ BOOL scrGetPlayerColourName(void) } //set the colour number to use for a player -BOOL scrSetPlayerColour(void) +bool scrSetPlayerColour(void) { SDWORD player, colour; @@ -5867,7 +5867,7 @@ BOOL scrSetPlayerColour(void) } //set all droids in an area to belong to a different player - returns the number of droids changed -BOOL scrTakeOverDroidsInArea(void) +bool scrTakeOverDroidsInArea(void) { SDWORD fromPlayer, toPlayer, x1, x2, y1, y2, numChanged; DROID *psDroid, *psNext; @@ -5934,7 +5934,7 @@ BOOL scrTakeOverDroidsInArea(void) } /*this takes over a single droid and passes a pointer back to the new one*/ -BOOL scrTakeOverSingleDroid(void) +bool scrTakeOverSingleDroid(void) { SDWORD playerToGain; DROID *psDroidToTake, *psNewDroid; @@ -5971,7 +5971,7 @@ BOOL scrTakeOverSingleDroid(void) // set all droids in an area of a certain experience level or less to belong to // a different player - returns the number of droids changed -BOOL scrTakeOverDroidsInAreaExp(void) +bool scrTakeOverDroidsInAreaExp(void) { SDWORD fromPlayer, toPlayer, x1, x2, y1, y2, numChanged, level, maxUnits; DROID *psDroid, *psNext; @@ -6049,7 +6049,7 @@ BOOL scrTakeOverDroidsInAreaExp(void) } /*this takes over a single structure and passes a pointer back to the new one*/ -BOOL scrTakeOverSingleStructure(void) +bool scrTakeOverSingleStructure(void) { SDWORD playerToGain; STRUCTURE *psStructToTake, *psNewStruct; @@ -6112,7 +6112,7 @@ BOOL scrTakeOverSingleStructure(void) //set all structures in an area to belong to a different player - returns the number of droids changed //will not work on factories for the selectedPlayer -BOOL scrTakeOverStructsInArea(void) +bool scrTakeOverStructsInArea(void) { SDWORD fromPlayer, toPlayer, x1, x2, y1, y2, numChanged; STRUCTURE *psStruct, *psNext, *psNewStruct; @@ -6205,9 +6205,9 @@ BOOL scrTakeOverStructsInArea(void) } //set Flag for defining what happens to the droids in a Transporter -BOOL scrSetDroidsToSafetyFlag(void) +bool scrSetDroidsToSafetyFlag(void) { - BOOL bState; + bool bState; if (!stackPopParams(1, VAL_BOOL, &bState)) { @@ -6220,9 +6220,9 @@ BOOL scrSetDroidsToSafetyFlag(void) } //set Flag for defining whether the coded countDown is called -BOOL scrSetPlayCountDown(void) +bool scrSetPlayCountDown(void) { - BOOL bState; + bool bState; if (!stackPopParams(1, VAL_BOOL, &bState)) { @@ -6237,7 +6237,7 @@ BOOL scrSetPlayCountDown(void) } //get the number of droids currently onthe map for a player -BOOL scrGetDroidCount(void) +bool scrGetDroidCount(void) { SDWORD player; @@ -6263,7 +6263,7 @@ BOOL scrGetDroidCount(void) // fire a weapon stat at an object -BOOL scrFireWeaponAtObj(void) +bool scrFireWeaponAtObj(void) { Vector3i target; BASE_OBJECT *psTarget; @@ -6290,7 +6290,7 @@ BOOL scrFireWeaponAtObj(void) } // fire a weapon stat at a location -BOOL scrFireWeaponAtLoc(void) +bool scrFireWeaponAtLoc(void) { Vector3i target; WEAPON sWeapon; @@ -6310,7 +6310,7 @@ BOOL scrFireWeaponAtLoc(void) } // set the number of kills for a droid -BOOL scrSetDroidKills(void) +bool scrSetDroidKills(void) { DROID *psDroid; SDWORD kills; @@ -6333,7 +6333,7 @@ BOOL scrSetDroidKills(void) } // get the number of kills for a droid -BOOL scrGetDroidKills(void) +bool scrGetDroidKills(void) { DROID *psDroid; @@ -6359,7 +6359,7 @@ BOOL scrGetDroidKills(void) } // reset the visibility for a player -BOOL scrResetPlayerVisibility(void) +bool scrResetPlayerVisibility(void) { SDWORD player, i; BASE_OBJECT *psObj; @@ -6405,7 +6405,7 @@ BOOL scrResetPlayerVisibility(void) // set the vtol return pos for a player -BOOL scrSetVTOLReturnPos(void) +bool scrSetVTOLReturnPos(void) { SDWORD player, tx,ty; @@ -6427,7 +6427,7 @@ BOOL scrSetVTOLReturnPos(void) } //called via the script in a Limbo Expand level to set the level to plain ol' expand -BOOL scrResetLimboMission(void) +bool scrResetLimboMission(void) { //check currently on a Limbo expand mission if (!missionLimboExpand()) @@ -6445,7 +6445,7 @@ BOOL scrResetLimboMission(void) // skirmish only. -BOOL scrIsVtol(void) +bool scrIsVtol(void) { DROID *psDroid; @@ -6472,7 +6472,7 @@ BOOL scrIsVtol(void) // do the setting up of the template list for the tutorial. // This function looks like it searches for a template called "ViperLtMGWheels", and deletes it. Why? -BOOL scrTutorialTemplates(void) +bool scrTutorialTemplates(void) { DROID_TEMPLATE *psCurr, *psPrev; @@ -6524,7 +6524,7 @@ BOOL scrTutorialTemplates(void) //----------------------------------------- //compare two strings (0 means they are different) -BOOL scrStrcmp(void) +bool scrStrcmp(void) { if (!stackPopParams(2, VAL_STRING, &strParam1, VAL_STRING, &strParam2)) { @@ -6543,7 +6543,7 @@ BOOL scrStrcmp(void) } /* Output a string to console */ -BOOL scrConsole(void) +bool scrConsole(void) { if (!stackPopParams(1, VAL_STRING, &strParam1)) { @@ -6556,12 +6556,12 @@ BOOL scrConsole(void) return true; } -BOOL scrDebug[MAX_PLAYERS]; +bool scrDebug[MAX_PLAYERS]; //turn on debug messages -BOOL scrDbgMsgOn(void) +bool scrDbgMsgOn(void) { - BOOL bOn; + bool bOn; SDWORD player; if (!stackPopParams(2, VAL_INT, &player, VAL_BOOL, &bOn)) @@ -6581,7 +6581,7 @@ BOOL scrDbgMsgOn(void) return true; } -BOOL scrMsg(void) +bool scrMsg(void) { SDWORD playerTo,playerFrom; char tmp[255]; @@ -6617,7 +6617,7 @@ BOOL scrMsg(void) return true; } -BOOL scrDbg(void) +bool scrDbg(void) { SDWORD player; @@ -6637,7 +6637,7 @@ BOOL scrDbg(void) return true; } -BOOL scrDebugFile(void) +bool scrDebugFile(void) { if (!stackPopParams(1, VAL_STRING, &strParam1)) { @@ -6655,7 +6655,7 @@ static UDWORD playerVisibleDroid; static UDWORD enumDroidCount; /* Prepare the droid iteration */ -BOOL scrInitEnumDroids(void) +bool scrInitEnumDroids(void) { SDWORD targetplayer,playerVisible; @@ -6672,7 +6672,7 @@ BOOL scrInitEnumDroids(void) } /* Get next droid */ -BOOL scrEnumDroid(void) +bool scrEnumDroid(void) { UDWORD count; DROID *psDroid; @@ -6714,7 +6714,7 @@ BOOL scrEnumDroid(void) } //Return the template factory is currently building -BOOL scrFactoryGetTemplate(void) +bool scrFactoryGetTemplate(void) { STRUCTURE *psStructure = NULL; DROID_TEMPLATE *psTemplate = NULL; @@ -6760,7 +6760,7 @@ BOOL scrFactoryGetTemplate(void) return true; } -BOOL scrNumTemplatesInProduction(void) +bool scrNumTemplatesInProduction(void) { SDWORD player,numTemplates = 0; DROID_TEMPLATE *psTemplate; @@ -6813,7 +6813,7 @@ BOOL scrNumTemplatesInProduction(void) } // Returns number of units based on a component a certain player has -BOOL scrNumDroidsByComponent(void) +bool scrNumDroidsByComponent(void) { SDWORD player,lookingPlayer,comp; UDWORD numFound; @@ -6917,7 +6917,7 @@ BOOL scrNumDroidsByComponent(void) return true; } -BOOL scrGetStructureLimit(void) +bool scrGetStructureLimit(void) { SDWORD player,limit; UDWORD structInc; @@ -6955,10 +6955,10 @@ BOOL scrGetStructureLimit(void) } // Returns true if limit for the passed structurestat is reached, otherwise returns false -BOOL scrStructureLimitReached(void) +bool scrStructureLimitReached(void) { SDWORD player; - BOOL bLimit = false; + bool bLimit = false; UDWORD structInc; STRUCTURE_LIMITS *psStructLimits; @@ -6996,7 +6996,7 @@ BOOL scrStructureLimitReached(void) } // How many structures of a given type a player has -BOOL scrGetNumStructures(void) +bool scrGetNumStructures(void) { SDWORD player,numStructures; UDWORD structInc; @@ -7030,7 +7030,7 @@ BOOL scrGetNumStructures(void) } // Return player's unit limit -BOOL scrGetUnitLimit(void) +bool scrGetUnitLimit(void) { SDWORD player; @@ -7054,7 +7054,7 @@ BOOL scrGetUnitLimit(void) } // Return minimum of 2 vals -BOOL scrMin(void) +bool scrMin(void) { SDWORD val1,val2; @@ -7073,7 +7073,7 @@ BOOL scrMin(void) } // Return maximum of 2 vals -BOOL scrMax(void) +bool scrMax(void) { SDWORD val1,val2; @@ -7091,7 +7091,7 @@ BOOL scrMax(void) return true; } -BOOL scrFMin(void) +bool scrFMin(void) { float fval1,fval2; @@ -7110,7 +7110,7 @@ BOOL scrFMin(void) } // Return maximum of 2 floats -BOOL scrFMax(void) +bool scrFMax(void) { float fval1,fval2; @@ -7128,7 +7128,7 @@ BOOL scrFMax(void) return true; } -BOOL ThreatInRange(SDWORD player, SDWORD range, SDWORD rangeX, SDWORD rangeY, BOOL bVTOLs) +bool ThreatInRange(SDWORD player, SDWORD range, SDWORD rangeX, SDWORD rangeY, bool bVTOLs) { UDWORD i,structType; STRUCTURE *psStruct; @@ -7202,13 +7202,13 @@ BOOL ThreatInRange(SDWORD player, SDWORD range, SDWORD rangeX, SDWORD rangeY, BO } //find unrevealed tile closest to pwLooker within the range of wRange -BOOL scrFogTileInRange(void) +bool scrFogTileInRange(void) { SDWORD pwLookerX,pwLookerY,tBestX,tBestY,threadRange; SDWORD wRangeX,wRangeY,tRangeX,tRangeY,wRange,player; UDWORD tx,ty,i,j,wDist,wBestDist; MAPTILE *psTile; - BOOL ok = false; + bool ok = false; SDWORD *wTileX,*wTileY; if (!stackPopParams(9, VAL_REF|VAL_INT, &wTileX, VAL_REF|VAL_INT, &wTileY, @@ -7302,7 +7302,7 @@ BOOL scrFogTileInRange(void) return true; } -BOOL scrMapRevealedInRange(void) +bool scrMapRevealedInRange(void) { SDWORD wRangeX,wRangeY,tRangeX,tRangeY,wRange,tRange,player; int i, j; @@ -7363,7 +7363,7 @@ BOOL scrMapRevealedInRange(void) } /* Returns true if a certain map tile was revealed, ie fog of war was removed */ -BOOL scrMapTileVisible(void) +bool scrMapTileVisible(void) { SDWORD tileX,tileY,player; @@ -7407,7 +7407,7 @@ BOOL scrMapTileVisible(void) //return number of reserach topics that are left to be researched //for a certain technology to become available -BOOL scrNumResearchLeft(void) +bool scrNumResearchLeft(void) { RESEARCH *psResearch; SDWORD player,iResult; @@ -7522,7 +7522,7 @@ BOOL scrNumResearchLeft(void) } //check if any of the ally is researching this topic -BOOL beingResearchedByAlly(SDWORD resIndex, SDWORD player) +bool beingResearchedByAlly(SDWORD resIndex, SDWORD player) { STRUCTURE *psOtherStruct; SDWORD i; @@ -7557,7 +7557,7 @@ BOOL beingResearchedByAlly(SDWORD resIndex, SDWORD player) } // true if player has completed this research -BOOL scrResearchCompleted(void) +bool scrResearchCompleted(void) { RESEARCH *psResearch; SDWORD player; @@ -7606,7 +7606,7 @@ BOOL scrResearchCompleted(void) } // true if player has already started researching it -BOOL scrResearchStarted(void) +bool scrResearchStarted(void) { RESEARCH *psResearch; SDWORD player; @@ -7655,10 +7655,10 @@ BOOL scrResearchStarted(void) } //returns true if location is dangerous -BOOL scrThreatInRange(void) +bool scrThreatInRange(void) { SDWORD player,range,rangeX,rangeY; - BOOL bVTOLs; + bool bVTOLs; if (!stackPopParams(5, VAL_INT, &player, VAL_INT, &rangeX, VAL_INT, &rangeY, VAL_INT, &range, VAL_BOOL, &bVTOLs)) @@ -7677,11 +7677,11 @@ BOOL scrThreatInRange(void) } -BOOL scrNumEnemyWeapObjInRange(void) +bool scrNumEnemyWeapObjInRange(void) { SDWORD lookingPlayer,range,rangeX,rangeY,i; UDWORD numEnemies = 0; - BOOL bVTOLs,bFinished; + bool bVTOLs,bFinished; if (!stackPopParams(6, VAL_INT, &lookingPlayer, VAL_INT, &rangeX, VAL_INT, &rangeY, VAL_INT, &range, VAL_BOOL, &bVTOLs, VAL_BOOL, &bFinished)) @@ -7713,11 +7713,11 @@ BOOL scrNumEnemyWeapObjInRange(void) } /* Calculates the total cost of enemy weapon objects in a certain area */ -BOOL scrEnemyWeapObjCostInRange(void) +bool scrEnemyWeapObjCostInRange(void) { SDWORD lookingPlayer,range,rangeX,rangeY,i; UDWORD enemyCost = 0; - BOOL bVTOLs,bFinished; + bool bVTOLs,bFinished; if (!stackPopParams(6, VAL_INT, &lookingPlayer, VAL_INT, &rangeX, VAL_INT, &rangeY, VAL_INT, &range, VAL_BOOL, &bVTOLs, VAL_BOOL, &bFinished)) @@ -7750,11 +7750,11 @@ BOOL scrEnemyWeapObjCostInRange(void) /* Calculates the total cost of ally (+ looking player) * weapon objects in a certain area */ -BOOL scrFriendlyWeapObjCostInRange(void) +bool scrFriendlyWeapObjCostInRange(void) { SDWORD player,range,rangeX,rangeY,i; UDWORD friendlyCost = 0; - BOOL bVTOLs,bFinished; + bool bVTOLs,bFinished; if (!stackPopParams(6, VAL_INT, &player, VAL_INT, &rangeX, VAL_INT, &rangeY, VAL_INT, &range, VAL_BOOL, &bVTOLs, VAL_BOOL, &bFinished)) @@ -7786,7 +7786,7 @@ BOOL scrFriendlyWeapObjCostInRange(void) * Will either count the number of droids or calculate the total costs. */ static UDWORD costOrAmountInRange(SDWORD player, SDWORD lookingPlayer, SDWORD range, - SDWORD rangeX, SDWORD rangeY, BOOL bVTOLs, BOOL justCount) + SDWORD rangeX, SDWORD rangeY, bool bVTOLs, bool justCount) { UDWORD droidCost; DROID *psDroid; @@ -7827,13 +7827,13 @@ static UDWORD costOrAmountInRange(SDWORD player, SDWORD lookingPlayer, SDWORD ra return droidCost; } -UDWORD numPlayerWeapDroidsInRange(SDWORD player, SDWORD lookingPlayer, SDWORD range, SDWORD rangeX, SDWORD rangeY, BOOL bVTOLs) +UDWORD numPlayerWeapDroidsInRange(SDWORD player, SDWORD lookingPlayer, SDWORD range, SDWORD rangeX, SDWORD rangeY, bool bVTOLs) { return costOrAmountInRange(player, lookingPlayer, range, rangeX, rangeY, bVTOLs, true /*only count*/); } UDWORD playerWeapDroidsCostInRange(SDWORD player, SDWORD lookingPlayer, SDWORD range, - SDWORD rangeX, SDWORD rangeY, BOOL bVTOLs) + SDWORD rangeX, SDWORD rangeY, bool bVTOLs) { return costOrAmountInRange(player, lookingPlayer, range, rangeX, rangeY, bVTOLs, false /*total cost*/); } @@ -7841,7 +7841,7 @@ UDWORD playerWeapDroidsCostInRange(SDWORD player, SDWORD lookingPlayer, SDWORD r UDWORD numPlayerWeapStructsInRange(SDWORD player, SDWORD lookingPlayer, SDWORD range, - SDWORD rangeX, SDWORD rangeY, BOOL bFinished) + SDWORD rangeX, SDWORD rangeY, bool bFinished) { const STRUCTURE* psStruct; @@ -7871,7 +7871,7 @@ UDWORD numPlayerWeapStructsInRange(SDWORD player, SDWORD lookingPlayer, SDWORD r } UDWORD playerWeapStructsCostInRange(SDWORD player, SDWORD lookingPlayer, SDWORD range, - SDWORD rangeX, SDWORD rangeY, BOOL bFinished) + SDWORD rangeX, SDWORD rangeY, bool bFinished) { const STRUCTURE* psStruct; @@ -7898,11 +7898,11 @@ UDWORD playerWeapStructsCostInRange(SDWORD player, SDWORD lookingPlayer, SDWORD return structsCost; } -BOOL scrNumEnemyWeapDroidsInRange(void) +bool scrNumEnemyWeapDroidsInRange(void) { SDWORD lookingPlayer,range,rangeX,rangeY,i; UDWORD numEnemies = 0; - BOOL bVTOLs; + bool bVTOLs; if (!stackPopParams(5, VAL_INT, &lookingPlayer, VAL_INT, &rangeX, VAL_INT, &rangeY, VAL_INT, &range, VAL_BOOL, &bVTOLs)) @@ -7933,11 +7933,11 @@ BOOL scrNumEnemyWeapDroidsInRange(void) -BOOL scrNumEnemyWeapStructsInRange(void) +bool scrNumEnemyWeapStructsInRange(void) { SDWORD lookingPlayer,range,rangeX,rangeY,i; UDWORD numEnemies = 0; - BOOL bFinished; + bool bFinished; if (!stackPopParams(5, VAL_INT, &lookingPlayer, VAL_INT, &rangeX, VAL_INT, &rangeY, VAL_INT, &range, VAL_BOOL, &bFinished)) @@ -7966,11 +7966,11 @@ BOOL scrNumEnemyWeapStructsInRange(void) return true; } -BOOL scrNumFriendlyWeapObjInRange(void) +bool scrNumFriendlyWeapObjInRange(void) { SDWORD player,range,rangeX,rangeY,i; UDWORD numFriends = 0; - BOOL bVTOLs,bFinished; + bool bVTOLs,bFinished; if (!stackPopParams(6, VAL_INT, &player, VAL_INT, &rangeX, VAL_INT, &rangeY, VAL_INT, &range, VAL_BOOL, &bVTOLs, VAL_BOOL, &bFinished)) @@ -7997,11 +7997,11 @@ BOOL scrNumFriendlyWeapObjInRange(void) return true; } -BOOL scrNumFriendlyWeapDroidsInRange(void) +bool scrNumFriendlyWeapDroidsInRange(void) { SDWORD lookingPlayer,range,rangeX,rangeY,i; UDWORD numEnemies = 0; - BOOL bVTOLs; + bool bVTOLs; if (!stackPopParams(5, VAL_INT, &lookingPlayer, VAL_INT, &rangeX, VAL_INT, &rangeY, VAL_INT, &range, VAL_BOOL, &bVTOLs)) @@ -8031,11 +8031,11 @@ BOOL scrNumFriendlyWeapDroidsInRange(void) -BOOL scrNumFriendlyWeapStructsInRange(void) +bool scrNumFriendlyWeapStructsInRange(void) { SDWORD lookingPlayer,range,rangeX,rangeY,i; UDWORD numEnemies = 0; - BOOL bFinished; + bool bFinished; if (!stackPopParams(5, VAL_INT, &lookingPlayer, VAL_INT, &rangeX, VAL_INT, &rangeY, VAL_INT, &range, VAL_BOOL, &bFinished)) @@ -8062,10 +8062,10 @@ BOOL scrNumFriendlyWeapStructsInRange(void) return true; } -BOOL scrNumPlayerWeapDroidsInRange(void) +bool scrNumPlayerWeapDroidsInRange(void) { SDWORD targetPlayer,lookingPlayer,range,rangeX,rangeY; - BOOL bVTOLs; + bool bVTOLs; if (!stackPopParams(6, VAL_INT, &targetPlayer, VAL_INT, &lookingPlayer, VAL_INT, &rangeX, VAL_INT, &rangeY, VAL_INT, &range, VAL_BOOL, &bVTOLs)) @@ -8085,10 +8085,10 @@ BOOL scrNumPlayerWeapDroidsInRange(void) return true; } -BOOL scrNumPlayerWeapStructsInRange(void) +bool scrNumPlayerWeapStructsInRange(void) { SDWORD targetPlayer,lookingPlayer,range,rangeX,rangeY; - BOOL bFinished; + bool bFinished; if (!stackPopParams(6, VAL_INT, &targetPlayer, VAL_INT, &lookingPlayer, VAL_INT, &rangeX, VAL_INT, &rangeY, VAL_INT, &range, VAL_BOOL, &bFinished)) @@ -8108,11 +8108,11 @@ BOOL scrNumPlayerWeapStructsInRange(void) return true; } -BOOL scrNumPlayerWeapObjInRange(void) +bool scrNumPlayerWeapObjInRange(void) { SDWORD targetPlayer,lookingPlayer,range,rangeX,rangeY; UDWORD numEnemies = 0; - BOOL bVTOLs,bFinished; + bool bVTOLs,bFinished; if (!stackPopParams(7, VAL_INT, &targetPlayer, VAL_INT, &lookingPlayer, VAL_INT, &rangeX, VAL_INT, &rangeY, VAL_INT, &range, @@ -8135,10 +8135,10 @@ BOOL scrNumPlayerWeapObjInRange(void) return true; } -BOOL scrNumEnemyObjInRange(void) +bool scrNumEnemyObjInRange(void) { SDWORD lookingPlayer,range,rangeX,rangeY; - BOOL bVTOLs,bFinished; + bool bVTOLs,bFinished; if (!stackPopParams(6, VAL_INT, &lookingPlayer, VAL_INT, &rangeX, VAL_INT, &rangeY, VAL_INT, &range, VAL_BOOL, &bVTOLs, VAL_BOOL, &bFinished)) @@ -8158,7 +8158,7 @@ BOOL scrNumEnemyObjInRange(void) } UDWORD numEnemyObjInRange(SDWORD player, SDWORD range, SDWORD rangeX, SDWORD rangeY, - BOOL bVTOLs, BOOL bFinished) + bool bVTOLs, bool bFinished) { unsigned int i; const STRUCTURE* psStruct; @@ -8220,7 +8220,7 @@ UDWORD numEnemyObjInRange(SDWORD player, SDWORD range, SDWORD rangeX, SDWORD ran } /* Similar to structureBuiltInRange(), but also returns true if structure is not finished */ -BOOL scrNumStructsByStatInRange(void) +bool scrNumStructsByStatInRange(void) { SDWORD player, lookingPlayer, index, x, y, range; SDWORD rangeSquared,NumStruct; @@ -8295,7 +8295,7 @@ BOOL scrNumStructsByStatInRange(void) return true; } -BOOL scrNumStructsByStatInArea(void) +bool scrNumStructsByStatInArea(void) { SDWORD player, lookingPlayer, index, x1, y1, x2, y2; SDWORD NumStruct; @@ -8357,7 +8357,7 @@ BOOL scrNumStructsByStatInArea(void) return true; } -BOOL scrNumStructsByTypeInRange(void) +bool scrNumStructsByTypeInRange(void) { SDWORD targetPlayer, lookingPlayer, type, x, y, range; SDWORD rangeSquared,NumStruct; @@ -8427,7 +8427,7 @@ BOOL scrNumStructsByTypeInRange(void) return true; } -BOOL scrNumFeatByTypeInRange(void) +bool scrNumFeatByTypeInRange(void) { SDWORD lookingPlayer, type, x, y, range; SDWORD rangeSquared,NumFeat; @@ -8498,7 +8498,7 @@ BOOL scrNumFeatByTypeInRange(void) } //returns num of visible structures of a certain player in range (only visible ones) -BOOL scrNumStructsButNotWallsInRangeVis(void) +bool scrNumStructsButNotWallsInRangeVis(void) { SDWORD player, lookingPlayer, x, y, range; SDWORD rangeSquared,NumStruct; @@ -8567,12 +8567,12 @@ BOOL scrNumStructsButNotWallsInRangeVis(void) } // Only returns structure if it is visible -BOOL scrGetStructureVis(void) +bool scrGetStructureVis(void) { SDWORD player, lookingPlayer, index; STRUCTURE *psStruct; UDWORD structType; - BOOL found; + bool found; if (!stackPopParams(3, ST_STRUCTURESTAT, &index, VAL_INT, &player, VAL_INT, &lookingPlayer)) { @@ -8619,7 +8619,7 @@ BOOL scrGetStructureVis(void) } //returns num of visible structures of a certain player in range -BOOL scrChooseValidLoc(void) +bool scrChooseValidLoc(void) { SDWORD sendY, sendX, *x, *y, player, threatRange; UDWORD tx,ty; @@ -8667,11 +8667,11 @@ BOOL scrChooseValidLoc(void) } //returns closest enemy object -BOOL scrGetClosestEnemy(void) +bool scrGetClosestEnemy(void) { SDWORD x,y,tx,ty, player, range,i; UDWORD dist, bestDist; - BOOL weaponOnly, bVTOLs, bFound = false; //only military objects? + bool weaponOnly, bVTOLs, bFound = false; //only military objects? BASE_OBJECT *psObj = NULL; STRUCTURE *psStruct = NULL; DROID *psDroid = NULL; @@ -8784,7 +8784,7 @@ BOOL scrGetClosestEnemy(void) } //How many droids can it still fit? -BOOL scrTransporterCapacity(void) +bool scrTransporterCapacity(void) { DROID *psDroid; @@ -8817,7 +8817,7 @@ BOOL scrTransporterCapacity(void) } //is it? -BOOL scrTransporterFlying(void) +bool scrTransporterFlying(void) { DROID *psDroid; @@ -8849,7 +8849,7 @@ BOOL scrTransporterFlying(void) return true; } -BOOL scrUnloadTransporter(void) +bool scrUnloadTransporter(void) { DROID *psDroid; SDWORD x,y; @@ -8878,10 +8878,10 @@ BOOL scrUnloadTransporter(void) } //return true if droid is a member of any group -BOOL scrHasGroup(void) +bool scrHasGroup(void) { DROID *psDroid; - BOOL retval; + bool retval; if (!stackPopParams(1, ST_DROID, &psDroid)) { @@ -8914,7 +8914,7 @@ BOOL scrHasGroup(void) } /* Range is in world units! */ -BOOL scrObjWeaponMaxRange(void) +bool scrObjWeaponMaxRange(void) { BASE_OBJECT *psObj; WEAPON_STATS *psStats; @@ -8971,7 +8971,7 @@ BOOL scrObjWeaponMaxRange(void) return true; } -BOOL scrObjHasWeapon(void) +bool scrObjHasWeapon(void) { BASE_OBJECT *psObj; @@ -9003,10 +9003,10 @@ BOOL scrObjHasWeapon(void) return true; } -BOOL scrObjectHasIndirectWeapon(void) +bool scrObjectHasIndirectWeapon(void) { WEAPON_STATS *psWeapStats; - BOOL bIndirect; + bool bIndirect; BASE_OBJECT *psObj; if (!stackPopParams(1, ST_BASEOBJECT, &psObj)) @@ -9050,12 +9050,12 @@ BOOL scrObjectHasIndirectWeapon(void) } //returns closest droid by type -BOOL scrGetClosestEnemyDroidByType(void) +bool scrGetClosestEnemyDroidByType(void) { SDWORD x,y,tx,ty, player, range,i,type; UDWORD dist,bestDist; - BOOL bFound = false; //only military objects? - BOOL bVTOLs; + bool bFound = false; //only military objects? + bool bVTOLs; DROID *psDroid = NULL, *foundDroid = NULL; if (!stackPopParams(6, VAL_INT, &x, VAL_INT, &y, @@ -9139,11 +9139,11 @@ BOOL scrGetClosestEnemyDroidByType(void) } //returns closest structure by type -BOOL scrGetClosestEnemyStructByType(void) +bool scrGetClosestEnemyStructByType(void) { SDWORD x,y,tx,ty, player, range,i,type,dist; UDWORD bestDist; - BOOL bFound = false; //only military objects? + bool bFound = false; //only military objects? STRUCTURE *psStruct = NULL, *foundStruct = NULL; if (!stackPopParams(5, VAL_INT, &x, VAL_INT, &y, @@ -9224,7 +9224,7 @@ BOOL scrGetClosestEnemyStructByType(void) //Approx point of intersection of a circle and a line with start loc being circle's center point -BOOL scrCirclePerimPoint(void) +bool scrCirclePerimPoint(void) { SDWORD basex,basey,*grx,*gry,radius; float factor, deltaX, deltaY; @@ -9266,10 +9266,10 @@ BOOL scrCirclePerimPoint(void) } //send my vision to AI -BOOL scrGiftRadar(void) +bool scrGiftRadar(void) { SDWORD playerFrom, playerTo; - BOOL playMsg; + bool playMsg; if (!stackPopParams(3, VAL_INT, &playerFrom, VAL_INT, &playerTo, VAL_BOOL, &playMsg)) { @@ -9291,7 +9291,7 @@ BOOL scrGiftRadar(void) return true; } -BOOL scrNumAllies(void) +bool scrNumAllies(void) { SDWORD player,numAllies,i; @@ -9336,7 +9336,7 @@ BOOL scrNumAllies(void) //num aa defenses in range -BOOL scrNumAAinRange(void) +bool scrNumAAinRange(void) { SDWORD targetPlayer,lookingPlayer,range,rangeX,rangeY; SDWORD tx,ty; @@ -9382,9 +9382,9 @@ BOOL scrNumAAinRange(void) } //select droid -BOOL scrSelectDroid(void) +bool scrSelectDroid(void) { - BOOL bSelect; + bool bSelect; DROID *psDroid; if (!stackPopParams(2, ST_DROID, &psDroid, VAL_BOOL, &bSelect)) @@ -9405,9 +9405,9 @@ BOOL scrSelectDroid(void) } //select droid group -BOOL scrSelectGroup(void) +bool scrSelectGroup(void) { - BOOL bSelect; + bool bSelect; DROID_GROUP *psGroup; DROID *psCurr; @@ -9425,7 +9425,7 @@ BOOL scrSelectGroup(void) return true; } -BOOL scrModulo(void) +bool scrModulo(void) { SDWORD num1,num2; @@ -9445,10 +9445,10 @@ BOOL scrModulo(void) return true; } -BOOL scrPlayerLoaded(void) +bool scrPlayerLoaded(void) { SDWORD player; - BOOL bPlayerHasFactories=false; + bool bPlayerHasFactories=false; STRUCTURE *psCurr; if (!stackPopParams(1, VAL_INT, &player)) @@ -9483,7 +9483,7 @@ BOOL scrPlayerLoaded(void) } /* Add a beacon (blip) */ -BOOL addBeaconBlip(SDWORD locX, SDWORD locY, SDWORD forPlayer, SDWORD sender, char * textMsg) +bool addBeaconBlip(SDWORD locX, SDWORD locY, SDWORD forPlayer, SDWORD sender, char * textMsg) { MESSAGE *psMessage; VIEWDATA *pTempData; @@ -9545,7 +9545,7 @@ BOOL addBeaconBlip(SDWORD locX, SDWORD locY, SDWORD forPlayer, SDWORD sender, ch return true; } -BOOL sendBeaconToPlayer(SDWORD locX, SDWORD locY, SDWORD forPlayer, SDWORD sender, char * beaconMsg) +bool sendBeaconToPlayer(SDWORD locX, SDWORD locY, SDWORD forPlayer, SDWORD sender, char * beaconMsg) { if(sender == forPlayer || myResponsibility(forPlayer)) //if destination player is on this machine { @@ -9653,7 +9653,7 @@ MESSAGE * findBeaconMsg(UDWORD player, SDWORD sender) } /* Add beacon (radar blip) */ -BOOL scrDropBeacon(void) +bool scrDropBeacon(void) { SDWORD forPlayer,sender; char ssval2[255]; @@ -9672,7 +9672,7 @@ BOOL scrDropBeacon(void) } /* Remove beacon from the map */ -BOOL scrRemoveBeacon(void) +bool scrRemoveBeacon(void) { MESSAGE *psMessage; SDWORD player, sender; @@ -9706,7 +9706,7 @@ BOOL scrRemoveBeacon(void) return true; } -BOOL scrClosestDamagedGroupDroid(void) +bool scrClosestDamagedGroupDroid(void) { DROID_GROUP *psGroup; DROID *psDroid,*psClosestDroid; @@ -9771,7 +9771,7 @@ SDWORD getNumRepairedBy(DROID *psDroidToCheck, SDWORD player) } /* Uses debug_console() for console debug output right now */ -BOOL scrMsgBox(void) +bool scrMsgBox(void) { if (!stackPopParams(1, VAL_STRING, &strParam1)) { @@ -9786,10 +9786,10 @@ BOOL scrMsgBox(void) // Check for a struct being within a certain range of a position (must be visible) -BOOL scrStructInRangeVis(void) +bool scrStructInRangeVis(void) { SDWORD range, player,lookingPlayer, x,y; - BOOL found; + bool found; if (!stackPopParams(5, VAL_INT, &lookingPlayer, VAL_INT, &player , VAL_INT, &x, VAL_INT, &y, VAL_INT, &range)) { @@ -9815,10 +9815,10 @@ BOOL scrStructInRangeVis(void) } // Check for a droid being within a certain range of a position (must be visible) -BOOL scrDroidInRangeVis(void) +bool scrDroidInRangeVis(void) { SDWORD range, player,lookingPlayer, x,y; - BOOL found; + bool found; if (!stackPopParams(5, VAL_INT, &lookingPlayer, VAL_INT, &player , VAL_INT, &x, VAL_INT, &y, VAL_INT, &range)) { @@ -9844,7 +9844,7 @@ BOOL scrDroidInRangeVis(void) } // check for a base object being in range of a point -BOOL objectInRangeVis(BASE_OBJECT *psList, SDWORD x, SDWORD y, SDWORD range, SDWORD lookingPlayer) +bool objectInRangeVis(BASE_OBJECT *psList, SDWORD x, SDWORD y, SDWORD range, SDWORD lookingPlayer) { BASE_OBJECT *psCurr; SDWORD xdiff, ydiff, rangeSq; @@ -9892,13 +9892,13 @@ BOOL objectInRangeVis(BASE_OBJECT *psList, SDWORD x, SDWORD y, SDWORD range, SDW } /* Go after a certain research */ -BOOL scrPursueResearch(void) +bool scrPursueResearch(void) { RESEARCH *psResearch; SDWORD foundIndex = 0, player, cur, tempIndex, Stack[400]; UDWORD index; SWORD top; - BOOL found; + bool found; PLAYER_RESEARCH *pPlayerRes; STRUCTURE *psBuilding; RESEARCH_FACILITY *psResFacilty; @@ -10058,7 +10058,7 @@ BOOL scrPursueResearch(void) return true; } -BOOL scrGetStructureType(void) +bool scrGetStructureType(void) { STRUCTURE *psStruct; @@ -10079,7 +10079,7 @@ BOOL scrGetStructureType(void) } /* Get player name from index */ -BOOL scrGetPlayerName(void) +bool scrGetPlayerName(void) { SDWORD player; @@ -10109,7 +10109,7 @@ BOOL scrGetPlayerName(void) } /* Set player name */ -BOOL scrSetPlayerName(void) +bool scrSetPlayerName(void) { SDWORD player; @@ -10173,7 +10173,7 @@ SDWORD getPlayerFromString(char *playerName) } /* Checks if a particular bit is set in an integer */ -BOOL scrGetBit(void) +bool scrGetBit(void) { SDWORD val1,val2; @@ -10195,10 +10195,10 @@ BOOL scrGetBit(void) } /* Sets a particular bit in an integer */ -BOOL scrSetBit(void) +bool scrSetBit(void) { SDWORD base,position; - BOOL bSet; + bool bSet; if (!stackPopParams(3, VAL_INT, &base, VAL_INT, &position, VAL_BOOL, &bSet)) @@ -10228,9 +10228,9 @@ BOOL scrSetBit(void) } /* Can we create and break alliances? */ -BOOL scrAlliancesLocked(void) +bool scrAlliancesLocked(void) { - BOOL bResult = true; + bool bResult = true; if(bMultiPlayer && (game.alliance == ALLIANCES)) bResult = false; @@ -10245,9 +10245,9 @@ BOOL scrAlliancesLocked(void) return true; } -BOOL scrASSERT(void) +bool scrASSERT(void) { - BOOL bExpression; + bool bExpression; SDWORD player; char sTmp[255]; @@ -10276,7 +10276,7 @@ BOOL scrASSERT(void) } /* Visualize radius at position */ -BOOL scrShowRangeAtPos(void) +bool scrShowRangeAtPos(void) { SDWORD x,y,radius; @@ -10292,7 +10292,7 @@ BOOL scrShowRangeAtPos(void) return true; } -BOOL scrToPow(void) +bool scrToPow(void) { float x,y; @@ -10313,7 +10313,7 @@ BOOL scrToPow(void) } /* Exponential function */ -BOOL scrExp(void) +bool scrExp(void) { float fArg; @@ -10332,7 +10332,7 @@ BOOL scrExp(void) } /* Square root */ -BOOL scrSqrt(void) +bool scrSqrt(void) { float fArg; @@ -10351,7 +10351,7 @@ BOOL scrSqrt(void) } /* Natural logarithm */ -BOOL scrLog(void) +bool scrLog(void) { float fArg; @@ -10370,7 +10370,7 @@ BOOL scrLog(void) } /* Show/Hide multiplayer debug menu */ -BOOL scrDebugMenu(void) +bool scrDebugMenu(void) { SDWORD menuUp; @@ -10386,7 +10386,7 @@ BOOL scrDebugMenu(void) } /* Set debug menu output string */ -BOOL scrSetDebugMenuEntry(void) +bool scrSetDebugMenuEntry(void) { SDWORD index; @@ -10402,7 +10402,7 @@ BOOL scrSetDebugMenuEntry(void) } /* Parse chat message and return number of commands that could be extracted */ -BOOL scrProcessChatMsg(void) +bool scrProcessChatMsg(void) { if (!stackPopParams(1, VAL_STRING, &strParam1)) { @@ -10431,7 +10431,7 @@ BOOL scrProcessChatMsg(void) /* Returns number of command arguments for a certain * chat command that could be extracted */ -BOOL scrGetNumArgsInCmd(void) +bool scrGetNumArgsInCmd(void) { SDWORD cmdIndex; @@ -10463,7 +10463,7 @@ BOOL scrGetNumArgsInCmd(void) /* Returns a string representing a certain chat command, * based on the command index provided */ -BOOL scrGetChatCmdDescription(void) +bool scrGetChatCmdDescription(void) { SDWORD cmdIndex; char *pChatCommand=NULL; @@ -10512,12 +10512,12 @@ BOOL scrGetChatCmdDescription(void) /* Returns a certain parameter of a certain chat command * Returns false if failed */ -BOOL scrGetChatCmdParam(void) +bool scrGetChatCmdParam(void) { SDWORD cmdIndex, argIndex; void *pArgument=NULL; INTERP_TYPE argType=VAL_VOID; - BOOL bSuccess=true; //failure on type mismatch + bool bSuccess=true; //failure on type mismatch //if (!stackPopParams(3, VAL_INT, &cmdIndex, VAL_INT, &argIndex, VAL_REF | VAL_VOID, &pArgument)) //{ @@ -10575,7 +10575,7 @@ BOOL scrGetChatCmdParam(void) } /* Returns true if a certain command was addressed to a certain player */ -BOOL scrChatCmdIsPlayerAddressed(void) +bool scrChatCmdIsPlayerAddressed(void) { SDWORD cmdIndex,playerInQuestion; @@ -10611,7 +10611,7 @@ BOOL scrChatCmdIsPlayerAddressed(void) } /* Modifies height of a tile */ -BOOL scrSetTileHeight(void) +bool scrSetTileHeight(void) { UDWORD tileX,tileY,newHeight; MAPTILE *psTile; @@ -10634,7 +10634,7 @@ BOOL scrSetTileHeight(void) /* Returns structure which placed on provided coordinates. * Returns NULL (NULLOBJECT) if there's no structure. */ -BOOL scrGetTileStructure(void) +bool scrGetTileStructure(void) { SDWORD structureX,structureY; @@ -10656,7 +10656,7 @@ BOOL scrGetTileStructure(void) /* Outputs script call stack */ -BOOL scrPrintCallStack(void) +bool scrPrintCallStack(void) { scrOutputCallTrace(LOG_SCRIPT); @@ -10666,7 +10666,7 @@ BOOL scrPrintCallStack(void) /* * Returns true if game debug mode is on */ -BOOL scrDebugModeEnabled(void) +bool scrDebugModeEnabled(void) { scrFunctionResult.v.bval = getDebugMappingStatus(); @@ -10682,7 +10682,7 @@ BOOL scrDebugModeEnabled(void) /* * Returns the cost of a droid */ -BOOL scrCalcDroidPower(void) +bool scrCalcDroidPower(void) { DROID *psDroid; @@ -10707,7 +10707,7 @@ BOOL scrCalcDroidPower(void) /* * Returns experience level of a droid */ -BOOL scrGetDroidLevel(void) +bool scrGetDroidLevel(void) { DROID *psDroid; @@ -10730,7 +10730,7 @@ BOOL scrGetDroidLevel(void) } /* Assembles a template from components and returns it */ -BOOL scrAssembleWeaponTemplate(void) +bool scrAssembleWeaponTemplate(void) { SDWORD player,bodyIndex,weapIndex,propIndex; DROID_TEMPLATE *pNewTemplate = NULL; @@ -10824,7 +10824,7 @@ BOOL scrAssembleWeaponTemplate(void) static DROID_TEMPLATE* scrCheckTemplateExists(SDWORD player, DROID_TEMPLATE *psTempl) { DROID_TEMPLATE* psCurrent; - BOOL equal; + bool equal; for (psCurrent = apsDroidTemplates[player]; psCurrent != NULL; psCurrent = psCurrent->psNext) { @@ -10868,7 +10868,7 @@ static DROID_TEMPLATE* scrCheckTemplateExists(SDWORD player, DROID_TEMPLATE *psT return NULL; } -BOOL scrWeaponShortHitUpgrade(void) +bool scrWeaponShortHitUpgrade(void) { SDWORD player,weapIndex; const WEAPON_STATS *psWeapStats; @@ -10889,7 +10889,7 @@ BOOL scrWeaponShortHitUpgrade(void) return true; } -BOOL scrWeaponLongHitUpgrade(void) +bool scrWeaponLongHitUpgrade(void) { SDWORD player,weapIndex; const WEAPON_STATS *psWeapStats; @@ -10911,7 +10911,7 @@ BOOL scrWeaponLongHitUpgrade(void) } -BOOL scrWeaponDamageUpgrade(void) +bool scrWeaponDamageUpgrade(void) { SDWORD player,weapIndex; const WEAPON_STATS *psWeapStats; @@ -10932,7 +10932,7 @@ BOOL scrWeaponDamageUpgrade(void) return true; } -BOOL scrWeaponFirePauseUpgrade(void) +bool scrWeaponFirePauseUpgrade(void) { SDWORD player,weapIndex; const WEAPON_STATS *psWeapStats; @@ -10954,10 +10954,10 @@ BOOL scrWeaponFirePauseUpgrade(void) } -BOOL scrIsComponentAvailable(void) +bool scrIsComponentAvailable(void) { SDWORD player; - BOOL bAvailable = false; + bool bAvailable = false; INTERP_VAL sVal; if (!stackPop(&sVal)) @@ -11016,7 +11016,7 @@ BOOL scrIsComponentAvailable(void) return true; } -BOOL scrGetBodySize(void) +bool scrGetBodySize(void) { SDWORD bodyIndex; @@ -11033,7 +11033,7 @@ BOOL scrGetBodySize(void) return true; } -BOOL scrGettext() +bool scrGettext() { if (!stackPopParams(1, VAL_STRING, &strParam1)) { @@ -11045,7 +11045,7 @@ BOOL scrGettext() return stackPushResult((INTERP_TYPE)ST_TEXTSTRING, &scrFunctionResult); } -BOOL scrGettext_noop() +bool scrGettext_noop() { if (!stackPopParams(1, VAL_STRING, &strParam1)) { @@ -11057,7 +11057,7 @@ BOOL scrGettext_noop() return stackPushResult(VAL_STRING, &scrFunctionResult); } -BOOL scrPgettext() +bool scrPgettext() { char* msg_ctxt_id; char* translation; @@ -11097,7 +11097,7 @@ BOOL scrPgettext() return stackPushResult((INTERP_TYPE)ST_TEXTSTRING, &scrFunctionResult); } -BOOL scrPgettext_expr() +bool scrPgettext_expr() { if (!stackPopParams(2, VAL_STRING, &strParam1, VAL_STRING, &strParam2)) { @@ -11109,7 +11109,7 @@ BOOL scrPgettext_expr() return stackPushResult((INTERP_TYPE)ST_TEXTSTRING, &scrFunctionResult); } -BOOL scrPgettext_noop() +bool scrPgettext_noop() { if (!stackPopParams(2, VAL_STRING, &strParam1, VAL_STRING, &strParam2)) { diff --git a/src/scriptfuncs.h b/src/scriptfuncs.h index 712dc1282..0e82d0a6f 100644 --- a/src/scriptfuncs.h +++ b/src/scriptfuncs.h @@ -34,443 +34,443 @@ struct BASE_OBJECT; struct DROID; -extern BOOL scriptInit(void); +extern bool scriptInit(void); extern void scriptSetStartPos(int position, int x, int y); extern void scriptSetDerrickPos(int x, int y); -extern BOOL scrGetPlayer(void); -extern BOOL scrGetDerrick(); -extern BOOL scrGetDifficulty(void); -extern BOOL scrScavengersActive(void); -extern BOOL scrGetPlayerStartPosition(void); -extern BOOL scrSafeDest(void); -extern BOOL scrThreatAt(void); +extern bool scrGetPlayer(void); +extern bool scrGetDerrick(); +extern bool scrGetDifficulty(void); +extern bool scrScavengersActive(void); +extern bool scrGetPlayerStartPosition(void); +extern bool scrSafeDest(void); +extern bool scrThreatAt(void); extern Vector2i getPlayerStartPosition(int player); -extern BOOL scrSetSunPosition(void); -extern BOOL scrSetSunIntensity(void); +extern bool scrSetSunPosition(void); +extern bool scrSetSunIntensity(void); // not used in scripts, but used in code. -extern BOOL objectInRange(struct BASE_OBJECT *psList, SDWORD x, SDWORD y, SDWORD range); +extern bool objectInRange(struct BASE_OBJECT *psList, SDWORD x, SDWORD y, SDWORD range); // Check for any player object being within a certain range of a position -extern BOOL scrObjectInRange(void); +extern bool scrObjectInRange(void); // Check for a droid being within a certain range of a position -extern BOOL scrDroidInRange(void); +extern bool scrDroidInRange(void); // Check for a struct being within a certain range of a position -extern BOOL scrStructInRange(void); +extern bool scrStructInRange(void); // return power of a player. -extern BOOL scrPlayerPower(void); +extern bool scrPlayerPower(void); // Check for any player object being within a certain area -extern BOOL scrObjectInArea(void); +extern bool scrObjectInArea(void); // Check for a droid being within a certain area -extern BOOL scrDroidInArea(void); +extern bool scrDroidInArea(void); // Check for a struct being within a certain Area of a position -extern BOOL scrStructInArea(void); +extern bool scrStructInArea(void); // as above, but only visible structures. -extern BOOL scrSeenStructInArea(void); +extern bool scrSeenStructInArea(void); // Check for a players structures but no walls being within a certain area -extern BOOL scrStructButNoWallsInArea(void); +extern bool scrStructButNoWallsInArea(void); // Count the number of player objects within a certain area -extern BOOL scrNumObjectsInArea(void); +extern bool scrNumObjectsInArea(void); // Count the number of player droids within a certain area -extern BOOL scrNumDroidsInArea(void); +extern bool scrNumDroidsInArea(void); // Count the number of player structures within a certain area -extern BOOL scrNumStructsInArea(void); +extern bool scrNumStructsInArea(void); // Count the number of player structures but not walls within a certain area -extern BOOL scrNumStructsButNotWallsInArea(void); +extern bool scrNumStructsButNotWallsInArea(void); // Count the number of structures in an area of a certain type -extern BOOL scrNumStructsByTypeInArea(void); +extern bool scrNumStructsByTypeInArea(void); // Check for a droid having seen a certain object -extern BOOL scrDroidHasSeen(void); +extern bool scrDroidHasSeen(void); // Enable a component to be researched -extern BOOL scrEnableComponent(void); +extern bool scrEnableComponent(void); // Make a component available -extern BOOL scrMakeComponentAvailable(void); +extern bool scrMakeComponentAvailable(void); //Enable a structure type to be built -extern BOOL scrEnableStructure(void); +extern bool scrEnableStructure(void); // true if structure is available. -extern BOOL scrIsStructureAvailable(void); +extern bool scrIsStructureAvailable(void); // Build a droid -extern BOOL scrAddDroid(void); +extern bool scrAddDroid(void); // Build a droid -extern BOOL scrAddDroidToMissionList(void); +extern bool scrAddDroidToMissionList(void); //builds a droid in the specified factory// -extern BOOL scrBuildDroid(void); +extern bool scrBuildDroid(void); //check for a building to have been destroyed -extern BOOL scrBuildingDestroyed(void); +extern bool scrBuildingDestroyed(void); // Add a reticule button to the interface -extern BOOL scrAddReticuleButton(void); +extern bool scrAddReticuleButton(void); //Remove a reticule button from the interface -extern BOOL scrRemoveReticuleButton(void); +extern bool scrRemoveReticuleButton(void); // add a message to the Intelligence Display -extern BOOL scrAddMessage(void); +extern bool scrAddMessage(void); // add a tutorial message to the Intelligence Display -//extern BOOL scrAddTutorialMessage(void); +//extern bool scrAddTutorialMessage(void); //make the droid with the matching id the currently selected droid -extern BOOL scrSelectDroidByID(void); +extern bool scrSelectDroidByID(void); // for a specified player, set the assembly point droids go to when built -extern BOOL scrSetAssemblyPoint(void); +extern bool scrSetAssemblyPoint(void); // test for structure is idle or not -extern BOOL scrStructureIdle(void); +extern bool scrStructureIdle(void); // sends a players droids to a location to attack -extern BOOL scrAttackLocation(void); +extern bool scrAttackLocation(void); // enumerate features; -extern BOOL scrInitGetFeature(void); -extern BOOL scrGetFeature(void); -extern BOOL scrGetFeatureB(void); +extern bool scrInitGetFeature(void); +extern bool scrGetFeature(void); +extern bool scrGetFeatureB(void); //Add a feature -extern BOOL scrAddFeature(void); +extern bool scrAddFeature(void); //Destroy a feature -extern BOOL scrDestroyFeature(void); +extern bool scrDestroyFeature(void); //Add a structure -extern BOOL scrAddStructure(void); +extern bool scrAddStructure(void); //Destroy a structure -extern BOOL scrDestroyStructure(void); +extern bool scrDestroyStructure(void); // enumerate structures -extern BOOL scrInitEnumStruct(void); -extern BOOL scrEnumStruct(void); -extern BOOL scrInitEnumStructB(void); -extern BOOL scrEnumStructB(void); +extern bool scrInitEnumStruct(void); +extern bool scrEnumStruct(void); +extern bool scrInitEnumStructB(void); +extern bool scrEnumStructB(void); /*looks to see if a structure (specified by type) exists */ -extern BOOL scrStructureBeingBuilt(void); +extern bool scrStructureBeingBuilt(void); /* almost the same as above, but only for a specific struct*/ // pc multiplayer only for now. -extern BOOL scrStructureComplete(void); +extern bool scrStructureComplete(void); /*looks to see if a structure (specified by type) exists and built*/ -extern BOOL scrStructureBuilt(void); +extern bool scrStructureBuilt(void); /*centre theview on an object - can be droid/structure or feature */ -extern BOOL scrCentreView(void); +extern bool scrCentreView(void); /*centre the view on a position */ -extern BOOL scrCentreViewPos(void); +extern bool scrCentreViewPos(void); // Get a pointer to a structure based on a stat - returns NULL if cannot find one -extern BOOL scrGetStructure(void); +extern bool scrGetStructure(void); // Get a pointer to a template based on a component stat - returns NULL if cannot find one -extern BOOL scrGetTemplate(void); +extern bool scrGetTemplate(void); // Get a pointer to a droid based on a component stat - returns NULL if cannot find one -extern BOOL scrGetDroid(void); +extern bool scrGetDroid(void); // Sets all the scroll params for the map -extern BOOL scrSetScrollParams(void); +extern bool scrSetScrollParams(void); // Sets the scroll minX separately for the map -extern BOOL scrSetScrollMinX(void); +extern bool scrSetScrollMinX(void); // Sets the scroll minY separately for the map -extern BOOL scrSetScrollMinY(void); +extern bool scrSetScrollMinY(void); // Sets the scroll maxX separately for the map -extern BOOL scrSetScrollMaxX(void); +extern bool scrSetScrollMaxX(void); // Sets the scroll maxY separately for the map -extern BOOL scrSetScrollMaxY(void); +extern bool scrSetScrollMaxY(void); // Sets which sensor will be used as the default for a player -extern BOOL scrSetDefaultSensor(void); +extern bool scrSetDefaultSensor(void); // Sets which ECM will be used as the default for a player -extern BOOL scrSetDefaultECM(void); +extern bool scrSetDefaultECM(void); // Sets which RepairUnit will be used as the default for a player -extern BOOL scrSetDefaultRepair(void); +extern bool scrSetDefaultRepair(void); // Sets the structure limits for a player -extern BOOL scrSetStructureLimits(void); +extern bool scrSetStructureLimits(void); // Sets all structure limits for a player to a specified value -extern BOOL scrSetAllStructureLimits(void); +extern bool scrSetAllStructureLimits(void); //multiplayer limit handler -extern BOOL scrApplyLimitSet(void); +extern bool scrApplyLimitSet(void); // plays a sound for the specified player - only plays the sound if the //specified player = selectedPlayer -extern BOOL scrPlaySound(void); +extern bool scrPlaySound(void); // plays a sound for the specified player - only plays the sound if the // specified player = selectedPlayer - saves position -extern BOOL scrPlaySoundPos(void); +extern bool scrPlaySoundPos(void); /* add a text message tothe top of the screen for the selected player*/ -extern BOOL scrAddConsoleText(void); +extern bool scrAddConsoleText(void); // same as above - but it doesn't clear what's there and isn't permanent -extern BOOL scrShowConsoleText(void); +extern bool scrShowConsoleText(void); /* Adds console text without clearing old */ -extern BOOL scrTagConsoleText(void); +extern bool scrTagConsoleText(void); //demo functions for turning the power on -extern BOOL scrTurnPowerOff(void); +extern bool scrTurnPowerOff(void); //demo functions for turning the power off -extern BOOL scrTurnPowerOn(void); +extern bool scrTurnPowerOn(void); //flags when the tutorial is over so that console messages can be turned on again -extern BOOL scrTutorialEnd(void); +extern bool scrTutorialEnd(void); //function to play a full-screen video in the middle of the game for the selected player -extern BOOL scrPlayVideo(void); +extern bool scrPlayVideo(void); //checks to see if there are any droids for the specified player -extern BOOL scrAnyDroidsLeft(void); +extern bool scrAnyDroidsLeft(void); //checks to see if there are any structures (except walls) for the specified player -extern BOOL scrAnyStructButWallsLeft(void); +extern bool scrAnyStructButWallsLeft(void); -extern BOOL scrAnyFactoriesLeft(void); +extern bool scrAnyFactoriesLeft(void); //function to call when the game is over, plays a message. -extern BOOL scrGameOverMessage(void); +extern bool scrGameOverMessage(void); //function to call when the game is over -extern BOOL scrGameOver(void); +extern bool scrGameOver(void); //defines the background audio to play -extern BOOL scrPlayBackgroundAudio(void); +extern bool scrPlayBackgroundAudio(void); // cd audio funcs -extern BOOL scrPlayIngameCDAudio(void); -extern BOOL scrStopCDAudio(void); -extern BOOL scrPauseCDAudio(void); -extern BOOL scrResumeCDAudio(void); +extern bool scrPlayIngameCDAudio(void); +extern bool scrStopCDAudio(void); +extern bool scrPauseCDAudio(void); +extern bool scrResumeCDAudio(void); // set the retreat point for a player -extern BOOL scrSetRetreatPoint(void); +extern bool scrSetRetreatPoint(void); // set the retreat force level -extern BOOL scrSetRetreatForce(void); +extern bool scrSetRetreatForce(void); // set the retreat leadership -extern BOOL scrSetRetreatLeadership(void); +extern bool scrSetRetreatLeadership(void); // set the retreat point for a group -extern BOOL scrSetGroupRetreatPoint(void); +extern bool scrSetGroupRetreatPoint(void); -extern BOOL scrSetGroupRetreatForce(void); +extern bool scrSetGroupRetreatForce(void); // set the retreat leadership -extern BOOL scrSetGroupRetreatLeadership(void); +extern bool scrSetGroupRetreatLeadership(void); // set the retreat health level -BOOL scrSetRetreatHealth(void); -BOOL scrSetGroupRetreatHealth(void); +bool scrSetRetreatHealth(void); +bool scrSetGroupRetreatHealth(void); //start a Mission -extern BOOL scrStartMission(void); +extern bool scrStartMission(void); //end a mission NO LONGER CALLED FROM SCRIPT -//extern BOOL scrEndMission(void); +//extern bool scrEndMission(void); //set Snow (enable disable snow) -extern BOOL scrSetSnow(void); +extern bool scrSetSnow(void); //set Rain (enable disable Rain) -extern BOOL scrSetRain(void); +extern bool scrSetRain(void); //set Background Fog (replace fade out with fog) -extern BOOL scrSetBackgroundFog(void); +extern bool scrSetBackgroundFog(void); //set Depth Fog (gradual fog from mid range to edge of world) -extern BOOL scrSetDepthFog(void); +extern bool scrSetDepthFog(void); //set Mission Fog colour, may be modified by weather effects -extern BOOL scrSetFogColour(void); +extern bool scrSetFogColour(void); // remove a message from the Intelligence Display -extern BOOL scrRemoveMessage(void); +extern bool scrRemoveMessage(void); // Pop up a message box with a number value in it -extern BOOL scrNumMB(void); +extern bool scrNumMB(void); // Do an approximation to a square root -extern BOOL scrApproxRoot(void); +extern bool scrApproxRoot(void); -extern BOOL scrRefTest(void); +extern bool scrRefTest(void); // is human or a computer? (multiplayer) -extern BOOL scrIsHumanPlayer(void); +extern bool scrIsHumanPlayer(void); // Set an alliance between two players -extern BOOL scrCreateAlliance(void); +extern bool scrCreateAlliance(void); -extern BOOL scrOfferAlliance(void); +extern bool scrOfferAlliance(void); // Break an alliance between two players -extern BOOL scrBreakAlliance(void); +extern bool scrBreakAlliance(void); // push true if an alliance still exists. -extern BOOL scrAllianceExists(void); -extern BOOL scrAllianceExistsBetween(void); +extern bool scrAllianceExists(void); +extern bool scrAllianceExistsBetween(void); // true if player is allied. -extern BOOL scrPlayerInAlliance(void); +extern bool scrPlayerInAlliance(void); // push true if group wins are allowed. -//extern BOOL scrAllianceState(void); +//extern bool scrAllianceState(void); // push true if a single alliance is dominant. -extern BOOL scrDominatingAlliance(void); +extern bool scrDominatingAlliance(void); // push true if human player is responsible for 'player' -extern BOOL scrMyResponsibility(void); +extern bool scrMyResponsibility(void); /*checks to see if a structure of the type specified exists within the specified range of an XY location */ -extern BOOL scrStructureBuiltInRange(void); +extern bool scrStructureBuiltInRange(void); // generate a random number -extern BOOL scrRandom(void); +extern bool scrRandom(void); // randomise the random number seed -extern BOOL scrRandomiseSeed(void); +extern bool scrRandomiseSeed(void); //explicitly enables a research topic -extern BOOL scrEnableResearch(void); +extern bool scrEnableResearch(void); //acts as if the research topic was completed - used to jump into the tree -extern BOOL scrCompleteResearch(void); +extern bool scrCompleteResearch(void); // start a reticule button flashing -extern BOOL scrFlashOn(void); +extern bool scrFlashOn(void); // stop a reticule button flashing -extern BOOL scrFlashOff(void); +extern bool scrFlashOff(void); //set the initial power level settings for a player -extern BOOL scrSetPowerLevel(void); +extern bool scrSetPowerLevel(void); //add some power for a player -extern BOOL scrAddPower(void); +extern bool scrAddPower(void); //set the landing Zone position for the map -extern BOOL scrSetLandingZone(void); +extern bool scrSetLandingZone(void); /*set the landing Zone position for the Limbo droids*/ -extern BOOL scrSetLimboLanding(void); +extern bool scrSetLimboLanding(void); //initialises all the no go areas -extern BOOL scrInitAllNoGoAreas(void); +extern bool scrInitAllNoGoAreas(void); //set a no go area for the map - landing zones for the enemy, or player 0 -extern BOOL scrSetNoGoArea(void); +extern bool scrSetNoGoArea(void); // set the zoom level for the radar -extern BOOL scrSetRadarZoom(void); +extern bool scrSetRadarZoom(void); //set the time delay for reinforcements for an offworld mission -extern BOOL scrSetReinforcementTime(void); +extern bool scrSetReinforcementTime(void); //set how long an offworld mission can last -1 = no limit -extern BOOL scrSetMissionTime(void); +extern bool scrSetMissionTime(void); // this returns how long is left for the current mission time is 1/100th sec - same units as passed in -extern BOOL scrMissionTimeRemaining(void); +extern bool scrMissionTimeRemaining(void); // clear all the console messages -extern BOOL scrFlushConsoleMessages(void); +extern bool scrFlushConsoleMessages(void); // find and manipulate a position to build a structure. -extern BOOL scrPickStructLocation(void); -extern BOOL scrPickStructLocationB(void); -extern BOOL scrPickStructLocationC(void); +extern bool scrPickStructLocation(void); +extern bool scrPickStructLocationB(void); +extern bool scrPickStructLocationC(void); // establish the distance between two points in world coordinates - approximate bounded to 11% out -extern BOOL scrDistanceTwoPts( void ); +extern bool scrDistanceTwoPts( void ); // decides if a base object can see another - you can select whether walls matter to line of sight -extern BOOL scrLOSTwoBaseObjects( void ); +extern bool scrLOSTwoBaseObjects( void ); // destroys all structures of a certain type within a certain area and gives a gfx effect if you want it -extern BOOL scrDestroyStructuresInArea( void ); +extern bool scrDestroyStructuresInArea( void ); // Estimates a threat from droids within a certain area -extern BOOL scrThreatInArea( void ); +extern bool scrThreatInArea( void ); // gets the nearest gateway to a list of points -extern BOOL scrGetNearestGateway( void ); +extern bool scrGetNearestGateway( void ); // Lets the user specify which tile goes under water. -extern BOOL scrSetWaterTile(void); +extern bool scrSetWaterTile(void); // lets the user specify which tile is used for rubble on skyscraper destruction -extern BOOL scrSetRubbleTile(void); +extern bool scrSetRubbleTile(void); // Tells the game what campaign it's in -extern BOOL scrSetCampaignNumber(void); +extern bool scrSetCampaignNumber(void); // tests whether a structure has a module. If structure is null, then any structure -extern BOOL scrTestStructureModule(void); +extern bool scrTestStructureModule(void); // give a player a template from another player -extern BOOL scrAddTemplate(void); +extern bool scrAddTemplate(void); // Sets the transporter entry and exit points for the map -extern BOOL scrSetTransporterExit(void); +extern bool scrSetTransporterExit(void); // Fly transporters in at start of map -extern BOOL scrFlyTransporterIn(void); +extern bool scrFlyTransporterIn(void); // Add droid to transporter -extern BOOL scrAddDroidToTransporter(void); +extern bool scrAddDroidToTransporter(void); -extern BOOL scrDestroyUnitsInArea( void ); +extern bool scrDestroyUnitsInArea( void ); // Removes a droid from thr world without all the graphical hoo ha. -extern BOOL scrRemoveDroid( void ); +extern bool scrRemoveDroid( void ); // Sets an object to be a certain percent damaged -extern BOOL scrForceDamage( void ); +extern bool scrForceDamage( void ); -extern BOOL scrGetGameStatus(void); +extern bool scrGetGameStatus(void); enum GAMESTATUS { @@ -480,212 +480,212 @@ enum GAMESTATUS }; //get the colour number used by a player -extern BOOL scrGetPlayerColour(void); -extern BOOL scrGetPlayerColourName(void); +extern bool scrGetPlayerColour(void); +extern bool scrGetPlayerColourName(void); //set the colour number to use for a player -extern BOOL scrSetPlayerColour(void); +extern bool scrSetPlayerColour(void); //set all droids in an area to belong to a different player -extern BOOL scrTakeOverDroidsInArea(void); +extern bool scrTakeOverDroidsInArea(void); /*this takes over a single droid and passes a pointer back to the new one*/ -extern BOOL scrTakeOverSingleDroid(void); +extern bool scrTakeOverSingleDroid(void); // set all droids in an area of a certain experience level or less to belong to // a different player - returns the number of droids changed -extern BOOL scrTakeOverDroidsInAreaExp(void); +extern bool scrTakeOverDroidsInAreaExp(void); /*this takes over a single structure and passes a pointer back to the new one*/ -extern BOOL scrTakeOverSingleStructure(void); +extern bool scrTakeOverSingleStructure(void); //set all structures in an area to belong to a different player - returns the number of droids changed //will not work on factories for the selectedPlayer -extern BOOL scrTakeOverStructsInArea(void); +extern bool scrTakeOverStructsInArea(void); //set Flag for defining what happens to the droids in a Transporter -extern BOOL scrSetDroidsToSafetyFlag(void); +extern bool scrSetDroidsToSafetyFlag(void); //set Flag for defining whether the coded countDown is called -extern BOOL scrSetPlayCountDown(void); +extern bool scrSetPlayCountDown(void); //get the number of droids currently onthe map for a player -extern BOOL scrGetDroidCount(void); +extern bool scrGetDroidCount(void); // fire a weapon stat at an object -extern BOOL scrFireWeaponAtObj(void); +extern bool scrFireWeaponAtObj(void); // fire a weapon stat at a location -extern BOOL scrFireWeaponAtLoc(void); +extern bool scrFireWeaponAtLoc(void); -extern BOOL scrClearConsole(void); +extern bool scrClearConsole(void); // set the number of kills for a droid -extern BOOL scrSetDroidKills(void); +extern bool scrSetDroidKills(void); // get the number of kills for a droid -extern BOOL scrGetDroidKills(void); +extern bool scrGetDroidKills(void); // reset the visibility for a player -extern BOOL scrResetPlayerVisibility(void); +extern bool scrResetPlayerVisibility(void); // set the vtol return pos for a player -extern BOOL scrSetVTOLReturnPos(void); +extern bool scrSetVTOLReturnPos(void); // skirmish function **NOT PSX** -extern BOOL scrIsVtol(void); +extern bool scrIsVtol(void); // init templates for tutorial. -extern BOOL scrTutorialTemplates(void); +extern bool scrTutorialTemplates(void); //called via the script in a Limbo Expand level to set the level to plain ol' expand -extern BOOL scrResetLimboMission(void); +extern bool scrResetLimboMission(void); // skirmish lassat fire. -extern BOOL scrSkFireLassat(void); +extern bool scrSkFireLassat(void); //----------------------------------------- //New functions //----------------------------------------- -extern BOOL scrStrcmp(void); -extern BOOL scrConsole(void); -extern BOOL scrDbgMsgOn(void); -extern BOOL scrDbg(void); -extern BOOL scrMsg(void); -extern BOOL scrDebugFile(void); +extern bool scrStrcmp(void); +extern bool scrConsole(void); +extern bool scrDbgMsgOn(void); +extern bool scrDbg(void); +extern bool scrMsg(void); +extern bool scrDebugFile(void); -extern BOOL scrActionDroidObj(void); -extern BOOL scrInitEnumDroids(void); -extern BOOL scrEnumDroid(void); -extern BOOL scrInitIterateGroupB(void); -extern BOOL scrIterateGroupB(void); -extern BOOL scrFactoryGetTemplate(void); -extern BOOL scrNumTemplatesInProduction(void); -extern BOOL scrNumDroidsByComponent(void); -extern BOOL scrGetStructureLimit(void); -extern BOOL scrStructureLimitReached(void); -extern BOOL scrGetNumStructures(void); -extern BOOL scrGetUnitLimit(void); -extern BOOL scrMin(void); -extern BOOL scrMax(void); -extern BOOL scrFMin(void); -extern BOOL scrFMax(void); -extern BOOL scrFogTileInRange(void); -extern BOOL scrMapRevealedInRange(void); -extern BOOL scrMapTileVisible(void); -extern BOOL scrPursueResearch(void); -extern BOOL scrNumResearchLeft(void); -extern BOOL scrResearchCompleted(void); -extern BOOL scrResearchStarted(void); -extern BOOL scrThreatInRange(void); -extern BOOL scrNumEnemyWeapObjInRange(void); -extern BOOL scrNumEnemyWeapDroidsInRange(void); -extern BOOL scrNumEnemyWeapStructsInRange(void); -extern BOOL scrNumFriendlyWeapObjInRange(void); -extern BOOL scrNumFriendlyWeapDroidsInRange(void); -extern BOOL scrNumFriendlyWeapStructsInRange(void); -extern BOOL scrNumPlayerWeapDroidsInRange(void); -extern BOOL scrNumPlayerWeapStructsInRange(void); -extern BOOL scrNumPlayerWeapObjInRange(void); -extern BOOL scrNumEnemyObjInRange(void); -extern BOOL scrEnemyWeapObjCostInRange(void); -extern BOOL scrFriendlyWeapObjCostInRange(void); -extern BOOL scrNumStructsByStatInRange(void); -extern BOOL scrNumStructsByStatInArea(void); -extern BOOL scrNumStructsByTypeInRange(void); -extern BOOL scrNumFeatByTypeInRange(void); -extern BOOL scrNumStructsButNotWallsInRangeVis(void); -extern BOOL scrGetStructureVis(void); -extern BOOL scrChooseValidLoc(void); -extern BOOL scrGetClosestEnemy(void); -extern BOOL scrTransporterCapacity(void); -extern BOOL scrTransporterFlying(void); -extern BOOL scrUnloadTransporter(void); -extern BOOL scrHasGroup(void); -extern BOOL scrObjWeaponMaxRange(void); -extern BOOL scrObjHasWeapon(void); -extern BOOL scrObjectHasIndirectWeapon(void); -extern BOOL scrGetClosestEnemyDroidByType(void); -extern BOOL scrGetClosestEnemyStructByType(void); -extern BOOL scrSkDefenseLocationB(void); -extern BOOL scrCirclePerimPoint(void); +extern bool scrActionDroidObj(void); +extern bool scrInitEnumDroids(void); +extern bool scrEnumDroid(void); +extern bool scrInitIterateGroupB(void); +extern bool scrIterateGroupB(void); +extern bool scrFactoryGetTemplate(void); +extern bool scrNumTemplatesInProduction(void); +extern bool scrNumDroidsByComponent(void); +extern bool scrGetStructureLimit(void); +extern bool scrStructureLimitReached(void); +extern bool scrGetNumStructures(void); +extern bool scrGetUnitLimit(void); +extern bool scrMin(void); +extern bool scrMax(void); +extern bool scrFMin(void); +extern bool scrFMax(void); +extern bool scrFogTileInRange(void); +extern bool scrMapRevealedInRange(void); +extern bool scrMapTileVisible(void); +extern bool scrPursueResearch(void); +extern bool scrNumResearchLeft(void); +extern bool scrResearchCompleted(void); +extern bool scrResearchStarted(void); +extern bool scrThreatInRange(void); +extern bool scrNumEnemyWeapObjInRange(void); +extern bool scrNumEnemyWeapDroidsInRange(void); +extern bool scrNumEnemyWeapStructsInRange(void); +extern bool scrNumFriendlyWeapObjInRange(void); +extern bool scrNumFriendlyWeapDroidsInRange(void); +extern bool scrNumFriendlyWeapStructsInRange(void); +extern bool scrNumPlayerWeapDroidsInRange(void); +extern bool scrNumPlayerWeapStructsInRange(void); +extern bool scrNumPlayerWeapObjInRange(void); +extern bool scrNumEnemyObjInRange(void); +extern bool scrEnemyWeapObjCostInRange(void); +extern bool scrFriendlyWeapObjCostInRange(void); +extern bool scrNumStructsByStatInRange(void); +extern bool scrNumStructsByStatInArea(void); +extern bool scrNumStructsByTypeInRange(void); +extern bool scrNumFeatByTypeInRange(void); +extern bool scrNumStructsButNotWallsInRangeVis(void); +extern bool scrGetStructureVis(void); +extern bool scrChooseValidLoc(void); +extern bool scrGetClosestEnemy(void); +extern bool scrTransporterCapacity(void); +extern bool scrTransporterFlying(void); +extern bool scrUnloadTransporter(void); +extern bool scrHasGroup(void); +extern bool scrObjWeaponMaxRange(void); +extern bool scrObjHasWeapon(void); +extern bool scrObjectHasIndirectWeapon(void); +extern bool scrGetClosestEnemyDroidByType(void); +extern bool scrGetClosestEnemyStructByType(void); +extern bool scrSkDefenseLocationB(void); +extern bool scrCirclePerimPoint(void); -extern BOOL scrGiftRadar(void); -extern BOOL scrNumAllies(void); -extern BOOL scrNumAAinRange(void); -extern BOOL scrSelectDroid(void); -extern BOOL scrSelectGroup(void); -extern BOOL scrModulo(void); -extern BOOL scrPlayerLoaded(void); -extern BOOL scrRemoveBeacon(void); -extern BOOL scrDropBeacon(void); -extern BOOL scrClosestDamagedGroupDroid(void); -extern BOOL scrMsgBox(void); -extern BOOL scrGetStructureType(void); -extern BOOL scrGetPlayerName(void); -extern BOOL scrSetPlayerName(void); -extern BOOL scrStructInRangeVis(void); -extern BOOL scrDroidInRangeVis(void); +extern bool scrGiftRadar(void); +extern bool scrNumAllies(void); +extern bool scrNumAAinRange(void); +extern bool scrSelectDroid(void); +extern bool scrSelectGroup(void); +extern bool scrModulo(void); +extern bool scrPlayerLoaded(void); +extern bool scrRemoveBeacon(void); +extern bool scrDropBeacon(void); +extern bool scrClosestDamagedGroupDroid(void); +extern bool scrMsgBox(void); +extern bool scrGetStructureType(void); +extern bool scrGetPlayerName(void); +extern bool scrSetPlayerName(void); +extern bool scrStructInRangeVis(void); +extern bool scrDroidInRangeVis(void); -extern BOOL scrGetBit(void); -extern BOOL scrSetBit(void); -extern BOOL scrAlliancesLocked(void); -extern BOOL scrASSERT(void); -extern BOOL scrShowRangeAtPos(void); -extern BOOL scrToPow(void); -extern BOOL scrDebugMenu(void); -extern BOOL scrSetDebugMenuEntry(void); -extern BOOL scrProcessChatMsg(void); -extern BOOL scrGetChatCmdDescription(void); -extern BOOL scrGetNumArgsInCmd(void); -extern BOOL scrGetChatCmdParam(void); -extern BOOL scrChatCmdIsPlayerAddressed(void); -extern BOOL scrSetTileHeight(void); -extern BOOL scrGetTileStructure(void); -extern BOOL scrPrintCallStack(void); -extern BOOL scrDebugModeEnabled(void); -extern BOOL scrCalcDroidPower(void); -extern BOOL scrGetDroidLevel(void); -extern BOOL scrMoveDroidStopped(void); -extern BOOL scrUpdateVisibleTiles(void); -extern BOOL scrCheckVisibleTile(void); -extern BOOL scrAssembleWeaponTemplate(void); -extern BOOL scrWeaponShortHitUpgrade(void); -extern BOOL scrWeaponLongHitUpgrade(void); -extern BOOL scrWeaponDamageUpgrade(void); -extern BOOL scrWeaponFirePauseUpgrade(void); -extern BOOL scrIsComponentAvailable(void); -extern BOOL scrGetBodySize(void); -extern BOOL scrGettext(void); -extern BOOL scrGettext_noop(void); -extern BOOL scrPgettext(void); -extern BOOL scrPgettext_expr(void); -extern BOOL scrPgettext_noop(void); +extern bool scrGetBit(void); +extern bool scrSetBit(void); +extern bool scrAlliancesLocked(void); +extern bool scrASSERT(void); +extern bool scrShowRangeAtPos(void); +extern bool scrToPow(void); +extern bool scrDebugMenu(void); +extern bool scrSetDebugMenuEntry(void); +extern bool scrProcessChatMsg(void); +extern bool scrGetChatCmdDescription(void); +extern bool scrGetNumArgsInCmd(void); +extern bool scrGetChatCmdParam(void); +extern bool scrChatCmdIsPlayerAddressed(void); +extern bool scrSetTileHeight(void); +extern bool scrGetTileStructure(void); +extern bool scrPrintCallStack(void); +extern bool scrDebugModeEnabled(void); +extern bool scrCalcDroidPower(void); +extern bool scrGetDroidLevel(void); +extern bool scrMoveDroidStopped(void); +extern bool scrUpdateVisibleTiles(void); +extern bool scrCheckVisibleTile(void); +extern bool scrAssembleWeaponTemplate(void); +extern bool scrWeaponShortHitUpgrade(void); +extern bool scrWeaponLongHitUpgrade(void); +extern bool scrWeaponDamageUpgrade(void); +extern bool scrWeaponFirePauseUpgrade(void); +extern bool scrIsComponentAvailable(void); +extern bool scrGetBodySize(void); +extern bool scrGettext(void); +extern bool scrGettext_noop(void); +extern bool scrPgettext(void); +extern bool scrPgettext_expr(void); +extern bool scrPgettext_noop(void); -extern BOOL beingResearchedByAlly(SDWORD resIndex, SDWORD player); -extern BOOL ThreatInRange(SDWORD player, SDWORD range, SDWORD rangeX, SDWORD rangeY, BOOL bVTOLs); -extern BOOL skTopicAvail(UWORD inc, UDWORD player); -extern UDWORD numPlayerWeapDroidsInRange(SDWORD player, SDWORD lookingPlayer, SDWORD range, SDWORD rangeX, SDWORD rangeY, BOOL bVTOLs); -extern UDWORD numPlayerWeapStructsInRange(SDWORD player, SDWORD lookingPlayer, SDWORD range, SDWORD rangeX, SDWORD rangeY, BOOL bFinished); -extern UDWORD playerWeapDroidsCostInRange(SDWORD player, SDWORD lookingPlayer, SDWORD range, SDWORD rangeX, SDWORD rangeY, BOOL bVTOLs); -extern UDWORD playerWeapStructsCostInRange(SDWORD player, SDWORD lookingPlayer, SDWORD range, SDWORD rangeX, SDWORD rangeY, BOOL bFinished); -extern UDWORD numEnemyObjInRange(SDWORD player, SDWORD range, SDWORD rangeX, SDWORD rangeY, BOOL bVTOLs, BOOL bFinished); -extern BOOL addBeaconBlip(SDWORD x, SDWORD y, SDWORD forPlayer, SDWORD sender, char * textMsg); -extern BOOL sendBeaconToPlayer(SDWORD locX, SDWORD locY, SDWORD forPlayer, SDWORD sender, char * beaconMsg); +extern bool beingResearchedByAlly(SDWORD resIndex, SDWORD player); +extern bool ThreatInRange(SDWORD player, SDWORD range, SDWORD rangeX, SDWORD rangeY, bool bVTOLs); +extern bool skTopicAvail(UWORD inc, UDWORD player); +extern UDWORD numPlayerWeapDroidsInRange(SDWORD player, SDWORD lookingPlayer, SDWORD range, SDWORD rangeX, SDWORD rangeY, bool bVTOLs); +extern UDWORD numPlayerWeapStructsInRange(SDWORD player, SDWORD lookingPlayer, SDWORD range, SDWORD rangeX, SDWORD rangeY, bool bFinished); +extern UDWORD playerWeapDroidsCostInRange(SDWORD player, SDWORD lookingPlayer, SDWORD range, SDWORD rangeX, SDWORD rangeY, bool bVTOLs); +extern UDWORD playerWeapStructsCostInRange(SDWORD player, SDWORD lookingPlayer, SDWORD range, SDWORD rangeX, SDWORD rangeY, bool bFinished); +extern UDWORD numEnemyObjInRange(SDWORD player, SDWORD range, SDWORD rangeX, SDWORD rangeY, bool bVTOLs, bool bFinished); +extern bool addBeaconBlip(SDWORD x, SDWORD y, SDWORD forPlayer, SDWORD sender, char * textMsg); +extern bool sendBeaconToPlayer(SDWORD locX, SDWORD locY, SDWORD forPlayer, SDWORD sender, char * beaconMsg); extern MESSAGE * findBeaconMsg(UDWORD player, SDWORD sender); extern SDWORD getNumRepairedBy(struct DROID *psDroidToCheck, SDWORD player); -extern BOOL objectInRangeVis(struct BASE_OBJECT *psList, SDWORD x, SDWORD y, SDWORD range, SDWORD lookingPlayer); +extern bool objectInRangeVis(struct BASE_OBJECT *psList, SDWORD x, SDWORD y, SDWORD range, SDWORD lookingPlayer); extern SDWORD getPlayerFromString(char *playerName); -extern BOOL scrExp(void); -extern BOOL scrSqrt(void); -extern BOOL scrLog(void); +extern bool scrExp(void); +extern bool scrSqrt(void); +extern bool scrLog(void); -extern BOOL addBeaconBlip(SDWORD locX, SDWORD locY, SDWORD forPlayer, SDWORD sender, char * textMsg); +extern bool addBeaconBlip(SDWORD locX, SDWORD locY, SDWORD forPlayer, SDWORD sender, char * textMsg); extern VIEWDATA *CreateBeaconViewData(SDWORD sender, UDWORD LocX, UDWORD LocY); -extern BOOL scrEnumUnbuilt(void); -extern BOOL scrIterateUnbuilt(void); +extern bool scrEnumUnbuilt(void); +extern bool scrIterateUnbuilt(void); #endif // __INCLUDED_SRC_SCRIPTFUNCS_H__ diff --git a/src/scriptobj.cpp b/src/scriptobj.cpp index 01abc540d..ea39ef11b 100644 --- a/src/scriptobj.cpp +++ b/src/scriptobj.cpp @@ -55,7 +55,7 @@ static const int UNALLOCATED_OBJECT = -1; static INTERP_VAL scrFunctionResult; //function return value to be pushed to stack // Get values from a base object -BOOL scrBaseObjGet(UDWORD index) +bool scrBaseObjGet(UDWORD index) { INTERP_TYPE type = VAL_VOID; BASE_OBJECT *psObj; @@ -377,7 +377,7 @@ BOOL scrBaseObjGet(UDWORD index) // convert a base object to a droid if it is the right type -BOOL scrObjToDroid(void) +bool scrObjToDroid(void) { BASE_OBJECT *psObj; @@ -404,7 +404,7 @@ BOOL scrObjToDroid(void) // convert a base object to a structure if it is the right type -BOOL scrObjToStructure(void) +bool scrObjToStructure(void) { BASE_OBJECT *psObj; @@ -430,7 +430,7 @@ BOOL scrObjToStructure(void) // convert a base object to a feature if it is the right type -BOOL scrObjToFeature(void) +bool scrObjToFeature(void) { BASE_OBJECT *psObj; @@ -460,7 +460,7 @@ BOOL scrObjToFeature(void) static SDWORD lgX,lgY, lgMembers, lgHealth; // Get values from a weapon -BOOL scrWeaponObjGet(UDWORD index) +bool scrWeaponObjGet(UDWORD index) { INTERP_TYPE type; SDWORD weapIndex; @@ -543,7 +543,7 @@ BOOL scrWeaponObjGet(UDWORD index) } // Get values from a group -BOOL scrGroupObjGet(UDWORD index) +bool scrGroupObjGet(UDWORD index) { INTERP_TYPE type; DROID_GROUP *psGroup; @@ -725,7 +725,7 @@ static char *scrGetStatName(INTERP_TYPE type, UDWORD data) // default value save routine //TODO: use union -BOOL scrValDefSave(INTERP_VAL *psVal, char *pBuffer, UDWORD *pSize) +bool scrValDefSave(INTERP_VAL *psVal, char *pBuffer, UDWORD *pSize) { VIEWDATA *psIntMessage; const char *pName; @@ -970,7 +970,7 @@ BOOL scrValDefSave(INTERP_VAL *psVal, char *pBuffer, UDWORD *pSize) } /// default value load routine -BOOL scrValDefLoad(SDWORD version, INTERP_VAL *psVal, char *pBuffer, UDWORD size) +bool scrValDefLoad(SDWORD version, INTERP_VAL *psVal, char *pBuffer, UDWORD size) { char *pPos; DROID *psCDroid; @@ -979,7 +979,7 @@ BOOL scrValDefLoad(SDWORD version, INTERP_VAL *psVal, char *pBuffer, UDWORD size LEVEL_DATASET *psLevel; DROID_GROUP *psGroup = NULL; const char *pName; - BOOL bObjectDefined; + bool bObjectDefined; switch ((unsigned)psVal->type) // Unsigned cast to suppress compiler warnings due to enum abuse. { diff --git a/src/scriptobj.h b/src/scriptobj.h index 069add5e5..398abd410 100644 --- a/src/scriptobj.h +++ b/src/scriptobj.h @@ -75,30 +75,30 @@ enum _groupids }; // Get values from a base object -extern BOOL scrBaseObjGet(UDWORD index); +extern bool scrBaseObjGet(UDWORD index); // Set values from a base object -extern BOOL scrBaseObjSet(UDWORD index); +extern bool scrBaseObjSet(UDWORD index); // convert a base object to a droid if it is the right type -extern BOOL scrObjToDroid(void); +extern bool scrObjToDroid(void); // convert a base object to a structure if it is the right type -extern BOOL scrObjToStructure(void); +extern bool scrObjToStructure(void); // convert a base object to a feature if it is the right type -extern BOOL scrObjToFeature(void); +extern bool scrObjToFeature(void); // Get values from a group -extern BOOL scrGroupObjGet(UDWORD index); +extern bool scrGroupObjGet(UDWORD index); // Get values from a weapon -extern BOOL scrWeaponObjGet(UDWORD index); +extern bool scrWeaponObjGet(UDWORD index); // default value save routine -extern BOOL scrValDefSave(INTERP_VAL *psVal, char *pBuffer, UDWORD *pSize); +extern bool scrValDefSave(INTERP_VAL *psVal, char *pBuffer, UDWORD *pSize); // default value load routine -extern BOOL scrValDefLoad(SDWORD version, INTERP_VAL *psVal, char *pBuffer, UDWORD size); +extern bool scrValDefLoad(SDWORD version, INTERP_VAL *psVal, char *pBuffer, UDWORD size); #endif // __INCLUDED_SRC_SCRIPTOBJ_H__ diff --git a/src/scripttabs.cpp b/src/scripttabs.cpp index cb5576880..76e49f532 100644 --- a/src/scripttabs.cpp +++ b/src/scripttabs.cpp @@ -2258,7 +2258,7 @@ TYPE_EQUIV asEquivTable[] = // Initialise the script system -BOOL scrTabInitialise(void) +bool scrTabInitialise(void) { unsigned int i; diff --git a/src/scripttabs.h b/src/scripttabs.h index 18deeebf8..b1fe633e7 100644 --- a/src/scripttabs.h +++ b/src/scripttabs.h @@ -113,7 +113,7 @@ extern VAR_SYMBOL asObjTable[]; extern CONST_SYMBOL asConstantTable[]; // Initialise the script system -extern BOOL scrTabInitialise(void); +extern bool scrTabInitialise(void); // Shut down the script system extern void scrShutDown(void); diff --git a/src/scriptvals.cpp b/src/scriptvals.cpp index 48e94276b..a76bc35dc 100644 --- a/src/scriptvals.cpp +++ b/src/scriptvals.cpp @@ -53,7 +53,7 @@ static SCRV_STORE *psContextStore=NULL; static std::listbasePointers; // Initialise the script value module -BOOL scrvInitialise(void) +bool scrvInitialise(void) { psContextStore = NULL; return true; @@ -91,7 +91,7 @@ void scrvReset(void) } // Add a new context to the list -BOOL scrvAddContext(char *pID, SCRIPT_CONTEXT *psContext, SCRV_TYPE type) +bool scrvAddContext(char *pID, SCRIPT_CONTEXT *psContext, SCRV_TYPE type) { SCRV_STORE *psNew; @@ -120,7 +120,7 @@ BOOL scrvAddContext(char *pID, SCRIPT_CONTEXT *psContext, SCRV_TYPE type) } // Add a new base pointer variable -BOOL scrvAddBasePointer(INTERP_VAL *psVal) +bool scrvAddBasePointer(INTERP_VAL *psVal) { basePointers.push_back(psVal); return true; @@ -150,7 +150,7 @@ void scrvUpdateBasePointers(void) } // create a group structure for a ST_GROUP variable -BOOL scrvNewGroup(INTERP_VAL *psVal) +bool scrvNewGroup(INTERP_VAL *psVal) { DROID_GROUP *psGroup; @@ -183,7 +183,7 @@ void scrvReleaseGroup(INTERP_VAL *psVal) } // Get a context from the list -BOOL scrvGetContext(char *pID, SCRIPT_CONTEXT **ppsContext) +bool scrvGetContext(char *pID, SCRIPT_CONTEXT **ppsContext) { SCRV_STORE *psCurr; diff --git a/src/scriptvals.h b/src/scriptvals.h index b4d56c649..94586a25b 100644 --- a/src/scriptvals.h +++ b/src/scriptvals.h @@ -59,13 +59,13 @@ struct ARRAY_INDEXES extern void scrv_error(const char* fmt, ...) WZ_DECL_FORMAT(printf, 1, 2); // Lookup a type -extern BOOL scrvLookUpType(const char *pIdent, INTERP_TYPE *pType); +extern bool scrvLookUpType(const char *pIdent, INTERP_TYPE *pType); // Lookup a variable identifier -extern BOOL scrvLookUpVar(const char *pIdent, UDWORD *pIndex); +extern bool scrvLookUpVar(const char *pIdent, UDWORD *pIndex); // Lookup an array identifier -extern BOOL scrvLookUpArray(const char *pIdent, UDWORD *pIndex); +extern bool scrvLookUpArray(const char *pIdent, UDWORD *pIndex); // Whether the script is run immediately or stored for later use enum SCRV_TYPE @@ -75,13 +75,13 @@ enum SCRV_TYPE }; // Add a new context to the list -extern BOOL scrvAddContext(char *pID, SCRIPT_CONTEXT *psContext, SCRV_TYPE type); +extern bool scrvAddContext(char *pID, SCRIPT_CONTEXT *psContext, SCRV_TYPE type); // Get a context from the list -extern BOOL scrvGetContext(char *pID, SCRIPT_CONTEXT **ppsContext); +extern bool scrvGetContext(char *pID, SCRIPT_CONTEXT **ppsContext); // Add a new base pointer variable -extern BOOL scrvAddBasePointer(INTERP_VAL *psVal); +extern bool scrvAddBasePointer(INTERP_VAL *psVal); // Check all the base pointers to see if they have died extern void scrvUpdateBasePointers(void); @@ -90,13 +90,13 @@ extern void scrvUpdateBasePointers(void); extern void scrvReleaseBasePointer(INTERP_VAL *psVal); // create a group structure for a ST_GROUP variable -extern BOOL scrvNewGroup(INTERP_VAL *psVal); +extern bool scrvNewGroup(INTERP_VAL *psVal); // release a ST_GROUP variable extern void scrvReleaseGroup(INTERP_VAL *psVal); // Initialise the script value module -extern BOOL scrvInitialise(void); +extern bool scrvInitialise(void); // Shut down the script value module extern void scrvShutDown(void); @@ -105,9 +105,9 @@ extern void scrvShutDown(void); extern void scrvReset(void); // Load a script value file -extern BOOL scrvLoad(PHYSFS_file* fileHandle); +extern bool scrvLoad(PHYSFS_file* fileHandle); // Link any object types to the actual pointer values -//extern BOOL scrvLinkValues(void); +//extern bool scrvLinkValues(void); #endif // __INCLUDED_SRC_SCRIPTVALS_H__ diff --git a/src/scriptvals_lexer.l b/src/scriptvals_lexer.l index 43696b040..4c954c9e3 100644 --- a/src/scriptvals_lexer.l +++ b/src/scriptvals_lexer.l @@ -106,7 +106,7 @@ extern void scrv_set_extra(YY_EXTRA_TYPE user_defined); int { yylval->tval = VAL_INT; return TYPE; } INT { yylval->tval = VAL_INT; return TYPE; } bool { yylval->tval = VAL_BOOL; return TYPE; } -BOOL { yylval->tval = VAL_BOOL; return TYPE; } +bool { yylval->tval = VAL_BOOL; return TYPE; } script return SCRIPT; store return STORE; run return RUN; diff --git a/src/scriptvals_parser.y b/src/scriptvals_parser.y index 187291303..780d9c451 100644 --- a/src/scriptvals_parser.y +++ b/src/scriptvals_parser.y @@ -60,7 +60,7 @@ static SCRIPT_CONTEXT *psCurrContext; static ARRAY_INDEXES sCurrArrayIndexes; // check that an array index is valid -static BOOL scrvCheckArrayIndex(SDWORD base, ARRAY_INDEXES *psIndexes, UDWORD *pIndex) +static bool scrvCheckArrayIndex(SDWORD base, ARRAY_INDEXES *psIndexes, UDWORD *pIndex) { SDWORD i, size; @@ -111,7 +111,7 @@ static BOOL scrvCheckArrayIndex(SDWORD base, ARRAY_INDEXES *psIndexes, UDWORD *p %error-verbose %union { - BOOL bval; + bool bval; INTERP_TYPE tval; char *sval; UDWORD vindex; @@ -781,7 +781,7 @@ var_value: BOOLEAN_T %% // Lookup a type -BOOL scrvLookUpType(const char *pIdent, INTERP_TYPE *pType) +bool scrvLookUpType(const char *pIdent, INTERP_TYPE *pType) { TYPE_SYMBOL *psCurr; @@ -799,7 +799,7 @@ BOOL scrvLookUpType(const char *pIdent, INTERP_TYPE *pType) // Lookup a variable identifier -BOOL scrvLookUpVar(const char *pIdent, UDWORD *pIndex) +bool scrvLookUpVar(const char *pIdent, UDWORD *pIndex) { UDWORD i; @@ -823,7 +823,7 @@ BOOL scrvLookUpVar(const char *pIdent, UDWORD *pIndex) // Lookup an array identifier -BOOL scrvLookUpArray(const char *pIdent, UDWORD *pIndex) +bool scrvLookUpArray(const char *pIdent, UDWORD *pIndex) { UDWORD i; @@ -847,7 +847,7 @@ BOOL scrvLookUpArray(const char *pIdent, UDWORD *pIndex) // Load a script value file -BOOL scrvLoad(PHYSFS_file* fileHandle) +bool scrvLoad(PHYSFS_file* fileHandle) { bool retval; lexerinput_t input; diff --git a/src/selection.cpp b/src/selection.cpp index ad764a2b5..8f7936bb0 100644 --- a/src/selection.cpp +++ b/src/selection.cpp @@ -45,13 +45,13 @@ // --------------------------------------------------------------------- // STATIC SUPPORT FUNCTIONS -UDWORD selSelectAllUnits ( UDWORD player, BOOL bOnScreen ); +UDWORD selSelectAllUnits ( UDWORD player, bool bOnScreen ); UDWORD selSelectAllSameProp ( UDWORD player, PROPULSION_TYPE propType, - BOOL bOnScreen ); -UDWORD selSelectAllCombat ( UDWORD player, BOOL bOnScreen); -UDWORD selSelectAllDamaged ( UDWORD player, BOOL bOnScreen); -UDWORD selSelectAllSame ( UDWORD player, BOOL bOnScreen); -UDWORD selNameSelect ( char *droidName, UDWORD player, BOOL bOnScreen ); + bool bOnScreen ); +UDWORD selSelectAllCombat ( UDWORD player, bool bOnScreen); +UDWORD selSelectAllDamaged ( UDWORD player, bool bOnScreen); +UDWORD selSelectAllSame ( UDWORD player, bool bOnScreen); +UDWORD selNameSelect ( char *droidName, UDWORD player, bool bOnScreen ); // --------------------------------------------------------------------- /* Selects the units of a given player according to given criteria. @@ -62,7 +62,7 @@ static DROID *psOldRD = NULL; // pointer to last selected repair unit static DROID *psOldNS = NULL; UDWORD selDroidSelection( UDWORD player, SELECTION_CLASS droidClass, - SELECTIONTYPE droidType, BOOL bOnScreen ) + SELECTIONTYPE droidType, bool bOnScreen ) { UDWORD retVal; char selInfo[255]; @@ -120,7 +120,7 @@ char selInfo[255]; // --------------------------------------------------------------------- // Selects all units owned by the player - onscreen toggle. -UDWORD selSelectAllUnits( UDWORD player, BOOL bOnScreen ) +UDWORD selSelectAllUnits( UDWORD player, bool bOnScreen ) { DROID *psDroid; UDWORD count; @@ -149,7 +149,7 @@ UDWORD count; // Selects all units owned by the player of a certain propulsion type. // On Screen toggle. UDWORD selSelectAllSameProp( UDWORD player, PROPULSION_TYPE propType, - BOOL bOnScreen ) + bool bOnScreen ) { PROPULSION_STATS *psPropStats; DROID *psDroid; @@ -181,7 +181,7 @@ UDWORD count; // --------------------------------------------------------------------- // Selects all units owned by the player that have a weapon. On screen // toggle. -UDWORD selSelectAllCombat( UDWORD player, BOOL bOnScreen) +UDWORD selSelectAllCombat( UDWORD player, bool bOnScreen) { DROID *psDroid; UDWORD count; @@ -210,7 +210,7 @@ UDWORD count; } // --------------------------------------------------------------------- // Selects all damaged units - on screen toggle. -UDWORD selSelectAllDamaged( UDWORD player, BOOL bOnScreen) +UDWORD selSelectAllDamaged( UDWORD player, bool bOnScreen) { DROID *psDroid; UDWORD damage; @@ -280,7 +280,7 @@ DROID *psDroid; // --------------------------------------------------------------------- // Selects all units the same as the one(s) selected -UDWORD selSelectAllSame( UDWORD player, BOOL bOnScreen) +UDWORD selSelectAllSame( UDWORD player, bool bOnScreen) { @@ -302,7 +302,7 @@ UDWORD count; } // --------------------------------------------------------------------- // sub-function - selects all units with same name as one passed in -UDWORD selNameSelect( char *droidName, UDWORD player, BOOL bOnScreen ) +UDWORD selNameSelect( char *droidName, UDWORD player, bool bOnScreen ) { DROID *psDroid; @@ -338,7 +338,7 @@ void selNextSpecifiedUnit(UDWORD unitType) DROID *psCurr; DROID *psResult; DROID *psFirst; -BOOL bLaterInList, bMatch; +bool bLaterInList, bMatch; for(psCurr = apsDroidLists[selectedPlayer],psFirst = NULL,psResult = NULL,bLaterInList = false; psCurr && !psResult; psCurr = psCurr->psNext) @@ -450,7 +450,7 @@ void selNextUnassignedUnit( void ) DROID *psCurr; DROID *psResult; DROID *psFirst; -BOOL bLaterInList; +bool bLaterInList; for(psCurr = apsDroidLists[selectedPlayer],psFirst = NULL,psResult = NULL,bLaterInList = false; psCurr && !psResult; psCurr = psCurr->psNext) @@ -527,7 +527,7 @@ STRUCTURE *psCurr; STRUCTURE *psResult; STRUCTURE *psOldStruct; STRUCTURE *psFirst; -BOOL bLaterInList; +bool bLaterInList; /* Firstly, start coughing if the type is invalid */ ASSERT(structType <= NUM_DIFF_BUILDINGS, "Invalid structure type %u in selNextSpecifiedBuilding", structType); @@ -587,7 +587,7 @@ BOOL bLaterInList; // --------------------------------------------------------------------- // see if a commander is the n'th command droid -static BOOL droidIsCommanderNum(DROID *psDroid, SDWORD n) +static bool droidIsCommanderNum(DROID *psDroid, SDWORD n) { DROID *psCurr; SDWORD numLess; diff --git a/src/selection.h b/src/selection.h index 925a4c465..1ef681cc7 100644 --- a/src/selection.h +++ b/src/selection.h @@ -42,7 +42,7 @@ DST_ALL_SAME // EXTERNALLY REFERENCED FUNCTIONS extern UDWORD selDroidSelection( UDWORD player, SELECTION_CLASS droidClass, - SELECTIONTYPE droidType, BOOL bOnScreen ); + SELECTIONTYPE droidType, bool bOnScreen ); extern UDWORD selDroidDeselect ( UDWORD player ); extern UDWORD selNumSelected ( UDWORD player ); extern void selNextRepairUnit ( void ); diff --git a/src/seqdisp.cpp b/src/seqdisp.cpp index 3963a24e0..3c4f945f1 100644 --- a/src/seqdisp.cpp +++ b/src/seqdisp.cpp @@ -74,14 +74,14 @@ struct SEQTEXT UDWORD y; UDWORD startFrame; UDWORD endFrame; - BOOL bSubtitle; + bool bSubtitle; }; struct SEQLIST { const char *pSeq; //name of the sequence to play const char *pAudio; //name of the wav to play - BOOL bSeqLoop; //loop this sequence + bool bSeqLoop; //loop this sequence SDWORD currentText; //cuurent number of text messages for this seq SEQTEXT aText[MAX_TEXT_OVERLAYS]; //text data to display for this sequence }; @@ -91,10 +91,10 @@ struct SEQLIST */ /***************************************************************************/ -static BOOL bAudioPlaying = false; -static BOOL bHoldSeqForAudio = false; -static BOOL bSeqSubtitles = true; -static BOOL bSeqPlaying = false; +static bool bAudioPlaying = false; +static bool bHoldSeqForAudio = false; +static bool bSeqSubtitles = true; +static bool bSeqPlaying = false; static const char aHardPath[] = "sequences/"; static char aVideoName[MAX_STR_LENGTH]; static char* pVideoBuffer = NULL; @@ -103,7 +103,7 @@ static SDWORD frameSkip = 1; static SEQLIST aSeqList[MAX_SEQ_LIST]; static SDWORD currentSeq = -1; static SDWORD currentPlaySeq = -1; -static BOOL g_bResumeInGame = false; +static bool g_bResumeInGame = false; /***************************************************************************/ /* @@ -118,8 +118,8 @@ enum VIDEO_RESOLUTION }; static bool seq_StartFullScreenVideo(const char* videoName, const char* audioName, VIDEO_RESOLUTION resolution); -BOOL seq_SetupVideoBuffers(void); -BOOL seq_ReleaseVideoBuffers(void); +bool seq_SetupVideoBuffers(void); +bool seq_ReleaseVideoBuffers(void); /***************************************************************************/ /* @@ -184,7 +184,7 @@ bool seq_RenderVideoToBuffer(const char* sequenceName, int seqCommand) return true; } -BOOL seq_ReleaseVideoBuffers(void) +bool seq_ReleaseVideoBuffers(void) { free(pVideoBuffer); free(pVideoPalette); @@ -193,7 +193,7 @@ BOOL seq_ReleaseVideoBuffers(void) return true; } -BOOL seq_SetupVideoBuffers(void) +bool seq_SetupVideoBuffers(void) { return true; } @@ -290,10 +290,10 @@ static bool seq_StartFullScreenVideo(const char* videoName, const char* audioNam return true; } -BOOL seq_UpdateFullScreenVideo(int *pbClear) +bool seq_UpdateFullScreenVideo(int *pbClear) { int i; - BOOL bMoreThanOneSequenceLine = false; + bool bMoreThanOneSequenceLine = false; bool stillPlaying; unsigned int subMin = SUBTITLE_BOX_MAX + D_H2; @@ -432,7 +432,7 @@ BOOL seq_UpdateFullScreenVideo(int *pbClear) return true; } -BOOL seq_StopFullScreenVideo(void) +bool seq_StopFullScreenVideo(void) { StopDriverMode(); if (!seq_AnySeqLeft()) @@ -456,7 +456,7 @@ BOOL seq_StopFullScreenVideo(void) } // add a string at x,y or add string below last line if x and y are 0 -BOOL seq_AddTextForVideo(const char* pText, SDWORD xOffset, SDWORD yOffset, SDWORD startFrame, SDWORD endFrame, SEQ_TEXT_POSITIONING textJustification) +bool seq_AddTextForVideo(const char* pText, SDWORD xOffset, SDWORD yOffset, SDWORD startFrame, SDWORD endFrame, SEQ_TEXT_POSITIONING textJustification) { SDWORD sourceLength, currentLength; char* currentText; @@ -559,7 +559,7 @@ BOOL seq_AddTextForVideo(const char* pText, SDWORD xOffset, SDWORD yOffset, SDWO return true; } -BOOL seq_ClearTextForVideo(void) +bool seq_ClearTextForVideo(void) { SDWORD i, j; @@ -579,7 +579,7 @@ BOOL seq_ClearTextForVideo(void) return true; } -static BOOL seq_AddTextFromFile(const char *pTextName, SEQ_TEXT_POSITIONING textJustification) +static bool seq_AddTextFromFile(const char *pTextName, SEQ_TEXT_POSITIONING textJustification) { char aTextName[MAX_STR_LENGTH]; char *pTextBuffer, *pCurrentLine, *pText; @@ -649,7 +649,7 @@ void seq_ClearSeqList(void) } //add a sequence to the list to be played -void seq_AddSeqToList(const char *pSeqName, const char *pAudioName, const char *pTextName, BOOL bLoop) +void seq_AddSeqToList(const char *pSeqName, const char *pAudioName, const char *pTextName, bool bLoop) { currentSeq++; @@ -690,7 +690,7 @@ void seq_AddSeqToList(const char *pSeqName, const char *pAudioName, const char * } /*checks to see if there are any sequences left in the list to play*/ -BOOL seq_AnySeqLeft(void) +bool seq_AnySeqLeft(void) { UBYTE nextSeq; @@ -713,7 +713,7 @@ BOOL seq_AnySeqLeft(void) static void seqDispCDOK( void ) { - BOOL bPlayedOK; + bool bPlayedOK; currentPlaySeq++; if (currentPlaySeq >= MAX_SEQ_LIST) @@ -750,12 +750,12 @@ void seq_StartNextFullScreenVideo(void) return; } -void seq_SetSubtitles(BOOL bNewState) +void seq_SetSubtitles(bool bNewState) { bSeqSubtitles = bNewState; } -BOOL seq_GetSubtitles(void) +bool seq_GetSubtitles(void) { return bSeqSubtitles; } diff --git a/src/seqdisp.h b/src/seqdisp.h index 62f4a73ad..d6a3f44f8 100644 --- a/src/seqdisp.h +++ b/src/seqdisp.h @@ -70,24 +70,24 @@ enum SEQ_TEXT_POSITIONING //buffer render extern bool seq_RenderVideoToBuffer(const char* sequenceName, int seqCommand); -extern BOOL seq_UpdateFullScreenVideo(int *bClear); +extern bool seq_UpdateFullScreenVideo(int *bClear); -extern BOOL seq_StopFullScreenVideo(void); +extern bool seq_StopFullScreenVideo(void); //control -extern BOOL seq_GetVideoSize(SDWORD* pWidth, SDWORD* pHeight); +extern bool seq_GetVideoSize(SDWORD* pWidth, SDWORD* pHeight); //text -extern BOOL seq_AddTextForVideo(const char* pText, SDWORD xOffset, SDWORD yOffset, SDWORD startTime, SDWORD endTime, SEQ_TEXT_POSITIONING textJustification); -extern BOOL seq_ClearTextForVideo(void); +extern bool seq_AddTextForVideo(const char* pText, SDWORD xOffset, SDWORD yOffset, SDWORD startTime, SDWORD endTime, SEQ_TEXT_POSITIONING textJustification); +extern bool seq_ClearTextForVideo(void); //clear the sequence list extern void seq_ClearSeqList(void); //add a sequence to the list to be played -extern void seq_AddSeqToList(const char *pSeqName, const char *pAudioName, const char *pTextName, BOOL bLoop); +extern void seq_AddSeqToList(const char *pSeqName, const char *pAudioName, const char *pTextName, bool bLoop); /*checks to see if there are any sequences left in the list to play*/ -extern BOOL seq_AnySeqLeft(void); +extern bool seq_AnySeqLeft(void); //set and check subtitle mode, true subtitles on -extern void seq_SetSubtitles(BOOL bNewState); -extern BOOL seq_GetSubtitles(void); +extern void seq_SetSubtitles(bool bNewState); +extern bool seq_GetSubtitles(void); /*returns the next sequence in the list to play*/ extern void seq_StartNextFullScreenVideo(void); diff --git a/src/stats.cpp b/src/stats.cpp index 0a8c8d090..a9c725fc7 100644 --- a/src/stats.cpp +++ b/src/stats.cpp @@ -95,7 +95,7 @@ UBYTE *apCompLists[MAX_PLAYERS][COMP_NUMCOMPONENTS]; //store for each players Structure states UBYTE *apStructTypeLists[MAX_PLAYERS]; -static BOOL compareYes(const char *strToCompare, const char *strOwner); +static bool compareYes(const char *strToCompare, const char *strOwner); static bool getMovementModel(const char* movementModel, MOVEMENT_MODEL* model); //Access functions for the max values to be used in the Design Screen @@ -416,7 +416,7 @@ void statsDealloc(COMPONENT_STATS* pStats, UDWORD listSize, UDWORD structureSize } -static BOOL allocateStatName(BASE_STATS* pStat, const char *Name) +static bool allocateStatName(BASE_STATS* pStat, const char *Name) { pStat->pName = allocateName(Name); @@ -440,7 +440,7 @@ static void deallocBodyStats(void) } /*Deallocate all the stats assigned from input data*/ -BOOL statsShutDown(void) +bool statsShutDown(void) { STATS_DEALLOC(asWeaponStats, numWeaponStats, WEAPON_STATS); //STATS_DEALLOC(asBodyStats, numBodyStats, BODY_STATS); @@ -489,44 +489,44 @@ UDWORD numCR(const char *pFileBuffer, UDWORD fileSize) * Allocate stats functions *******************************************************************************/ /* Allocate Weapon stats */ -BOOL statsAllocWeapons(UDWORD numStats) +bool statsAllocWeapons(UDWORD numStats) { ALLOC_STATS(numStats, asWeaponStats, numWeaponStats, WEAPON_STATS); } /* Allocate Body Stats */ -BOOL statsAllocBody(UDWORD numStats) +bool statsAllocBody(UDWORD numStats) { ALLOC_STATS(numStats, asBodyStats, numBodyStats, BODY_STATS); } /* Allocate Brain Stats */ -BOOL statsAllocBrain(UDWORD numStats) +bool statsAllocBrain(UDWORD numStats) { ALLOC_STATS(numStats, asBrainStats, numBrainStats, BRAIN_STATS); } /* Allocate Propulsion Stats */ -BOOL statsAllocPropulsion(UDWORD numStats) +bool statsAllocPropulsion(UDWORD numStats) { ALLOC_STATS(numStats, asPropulsionStats, numPropulsionStats, PROPULSION_STATS); } /* Allocate Sensor Stats */ -BOOL statsAllocSensor(UDWORD numStats) +bool statsAllocSensor(UDWORD numStats) { ALLOC_STATS(numStats, asSensorStats, numSensorStats, SENSOR_STATS); } /* Allocate Ecm Stats */ -BOOL statsAllocECM(UDWORD numStats) +bool statsAllocECM(UDWORD numStats) { ALLOC_STATS(numStats, asECMStats, numECMStats, ECM_STATS); } /* Allocate Repair Stats */ -BOOL statsAllocRepair(UDWORD numStats) +bool statsAllocRepair(UDWORD numStats) { ALLOC_STATS(numStats, asRepairStats, numRepairStats, REPAIR_STATS); } /* Allocate Construct Stats */ -BOOL statsAllocConstruct(UDWORD numStats) +bool statsAllocConstruct(UDWORD numStats) { ALLOC_STATS(numStats, asConstructStats, numConstructStats, CONSTRUCT_STATS); } @@ -546,7 +546,7 @@ const char *getStatName(const void * Stat) *******************************************************************************/ /*Load the weapon stats from the file exported from Access*/ -BOOL loadWeaponStats(const char *pWeaponData, UDWORD bufferSize) +bool loadWeaponStats(const char *pWeaponData, UDWORD bufferSize) { unsigned int NumWeapons = numCR(pWeaponData, bufferSize); WEAPON_STATS sStats, * const psStats = &sStats; @@ -966,7 +966,7 @@ BOOL loadWeaponStats(const char *pWeaponData, UDWORD bufferSize) } /*Load the Body stats from the file exported from Access*/ -BOOL loadBodyStats(const char *pBodyData, UDWORD bufferSize) +bool loadBodyStats(const char *pBodyData, UDWORD bufferSize) { BODY_STATS sStats, * const psStats = &sStats; unsigned int NumBody = numCR(pBodyData, bufferSize); @@ -1086,7 +1086,7 @@ BOOL loadBodyStats(const char *pBodyData, UDWORD bufferSize) } /*Load the Brain stats from the file exported from Access*/ -BOOL loadBrainStats(const char *pBrainData, UDWORD bufferSize) +bool loadBrainStats(const char *pBrainData, UDWORD bufferSize) { BRAIN_STATS sStats, * const psStats = &sStats; const unsigned int NumBrain = numCR(pBrainData, bufferSize); @@ -1211,7 +1211,7 @@ bool getPropulsionType(const char* typeName, PROPULSION_TYPE* type) } /*Load the Propulsion stats from the file exported from Access*/ -BOOL loadPropulsionStats(const char *pPropulsionData, UDWORD bufferSize) +bool loadPropulsionStats(const char *pPropulsionData, UDWORD bufferSize) { const unsigned int NumPropulsion = numCR(pPropulsionData, bufferSize); PROPULSION_STATS sStats, * const psStats = &sStats; @@ -1316,7 +1316,7 @@ BOOL loadPropulsionStats(const char *pPropulsionData, UDWORD bufferSize) } /*Load the Sensor stats from the file exported from Access*/ -BOOL loadSensorStats(const char *pSensorData, UDWORD bufferSize) +bool loadSensorStats(const char *pSensorData, UDWORD bufferSize) { unsigned int NumSensor = numCR(pSensorData, bufferSize); SENSOR_STATS sStats, * const psStats = &sStats; @@ -1458,7 +1458,7 @@ BOOL loadSensorStats(const char *pSensorData, UDWORD bufferSize) } /*Load the ECM stats from the file exported from Access*/ -BOOL loadECMStats(const char *pECMData, UDWORD bufferSize) +bool loadECMStats(const char *pECMData, UDWORD bufferSize) { const unsigned int NumECM = numCR(pECMData, bufferSize); ECM_STATS sStats, * const psStats = &sStats; @@ -1562,7 +1562,7 @@ BOOL loadECMStats(const char *pECMData, UDWORD bufferSize) } /*Load the Repair stats from the file exported from Access*/ -BOOL loadRepairStats(const char *pRepairData, UDWORD bufferSize) +bool loadRepairStats(const char *pRepairData, UDWORD bufferSize) { const unsigned int NumRepair = numCR(pRepairData, bufferSize); REPAIR_STATS sStats, * const psStats = &sStats; @@ -1683,7 +1683,7 @@ BOOL loadRepairStats(const char *pRepairData, UDWORD bufferSize) } /*Load the Construct stats from the file exported from Access*/ -BOOL loadConstructStats(const char *pConstructData, UDWORD bufferSize) +bool loadConstructStats(const char *pConstructData, UDWORD bufferSize) { const unsigned int NumConstruct = numCR(pConstructData, bufferSize); CONSTRUCT_STATS sStats, * const psStats = &sStats; @@ -1780,7 +1780,7 @@ BOOL loadConstructStats(const char *pConstructData, UDWORD bufferSize) /*Load the Propulsion Types from the file exported from Access*/ -BOOL loadPropulsionTypes(const char *pPropTypeData, UDWORD bufferSize) +bool loadPropulsionTypes(const char *pPropTypeData, UDWORD bufferSize) { const unsigned int NumTypes = PROPULSION_TYPE_NUM; PROPULSION_TYPES *pPropType; @@ -1855,7 +1855,7 @@ BOOL loadPropulsionTypes(const char *pPropTypeData, UDWORD bufferSize) /*Load the Terrain Table from the file exported from Access*/ -BOOL loadTerrainTable(const char *pTerrainTableData, UDWORD bufferSize) +bool loadTerrainTable(const char *pTerrainTableData, UDWORD bufferSize) { const unsigned int NumEntries = numCR(pTerrainTableData, bufferSize); unsigned int i; @@ -1914,7 +1914,7 @@ BOOL loadTerrainTable(const char *pTerrainTableData, UDWORD bufferSize) } /*Load the Special Ability stats from the file exported from Access*/ -BOOL loadSpecialAbility(const char *pSAbilityData, UDWORD bufferSize) +bool loadSpecialAbility(const char *pSAbilityData, UDWORD bufferSize) { const unsigned int NumTypes = numCR(pSAbilityData, bufferSize); SPECIAL_ABILITY *pSAbility; @@ -1970,7 +1970,7 @@ BOOL loadSpecialAbility(const char *pSAbilityData, UDWORD bufferSize) } /* load the IMDs to use for each body-propulsion combination */ -BOOL loadBodyPropulsionIMDs(const char *pData, UDWORD bufferSize) +bool loadBodyPropulsionIMDs(const char *pData, UDWORD bufferSize) { const unsigned int NumTypes = numCR(pData, bufferSize); BODY_STATS *psBodyStat = asBodyStats; @@ -1979,7 +1979,7 @@ BOOL loadBodyPropulsionIMDs(const char *pData, UDWORD bufferSize) char bodyName[MAX_STR_LENGTH], propulsionName[MAX_STR_LENGTH], leftIMD[MAX_STR_LENGTH], rightIMD[MAX_STR_LENGTH]; iIMDShape **startIMDs; - BOOL found; + bool found; //check that the body and propulsion stats have already been read in @@ -2100,7 +2100,7 @@ BOOL loadBodyPropulsionIMDs(const char *pData, UDWORD bufferSize) -static BOOL +static bool statsGetAudioIDFromString( char *szStatName, char *szWavName, SDWORD *piWavID ) { if ( strcmp( szWavName, "-1" ) == 0 ) @@ -2131,7 +2131,7 @@ statsGetAudioIDFromString( char *szStatName, char *szWavName, SDWORD *piWavID ) /*Load the weapon sounds from the file exported from Access*/ -BOOL loadWeaponSounds(const char *pSoundData, UDWORD bufferSize) +bool loadWeaponSounds(const char *pSoundData, UDWORD bufferSize) { const unsigned int NumRecords = numCR(pSoundData, bufferSize); SDWORD i, weaponSoundID, explosionSoundID, inc, iDum; @@ -2178,7 +2178,7 @@ BOOL loadWeaponSounds(const char *pSoundData, UDWORD bufferSize) } /*Load the Weapon Effect Modifiers from the file exported from Access*/ -BOOL loadWeaponModifiers(const char *pWeapModData, UDWORD bufferSize) +bool loadWeaponModifiers(const char *pWeapModData, UDWORD bufferSize) { const unsigned int NumRecords = numCR(pWeapModData, bufferSize); PROPULSION_TYPE propInc; @@ -2233,7 +2233,7 @@ BOOL loadWeaponModifiers(const char *pWeapModData, UDWORD bufferSize) } /*Load the propulsion type sounds from the file exported from Access*/ -BOOL loadPropulsionSounds(const char *pPropSoundData, UDWORD bufferSize) +bool loadPropulsionSounds(const char *pPropSoundData, UDWORD bufferSize) { const unsigned int NumRecords = numCR(pPropSoundData, bufferSize); SDWORD i, startID, idleID, moveOffID, moveID, @@ -2696,7 +2696,7 @@ unsigned int componentType(const char* pType) } //function to compare a value with yes/no - if neither warns player! -BOOL compareYes(const char* strToCompare, const char* strOwner) +bool compareYes(const char* strToCompare, const char* strOwner) { if (!strcmp(strToCompare, "YES")) { @@ -2818,7 +2818,7 @@ const char* getName(const char *pNameID) /*sets the store to the body size based on the name passed in - returns false if doesn't compare with any*/ -BOOL getBodySize(const char *pSize, UBYTE *pStore) +bool getBodySize(const char *pSize, UBYTE *pStore) { if (!strcmp(pSize, "LIGHT")) { @@ -3491,7 +3491,7 @@ void adjustMaxDesignStats(void) } /* Check if an object has a weapon */ -BOOL objHasWeapon(BASE_OBJECT *psObj) +bool objHasWeapon(BASE_OBJECT *psObj) { //check if valid type diff --git a/src/stats.h b/src/stats.h index 990521f43..dfe0e354d 100644 --- a/src/stats.h +++ b/src/stats.h @@ -107,34 +107,34 @@ extern UBYTE *apStructTypeLists[MAX_PLAYERS]; * Allocate stats functions *******************************************************************************/ /* Allocate Weapon stats */ -extern BOOL statsAllocWeapons(UDWORD numEntries); +extern bool statsAllocWeapons(UDWORD numEntries); /*Allocate Armour stats*/ -//extern BOOL statsAllocArmour(UDWORD numEntries); +//extern bool statsAllocArmour(UDWORD numEntries); /*Allocate Body stats*/ -extern BOOL statsAllocBody(UDWORD numEntries); +extern bool statsAllocBody(UDWORD numEntries); /*Allocate Brain stats*/ -extern BOOL statsAllocBrain(UDWORD numEntries); +extern bool statsAllocBrain(UDWORD numEntries); /*Allocate Power stats*/ -//extern BOOL statsAllocPower(UDWORD numEntries); +//extern bool statsAllocPower(UDWORD numEntries); /*Allocate Propulsion stats*/ -extern BOOL statsAllocPropulsion(UDWORD numEntries); +extern bool statsAllocPropulsion(UDWORD numEntries); /*Allocate Sensor stats*/ -extern BOOL statsAllocSensor(UDWORD numEntries); +extern bool statsAllocSensor(UDWORD numEntries); /*Allocate Ecm Stats*/ -extern BOOL statsAllocECM(UDWORD numEntries); +extern bool statsAllocECM(UDWORD numEntries); /*Allocate Repair Stats*/ -extern BOOL statsAllocRepair(UDWORD numEntries); +extern bool statsAllocRepair(UDWORD numEntries); /*Allocate Construct Stats*/ -extern BOOL statsAllocConstruct(UDWORD numEntries); +extern bool statsAllocConstruct(UDWORD numEntries); extern UWORD weaponROF(WEAPON_STATS *psStat, SBYTE player); @@ -145,55 +145,55 @@ extern UWORD weaponROF(WEAPON_STATS *psStat, SBYTE player); extern UDWORD numCR(const char *pFileBuffer, UDWORD fileSize); /*Load the weapon stats from the file exported from Access*/ -extern BOOL loadWeaponStats(const char *pWeaponData, UDWORD bufferSize); +extern bool loadWeaponStats(const char *pWeaponData, UDWORD bufferSize); /*Load the armour stats from the file exported from Access*/ -//extern BOOL loadArmourStats(void); +//extern bool loadArmourStats(void); /*Load the body stats from the file exported from Access*/ -extern BOOL loadBodyStats(const char *pBodyData, UDWORD bufferSize); +extern bool loadBodyStats(const char *pBodyData, UDWORD bufferSize); /*Load the brain stats from the file exported from Access*/ -extern BOOL loadBrainStats(const char *pBrainData, UDWORD bufferSize); +extern bool loadBrainStats(const char *pBrainData, UDWORD bufferSize); /*Load the power stats from the file exported from Access*/ -//extern BOOL loadPowerStats(void); +//extern bool loadPowerStats(void); /*Load the propulsion stats from the file exported from Access*/ -extern BOOL loadPropulsionStats(const char *pPropulsionData, UDWORD bufferSize); +extern bool loadPropulsionStats(const char *pPropulsionData, UDWORD bufferSize); /*Load the sensor stats from the file exported from Access*/ -extern BOOL loadSensorStats(const char *pSensorData, UDWORD bufferSize); +extern bool loadSensorStats(const char *pSensorData, UDWORD bufferSize); /*Load the ecm stats from the file exported from Access*/ -extern BOOL loadECMStats(const char *pECMData, UDWORD bufferSize); +extern bool loadECMStats(const char *pECMData, UDWORD bufferSize); /*Load the repair stats from the file exported from Access*/ -extern BOOL loadRepairStats(const char *pRepairData, UDWORD bufferSize); +extern bool loadRepairStats(const char *pRepairData, UDWORD bufferSize); /*Load the construct stats from the file exported from Access*/ -extern BOOL loadConstructStats(const char *pConstructData, UDWORD bufferSize); +extern bool loadConstructStats(const char *pConstructData, UDWORD bufferSize); /*Load the Propulsion Types from the file exported from Access*/ -extern BOOL loadPropulsionTypes(const char *pPropTypeData, UDWORD bufferSize); +extern bool loadPropulsionTypes(const char *pPropTypeData, UDWORD bufferSize); /*Load the propulsion sounds from the file exported from Access*/ -extern BOOL loadPropulsionSounds(const char *pSoundData, UDWORD bufferSize); +extern bool loadPropulsionSounds(const char *pSoundData, UDWORD bufferSize); /*Load the Terrain Table from the file exported from Access*/ -extern BOOL loadTerrainTable(const char *pTerrainTableData, UDWORD bufferSize); +extern bool loadTerrainTable(const char *pTerrainTableData, UDWORD bufferSize); /*Load the Special Ability stats from the file exported from Access*/ -extern BOOL loadSpecialAbility(const char *pSAbilityData, UDWORD bufferSize); +extern bool loadSpecialAbility(const char *pSAbilityData, UDWORD bufferSize); /* load the IMDs to use for each body-propulsion combination */ -extern BOOL loadBodyPropulsionIMDs(const char *pData, UDWORD bufferSize); +extern bool loadBodyPropulsionIMDs(const char *pData, UDWORD bufferSize); /*Load the weapon sounds from the file exported from Access*/ -extern BOOL loadWeaponSounds(const char *pSoundData, UDWORD bufferSize); +extern bool loadWeaponSounds(const char *pSoundData, UDWORD bufferSize); /*Load the Weapon Effect Modifiers from the file exported from Access*/ -extern BOOL loadWeaponModifiers(const char *pWeapModData, UDWORD bufferSize); +extern bool loadWeaponModifiers(const char *pWeapModData, UDWORD bufferSize); /******************************************************************************* * Set stats functions *******************************************************************************/ @@ -245,7 +245,7 @@ extern CONSTRUCT_STATS *statsGetConstruct(UDWORD ref); *******************************************************************************/ /*calls the STATS_DEALLOC macro for each set of stats*/ -extern BOOL statsShutDown(void); +extern bool statsShutDown(void); /*Deallocate the stats passed in as parameter */ extern void statsDealloc(COMPONENT_STATS* pStats, UDWORD listSize, @@ -276,7 +276,7 @@ extern char* allocateName(const char* name); extern const char* getName(const char *pNameID); /*sets the store to the body size based on the name passed in - returns false if doesn't compare with any*/ -extern BOOL getBodySize(const char *pSize, UBYTE *pStore); +extern bool getBodySize(const char *pSize, UBYTE *pStore); // Pass in a stat and get its name extern const char* getStatName(const void * pStat); @@ -355,7 +355,7 @@ extern UDWORD getMaxWeaponDamage(void); extern UDWORD getMaxWeaponROF(void); extern UDWORD getMaxPropulsionSpeed(void); -extern BOOL objHasWeapon(BASE_OBJECT *psObj); +extern bool objHasWeapon(BASE_OBJECT *psObj); extern void statsInitVars(void); diff --git a/src/structure.cpp b/src/structure.cpp index 33c9e0dda..80438a7c2 100644 --- a/src/structure.cpp +++ b/src/structure.cpp @@ -175,10 +175,10 @@ static UBYTE satUplinkExists[MAX_PLAYERS]; //flag for when the player has one built - either completely or partially static UBYTE lasSatExists[MAX_PLAYERS]; -static BOOL setFunctionality(STRUCTURE* psBuilding, STRUCTURE_TYPE functionType); +static bool setFunctionality(STRUCTURE* psBuilding, STRUCTURE_TYPE functionType); static void setFlagPositionInc(FUNCTIONALITY* pFunctionality, UDWORD player, UBYTE factoryType); static void informPowerGen(STRUCTURE *psStruct); -static BOOL electronicReward(STRUCTURE *psStructure, UBYTE attackPlayer); +static bool electronicReward(STRUCTURE *psStructure, UBYTE attackPlayer); static void factoryReward(UBYTE losingPlayer, UBYTE rewardPlayer); static void repairFacilityReward(UBYTE losingPlayer, UBYTE rewardPlayer); static void findAssemblyPointPosition(UDWORD *pX, UDWORD *pY, UDWORD player); @@ -260,7 +260,7 @@ static void auxStructureClosedGate(STRUCTURE *psStructure) } } -BOOL IsStatExpansionModule(STRUCTURE_STATS *psStats) +bool IsStatExpansionModule(STRUCTURE_STATS *psStats) { // If the stat is any of the 3 expansion types ... then return true if( psStats->type == REF_POWER_MODULE || @@ -551,7 +551,7 @@ STRUCTURE_STATS::STRUCTURE_STATS(LineView line) } /* load the Structure stats from the Access database */ -BOOL loadStructureStats(const char *pStructData, UDWORD bufferSize) +bool loadStructureStats(const char *pStructData, UDWORD bufferSize) { UDWORD module; UDWORD iID; @@ -663,7 +663,7 @@ void initStructLimits(void) } /* set the current number of structures of each type built */ -void setCurrentStructQuantity(BOOL displayError) +void setCurrentStructQuantity(bool displayError) { UDWORD player, inc; @@ -694,7 +694,7 @@ void setCurrentStructQuantity(BOOL displayError) } //Load the weapons assigned to Structure in the Access database -BOOL loadStructureWeapons(const char *pWeaponData, UDWORD bufferSize) +bool loadStructureWeapons(const char *pWeaponData, UDWORD bufferSize) { TableView table(pWeaponData, bufferSize); @@ -717,7 +717,7 @@ BOOL loadStructureWeapons(const char *pWeaponData, UDWORD bufferSize) } //Load the programs assigned to Droids in the Access database -BOOL loadStructureFunctions(const char *pFunctionData, UDWORD bufferSize) +bool loadStructureFunctions(const char *pFunctionData, UDWORD bufferSize) { TableView table(pFunctionData, bufferSize); @@ -764,7 +764,7 @@ BOOL loadStructureFunctions(const char *pFunctionData, UDWORD bufferSize) } /*Load the Structure Strength Modifiers from the file exported from Access*/ -BOOL loadStructureStrengthModifiers(const char *pStrengthModData, UDWORD bufferSize) +bool loadStructureStrengthModifiers(const char *pStrengthModData, UDWORD bufferSize) { //initialise to 100% for (unsigned i = 0; i < WE_NUMEFFECTS; ++i) @@ -794,7 +794,7 @@ BOOL loadStructureStrengthModifiers(const char *pStrengthModData, UDWORD bufferS } -BOOL structureStatsShutDown(void) +bool structureStatsShutDown(void) { UDWORD inc; @@ -1053,7 +1053,7 @@ void structureDemolish(STRUCTURE *psStruct, DROID *psDroid, int buildPoints) structureBuild(psStruct, psDroid, -buildPoints); } -BOOL structureRepair(STRUCTURE *psStruct, DROID *psDroid, int buildPoints) +bool structureRepair(STRUCTURE *psStruct, DROID *psDroid, int buildPoints) { int repairAmount = (buildPoints * structureBody(psStruct))/psStruct->pStructureType->buildPoints; /* (droid construction power * current max hitpoints [incl. upgrades]) @@ -1082,7 +1082,7 @@ BOOL structureRepair(STRUCTURE *psStruct, DROID *psDroid, int buildPoints) } /* Set the type of droid for a factory to build */ -BOOL structSetManufacture(STRUCTURE *psStruct, DROID_TEMPLATE *psTempl, QUEUE_MODE mode) +bool structSetManufacture(STRUCTURE *psStruct, DROID_TEMPLATE *psTempl, QUEUE_MODE mode) { FACTORY *psFact; @@ -1146,7 +1146,7 @@ BOOL structSetManufacture(STRUCTURE *psStruct, DROID_TEMPLATE *psTempl, QUEUE_MO */ // look at where other walls are to decide what type of wall to build -static SDWORD structWallScan(BOOL aWallPresent[5][5], SDWORD x, SDWORD y) +static SDWORD structWallScan(bool aWallPresent[5][5], SDWORD x, SDWORD y) { if (aWallPresent[x-1][y] || aWallPresent[x+1][y]) { @@ -1168,7 +1168,7 @@ static SDWORD structWallScan(BOOL aWallPresent[5][5], SDWORD x, SDWORD y) // Choose a type of wall for a location - and update any neighbouring walls static SDWORD structChooseWallType(UDWORD player, UDWORD mapX, UDWORD mapY) { - BOOL aWallPresent[5][5]; + bool aWallPresent[5][5]; SDWORD xdiff,ydiff, x,y; STRUCTURE *psStruct; STRUCTURE *apsStructs[5][5]; @@ -1364,12 +1364,12 @@ void alignStructure(STRUCTURE *psBuilding) } /*Builds an instance of a Structure - the x/y passed in are in world coords. */ -STRUCTURE *buildStructure(STRUCTURE_STATS *pStructureType, UDWORD x, UDWORD y, UDWORD player, BOOL FromSave) +STRUCTURE *buildStructure(STRUCTURE_STATS *pStructureType, UDWORD x, UDWORD y, UDWORD player, bool FromSave) { return buildStructureDir(pStructureType, x, y, 0, player, FromSave); } -STRUCTURE* buildStructureDir(STRUCTURE_STATS *pStructureType, UDWORD x, UDWORD y, uint16_t direction, UDWORD player, BOOL FromSave) +STRUCTURE* buildStructureDir(STRUCTURE_STATS *pStructureType, UDWORD x, UDWORD y, uint16_t direction, UDWORD player, bool FromSave) { STRUCTURE *psBuilding = NULL; Vector2i size = getStructureStatsSize(pStructureType, direction); @@ -1701,7 +1701,7 @@ STRUCTURE* buildStructureDir(STRUCTURE_STATS *pStructureType, UDWORD x, UDWORD y } else //its an upgrade { - BOOL bUpgraded = false; + bool bUpgraded = false; int32_t bodyDiff = 0; //don't create the Structure use existing one @@ -1932,7 +1932,7 @@ STRUCTURE *buildBlueprint(STRUCTURE_STATS *psStats, int32_t x, int32_t y, uint16 return blueprint; } -static BOOL setFunctionality(STRUCTURE *psBuilding, STRUCTURE_TYPE functionType) +static bool setFunctionality(STRUCTURE *psBuilding, STRUCTURE_TYPE functionType) { CHECK_STRUCTURE(psBuilding); @@ -2239,7 +2239,7 @@ void clearCommandDroidFactory(DROID *psDroid) } /* Check that a tile is vacant for a droid to be placed */ -static BOOL structClearTile(UWORD x, UWORD y) +static bool structClearTile(UWORD x, UWORD y) { UDWORD player; DROID *psCurr; @@ -2270,10 +2270,10 @@ static BOOL structClearTile(UWORD x, UWORD y) } /*find a location near to a structure to start the droid of*/ -BOOL placeDroid(STRUCTURE *psStructure, UDWORD *droidX, UDWORD *droidY) +bool placeDroid(STRUCTURE *psStructure, UDWORD *droidX, UDWORD *droidY) { SWORD sx,sy, xmin,xmax, ymin,ymax, x,y, xmid; - BOOL placed; + bool placed; unsigned sWidth = getStructureWidth(psStructure); unsigned sBreadth = getStructureBreadth(psStructure); @@ -2379,17 +2379,17 @@ BOOL placeDroid(STRUCTURE *psStructure, UDWORD *droidX, UDWORD *droidY) /* Place a newly manufactured droid next to a factory and then send if off to the assembly point, returns true if droid was placed successfully */ -static BOOL structPlaceDroid(STRUCTURE *psStructure, DROID_TEMPLATE *psTempl, +static bool structPlaceDroid(STRUCTURE *psStructure, DROID_TEMPLATE *psTempl, DROID **ppsDroid) { UDWORD x,y; - BOOL placed;//bTemp = false; + bool placed;//bTemp = false; DROID *psNewDroid; FACTORY *psFact; FLAG_POSITION *psFlag; Vector3i iVecEffect; UBYTE factoryType; - BOOL assignCommander; + bool assignCommander; CHECK_STRUCTURE(psStructure); @@ -2589,7 +2589,7 @@ static bool IsFactoryCommanderGroupFull(const FACTORY* psFactory) // doesn't mean that these numbers can't be exceeded if units are // put down in the editor or by the scripts. -BOOL IsPlayerStructureLimitReached(UDWORD PlayerNumber) +bool IsPlayerStructureLimitReached(UDWORD PlayerNumber) { // PC currently doesn't limit number of structures a player can build. return false; @@ -2602,7 +2602,7 @@ UDWORD getMaxDroids(UDWORD PlayerNumber) } -BOOL IsPlayerDroidLimitReached(UDWORD PlayerNumber) +bool IsPlayerDroidLimitReached(UDWORD PlayerNumber) { unsigned int numDroids = getNumDroids(PlayerNumber) + getNumMissionDroids(PlayerNumber) + getNumTransporterDroids(PlayerNumber); @@ -2610,7 +2610,7 @@ BOOL IsPlayerDroidLimitReached(UDWORD PlayerNumber) } -static BOOL maxDroidsByTypeReached(STRUCTURE *psStructure) +static bool maxDroidsByTypeReached(STRUCTURE *psStructure) { FACTORY *psFact = &psStructure->pFunctionality->factory; @@ -2635,7 +2635,7 @@ static BOOL maxDroidsByTypeReached(STRUCTURE *psStructure) // Check for max number of units reached and halt production. // -BOOL CheckHaltOnMaxUnitsReached(STRUCTURE *psStructure) +bool CheckHaltOnMaxUnitsReached(STRUCTURE *psStructure) { CHECK_STRUCTURE(psStructure); @@ -2671,7 +2671,7 @@ static void aiUpdateStructure(STRUCTURE *psStructure, bool isMission) REPAIR_FACILITY *psRepairFac = NULL; RESEARCH_FACILITY *psResFacility; Vector3i iVecEffect; - BOOL bDroidPlaced = false; + bool bDroidPlaced = false; WEAPON_STATS *psWStats; SDWORD xdiff,ydiff, mindist, currdist; UDWORD i; @@ -3599,7 +3599,7 @@ static void aiUpdateStructure(STRUCTURE *psStructure, bool isMission) /** Decides whether a structure should emit smoke when it's damaged */ -static BOOL canSmoke(STRUCTURE *psStruct) +static bool canSmoke(STRUCTURE *psStruct) { if (psStruct->pStructureType->type == REF_WALL || psStruct->pStructureType->type == REF_WALLCORNER || psStruct->status == SS_BEING_BUILT || psStruct->pStructureType->type == REF_GATE) @@ -3913,7 +3913,7 @@ There is now a limit of how many of each type of structure are allowed per missi UDWORD fillStructureList(STRUCTURE_STATS **ppList, UDWORD selectedPlayer, UDWORD limit) { UDWORD inc, count; - BOOL researchModule, factoryModule, powerModule; + bool researchModule, factoryModule, powerModule; STRUCTURE *psCurr; STRUCTURE_STATS *psBuilding; @@ -4092,7 +4092,7 @@ bool validLocation(BASE_STATS *psStats, unsigned x, unsigned y, uint16_t directi { STRUCTURE *psStruct; STRUCTURE_STATS *psBuilding; - BOOL valid = true; + bool valid = true; SDWORD i, j; UDWORD min, max; HIGHLIGHT site; @@ -4533,7 +4533,7 @@ failed: // Succeeded if got here without jumping. for a new structure, find a location along an edge which the droid can get to and return this as the destination for the droid. */ -BOOL getDroidDestination(BASE_STATS *psStats, UDWORD structX, +bool getDroidDestination(BASE_STATS *psStats, UDWORD structX, UDWORD structY, UDWORD *pDroidX, UDWORD *pDroidY) { int32_t start; @@ -4689,7 +4689,7 @@ BOOL getDroidDestination(BASE_STATS *psStats, UDWORD structX, } /* check along the width of a structure for an empty space */ -BOOL checkWidth(UDWORD maxRange, UDWORD x, UDWORD y, UDWORD *pDroidX, UDWORD *pDroidY) +bool checkWidth(UDWORD maxRange, UDWORD x, UDWORD y, UDWORD *pDroidX, UDWORD *pDroidY) { UDWORD side; @@ -4710,7 +4710,7 @@ BOOL checkWidth(UDWORD maxRange, UDWORD x, UDWORD y, UDWORD *pDroidX, UDWORD *pD } /* check along the length of a structure for an empty space */ -BOOL checkLength(UDWORD maxRange, UDWORD x, UDWORD y, UDWORD *pDroidX, UDWORD *pDroidY) +bool checkLength(UDWORD maxRange, UDWORD x, UDWORD y, UDWORD *pDroidX, UDWORD *pDroidY) { UDWORD side; @@ -4755,9 +4755,9 @@ static void removeStructFromMap(STRUCTURE *psStruct) // remove a structure from a game without any visible effects // bDestroy = true if the object is to be destroyed // (for example used to change the type of wall at a location) -BOOL removeStruct(STRUCTURE *psDel, BOOL bDestroy) +bool removeStruct(STRUCTURE *psDel, bool bDestroy) { - BOOL resourceFound = false; + bool resourceFound = false; uint32_t mask; FACTORY *psFactory; SDWORD cluster; @@ -4874,10 +4874,10 @@ BOOL removeStruct(STRUCTURE *psDel, BOOL bDestroy) } /* Remove a structure */ -BOOL destroyStruct(STRUCTURE *psDel) +bool destroyStruct(STRUCTURE *psDel) { UDWORD widthScatter,breadthScatter,heightScatter; - BOOL resourceFound = false; + bool resourceFound = false; bool bMinor; const unsigned burnDurationWall = 1000; @@ -5078,7 +5078,7 @@ int32_t getStructStatFromName(char const *pName) /*check to see if the structure is 'doing' anything - return true if idle*/ -BOOL structureIdle(STRUCTURE *psBuilding) +bool structureIdle(STRUCTURE *psBuilding) { BASE_STATS *pSubject = NULL; @@ -5116,10 +5116,10 @@ BOOL structureIdle(STRUCTURE *psBuilding) /*checks to see if any structure exists of a specified type with a specified status */ -BOOL checkStructureStatus( STRUCTURE_STATS *psStats, UDWORD player, UDWORD status) +bool checkStructureStatus( STRUCTURE_STATS *psStats, UDWORD player, UDWORD status) { STRUCTURE *psStructure; - BOOL found = false; + bool found = false; for (psStructure = apsStructLists[player]; psStructure != NULL; psStructure = psStructure->psNext) @@ -5140,10 +5140,10 @@ BOOL checkStructureStatus( STRUCTURE_STATS *psStats, UDWORD player, UDWORD statu /*checks to see if a specific structure type exists -as opposed to a structure stat type*/ -BOOL checkSpecificStructExists(UDWORD structInc, UDWORD player) +bool checkSpecificStructExists(UDWORD structInc, UDWORD player) { STRUCTURE *psStructure; - BOOL found = false; + bool found = false; ASSERT_OR_RETURN(false, structInc < numStructureStats, "Invalid structure inc"); @@ -5223,7 +5223,7 @@ void findAssemblyPointPosition(UDWORD *pX, UDWORD *pY, UDWORD player) /*sets the point new droids go to - x/y in world coords for a Factory bCheck is set to true for initial placement of the Assembly Point*/ void setAssemblyPoint(FLAG_POSITION *psAssemblyPoint, UDWORD x, UDWORD y, - UDWORD player, BOOL bCheck) + UDWORD player, bool bCheck) { ASSERT_OR_RETURN( , psAssemblyPoint != NULL, "invalid AssemblyPoint pointer"); @@ -5365,21 +5365,21 @@ STRUCTURE_STATS * structGetDemolishStat( void ) /*sets the flag to indicate a HQ Exists - so draw Radar*/ -void setHQExists(BOOL state, UDWORD player) +void setHQExists(bool state, UDWORD player) { hqExists[player] = (UBYTE)state; } /*returns the status of the flag*/ -BOOL getHQExists(UDWORD player) +bool getHQExists(UDWORD player) { return hqExists[player]; } /*sets the flag to indicate a SatUplink Exists - so draw everything!*/ -void setSatUplinkExists(BOOL state, UDWORD player) +void setSatUplinkExists(bool state, UDWORD player) { satUplinkExists[player] = (UBYTE)state; if (state) @@ -5394,21 +5394,21 @@ void setSatUplinkExists(BOOL state, UDWORD player) /*returns the status of the flag*/ -BOOL getSatUplinkExists(UDWORD player) +bool getSatUplinkExists(UDWORD player) { return satUplinkExists[player]; } /*sets the flag to indicate a Las Sat Exists - ONLY EVER WANT ONE*/ -void setLasSatExists(BOOL state, UDWORD player) +void setLasSatExists(bool state, UDWORD player) { lasSatExists[player] = (UBYTE)state; } /*returns the status of the flag*/ -BOOL getLasSatExists(UDWORD player) +bool getLasSatExists(UDWORD player) { return lasSatExists[player]; } @@ -6023,7 +6023,7 @@ void printStructureInfo(STRUCTURE *psStructure) /*Checks the template type against the factory type - returns false if not a good combination!*/ -BOOL validTemplateForFactory(DROID_TEMPLATE *psTemplate, STRUCTURE *psFactory) +bool validTemplateForFactory(DROID_TEMPLATE *psTemplate, STRUCTURE *psFactory) { //not in multiPlayer! - AB 26/5/99 if (!bMultiPlayer) @@ -6084,11 +6084,11 @@ BOOL validTemplateForFactory(DROID_TEMPLATE *psTemplate, STRUCTURE *psFactory) /*calculates the damage caused to the resistance levels of structures - returns true when captured*/ -BOOL electronicDamage(BASE_OBJECT *psTarget, UDWORD damage, UBYTE attackPlayer) +bool electronicDamage(BASE_OBJECT *psTarget, UDWORD damage, UBYTE attackPlayer) { STRUCTURE *psStructure; DROID *psDroid; - BOOL bCompleted = true; + bool bCompleted = true; Vector3i pos; UDWORD i; @@ -6233,9 +6233,9 @@ BOOL electronicDamage(BASE_OBJECT *psTarget, UDWORD damage, UBYTE attackPlayer) /* EW works differently in multiplayer mode compared with single player.*/ -BOOL validStructResistance(STRUCTURE *psStruct) +bool validStructResistance(STRUCTURE *psStruct) { - BOOL bTarget = false; + bool bTarget = false; ASSERT_OR_RETURN(false, psStruct != NULL, "Invalid structure pointer"); @@ -6391,9 +6391,9 @@ UDWORD structureResistance(STRUCTURE_STATS *psStats, UBYTE player) /*gives the attacking player a reward based on the type of structure that has been attacked*/ -BOOL electronicReward(STRUCTURE *psStructure, UBYTE attackPlayer) +bool electronicReward(STRUCTURE *psStructure, UBYTE attackPlayer) { - BOOL bRewarded = false; + bool bRewarded = false; switch(psStructure->pStructureType->type) { @@ -6603,7 +6603,7 @@ void hqReward(UBYTE losingPlayer, UBYTE rewardPlayer) // Return true if structure is a factory of any type. // -BOOL StructIsFactory(STRUCTURE *Struct) +bool StructIsFactory(STRUCTURE *Struct) { ASSERT_OR_RETURN(false, Struct != NULL, "Invalid structure!"); ASSERT_OR_RETURN(false, Struct->pStructureType != NULL, "Invalid structureType!"); @@ -6621,7 +6621,7 @@ BOOL StructIsFactory(STRUCTURE *Struct) // Return true if flag is a delivery point for a factory. // -BOOL FlagIsFactory(FLAG_POSITION *psCurrFlag) +bool FlagIsFactory(FLAG_POSITION *psCurrFlag) { if( (psCurrFlag->factoryType == FACTORY_FLAG) || (psCurrFlag->factoryType == CYBORG_FLAG) || (psCurrFlag->factoryType == VTOL_FLAG) ) @@ -6905,7 +6905,7 @@ DROID_TEMPLATE * factoryProdUpdate(STRUCTURE *psStructure, DROID_TEMPLATE *psTem //adjust the production run for this template type -void factoryProdAdjust(STRUCTURE *psStructure, DROID_TEMPLATE *psTemplate, BOOL add) +void factoryProdAdjust(STRUCTURE *psStructure, DROID_TEMPLATE *psTemplate, bool add) { CHECK_STRUCTURE(psStructure); ASSERT_OR_RETURN( , psStructure->player == productionPlayer, "called for incorrect player"); @@ -7037,7 +7037,7 @@ UWORD countAssignableFactories(UBYTE player,UWORD factoryType) // check whether a factory of a certain number and type exists -BOOL checkFactoryExists(UDWORD player, UDWORD factoryType, UDWORD inc) +bool checkFactoryExists(UDWORD player, UDWORD factoryType, UDWORD inc) { ASSERT_OR_RETURN(false, player < MAX_PLAYERS, "Invalid player"); ASSERT_OR_RETURN(false, factoryType < NUM_FACTORY_TYPES, "Invalid factoryType"); @@ -7121,7 +7121,7 @@ void checkDeliveryPoints(UDWORD version) //adjust the loop quantity for this factory -void factoryLoopAdjust(STRUCTURE *psStruct, BOOL add) +void factoryLoopAdjust(STRUCTURE *psStruct, bool add) { FACTORY *psFactory; @@ -7174,7 +7174,7 @@ float structHeightScale(STRUCTURE *psStruct) /*compares the structure sensor type with the droid weapon type to see if the FIRE_SUPPORT order can be assigned*/ -BOOL structSensorDroidWeapon(STRUCTURE *psStruct, DROID *psDroid) +bool structSensorDroidWeapon(STRUCTURE *psStruct, DROID *psDroid) { //another crash when nStat is marked as 0xcd... FIXME: Why is nStat not initialized properly? //Added a safety check: Only units with weapons can be assigned. @@ -7219,7 +7219,7 @@ BOOL structSensorDroidWeapon(STRUCTURE *psStruct, DROID *psDroid) /*checks if the structure has a Counter Battery sensor attached - returns true if it has*/ -BOOL structCBSensor(const STRUCTURE* psStruct) +bool structCBSensor(const STRUCTURE* psStruct) { // Super Sensor works as any type if (psStruct->pStructureType->pSensor @@ -7236,7 +7236,7 @@ BOOL structCBSensor(const STRUCTURE* psStruct) /*checks if the structure has a Standard Turret sensor attached - returns true if it has*/ -BOOL structStandardSensor(const STRUCTURE* psStruct) +bool structStandardSensor(const STRUCTURE* psStruct) { // Super Sensor works as any type if (psStruct->pStructureType->pSensor @@ -7253,7 +7253,7 @@ BOOL structStandardSensor(const STRUCTURE* psStruct) /*checks if the structure has a VTOL Intercept sensor attached - returns true if it has*/ -BOOL structVTOLSensor(const STRUCTURE* psStruct) +bool structVTOLSensor(const STRUCTURE* psStruct) { // Super Sensor works as any type if (psStruct->pStructureType->pSensor @@ -7270,7 +7270,7 @@ BOOL structVTOLSensor(const STRUCTURE* psStruct) /*checks if the structure has a VTOL Counter Battery sensor attached - returns true if it has*/ -BOOL structVTOLCBSensor(const STRUCTURE* psStruct) +bool structVTOLCBSensor(const STRUCTURE* psStruct) { // Super Sensor works as any type if (psStruct->pStructureType->pSensor @@ -7287,7 +7287,7 @@ BOOL structVTOLCBSensor(const STRUCTURE* psStruct) // check whether a rearm pad is clear -BOOL clearRearmPad(STRUCTURE *psStruct) +bool clearRearmPad(STRUCTURE *psStruct) { return psStruct->pStructureType->type == REF_REARM_PAD && (psStruct->pFunctionality->rearmPad.psObj == NULL @@ -7299,7 +7299,7 @@ BOOL clearRearmPad(STRUCTURE *psStruct) // if bClear is true it tries to find the nearest clear rearm pad in // the same cluster as psTarget // psTarget can be NULL -STRUCTURE * findNearestReArmPad(DROID *psDroid, STRUCTURE *psTarget, BOOL bClear) +STRUCTURE * findNearestReArmPad(DROID *psDroid, STRUCTURE *psTarget, bool bClear) { STRUCTURE *psStruct, *psNearest, *psTotallyClear; SDWORD xdiff,ydiff, mindist, currdist, totallyDist; @@ -7392,7 +7392,7 @@ void ensureRearmPadClear(STRUCTURE *psStruct, DROID *psDroid) // return whether a rearm pad has a vtol on it -BOOL vtolOnRearmPad(STRUCTURE *psStruct, DROID *psDroid) +bool vtolOnRearmPad(STRUCTURE *psStruct, DROID *psDroid) { DROID *psCurr; SDWORD tx,ty; @@ -7415,14 +7415,14 @@ BOOL vtolOnRearmPad(STRUCTURE *psStruct, DROID *psDroid) /* Just returns true if the structure's present body points aren't as high as the original*/ -BOOL structIsDamaged(STRUCTURE *psStruct) +bool structIsDamaged(STRUCTURE *psStruct) { return psStruct->body < structureBody(psStruct); } // give a structure from one player to another - used in Electronic Warfare //returns pointer to the new structure -STRUCTURE * giftSingleStructure(STRUCTURE *psStructure, UBYTE attackPlayer, BOOL bFromScript) +STRUCTURE * giftSingleStructure(STRUCTURE *psStructure, UBYTE attackPlayer, bool bFromScript) { STRUCTURE *psNewStruct, *psStruct; DROID *psCurr; @@ -7430,7 +7430,7 @@ STRUCTURE * giftSingleStructure(STRUCTURE *psStructure, UBYTE attackPlayer, BOOL UDWORD x, y; UBYTE capacity = 0, originalPlayer; SWORD buildPoints = 0, i; - BOOL bPowerOn; + bool bPowerOn; UWORD direction; CHECK_STRUCTURE(psStructure); @@ -7666,7 +7666,7 @@ void structUpdateRecoil( STRUCTURE *psStruct ) /*checks that the structure stats have loaded up as expected - must be done after all StructureStats parts have been loaded*/ -BOOL checkStructureStats(void) +bool checkStructureStats(void) { UDWORD structInc, inc; @@ -7775,7 +7775,7 @@ void resetResistanceLag(STRUCTURE *psBuilding) /*checks the structure passed in is a Las Sat structure which is currently selected - returns true if valid*/ -BOOL lasSatStructSelected(STRUCTURE *psStruct) +bool lasSatStructSelected(STRUCTURE *psStruct) { if ( (psStruct->selected || (bMultiPlayer && !isHumanPlayer(psStruct->player))) && psStruct->asWeaps[0].nStat @@ -7819,7 +7819,7 @@ Vector2i getStructureStatsSize(STRUCTURE_STATS const *pStructureType, uint16_t d } // Check that psVictimStruct is not referred to by any other object in the game -BOOL structureCheckReferences(STRUCTURE *psVictimStruct) +bool structureCheckReferences(STRUCTURE *psVictimStruct) { int plr, i; diff --git a/src/structure.h b/src/structure.h index 6f2a6b12c..f9781ce55 100644 --- a/src/structure.h +++ b/src/structure.h @@ -98,45 +98,45 @@ extern STRUCTSTRENGTH_MODIFIER asStructStrengthModifier[WE_NUMEFFECTS][ extern void handleAbandonedStructures(void); -extern BOOL IsPlayerDroidLimitReached(UDWORD PlayerNumber); -extern BOOL IsPlayerStructureLimitReached(UDWORD PlayerNumber); -extern BOOL CheckHaltOnMaxUnitsReached(STRUCTURE *psStructure); +extern bool IsPlayerDroidLimitReached(UDWORD PlayerNumber); +extern bool IsPlayerStructureLimitReached(UDWORD PlayerNumber); +extern bool CheckHaltOnMaxUnitsReached(STRUCTURE *psStructure); -extern BOOL loadStructureStats(const char *pStructData, UDWORD bufferSize); -extern BOOL loadStructureWeapons(const char *pWeaponData, UDWORD bufferSize); -extern BOOL loadStructureFunctions(const char *pFunctionData, UDWORD bufferSize); +extern bool loadStructureStats(const char *pStructData, UDWORD bufferSize); +extern bool loadStructureWeapons(const char *pWeaponData, UDWORD bufferSize); +extern bool loadStructureFunctions(const char *pFunctionData, UDWORD bufferSize); /*Load the Structure Strength Modifiers from the file exported from Access*/ -extern BOOL loadStructureStrengthModifiers(const char *pStrengthModData, UDWORD bufferSize); +extern bool loadStructureStrengthModifiers(const char *pStrengthModData, UDWORD bufferSize); -extern BOOL structureStatsShutDown(void); +extern bool structureStatsShutDown(void); int requestOpenGate(STRUCTURE *psStructure); int32_t structureDamage(STRUCTURE *psStructure, UDWORD damage, WEAPON_CLASS weaponClass, WEAPON_SUBCLASS weaponSubClass, HIT_SIDE impactSide); extern void structureBuild(STRUCTURE *psStructure, DROID *psDroid, int buildPoints); extern void structureDemolish(STRUCTURE *psStructure, DROID *psDroid, int buildPoints); -extern BOOL structureRepair(STRUCTURE *psStruct, DROID *psDroid, int buildPoints); +extern bool structureRepair(STRUCTURE *psStruct, DROID *psDroid, int buildPoints); /* Set the type of droid for a factory to build */ -extern BOOL structSetManufacture(STRUCTURE *psStruct, DROID_TEMPLATE *psTempl, QUEUE_MODE mode); +extern bool structSetManufacture(STRUCTURE *psStruct, DROID_TEMPLATE *psTempl, QUEUE_MODE mode); //temp test function for creating structures at the start of the game extern void createTestStructures(void); //builds a specified structure at a given location -STRUCTURE *buildStructure(STRUCTURE_STATS *pStructureType, UDWORD x, UDWORD y, UDWORD player, BOOL FromSave); -STRUCTURE *buildStructureDir(STRUCTURE_STATS *pStructureType, UDWORD x, UDWORD y, uint16_t direction, UDWORD player, BOOL FromSave); +STRUCTURE *buildStructure(STRUCTURE_STATS *pStructureType, UDWORD x, UDWORD y, UDWORD player, bool FromSave); +STRUCTURE *buildStructureDir(STRUCTURE_STATS *pStructureType, UDWORD x, UDWORD y, uint16_t direction, UDWORD player, bool FromSave); /// Create a blueprint structure, with just enough information to render it STRUCTURE *buildBlueprint(STRUCTURE_STATS *psStats, int32_t x, int32_t y, uint16_t direction, STRUCT_STATES state); /* The main update routine for all Structures */ void structureUpdate(STRUCTURE *psBuilding, bool mission); /* Remove a structure and free it's memory */ -extern BOOL destroyStruct(STRUCTURE *psDel); +extern bool destroyStruct(STRUCTURE *psDel); // remove a structure from a game without any visible effects // bDestroy = true if the object is to be destroyed // (for example used to change the type of wall at a location) -BOOL removeStruct(STRUCTURE *psDel, BOOL bDestroy); +bool removeStruct(STRUCTURE *psDel, bool bDestroy); //fills the list with Structures that can be built extern UDWORD fillStructureList(STRUCTURE_STATS **ppList, UDWORD selectedPlayer, @@ -147,33 +147,33 @@ extern bool validLocation(BASE_STATS *psStats, unsigned x, unsigned y, uint16_t /* for a new structure, find a location along an edge which the droid can get to and return this as the destination for the droid */ -//extern BOOL getDroidDestination(STRUCTURE_STATS *psPositionStats, UDWORD structX, +//extern bool getDroidDestination(STRUCTURE_STATS *psPositionStats, UDWORD structX, // UDWORD structY, UDWORD * pDroidX, UDWORD *pDroidY); /*for a structure or feature, find a location along an edge which the droid can get to and return this as the destination for the droid*/ -extern BOOL getDroidDestination(BASE_STATS *psPositionStats, UDWORD structX, +extern bool getDroidDestination(BASE_STATS *psPositionStats, UDWORD structX, UDWORD structY, UDWORD * pDroidX, UDWORD *pDroidY); /* check along the width of a structure for an empty space */ -extern BOOL checkWidth(UDWORD maxRange, UDWORD x, UDWORD y, UDWORD *pDroidX, UDWORD *pDroidY); +extern bool checkWidth(UDWORD maxRange, UDWORD x, UDWORD y, UDWORD *pDroidX, UDWORD *pDroidY); /* check along the length of a structure for an empty space */ -extern BOOL checkLength(UDWORD maxRange, UDWORD x, UDWORD y, UDWORD *pDroidX, UDWORD *pDroidY); +extern bool checkLength(UDWORD maxRange, UDWORD x, UDWORD y, UDWORD *pDroidX, UDWORD *pDroidY); extern void alignStructure(STRUCTURE *psBuilding); //initialise the structure limits structure extern void initStructLimits(void); /* set the current number of structures of each type built */ -extern void setCurrentStructQuantity(BOOL displayError); +extern void setCurrentStructQuantity(bool displayError); /* get a stat inc based on the name */ extern int32_t getStructStatFromName(char const *pName); /*check to see if the structure is 'doing' anything - return true if idle*/ -extern BOOL structureIdle(STRUCTURE *psBuilding); +extern bool structureIdle(STRUCTURE *psBuilding); /*checks to see if any structure exists of a specified type with a specified status */ -extern BOOL checkStructureStatus( STRUCTURE_STATS *psStats, UDWORD player, UDWORD status); +extern bool checkStructureStatus( STRUCTURE_STATS *psStats, UDWORD player, UDWORD status); /*sets the point new droids go to - x/y in world coords for a Factory*/ extern void setAssemblyPoint(FLAG_POSITION *psAssemblyPoint, UDWORD x, UDWORD y, - UDWORD player, BOOL bCheck); + UDWORD player, bool bCheck); //extern void createAssemblyPoint(STRUCTURE* psStruct); /* consider delivery points when selected by player*/ @@ -192,15 +192,15 @@ extern void resetFactoryNumFlag(void); extern STRUCTURE_STATS * structGetDemolishStat( void ); /*find a location near to the factory to start the droid of*/ -extern BOOL placeDroid(STRUCTURE *psStructure, UDWORD *droidX, UDWORD *droidY); +extern bool placeDroid(STRUCTURE *psStructure, UDWORD *droidX, UDWORD *droidY); /*sets the flag to indicate a Power Generator Exists - so do Oil Derrick anim*/ -//extern void setPowerGenExists(BOOL state, UDWORD player); +//extern void setPowerGenExists(bool state, UDWORD player); /*returns teh status of the flag*/ -//extern BOOL getPowerGenExists(UDWORD player); +//extern bool getPowerGenExists(UDWORD player); /* is this a lassat structure? */ -static inline BOOL isLasSat(STRUCTURE_STATS *pStructureType) +static inline bool isLasSat(STRUCTURE_STATS *pStructureType) { ASSERT_OR_RETURN(false, pStructureType != NULL, "LasSat is invalid?"); @@ -209,17 +209,17 @@ static inline BOOL isLasSat(STRUCTURE_STATS *pStructureType) } /*sets the flag to indicate a HQ Exists - so draw Radar*/ -extern void setHQExists(BOOL state, UDWORD player); +extern void setHQExists(bool state, UDWORD player); /*returns the status of the flag*/ -extern BOOL getHQExists(UDWORD player); +extern bool getHQExists(UDWORD player); /*sets the flag to indicate a SatUplink Exists - so draw everything!*/ -extern void setSatUplinkExists(BOOL state, UDWORD player); +extern void setSatUplinkExists(bool state, UDWORD player); /*returns the status of the flag*/ -extern BOOL getSatUplinkExists(UDWORD player); +extern bool getSatUplinkExists(UDWORD player); /*sets the flag to indicate a Las Sat Exists - ONLY EVER WANT ONE*/ -extern void setLasSatExists(BOOL state, UDWORD player); +extern void setLasSatExists(bool state, UDWORD player); /*returns the status of the flag*/ -extern BOOL getLasSatExists(UDWORD player); +extern bool getLasSatExists(UDWORD player); /* added int weapon_slot to fix the alway slot 0 hack */ bool calcStructureMuzzleLocation(STRUCTURE *psStructure, Vector3i *muzzle, int weapon_slot); @@ -256,19 +256,19 @@ extern void printStructureInfo(STRUCTURE *psStructure); /*Checks the template type against the factory type - returns false if not a good combination!*/ -extern BOOL validTemplateForFactory(DROID_TEMPLATE *psTemplate, STRUCTURE *psFactory); +extern bool validTemplateForFactory(DROID_TEMPLATE *psTemplate, STRUCTURE *psFactory); /*calculates the damage caused to the resistance levels of structures*/ -//extern BOOL electronicDamage(STRUCTURE *psStructure, UDWORD damage, UBYTE attackPlayer); +//extern bool electronicDamage(STRUCTURE *psStructure, UDWORD damage, UBYTE attackPlayer); //electronic damage can be targetted at droids as well as structures now - AB 5/11/98 -extern BOOL electronicDamage(BASE_OBJECT *psTarget, UDWORD damage, UBYTE attackPlayer); +extern bool electronicDamage(BASE_OBJECT *psTarget, UDWORD damage, UBYTE attackPlayer); /* EW works differently in multiplayer mode compared with single player.*/ -extern BOOL validStructResistance(STRUCTURE *psStruct); +extern bool validStructResistance(STRUCTURE *psStruct); /*checks to see if a specific structure type exists -as opposed to a structure stat type*/ -extern BOOL checkSpecificStructExists(UDWORD structInc, UDWORD player); +extern bool checkSpecificStructExists(UDWORD structInc, UDWORD player); extern int32_t getStructureDamage(const STRUCTURE* psStructure); @@ -282,10 +282,10 @@ extern UDWORD structureBaseBody(const STRUCTURE *psStructure); extern void hqReward(UBYTE losingPlayer, UBYTE rewardPlayer); // Is a structure a factory of somekind? -extern BOOL StructIsFactory(STRUCTURE *Struct); +extern bool StructIsFactory(STRUCTURE *Struct); // Is a flag a factory delivery point? -extern BOOL FlagIsFactory(FLAG_POSITION *psCurrFlag); +extern bool FlagIsFactory(FLAG_POSITION *psCurrFlag); // Find a factories corresonding delivery point. extern FLAG_POSITION *FindFactoryDelivery(STRUCTURE *Struct); @@ -298,7 +298,7 @@ one to build - if any*/ extern DROID_TEMPLATE * factoryProdUpdate(STRUCTURE *psStructure, DROID_TEMPLATE *psTemplate); //increment the production run for this type -extern void factoryProdAdjust(STRUCTURE *psStructure, DROID_TEMPLATE *psTemplate, BOOL add); +extern void factoryProdAdjust(STRUCTURE *psStructure, DROID_TEMPLATE *psTemplate, bool add); //returns the quantity of a specific template in the production list ProductionRunEntry getProduction(STRUCTURE *psStructure, DROID_TEMPLATE *psTemplate); @@ -310,7 +310,7 @@ extern UBYTE checkProductionForCommand(UBYTE player); extern void checkDeliveryPoints(UDWORD version); //adjust the loop quantity for this factory -extern void factoryLoopAdjust(STRUCTURE *psStruct, BOOL add); +extern void factoryLoopAdjust(STRUCTURE *psStruct, bool add); /*cancels the production run for the factory and returns any power that was accrued but not used*/ @@ -337,49 +337,49 @@ extern float structHeightScale(STRUCTURE *psStruct); /*compares the structure sensor type with the droid weapon type to see if the FIRE_SUPPORT order can be assigned*/ -extern BOOL structSensorDroidWeapon(STRUCTURE *psStruct, DROID *psDroid); +extern bool structSensorDroidWeapon(STRUCTURE *psStruct, DROID *psDroid); /*checks if the structure has a Counter Battery sensor attached - returns true if it has*/ -extern BOOL structCBSensor(const STRUCTURE* psStruct); +extern bool structCBSensor(const STRUCTURE* psStruct); /*checks if the structure has a Standard Turret sensor attached - returns true if it has*/ -extern BOOL structStandardSensor(const STRUCTURE* psStruct); +extern bool structStandardSensor(const STRUCTURE* psStruct); /*checks if the structure has a VTOL Intercept sensor attached - returns true if it has*/ -extern BOOL structVTOLSensor(const STRUCTURE* psStruct); +extern bool structVTOLSensor(const STRUCTURE* psStruct); /*checks if the structure has a VTOL Counter Battery sensor attached - returns true if it has*/ -extern BOOL structVTOLCBSensor(const STRUCTURE* psStruct); +extern bool structVTOLCBSensor(const STRUCTURE* psStruct); // return the nearest rearm pad // if bClear is true it tries to find the nearest clear rearm pad in // the same cluster as psTarget // psTarget can be NULL -STRUCTURE * findNearestReArmPad(DROID *psDroid, STRUCTURE *psTarget, BOOL bClear); +STRUCTURE * findNearestReArmPad(DROID *psDroid, STRUCTURE *psTarget, bool bClear); // check whether a rearm pad is clear -BOOL clearRearmPad(STRUCTURE *psStruct); +bool clearRearmPad(STRUCTURE *psStruct); // clear a rearm pad for a vtol to land on it void ensureRearmPadClear(STRUCTURE *psStruct, DROID *psDroid); // return whether a rearm pad has a vtol on it -BOOL vtolOnRearmPad(STRUCTURE *psStruct, DROID *psDroid); +bool vtolOnRearmPad(STRUCTURE *psStruct, DROID *psDroid); /* Just returns true if the structure's present body points aren't as high as the original*/ -extern BOOL structIsDamaged(STRUCTURE *psStruct); +extern bool structIsDamaged(STRUCTURE *psStruct); // give a structure from one player to another - used in Electronic Warfare -extern STRUCTURE * giftSingleStructure(STRUCTURE *psStructure, UBYTE attackPlayer, BOOL bFromScript); +extern STRUCTURE * giftSingleStructure(STRUCTURE *psStructure, UBYTE attackPlayer, bool bFromScript); /*Initialise the production list and set up the production player*/ extern void changeProductionPlayer(UBYTE player); // La! -extern BOOL IsStatExpansionModule(STRUCTURE_STATS *psStats); +extern bool IsStatExpansionModule(STRUCTURE_STATS *psStats); /// is this a blueprint and not a real structure? bool structureIsBlueprint(STRUCTURE *psStructure); @@ -387,7 +387,7 @@ bool isBlueprint(BASE_OBJECT *psObject); /*checks that the structure stats have loaded up as expected - must be done after all StructureStats parts have been loaded*/ -extern BOOL checkStructureStats(void); +extern bool checkStructureStats(void); /*returns the power cost to build this structure*/ extern UDWORD structPowerToBuild(const STRUCTURE* psStruct); @@ -395,13 +395,13 @@ extern UDWORD structPowerToBuild(const STRUCTURE* psStruct); extern UDWORD getMaxDroids(UDWORD PlayerNumber); // check whether a factory of a certain number and type exists -extern BOOL checkFactoryExists(UDWORD player, UDWORD factoryType, UDWORD inc); +extern bool checkFactoryExists(UDWORD player, UDWORD factoryType, UDWORD inc); /*checks the structure passed in is a Las Sat structure which is currently selected - returns true if valid*/ -extern BOOL lasSatStructSelected(STRUCTURE *psStruct); +extern bool lasSatStructSelected(STRUCTURE *psStruct); -BOOL structureCheckReferences(STRUCTURE *psVictimStruct); +bool structureCheckReferences(STRUCTURE *psVictimStruct); void cbNewDroid(STRUCTURE *psFactory, DROID *psDroid); diff --git a/src/structuredef.h b/src/structuredef.h index 3035d87e3..011460058 100644 --- a/src/structuredef.h +++ b/src/structuredef.h @@ -201,7 +201,7 @@ struct FACTORY struct RES_EXTRACTOR { - BOOL active; /*indicates when the extractor is on ie digging up oil*/ + bool active; /*indicates when the extractor is on ie digging up oil*/ struct STRUCTURE * psPowerGen; ///< owning power generator }; diff --git a/src/text.cpp b/src/text.cpp index 1253f57b2..efc956cbb 100644 --- a/src/text.cpp +++ b/src/text.cpp @@ -31,7 +31,7 @@ struct STR_RES* psStringRes = NULL; /* Initialise the string system */ -BOOL stringsInitialise(void) +bool stringsInitialise(void) { psStringRes = strresCreate(); diff --git a/src/text.h b/src/text.h index c54535f3c..cae004fb4 100644 --- a/src/text.h +++ b/src/text.h @@ -31,7 +31,7 @@ struct STR_RES; extern struct STR_RES *psStringRes; /* Initialise the string system */ -extern BOOL stringsInitialise(void); +extern bool stringsInitialise(void); /* Shut down the string system */ extern void stringsShutDown(void); diff --git a/src/texture.cpp b/src/texture.cpp index 2a0c52c94..5ff1282d0 100644 --- a/src/texture.cpp +++ b/src/texture.cpp @@ -217,7 +217,7 @@ bool texLoad(const char *fileName) sprintf(fullPath, "%s/tile-%02d.png", partialPath, k); if (PHYSFS_exists(fullPath)) // avoid dire warning { - BOOL retval = iV_loadImage_PNG(fullPath, &tile); + bool retval = iV_loadImage_PNG(fullPath, &tile); ASSERT_OR_RETURN(false, retval, "Could not load %s!", fullPath); } else diff --git a/src/transporter.cpp b/src/transporter.cpp index 8a2ee5a43..03ce24cf6 100644 --- a/src/transporter.cpp +++ b/src/transporter.cpp @@ -141,29 +141,29 @@ extern W_SCREEN *psWScreen; /* Static variables */ static DROID *psCurrTransporter; static DROID *g_psCurScriptTransporter = NULL; -static BOOL onMission; +static bool onMission; static UDWORD g_iLaunchTime = 0; //used for audio message for reinforcements -static BOOL bFirstTransporter; +static bool bFirstTransporter; //the tab positions of the DroidsAvail window static UWORD objMajor = 0, objMinor = 0; /*functions */ -static BOOL intAddTransporterContents(void); +static bool intAddTransporterContents(void); static void transporterRemoveDroid(UDWORD id); static void setCurrentTransporter(UDWORD id); static void intRemoveTransContentNoAnim(void); -static BOOL intAddTransButtonForm(void); -static BOOL intAddTransContentsForm(void); -static BOOL intAddDroidsAvailForm(void); +static bool intAddTransButtonForm(void); +static bool intAddTransContentsForm(void); +static bool intAddDroidsAvailForm(void); void intRemoveTransContent(void); static UDWORD transporterSpaceRequired(DROID *psDroid); static DROID* transInterfaceDroidList(void); static void intTransporterAddDroid(UDWORD id); static void intRemoveTransDroidsAvail(void); static void intRemoveTransDroidsAvailNoAnim(void); -static BOOL _intRefreshTransporter(void); -static BOOL _intAddTransporter(DROID *psSelected, BOOL offWorld); +static bool _intRefreshTransporter(void); +static bool _intAddTransporter(DROID *psSelected, bool offWorld); static void _intProcessTransporter(UDWORD id); @@ -177,7 +177,7 @@ void initTransporters(void) // Call to refresh the transporter screen, ie when a droids boards it. // -BOOL intRefreshTransporter(void) +bool intRefreshTransporter(void) { //printf("intRefreshTransporter\n"); @@ -185,13 +185,13 @@ BOOL intRefreshTransporter(void) } -static BOOL _intRefreshTransporter(void) +static bool _intRefreshTransporter(void) { // Is the transporter screen up? if( (intMode == INT_TRANSPORTER) && (widgGetFromID(psWScreen,IDTRANS_FORM) != NULL)) { - BOOL Ret; + bool Ret; // Refresh it by re-adding it. Ret = intAddTransporter(psCurrTransporter,onMission); intMode = INT_TRANSPORTER; @@ -202,7 +202,7 @@ static BOOL _intRefreshTransporter(void) } -BOOL intAddTransporter(DROID *psSelected, BOOL offWorld) +bool intAddTransporter(DROID *psSelected, bool offWorld) { return(_intAddTransporter(psSelected,offWorld)); @@ -210,9 +210,9 @@ BOOL intAddTransporter(DROID *psSelected, BOOL offWorld) /*Add the Transporter Interface*/ -static BOOL _intAddTransporter(DROID *psSelected, BOOL offWorld) +static bool _intAddTransporter(DROID *psSelected, bool offWorld) { - BOOL Animate = true; + bool Animate = true; onMission = offWorld; psCurrTransporter = psSelected; @@ -307,9 +307,9 @@ static BOOL _intAddTransporter(DROID *psSelected, BOOL offWorld) } // Add the main Transporter Contents Interface -BOOL intAddTransporterContents(void) +bool intAddTransporterContents(void) { - BOOL Animate = true; + bool Animate = true; // Is the form already up? if(widgGetFromID(psWScreen,IDTRANS_CONTENTFORM) != NULL) @@ -413,7 +413,7 @@ BOOL intAddTransporterContents(void) } /*This is used to display the transporter button and capacity when at the home base ONLY*/ -BOOL intAddTransporterLaunch(DROID *psDroid) +bool intAddTransporterLaunch(DROID *psDroid) { UDWORD capacity; DROID *psCurr, *psNext; @@ -498,7 +498,7 @@ void intRemoveTransporterLaunch(void) } /* Add the Transporter Button form */ -BOOL intAddTransButtonForm(void) +bool intAddTransButtonForm(void) { UDWORD numButtons, i; SDWORD BufferID; @@ -655,7 +655,7 @@ BOOL intAddTransButtonForm(void) } /* Add the Transporter Contents form */ -BOOL intAddTransContentsForm(void) +bool intAddTransContentsForm(void) { UDWORD i; SDWORD BufferID; @@ -758,12 +758,12 @@ BOOL intAddTransContentsForm(void) } /* Add the Droids back at home form */ -BOOL intAddDroidsAvailForm(void) +bool intAddDroidsAvailForm(void) { UDWORD numButtons, i, butPerForm; SDWORD BufferID; DROID *psDroid; - BOOL Animate = true; + bool Animate = true; // Is the form already up? if(widgGetFromID(psWScreen,IDTRANS_DROIDS) != NULL) @@ -1403,7 +1403,7 @@ void intTransporterAddDroid(UDWORD id) /*Adds a droid to the transporter, removing it from the world */ void transporterAddDroid(DROID *psTransporter, DROID *psDroidToAdd) { - BOOL bDroidRemoved; + bool bDroidRemoved; ASSERT( psTransporter != NULL, "Was passed a NULL transporter" ); ASSERT( psDroidToAdd != NULL, "Was passed a NULL droid, can't add to transporter" ); @@ -1463,7 +1463,7 @@ void transporterAddDroid(DROID *psTransporter, DROID *psDroidToAdd) } /*check to see if the droid can fit on the Transporter - return true if fits*/ -BOOL checkTransporterSpace(DROID *psTransporter, DROID *psAssigned) +bool checkTransporterSpace(DROID *psTransporter, DROID *psAssigned) { DROID *psDroid, *psNext; UDWORD capacity; @@ -1557,7 +1557,7 @@ void transporterSetLaunchTime(UDWORD time) /*launches the defined transporter to the offworld map*/ -BOOL launchTransporter(DROID *psTransporter) +bool launchTransporter(DROID *psTransporter) { UDWORD iX, iY; @@ -1607,7 +1607,7 @@ BOOL launchTransporter(DROID *psTransporter) /*checks how long the transporter has been travelling to see if it should have arrived - returns true when there*/ -BOOL updateTransporter(DROID *psTransporter) +bool updateTransporter(DROID *psTransporter) { ASSERT( psTransporter != NULL, "updateTransporter: Invalid droid pointer" ); @@ -1828,7 +1828,7 @@ void resetTransporter() } /*checks the order of the droid to see if its currently flying*/ -BOOL transporterFlying(DROID *psTransporter) +bool transporterFlying(DROID *psTransporter) { ASSERT( psTransporter != NULL, "transporterFlying: Invalid droid pointer" ); diff --git a/src/transporter.h b/src/transporter.h index cf2cd3084..f275615e5 100644 --- a/src/transporter.h +++ b/src/transporter.h @@ -35,9 +35,9 @@ //initialises Transporter variables extern void initTransporters(void); // Refresh the transporter screen. -extern BOOL intRefreshTransporter(void); +extern bool intRefreshTransporter(void); /*Add the Transporter Interface*/ -extern BOOL intAddTransporter(DROID *psSelected, BOOL offWorld); +extern bool intAddTransporter(DROID *psSelected, bool offWorld); /* Remove the Transporter widgets from the screen */ extern void intRemoveTrans(void); extern void intRemoveTransNoAnim(void); @@ -47,7 +47,7 @@ extern void intProcessTransporter(UDWORD id); /*Adds a droid to the transporter, removing it from the world*/ extern void transporterAddDroid(DROID *psTransporter, DROID *psDroidToAdd); /*check to see if the droid can fit on the Transporter - return true if fits*/ -extern BOOL checkTransporterSpace(DROID *psTransporter, DROID *psAssigned); +extern bool checkTransporterSpace(DROID *psTransporter, DROID *psAssigned); /*calculates how much space is remaining on the transporter - allows droids to take up different amount depending on their body size - currently all are set to one!*/ extern UDWORD calcRemainingCapacity(DROID *psTransporter); @@ -55,11 +55,11 @@ extern UDWORD calcRemainingCapacity(DROID *psTransporter); extern bool transporterIsEmpty(const DROID* psTransporter); /*launches the defined transporter to the offworld map*/ -extern BOOL launchTransporter(DROID *psTransporter); +extern bool launchTransporter(DROID *psTransporter); /*checks how long the transporter has been travelling to see if it should have arrived - returns true when there*/ -extern BOOL updateTransporter(DROID *psTransporter); +extern bool updateTransporter(DROID *psTransporter); extern void intUpdateTransCapacity(WIDGET *psWidget, W_CONTEXT *psContext); @@ -72,7 +72,7 @@ extern void processLaunchTransporter(void); extern SDWORD bobTransporterHeight( void ); /*This is used to display the transporter button and capacity when at the home base ONLY*/ -extern BOOL intAddTransporterLaunch(DROID *psDroid); +extern bool intAddTransporterLaunch(DROID *psDroid); /* set current transporter (for script callbacks) */ extern void transporterSetScriptCurrent( DROID *psTransporter ); @@ -81,7 +81,7 @@ extern void transporterSetScriptCurrent( DROID *psTransporter ); extern DROID * transporterGetScriptCurrent( void ); /* check whether transporter on mission */ -//extern BOOL transporterOnMission( void ); +//extern bool transporterOnMission( void ); /*called when a Transporter has arrived back at the LZ when sending droids to safety*/ extern void resetTransporter(void); @@ -95,7 +95,7 @@ extern void transporterSetLaunchTime(UDWORD time); extern void flashMissionButton(UDWORD buttonID); extern void stopMissionButtonFlash(UDWORD buttonID); /*checks the order of the droid to see if its currenly flying*/ -extern BOOL transporterFlying(DROID *psTransporter); +extern bool transporterFlying(DROID *psTransporter); //initialise the flag to indicate the first transporter has arrived - set in startMission() extern void initFirstTransporterFlag(void); diff --git a/src/visibility.cpp b/src/visibility.cpp index b0caaee17..a9394d736 100644 --- a/src/visibility.cpp +++ b/src/visibility.cpp @@ -82,7 +82,7 @@ static Vector2i *gWall = NULL; // initialise the visibility stuff -BOOL visInitialise(void) +bool visInitialise(void) { visLevelIncAcc = 0; visLevelDecAcc = 0; @@ -887,7 +887,7 @@ static int checkFireLine(const SIMPLE_OBJECT* psViewer, const BASE_OBJECT* psTar // run a manual trace along the line of fire until target is reached while (partSq < distSq) { - BOOL hasSplitIntersection; + bool hasSplitIntersection; oldPartSq = partSq; diff --git a/src/visibility.h b/src/visibility.h index 4987bebc6..cf4cab9e5 100644 --- a/src/visibility.h +++ b/src/visibility.h @@ -27,7 +27,7 @@ #define LINE_OF_FIRE_MINIMUM 5 // initialise the visibility stuff -extern BOOL visInitialise(void); +extern bool visInitialise(void); /* Check which tiles can be seen by an object */ extern void visTilesUpdate(BASE_OBJECT *psObj); @@ -68,7 +68,7 @@ void visRemoveVisibilityOffWorld(BASE_OBJECT *psObj); void visRemoveVisibility(BASE_OBJECT *psObj); // fast test for whether obj2 is in range of obj1 -static inline BOOL visObjInRange(BASE_OBJECT *psObj1, BASE_OBJECT *psObj2, SDWORD range) +static inline bool visObjInRange(BASE_OBJECT *psObj1, BASE_OBJECT *psObj2, SDWORD range) { int32_t xdiff = psObj1->pos.x - psObj2->pos.x, ydiff = psObj1->pos.y - psObj2->pos.y; diff --git a/src/warcam.cpp b/src/warcam.cpp index 199ece5e4..ab5f8f29a 100644 --- a/src/warcam.cpp +++ b/src/warcam.cpp @@ -73,7 +73,7 @@ static SDWORD warCamLogoRotation; static BASE_OBJECT radarTarget(OBJ_TARGET, 0, 0); /* Do we trun to face when doing a radar jump? */ -static BOOL bRadarAllign; +static bool bRadarAllign; static SDWORD presAvAngle = 0;; @@ -88,10 +88,10 @@ static SDWORD presAvAngle = 0;; /* How much info do you want when tracking a droid - this toggles full stat info */ -static BOOL bFullInfo = false; +static bool bFullInfo = false; /* Are we requesting a new track to start that is a radar (location) track? */ -static BOOL bRadarTrackingRequested = false; +static bool bRadarTrackingRequested = false; /* World coordinates for a radar track/jump */ static float radarX,radarY; @@ -99,7 +99,7 @@ static float radarX,radarY; /* Where we were up to (pos and rot) last update - allows us to see whether we are sufficently near our target to disable further tracking */ static Vector3i oldPosition, oldRotation; -static BOOL OldViewValid; +static bool OldViewValid; //----------------------------------------------------------------------------------- /* Sets the camera to inactive to begin with */ @@ -143,7 +143,7 @@ static void processLeaderSelection( void ) DROID *psPresent; DROID *psNew = NULL; UDWORD leaderClass; - BOOL bSuccess; + bool bSuccess; UDWORD dif; UDWORD bestSoFar; @@ -327,13 +327,13 @@ static BASE_OBJECT *camFindTarget(void) } -BOOL camTrackCamera(void); +bool camTrackCamera(void); /* Updates the camera position/angle along with the object movement */ -BOOL processWarCam( void ) +bool processWarCam( void ) { BASE_OBJECT *foundTarget; -BOOL Status = true; +bool Status = true; /* Get out if the camera isn't active */ if(trackingCamera.status == CAM_INACTIVE) @@ -422,7 +422,7 @@ BOOL Status = true; //----------------------------------------------------------------------------------- /* Flips states for camera active */ -void setWarCamActive(BOOL status) +void setWarCamActive(bool status) { debug( LOG_NEVER, "setWarCamActive(%d)\n", status ); @@ -551,7 +551,7 @@ static uint16_t getAverageTrackAngle(unsigned groupNumber, bool bCheckOnScreen) //----------------------------------------------------------------------------------- -static void getTrackingConcerns(SDWORD *x, SDWORD *y, SDWORD *z, UDWORD groupNumber, BOOL bOnScreen) +static void getTrackingConcerns(SDWORD *x, SDWORD *y, SDWORD *z, UDWORD groupNumber, bool bOnScreen) { SDWORD xTotals = 0, yTotals = 0, zTotals = 0; DROID *psDroid; @@ -624,7 +624,7 @@ static void updateCameraAcceleration(UBYTE update) { Vector3i concern = swapYZ(trackingCamera.target->pos); Vector2i behind(0, 0); /* Irrelevant for normal radar tracking */ - BOOL bFlying = false; + bool bFlying = false; /* This is where we check what it is we're tracking. @@ -749,9 +749,9 @@ static void updateCameraRotationAcceleration( UBYTE update ) SDWORD worldAngle; float separation; SDWORD xConcern, yConcern, zConcern; - BOOL bTooLow; + bool bTooLow; PROPULSION_STATS *psPropStats; - BOOL bGotFlying = false; + bool bGotFlying = false; SDWORD xPos = 0, yPos = 0, zPos = 0; bTooLow = false; @@ -938,11 +938,11 @@ static UDWORD getRotationMagnitude( void ) /* Returns how far away we are from our goal in rotation */ /* Updates the viewpoint according to the object being tracked */ -BOOL camTrackCamera( void ) +bool camTrackCamera( void ) { PROPULSION_STATS *psPropStats; DROID *psDroid; -BOOL bFlying; +bool bFlying; bFlying = false; @@ -1113,7 +1113,7 @@ UDWORD getNumDroidsSelected( void ) //----------------------------------------------------------------------------------- /* Returns whether or not the tracking camera is active */ -BOOL getWarCamStatus( void ) +bool getWarCamStatus( void ) { /* Is it switched off? */ if(trackingCamera.status == CAM_INACTIVE) @@ -1169,9 +1169,9 @@ void requestRadarTrack(SDWORD x, SDWORD y) } /* Returns whether we're presently tracking to a new _location_ */ -BOOL getRadarTrackingStatus( void ) +bool getRadarTrackingStatus( void ) { -BOOL retVal; +bool retVal; if(trackingCamera.status == CAM_INACTIVE) { diff --git a/src/warcam.h b/src/warcam.h index 897e7dc74..32d9b84eb 100644 --- a/src/warcam.h +++ b/src/warcam.h @@ -73,13 +73,13 @@ BASE_OBJECT *target; /* Externally referenced functions */ extern void initWarCam ( void ); -extern void setWarCamActive ( BOOL status ); -extern BOOL getWarCamStatus ( void ); +extern void setWarCamActive ( bool status ); +extern bool getWarCamStatus ( void ); extern void camToggleStatus ( void ); -extern BOOL processWarCam ( void ); +extern bool processWarCam ( void ); extern void camToggleInfo ( void ); extern void requestRadarTrack ( SDWORD x, SDWORD y ); -extern BOOL getRadarTrackingStatus( void ); +extern bool getRadarTrackingStatus( void ); extern void toggleRadarAllignment( void ); extern void camInformOfRotation ( Vector3i *rotation ); extern BASE_OBJECT *camFindDroidTarget(void); diff --git a/src/warzoneconfig.cpp b/src/warzoneconfig.cpp index ebac0d0d1..e7fdf0308 100644 --- a/src/warzoneconfig.cpp +++ b/src/warzoneconfig.cpp @@ -45,11 +45,11 @@ struct WARZONE_GLOBALS { FMV_MODE FMVmode; - BOOL bFog; + bool bFog; SWORD effectsLevel; - BOOL Fullscreen; - BOOL soundEnabled; - BOOL trapCursor; + bool Fullscreen; + bool soundEnabled; + bool trapCursor; UDWORD width; UDWORD height; unsigned int fsaa; @@ -112,12 +112,12 @@ int8_t war_GetSPcolor(void) return warGlobs.SPcolor; } -void war_setFullscreen(BOOL b) +void war_setFullscreen(bool b) { warGlobs.Fullscreen = b; } -BOOL war_getFullscreen(void) +bool war_getFullscreen(void) { return warGlobs.Fullscreen; } @@ -132,12 +132,12 @@ unsigned int war_getFSAA() return warGlobs.fsaa; } -void war_SetTrapCursor(BOOL b) +void war_SetTrapCursor(bool b) { warGlobs.trapCursor = b; } -BOOL war_GetTrapCursor(void) +bool war_GetTrapCursor(void) { return warGlobs.trapCursor; } @@ -174,7 +174,7 @@ UDWORD war_GetHeight(void) /***************************************************************************/ /***************************************************************************/ -void war_SetFog(BOOL val) +void war_SetFog(bool val) { debug(LOG_FOG, "Visual fog turned %s", val ? "ON" : "OFF"); @@ -197,7 +197,7 @@ void war_SetFog(BOOL val) } } -BOOL war_GetFog(void) +bool war_GetFog(void) { return warGlobs.bFog; } @@ -234,12 +234,12 @@ bool war_GetColouredCursor(void) return warGlobs.ColouredCursor; } -void war_setSoundEnabled( BOOL soundEnabled ) +void war_setSoundEnabled( bool soundEnabled ) { warGlobs.soundEnabled = soundEnabled; } -BOOL war_getSoundEnabled( void ) +bool war_getSoundEnabled( void ) { return warGlobs.soundEnabled; } diff --git a/src/warzoneconfig.h b/src/warzoneconfig.h index f73a90dc3..9ce798d5c 100644 --- a/src/warzoneconfig.h +++ b/src/warzoneconfig.h @@ -45,18 +45,18 @@ enum FMV_MODE */ /***************************************************************************/ extern void war_SetDefaultStates(void); -extern void war_SetFog(BOOL val); -extern BOOL war_GetFog(void); +extern void war_SetFog(bool val); +extern bool war_GetFog(void); extern void war_SetFMVmode(FMV_MODE mode); extern FMV_MODE war_GetFMVmode(void); -extern void war_SetAllowSubtitles(BOOL); -extern BOOL war_GetAllowSubtitles(void); -extern void war_setFullscreen(BOOL); -extern BOOL war_getFullscreen(void); +extern void war_SetAllowSubtitles(bool); +extern bool war_GetAllowSubtitles(void); +extern void war_setFullscreen(bool); +extern bool war_getFullscreen(void); extern void war_setFSAA(unsigned int); extern unsigned int war_getFSAA(void); -extern void war_SetTrapCursor(BOOL b); -extern BOOL war_GetTrapCursor(void); +extern void war_SetTrapCursor(bool b); +extern bool war_GetTrapCursor(void); extern void war_SetVsync(bool b); extern bool war_GetVsync(void); extern void war_SetWidth(UDWORD width); @@ -77,13 +77,13 @@ extern void war_SetSPcolor(int color); * * \param soundEnabled enable sound (or not) */ -void war_setSoundEnabled( BOOL soundEnabled ); +void war_setSoundEnabled( bool soundEnabled ); /** * Whether we should initialize sound or not * * \return Enable sound (or not) */ -BOOL war_getSoundEnabled( void ); +bool war_getSoundEnabled( void ); #endif // __INCLUDED_SRC_WARZONECONFIG_H__ diff --git a/src/wrappers.cpp b/src/wrappers.cpp index 34881af69..2c5344166 100644 --- a/src/wrappers.cpp +++ b/src/wrappers.cpp @@ -50,15 +50,15 @@ struct STAR PIELIGHT colour; }; -static BOOL firstcall = false; -static BOOL bPlayerHasLost = false; -static BOOL bPlayerHasWon = false; +static bool firstcall = false; +static bool bPlayerHasLost = false; +static bool bPlayerHasWon = false; static UBYTE scriptWinLoseVideo = PLAY_NONE; void runCreditsScreen ( void ); static UDWORD lastChange = 0; -BOOL hostlaunch = false; // used to detect if we are hosting a game via command line option. +bool hostlaunch = false; // used to detect if we are hosting a game via command line option. static uint32_t lastTick = 0; static int barLeftX, barLeftY, barRightX, barRightY, boxWidth, boxHeight, starsNum, starHeight; @@ -108,7 +108,7 @@ static void setupLoadingScreen(void) // ////////////////////////////////////////////////////////////////// // Initialise frontend globals and statics. // -BOOL frontendInitVars(void) +bool frontendInitVars(void) { firstcall = true; setupLoadingScreen(); @@ -318,7 +318,7 @@ void loadingScreenCallback(void) } // fill buffers with the static screen -void initLoadingScreen( BOOL drawbdrop ) +void initLoadingScreen( bool drawbdrop ) { pie_ShowMouse(false); if (!drawbdrop) // fill buffers @@ -388,7 +388,7 @@ void closeLoadingScreen(void) //////////////////////////////////////////////////////////////////////////////// // Gameover screen. -BOOL displayGameOver(BOOL bDidit) +bool displayGameOver(bool bDidit) { if(bDidit) { @@ -417,24 +417,24 @@ BOOL displayGameOver(BOOL bDidit) //////////////////////////////////////////////////////////////////////////////// -BOOL testPlayerHasLost( void ) +bool testPlayerHasLost( void ) { return(bPlayerHasLost); } -void setPlayerHasLost( BOOL val ) +void setPlayerHasLost( bool val ) { bPlayerHasLost = val; } //////////////////////////////////////////////////////////////////////////////// -BOOL testPlayerHasWon( void ) +bool testPlayerHasWon( void ) { return(bPlayerHasWon); } -void setPlayerHasWon( BOOL val ) +void setPlayerHasWon( bool val ) { bPlayerHasWon = val; } diff --git a/src/wrappers.h b/src/wrappers.h index 5b7754294..5b38495e2 100644 --- a/src/wrappers.h +++ b/src/wrappers.h @@ -35,22 +35,22 @@ enum TITLECODE #define PLAY_WIN 1 #define PLAY_LOSE 2 -extern BOOL hostlaunch; +extern bool hostlaunch; -BOOL frontendInitVars(void); +bool frontendInitVars(void); TITLECODE titleLoop(void); -void initLoadingScreen(BOOL drawbdrop); +void initLoadingScreen(bool drawbdrop); void closeLoadingScreen(void); void loadingScreenCallback(void); void startCreditsScreen(void); -BOOL displayGameOver(BOOL success); -void setPlayerHasLost(BOOL val); -BOOL testPlayerHasLost(void); -BOOL testPlayerHasWon(void); -void setPlayerHasWon(BOOL val); +bool displayGameOver(bool success); +void setPlayerHasLost(bool val); +bool testPlayerHasLost(void); +bool testPlayerHasWon(void); +void setPlayerHasWon(bool val); void setScriptWinLoseVideo(UBYTE val); UBYTE getScriptWinLoseVideo(void);