- Updated Windows installer.

- Updated Readme.
- Fixed Battlescape soldiers starting at the back.
- Added scroll wheel and camera movement to Battlescape level changing.
- Some cleanup.

git-svn-id: https://openxcom.svn.sourceforge.net/svnroot/openxcom/trunk@260 11c4a5ed-7179-4546-81a6-367b3be9d812

Author: SupSuper

README.txt

@@ -50,6 +50,32 @@ contents of your X-Com folder into the DATA subfolder.
 
 Run openxcom to play.
 
+1.4. Options
+-------------
+You can use the following command-line arguments to
+change the game�s internal settings:
+
+"-fullscreen" - starts the game in full-screen mode
+instead of in a window.
+
+"-width w -height h" - resizes the game screen to that
+resolution. Since the original resolution is tiny, by default
+the game runs at 640�400 resolution (2x size). You can
+use this to make the game bigger to suit your tastes.
+Be careful though, the game will only work in full-screen
+if you use a resolution supported by your system.
+
+You can also use the following keyboard shortcuts:
+
+F5 - Saves screenshot to USER folder.
+F12 - Turns on/off FPS counter.
+ALT-ENTER - Turns on/off fullscreen mode.
+
+You can also use custom music if you have issues with
+the default game MIDIs. The game will play any music file
+in MIDI, MP3 or OGG format that matches the original filenames
+in the Windows version (GMGEO1, GMGEO2, GMSTORY, etc).
+
 
 2. For developers
 ===================

install/installer-win32.nsi

@@ -91,6 +91,7 @@ FunctionEnd
 	!insertmacro MUI_PAGE_FINISH
 
 	!insertmacro MUI_UNPAGE_WELCOME
+	!insertmacro MUI_UNPAGE_COMPONENTS
 	!insertmacro MUI_UNPAGE_CONFIRM
 	!insertmacro MUI_UNPAGE_INSTFILES
 	!insertmacro MUI_UNPAGE_FINISH
@@ -151,6 +152,22 @@ Section "Game Files" SecMain
 	CopyFiles /SILENT "$UFODIR\UNITS\*.*" "$INSTDIR\DATA\UNITS" 467
 
 	ufo_no:
+	
+	SetOutPath "$INSTDIR\DATA\Language"
+	
+	File "..\bin\DATA\Language\English.lng"
+	File "..\bin\DATA\Language\French.geo"
+	File "..\bin\DATA\Language\French.lng"
+	File "..\bin\DATA\Language\German.geo"
+	File "..\bin\DATA\Language\German.lng"
+	File "..\bin\DATA\Language\Italian.geo"
+	File "..\bin\DATA\Language\Italian.lng"
+	File "..\bin\DATA\Language\Spanish.geo"
+	File "..\bin\DATA\Language\Spanish.lng"
+	
+	SetOutPath "$INSTDIR\USER"
+	
+	File "..\bin\USER\README.txt"
 
 	;Store installation folder
 	WriteRegStr HKLM "Software\${GAME_NAME}" "" $INSTDIR
@@ -204,10 +221,20 @@ SectionEnd
 	!insertmacro MUI_FUNCTION_DESCRIPTION_END
 
 ;--------------------------------
-;Uninstaller Section
+;Uninstaller Sections
+
+Section /o "un.Delete User Files" UnUser
+	Delete "$INSTDIR\USER\*.*"
+SectionEnd
 
-Section "Uninstall"
+Section "un.Delete X-Com Data" UnData
+	RMDir /r "$INSTDIR\DATA"
+SectionEnd
 
+Section "-un.Main"
+	
+	SetOutPath "$TEMP"
+	
 	Delete "$INSTDIR\OpenXcom.exe"
 	Delete "$INSTDIR\libogg-0.dll"
 	Delete "$INSTDIR\libvorbis-0.dll"
@@ -221,11 +248,24 @@ Section "Uninstall"
 	Delete "$INSTDIR\msvcr100.dll"
 	Delete "$INSTDIR\COPYING"
 	Delete "$INSTDIR\README.txt"
+	
 	Delete "$INSTDIR\DATA\README.txt"
+	Delete "$INSTDIR\DATA\Language\English.lng"
+	Delete "$INSTDIR\DATA\Language\French.geo"
+	Delete "$INSTDIR\DATA\Language\French.lng"
+	Delete "$INSTDIR\DATA\Language\German.geo"
+	Delete "$INSTDIR\DATA\Language\German.lng"
+	Delete "$INSTDIR\DATA\Language\Italian.geo"
+	Delete "$INSTDIR\DATA\Language\Italian.lng"
+	Delete "$INSTDIR\DATA\Language\Spanish.geo"
+	Delete "$INSTDIR\DATA\Language\Spanish.lng"
+	RMDir "$INSTDIR\DATA\Language"
+	RMDir "$INSTDIR\DATA"
+	
+	Delete "$INSTDIR\USER\README.txt"
+	RMDir "$INSTDIR\USER"
 
 	Delete "$INSTDIR\Uninstall.exe"
-	
-	RMDir /r "$INSTDIR\DATA"
 	RMDir "$INSTDIR"
 
 	!insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder
@@ -242,6 +282,19 @@ Section "Uninstall"
 
 SectionEnd
 
+;--------------------------------
+;Uninstaller Descriptions
+
+	;Language strings
+	LangString DESC_UnUser ${LANG_ENGLISH} "Deletes all savegames, screenshots, options, etc."
+	LangString DESC_UnData ${LANG_ENGLISH} "Deletes the copied X-Com resources."
+
+	;Assign language strings to sections
+	!insertmacro MUI_UNFUNCTION_DESCRIPTION_BEGIN
+		!insertmacro MUI_DESCRIPTION_TEXT ${UnUser} $(DESC_UnUser)
+		!insertmacro MUI_DESCRIPTION_TEXT ${UnData} $(DESC_UnData)
+	!insertmacro MUI_UNFUNCTION_DESCRIPTION_END
+
 ;--------------------------------
 ;Version Information
 

src/Basescape/BaseInfoState.cpp

@@ -393,11 +393,13 @@ void BaseInfoState::edtBaseKeyPress(Action *action)
  */
 void BaseInfoState::miniClick(Action *action)
 {
+	if (_mini->getHoveredBase() < 0)
+		return;
 	unsigned int base = _mini->getHoveredBase();
-	if (base >= 0 && base < _game->getSavedGame()->getBases()->size())
+	if (base < _game->getSavedGame()->getBases()->size())
 	{
 		_mini->setSelectedBase(base);
-		_base = _game->getSavedGame()->getBases()->at(_mini->getHoveredBase());
+		_base = _game->getSavedGame()->getBases()->at(base);
 		_state->setBase(_base);
 		init();
 	}

src/Basescape/BasescapeState.cpp

@@ -422,11 +422,13 @@ void BasescapeState::viewMouseOut(Action *action)
  */
 void BasescapeState::miniClick(Action *action)
 {
+	if (_mini->getHoveredBase() < 0)
+		return;
 	unsigned int base = _mini->getHoveredBase();
-	if (base >= 0 && base < _game->getSavedGame()->getBases()->size())
+	if (base < _game->getSavedGame()->getBases()->size())
 	{
 		_mini->setSelectedBase(base);
-		_base = _game->getSavedGame()->getBases()->at(_mini->getHoveredBase());
+		_base = _game->getSavedGame()->getBases()->at(base);
 		init();
 	}
 }

src/Battlescape/BattlescapeGenerator.cpp

@@ -235,7 +235,7 @@ void BattlescapeGenerator::addSoldier(Soldier *soldier, RuleUnitSprite *rules)
 	Position pos;
 	int x, y, z;
 
-	for (int i = 0; i < _height * _length * _width; i++)
+	for (int i = _height * _length * _width - 1; i >= 0; i--)
 	{
 		// to spawn an xcom soldier, there has to be a tile, with a floor, with the starting point attribute and no object in the way
 		if (_save->getTiles()[i] && _save->getTiles()[i]->getMapData(O_FLOOR) && _save->getTiles()[i]->getMapData(O_FLOOR)->getSpecialType() == START_POINT && !_save->getTiles()[i]->getMapData(O_OBJECT))

src/Battlescape/BattlescapeState.cpp

@@ -261,7 +261,7 @@ void BattlescapeState::mapClick(Action *action)
 		Pathfinding *pf = _battleGame->getPathfinding();
 		pf->calculate(_battleGame->getSelectedUnit(), pos);
 	}
-	if (action->getDetails()->button.button == SDL_BUTTON_RIGHT)
+	else if (action->getDetails()->button.button == SDL_BUTTON_RIGHT)
 	{
 		BattleUnit *unit = _battleGame->getSelectedUnit();
 		unit->lookAt(pos);

src/Battlescape/Map.cpp

@@ -357,44 +357,23 @@ void Map::drawTerrain()
 }
 
 /**
- * Blits the map onto another surface. 
- * @param surface Pointer to another surface.
- */
-void Map::blit(Surface *surface)
-{
-	Surface::blit(surface);
-}
-
-/**
- * Ignores any mouse clicks that are outside the map.
- * @param action Pointer to an action.
- * @param state State that the action handlers belong to.
- */
-void Map::mousePress(Action *action, State *state)
-{
-
-}
-
-/**
- * Ignores any mouse clicks that are outside the map.
+ * Handles map mouse shortcuts.
  * @param action Pointer to an action.
  * @param state State that the action handlers belong to.
  */
-void Map::mouseRelease(Action *action, State *state)
+void Map::mouseClick(Action *action, State *state)
 {
-
+	InteractiveSurface::mouseClick(action, state);
+	if (action->getDetails()->button.button == SDL_BUTTON_WHEELUP)
+	{
+		up();
+	}
+	else if (action->getDetails()->button.button == SDL_BUTTON_WHEELDOWN)
+	{
+		down();
+	}
 }
 
-/**
- * Ignores any mouse clicks that are outside the map
- * @param action Pointer to an action.
- * @param state State that the action handlers belong to.
- */
-/*void Map::mouseClick(Action *action, State *state)
-{
-	int test=0;
-}*/
-
 /**
  * Handles map keyboard shortcuts.
  * @param action Pointer to an action.
@@ -617,19 +596,25 @@ void Map::animate()
  */
 void Map::up()
 {
-	_viewHeight++;
-	minMaxInt(&_viewHeight, 0, _save->getHeight()-1);
-	draw();
+	if (_viewHeight < _save->getHeight() - 1)
+	{
+		_viewHeight++;
+		_mapOffsetY += _spriteHeight / 2;
+		draw();
+	}
 }
 
 /**
  * Go one level down.
  */
 void Map::down()
 {
-	_viewHeight--;
-	minMaxInt(&_viewHeight, 0, _save->getHeight()-1);
-	draw();
+	if (_viewHeight > 0)
+	{
+		_viewHeight--;
+		_mapOffsetY -= _spriteHeight / 2;
+		draw();
+	}
 }
 
 /**
@@ -639,6 +624,7 @@ void Map::down()
 void Map::setViewHeight(int viewheight)
 {
 	_viewHeight = viewheight;
+	minMaxInt(&_viewHeight, 0, _save->getHeight()-1);
 	draw();
 }
 

src/Battlescape/Map.h

@@ -82,14 +82,8 @@ class Map : public InteractiveSurface
 	void draw();
 	/// draws the terrain
 	void drawTerrain();
-	/// blit the surface
-	void blit(Surface *surface);
-	/// Special handling for mouse presses.
-	void mousePress(Action *action, State *state);
-	/// Special handling for mouse releases.
-	void mouseRelease(Action *action, State *state);
 	/// Special handling for mouse clicks.
-	//void mouseClick(Action *action, State *state);
+	void mouseClick(Action *action, State *state);
 	/// Special handling for mous over
 	void mouseOver(Action *action, State *state);
 	/// Special handling for key presses.

src/Engine/Game.cpp

@@ -265,8 +265,8 @@ Language *const Game::getLanguage() const
 }
 
 /**
- * Sets a new saved game for the game to use.
- * @param save Pointer to the saved game.
+ * Changes the language currently in use by the game.
+ * @param lang Pointer to the language.
  */
 void Game::setLanguage(Language *lang)
 {

src/Engine/Language.cpp

@@ -44,6 +44,7 @@ Language::~Language()
  * to a wide-character string.
  * @note Adapted from http://www.linuxquestions.org/questions/programming-9/wstring-utf8-conversion-in-pure-c-701084/
  * @param src UTF-8 string.
+ * @return Wide-character string.
  */
 std::wstring Language::utf8ToWstr(const std::string& src)
 {
@@ -104,6 +105,7 @@ std::wstring Language::utf8ToWstr(const std::string& src)
  * to a 8-bit string encoded in UTF-8.
  * @note Adapted from http://www.linuxquestions.org/questions/programming-9/wstring-utf8-conversion-in-pure-c-701084/
  * @param src Wide-character string.
+ * @return UTF-8 string.
  */
 std::string Language::wstrToUtf8(const std::wstring& src)
 {