Fix headers

Makefile

@@ -11,6 +11,7 @@
 ##	Makefile	-	The make file.
 ##
 ##	(c) Copyright 1998-2003 by Lutz Sammer and Nehal Mistry
+##	(c) Copyright 2010      by Pali Rohár
 ##
 ##	Stratagus is free software; you can redistribute it and/or modify
 ##	it under the terms of the GNU General Public License as published

src/include/video.h

@@ -11,6 +11,7 @@
 /**@name video.h - The video headerfile. */
 //
 //      (c) Copyright 1999-2006 by Lutz Sammer, Nehal Mistry, and Jimmy Salmon
+//      (c) Copyright 2010      by Pali Rohár
 //
 //      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

src/map/map_fog.cpp

@@ -12,6 +12,7 @@
 //
 //      (c) Copyright 1999-2006 by Lutz Sammer, Vladi Shabanski,
 //                                 Russell Smith, and Jimmy Salmon
+//      (c) Copyright 2010      by Pali Rohár
 //
 //      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

src/map/minimap.cpp

@@ -11,6 +11,7 @@
 /**@name minimap.cpp - The minimap. */
 //
 //      (c) Copyright 1998-2007 by Lutz Sammer and Jimmy Salmon
+//      (c) Copyright 2010      by Pali Rohár
 //
 //      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
@@ -108,8 +109,8 @@ static void CreateMinimapTexture(void)
 	glGenTextures(1, &MinimapTexture);
 	glBindTexture(GL_TEXTURE_2D, MinimapTexture);
 #ifdef USE_GLES
-#warning TODO: convert glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); to GLES
-#warning TODO: convert glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); to GLES
+#warning TODO: Port glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); to GLES
+#warning TODO: Port glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); to GLES
 #else
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);

src/metaserver/main.cpp

@@ -11,6 +11,7 @@
 /**@name main.cpp - Primary functionality. */
 //
 //      (c) Copyright 2005 by Edward Haase
+//      (c) Copyright 2010 by Pali Rohár
 //
 //      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
@@ -59,7 +60,7 @@ extern int optopt;
 extern int getopt(int argc, char *const *argv, const char *opt);
 #endif
 
-#ifdef USE_WIN32
+#if defined(USE_WIN32) && ! defined(NO_STDIO_REDIRECT)
 #include "attachconsole.h"
 #endif
 

src/stratagus/Module.make

@@ -11,6 +11,7 @@
 ##	Module.make	-	Module Makefile (included from Makefile).
 ##
 ##	(c) Copyright 2004 by The Stratagus Team
+##	(c) Copyright 2010 by Pali Rohár
 ##
 ##      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
@@ -32,7 +33,9 @@ MSRC =   construct.cpp groups.cpp iolib.cpp mainloop.cpp missile.cpp \
          util.cpp luacallback.cpp title.cpp
 
 ifneq ($(findstring -DUSE_WIN32, $(CPPFLAGS)),)
-	MSRC += attachconsole.cpp
+	ifeq ($(findstring -DNO_STDIO_REDIRECT, $(CPPFLAGS)),)
+		MSRC += attachconsole.cpp
+	endif
 endif
 
 SRC +=   $(addprefix $(MODULE)/,$(MSRC))

src/stratagus/iolib.cpp

@@ -11,6 +11,7 @@
 /**@name iolib.cpp - Compression-IO helper functions. */
 //
 //      (c) Copyright 2000-2005 by Andreas Arens, Lutz Sammer, and Jimmy Salmon
+//      (c) Copyright 2010      by Pali Rohár
 //
 //      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
@@ -544,6 +545,7 @@ char *LibraryFileName(const char *file, char *buffer, size_t buffersize)
 	}
 #endif
 
+#ifndef USE_WIN32
 	//  In user home directory
 	if ((s = getenv("HOME")) && !GameName.empty()) {
 		sprintf(buffer, "%s/%s/%s/%s", s, STRATAGUS_HOME_PATH, GameName.c_str(), file);
@@ -551,6 +553,7 @@ char *LibraryFileName(const char *file, char *buffer, size_t buffersize)
 			return buffer;
 		}
 	}
+#endif
 
 	// In global shared directory
 	sprintf(buffer, "%s/%s", StratagusLibPath.c_str(), file);

src/stratagus/stratagus.cpp

@@ -12,6 +12,7 @@
 //
 //      (c) Copyright 1998-2008 by Lutz Sammer, Francois Beerten, and
 //                                 Jimmy Salmon
+//      (c) Copyright 2010      by Pali Rohár
 //
 //      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
@@ -225,7 +226,7 @@ extern int getopt(int argc, char *const *argv, const char *opt);
 #include "title.h"
 #include "map.h"
 
-#ifdef USE_WIN32
+#if defined(USE_WIN32) && ! defined(NO_STDIO_REDIRECT)
 #include "attachconsole.h"
 #endif
 
@@ -537,10 +538,13 @@ int SaveReplay(const std::string &filename)
 */
 static void PrintHeader(void)
 {
-	fprintf(stdout, "%s\n  written by Lutz Sammer, Fabrice Rossi, Vladi Shabanski, Patrice Fortier,\n"
-		"Jon Gabrielson, Andreas Arens, Nehal Mistry, Jimmy Salmon, Pali Rohar, and others.\n"
-		"\t(http://stratagus.org)"
-		"\nCompile options %s", NameLine, CompileOptions.c_str());
+	fprintf(stdout,
+		"%s\n  written by Lutz Sammer, Fabrice Rossi, Vladi Shabanski, Patrice Fortier,\n"
+		"Jon Gabrielson, Andreas Arens, Nehal Mistry, Jimmy Salmon, Pali Rohar,\n"
+		"and others.\n"
+		"\t(http://stratagus.org)\n"
+		"Compile options %s",
+		NameLine, CompileOptions.c_str());
 }
 
 /**

src/ui/interface.cpp

@@ -11,6 +11,7 @@
 /**@name interface.cpp - The interface. */
 //
 //      (c) Copyright 1998-2005 by Lutz Sammer and Jimmy Salmon
+//      (c) Copyright 2010      by Pali Rohár
 //
 //      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

src/ui/ui.cpp

@@ -12,6 +12,7 @@
 //
 //      (c) Copyright 1999-2005 by Lutz Sammer, Andreas Arens, and
 //                                 Jimmy Salmon
+//      (c) Copyright 2010      by Pali Rohár
 //
 //      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

src/unit/depend.cpp

@@ -12,6 +12,7 @@
 //
 //      (c) Copyright 2000-2007 by Vladi Belperchinov-Shabanski, Lutz Sammer,
 //                                 and Jimmy Salmon
+//      (c) Copyright 2010      by Pali Rohár
 //
 //      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

src/video/graphic.cpp

@@ -11,6 +11,7 @@
 /**@name graphic.cpp - The general graphic functions. */
 //
 //      (c) Copyright 1999-2006 by Lutz Sammer, Nehal Mistry, and Jimmy Salmon
+//      (c) Copyright 2010      by Pali Rohár
 //
 //      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
@@ -983,8 +984,8 @@ static void MakeTextures2(CGraphic *g, GLuint texture, CUnitColors *colors,
 	SDL_LockSurface(g->Surface);
 	glBindTexture(GL_TEXTURE_2D, texture);
 #ifdef USE_GLES
-#warning TODO: Convert glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); to GLES
-#warning TODO: Convert glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); to GLES
+#warning TODO: Port glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); to GLES
+#warning TODO: Port glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); to GLES
 #else
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);

src/video/linedraw.cpp

@@ -12,6 +12,7 @@
 //
 //      (c) Copyright 2000-2006 by Lutz Sammer, Stephan Rasenberg,
 //                                 Jimmy Salmon, and Nehal Mistry
+//      (c) Copyright 2010      by Pali Rohár
 //
 //      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

src/video/movie.cpp

@@ -11,6 +11,7 @@
 /**@name movie.cpp - Movie playback functions. */
 //
 //      (c) Copyright 2005 by Nehal Mistry and Jimmy Salmon
+//      (c) Copyright 2010 by Pali Rohár
 //
 //      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

src/video/png.cpp

@@ -11,6 +11,7 @@
 /**@name png.cpp - The png graphic file loader. */
 //
 //      (c) Copyright 1998-2006 by Lutz Sammer and Jimmy Salmon
+//      (c) Copyright 2010      by Pali Rohár
 //
 //      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
@@ -367,7 +368,7 @@ void SaveScreenshotPNG(const char *name)
 			exit(1);
 		}
 #ifdef USE_GLES
-#warning TODO: convert glReadBuffer(GL_FRONT); to GLES
+#warning TODO: Port glReadBuffer(GL_FRONT); to GLES
 #else
 		glReadBuffer(GL_FRONT);
 #endif

src/video/sdl.cpp

@@ -11,6 +11,7 @@
 /**@name sdl.cpp - SDL video support. */
 //
 //      (c) Copyright 1999-2006 by Lutz Sammer, Jimmy Salmon, Nehal Mistry
+//      (c) Copyright 2010      by Pali Rohár
 //
 //      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

src/video/sprite.cpp

@@ -12,6 +12,7 @@
 //
 //      (c) Copyright 2000-2005 by Lutz Sammer, Stephan Rasenberg,
 //                                 Nehal Mistry, and Jimmy Salmon
+//      (c) Copyright 2010      by Pali Rohár
 //
 //      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