← Back to branch summary

~flamefire/s25rttr/s25rttr

~flamefire/s25rttr/s25rttr

« back to all changes in this revision

Viewing changes to src/GameSavegame.cpp

Committer: Alex
Date: 2013-08-27 22:44:20 UTC
mfrom: (8873.1.48 trunk)
Revision ID: alex@flamefire-20130827224420-29ckzxhc59p3yc3f

Merge trunk

files added:
src/AddonAsyncDebug.h

files removed:
codelite

codelite/s25client.project

codelite/s25client.workspace

driver/audio/SDL/codelite

driver/audio/SDL/codelite/audio-SDL.project

driver/audio/SDL/win32/vs2008

driver/audio/SDL/win32/vs2008/audioSDL.vcproj

driver/codelite

driver/codelite/audio.project

driver/codelite/video.project

driver/video/SDL/codelite

driver/video/SDL/codelite/video-SDL.project

driver/video/SDL/win32/vs2008

driver/video/SDL/win32/vs2008/videoSDL.vcproj

driver/video/WinAPI/win32/vs2008

driver/video/WinAPI/win32/vs2008/videoWinAPI.vcproj

driver/win32/vs2008

driver/win32/vs2008/audio.vcproj

driver/win32/vs2008/video.vcproj

libendian/codelite

libendian/codelite/libendian.project

libendian/win32/vs2008

libendian/win32/vs2008/libendian.vcproj

liblobby/win32/vs2008

liblobby/win32/vs2008/liblobby_c.vcproj

liblobby/win32/vs2008/liblobby_s.vcproj

libsiedler2/codelite

libsiedler2/codelite/libsiedler2.project

libsiedler2/win32/vs2008

libsiedler2/win32/vs2008/libsiedler2.sln

libsiedler2/win32/vs2008/libsiedler2.vcproj

mygettext/codelite

mygettext/codelite/mygettext.project

mygettext/win32/vs2008

mygettext/win32/vs2008/mygettext.vcproj

s-c/resample-1.8.1/win32/vs2008

s-c/resample-1.8.1/win32/vs2008/resample-1.8.1.sln

s-c/resample-1.8.1/win32/vs2008/resample-1.8.1.vcproj

s-c/win32/vs2008

s-c/win32/vs2008/sound-convert.sln

s-c/win32/vs2008/sound-convert.vcproj

s25update/win32/vs2008

s25update/win32/vs2008/s25update.vcproj

version/win32/vs2008

version/win32/vs2008/version.vcproj

win32/vs2008

win32/vs2008/s25client-setup.vdproj

win32/vs2008/s25client.sln

win32/vs2008/s25client.vcproj

files modified:
INSTALL

driver/src/AudioInterface.h

driver/src/VideoInterface.h

driver/video/SDL/src/SDL.cpp

driver/video/WinAPI/src/WinAPI.cpp

liblobby/src/main.h

libsiedler2/src/LoadBMP.cpp

libutil/src/files.h

s25update/src/main.cpp

src/AIJHHelper.cpp

src/AIPlayerJH.cpp

src/AIPlayerJH.h

src/CMakeLists.txt

src/GameClient.cpp

src/GameClient.h

src/GameClientGF_Game.cpp

src/GameClientPlayer.cpp

src/GameClientPlayer.h

src/GameReplay.cpp

src/GameSavegame.cpp

src/GameServer.cpp

src/GameServer.h

src/GameWorldBase.cpp

src/GlobalGameSettings.cpp

src/SerializedGameData.cpp

src/Settings.cpp

src/const_addons.h

src/dskSplash.cpp

src/iwAddons.cpp

src/main.h

src/noFigure.cpp

src/nobBaseWarehouse.cpp

src/nobBaseWarehouse.h

src/nobMilitary.cpp

src/nofActiveSoldier.cpp

src/nofPassiveSoldier.cpp

src/nofSoldier.cpp

src/nofSoldier.h

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

Show diffs side-by-side

added added

removed removed

src/GameSavegame.cpp

1

// $Id: GameSavegame.cpp 8505 2012-11-12 18:04:58Z marcus $

1

// $Id: GameSavegame.cpp 8920 2013-08-27 19:40:37Z marcus $

2

2

//

3

3

// Copyright (c) 2005 - 2011 Settlers Freaks (sf-team at siedler25.org)

4

4

//

Older »