From 2260f6bf4feb62929e32a1bea9cd3f403aa034b1 Mon Sep 17 00:00:00 2001 From: Krzysztof Dermont Date: Fri, 20 Jun 2014 23:41:38 +0200 Subject: Big part of PhysFS support * removed -mod argument * removed -datadir argument * removed -lang argument * removed some dead ui code * added resource manager and file loaders (stream and SDL) * changed interface textures location to match new directory structure * removed CGameData for mod support * added PhysFS support --- src/app/system.h | 9 --------- 1 file changed, 9 deletions(-) (limited to 'src/app/system.h') diff --git a/src/app/system.h b/src/app/system.h index c2125fe..01f2672 100644 --- a/src/app/system.h +++ b/src/app/system.h @@ -130,17 +130,8 @@ public: /** The difference is \a after - \a before. */ virtual long long TimeStampExactDiff(SystemTimeStamp *before, SystemTimeStamp *after) = 0; - //! Returns the data path (containing textures, levels, helpfiles, etc) - virtual std::string GetDataPath(); - - //! Returns the translations path - virtual std::string GetLangPath(); - //! Returns the profile (colobot.ini) file location virtual std::string GetProfileFileLocation(); - - //! Returns the savegame directory location - virtual std::string GetSavegameDirectoryLocation(); }; //! Global function to get CSystemUtils instance -- cgit v1.2.3-1-g7c22 From 9a3cd67c3bb2f7d0d4b83f6a5ac8bbcfedf4207b Mon Sep 17 00:00:00 2001 From: krzys-h Date: Thu, 24 Jul 2014 23:38:13 +0200 Subject: Saving colobot.ini through physfs --- src/app/system.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/app/system.h') diff --git a/src/app/system.h b/src/app/system.h index 01f2672..6d2fe58 100644 --- a/src/app/system.h +++ b/src/app/system.h @@ -130,8 +130,8 @@ public: /** The difference is \a after - \a before. */ virtual long long TimeStampExactDiff(SystemTimeStamp *before, SystemTimeStamp *after) = 0; - //! Returns the profile (colobot.ini) file location - virtual std::string GetProfileFileLocation(); + //! Returns the save dir location + virtual std::string GetSaveDir(); }; //! Global function to get CSystemUtils instance -- cgit v1.2.3-1-g7c22 From 0b2f25a6e3fda014b0f5a4282283fb90b0958d42 Mon Sep 17 00:00:00 2001 From: krzys-h Date: Wed, 6 Aug 2014 12:27:17 +0200 Subject: Restored -datadir and -langdir arguments, added -savedir Also, fixed some crashes when unable to open file --- src/app/system.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/app/system.h') diff --git a/src/app/system.h b/src/app/system.h index 6d2fe58..5177815 100644 --- a/src/app/system.h +++ b/src/app/system.h @@ -130,6 +130,12 @@ public: /** The difference is \a after - \a before. */ virtual long long TimeStampExactDiff(SystemTimeStamp *before, SystemTimeStamp *after) = 0; + //! Returns the data path (containing textures, levels, helpfiles, etc) + virtual std::string GetDataPath(); + + //! Returns the translations path + virtual std::string GetLangPath(); + //! Returns the save dir location virtual std::string GetSaveDir(); }; -- cgit v1.2.3-1-g7c22 From 6a1ceba8c0914691ebc873fd666e7cde1cffdb64 Mon Sep 17 00:00:00 2001 From: Piotr Dziwinski Date: Sun, 7 Sep 2014 19:26:06 +0200 Subject: Some cleaning up --- src/app/system.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/app/system.h') diff --git a/src/app/system.h b/src/app/system.h index 5177815..4b4440f 100644 --- a/src/app/system.h +++ b/src/app/system.h @@ -132,10 +132,10 @@ public: //! Returns the data path (containing textures, levels, helpfiles, etc) virtual std::string GetDataPath(); - + //! Returns the translations path virtual std::string GetLangPath(); - + //! Returns the save dir location virtual std::string GetSaveDir(); }; -- cgit v1.2.3-1-g7c22 From 9fd6cf54492cedd7f6231a0b1d0655120cb1c4d7 Mon Sep 17 00:00:00 2001 From: krzys-h Date: Tue, 14 Oct 2014 15:11:37 +0200 Subject: Changed all occurences of PPC in the code to TerranovaTeam --- src/app/system.h | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) (limited to 'src/app/system.h') diff --git a/src/app/system.h b/src/app/system.h index c2125fe..36e558a 100644 --- a/src/app/system.h +++ b/src/app/system.h @@ -1,19 +1,21 @@ -// * This file is part of the COLOBOT source code -// * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch -// * Copyright (C) 2012, Polish Portal of Colobot (PPC) -// * -// * This program is free software: you can redistribute it and/or modify -// * it under the terms of the GNU General Public License as published by -// * the Free Software Foundation, either version 3 of the License, or -// * (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have received a copy of the GNU General Public License -// * along with this program. If not, see http://www.gnu.org/licenses/. +/* + * This file is part of the Colobot: Gold Edition source code + * Copyright (C) 2001-2014, Daniel Roux, EPSITEC SA & TerranovaTeam + * http://epsiteс.ch; http://colobot.info; http://github.com/colobot + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://gnu.org/licenses + */ /** * \file app/system.h -- cgit v1.2.3-1-g7c22