[colobot] 97/390: Merge branch 'dev-physfs' into dev
Didier Raboud
odyx at moszumanska.debian.org
Fri Jun 12 14:21:33 UTC 2015
This is an automated email from the git hooks/post-receive script.
odyx pushed a commit to branch upstream/latest
in repository colobot.
commit 0245fdc6c328edf65b4fd9f45be4f440ef92b6eb
Merge: d7ef0a1 83abb8c
Author: krzys-h <krzys_h at interia.pl>
Date: Sun Oct 19 16:18:36 2014 +0200
Merge branch 'dev-physfs' into dev
Conflicts:
src/app/app.cpp
.gitignore | 2 +
.travis.yml | 2 +-
CMakeLists.txt | 1 +
cmake/FindPhysFS.cmake | 36 +
data | 2 +-
desktop/.gitignore | 3 +
lib/localename/.gitignore | 1 +
src/CMakeLists.txt | 13 +-
src/app/app.cpp | 120 +-
src/app/app.h | 16 +-
src/app/gamedata.cpp | 139 --
src/app/gamedata.h | 69 -
src/app/main.cpp | 2 +
src/app/pausemanager.cpp | 18 +-
src/app/system.cpp | 10 +-
src/app/system.h | 7 +-
src/app/system_linux.cpp | 34 +-
src/app/system_linux.h | 3 +-
src/app/system_macosx.cpp | 14 +-
src/app/system_macosx.h | 3 +-
src/app/system_windows.cpp | 25 +-
src/app/system_windows.h | 3 +-
src/common/image.cpp | 14 +-
src/common/profile.cpp | 58 +-
src/common/profile.h | 3 -
.../resources/inputstream.cpp} | 56 +-
.../resources/inputstream.h} | 28 +-
src/common/resources/inputstreambuffer.cpp | 132 ++
.../resources/inputstreambuffer.h} | 40 +-
.../resources/outputstream.cpp} | 50 +-
.../resources/outputstream.h} | 27 +-
src/common/resources/outputstreambuffer.cpp | 89 ++
.../resources/outputstreambuffer.h} | 35 +-
src/common/resources/resourcemanager.cpp | 280 ++++
src/common/resources/resourcemanager.h | 63 +
src/common/resources/sndfile.cpp | 133 ++
.../system_macosx.h => common/resources/sndfile.h} | 38 +-
src/graphics/engine/cloud.cpp | 6 +-
src/graphics/engine/engine.cpp | 49 +-
src/graphics/engine/lightning.cpp | 2 +-
src/graphics/engine/modelfile.cpp | 20 +-
src/graphics/engine/modelmanager.cpp | 7 +-
src/graphics/engine/particle.cpp | 8 +-
src/graphics/engine/planet.cpp | 4 +-
src/graphics/engine/pyro.cpp | 4 +-
src/graphics/engine/terrain.cpp | 19 +-
src/graphics/engine/text.cpp | 22 +-
src/graphics/engine/water.cpp | 6 +-
src/object/auto/autobase.cpp | 4 +-
src/object/level/parser.cpp | 244 ++++
src/object/level/parser.h | 69 +
src/object/level/parserexceptions.cpp | 45 +
.../level/parserexceptions.h} | 46 +-
src/object/level/parserline.cpp | 90 ++
src/object/level/parserline.h | 62 +
src/object/level/parserparam.cpp | 940 ++++++++++++++
src/object/level/parserparam.h | 137 ++
src/object/robotmain.cpp | 1371 +++++++++-----------
src/object/robotmain.h | 12 +-
src/script/cmdtoken.cpp | 2 +
src/script/script.cpp | 52 +-
src/sound/oalsound/alsound.cpp | 23 +-
src/sound/oalsound/alsound.h | 67 +-
src/sound/oalsound/buffer.cpp | 33 +-
src/sound/sound.cpp | 2 +-
src/ui/button.cpp | 2 +-
src/ui/check.cpp | 2 +-
src/ui/color.cpp | 2 +-
src/ui/compass.cpp | 2 +-
src/ui/control.cpp | 14 +-
src/ui/displayinfo.cpp | 282 ----
src/ui/displayinfo.h | 1 -
src/ui/edit.cpp | 83 +-
src/ui/gauge.cpp | 2 +-
src/ui/group.cpp | 60 +-
src/ui/image.cpp | 8 +-
src/ui/key.cpp | 2 +-
src/ui/list.cpp | 10 +-
src/ui/maindialog.cpp | 265 ++--
src/ui/maindialog.h | 7 +-
src/ui/map.cpp | 34 +-
src/ui/scroll.cpp | 8 +-
src/ui/shortcut.cpp | 6 +-
src/ui/slider.cpp | 6 +-
src/ui/studio.cpp | 1 -
src/ui/window.cpp | 38 +-
test/envs/CMakeLists.txt | 3 +-
test/unit/common/profile_test.cpp | 1 -
tools/check-levels.sh | 18 +-
89 files changed, 3727 insertions(+), 2045 deletions(-)
diff --cc src/app/app.cpp
index 77930ed,150fb87..06e3f01
--- a/src/app/app.cpp
+++ b/src/app/app.cpp
@@@ -114,9 -113,8 +113,8 @@@ CApplication::CApplication(
m_exitCode = 0;
m_active = false;
m_debugModes = 0;
- m_customDataPath = false;
- m_windowTitle = "COLOBOT GOLD";
+ m_windowTitle = "COLOBOT: Gold Edition";
m_simulationSuspended = false;
@@@ -151,12 -149,12 +149,18 @@@
m_mouseButtonsState = 0;
m_trackedKeys = 0;
+ #ifdef PORTABLE
+ m_dataPath = "./data";
+ m_langPath = "./lang";
+ #else
m_dataPath = GetSystemUtils()->GetDataPath();
m_langPath = GetSystemUtils()->GetLangPath();
- #if DEV_BUILD
- m_savePath = "saves";
++ #endif
++
++ #ifdef DEV_BUILD
++ m_savePath = "./saves";
+ #else
+ m_savePath = GetSystemUtils()->GetSaveDir();
#endif
m_runSceneName = "";
diff --cc src/ui/maindialog.cpp
index c0656a6,7d1da0a..dec4586
--- a/src/ui/maindialog.cpp
+++ b/src/ui/maindialog.cpp
@@@ -4704,45 -4644,57 +4642,20 @@@ void CMainDialog::UpdateSceneResume(in
m_bSceneSoluce = false;
}
}
-
- BuildSceneName(fileName, m_sceneName, rank);
- sprintf(op, "Resume.E");
- sprintf(op_i18n, "Resume.%c", m_app->GetLanguageChar());
-
- file = fopen(fileName.c_str(), "r");
- if ( file == NULL ) return;
-
- name[0] = 0;
- while ( fgets(line, 500, file) != NULL )
+
+ if(rank<100) return;
+
+ try {
+ CLevelParser* level = new CLevelParser(m_sceneName, rank/100, rank%100);
+ level->Load();
+ pe->SetText(level->Get("Resume")->GetParam("text")->AsString().c_str());
+ }
+ catch(CLevelParserException& e)
{
- for ( i=0 ; i<500 ; i++ )
- {
- if (line[i] == 0)
- break;
-
- if ( line[i] == '\t' ) line[i] = ' '; // replaces tab by space
- if ( line[i] == '/' && line[i+1] == '/' )
- {
- line[i] = 0;
- break;
- }
- }
-
- if ( Cmd(line, op) )
- {
- OpString(line, "text", name);
- }
- if ( Cmd(line, op_i18n) )
- {
- OpString(line, "text", name);
- break;
- }
+ pe->SetText((std::string("[ERROR]: ")+e.what()).c_str());
}
- fclose(file);
-
- pe->SetText(name);
}
-// Updates the list of devices.
-
-void CMainDialog::UpdateDisplayDevice()
-{
- CWindow* pw;
- CList* pl;
- char bufDevices[1000];
- //char bufModes[5000];
- int i, j;
-
- pw = static_cast<CWindow*>(m_interface->SearchControl(EVENT_WINDOW5));
- if ( pw == 0 ) return;
- pl = static_cast<CList*>(pw->SearchControl(EVENT_LIST1));
- if ( pl == 0 ) return;
- pl->Flush();
-
- //bufModes[0] = 0;
- /* TODO: remove device choice
- m_engine->EnumDevices(bufDevices, 1000,
- bufModes, 5000,
- totalDevices, selectDevices,
- totalModes, selectModes);*/
-
- i = 0;
- j = 0;
- while ( bufDevices[i] != 0 )
- {
- pl->SetItemName(j++, bufDevices+i);
- while ( bufDevices[i++] != 0 );
- }
-
- pl->SetSelect(0);
- pl->ShowSelect(false);
-
- m_setupSelDevice = 0;
-}
-
// Updates the list of modes.
void CMainDialog::UpdateDisplayMode()
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git
More information about the Pkg-games-commits
mailing list