~flosoft/s25rttr/trunk

Committer: FloSoft
Date: 2014-04-25 15:35:50 UTC
Revision ID: flosoft@siedler25.org-20140425153550-9muu4vodhlqu58m0

committing subversion revision 9357 by FloSoft
astyle

modified:
s25client/trunk/
s25client/trunk/contrib/lua/lin32/include/
s25client/trunk/contrib/lua/lin64/include/
s25client/trunk/contrib/lua/mac/include/
s25client/trunk/contrib/lua/win32/include/
s25client/trunk/contrib/lua/win64/include/
s25client/trunk/driver/audio/SDL/src/
s25client/trunk/driver/src/
s25client/trunk/driver/video/GLFW/src/
s25client/trunk/driver/video/SDL/src/
s25client/trunk/driver/video/WinAPI/src/
s25client/trunk/src/
s25client/trunk/win32/
s25client/trunk/win32/prebuild-mutex/src/

files modified:
build_version.cpp

contrib/lua/lin32/include/lauxlib.h

contrib/lua/lin32/include/lua.h

contrib/lua/lin32/include/luaconf.h

contrib/lua/lin32/include/lualib.h

contrib/lua/lin64/include/lauxlib.h

contrib/lua/lin64/include/lua.h

contrib/lua/lin64/include/luaconf.h

contrib/lua/lin64/include/lualib.h

contrib/lua/mac/include/lauxlib.h

contrib/lua/mac/include/lua.h

contrib/lua/mac/include/luaconf.h

contrib/lua/mac/include/lualib.h

contrib/lua/win32/include/lauxlib.h

contrib/lua/win32/include/lua.h

contrib/lua/win32/include/luaconf.h

contrib/lua/win32/include/lualib.h

contrib/lua/win64/include/lauxlib.h

contrib/lua/win64/include/lua.h

contrib/lua/win64/include/luaconf.h

contrib/lua/win64/include/lualib.h

driver/audio/SDL/src/SDL.cpp

driver/audio/SDL/src/SDL.h

driver/audio/SDL/src/SoundSDL_Effect.cpp

driver/audio/SDL/src/SoundSDL_Effect.h

driver/audio/SDL/src/SoundSDL_Music.cpp

driver/audio/SDL/src/SoundSDL_Music.h

driver/audio/SDL/src/main.h

driver/src/AudioDriver.cpp

driver/src/AudioDriver.h

driver/src/AudioInterface.h

driver/src/DriverInterface.cpp

driver/src/Interface.h

driver/src/Sound.cpp

driver/src/Sound.h

driver/src/VideoDriver.cpp

driver/src/VideoDriver.h

driver/src/VideoInterface.h

driver/src/main.h

driver/src/tempname.cpp

driver/src/tempname.h

driver/video/GLFW/src/GLFW.cpp

driver/video/GLFW/src/GLFW.h

driver/video/GLFW/src/main.h

driver/video/GLFW/src/oem.cpp

driver/video/GLFW/src/oem.h

driver/video/SDL/src/SDL.cpp

driver/video/SDL/src/SDL.h

driver/video/SDL/src/main.h

driver/video/WinAPI/src/WinAPI.cpp

driver/video/WinAPI/src/WinAPI.h

driver/video/WinAPI/src/main.h

src/AIBase.h

src/AIConstruction.cpp

src/AIConstruction.h

src/AIEventManager.cpp

src/AIEventManager.h

src/AIInterface.cpp

src/AIInterface.h

src/AIJHHelper.cpp

src/AIJHHelper.h

src/AIPlayer.cpp

src/AIPlayer.h

src/AIPlayerJH.cpp

src/AIPlayerJH.h

src/AIResourceMap.cpp

src/AIResourceMap.h

src/AddonAIDebugWindow.h

src/AddonAdjustMilitaryStrength.h

src/AddonAsyncDebug.h

src/AddonCatapultGraphics.h

src/AddonChangeGoldDeposits.h

src/AddonCharburner.h

src/AddonCustomBuildSequence.h

src/AddonDefenderBehavior.h

src/AddonDemolitionProhibition.h

src/AddonExhaustibleWells.h

src/AddonInexhaustibleFish.h

src/AddonInexhaustibleGraniteMines.h

src/AddonInexhaustibleMines.h

src/AddonLimitCatapults.h

src/AddonManualRoadEnlargement.h

src/AddonMaxRank.h

src/AddonMaxWaterwayLength.h

src/AddonMilitaryAid.h

src/AddonNoCoinsDefault.h

src/AddonRefundMaterials.h

src/AddonRefundOnEmergency.h

src/AddonSeaAttack.h

src/AddonShipSpeed.h

src/AddonStatisticsVisibility.h

src/AddonToolOrdering.h

src/AddonTrade.h

src/Addons.cpp

src/Addons.h

src/AudioDriverLoaderInterface.h

src/AudioDriverWrapper.cpp

src/AudioDriverWrapper.h

src/BuildingConsts.h

src/BurnedWarehouse.cpp

src/BurnedWarehouse.h

src/CatapultStone.cpp

src/CatapultStone.h

src/ClientInterface.cpp

src/ClientInterface.h

src/CollisionDetection.cpp

src/CollisionDetection.h

src/Debug.cpp

src/Debug.h

src/Desktop.cpp

src/Desktop.h

src/DoorConsts.h

src/DriverWrapper.cpp

src/DriverWrapper.h

src/EventManager.cpp

src/EventManager.h

src/ExtensionList.cpp

src/ExtensionList.h

src/FOWObjects.cpp

src/FOWObjects.h

src/FileChecksum.cpp

src/FileChecksum.h

src/GameClient.cpp

src/GameClient.h

src/GameClientCommands.cpp

src/GameClientGF_Game.cpp

src/GameClientGF_Replay.cpp

src/GameClientPlayer.cpp

src/GameClientPlayer.h

src/GameCommands.cpp

src/GameCommands.h

src/GameConsts.h

src/GameInterface.h

src/GameManager.cpp

src/GameManager.h

src/GameMessage.cpp

src/GameMessage.h

src/GameMessageInterface.h

src/GameMessages.h

src/GameObject.cpp

src/GameObject.h

src/GamePlayerInfo.cpp

src/GamePlayerInfo.h

src/GamePlayerList.cpp

src/GameProtocol.h

src/GameReplay.cpp

src/GameReplay.h

src/GameSavedFile.cpp

src/GameSavedFile.h

src/GameSavegame.cpp

src/GameSavegame.h

src/GameServer.cpp

src/GameServer.h

src/GameServerPlayer.cpp

src/GameServerPlayer.h

src/GameWorld.cpp

src/GameWorld.h

src/GameWorldBase.cpp

src/GameWorldGame.cpp

src/GameWorldView.cpp

src/GameWorldViewer.cpp

src/GammaTable.h

src/GlobalGameSettings.cpp

src/GlobalGameSettings.h

src/GlobalVars.cpp

src/GlobalVars.h

src/IngameWindow.cpp

src/IngameWindow.h

src/JobConsts.h

src/ListDir.cpp

src/ListDir.h

src/Loader.cpp

src/Loader.h

src/MapConsts.h

src/MapGeometry.cpp

src/MapGeometry.h

src/Messenger.cpp

src/Messenger.h

src/MilitaryConsts.h

src/Minimap.cpp

src/Minimap.h

src/MinimapConsts.h

src/MouseAndKeys.h

src/Msgbox.h

src/MusicPlayer.cpp

src/MusicPlayer.h

src/NodalObjectTypes.h

src/Node.h

src/Pathfinding.cpp

src/PointDistance.h

src/PostMsg.cpp

src/PostMsg.h

src/Random.cpp

src/Random.h

src/RoadSegment.cpp

src/RoadSegment.h

src/SerializedGameData.cpp

src/SerializedGameData.h

src/Settings.cpp

src/Settings.h

src/SoundManager.cpp

src/SoundManager.h

src/Swap.h

src/TerrainRenderer.cpp

src/TerrainRenderer.h

src/TerritoryRegion.cpp

src/TerritoryRegion.h

src/TradeGraph.cpp

src/TradeGraph.h

src/VideoDriverLoaderInterface.h

src/VideoDriverWrapper.cpp

src/VideoDriverWrapper.h

src/Ware.cpp

src/Ware.h

src/Window.cpp

src/Window.h

src/WindowManager.cpp

src/WindowManager.h

src/const_addons.h

src/const_gui_ids.h

src/ctrlBuildingIcon.cpp

src/ctrlBuildingIcon.h

src/ctrlButton.cpp

src/ctrlButton.h

src/ctrlChat.cpp

src/ctrlChat.h

src/ctrlCheck.cpp

src/ctrlCheck.h

src/ctrlComboBox.cpp

src/ctrlComboBox.h

src/ctrlDeepening.cpp

src/ctrlDeepening.h

src/ctrlEdit.cpp

src/ctrlEdit.h

src/ctrlGroup.cpp

src/ctrlGroup.h

src/ctrlImage.cpp

src/ctrlImage.h

src/ctrlIngameMinimap.cpp

src/ctrlIngameMinimap.h

src/ctrlList.cpp

src/ctrlList.h

src/ctrlMinimap.cpp

src/ctrlMinimap.h

src/ctrlMultiSelectGroup.cpp

src/ctrlMultiSelectGroup.h

src/ctrlMultiline.cpp

src/ctrlMultiline.h

src/ctrlOptionGroup.cpp

src/ctrlOptionGroup.h

src/ctrlPercent.cpp

src/ctrlPercent.h

src/ctrlPreviewMinimap.cpp

src/ctrlPreviewMinimap.h

src/ctrlProgress.cpp

src/ctrlProgress.h

src/ctrlRectangle.h

src/ctrlScrollBar.cpp

src/ctrlScrollBar.h

src/ctrlTab.cpp

src/ctrlTab.h

src/ctrlTable.cpp

src/ctrlTable.h

src/ctrlText.cpp

src/ctrlText.h

src/ctrlTimer.cpp

src/ctrlTimer.h

src/ctrlVarDeepening.cpp

src/ctrlVarDeepening.h

src/ctrlVarText.cpp

src/ctrlVarText.h

src/customborderbuilder.cpp

src/customborderbuilder.h

src/dskAboutRTTR.cpp

src/dskAboutRTTR.h

src/dskCredits.cpp

src/dskCredits.h

src/dskDirectIP.cpp

src/dskDirectIP.h

src/dskGameInterface.cpp

src/dskGameInterface.h

src/dskGameLoader.cpp

src/dskGameLoader.h

src/dskHostGame.cpp

src/dskHostGame.h

src/dskIntro.cpp

src/dskIntro.h

src/dskLobby.cpp

src/dskLobby.h

src/dskMainMenu.cpp

src/dskMainMenu.h

src/dskMultiPlayer.cpp

src/dskMultiPlayer.h

src/dskOptions.cpp

src/dskOptions.h

src/dskSelectMap.cpp

src/dskSelectMap.h

src/dskSinglePlayer.cpp

src/dskSinglePlayer.h

src/dskSplash.cpp

src/dskSplash.h

src/glAllocator.cpp

src/glAllocator.h

src/glArchivItem_Bitmap.cpp

src/glArchivItem_Bitmap.h

src/glArchivItem_Bitmap_Direct.cpp

src/glArchivItem_Bitmap_Direct.h

src/glArchivItem_Bitmap_Player.cpp

src/glArchivItem_Bitmap_Player.h

src/glArchivItem_Bitmap_RLE.cpp

src/glArchivItem_Bitmap_RLE.h

src/glArchivItem_Bitmap_Raw.cpp

src/glArchivItem_Bitmap_Raw.h

src/glArchivItem_Bitmap_Shadow.cpp

src/glArchivItem_Bitmap_Shadow.h

src/glArchivItem_Bob.cpp

src/glArchivItem_Bob.h

src/glArchivItem_Font.cpp

src/glArchivItem_Font.h

src/glArchivItem_Map.cpp

src/glArchivItem_Map.h

src/glArchivItem_Music.cpp

src/glArchivItem_Music.h

src/glArchivItem_Sound.cpp

src/glArchivItem_Sound.h

src/glArchivItem_Sound_Midi.cpp

src/glArchivItem_Sound_Midi.h

src/glArchivItem_Sound_Other.cpp

src/glArchivItem_Sound_Other.h

src/glArchivItem_Sound_Wave.cpp

src/glArchivItem_Sound_Wave.h

src/glArchivItem_Sound_XMidi.cpp

src/glArchivItem_Sound_XMidi.h

src/glSmartBitmap.cpp

src/glSmartBitmap.h

src/iwAIDebug.cpp

src/iwAIDebug.h

src/iwAction.cpp

src/iwAction.h

src/iwAddons.cpp

src/iwAddons.h

src/iwBaseWarehouse.cpp

src/iwBaseWarehouse.h

src/iwBuildOrder.cpp

src/iwBuildOrder.h

src/iwBuilding.cpp

src/iwBuilding.h

src/iwBuildingProductivities.cpp

src/iwBuildingProductivities.h

src/iwBuildingSite.cpp

src/iwBuildingSite.h

src/iwBuildings.cpp

src/iwBuildings.h

src/iwChat.cpp

src/iwChat.h

src/iwDemolishBuilding.cpp

src/iwDemolishBuilding.h

src/iwDiplomacy.cpp

src/iwDiplomacy.h

src/iwDirectIPConnect.cpp

src/iwDirectIPConnect.h

src/iwDirectIPCreate.cpp

src/iwDirectIPCreate.h

src/iwDistribution.cpp

src/iwDistribution.h

src/iwEndgame.cpp

src/iwEndgame.h

src/iwHQ.cpp

src/iwHQ.h

src/iwHarborBuilding.cpp

src/iwHarborBuilding.h

src/iwHelp.cpp

src/iwHelp.h

src/iwInventory.cpp

src/iwInventory.h

src/iwLobbyConnect.cpp

src/iwLobbyConnect.h

src/iwLobbyRanking.cpp

src/iwLobbyRanking.h

src/iwLobbyServerInfo.cpp

src/iwLobbyServerInfo.h

src/iwMainMenu.cpp

src/iwMainMenu.h

src/iwMerchandiseStatistics.cpp

src/iwMerchandiseStatistics.h

src/iwMilitary.cpp

src/iwMilitary.h

src/iwMilitaryBuilding.cpp

src/iwMilitaryBuilding.h

src/iwMinimap.cpp

src/iwMinimap.h

src/iwMsgbox.cpp

src/iwMsgbox.h

src/iwMusicPlayer.cpp

src/iwMusicPlayer.h

src/iwObservate.cpp

src/iwObservate.h

src/iwOptionsWindow.cpp

src/iwOptionsWindow.h

src/iwPlayReplay.cpp

src/iwPlayReplay.h

src/iwPleaseWait.cpp

src/iwPleaseWait.h

src/iwPostWindow.cpp

src/iwPostWindow.h

src/iwRoadWindow.cpp

src/iwRoadWindow.h

src/iwSave.cpp

src/iwSave.h

src/iwSettings.cpp

src/iwSettings.h

src/iwShip.cpp

src/iwShip.h

src/iwSkipGFs.cpp

src/iwSkipGFs.h

src/iwStatistics.cpp

src/iwStatistics.h

src/iwStorehouse.cpp

src/iwStorehouse.h

src/iwSurrender.cpp

src/iwSurrender.h

src/iwTextfile.cpp

src/iwTextfile.h

src/iwTools.cpp

src/iwTools.h

src/iwTrade.cpp

src/iwTrade.h

src/iwTransport.cpp

src/iwTransport.h

src/iwWares.cpp

src/iwWares.h

src/languages.cpp

src/languages.h

src/list.h

src/macros.h

src/main.cpp

src/main.h

src/noAnimal.cpp

src/noAnimal.h

src/noBase.cpp

src/noBase.h

src/noBaseBuilding.cpp

src/noBaseBuilding.h

src/noBuilding.cpp

src/noBuilding.h

src/noBuildingSite.cpp

src/noBuildingSite.h

src/noCharburnerPile.cpp

src/noCharburnerPile.h

src/noCoordBase.cpp

src/noCoordBase.h

src/noDisappearingEnvObject.cpp

src/noDisappearingEnvObject.h

src/noDisappearingMapEnvObject.cpp

src/noDisappearingMapEnvObject.h

src/noEnvObject.cpp

src/noEnvObject.h

src/noExtension.cpp

src/noExtension.h

src/noFighting.cpp

src/noFighting.h

src/noFigure.cpp

src/noFigure.h

src/noFire.cpp

src/noFire.h

src/noFlag.cpp

src/noFlag.h

src/noGrainfield.cpp

src/noGrainfield.h

src/noGranite.cpp

src/noGranite.h

src/noMovable.cpp

src/noMovable.h

src/noNothing.cpp

src/noNothing.h

src/noRoadNode.cpp

src/noRoadNode.h

src/noShip.cpp

src/noShip.h

src/noShipBuildingSite.cpp

src/noShipBuildingSite.h

src/noSign.cpp

src/noSign.h

src/noSkeleton.cpp

src/noSkeleton.h

src/noStaticObject.cpp

src/noStaticObject.h

src/noTree.cpp

src/noTree.h

src/nobBaseMilitary.cpp

src/nobBaseMilitary.h

src/nobBaseWarehouse.cpp

src/nobBaseWarehouse.h

src/nobHQ.cpp

src/nobHQ.h

src/nobHarborBuilding.cpp

src/nobHarborBuilding.h

src/nobMilitary.cpp

src/nobMilitary.h

src/nobShipYard.cpp

src/nobShipYard.h

src/nobStorehouse.cpp

src/nobStorehouse.h

src/nobUsual.cpp

src/nobUsual.h

src/nofActiveSoldier.cpp

src/nofActiveSoldier.h

src/nofAggressiveDefender.cpp

src/nofAggressiveDefender.h

src/nofArmorer.cpp

src/nofArmorer.h

src/nofAttacker.cpp

src/nofAttacker.h

src/nofBaker.cpp

src/nofBaker.h

src/nofBrewer.cpp

src/nofBrewer.h

src/nofBuilder.cpp

src/nofBuilder.h

src/nofBuildingWorker.cpp

src/nofBuildingWorker.h

src/nofButcher.cpp

src/nofButcher.h

src/nofCarpenter.cpp

src/nofCarpenter.h

src/nofCarrier.cpp

src/nofCarrier.h

src/nofCatapultMan.cpp

src/nofCatapultMan.h

src/nofCharburner.cpp

src/nofCharburner.h

src/nofDefender.cpp

src/nofDefender.h

src/nofDonkeybreeder.cpp

src/nofDonkeybreeder.h

src/nofFarmer.cpp

src/nofFarmer.h

src/nofFarmhand.cpp

src/nofFarmhand.h

src/nofFisher.cpp

src/nofFisher.h

src/nofFlagWorker.cpp

src/nofFlagWorker.h

src/nofForester.cpp

src/nofForester.h

src/nofGeologist.cpp

src/nofGeologist.h

src/nofHunter.cpp

src/nofHunter.h

src/nofIronfounder.cpp

src/nofIronfounder.h

src/nofMetalworker.cpp

src/nofMetalworker.h

src/nofMiller.cpp

src/nofMiller.h

src/nofMiner.cpp

src/nofMiner.h

src/nofMinter.cpp

src/nofMinter.h

src/nofPassiveSoldier.cpp

src/nofPassiveSoldier.h

src/nofPassiveWorker.cpp

src/nofPassiveWorker.h

src/nofPigbreeder.cpp

src/nofPigbreeder.h

src/nofPlaner.cpp

src/nofPlaner.h

src/nofScout_Free.cpp

src/nofScout_Free.h

src/nofScout_LookoutTower.cpp

src/nofScout_LookoutTower.h

src/nofShipWright.cpp

src/nofShipWright.h

src/nofSoldier.cpp

src/nofSoldier.h

src/nofStonemason.cpp

src/nofStonemason.h

src/nofTradeDonkey.cpp

src/nofTradeDonkey.h

src/nofTradeLeader.cpp

src/nofTradeLeader.h

src/nofWarehouseWorker.cpp

src/nofWarehouseWorker.h

src/nofWellguy.cpp

src/nofWellguy.h

src/nofWoodcutter.cpp

src/nofWoodcutter.h

src/nofWorkman.cpp

src/nofWorkman.h

src/signale.cpp

src/strlwr.h

src/win32_nanosleep.cpp

src/win32_nanosleep.h

win32/prebuild-mutex/src/prebuild-mutex.cpp

win32/resource.h

Show diffs side-by-side

added added

removed removed

src/ctrlMultiline.h

// $Id: ctrlMultiline.h 7521 2011-09-08 20:45:55Z FloSoft $

// $Id: ctrlMultiline.h 9357 2014-04-25 15:35:25Z FloSoft $

class ctrlMultiline : public Window

{

public:

/// Breite der Scrollbar

static const unsigned short SCROLLBAR_WIDTH = 20;

public:

ctrlMultiline(Window *parent, unsigned int id, unsigned short x, unsigned short y, unsigned short width, unsigned short height, TextureColor tc, glArchivItem_Font *font, unsigned int format = 0);

//void AddText(const std::string& text, unsigned int color);

void AddString(const std::string& str, unsigned int color, bool scroll = true);

unsigned GetLineCount() { return unsigned(lines.size()); }

/// Gibt den index-ten Eintrag zur�ck

const std::string& GetLine(const unsigned index) const { return lines[index].str; }

void SetLine(const unsigned index, const std::string& str, unsigned int color);

/// Schaltet Box ein und aus

void EnableBox(const bool enable) { draw_box = enable; }

virtual bool Msg_LeftDown(const MouseCoords& mc);

virtual bool Msg_LeftUp(const MouseCoords& mc);

virtual bool Msg_WheelUp(const MouseCoords& mc);

virtual bool Msg_WheelDown(const MouseCoords& mc);

virtual bool Msg_MouseMove(const MouseCoords& mc);

protected:

virtual bool Draw_(void);

void Resize_(unsigned short width, unsigned short height);

private:

TextureColor tc;

glArchivItem_Font *font;

unsigned int format;

struct Line

{

std::string str;

unsigned int color;

};

/// Die ganzen Strings

std::vector<Line> lines;

/// Anzahl der Zeilen, die in das Control passen

unsigned lines_in_control;

/// Soll die Box gezeichnet werden?

bool draw_box;

public:

/// Breite der Scrollbar

static const unsigned short SCROLLBAR_WIDTH = 20;

public:

ctrlMultiline(Window* parent, unsigned int id, unsigned short x, unsigned short y, unsigned short width, unsigned short height, TextureColor tc, glArchivItem_Font* font, unsigned int format = 0);

//void AddText(const std::string& text, unsigned int color);

void AddString(const std::string& str, unsigned int color, bool scroll = true);

unsigned GetLineCount() { return unsigned(lines.size()); }

/// Gibt den index-ten Eintrag zur�ck

const std::string& GetLine(const unsigned index) const { return lines[index].str; }

void SetLine(const unsigned index, const std::string& str, unsigned int color);

/// Schaltet Box ein und aus

void EnableBox(const bool enable) { draw_box = enable; }

virtual bool Msg_LeftDown(const MouseCoords& mc);

virtual bool Msg_LeftUp(const MouseCoords& mc);

virtual bool Msg_WheelUp(const MouseCoords& mc);

virtual bool Msg_WheelDown(const MouseCoords& mc);

virtual bool Msg_MouseMove(const MouseCoords& mc);

protected:

virtual bool Draw_(void);

void Resize_(unsigned short width, unsigned short height);

private:

TextureColor tc;

glArchivItem_Font* font;

unsigned int format;

struct Line

{

std::string str;

unsigned int color;

};

/// Die ganzen Strings

std::vector<Line> lines;

/// Anzahl der Zeilen, die in das Control passen

unsigned lines_in_control;

/// Soll die Box gezeichnet werden?

bool draw_box;

};

#endif /// !CTRLMULTILINE_H_INCLUDED

Older »