diff --git a/source/AUTH b/source/AUTH index 66aefad..225f3f5 100644 --- a/source/AUTH +++ b/source/AUTH @@ -4,7 +4,7 @@ Most graphics are by Iwan Gabovitch aka qubodup. All of qubodup's graphics are in the Public domain Data from the OpenArena team is under GPL v2 -Data from the Trackballs team is under GPL v2 +Data from the Dietrich Radel (originally part of Trackballs) is under GPL v2 Poul Sander's files are multi licensed under "GPL v2 or later" OR "CC-BY-SA any version" Misc: @@ -32,7 +32,7 @@ black_line.png Poul Sander blue.png qubodup board_back_back.png qubodup bomb.png Poul Sander -chain_frame.png Poul Sander +chain_frame.png Poul Sander counter_1.png Poul Sander counter_2.png Poul Sander counter_3.png Poul Sander @@ -95,8 +95,8 @@ counter_final.ogg openarena-svn900:/sound/feedback/hit.wav applause.ogg (CC-BY 3.0) Blender Foundation - Cut by LeeZH (http://opengameart.org/content/applause) /music/ -bgmusic.ogg Trackballs team (http://trackballs.sourceforge.net/) v 1.2 (GPL2), copy of tb_design.ogg -highbeat.ogg Trackballs team (http://trackballs.sourceforge.net/) v 1.2 (GPL2), derived from tb_genesis.ogg +bgmusic.ogg "Life by Design", by Dietrich Radel (GPL) +highbeat.ogg derived from "Genesis (In The Beginning)", by Dietrich Radel (GPL) diff --git a/source/code/common.cpp b/source/code/common.cpp index c683d54..5cf51d6 100644 --- a/source/code/common.cpp +++ b/source/code/common.cpp @@ -195,7 +195,7 @@ void Config::load() { inFile.get(); //Read the space between the key and the content inFile.getline(value,MAX_VAR_LENGTH); #if DEBUG - cerr << "Config "<< "read: " << key << " with:\"" << value << "\"" << endl; + cerr << "Config read: " << key << " with:\"" << value << "\"" << endl; #endif configMap[key] = (string)value; } diff --git a/source/code/sago/SagoMisc.cpp b/source/code/sago/SagoMisc.cpp index 065631a..8f2b1a2 100644 --- a/source/code/sago/SagoMisc.cpp +++ b/source/code/sago/SagoMisc.cpp @@ -38,7 +38,7 @@ namespace sago { std::vector GetFileList(const char* dir) { - std::vector ret; + vector ret; char** rc = PHYSFS_enumerateFiles(dir); for (char** i = rc; *i != NULL; i++) { ret.push_back(*i); @@ -52,9 +52,9 @@ bool FileExists(const char* filename) { } std::string GetFileContent(const char* filename) { - std::string ret; + string ret; if (!PHYSFS_exists(filename)) { - std::cerr << "GetFileContent - File does not exists: " << filename << std::endl; + cerr << "GetFileContent - File does not exists: " << filename << endl; return ret; } PHYSFS_file* myfile = PHYSFS_openRead(filename); @@ -65,7 +65,7 @@ std::string GetFileContent(const char* filename) { delete [] m_data; m_data = nullptr; PHYSFS_close(myfile); - std::cerr << "Error: Curropt data file: " << filename << std::endl; + cerr << "Error: Curropt data file: " << filename << endl; return ret; } PHYSFS_close(myfile);