Skip to content

Commit 2fcdae7

Browse files
Shoes01Shoes01
committed
Merge branch 'master' into alpha_release
Conflicts: src/Savegame/SavedGame.h src/Savegame/Soldier.cpp src/Savegame/Soldier.h
2 parents aecbd28 + 400debc commit 2fcdae7

46 files changed

Lines changed: 440 additions & 273 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

bin/Run-Win32-Debug.bat renamed to Run-Win32-Debug.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
@cd Win32
1+
@cd bin\Win32
22
@start Debug\OpenXcom.exe -data "..\data"

bin/Run-Win32-Release.bat renamed to Run-Win32-Release.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
@cd Win32
1+
@cd bin\Win32
22
@start Release\OpenXcom.exe -data "..\data"

bin/Run-Win64-Debug.bat renamed to Run-Win64-Debug.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
@cd Win64
1+
@cd bin\Win32
22
@start Debug\OpenXcom.exe -data "..\data"

bin/Run-Win64-Release.bat renamed to Run-Win64-Release.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
@cd Win64
1+
@cd bin\Win64
22
@start Release\OpenXcom.exe -data "..\data"

‎bin/data/Language/en-GB.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1331,7 +1331,7 @@ en-GB:
13311331
STR_FIELDPROMOTIONS: "Field promotions"
13321332
STR_FIELDPROMOTIONS_DESC: "Only soldiers that were present at the mission site are eligible for promotion."
13331333
STR_IRONMAN: "IRONMAN"
1334-
STR_IRONMAN_DESC: "No manual saving. All choices are permanent."
1334+
STR_IRONMAN_DESC: "No manual saving"
13351335
STR_SAVE_AND_ABANDON_GAME: "SAVE AND ABANDON GAME"
13361336
STR_MOD_UNSUCCESSFUL: "Mod failed to load"
13371337
STR_NEW_SAVED_GAME_SLOT: "<NEW SAVED GAME>"

‎bin/data/Language/en-US.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1331,7 +1331,7 @@ en-US:
13311331
STR_FIELDPROMOTIONS: "Field promotions"
13321332
STR_FIELDPROMOTIONS_DESC: "Only soldiers that were present at the mission site are eligible for promotion."
13331333
STR_IRONMAN: "IRONMAN"
1334-
STR_IRONMAN_DESC: "No manual saving. All choices are permanent."
1334+
STR_IRONMAN_DESC: "No manual saving"
13351335
STR_SAVE_AND_ABANDON_GAME: "SAVE AND ABANDON GAME"
13361336
STR_MOD_UNSUCCESSFUL: "Mod failed to load"
13371337
STR_NEW_SAVED_GAME_SLOT: "<NEW SAVED GAME>"

‎install/win/installer.nsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@
9797
!insertmacro MUI_LANGUAGE "PortugueseBR"
9898
!insertmacro MUI_LANGUAGE "Polish"
9999
!insertmacro MUI_LANGUAGE "Romanian"
100+
!insertmacro MUI_LANGUAGE "Spanish"
100101
!insertmacro MUI_LANGUAGE "Turkish"
101102

102103
!include "installerlang.nsh" ; Language strings

‎install/win/installerlang.nsh‎

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,4 +289,41 @@ LangString LINK_Uninstall ${LANG_TURKISH} "Program Kaldır"
289289
;Warnings
290290

291291
LangString WARN_UFOMissing ${LANG_TURKISH} "X-COM 1 bu dizinde bulunamadı. ${GAME_NAME} için geçerli bir X-COM kurulumu zorunludur. Devam?"
292-
LangString WARN_XCUDetected ${LANG_TURKISH} "XcomUtil tespit edildi. ${GAME_NAME} XcomUtil ile uyumlu olmadığından tuhaf sorunlarla karşılabilirsiniz. Devam?"
292+
LangString WARN_XCUDetected ${LANG_TURKISH} "XcomUtil tespit edildi. ${GAME_NAME} XcomUtil ile uyumlu olmadığından tuhaf sorunlarla karşılabilirsiniz. Devam?"
293+
294+
;================SPANISH================
295+
296+
;--------------------------------
297+
;Pages
298+
299+
LangString PAGE_UfoFolder ${LANG_SPANISH} "${GAME_NAME} requiere una copia de UFO: Enemy Unknown / X-COM: UFO Defense. Puede omitir este paso si va a actualizar una instalación existente.$\n$\nEl programa de instalación copiará los archivos necesarios en la siguiente carpeta. Para copiar desde una carpeta diferente, presione en Explorar y seleccione otra carpeta. Precione en Siguiente para continuar."
300+
LangString PAGE_UfoFolder_TITLE ${LANG_SPANISH} "Selecione ubicación X-COM 1 "
301+
LangString PAGE_UfoFolder_SUBTITLE ${LANG_SPANISH} "Selecione la carpeta donde tiene X-COM 1 instalado."
302+
LangString DEST_UfoFolder ${LANG_SPANISH} "X-COM 1 carpeta"
303+
;--------------------------------
304+
;Installer Sections
305+
306+
LangString NAME_SecMain ${LANG_SPANISH} "Archivos del juego"
307+
LangString DESC_SecMain ${LANG_SPANISH} "Archivos necesarios para ejecutar ${GAME_NAME}."
308+
LangString NAME_SecPatch ${LANG_SPANISH} "Parche de datos"
309+
LangString DESC_SecPatch ${LANG_SPANISH} "Corrige los errores en los datos de X-COM 1. Recomendado para instalaciones iniciales. (requiere una conexión al Internet)"
310+
LangString NAME_SecDesktop ${LANG_SPANISH} "Atajo en el escritorio"
311+
LangString DESC_SecDesktop ${LANG_SPANISH} "Crea un acceso directo en el escritorio para jugar ${GAME_NAME}."
312+
313+
;--------------------------------
314+
;Uninstaller Descriptions
315+
LangString NAME_UnData ${LANG_SPANISH} "Borra datos de X-COM"
316+
LangString DESC_UnData ${LANG_SPANISH} "Borra todos los datos de ${GAME_NAME}, incluyendo mods y los recursos de X-COM. Recomendado para una reinstalación limpia."
317+
LangString NAME_UnUser ${LANG_SPANISH} "Borra datos de usuario"
318+
LangString DESC_UnUser ${LANG_SPANISH} "Borra todos los datos del usuario ${GAME_NAME}, incluyendo partidas guardadas, capturas de pantalla y opciones. Recomendado para una limpieza completa. "
319+
;--------------------------------
320+
;Shortcuts
321+
LangString LINK_DataFolder ${LANG_SPANISH} "Carpeta de datos"
322+
LangString LINK_Readme ${LANG_SPANISH} "Leerme"
323+
LangString LINK_UserFolder ${LANG_SPANISH} "Carpeta de usuario"
324+
LangString LINK_Uninstall ${LANG_SPANISH} "Desinstalación"
325+
326+
;--------------------------------
327+
;Warnings
328+
LangString WARN_UFOMissing ${LANG_SPANISH} "X-COM 1 no se encuentra en esta carpeta. ${GAME_NAME} requiere una instalación válida de X-COM para ejecutarse. ¿Desea continuar?"
329+
LangString WARN_XCUDetected ${LANG_SPANISH} "XcomUtil detectado. ${GAME_NAME} es incompatible con XcomUtil y puede experimentar un comportamiento extraño. ¿Desea continuar?"

‎src/Basescape/BasescapeState.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ void BasescapeState::handleKeyPress(Action *action)
511511
Options::keyBaseSelect8};
512512
int base = -1;
513513
int key = action->getDetails()->key.keysym.sym;
514-
for (int i = 0; i < MiniBaseView::MAX_BASES; ++i)
514+
for (size_t i = 0; i < MiniBaseView::MAX_BASES; ++i)
515515
{
516516
if (key == baseKeys[i])
517517
{

‎src/Basescape/SellState.cpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -562,6 +562,7 @@ void SellState::changeByValue(int change, int dir)
562562
// Calculate the change in storage space in tenths of an XCom storage unit.
563563
Craft *craft;
564564
RuleItem *armor, *item, *weapon, *ammo;
565+
double total = 0.0;
565566
switch (getType(_sel))
566567
{
567568
case SELL_SOLDIER:
@@ -572,7 +573,6 @@ void SellState::changeByValue(int change, int dir)
572573
}
573574
break;
574575
case SELL_CRAFT:
575-
double total;
576576
craft = _crafts[getCraftIndex(_sel)];
577577
for (std::vector<CraftWeapon*>::iterator w = craft->getWeapons()->begin(); w != craft->getWeapons()->end(); ++w)
578578
{
@@ -588,8 +588,7 @@ void SellState::changeByValue(int change, int dir)
588588
item = _game->getRuleset()->getItem(_items[getItemIndex(_sel)]);
589589
_spaceChange -= dir * change * (int)(10 * item->getSize());
590590
break;
591-
case SELL_ENGINEER:
592-
case SELL_SCIENTIST:
591+
default:
593592
break;
594593
}
595594

0 commit comments

Comments
 (0)