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.cpp | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'src/app/system.cpp') diff --git a/src/app/system.cpp b/src/app/system.cpp index eaa9e4c..b2e6b47 100644 --- a/src/app/system.cpp +++ b/src/app/system.cpp @@ -192,23 +192,7 @@ float CSystemUtils::TimeStampDiff(SystemTimeStamp *before, SystemTimeStamp *afte return result; } -std::string CSystemUtils::GetDataPath() -{ - return COLOBOT_DEFAULT_DATADIR; -} - -std::string CSystemUtils::GetLangPath() -{ - return COLOBOT_I18N_DIR; -} - std::string CSystemUtils::GetProfileFileLocation() { return std::string("colobot.ini"); } - -std::string CSystemUtils::GetSavegameDirectoryLocation() -{ - return std::string("savegame"); -} - -- 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.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/app/system.cpp') diff --git a/src/app/system.cpp b/src/app/system.cpp index b2e6b47..66d08e5 100644 --- a/src/app/system.cpp +++ b/src/app/system.cpp @@ -192,7 +192,7 @@ float CSystemUtils::TimeStampDiff(SystemTimeStamp *before, SystemTimeStamp *afte return result; } -std::string CSystemUtils::GetProfileFileLocation() +std::string CSystemUtils::GetSaveDir() { - return std::string("colobot.ini"); + return std::string("save"); } -- 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.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/app/system.cpp') diff --git a/src/app/system.cpp b/src/app/system.cpp index 66d08e5..0435b39 100644 --- a/src/app/system.cpp +++ b/src/app/system.cpp @@ -192,6 +192,16 @@ float CSystemUtils::TimeStampDiff(SystemTimeStamp *before, SystemTimeStamp *afte return result; } +std::string CSystemUtils::GetDataPath() +{ + return COLOBOT_DEFAULT_DATADIR; +} + +std::string CSystemUtils::GetLangPath() +{ + return COLOBOT_I18N_DIR; +} + std::string CSystemUtils::GetSaveDir() { return std::string("save"); -- 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.cpp | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) (limited to 'src/app/system.cpp') diff --git a/src/app/system.cpp b/src/app/system.cpp index eaa9e4c..118bc80 100644 --- a/src/app/system.cpp +++ b/src/app/system.cpp @@ -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 + */ #include "app/system.h" -- cgit v1.2.3-1-g7c22