Attachment #149736 for bug #217710

View | Details | Raw Unified | Return to bug 217710 | Differences between
Collapse All | Expand All




++ src-setup/Audio.cpp

 */
#include "Audio.h"

#include <cstdio>
#include <cstdlib>
#include <cstring>

#ifndef _WIN32
#include <unistd.h>
#include <cerrno>
#include <fcntl.h>
#include <sys/stat.h>
#include <sys/types.h>

#include <AL/alc.h>
#include <AL/alut.h>


//====================================================================
Audio::Audio()
{
++ src-setup/ConfigFile.cpp

 */
#include "ConfigFile.h"

#include <cstdio>
#include <cstdlib>

#include <qapp.h>
#include <qfiledialog.h>
++ src-setup/HelpPage.cpp

 */
#include "HelpPage.h"

#include <cstdio>

#include <qwidget.h>
#include <qapplication.h>
++ src-setup/HiScoreWidget.cpp

#include "HiScoreWidget.h"

#include <cstdio>
#include <cstdlib>

#include <qfileinfo.h>

++ src-setup/HiScoreWidget.h

#ifndef HiScoreWidget_h
#define HiScoreWidget_h

#include <ctime>

#include <qlabel.h>
#include <qlayout.h>
++ src-setup/MainWidget.cpp

 */
#include "MainWidget.h"

#include <cstdio>
#include <cstdlib>

#include <qapp.h>
#include <qfile.h>
++ src-setup/PlayList.cpp

 */
#include "PlayList.h"

#include <cstdio>
#include <cstdlib>

#include <qapp.h>
#include <qtooltip.h>
++ src/Ammo.cpp

 */
#include "Ammo.h"

#include <cstdio>


int ActiveAmmo::ammoCount = 0;
++ src/AudioOpenAL.cpp

	void	alcDestroyContext(void*) { alExit(); }
#endif //macintosh

#include <cstdio>
#include <cstdlib>
#include <cstdarg>
#include <cstring>

#ifndef _WIN32
	#include <unistd.h>
	#include <cerrno>
	#include <fcntl.h>
	#include <sys/stat.h>
	#include <sys/types.h>
++ src/AudioSDLMixer.cpp

 
#include "AudioSDLMixer.h"

#include <cstdio>
#include <cstdlib>
#include <stdarg.h>
#include <cstring>

#ifndef _WIN32
#include <unistd.h>
#include <cerrno>
#include <fcntl.h>
#include <sys/stat.h>
#endif // _WIN32
++ src/Config.cpp

#include "HiScore.h"

//====================================================================
#include <cstdio>
#include <cstdlib>
#include <cstring>

#include "NCString.h"

++ src/EnemyAircraft.cpp

 */
#include "EnemyAircraft.h"

#include <cstdio>
#include <cstdlib>
#include <cmath>

#include "Config.h"

++ src/EnemyAircraft_Boss00.cpp

 */
#include "EnemyAircraft_Boss00.h"

#include <cstdio>
#include <cstdlib>
#include <cmath>

#include "Config.h"

++ src/EnemyAircraft_Boss01.cpp

 */
#include "EnemyAircraft_Boss01.h"

#include <cstdio>
#include <cstdlib>
#include <cmath>

#include "Config.h"

++ src/EnemyAircraft_Gnat.cpp

 */
#include "EnemyAircraft_Gnat.h"

#include <cstdio>
#include <cstdlib>
#include <cmath>

#include "Config.h"

++ src/EnemyAircraft_Omni.cpp

 */
#include "EnemyAircraft_Omni.h"

#include <cstdio>
#include <cstdlib>
#include <cmath>

#include "Config.h"

++ src/EnemyAircraft_RayGun.cpp

 */
#include "EnemyAircraft_RayGun.h"

#include <cstdio>
#include <cstdlib>
#include <cmath>

#include "Config.h"

++ src/EnemyAircraft_Straight.cpp

 */
#include "EnemyAircraft_Straight.h"

#include <cstdio>
#include <cstdlib>
#include <cmath>

#include "Config.h"

++ src/EnemyAircraft_Tank.cpp

 */
#include "EnemyAircraft_Tank.h"

#include <cstdio>
#include <cstdlib>
#include <cmath>

#include "Config.h"

++ src/EnemyAmmo.cpp

 */
#include "EnemyAmmo.h"

#include <cstdio>
#include <cstdlib>
#include <cmath>

#include "compatibility.h"
#include <GL/gl.h>
++ src/EnemyFleet.cpp

 */
#include "EnemyFleet.h"

#include <cstdio>
#include <cmath>

#include "compatibility.h"
#include <GL/gl.h>
++ src/Explosions.cpp

 */
#include "Explosions.h"

#include <cstdlib>

#include "compatibility.h"
#include <GL/gl.h>
++ src/Global.h

#ifndef Global_h
#define Global_h

#include <cstdio>
#include <ctime>

#include "define.h"
#include "TexFont.h"
++ src/GroundMetal.cpp

#include "GroundMetal.h"

#include <GL/glpng.h>
#include <cmath>

#include "extern.h"
#include "Global.h"
++ src/GroundMetalSegment.cpp

 */
#include "GroundMetalSegment.h"

#include <cmath>

#include "compatibility.h"
#include <GL/gl.h>
++ src/GroundSea.cpp

 */
#include "GroundSea.h"

#include <cstdlib>
#include <GL/glpng.h>

#include "extern.h"
++ src/GroundSeaSegment.cpp

 */
#include "GroundSeaSegment.h"

#include <cmath>

#include "compatibility.h"
#include <GL/gl.h>
++ src/HeroAircraft.cpp

 */
#include "HeroAircraft.h"

#include <cstdio>
#include <cstdlib>
#include <cmath>

#include "compatibility.h"
#include <GL/gl.h>
++ src/HeroAmmo.cpp

 */
#include "HeroAmmo.h"

#include <cstdio>
#include <cstdlib>

#include "compatibility.h"
#include <GL/gl.h>
++ src/HiScore.cpp

#include "HeroAircraft.h"

//====================================================================
#include <cstdio>
#include <cstdlib>
#include <cstring>

HiScore	*HiScore::instance = 0;

++ src/HiScore.h

#ifndef HiScore_h
#define HiScore_h

#include <cstdio>
#include <ctime>

#include "define.h"

++ src/MainGL.cpp

 */
#include "MainGL.h"

#include <cstdio>
#include <cstdlib>
#include <cstring>
#include <cmath>

#include "compatibility.h"
#include <GL/gl.h>
++ src/MainGLUT.cpp


#ifdef USE_GLUT

#include <cstdio>
#include <unistd.h>

#include <GL/glut.h>
++ src/MainSDL.cpp


#ifdef USE_SDL

#include <cstdlib>
#include <cmath>
#include <SDL.h>

#include "compatibility.h"
++ src/MainSDL_Event.cpp


#ifdef USE_SDL

#include <cstdlib>
#include <cstdio>
#include <cstring>

#include "Config.h"

++ src/MenuGL.cpp

 */
#include "MenuGL.h"

#include <cstdlib>
#include <cstring>
#include <cmath>

#include "compatibility.h"
#include <GL/gl.h>
++ src/NCString.cpp

#include "NCString.h"

#include <cstdio>
#include <cctype>
#include <cstdlib>
#include <cstring>
#include <climits>
#include <cstdarg>

/**
 * ctor

NCString operator + (const char 	*s1, const NCString &s2)   {   NCString tmp(s1);   tmp += s2;  return tmp; }
NCString operator + (const NCString &s1, const char 	*s2)   {   NCString tmp(s1);   tmp += s2;  return tmp; }
//-----------------------------------------------------
std::ostream& operator << (std::ostream &os, const NCString &s1)
{
	return os << (const char*)s1;
}
++ src/NCString.h

#ifndef NCString_h
#define NCString_h

#include <iostream>

typedef unsigned int uint;
typedef unsigned short ushort;

/** add     @relates NCString */	NCString operator + (const NCString &s1, const NCString &s2);
/** add     @relates NCString */	NCString operator + (const char     *s1, const NCString &s2);
/** add     @relates NCString */	NCString operator + (const NCString &s1, const char     *s2);
/** stream  @relates NCString */	std::ostream& operator << (std::ostream &os, const NCString &s1);

#endif // NCString_h

++ src/PowerUps.cpp

 */
#include "PowerUps.h"

#include <cstdio>
#include <cstdlib>
#include <cmath>

#include "compatibility.h"
#include <GL/gl.h>
++ src/ScreenItem.cpp

 */
#include "ScreenItem.h"

#include <cstdio>


int ScreenItem::itemCount = 0;
++ src/ScreenItemAdd.cpp

 */
#include "ScreenItemAdd.h"

#include <cstdio>
#include <cstdlib>

#include "define.h"
#include "Global.h"
++ src/StatusDisplay.cpp

 */
#include "StatusDisplay.h"

#include <cstdio>
#include <cstdlib>
#include <cstring>
#include <cmath>

#include "compatibility.h"
#include <GL/gl.h>
++ src/TexFont.cpp

   provided without guarantee or warrantee expressed or  implied. This
   program is -not- in the public domain. */
#include "compatibility.h"
#include <cassert>
#include <cctype>
#include <cstdlib>
#include <cstdio>
#include <cstring>
#include <cmath>
#include <GL/glu.h>
#include "TexFont.h"

++ src/extern.h

#ifndef extern_h
#define extern_h

#include <cstdio>

const char *dataLoc(const char *filename, bool doCheck = true);
const char *alterPathForPlatform(char *filename);
++ src/main.cpp

#include "compatibility.h"
#include <GL/gl.h>

#include <cstdlib>
#include <cstdio>
#include <cstring>
#include <ctime>

#ifndef _WIN32
#include <unistd.h>
#include <fcntl.h>
#include <cerrno>
#include <sys/stat.h>
#endif // _WIN32

++ support/glpng/include/GL/glpng.h

#ifndef _GLPNG_H_
#define _GLPNG_H_

#ifdef __cplusplus
#  include <cstdio>
#else
#  include <stdio.h>
#endif

#ifdef __cplusplus
extern "C" {
++ support/glpng/src/glpng.c

#endif

#include <GL/glpng.h>
/* needed to get the glext prototypes */
#define GL_GLEXT_PROTOTYPES
#include <GL/gl.h>
#include <stdlib.h>
#include <math.h>


static char gammaExplicit = 0;	/*if  */

static void checkForGammaEnv(void)
{
	double viewingGamma;
	char *gammaEnv = getenv("VIEWING_GAMMA");

	}
}

#ifdef _WIN32
static int ExtSupported(const char *x) {
	static const GLubyte *ext = NULL;
	const char *c;


	return 0;
}
#endif

#define GET(o) ((int)*(data + (o)))


Return to bug 217710

Line Link Here

(-)file_not_specified_in_diff (-165 / +175 lines)
0	-- src-setup/Audio.cpp	0	++ src-setup/Audio.cpp
Lines 7-19 Link Here
7	*/	7	*/
8	#include "Audio.h"	8	#include "Audio.h"
9		9
10	#include <stdio.h>	10	#include <cstdio>
11	#include <stdlib.h>	11	#include <cstdlib>
12	#include <string.h>	12	#include <cstring>
13		13
14	#ifndef _WIN32	14	#ifndef _WIN32
15	#include <unistd.h>	15	#include <unistd.h>
16	#include <errno.h>	16	#include <cerrno>
17	#include <fcntl.h>	17	#include <fcntl.h>
18	#include <sys/stat.h>	18	#include <sys/stat.h>
19	#include <sys/types.h>	19	#include <sys/types.h>
Lines 23-28 Link Here
23	#include <AL/alc.h>	23	#include <AL/alc.h>
24	#include <AL/alut.h>	24	#include <AL/alut.h>
25		25
		26
26	//====================================================================	27	//====================================================================
27	Audio::Audio()	28	Audio::Audio()
28	{	29	{
29	-- src-setup/ConfigFile.cpp	30	++ src-setup/ConfigFile.cpp
Lines 7-14 Link Here
7	*/	7	*/
8	#include "ConfigFile.h"	8	#include "ConfigFile.h"
9		9
10	#include <stdio.h>	10	#include <cstdio>
11	#include <stdlib.h>	11	#include <cstdlib>
12		12
13	#include <qapp.h>	13	#include <qapp.h>
14	#include <qfiledialog.h>	14	#include <qfiledialog.h>
15	-- src-setup/HelpPage.cpp	15	++ src-setup/HelpPage.cpp
Lines 7-13 Link Here
7	*/	7	*/
8	#include "HelpPage.h"	8	#include "HelpPage.h"
9		9
10	#include <stdio.h>	10	#include <cstdio>
11		11
12	#include <qwidget.h>	12	#include <qwidget.h>
13	#include <qapplication.h>	13	#include <qapplication.h>
14	-- src-setup/HiScoreWidget.cpp	14	++ src-setup/HiScoreWidget.cpp
Lines 1-7 Link Here
1	#include "HiScoreWidget.h"	1	#include "HiScoreWidget.h"
2		2
3	#include <stdio.h>	3	#include <cstdio>
4	#include <stdlib.h>	4	#include <cstdlib>
5		5
6	#include <qfileinfo.h>	6	#include <qfileinfo.h>
7		7
8	-- src-setup/HiScoreWidget.h	8	++ src-setup/HiScoreWidget.h
Lines 8-14 Link Here
8	#ifndef HiScoreWidget_h	8	#ifndef HiScoreWidget_h
9	#define HiScoreWidget_h	9	#define HiScoreWidget_h
10		10
11	#include <time.h>	11	#include <ctime>
12		12
13	#include <qlabel.h>	13	#include <qlabel.h>
14	#include <qlayout.h>	14	#include <qlayout.h>
15	-- src-setup/MainWidget.cpp	15	++ src-setup/MainWidget.cpp
Lines 7-14 Link Here
7	*/	7	*/
8	#include "MainWidget.h"	8	#include "MainWidget.h"
9		9
10	#include <stdio.h>	10	#include <cstdio>
11	#include <stdlib.h>	11	#include <cstdlib>
12		12
13	#include <qapp.h>	13	#include <qapp.h>
14	#include <qfile.h>	14	#include <qfile.h>
15	-- src-setup/PlayList.cpp	15	++ src-setup/PlayList.cpp
Lines 7-14 Link Here
7	*/	7	*/
8	#include "PlayList.h"	8	#include "PlayList.h"
9		9
10	#include <stdio.h>	10	#include <cstdio>
11	#include <stdlib.h>	11	#include <cstdlib>
12		12
13	#include <qapp.h>	13	#include <qapp.h>
14	#include <qtooltip.h>	14	#include <qtooltip.h>
15	-- src/Ammo.cpp	15	++ src/Ammo.cpp
Lines 7-13 Link Here
7	*/	7	*/
8	#include "Ammo.h"	8	#include "Ammo.h"
9		9
10	#include <stdio.h>	10	#include <cstdio>
11		11
12		12
13	int ActiveAmmo::ammoCount = 0;	13	int ActiveAmmo::ammoCount = 0;
14	-- src/AudioOpenAL.cpp	14	++ src/AudioOpenAL.cpp
Lines 15-28 Link Here
15	void alcDestroyContext(void*) { alExit(); }	15	void alcDestroyContext(void*) { alExit(); }
16	#endif //macintosh	16	#endif //macintosh
17		17
18	#include <stdio.h>	18	#include <cstdio>
19	#include <stdlib.h>	19	#include <cstdlib>
20	#include <stdarg.h>	20	#include <cstdarg>
21	#include <string.h>	21	#include <cstring>
22		22
23	#ifndef _WIN32	23	#ifndef _WIN32
24	#include <unistd.h>	24	#include <unistd.h>
25	#include <errno.h>	25	#include <cerrno>
26	#include <fcntl.h>	26	#include <fcntl.h>
27	#include <sys/stat.h>	27	#include <sys/stat.h>
28	#include <sys/types.h>	28	#include <sys/types.h>
29	-- src/AudioSDLMixer.cpp	29	++ src/AudioSDLMixer.cpp
Lines 9-22 Link Here
9		9
10	#include "AudioSDLMixer.h"	10	#include "AudioSDLMixer.h"
11		11
12	#include <stdio.h>	12	#include <cstdio>
13	#include <stdlib.h>	13	#include <cstdlib>
14	#include <stdarg.h>	14	#include <stdarg.h>
15	#include <string.h>	15	#include <cstring>
16		16
17	#ifndef _WIN32	17	#ifndef _WIN32
18	#include <unistd.h>	18	#include <unistd.h>
19	#include <errno.h>	19	#include <cerrno>
20	#include <fcntl.h>	20	#include <fcntl.h>
21	#include <sys/stat.h>	21	#include <sys/stat.h>
22	#endif // _WIN32	22	#endif // _WIN32
23	-- src/Config.cpp	23	++ src/Config.cpp
Lines 10-18 Link Here
10	#include "HiScore.h"	10	#include "HiScore.h"
11		11
12	//====================================================================	12	//====================================================================
13	#include <stdio.h>	13	#include <cstdio>
14	#include <stdlib.h>	14	#include <cstdlib>
15	#include <string.h>	15	#include <cstring>
16		16
17	#include "NCString.h"	17	#include "NCString.h"
18		18
19	-- src/EnemyAircraft.cpp	19	++ src/EnemyAircraft.cpp
Lines 7-15 Link Here
7	*/	7	*/
8	#include "EnemyAircraft.h"	8	#include "EnemyAircraft.h"
9		9
10	#include <stdio.h>	10	#include <cstdio>
11	#include <stdlib.h>	11	#include <cstdlib>
12	#include <math.h>	12	#include <cmath>
13		13
14	#include "Config.h"	14	#include "Config.h"
15		15
16	-- src/EnemyAircraft_Boss00.cpp	16	++ src/EnemyAircraft_Boss00.cpp
Lines 7-15 Link Here
7	*/	7	*/
8	#include "EnemyAircraft_Boss00.h"	8	#include "EnemyAircraft_Boss00.h"
9		9
10	#include <stdio.h>	10	#include <cstdio>
11	#include <stdlib.h>	11	#include <cstdlib>
12	#include <math.h>	12	#include <cmath>
13		13
14	#include "Config.h"	14	#include "Config.h"
15		15
16	-- src/EnemyAircraft_Boss01.cpp	16	++ src/EnemyAircraft_Boss01.cpp
Lines 7-15 Link Here
7	*/	7	*/
8	#include "EnemyAircraft_Boss01.h"	8	#include "EnemyAircraft_Boss01.h"
9		9
10	#include <stdio.h>	10	#include <cstdio>
11	#include <stdlib.h>	11	#include <cstdlib>
12	#include <math.h>	12	#include <cmath>
13		13
14	#include "Config.h"	14	#include "Config.h"
15		15
16	-- src/EnemyAircraft_Gnat.cpp	16	++ src/EnemyAircraft_Gnat.cpp
Lines 7-15 Link Here
7	*/	7	*/
8	#include "EnemyAircraft_Gnat.h"	8	#include "EnemyAircraft_Gnat.h"
9		9
10	#include <stdio.h>	10	#include <cstdio>
11	#include <stdlib.h>	11	#include <cstdlib>
12	#include <math.h>	12	#include <cmath>
13		13
14	#include "Config.h"	14	#include "Config.h"
15		15
16	-- src/EnemyAircraft_Omni.cpp	16	++ src/EnemyAircraft_Omni.cpp
Lines 7-15 Link Here
7	*/	7	*/
8	#include "EnemyAircraft_Omni.h"	8	#include "EnemyAircraft_Omni.h"
9		9
10	#include <stdio.h>	10	#include <cstdio>
11	#include <stdlib.h>	11	#include <cstdlib>
12	#include <math.h>	12	#include <cmath>
13		13
14	#include "Config.h"	14	#include "Config.h"
15		15
16	-- src/EnemyAircraft_RayGun.cpp	16	++ src/EnemyAircraft_RayGun.cpp
Lines 7-15 Link Here
7	*/	7	*/
8	#include "EnemyAircraft_RayGun.h"	8	#include "EnemyAircraft_RayGun.h"
9		9
10	#include <stdio.h>	10	#include <cstdio>
11	#include <stdlib.h>	11	#include <cstdlib>
12	#include <math.h>	12	#include <cmath>
13		13
14	#include "Config.h"	14	#include "Config.h"
15		15
16	-- src/EnemyAircraft_Straight.cpp	16	++ src/EnemyAircraft_Straight.cpp
Lines 7-15 Link Here
7	*/	7	*/
8	#include "EnemyAircraft_Straight.h"	8	#include "EnemyAircraft_Straight.h"
9		9
10	#include <stdio.h>	10	#include <cstdio>
11	#include <stdlib.h>	11	#include <cstdlib>
12	#include <math.h>	12	#include <cmath>
13		13
14	#include "Config.h"	14	#include "Config.h"
15		15
16	-- src/EnemyAircraft_Tank.cpp	16	++ src/EnemyAircraft_Tank.cpp
Lines 7-15 Link Here
7	*/	7	*/
8	#include "EnemyAircraft_Tank.h"	8	#include "EnemyAircraft_Tank.h"
9		9
10	#include <stdio.h>	10	#include <cstdio>
11	#include <stdlib.h>	11	#include <cstdlib>
12	#include <math.h>	12	#include <cmath>
13		13
14	#include "Config.h"	14	#include "Config.h"
15		15
16	-- src/EnemyAmmo.cpp	16	++ src/EnemyAmmo.cpp
Lines 7-15 Link Here
7	*/	7	*/
8	#include "EnemyAmmo.h"	8	#include "EnemyAmmo.h"
9		9
10	#include <stdio.h>	10	#include <cstdio>
11	#include <stdlib.h>	11	#include <cstdlib>
12	#include <math.h>	12	#include <cmath>
13		13
14	#include "compatibility.h"	14	#include "compatibility.h"
15	#include <GL/gl.h>	15	#include <GL/gl.h>
16	-- src/EnemyFleet.cpp	16	++ src/EnemyFleet.cpp
Lines 7-14 Link Here
7	*/	7	*/
8	#include "EnemyFleet.h"	8	#include "EnemyFleet.h"
9		9
10	#include <stdio.h>	10	#include <cstdio>
11	#include <math.h>	11	#include <cmath>
12		12
13	#include "compatibility.h"	13	#include "compatibility.h"
14	#include <GL/gl.h>	14	#include <GL/gl.h>
15	-- src/Explosions.cpp	15	++ src/Explosions.cpp
Lines 7-13 Link Here
7	*/	7	*/
8	#include "Explosions.h"	8	#include "Explosions.h"
9		9
10	#include <stdlib.h>	10	#include <cstdlib>
11		11
12	#include "compatibility.h"	12	#include "compatibility.h"
13	#include <GL/gl.h>	13	#include <GL/gl.h>
14	-- src/Global.h	14	++ src/Global.h
Lines 8-15 Link Here
8	#ifndef Global_h	8	#ifndef Global_h
9	#define Global_h	9	#define Global_h
10		10
11	#include <stdio.h>	11	#include <cstdio>
12	#include <time.h>	12	#include <ctime>
13		13
14	#include "define.h"	14	#include "define.h"
15	#include "TexFont.h"	15	#include "TexFont.h"
16	-- src/GroundMetal.cpp	16	++ src/GroundMetal.cpp
Lines 8-14 Link Here
8	#include "GroundMetal.h"	8	#include "GroundMetal.h"
9		9
10	#include <GL/glpng.h>	10	#include <GL/glpng.h>
11	#include <math.h>	11	#include <cmath>
12		12
13	#include "extern.h"	13	#include "extern.h"
14	#include "Global.h"	14	#include "Global.h"
15	-- src/GroundMetalSegment.cpp	15	++ src/GroundMetalSegment.cpp
Lines 7-13 Link Here
7	*/	7	*/
8	#include "GroundMetalSegment.h"	8	#include "GroundMetalSegment.h"
9		9
10	#include <math.h>	10	#include <cmath>
11		11
12	#include "compatibility.h"	12	#include "compatibility.h"
13	#include <GL/gl.h>	13	#include <GL/gl.h>
14	-- src/GroundSea.cpp	14	++ src/GroundSea.cpp
Lines 7-13 Link Here
7	*/	7	*/
8	#include "GroundSea.h"	8	#include "GroundSea.h"
9		9
10	#include <stdlib.h>	10	#include <cstdlib>
11	#include <GL/glpng.h>	11	#include <GL/glpng.h>
12		12
13	#include "extern.h"	13	#include "extern.h"
14	-- src/GroundSeaSegment.cpp	14	++ src/GroundSeaSegment.cpp
Lines 7-13 Link Here
7	*/	7	*/
8	#include "GroundSeaSegment.h"	8	#include "GroundSeaSegment.h"
9		9
10	#include <math.h>	10	#include <cmath>
11		11
12	#include "compatibility.h"	12	#include "compatibility.h"
13	#include <GL/gl.h>	13	#include <GL/gl.h>
14	-- src/HeroAircraft.cpp	14	++ src/HeroAircraft.cpp
Lines 7-15 Link Here
7	*/	7	*/
8	#include "HeroAircraft.h"	8	#include "HeroAircraft.h"
9		9
10	#include <stdio.h>	10	#include <cstdio>
11	#include <stdlib.h>	11	#include <cstdlib>
12	#include <math.h>	12	#include <cmath>
13		13
14	#include "compatibility.h"	14	#include "compatibility.h"
15	#include <GL/gl.h>	15	#include <GL/gl.h>
16	-- src/HeroAmmo.cpp	16	++ src/HeroAmmo.cpp
Lines 7-14 Link Here
7	*/	7	*/
8	#include "HeroAmmo.h"	8	#include "HeroAmmo.h"
9		9
10	#include <stdio.h>	10	#include <cstdio>
11	#include <stdlib.h>	11	#include <cstdlib>
12		12
13	#include "compatibility.h"	13	#include "compatibility.h"
14	#include <GL/gl.h>	14	#include <GL/gl.h>
15	-- src/HiScore.cpp	15	++ src/HiScore.cpp
Lines 11-19 Link Here
11	#include "HeroAircraft.h"	11	#include "HeroAircraft.h"
12		12
13	//====================================================================	13	//====================================================================
14	#include <stdio.h>	14	#include <cstdio>
15	#include <stdlib.h>	15	#include <cstdlib>
16	#include <string.h>	16	#include <cstring>
17		17
18	HiScore *HiScore::instance = 0;	18	HiScore *HiScore::instance = 0;
19		19
20	-- src/HiScore.h	20	++ src/HiScore.h
Lines 8-15 Link Here
8	#ifndef HiScore_h	8	#ifndef HiScore_h
9	#define HiScore_h	9	#define HiScore_h
10		10
11	#include <stdio.h>	11	#include <cstdio>
12	#include <time.h>	12	#include <ctime>
13		13
14	#include "define.h"	14	#include "define.h"
15		15
16	-- src/MainGL.cpp	16	++ src/MainGL.cpp
Lines 7-16 Link Here
7	*/	7	*/
8	#include "MainGL.h"	8	#include "MainGL.h"
9		9
10	#include <stdio.h>	10	#include <cstdio>
11	#include <stdlib.h>	11	#include <cstdlib>
12	#include <string.h>	12	#include <cstring>
13	#include <math.h>	13	#include <cmath>
14		14
15	#include "compatibility.h"	15	#include "compatibility.h"
16	#include <GL/gl.h>	16	#include <GL/gl.h>
17	-- src/MainGLUT.cpp	17	++ src/MainGLUT.cpp
Lines 9-15 Link Here
9		9
10	#ifdef USE_GLUT	10	#ifdef USE_GLUT
11		11
12	#include <stdio.h>	12	#include <cstdio>
13	#include <unistd.h>	13	#include <unistd.h>
14		14
15	#include <GL/glut.h>	15	#include <GL/glut.h>
16	-- src/MainSDL.cpp	16	++ src/MainSDL.cpp
Lines 9-16 Link Here
9		9
10	#ifdef USE_SDL	10	#ifdef USE_SDL
11		11
12	#include <stdlib.h>	12	#include <cstdlib>
13	#include <math.h>	13	#include <cmath>
14	#include <SDL.h>	14	#include <SDL.h>
15		15
16	#include "compatibility.h"	16	#include "compatibility.h"
17	-- src/MainSDL_Event.cpp	17	++ src/MainSDL_Event.cpp
Lines 9-17 Link Here
9		9
10	#ifdef USE_SDL	10	#ifdef USE_SDL
11		11
12	#include <stdlib.h>	12	#include <cstdlib>
13	#include <stdio.h>	13	#include <cstdio>
14	#include <string.h>	14	#include <cstring>
15		15
16	#include "Config.h"	16	#include "Config.h"
17		17
18	-- src/MenuGL.cpp	18	++ src/MenuGL.cpp
Lines 7-15 Link Here
7	*/	7	*/
8	#include "MenuGL.h"	8	#include "MenuGL.h"
9		9
10	#include <stdlib.h>	10	#include <cstdlib>
11	#include <string.h>	11	#include <cstring>
12	#include <math.h>	12	#include <cmath>
13		13
14	#include "compatibility.h"	14	#include "compatibility.h"
15	#include <GL/gl.h>	15	#include <GL/gl.h>
16	-- src/NCString.cpp	16	++ src/NCString.cpp
Lines 1-10 Link Here
1	#include "NCString.h"	1	#include "NCString.h"
2		2
3	#include <stdio.h>	3	#include <cstdio>
4	#include <ctype.h>	4	#include <cctype>
5	#include <stdlib.h>	5	#include <cstdlib>
6	#include <string.h>	6	#include <cstring>
7	#include <limits.h>	7	#include <climits>
		8	#include <cstdarg>
8		9
9	/**	10	/**
10	* ctor	11	* ctor
Lines 1463-1469 Link Here
1463	NCString operator + (const char *s1, const NCString &s2) { NCString tmp(s1); tmp += s2; return tmp; }	1464	NCString operator + (const char *s1, const NCString &s2) { NCString tmp(s1); tmp += s2; return tmp; }
1464	NCString operator + (const NCString &s1, const char *s2) { NCString tmp(s1); tmp += s2; return tmp; }	1465	NCString operator + (const NCString &s1, const char *s2) { NCString tmp(s1); tmp += s2; return tmp; }
1465	//-----------------------------------------------------	1466	//-----------------------------------------------------
1466	ostream& operator << (ostream &os, const NCString &s1)	1467	std::ostream& operator << (std::ostream &os, const NCString &s1)
1467	{	1468	{
1468	return os << (const char*)s1;	1469	return os << (const char*)s1;
1469	}	1470	}
1470	-- src/NCString.h	1471	++ src/NCString.h
Lines 1-7 Link Here
1	#ifndef NCString_h	1	#ifndef NCString_h
2	#define NCString_h	2	#define NCString_h
3		3
4	#include <stream.h>	4	#include <iostream>
5		5
6	typedef unsigned int uint;	6	typedef unsigned int uint;
7	typedef unsigned short ushort;	7	typedef unsigned short ushort;
Lines 123-129 Link Here
123	/** add @relates NCString */ NCString operator + (const NCString &s1, const NCString &s2);	123	/** add @relates NCString */ NCString operator + (const NCString &s1, const NCString &s2);
124	/** add @relates NCString / NCString operator + (const char s1, const NCString &s2);	124	/** add @relates NCString / NCString operator + (const char s1, const NCString &s2);
125	/** add @relates NCString / NCString operator + (const NCString &s1, const char s2);	125	/** add @relates NCString / NCString operator + (const NCString &s1, const char s2);
126	/** stream @relates NCString */ ostream& operator << (ostream &os, const NCString &s1);	126	/** stream @relates NCString */ std::ostream& operator << (std::ostream &os, const NCString &s1);
127		127
128	#endif // NCString_h	128	#endif // NCString_h
129		129
130	-- src/PowerUps.cpp	130	++ src/PowerUps.cpp
Lines 7-15 Link Here
7	*/	7	*/
8	#include "PowerUps.h"	8	#include "PowerUps.h"
9		9
10	#include <stdio.h>	10	#include <cstdio>
11	#include <stdlib.h>	11	#include <cstdlib>
12	#include <math.h>	12	#include <cmath>
13		13
14	#include "compatibility.h"	14	#include "compatibility.h"
15	#include <GL/gl.h>	15	#include <GL/gl.h>
16	-- src/ScreenItem.cpp	16	++ src/ScreenItem.cpp
Lines 7-13 Link Here
7	*/	7	*/
8	#include "ScreenItem.h"	8	#include "ScreenItem.h"
9		9
10	#include <stdio.h>	10	#include <cstdio>
11		11
12		12
13	int ScreenItem::itemCount = 0;	13	int ScreenItem::itemCount = 0;
14	-- src/ScreenItemAdd.cpp	14	++ src/ScreenItemAdd.cpp
Lines 7-14 Link Here
7	*/	7	*/
8	#include "ScreenItemAdd.h"	8	#include "ScreenItemAdd.h"
9		9
10	#include <stdio.h>	10	#include <cstdio>
11	#include <stdlib.h>	11	#include <cstdlib>
12		12
13	#include "define.h"	13	#include "define.h"
14	#include "Global.h"	14	#include "Global.h"
15	-- src/StatusDisplay.cpp	15	++ src/StatusDisplay.cpp
Lines 7-16 Link Here
7	*/	7	*/
8	#include "StatusDisplay.h"	8	#include "StatusDisplay.h"
9		9
10	#include <stdio.h>	10	#include <cstdio>
11	#include <stdlib.h>	11	#include <cstdlib>
12	#include <string.h>	12	#include <cstring>
13	#include <math.h>	13	#include <cmath>
14		14
15	#include "compatibility.h"	15	#include "compatibility.h"
16	#include <GL/gl.h>	16	#include <GL/gl.h>
17	-- src/TexFont.cpp	17	++ src/TexFont.cpp
Lines 5-16 Link Here
5	provided without guarantee or warrantee expressed or implied. This	5	provided without guarantee or warrantee expressed or implied. This
6	program is -not- in the public domain. */	6	program is -not- in the public domain. */
7	#include "compatibility.h"	7	#include "compatibility.h"
8	#include <assert.h>	8	#include <cassert>
9	#include <ctype.h>	9	#include <cctype>
10	#include <stdlib.h>	10	#include <cstdlib>
11	#include <stdio.h>	11	#include <cstdio>
12	#include <string.h>	12	#include <cstring>
13	#include <math.h>	13	#include <cmath>
14	#include <GL/glu.h>	14	#include <GL/glu.h>
15	#include "TexFont.h"	15	#include "TexFont.h"
16		16
17	-- src/extern.h	17	++ src/extern.h
Lines 8-14 Link Here
8	#ifndef extern_h	8	#ifndef extern_h
9	#define extern_h	9	#define extern_h
10		10
11	#include <stdio.h>	11	#include <cstdio>
12		12
13	const char dataLoc(const char filename, bool doCheck = true);	13	const char dataLoc(const char filename, bool doCheck = true);
14	const char alterPathForPlatform(char filename);	14	const char alterPathForPlatform(char filename);
15	-- src/main.cpp	15	++ src/main.cpp
Lines 8-22 Link Here
8	#include "compatibility.h"	8	#include "compatibility.h"
9	#include <GL/gl.h>	9	#include <GL/gl.h>
10		10
11	#include <stdlib.h>	11	#include <cstdlib>
12	#include <stdio.h>	12	#include <cstdio>
13	#include <string.h>	13	#include <cstring>
14	#include <time.h>	14	#include <ctime>
15		15
16	#ifndef _WIN32	16	#ifndef _WIN32
17	#include <unistd.h>	17	#include <unistd.h>
18	#include <fcntl.h>	18	#include <fcntl.h>
19	#include <errno.h>	19	#include <cerrno>
20	#include <sys/stat.h>	20	#include <sys/stat.h>
21	#endif // _WIN32	21	#endif // _WIN32
22		22
23	-- support/glpng/include/GL/glpng.h	23	++ support/glpng/include/GL/glpng.h
Lines 23-29 Link Here
23	#ifndef _GLPNG_H_	23	#ifndef _GLPNG_H_
24	#define _GLPNG_H_	24	#define _GLPNG_H_
25		25
26	#include <stdio.h>	26	#ifdef __cplusplus
		27	# include <cstdio>
		28	#else
		29	# include <stdio.h>
		30	#endif
27		31
28	#ifdef __cplusplus	32	#ifdef __cplusplus
29	extern "C" {	33	extern "C" {
30	-- support/glpng/src/glpng.c	34	++ support/glpng/src/glpng.c
Lines 4-9 Link Here
4	#endif	4	#endif
5		5
6	#include <GL/glpng.h>	6	#include <GL/glpng.h>
		7	/* needed to get the glext prototypes */
		8	#define GL_GLEXT_PROTOTYPES
7	#include <GL/gl.h>	9	#include <GL/gl.h>
8	#include <stdlib.h>	10	#include <stdlib.h>
9	#include <math.h>	11	#include <math.h>
Lines 47-53 Link Here
47		49
48	static char gammaExplicit = 0; /if /	50	static char gammaExplicit = 0; /if /
49		51
50	static void checkForGammaEnv()	52	static void checkForGammaEnv(void)
51	{	53	{
52	double viewingGamma;	54	double viewingGamma;
53	char *gammaEnv = getenv("VIEWING_GAMMA");	55	char *gammaEnv = getenv("VIEWING_GAMMA");
Lines 91-96 Link Here
91	}	93	}
92	}	94	}
93		95
		96	#ifdef _WIN32
94	static int ExtSupported(const char *x) {	97	static int ExtSupported(const char *x) {
95	static const GLubyte *ext = NULL;	98	static const GLubyte *ext = NULL;
96	const char *c;	99	const char *c;
Lines 107-112 Link Here
107		110
108	return 0;	111	return 0;
109	}	112	}
		113	#endif
110		114
111	#define GET(o) ((int)*(data + (o)))	115	#define GET(o) ((int)*(data + (o)))
112		116