Attachment #518942 for bug #641110

View | Details | Raw Unified | Return to bug 641110
Collapse All | Expand All

Lines 239-247 Link Here

(-)a/IDE/codeblocks/dunelegacy.cbp (-2 lines)
239	<Unit filename="../../include/misc/Scaler.h" />	239	<Unit filename="../../include/misc/Scaler.h" />
240	<Unit filename="../../include/misc/draw_util.h" />	240	<Unit filename="../../include/misc/draw_util.h" />
241	<Unit filename="../../include/misc/fnkdat.h" />	241	<Unit filename="../../include/misc/fnkdat.h" />
242	<Unit filename="../../include/misc/functional.h" />
243	<Unit filename="../../include/misc/md5.h" />	242	<Unit filename="../../include/misc/md5.h" />
244	<Unit filename="../../include/misc/memory.h" />
245	<Unit filename="../../include/misc/sound_util.h" />	243	<Unit filename="../../include/misc/sound_util.h" />
246	<Unit filename="../../include/misc/strictmath.h" />	244	<Unit filename="../../include/misc/strictmath.h" />
247	<Unit filename="../../include/misc/string_util.h" />	245	<Unit filename="../../include/misc/string_util.h" />

Lines 21-27 Link Here

(-)a/include/FileClasses/FontManager.h (-1 / +1 lines)
21	#include <SDL.h>	21	#include <SDL.h>
22	#include "Font.h"	22	#include "Font.h"
23		23
24	#include <misc/memory.h>	24	#include <memory>
25	#include <string>	25	#include <string>
26		26
27	typedef enum {	27	typedef enum {

Lines 25-31 Link Here

(-)a/include/FileClasses/GFXManager.h (-1 / +1 lines)
25	#include <DataTypes.h>	25	#include <DataTypes.h>
26		26
27	#include <string>	27	#include <string>
28	#include <misc/memory.h>	28	#include <memory>
29		29
30	#define NUM_MAPCHOICEPIECES 28	30	#define NUM_MAPCHOICEPIECES 28
31	#define NUM_MAPCHOICEARROWS 9	31	#define NUM_MAPCHOICEARROWS 9

Lines 23-29 Link Here

(-)a/include/FileClasses/PictureFactory.h (-1 / +1 lines)
23		23
24	#include <SDL.h>	24	#include <SDL.h>
25		25
26	#include <misc/memory.h>	26	#include <memory>
27		27
28	class PictureFactory {	28	class PictureFactory {
29	public:	29	public:

Lines 24-30 Link Here

(-)a/include/FileClasses/TextManager.h (-1 / +1 lines)
24	#include <string>	24	#include <string>
25	#include <vector>	25	#include <vector>
26	#include <map>	26	#include <map>
27	#include <misc/memory.h>	27	#include <memory>
28		28
29	#include <algorithm>	29	#include <algorithm>
30		30

Lines 20-29 Link Here

(-)a/include/GUI/Button.h (-1 / +1 lines)
20		20
21	#include "Widget.h"	21	#include "Widget.h"
22	#include "GUIStyle.h"	22	#include "GUIStyle.h"
23	#include <misc/functional.h>
24	#include <SDL.h>	23	#include <SDL.h>
25		24
26	#include <string>	25	#include <string>
		26	#include <functional>
27		27
28	/// A abstract base class for all buttons	28	/// A abstract base class for all buttons
29	class Button : public Widget {	29	class Button : public Widget {

Lines 20-26 Link Here

(-)a/include/GUI/ClickMap.h (-1 / +1 lines)
20		20
21	#include "Widget.h"	21	#include "Widget.h"
22		22
23	#include <misc/functional.h>	23	#include <functional>
24		24
25	/// This widget reports the coordinate where the user clicked on	25	/// This widget reports the coordinate where the user clicked on
26	class ClickMap : public Widget {	26	class ClickMap : public Widget {




#include "PictureButton.h"
#include "ListBox.h"

#include <misc/functional.h>

#include <SDL.h>
#include <vector>
#include <string>
#include <functional>

/// A class for a dropdown box widget
class DropDownBox : public Widget {




#include "Widget.h"
#include "ScrollBar.h"

#include <misc/functional.h>

#include <SDL.h>
#include <vector>
#include <string>
#include <functional>

class DropDownBox;


Lines 22-28 Link Here

(-)a/include/GUI/ScrollBar.h (-1 / +1 lines)
22	#include "PictureButton.h"	22	#include "PictureButton.h"
23	#include "TextButton.h"	23	#include "TextButton.h"
24		24
25	#include <misc/functional.h>	25	#include <functional>
26		26
27	/// A class for a scroll bar	27	/// A class for a scroll bar
28	class ScrollBar : public Widget {	28	class ScrollBar : public Widget {

Lines 20-27 Link Here

(-)a/include/GUI/Widget.h (-2 / +1 lines)
20		20
21	#include <SDL.h>	21	#include <SDL.h>
22		22
23	#include <misc/functional.h>	23	#include <functional>
24
25	#include <iostream>	24	#include <iostream>
26		25
27	/// A point class for representing a point.	26	/// A point class for representing a point.

Lines 22-28 Link Here

(-)a/include/GUI/dune/ChatManager.h (-1 / +1 lines)
22		22
23	#include <SDL.h>	23	#include <SDL.h>
24		24
25	#include <misc/memory.h>	25	#include <memory>
26	#include <string>	26	#include <string>
27	#include <list>	27	#include <list>
28		28

Lines 27-33 Link Here

(-)a/include/House.h (-1 / +1 lines)
27		27
28	#include <players/Player.h>	28	#include <players/Player.h>
29		29
30	#include <misc/memory.h>	30	#include <memory>
31		31
32	// forward declarations	32	// forward declarations
33	class UnitBase;	33	class UnitBase;

Lines 30-36 Link Here

(-)a/include/INIMap/INIMap.h (-1 / +1 lines)
30	#include <SDL.h>	30	#include <SDL.h>
31		31
32	#include <string>	32	#include <string>
33	#include <misc/memory.h>	33	#include <memory>
34		34
35		35
36	class INIMap {	36	class INIMap {

Lines 27-33 Link Here

(-)a/include/INIMap/INIMapLoader.h (-1 / +1 lines)
27		27
28	#include <string>	28	#include <string>
29	#include <map>	29	#include <map>
30	#include <misc/memory.h>	30	#include <memory>
31		31
32		32
33	// forward declarations	33	// forward declarations

Lines 27-33 Link Here

(-)a/include/INIMap/INIMapPreviewCreator.h (-1 / +1 lines)
27		27
28	#include <string>	28	#include <string>
29	#include <map>	29	#include <map>
30	#include <misc/memory.h>	30	#include <memory>
31		31
32		32
33	class INIMapPreviewCreator : public INIMap {	33	class INIMapPreviewCreator : public INIMap {

Lines 18-25 Link Here

(-)a/include/MapEditor/MapEditorOperation.h (-2 / +1 lines)
18	#ifndef MAPEDITOROPERATION_H	18	#ifndef MAPEDITOROPERATION_H
19	#define MAPEDITOROPERATION_H	19	#define MAPEDITOROPERATION_H
20		20
21	#include <misc/memory.h>
22
23	#include <data.h>	21	#include <data.h>
24		22
25	#include <DataTypes.h>	23	#include <DataTypes.h>
Lines 29-34 Link Here
29	#include <MapEditor/MapInfo.h>	27	#include <MapEditor/MapInfo.h>
30		28
31	#include <vector>	29	#include <vector>
		30	#include <memory>
32		31
33	class MapEditor;	32	class MapEditor;
34		33





#include <Network/GameServerInfo.h>

#include <misc/functional.h>

#include <enet/enet.h>
#include <SDL.h>
#include <string>
#include <list>
#include <functional>

#define LANGAME_ANNOUNCER_PORT				    28746
#define	LANGAME_ANNOUNCER_INTERVAL			    3000

Lines 21-28 Link Here

(-)a/include/Network/MetaServerClient.h (-2 / +2 lines)
21	#include <Network/MetaServerCommands.h>	21	#include <Network/MetaServerCommands.h>
22	#include <Network/GameServerInfo.h>	22	#include <Network/GameServerInfo.h>
23		23
24	#include <misc/memory.h>	24	#include <memory>
25	#include <misc/functional.h>	25	#include <functional>
26		26
27	#include <enet/enet.h>	27	#include <enet/enet.h>
28	#include <string>	28	#include <string>




#include <Network/LANGameFinderAndAnnouncer.h>
#include <Network/MetaServerClient.h>

#include <misc/functional.h>

#include <enet/enet.h>
#include <SDL.h>
#include <string>
#include <list>
#include <functional>
#include <stdarg.h>

#define NETWORKDISCONNECT_QUIT              1

Lines 22-30 Link Here

(-)a/include/RadarViewBase.h (-2 / +1 lines)
22		22
23	#include <DataTypes.h>	23	#include <DataTypes.h>
24		24
25	#include <misc/functional.h>
26
27	#include <SDL.h>	25	#include <SDL.h>
		26	#include <functional>
28		27
29		28
30	#define NUM_STATIC_FRAMES 21	29	#define NUM_STATIC_FRAMES 21

Lines 22-28 Link Here

(-)a/include/Trigger/TriggerManager.h (-1 / +1 lines)
22	#include <misc/InputStream.h>	22	#include <misc/InputStream.h>
23	#include <misc/OutputStream.h>	23	#include <misc/OutputStream.h>
24		24
25	#include <misc/memory.h>	25	#include <memory>
26	#include <list>	26	#include <list>
27		27
28	/**	28	/**

Lines 20-26 Link Here

(-)a/include/players/PlayerFactory.h (-1 / +1 lines)
20		20
21	#include <players/Player.h>	21	#include <players/Player.h>
22		22
23	#include <misc/functional.h>	23	#include <functional>
24		24
25	class PlayerFactory {	25	class PlayerFactory {
26	public:	26	public:

Lines 31-38 Link Here

(-)a/src/FileClasses/PictureFactory.cpp (-2 / +1 lines)
31	#include <misc/Scaler.h>	31	#include <misc/Scaler.h>
32		32
33	#include <stdexcept>	33	#include <stdexcept>
34		34	#include <memory>
35	#include <misc/memory.h>
36		35
37	using std::shared_ptr;	36	using std::shared_ptr;
38		37

Lines 21-27 Link Here

(-)a/src/MapEditor/MapGenerator.cpp (-1 / +1 lines)
21		21
22	#include <misc/Random.h>	22	#include <misc/Random.h>
23		23
24	#include <misc/memory.h>	24	#include <memory>
25		25
26		26
27	#define ROCKFILLER 2 //how many times random generator will try to remove sand "holes" for rock from the map	27	#define ROCKFILLER 2 //how many times random generator will try to remove sand "holes" for rock from the map

Lines 38-44 Link Here

(-)a/src/Menu/CustomGameMenu.cpp (-1 / +1 lines)
38		38
39	#include <globals.h>	39	#include <globals.h>
40		40
41	#include <misc/memory.h>	41	#include <memory>
42		42
43		43
44	CustomGameMenu::CustomGameMenu(bool multiplayer, bool LANServer)	44	CustomGameMenu::CustomGameMenu(bool multiplayer, bool LANServer)

Lines 27-34 Link Here

(-)a/src/Trigger/ReinforcementTrigger.cpp (-2 / +2 lines)
27	#include <units/UnitBase.h>	27	#include <units/UnitBase.h>
28	#include <units/Carryall.h>	28	#include <units/Carryall.h>
29		29
30	#include <misc/memory.h>
31	#include <misc/strictmath.h>	30	#include <misc/strictmath.h>
		31
		32	#include <memory>
32	#include <stdio.h>	33	#include <stdio.h>
33		34
34	ReinforcementTrigger::ReinforcementTrigger(int houseID, Uint32 itemID, DropLocation location, bool bRepeat, Uint32 triggerCycleNumber) : Trigger(triggerCycleNumber)	35	ReinforcementTrigger::ReinforcementTrigger(int houseID, Uint32 itemID, DropLocation location, bool bRepeat, Uint32 triggerCycleNumber) : Trigger(triggerCycleNumber)
35	-

Return to bug 641110

Lines 22-32 Link Here

(-)a/include/GUI/DropDownBox.h (-1 / +1 lines)
22	#include "PictureButton.h"	22	#include "PictureButton.h"
23	#include "ListBox.h"	23	#include "ListBox.h"
24		24
25	#include <misc/functional.h>
26		25
27	#include <SDL.h>	26	#include <SDL.h>
28	#include <vector>	27	#include <vector>
29	#include <string>	28	#include <string>
		29	#include <functional>
30		30
31	/// A class for a dropdown box widget	31	/// A class for a dropdown box widget
32	class DropDownBox : public Widget {	32	class DropDownBox : public Widget {

Lines 21-31 Link Here

(-)a/include/GUI/ListBox.h (-2 / +1 lines)
21	#include "Widget.h"	21	#include "Widget.h"
22	#include "ScrollBar.h"	22	#include "ScrollBar.h"
23		23
24	#include <misc/functional.h>
25
26	#include <SDL.h>	24	#include <SDL.h>
27	#include <vector>	25	#include <vector>
28	#include <string>	26	#include <string>
		27	#include <functional>
29		28
30	class DropDownBox;	29	class DropDownBox;
31		30

Lines 20-31 Link Here

(-)a/include/Network/LANGameFinderAndAnnouncer.h (-1 / +1 lines)
20		20
21	#include <Network/GameServerInfo.h>	21	#include <Network/GameServerInfo.h>
22		22
23	#include <misc/functional.h>
24		23
25	#include <enet/enet.h>	24	#include <enet/enet.h>
26	#include <SDL.h>	25	#include <SDL.h>
27	#include <string>	26	#include <string>
28	#include <list>	27	#include <list>
		28	#include <functional>
29		29
30	#define LANGAME_ANNOUNCER_PORT 28746	30	#define LANGAME_ANNOUNCER_PORT 28746
31	#define LANGAME_ANNOUNCER_INTERVAL 3000	31	#define LANGAME_ANNOUNCER_INTERVAL 3000

Lines 26-37 Link Here

(-)a/include/Network/NetworkManager.h (-2 / +1 lines)
26	#include <Network/LANGameFinderAndAnnouncer.h>	26	#include <Network/LANGameFinderAndAnnouncer.h>
27	#include <Network/MetaServerClient.h>	27	#include <Network/MetaServerClient.h>
28		28
29	#include <misc/functional.h>
30
31	#include <enet/enet.h>	29	#include <enet/enet.h>
32	#include <SDL.h>	30	#include <SDL.h>
33	#include <string>	31	#include <string>
34	#include <list>	32	#include <list>
		33	#include <functional>
35	#include <stdarg.h>	34	#include <stdarg.h>
36		35
37	#define NETWORKDISCONNECT_QUIT 1	36	#define NETWORKDISCONNECT_QUIT 1