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_macosx.cpp | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'src/app/system_macosx.cpp') diff --git a/src/app/system_macosx.cpp b/src/app/system_macosx.cpp index 68f5c79..38885eb 100644 --- a/src/app/system_macosx.cpp +++ b/src/app/system_macosx.cpp @@ -87,16 +87,6 @@ void CSystemUtilsMacOSX::Init() m_dataPath += "/Contents/Resources"; } -std::string CSystemUtilsMacOSX::GetDataPath() -{ - return m_dataPath; -} - -std::string CSystemUtilsMacOSX::GetLangPath() -{ - return m_dataPath + "/i18n"; -} - std::string CSystemUtilsMacOSX::GetProfileFileLocation() { std::string profileFile = m_ASPath + "/colobot.ini"; @@ -104,13 +94,3 @@ std::string CSystemUtilsMacOSX::GetProfileFileLocation() GetLogger()->Trace("Profile file is %s\n", profileFile.c_str()); return profileFile; } - -std::string CSystemUtilsMacOSX::GetSavegameDirectoryLocation() -{ - std::string savegameDir = m_ASPath + "/savegame"; - boost::filesystem::create_directories(savegameDir.c_str()); - GetLogger()->Trace("Saved game files are going to %s\n", savegameDir.c_str()); - - return savegameDir; -} - -- 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_macosx.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/app/system_macosx.cpp') diff --git a/src/app/system_macosx.cpp b/src/app/system_macosx.cpp index 38885eb..473a10c 100644 --- a/src/app/system_macosx.cpp +++ b/src/app/system_macosx.cpp @@ -87,10 +87,11 @@ void CSystemUtilsMacOSX::Init() m_dataPath += "/Contents/Resources"; } -std::string CSystemUtilsMacOSX::GetProfileFileLocation() +std::string CSystemUtilsMacOSX::GetSaveDir() { - std::string profileFile = m_ASPath + "/colobot.ini"; - - GetLogger()->Trace("Profile file is %s\n", profileFile.c_str()); - return profileFile; + std::string savegameDir = m_ASPath; + boost::filesystem::create_directories(savegameDir.c_str()); + GetLogger()->Trace("Saved game files are going to %s\n", savegameDir.c_str()); + + return savegameDir; } -- 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_macosx.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src/app/system_macosx.cpp') diff --git a/src/app/system_macosx.cpp b/src/app/system_macosx.cpp index 473a10c..06c67d3 100644 --- a/src/app/system_macosx.cpp +++ b/src/app/system_macosx.cpp @@ -87,10 +87,19 @@ void CSystemUtilsMacOSX::Init() m_dataPath += "/Contents/Resources"; } +std::string CSystemUtilsMacOSX::GetDataPath() +{ + return m_dataPath; +} + +std::string CSystemUtilsMacOSX::GetLangPath() +{ + return m_dataPath + "/i18n"; +} + std::string CSystemUtilsMacOSX::GetSaveDir() { std::string savegameDir = m_ASPath; - boost::filesystem::create_directories(savegameDir.c_str()); GetLogger()->Trace("Saved game files are going to %s\n", savegameDir.c_str()); return savegameDir; -- 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_macosx.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/app/system_macosx.cpp') diff --git a/src/app/system_macosx.cpp b/src/app/system_macosx.cpp index 06c67d3..fd29667 100644 --- a/src/app/system_macosx.cpp +++ b/src/app/system_macosx.cpp @@ -101,6 +101,6 @@ std::string CSystemUtilsMacOSX::GetSaveDir() { std::string savegameDir = m_ASPath; GetLogger()->Trace("Saved game files are going to %s\n", savegameDir.c_str()); - + return savegameDir; } -- 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_macosx.cpp | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) (limited to 'src/app/system_macosx.cpp') diff --git a/src/app/system_macosx.cpp b/src/app/system_macosx.cpp index 68f5c79..c44831f 100644 --- a/src/app/system_macosx.cpp +++ b/src/app/system_macosx.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) 2013, 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_macosx.h" -- cgit v1.2.3-1-g7c22