[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[netPanzer-CVS] netpanzer ./ChangeLog mk/jam/application.jam sr...
|
From: |
Matthias Braun |
|
Subject: |
[netPanzer-CVS] netpanzer ./ChangeLog mk/jam/application.jam sr... |
|
Date: |
Sat, 22 Nov 2003 10:44:24 -0500 |
CVSROOT: /cvsroot/netpanzer
Module name: netpanzer
Branch:
Changes by: Matthias Braun <address@hidden> 03/11/22 10:43:51
Modified files:
. : ChangeLog
mk/jam : application.jam
src : Jamfile
src/Lib/2D : ColorTable.cpp DigitText.cpp DigitText.hpp
PackedSurface.cpp PackedSurface.hpp Palette.cpp
Palette.hpp Surface.cpp Surface.hpp
src/Lib/Interfaces: UtilInterface.cpp UtilInterface.hpp
src/Lib/Types : String.cpp
src/Lib/Xml : XmlConfig.cpp XmlConfig.hpp XmlParser.cpp
XmlStore.cpp XmlStore.hpp
src/NetPanzer/Classes: BonusUnitPowerUp.cpp
EnemyRadarPowerUp.cpp Objective.hpp
Outpost.hpp PlacementMatrix.hpp
PlayerID.hpp ScreenSurface.cpp
ScreenSurface.hpp SelectionBoxSprite.cpp
SelectionBoxSprite.hpp SelectionList.cpp
SpawnList.cpp SpawnList.hpp Sprite.cpp
Sprite.hpp SpriteSorter.cpp
TileEngine.cpp TileSet.cpp
UnitBlackBoard.hpp UnitBucketArray.cpp
UnitBucketArray.hpp UnitIDList.hpp
UnitList.hpp UnitPowerUp.cpp
UnitState.hpp WadMapTable.hpp
WorldInputCmdProcessor.cpp
WorldInputCmdProcessor.hpp WorldMap.cpp
src/NetPanzer/Classes/AI: Astar.cpp Astar.hpp
src/NetPanzer/Classes/Network: ClientConnectDaemon.cpp
ClientConnectDaemon.hpp
NetPacket.hpp NetPacketQueues.cpp
NetPacketQueues.hpp
NetworkClient.cpp
NetworkClient.hpp
NetworkInterface.cpp
NetworkServer.cpp
NetworkServer.hpp
NetworkState.hpp
ServerConnectDaemon.hpp
SystemNetMessage.hpp
src/NetPanzer/Classes/Units: Abrams.cpp Archer.cpp
Hammerhead.cpp Humvee.cpp
Leopard.cpp Lynx.cpp M109.cpp
Scorpion.cpp SpahPanzer.cpp
UnitGlobals.cpp UnitGlobals.hpp
Valentine.cpp Vehicle.cpp
Vehicle.hpp
src/NetPanzer/Classes/Weapons: BulletWeapon.cpp MissleWeapon.cpp
MissleWeapon.hpp ShellWeapon.cpp
Weapon.cpp Weapon.hpp
WeaponGlobals.hpp
src/NetPanzer/Core: main.cpp
src/NetPanzer/Interfaces: BaseGameManager.cpp BotGameManager.cpp
ChatInterface.cpp ConfigVariable.cpp
ConfigVariable.hpp
ConsoleInterface.hpp
DedicatedGameManager.cpp
GameConfig.cpp GameConfig.hpp
GameControlRulesDaemon.cpp
GameControlRulesDaemon.hpp
GameManager.cpp GameManager.hpp
MapInterface.hpp MapsManager.cpp
MapsManager.hpp MiniMapInterface.hpp
MouseInterface.cpp MouseInterface.hpp
ObjectiveInterface.cpp
ObjectiveInterface.hpp
PathScheduler.cpp PathScheduler.hpp
PlayerGameManager.cpp
PowerUpInterface.cpp
PowerUpInterface.hpp
ProjectileInterface.cpp Stats.cpp
Stats.hpp TileInterface.hpp
UnitInterface.cpp UnitInterface.hpp
UnitProfileInterface.cpp
src/NetPanzer/Interfaces/unix: NetworkClientUnix.cpp
NetworkClientUnix.hpp
NetworkServerUnix.cpp
NetworkServerUnix.hpp
src/NetPanzer/Port: Gdatstct.cpp blitters.cpp
src/NetPanzer/Views: GameViewGlobals.cpp GameViewGlobals.hpp
src/NetPanzer/Views/Game: AreYouSureExitView.cpp
AreYouSureExitView.hpp
AreYouSureResignView.cpp
AreYouSureResignView.hpp ChatView.cpp
ChatView.hpp CodeStatsView.hpp
ConsoleLoadingView.cpp
ConsoleLoadingView.hpp
GameInfoView.cpp GameInfoView.hpp
GameTemplateView.hpp
GameToolbarView.hpp GameView.cpp
HelpScrollView.hpp LoadingView.hpp
LobbyView.cpp LobbyView.hpp
MiniMapView.hpp ProgressView.cpp
ProgressView.hpp RankView.cpp
RankView.hpp ResignView.cpp
ResignView.hpp
VehicleSelectionView.cpp
VehicleSelectionView.hpp
WinnerMesgView.cpp WinnerMesgView.hpp
src/NetPanzer/Views/MainMenu: HelpView.hpp MainMenuView.hpp
MenuTemplateView.cpp
MenuTemplateView.hpp
OptionsTemplateView.hpp
OrderingView.hpp SkirmishView.hpp
SpecialButtonView.cpp
src/NetPanzer/Views/MainMenu/Multi: FlagSelectionView.cpp
FlagSelectionView.hpp
GetSessionHostView.cpp
GetSessionHostView.hpp
GetSessionView.hpp
HostJoinTemplateView.cpp
HostJoinTemplateView.hpp
HostOptionsView.hpp
HostView.hpp
IPAddressView.hpp
IRCLobbyView.cpp
IRCLobbyView.hpp
JoinView.hpp
MapSelectionView.cpp
MapSelectionView.hpp
PlayerNameView.hpp
UnitColorView.cpp
UnitColorView.hpp
UnitSelectionView.hpp
src/NetPanzer/Views/MainMenu/Options: ControlsView.hpp
VisualsView.cpp
Added files:
src/Lib : Jamfile
src/Lib/2D : Jamfile
src/Lib/ArrayUtil: ArrayGrowableTemplate.hpp ArrayTemplate.hpp
BitArray.cpp BitArray.hpp BoundBox.cpp
BoundBox.hpp BucketArrayTemplate.hpp
FileList.cpp FileList.hpp Jamfile
LinkListDoubleTemplate.hpp
LinkListSingleTemplate.hpp PArray.cpp
PArray.hpp QueueTemplate.hpp Timer.cpp
Timer.hpp
src/Lib/System : DummySound.cpp DummySound.hpp Jamfile Sound.cpp
Sound.hpp UIDraw.cpp UIDraw.hpp
src/Lib/System/SDL: SDLDraw.cpp SDLDraw.hpp SDLSound.cpp
SDLSound.hpp
src/Lib/Types : Jamfile
src/Lib/Util : BresenhamLine.cpp BresenhamLine.hpp
Exception.cpp Exception.hpp FileSystem.cpp
FileSystem.hpp FileUtil.cpp FileUtil.hpp
Jamfile Log.cpp Log.hpp Math.cpp Math.hpp
NoCopy.hpp SplitPath.cpp SplitPath.hpp
TimerInterface.cpp TimerInterface.hpp
UtilInterface.cpp UtilInterface.hpp
cGrowList.hpp cTimeStamp.cpp cTimeStamp.hpp
src/Lib/Xml : Jamfile
src/Lib/optionmm: Jamfile
src/NetPanzer : Jamfile
src/NetPanzer/Bot: Bot.cpp Bot.hpp BotPlayer.cpp BotPlayer.hpp
BotTask.hpp BotTaskList.cpp BotTaskList.hpp
src/NetPanzer/IRCLobby: GameServer.hpp GameServerList.hpp
IRCChatMessage.hpp IRCLobby.cpp
IRCLobby.hpp ProxyServer.cpp
ProxyServer.hpp irc_test.cpp_
src/NetPanzer/Network: ClientList.cpp ClientList.hpp
ClientSocket.cpp ClientSocket.hpp
SDLNet.cpp SDLNet.hpp ServerSocket.cpp
ServerSocket.hpp SocketClient.cpp
SocketClient.hpp SocketMessage.cpp
SocketMessage.hpp
src/NetPanzer/Particles: ChunkTrajectoryParticle2D.cpp
ChunkTrajectoryParticle2D.hpp
CloudParticle2D.cpp CloudParticle2D.hpp
CraterParticle2D.cpp
CraterParticle2D.hpp
DirtKickParticle2D.cpp
DirtKickParticle2D.hpp
ExplosionFlashParticle2D.hpp
FireParticle2D.cpp FireParticle2D.hpp
FireParticleSystem2D.cpp
FireParticleSystem2D.hpp
FlameParticle2D.cpp FlameParticle2D.hpp
FlashParticle2D.cpp FlashParticle2D.hpp
GroundExplosionParticle2D.cpp
GroundExplosionParticle2D.hpp
GroundExplosionParticleSystem2D.cpp
GroundExplosionParticleSystem2D.hpp
MovementDirtPuffParticle2D.hpp
Particle2D.cpp Particle2D.hpp
ParticleInterface.cpp
ParticleInterface.hpp
ParticleSystem2D.cpp
ParticleSystem2D.hpp
ParticleSystemGlobals.cpp
ParticleSystemGlobals.hpp
ParticleTweakView.cpp
ParticleTweakView.hpp Physics.cpp
Physics.hpp PuffParticle2D.cpp
PuffParticle2D.hpp
RadarPingParticle2D.cpp
RadarPingParticle2D.hpp
SmokingTrajectoryParticle2D.cpp
SmokingTrajectoryParticle2D.hpp
SmolderParticleSystem2D.cpp
SmolderParticleSystem2D.hpp
SnowParticle2D.cpp SnowParticle2D.hpp
SnowParticleSystem2D.cpp
SnowParticleSystem2D.hpp
SparkParticle2D.cpp SparkParticle2D.hpp
TemplateExplosionSystem.cpp
TemplateExplosionSystem.hpp
TemplateMuzzleSystem.cpp
TemplateMuzzleSystem.hpp
TrajectoryParticle2D.cpp
TrajectoryParticle2D.hpp
VectorPuffParticle2D.cpp
VectorPuffParticle2D.hpp
WindParticle2D.cpp WindParticle2D.hpp
src/NetPanzer/View: AbstractButton.cpp AbstractButton.hpp
Button.cpp Button.hpp CheckBox.cpp
CheckBox.hpp Choice.cpp Choice.hpp
Component.cpp Component.hpp Desktop.cpp
Desktop.hpp Icon.cpp Icon.hpp InputEvent.hpp
Label.cpp Label.hpp MouseEvent.hpp
ScrollBar.cpp ScrollBar.hpp
StateChangedCallback.hpp TextArea.cpp
TextArea.hpp TextComponent.cpp
TextComponent.hpp TextField.cpp
TextField.hpp View.cpp View.hpp
ViewGlobals.cpp ViewGlobals.hpp cButton.cpp
cButton.hpp cInputField.cpp cInputField.hpp
cMouse.cpp cMouse.hpp
Removed files:
src/Bot : Bot.cpp Bot.hpp BotPlayer.cpp BotPlayer.hpp
BotTask.hpp BotTaskList.cpp BotTaskList.hpp
src/Lib/IRCLobby: GameServer.hpp GameServerList.hpp
IRCChatMessage.hpp IRCLobby.cpp IRCLobby.hpp
irc_test.cpp_
src/Lib/PObject/Classes: Angle.cpp Angle.hpp BitArray.cpp
BitArray.hpp BoundBox.cpp BoundBox.hpp
BresenhamLine.cpp BresenhamLine.hpp
FileList.cpp FileList.hpp PArray.cpp
PArray.hpp Timer.cpp Timer.hpp
src/Lib/PObject/Templates: ArrayGrowableTemplate.hpp
ArrayTemplate.hpp
BucketArrayTemplate.hpp
LinkListDoubleTemplate.hpp
LinkListSingleTemplate.hpp
QueueTemplate.hpp
src/UILib : DummySound.cpp DummySound.hpp Sound.cpp
Sound.hpp UIDraw.cpp UIDraw.hpp
src/UILib/Network: ClientList.cpp ClientList.hpp
ClientSocket.cpp ClientSocket.hpp SDLNet.cpp
SDLNet.hpp ServerSocket.cpp ServerSocket.hpp
SocketClient.cpp SocketClient.hpp
SocketMessage.cpp SocketMessage.hpp
src/UILib/SDL : SDLDraw.cpp SDLDraw.hpp SDLSound.cpp
SDLSound.hpp
Log message:
-big reorganisation. Created several real libs in the lib directory and
moved
some stuff inside NetPanzer directory.
Patches:
Index: netpanzer/ChangeLog
diff -u netpanzer/ChangeLog:1.35 netpanzer/ChangeLog:1.36
--- netpanzer/ChangeLog:1.35 Fri Nov 21 17:33:11 2003
+++ netpanzer/ChangeLog Sat Nov 22 10:43:09 2003
@@ -1,3 +1,7 @@
+22-Nov-2003 by Matthias Braun
+-big reorganisation. Created several real libs in the lib directory and moved
+some stuff inside NetPanzer directory.
+
21-Nov-2003 by Matthias Braun
-Applied a patch by Michel Metzger (address@hidden) which makes it possible to
select the location where built units move.
Index: netpanzer/mk/jam/application.jam
diff -u netpanzer/mk/jam/application.jam:1.1
netpanzer/mk/jam/application.jam:1.2
--- netpanzer/mk/jam/application.jam:1.1 Tue Sep 23 21:26:18 2003
+++ netpanzer/mk/jam/application.jam Sat Nov 22 10:43:11 2003
@@ -40,6 +40,7 @@
Always $(<)clean ;
NotFile $(<)clean ;
Clean $(<)clean : $(objects) ; # create target clean rule
+ Depends clean : $(<)clean ;
# so 'jam foo' works when it's really foo.exe (Windows) or foo.app (MacOS/X)
if $(target) != $(<)
Index: netpanzer/src/Jamfile
diff -u netpanzer/src/Jamfile:1.7 netpanzer/src/Jamfile:1.8
--- netpanzer/src/Jamfile:1.7 Wed Nov 19 07:26:50 2003
+++ netpanzer/src/Jamfile Sat Nov 22 10:43:12 2003
@@ -1,52 +1,7 @@
SubDir TOP src ;
-SUBDIRS =
- .
- Lib
- Lib/2D
- Lib/Xml
- Lib/View
- Lib/IRCLobby
- Lib/Types
- Lib/Particles
- Lib/PObject
- Lib/PObject/Classes
- Lib/PObject/Templates
- Lib/optionmm
- Lib/Interfaces
- NetPanzer
- NetPanzer/Core
- NetPanzer/Port
- NetPanzer/Views
- NetPanzer/Views/Game
- NetPanzer/Views/MainMenu
- NetPanzer/Views/MainMenu/Multi
- NetPanzer/Views/MainMenu/Options
- NetPanzer/Classes
- NetPanzer/Classes/AI
- NetPanzer/Classes/Units
- NetPanzer/Classes/Weapons
- NetPanzer/Classes/Network
- NetPanzer/Resources
- NetPanzer/Structs
- NetPanzer/Interfaces
- NetPanzer/Interfaces/unix
- Bot
- UILib
- UILib/SDL
- UILib/Network
-;
-
-for i in $(SUBDIRS)
-{
- SearchSubdir $(i) ;
- SOURCES += [ Wildcard $(i) : *.cpp *.hpp ] ;
- IncludeDir $(i) ;
-}
-
-Application netpanzer : $(SOURCES) ;
-CFlags netpanzer : -DDATADIR=\\\"$(datadir)\\\" ;
-ExternalLibs netpanzer : XML SDLNET SDLMIXER SDLIMAGE SDL PHYSFS ;
-Help netpanzer : "Build the main netpanzer executable" ;
+IncludeDir Lib ;
+SubInclude TOP src Lib ;
SubInclude TOP src Editor ;
+SubInclude TOP src NetPanzer ;
Index: netpanzer/src/Lib/2D/ColorTable.cpp
diff -u netpanzer/src/Lib/2D/ColorTable.cpp:1.16
netpanzer/src/Lib/2D/ColorTable.cpp:1.17
--- netpanzer/src/Lib/2D/ColorTable.cpp:1.16 Wed Oct 22 19:05:40 2003
+++ netpanzer/src/Lib/2D/ColorTable.cpp Sat Nov 22 10:43:12 2003
@@ -17,14 +17,14 @@
*/
#include <config.h>
-#include "SplitPath.hpp"
-#include "FileSystem.hpp"
-#include "Log.hpp"
-#include "Exception.hpp"
+#include "Util/SplitPath.hpp"
+#include "Util/FileSystem.hpp"
+#include "Util/Log.hpp"
+#include "Util/Exception.hpp"
#include "ColorTable.hpp"
#include "Palette.hpp"
#include "Surface.hpp"
-#include "UtilInterface.hpp"
+#include "Util/UtilInterface.hpp"
char *ColorTable::extension = ".tbl";
Index: netpanzer/src/Lib/2D/DigitText.cpp
diff -u netpanzer/src/Lib/2D/DigitText.cpp:1.8
netpanzer/src/Lib/2D/DigitText.cpp:1.9
--- netpanzer/src/Lib/2D/DigitText.cpp:1.8 Mon Oct 13 10:30:06 2003
+++ netpanzer/src/Lib/2D/DigitText.cpp Sat Nov 22 10:43:13 2003
@@ -17,8 +17,8 @@
*/
#include <config.h>
-#include "Exception.hpp"
-#include "FileSystem.hpp"
+#include "Util/Exception.hpp"
+#include "Util/FileSystem.hpp"
#include "DigitText.hpp"
Surface DigitText::charactersNormal;
Index: netpanzer/src/Lib/2D/DigitText.hpp
diff -u netpanzer/src/Lib/2D/DigitText.hpp:1.4
netpanzer/src/Lib/2D/DigitText.hpp:1.5
--- netpanzer/src/Lib/2D/DigitText.hpp:1.4 Mon Oct 13 10:30:07 2003
+++ netpanzer/src/Lib/2D/DigitText.hpp Sat Nov 22 10:43:13 2003
@@ -18,8 +18,8 @@
#ifndef __DigitText_hpp__
#define __DigitText_hpp__
+#include "Types/iXY.hpp"
#include "Surface.hpp"
-#include "iXY.hpp"
#include "Color.hpp"
enum DIGIT_BLT_MODES
Index: netpanzer/src/Lib/2D/PackedSurface.cpp
diff -u netpanzer/src/Lib/2D/PackedSurface.cpp:1.19
netpanzer/src/Lib/2D/PackedSurface.cpp:1.20
--- netpanzer/src/Lib/2D/PackedSurface.cpp:1.19 Sat Oct 25 11:26:05 2003
+++ netpanzer/src/Lib/2D/PackedSurface.cpp Sat Nov 22 10:43:13 2003
@@ -22,13 +22,13 @@
#include <algorithm>
#include <memory>
+#include "Util/TimerInterface.hpp"
+#include "Util/FileSystem.hpp"
+#include "Util/Exception.hpp"
+#include "Util/UtilInterface.hpp"
#include "PackedSurface.hpp"
#include "Surface.hpp"
-#include "TimerInterface.hpp"
#include "Span.hpp"
-#include "FileSystem.hpp"
-#include "Exception.hpp"
-#include "UtilInterface.hpp"
#ifdef MSVC
#pragma pack (1)
Index: netpanzer/src/Lib/2D/PackedSurface.hpp
diff -u netpanzer/src/Lib/2D/PackedSurface.hpp:1.6
netpanzer/src/Lib/2D/PackedSurface.hpp:1.7
--- netpanzer/src/Lib/2D/PackedSurface.hpp:1.6 Mon Oct 13 10:30:08 2003
+++ netpanzer/src/Lib/2D/PackedSurface.hpp Sat Nov 22 10:43:13 2003
@@ -18,10 +18,10 @@
#ifndef __PackedSurface_hpp__
#define __PackedSurface_hpp__
-#include "iRect.hpp"
-#include "iXY.hpp"
+#include "Types/iRect.hpp"
+#include "Types/iXY.hpp"
+#include "Util/cGrowList.hpp"
#include "ColorTable.hpp"
-#include "cGrowList.hpp"
class Surface;
class PackedSurface;
Index: netpanzer/src/Lib/2D/Palette.cpp
diff -u netpanzer/src/Lib/2D/Palette.cpp:1.13
netpanzer/src/Lib/2D/Palette.cpp:1.14
--- netpanzer/src/Lib/2D/Palette.cpp:1.13 Wed Nov 12 12:31:29 2003
+++ netpanzer/src/Lib/2D/Palette.cpp Sat Nov 22 10:43:13 2003
@@ -20,9 +20,9 @@
#include <math.h>
#include "Palette.hpp"
-#include "FileSystem.hpp"
-#include "Exception.hpp"
-#include "UtilInterface.hpp"
+#include "Util/FileSystem.hpp"
+#include "Util/Exception.hpp"
+#include "Util/UtilInterface.hpp"
float Palette::brightness = 1.0f;
Index: netpanzer/src/Lib/2D/Palette.hpp
diff -u netpanzer/src/Lib/2D/Palette.hpp:1.5
netpanzer/src/Lib/2D/Palette.hpp:1.6
--- netpanzer/src/Lib/2D/Palette.hpp:1.5 Sun Oct 5 09:50:09 2003
+++ netpanzer/src/Lib/2D/Palette.hpp Sat Nov 22 10:43:13 2003
@@ -24,7 +24,7 @@
#include "Color.hpp"
#include "ColorTable.hpp"
#include "RGBColor.hpp"
-#include "String.hpp"
+#include "Types/String.hpp"
const size_t PALETTE_LENGTH = 256;
Index: netpanzer/src/Lib/2D/Surface.cpp
diff -u netpanzer/src/Lib/2D/Surface.cpp:1.41
netpanzer/src/Lib/2D/Surface.cpp:1.42
--- netpanzer/src/Lib/2D/Surface.cpp:1.41 Thu Nov 6 14:58:28 2003
+++ netpanzer/src/Lib/2D/Surface.cpp Sat Nov 22 10:43:14 2003
@@ -22,16 +22,16 @@
#include <vector>
#include <string>
#include <algorithm>
-#include "Log.hpp"
+#include "Util/Log.hpp"
+#include "Util/FileSystem.hpp"
+#include "Util/UtilInterface.hpp"
+#include "Util/cGrowList.hpp"
+#include "Types/fXY.hpp"
+#include "Util/TimerInterface.hpp"
+#include "Util/Exception.hpp"
+#include "Palette.hpp"
#include "Surface.hpp"
-#include "FileSystem.hpp"
-#include "UtilInterface.hpp"
-#include "cGrowList.hpp"
-#include "fXY.hpp"
-#include "TimerInterface.hpp"
#include "Span.hpp"
-#include "Palette.hpp"
-#include "Exception.hpp"
using std::swap;
using std::min;
Index: netpanzer/src/Lib/2D/Surface.hpp
diff -u netpanzer/src/Lib/2D/Surface.hpp:1.18
netpanzer/src/Lib/2D/Surface.hpp:1.19
--- netpanzer/src/Lib/2D/Surface.hpp:1.18 Thu Nov 6 14:58:28 2003
+++ netpanzer/src/Lib/2D/Surface.hpp Sat Nov 22 10:43:14 2003
@@ -22,9 +22,9 @@
#include <stdint.h>
#include <stdlib.h>
#include <stdio.h>
-#include "iXY.hpp"
-#include "iRect.hpp"
-#include "NoCopy.hpp"
+#include "Types/iXY.hpp"
+#include "Types/iRect.hpp"
+#include "Util/NoCopy.hpp"
class ColorTable;
class Palette;
Index: netpanzer/src/Lib/Interfaces/UtilInterface.cpp
diff -u netpanzer/src/Lib/Interfaces/UtilInterface.cpp:1.12
netpanzer/src/Lib/Interfaces/UtilInterface.cpp:1.13
--- netpanzer/src/Lib/Interfaces/UtilInterface.cpp:1.12 Thu Nov 13 08:12:18 2003
+++ netpanzer/src/Lib/Interfaces/UtilInterface.cpp Sat Nov 22 10:43:16 2003
@@ -23,7 +23,6 @@
#include "SplitPath.hpp"
#include "Exception.hpp"
#include "FileSystem.hpp"
-#include "GameConfig.hpp"
#include "UtilInterface.hpp"
#include "Log.hpp"
@@ -142,8 +141,6 @@
#endif
} // end UtilInterface::startRandomNumberGenerator
-
-
// split server:port string, doesn't always set the port
void UtilInterface::splitServerPort(const std::string& server,std::string&
address,int *port)
{
@@ -158,64 +155,4 @@
port[0]=atoi(port_str.c_str());
}
}
-
-
-void UtilInterface::makeBase64(std::string &base64,std::string &str)
-{
- static const char
base64_chars[65]="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
- const char *auth_ptr;
- char auth_ptr_dest[5];
-
- auth_ptr_dest[4]=0;
- base64="";
- for(auth_ptr=str.c_str(); *auth_ptr; auth_ptr+=3) {
- auth_ptr_dest[0]='=';
- auth_ptr_dest[1]='=';
- auth_ptr_dest[2]='=';
- auth_ptr_dest[3]='=';
-
- auth_ptr_dest[0]=base64_chars[(auth_ptr[0]&0xfc) >>2];
- auth_ptr_dest[1]=base64_chars[((auth_ptr[0]&0x3)
<<4)|((auth_ptr[1]&0xf0)>>4)];
- if(auth_ptr[1]==0) { base64+=auth_ptr_dest; break; }
- auth_ptr_dest[2]=base64_chars[((auth_ptr[1]&0xf)
<<2)|((auth_ptr[2]&0xc0)>>6)];
- if(auth_ptr[2]==0) { base64+=auth_ptr_dest; break; }
- auth_ptr_dest[3]=base64_chars[((auth_ptr[2]&0x3f))];
- base64+=auth_ptr_dest;
- }
-}
-
-
-void UtilInterface::getProxyConnect(std::stringstream &buffer,const
std::string &serveraddress) {
- if(((const std::string &)gameconfig->proxyserver).size()>0) {
- buffer << "CONNECT " << serveraddress << " HTTP/1.0\r\n";
- if(((const std::string &)gameconfig->proxyserveruser).size()>0) {
- std::string base64;
- std::string userpass( ((const std::string
&)gameconfig->proxyserveruser) +":"+((const std::string
&)gameconfig->proxyserverpass) );
- UtilInterface::makeBase64(base64, userpass);
- buffer << "Authorization: Basic " << base64 << "\r\n";
- }
- buffer << "\r\n";
- }
-}
-
-
-void UtilInterface::sendProxyConnect(TCPsocket socket,const std::string
&serveraddress)
-{
- std::stringstream buffer;
-
- getProxyConnect(buffer,serveraddress);
-
- SDLNet_TCP_Send(socket,const_cast<char*>
(buffer.str().c_str()),buffer.str().size());
- int lfs=0;
-// XXX grab any http error messages
- while(1) {
- char ch;
- if(SDLNet_TCP_Recv(socket,&ch,1)!=1) { break; }
- if(ch=='\r') { continue; }
- if(ch=='\n') { lfs++; }
- else { lfs=0; }
- if(lfs>=2) { break; }
- }
-}
-
Index: netpanzer/src/Lib/Interfaces/UtilInterface.hpp
diff -u netpanzer/src/Lib/Interfaces/UtilInterface.hpp:1.7
netpanzer/src/Lib/Interfaces/UtilInterface.hpp:1.8
--- netpanzer/src/Lib/Interfaces/UtilInterface.hpp:1.7 Thu Nov 13 08:12:18 2003
+++ netpanzer/src/Lib/Interfaces/UtilInterface.hpp Sat Nov 22 10:43:17 2003
@@ -41,13 +41,14 @@
sprintf(Filename::name, "%s", name);
}
-
-}
-; // end Filename
+}; // end Filename
int FilenameSortFunction(const void *a, const void *b);
//--------------------------------------------------------------------------
+/**
+ * @deprecated This interface is deprecated and shouldn't be used in new code
+ */
class UtilInterface
{
public:
@@ -62,11 +63,6 @@
// get servername/port from a string, doesn't always set the port
static void splitServerPort(const std::string &server,std::string
&address,int *port);
- static void makeBase64(std::string &base64,std::string &str);
- static void getProxyConnect(std::stringstream &buf,const std::string
&serveraddress);
- static void sendProxyConnect(TCPsocket socket,const std::string
&serveraddress);
-
-
}; // end UtilInterface
#endif // __UtilInterface_hpp__
Index: netpanzer/src/Lib/Types/String.cpp
diff -u netpanzer/src/Lib/Types/String.cpp:1.1
netpanzer/src/Lib/Types/String.cpp:1.2
--- netpanzer/src/Lib/Types/String.cpp:1.1 Sat Oct 25 09:29:14 2003
+++ netpanzer/src/Lib/Types/String.cpp Sat Nov 22 10:43:19 2003
@@ -17,7 +17,6 @@
*/
#include <config.h>
-#include "Exception.hpp"
#include "String.hpp"
// String
@@ -28,11 +27,7 @@
{
length = strlen(string);
mem = new char [length + 1];
- if (mem == 0) {
- throw Exception("ERROR: Unable to allocate string.");
- }
strcpy(mem, string);
-
} // String::String
// String
@@ -43,11 +38,7 @@
{
length = string.length;
mem = new char [length + 1];
- if (mem == 0) {
- throw Exception("ERROR: Unable to allocate string.");
- }
strcpy(mem, string.mem);
-
} // String::String
// ~String
@@ -69,9 +60,6 @@
delete [] mem;
length = string.length;
mem = new char [length + 1];
- if (mem == 0) {
- throw Exception("ERROR: Unable to allocate string.");
- }
strcpy(mem, string.mem);
}
@@ -87,9 +75,6 @@
char *tempPtr = mem;
length += string.length;
mem = new char [length + 1];
- if (mem == 0) {
- throw Exception("ERROR: Unable to allocate string.");
- }
strcpy(mem, tempPtr);
strcat(mem, string.mem);
delete [] tempPtr;
Index: netpanzer/src/Lib/Xml/XmlConfig.cpp
diff -u netpanzer/src/Lib/Xml/XmlConfig.cpp:1.4
netpanzer/src/Lib/Xml/XmlConfig.cpp:1.5
--- netpanzer/src/Lib/Xml/XmlConfig.cpp:1.4 Sat Nov 22 04:13:56 2003
+++ netpanzer/src/Lib/Xml/XmlConfig.cpp Sat Nov 22 10:43:22 2003
@@ -19,8 +19,8 @@
#include "XmlConfig.hpp"
#include "XmlParser.hpp"
-#include "Exception.hpp"
-#include "Log.hpp"
+#include "Util/Exception.hpp"
+#include "Util/Log.hpp"
//-----------------------------------------------------------------
/**
Index: netpanzer/src/Lib/Xml/XmlConfig.hpp
diff -u netpanzer/src/Lib/Xml/XmlConfig.hpp:1.3
netpanzer/src/Lib/Xml/XmlConfig.hpp:1.4
--- netpanzer/src/Lib/Xml/XmlConfig.hpp:1.3 Sat Nov 22 04:13:57 2003
+++ netpanzer/src/Lib/Xml/XmlConfig.hpp Sat Nov 22 10:43:22 2003
@@ -15,13 +15,13 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
#ifndef XMLCONFIG_H
#define XMLCONFIG_H
#include <string>
#include <libxml/tree.h>
-#include <iXY.hpp>
+
+#include "Types/iXY.hpp"
/**
* XML configuration from file.
Index: netpanzer/src/Lib/Xml/XmlParser.cpp
diff -u netpanzer/src/Lib/Xml/XmlParser.cpp:1.2
netpanzer/src/Lib/Xml/XmlParser.cpp:1.3
--- netpanzer/src/Lib/Xml/XmlParser.cpp:1.2 Mon Sep 22 11:15:51 2003
+++ netpanzer/src/Lib/Xml/XmlParser.cpp Sat Nov 22 10:43:22 2003
@@ -23,7 +23,7 @@
#include <libxml/globals.h>
#include "XmlParser.hpp"
-#include "Log.hpp"
+#include "Util/Log.hpp"
//-----------------------------------------------------------------
/**
Index: netpanzer/src/Lib/Xml/XmlStore.cpp
diff -u netpanzer/src/Lib/Xml/XmlStore.cpp:1.3
netpanzer/src/Lib/Xml/XmlStore.cpp:1.4
--- netpanzer/src/Lib/Xml/XmlStore.cpp:1.3 Sat Nov 22 04:13:57 2003
+++ netpanzer/src/Lib/Xml/XmlStore.cpp Sat Nov 22 10:43:22 2003
@@ -19,9 +19,9 @@
#include "XmlStore.hpp"
#include "XmlParser.hpp"
-#include "FileSystem.hpp"
-#include "Exception.hpp"
-#include "Log.hpp"
+#include "Util/FileSystem.hpp"
+#include "Util/Exception.hpp"
+#include "Util/Log.hpp"
//-----------------------------------------------------------------
/**
Index: netpanzer/src/Lib/Xml/XmlStore.hpp
diff -u netpanzer/src/Lib/Xml/XmlStore.hpp:1.3
netpanzer/src/Lib/Xml/XmlStore.hpp:1.4
--- netpanzer/src/Lib/Xml/XmlStore.hpp:1.3 Sat Nov 22 04:13:57 2003
+++ netpanzer/src/Lib/Xml/XmlStore.hpp Sat Nov 22 10:43:22 2003
@@ -20,7 +20,8 @@
#include <string>
#include <libxml/tree.h>
-#include <iXY.hpp>
+
+#include "Types/iXY.hpp"
/**
* Save XML configuration to file.
Index: netpanzer/src/NetPanzer/Classes/AI/Astar.cpp
diff -u netpanzer/src/NetPanzer/Classes/AI/Astar.cpp:1.9
netpanzer/src/NetPanzer/Classes/AI/Astar.cpp:1.10
--- netpanzer/src/NetPanzer/Classes/AI/Astar.cpp:1.9 Thu Nov 6 12:53:25 2003
+++ netpanzer/src/NetPanzer/Classes/AI/Astar.cpp Sat Nov 22 10:43:27 2003
@@ -19,9 +19,9 @@
#include <functional>
#include "Astar.hpp"
-#include "Timer.hpp"
+#include "ArrayUtil/Timer.hpp"
#include "PathingState.hpp"
-#include "Log.hpp"
+#include "Util/Log.hpp"
Astar::Astar()
{
Index: netpanzer/src/NetPanzer/Classes/AI/Astar.hpp
diff -u netpanzer/src/NetPanzer/Classes/AI/Astar.hpp:1.7
netpanzer/src/NetPanzer/Classes/AI/Astar.hpp:1.8
--- netpanzer/src/NetPanzer/Classes/AI/Astar.hpp:1.7 Thu Nov 6 12:53:26 2003
+++ netpanzer/src/NetPanzer/Classes/AI/Astar.hpp Sat Nov 22 10:43:27 2003
@@ -20,7 +20,7 @@
#include <queue>
-#include "BitArray.hpp"
+#include "ArrayUtil/BitArray.hpp"
#include "MapInterface.hpp"
#include "UnitID.hpp"
#include "UnitBlackBoard.hpp"
Index: netpanzer/src/NetPanzer/Classes/BonusUnitPowerUp.cpp
diff -u netpanzer/src/NetPanzer/Classes/BonusUnitPowerUp.cpp:1.7
netpanzer/src/NetPanzer/Classes/BonusUnitPowerUp.cpp:1.8
--- netpanzer/src/NetPanzer/Classes/BonusUnitPowerUp.cpp:1.7 Tue Sep 16
16:16:11 2003
+++ netpanzer/src/NetPanzer/Classes/BonusUnitPowerUp.cpp Sat Nov 22
10:43:23 2003
@@ -30,7 +30,7 @@
#include "UnitNetMessage.hpp"
#include "PowerUpNetMessage.hpp"
-#include "Sound.hpp"
+#include "System/Sound.hpp"
SpritePacked BONUS_POWERUP_ANIM;
Index: netpanzer/src/NetPanzer/Classes/EnemyRadarPowerUp.cpp
diff -u netpanzer/src/NetPanzer/Classes/EnemyRadarPowerUp.cpp:1.7
netpanzer/src/NetPanzer/Classes/EnemyRadarPowerUp.cpp:1.8
--- netpanzer/src/NetPanzer/Classes/EnemyRadarPowerUp.cpp:1.7 Tue Sep 16
16:16:11 2003
+++ netpanzer/src/NetPanzer/Classes/EnemyRadarPowerUp.cpp Sat Nov 22
10:43:24 2003
@@ -31,7 +31,7 @@
#include "UnitNetMessage.hpp"
#include "PowerUpNetMessage.hpp"
-#include "Sound.hpp"
+#include "System/Sound.hpp"
SpritePacked ENEMY_RADAR_POWERUP_ANIM;
Index: netpanzer/src/NetPanzer/Classes/Network/ClientConnectDaemon.cpp
diff -u netpanzer/src/NetPanzer/Classes/Network/ClientConnectDaemon.cpp:1.10
netpanzer/src/NetPanzer/Classes/Network/ClientConnectDaemon.cpp:1.11
--- netpanzer/src/NetPanzer/Classes/Network/ClientConnectDaemon.cpp:1.10
Wed Oct 22 13:50:46 2003
+++ netpanzer/src/NetPanzer/Classes/Network/ClientConnectDaemon.cpp Sat Nov
22 10:43:27 2003
@@ -26,7 +26,7 @@
#include "GameConfig.hpp"
#include "GameManager.hpp"
-#include "Log.hpp"
+#include "Util/Log.hpp"
#include "ConnectNetMessage.hpp"
#include "ConsoleInterface.hpp"
Index: netpanzer/src/NetPanzer/Classes/Network/ClientConnectDaemon.hpp
diff -u netpanzer/src/NetPanzer/Classes/Network/ClientConnectDaemon.hpp:1.3
netpanzer/src/NetPanzer/Classes/Network/ClientConnectDaemon.hpp:1.4
--- netpanzer/src/NetPanzer/Classes/Network/ClientConnectDaemon.hpp:1.3 Tue Sep
16 16:16:11 2003
+++ netpanzer/src/NetPanzer/Classes/Network/ClientConnectDaemon.hpp Sat Nov
22 10:43:28 2003
@@ -20,7 +20,7 @@
#include "PlayerState.hpp"
#include "NetPacket.hpp"
-#include "Timer.hpp"
+#include "ArrayUtil/Timer.hpp"
class ClientConnectDaemon
{
Index: netpanzer/src/NetPanzer/Classes/Network/NetPacket.hpp
diff -u netpanzer/src/NetPanzer/Classes/Network/NetPacket.hpp:1.8
netpanzer/src/NetPanzer/Classes/Network/NetPacket.hpp:1.9
--- netpanzer/src/NetPanzer/Classes/Network/NetPacket.hpp:1.8 Thu Nov 20
19:19:25 2003
+++ netpanzer/src/NetPanzer/Classes/Network/NetPacket.hpp Sat Nov 22
10:43:28 2003
@@ -19,7 +19,7 @@
#define _NETPACKET_HPP
#include "NetMessageEnums.hpp"
-#include "UILib/Network/SocketClient.hpp"
+#include "Network/SocketClient.hpp"
#define _MAX_NET_PACKET_SIZE 512
Index: netpanzer/src/NetPanzer/Classes/Network/NetPacketQueues.cpp
diff -u netpanzer/src/NetPanzer/Classes/Network/NetPacketQueues.cpp:1.8
netpanzer/src/NetPanzer/Classes/Network/NetPacketQueues.cpp:1.9
--- netpanzer/src/NetPanzer/Classes/Network/NetPacketQueues.cpp:1.8 Thu Nov
20 19:19:25 2003
+++ netpanzer/src/NetPanzer/Classes/Network/NetPacketQueues.cpp Sat Nov 22
10:43:28 2003
@@ -17,7 +17,7 @@
*/
#include <config.h>
-#include "Log.hpp"
+#include "Util/Log.hpp"
#include "NetPacketQueues.hpp"
#include "ConsoleInterface.hpp"
Index: netpanzer/src/NetPanzer/Classes/Network/NetPacketQueues.hpp
diff -u netpanzer/src/NetPanzer/Classes/Network/NetPacketQueues.hpp:1.4
netpanzer/src/NetPanzer/Classes/Network/NetPacketQueues.hpp:1.5
--- netpanzer/src/NetPanzer/Classes/Network/NetPacketQueues.hpp:1.4 Thu Nov
20 19:19:25 2003
+++ netpanzer/src/NetPanzer/Classes/Network/NetPacketQueues.hpp Sat Nov 22
10:43:28 2003
@@ -20,9 +20,9 @@
#include <string.h>
#include "NetPacket.hpp"
-#include "QueueTemplate.hpp"
-#include "ArrayTemplate.hpp"
-#include "Timer.hpp"
+#include "ArrayUtil/QueueTemplate.hpp"
+#include "ArrayUtil/ArrayTemplate.hpp"
+#include "ArrayUtil/Timer.hpp"
class NetPacketQueue : public QueueTemplate< NetPacket >
{
Index: netpanzer/src/NetPanzer/Classes/Network/NetworkClient.cpp
diff -u netpanzer/src/NetPanzer/Classes/Network/NetworkClient.cpp:1.10
netpanzer/src/NetPanzer/Classes/Network/NetworkClient.cpp:1.11
--- netpanzer/src/NetPanzer/Classes/Network/NetworkClient.cpp:1.10 Thu Nov
20 19:19:25 2003
+++ netpanzer/src/NetPanzer/Classes/Network/NetworkClient.cpp Sat Nov 22
10:43:28 2003
@@ -17,7 +17,7 @@
*/
#include <config.h>
-#include "Log.hpp"
+#include "Util/Log.hpp"
#include "NetworkGlobals.hpp"
#include "NetworkClient.hpp"
Index: netpanzer/src/NetPanzer/Classes/Network/NetworkClient.hpp
diff -u netpanzer/src/NetPanzer/Classes/Network/NetworkClient.hpp:1.7
netpanzer/src/NetPanzer/Classes/Network/NetworkClient.hpp:1.8
--- netpanzer/src/NetPanzer/Classes/Network/NetworkClient.hpp:1.7 Sun Oct
5 09:50:12 2003
+++ netpanzer/src/NetPanzer/Classes/Network/NetworkClient.hpp Sat Nov 22
10:43:28 2003
@@ -21,9 +21,9 @@
#include "NetworkInterface.hpp"
#include "NetworkReturnCodes.hpp"
-#include "Timer.hpp"
+#include "ArrayUtil/Timer.hpp"
#include "PlayerID.hpp"
-#include "ArrayTemplate.hpp"
+#include "ArrayUtil/ArrayTemplate.hpp"
enum { _connection_loop_back,
_connection_network
Index: netpanzer/src/NetPanzer/Classes/Network/NetworkInterface.cpp
diff -u netpanzer/src/NetPanzer/Classes/Network/NetworkInterface.cpp:1.9
netpanzer/src/NetPanzer/Classes/Network/NetworkInterface.cpp:1.10
--- netpanzer/src/NetPanzer/Classes/Network/NetworkInterface.cpp:1.9 Thu Nov
20 19:19:25 2003
+++ netpanzer/src/NetPanzer/Classes/Network/NetworkInterface.cpp Sat Nov
22 10:43:28 2003
@@ -17,7 +17,7 @@
*/
#include <config.h>
-#include "Log.hpp"
+#include "Util/Log.hpp"
#include "NetworkInterface.hpp"
void EnqueueIncomingPacket(void *message, unsigned long message_size,
Index: netpanzer/src/NetPanzer/Classes/Network/NetworkServer.cpp
diff -u netpanzer/src/NetPanzer/Classes/Network/NetworkServer.cpp:1.8
netpanzer/src/NetPanzer/Classes/Network/NetworkServer.cpp:1.9
--- netpanzer/src/NetPanzer/Classes/Network/NetworkServer.cpp:1.8 Thu Nov
20 19:19:25 2003
+++ netpanzer/src/NetPanzer/Classes/Network/NetworkServer.cpp Sat Nov 22
10:43:28 2003
@@ -17,7 +17,7 @@
*/
#include <config.h>
-#include "Log.hpp"
+#include "Util/Log.hpp"
#include "NetworkServer.hpp"
#include "ClientServerNetMessage.hpp"
Index: netpanzer/src/NetPanzer/Classes/Network/NetworkServer.hpp
diff -u netpanzer/src/NetPanzer/Classes/Network/NetworkServer.hpp:1.5
netpanzer/src/NetPanzer/Classes/Network/NetworkServer.hpp:1.6
--- netpanzer/src/NetPanzer/Classes/Network/NetworkServer.hpp:1.5 Tue Sep
16 16:16:11 2003
+++ netpanzer/src/NetPanzer/Classes/Network/NetworkServer.hpp Sat Nov 22
10:43:28 2003
@@ -21,9 +21,9 @@
#include "NetworkInterface.hpp"
#include "NetworkReturnCodes.hpp"
-#include "Timer.hpp"
+#include "ArrayUtil/Timer.hpp"
#include "PlayerID.hpp"
-#include "LinkListSingleTemplate.hpp"
+#include "ArrayUtil/LinkListSingleTemplate.hpp"
class ServerClientListData
{
Index: netpanzer/src/NetPanzer/Classes/Network/NetworkState.hpp
diff -u netpanzer/src/NetPanzer/Classes/Network/NetworkState.hpp:1.3
netpanzer/src/NetPanzer/Classes/Network/NetworkState.hpp:1.4
--- netpanzer/src/NetPanzer/Classes/Network/NetworkState.hpp:1.3 Tue Sep
16 16:16:11 2003
+++ netpanzer/src/NetPanzer/Classes/Network/NetworkState.hpp Sat Nov 22
10:43:29 2003
@@ -18,7 +18,7 @@
#ifndef _NETWORKSTATE_HPP
#define _NETWORKSTATE_HPP
-#include "Timer.hpp"
+#include "ArrayUtil/Timer.hpp"
enum{ _network_state_server, _network_state_client };
Index: netpanzer/src/NetPanzer/Classes/Network/ServerConnectDaemon.hpp
diff -u netpanzer/src/NetPanzer/Classes/Network/ServerConnectDaemon.hpp:1.4
netpanzer/src/NetPanzer/Classes/Network/ServerConnectDaemon.hpp:1.5
--- netpanzer/src/NetPanzer/Classes/Network/ServerConnectDaemon.hpp:1.4 Tue Sep
16 16:16:11 2003
+++ netpanzer/src/NetPanzer/Classes/Network/ServerConnectDaemon.hpp Sat Nov
22 10:43:29 2003
@@ -19,9 +19,9 @@
#define _SERVERCONNECTDAEMON_HPP
#include "PlayerState.hpp"
-#include "QueueTemplate.hpp"
+#include "ArrayUtil/QueueTemplate.hpp"
#include "NetPacket.hpp"
-#include "Timer.hpp"
+#include "ArrayUtil/Timer.hpp"
enum { _connect_status_waiting,
_connect_status_abort,
Index: netpanzer/src/NetPanzer/Classes/Network/SystemNetMessage.hpp
diff -u netpanzer/src/NetPanzer/Classes/Network/SystemNetMessage.hpp:1.5
netpanzer/src/NetPanzer/Classes/Network/SystemNetMessage.hpp:1.6
--- netpanzer/src/NetPanzer/Classes/Network/SystemNetMessage.hpp:1.5 Thu Nov
20 19:19:25 2003
+++ netpanzer/src/NetPanzer/Classes/Network/SystemNetMessage.hpp Sat Nov
22 10:43:29 2003
@@ -22,7 +22,7 @@
#include "PlayerState.hpp"
#include "NetPacket.hpp"
-#include "iXY.hpp"
+#include "Types/iXY.hpp"
#ifdef MSVC
#pragma pack(1)
Index: netpanzer/src/NetPanzer/Classes/Objective.hpp
diff -u netpanzer/src/NetPanzer/Classes/Objective.hpp:1.6
netpanzer/src/NetPanzer/Classes/Objective.hpp:1.7
--- netpanzer/src/NetPanzer/Classes/Objective.hpp:1.6 Fri Nov 21 09:23:54 2003
+++ netpanzer/src/NetPanzer/Classes/Objective.hpp Sat Nov 22 10:43:24 2003
@@ -18,7 +18,7 @@
#ifndef _OBJECTIVE_HPP
#define _OBJECTIVE_HPP
-#include "BoundBox.hpp"
+#include "ArrayUtil/BoundBox.hpp"
#include "SpriteSorter.hpp"
#include "PlayerState.hpp"
#include "ObjectiveMessageTypes.hpp"
Index: netpanzer/src/NetPanzer/Classes/Outpost.hpp
diff -u netpanzer/src/NetPanzer/Classes/Outpost.hpp:1.4
netpanzer/src/NetPanzer/Classes/Outpost.hpp:1.5
--- netpanzer/src/NetPanzer/Classes/Outpost.hpp:1.4 Fri Nov 21 09:23:55 2003
+++ netpanzer/src/NetPanzer/Classes/Outpost.hpp Sat Nov 22 10:43:24 2003
@@ -19,7 +19,7 @@
#define _OUTPOST_HPP
#include "Objective.hpp"
-#include "Timer.hpp"
+#include "ArrayUtil/Timer.hpp"
#include "UnitID.hpp"
#include "SelectionBoxSprite.hpp"
Index: netpanzer/src/NetPanzer/Classes/PlacementMatrix.hpp
diff -u netpanzer/src/NetPanzer/Classes/PlacementMatrix.hpp:1.5
netpanzer/src/NetPanzer/Classes/PlacementMatrix.hpp:1.6
--- netpanzer/src/NetPanzer/Classes/PlacementMatrix.hpp:1.5 Tue Sep 16
16:16:11 2003
+++ netpanzer/src/NetPanzer/Classes/PlacementMatrix.hpp Sat Nov 22 10:43:24 2003
@@ -18,7 +18,7 @@
#ifndef _PLACEMENTMATRIX_HPP
#define _PLACEMENTMATRIX_HPP
-#include "iXY.hpp"
+#include "Types/iXY.hpp"
class PlacementMatrix
{
Index: netpanzer/src/NetPanzer/Classes/PlayerID.hpp
diff -u netpanzer/src/NetPanzer/Classes/PlayerID.hpp:1.9
netpanzer/src/NetPanzer/Classes/PlayerID.hpp:1.10
--- netpanzer/src/NetPanzer/Classes/PlayerID.hpp:1.9 Thu Nov 20 19:19:24 2003
+++ netpanzer/src/NetPanzer/Classes/PlayerID.hpp Sat Nov 22 10:43:24 2003
@@ -19,7 +19,7 @@
#define _PLAYERID_HPP
#include <stdint.h>
-#include "UILib/Network/SocketClient.hpp"
+#include "Network/SocketClient.hpp"
class PlayerID
{
Index: netpanzer/src/NetPanzer/Classes/ScreenSurface.cpp
diff -u netpanzer/src/NetPanzer/Classes/ScreenSurface.cpp:1.1
netpanzer/src/NetPanzer/Classes/ScreenSurface.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/ScreenSurface.cpp:1.1 Fri Oct 3
10:45:38 2003
+++ netpanzer/src/NetPanzer/Classes/ScreenSurface.cpp Sat Nov 22 10:43:24 2003
@@ -17,7 +17,7 @@
*/
#include <config.h>
-#include "UIDraw.hpp"
+#include "System/UIDraw.hpp"
#include "ScreenSurface.hpp"
ScreenSurface* screen = 0;
Index: netpanzer/src/NetPanzer/Classes/ScreenSurface.hpp
diff -u netpanzer/src/NetPanzer/Classes/ScreenSurface.hpp:1.1
netpanzer/src/NetPanzer/Classes/ScreenSurface.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/ScreenSurface.hpp:1.1 Fri Oct 3
10:45:38 2003
+++ netpanzer/src/NetPanzer/Classes/ScreenSurface.hpp Sat Nov 22 10:43:24 2003
@@ -18,7 +18,7 @@
#ifndef _DDHARDSURFACE_HPP
#define _DDHARDSURFACE_HPP
-#include "Surface.hpp"
+#include "2D/Surface.hpp"
class UIDraw;
Index: netpanzer/src/NetPanzer/Classes/SelectionBoxSprite.cpp
diff -u netpanzer/src/NetPanzer/Classes/SelectionBoxSprite.cpp:1.10
netpanzer/src/NetPanzer/Classes/SelectionBoxSprite.cpp:1.11
--- netpanzer/src/NetPanzer/Classes/SelectionBoxSprite.cpp:1.10 Sun Oct 5
09:50:12 2003
+++ netpanzer/src/NetPanzer/Classes/SelectionBoxSprite.cpp Sat Nov 22
10:43:24 2003
@@ -18,7 +18,7 @@
#include <config.h>
#include "SelectionBoxSprite.hpp"
-#include "Palette.hpp"
+#include "2D/Palette.hpp"
#include "GameConfig.hpp"
Surface UNIT_FLAGS_SURFACE;
Index: netpanzer/src/NetPanzer/Classes/SelectionBoxSprite.hpp
diff -u netpanzer/src/NetPanzer/Classes/SelectionBoxSprite.hpp:1.6
netpanzer/src/NetPanzer/Classes/SelectionBoxSprite.hpp:1.7
--- netpanzer/src/NetPanzer/Classes/SelectionBoxSprite.hpp:1.6 Tue Sep 16
16:16:11 2003
+++ netpanzer/src/NetPanzer/Classes/SelectionBoxSprite.hpp Sat Nov 22
10:43:24 2003
@@ -18,7 +18,7 @@
#ifndef _SELECTION_BOX_SPRITE_HPP
#define _SELECTION_BOX_SPRITE_HPP
-#include "BoundBox.hpp"
+#include "ArrayUtil/BoundBox.hpp"
#include "Sprite.hpp"
extern Surface UNIT_FLAGS_SURFACE;
Index: netpanzer/src/NetPanzer/Classes/SelectionList.cpp
diff -u netpanzer/src/NetPanzer/Classes/SelectionList.cpp:1.6
netpanzer/src/NetPanzer/Classes/SelectionList.cpp:1.7
--- netpanzer/src/NetPanzer/Classes/SelectionList.cpp:1.6 Wed Nov 12
03:28:31 2003
+++ netpanzer/src/NetPanzer/Classes/SelectionList.cpp Sat Nov 22 10:43:24 2003
@@ -19,7 +19,7 @@
#include "SelectionList.hpp"
#include "UnitInterface.hpp"
#include "PlayerInterface.hpp"
-#include "Log.hpp"
+#include "Util/Log.hpp"
int selectKey( void *key, UnitState *comp )
{
Index: netpanzer/src/NetPanzer/Classes/SpawnList.cpp
diff -u netpanzer/src/NetPanzer/Classes/SpawnList.cpp:1.10
netpanzer/src/NetPanzer/Classes/SpawnList.cpp:1.11
--- netpanzer/src/NetPanzer/Classes/SpawnList.cpp:1.10 Wed Nov 12 12:55:43 2003
+++ netpanzer/src/NetPanzer/Classes/SpawnList.cpp Sat Nov 22 10:43:24 2003
@@ -22,8 +22,8 @@
#include <memory>
#include "SpawnList.hpp"
-#include "FileSystem.hpp"
-#include "Exception.hpp"
+#include "Util/FileSystem.hpp"
+#include "Util/Exception.hpp"
#include "GameConfig.hpp"
SpawnList::SpawnList( unsigned long size )
Index: netpanzer/src/NetPanzer/Classes/SpawnList.hpp
diff -u netpanzer/src/NetPanzer/Classes/SpawnList.hpp:1.5
netpanzer/src/NetPanzer/Classes/SpawnList.hpp:1.6
--- netpanzer/src/NetPanzer/Classes/SpawnList.hpp:1.5 Wed Sep 24 13:43:21 2003
+++ netpanzer/src/NetPanzer/Classes/SpawnList.hpp Sat Nov 22 10:43:24 2003
@@ -18,9 +18,9 @@
#ifndef _SPAWNLIST_HPP
#define _SPAWNLIST_HPP
-#include "Timer.hpp"
-#include "ArrayTemplate.hpp"
-#include "iXY.hpp"
+#include "ArrayUtil/Timer.hpp"
+#include "ArrayUtil/ArrayTemplate.hpp"
+#include "Types/iXY.hpp"
class SpawnPoint
{
Index: netpanzer/src/NetPanzer/Classes/Sprite.cpp
diff -u netpanzer/src/NetPanzer/Classes/Sprite.cpp:1.6
netpanzer/src/NetPanzer/Classes/Sprite.cpp:1.7
--- netpanzer/src/NetPanzer/Classes/Sprite.cpp:1.6 Tue Sep 16 16:16:11 2003
+++ netpanzer/src/NetPanzer/Classes/Sprite.cpp Sat Nov 22 10:43:24 2003
@@ -17,7 +17,7 @@
*/
#include <config.h>
#include "Sprite.hpp"
-#include "Palette.hpp"
+#include "2D/Palette.hpp"
Sprite::Sprite( )
{
Index: netpanzer/src/NetPanzer/Classes/Sprite.hpp
diff -u netpanzer/src/NetPanzer/Classes/Sprite.hpp:1.6
netpanzer/src/NetPanzer/Classes/Sprite.hpp:1.7
--- netpanzer/src/NetPanzer/Classes/Sprite.hpp:1.6 Tue Sep 16 16:16:11 2003
+++ netpanzer/src/NetPanzer/Classes/Sprite.hpp Sat Nov 22 10:43:25 2003
@@ -18,8 +18,8 @@
#ifndef _SPRITE_HPP
#define _SPRITE_HPP
-#include "Surface.hpp"
-#include "PackedSurface.hpp"
+#include "2D/Surface.hpp"
+#include "2D/PackedSurface.hpp"
#define _MAX_HEIGHT_LEVELS 8
Index: netpanzer/src/NetPanzer/Classes/SpriteSorter.cpp
diff -u netpanzer/src/NetPanzer/Classes/SpriteSorter.cpp:1.8
netpanzer/src/NetPanzer/Classes/SpriteSorter.cpp:1.9
--- netpanzer/src/NetPanzer/Classes/SpriteSorter.cpp:1.8 Tue Sep 16
16:16:11 2003
+++ netpanzer/src/NetPanzer/Classes/SpriteSorter.cpp Sat Nov 22 10:43:25 2003
@@ -19,7 +19,7 @@
#include <algorithm>
#include <functional>
-#include "Exception.hpp"
+#include "Util/Exception.hpp"
#include "SpriteSorter.hpp"
SpriteSorter SPRITE_SORTER;
Index: netpanzer/src/NetPanzer/Classes/TileEngine.cpp
diff -u netpanzer/src/NetPanzer/Classes/TileEngine.cpp:1.10
netpanzer/src/NetPanzer/Classes/TileEngine.cpp:1.11
--- netpanzer/src/NetPanzer/Classes/TileEngine.cpp:1.10 Fri Oct 3 10:45:03 2003
+++ netpanzer/src/NetPanzer/Classes/TileEngine.cpp Sat Nov 22 10:43:25 2003
@@ -20,7 +20,7 @@
#include "TileEngine.hpp"
#include "blitters.hpp"
#include "ScreenSurface.hpp"
-#include "UILib/UIDraw.hpp"
+#include "System/UIDraw.hpp"
void TileEngine::blitWorld()
{
Index: netpanzer/src/NetPanzer/Classes/TileSet.cpp
diff -u netpanzer/src/NetPanzer/Classes/TileSet.cpp:1.10
netpanzer/src/NetPanzer/Classes/TileSet.cpp:1.11
--- netpanzer/src/NetPanzer/Classes/TileSet.cpp:1.10 Wed Oct 22 09:19:27 2003
+++ netpanzer/src/NetPanzer/Classes/TileSet.cpp Sat Nov 22 10:43:25 2003
@@ -24,13 +24,13 @@
#include <stdlib.h>
#include <unistd.h>
-#include "FileSystem.hpp"
-#include "Exception.hpp"
+#include "Util/FileSystem.hpp"
+#include "Util/Exception.hpp"
#include "Gdatstct.hpp"
// XXX hack, remove me
#include <SDL.h>
-#include "Palette.hpp"
+#include "2D/Palette.hpp"
TileSet::TileSet( )
{
Index: netpanzer/src/NetPanzer/Classes/UnitBlackBoard.hpp
diff -u netpanzer/src/NetPanzer/Classes/UnitBlackBoard.hpp:1.5
netpanzer/src/NetPanzer/Classes/UnitBlackBoard.hpp:1.6
--- netpanzer/src/NetPanzer/Classes/UnitBlackBoard.hpp:1.5 Tue Sep 16
16:16:11 2003
+++ netpanzer/src/NetPanzer/Classes/UnitBlackBoard.hpp Sat Nov 22 10:43:25 2003
@@ -18,8 +18,8 @@
#ifndef _UNITBLACKBOARD_HPP
#define _UNITBLACKBOARD_HPP
-#include "BitArray.hpp"
-#include "iXY.hpp"
+#include "ArrayUtil/BitArray.hpp"
+#include "Types/iXY.hpp"
class UnitBlackBoard
{
Index: netpanzer/src/NetPanzer/Classes/UnitBucketArray.cpp
diff -u netpanzer/src/NetPanzer/Classes/UnitBucketArray.cpp:1.7
netpanzer/src/NetPanzer/Classes/UnitBucketArray.cpp:1.8
--- netpanzer/src/NetPanzer/Classes/UnitBucketArray.cpp:1.7 Mon Sep 22
09:53:50 2003
+++ netpanzer/src/NetPanzer/Classes/UnitBucketArray.cpp Sat Nov 22 10:43:25 2003
@@ -17,7 +17,7 @@
*/
#include <config.h>
-#include "Palette.hpp"
+#include "2D/Palette.hpp"
#include "UnitBucketArray.hpp"
UnitBucketArray::UnitBucketArray( )
Index: netpanzer/src/NetPanzer/Classes/UnitBucketArray.hpp
diff -u netpanzer/src/NetPanzer/Classes/UnitBucketArray.hpp:1.5
netpanzer/src/NetPanzer/Classes/UnitBucketArray.hpp:1.6
--- netpanzer/src/NetPanzer/Classes/UnitBucketArray.hpp:1.5 Fri Nov 7
04:38:40 2003
+++ netpanzer/src/NetPanzer/Classes/UnitBucketArray.hpp Sat Nov 22 10:43:25 2003
@@ -18,7 +18,7 @@
#ifndef _UNIT_BUCKET_ARRAY_HPP
#define _UNIT_BUCKET_ARRAY_HPP
-#include "BucketArrayTemplate.hpp"
+#include "ArrayUtil/BucketArrayTemplate.hpp"
#include "UnitBase.hpp"
#include "UnitID.hpp"
Index: netpanzer/src/NetPanzer/Classes/UnitIDList.hpp
diff -u netpanzer/src/NetPanzer/Classes/UnitIDList.hpp:1.2
netpanzer/src/NetPanzer/Classes/UnitIDList.hpp:1.3
--- netpanzer/src/NetPanzer/Classes/UnitIDList.hpp:1.2 Tue Sep 16 16:16:11 2003
+++ netpanzer/src/NetPanzer/Classes/UnitIDList.hpp Sat Nov 22 10:43:25 2003
@@ -19,7 +19,7 @@
#define _UNITIDLIST_HPP
#include "UnitID.hpp"
-#include "ArrayGrowableTemplate.hpp"
+#include "ArrayUtil/ArrayGrowableTemplate.hpp"
typedef ArrayGrowableTemplate< UnitID > UnitIDListTemplate;
Index: netpanzer/src/NetPanzer/Classes/UnitList.hpp
diff -u netpanzer/src/NetPanzer/Classes/UnitList.hpp:1.4
netpanzer/src/NetPanzer/Classes/UnitList.hpp:1.5
--- netpanzer/src/NetPanzer/Classes/UnitList.hpp:1.4 Fri Nov 7 04:38:40 2003
+++ netpanzer/src/NetPanzer/Classes/UnitList.hpp Sat Nov 22 10:43:25 2003
@@ -20,7 +20,7 @@
#include "UnitBase.hpp"
#include "UnitID.hpp"
-#include "LinkListSingleTemplate.hpp"
+#include "ArrayUtil/LinkListSingleTemplate.hpp"
class UnitPointer
{
Index: netpanzer/src/NetPanzer/Classes/UnitPowerUp.cpp
diff -u netpanzer/src/NetPanzer/Classes/UnitPowerUp.cpp:1.8
netpanzer/src/NetPanzer/Classes/UnitPowerUp.cpp:1.9
--- netpanzer/src/NetPanzer/Classes/UnitPowerUp.cpp:1.8 Mon Sep 22 09:53:50 2003
+++ netpanzer/src/NetPanzer/Classes/UnitPowerUp.cpp Sat Nov 22 10:43:25 2003
@@ -34,7 +34,7 @@
//#include "lua.h"
-#include "Sound.hpp"
+#include "System/Sound.hpp"
enum { _unit_powerup_hitpoints,
Index: netpanzer/src/NetPanzer/Classes/UnitState.hpp
diff -u netpanzer/src/NetPanzer/Classes/UnitState.hpp:1.6
netpanzer/src/NetPanzer/Classes/UnitState.hpp:1.7
--- netpanzer/src/NetPanzer/Classes/UnitState.hpp:1.6 Tue Sep 16 16:16:11 2003
+++ netpanzer/src/NetPanzer/Classes/UnitState.hpp Sat Nov 22 10:43:25 2003
@@ -19,8 +19,8 @@
#define _UNITSTATE_HPP
#include <string.h>
-#include "BoundBox.hpp"
-#include "Angle.hpp"
+#include "ArrayUtil/BoundBox.hpp"
+#include "Types/Angle.hpp"
#include "UnitLifecycles.hpp"
Index: netpanzer/src/NetPanzer/Classes/Units/Abrams.cpp
diff -u netpanzer/src/NetPanzer/Classes/Units/Abrams.cpp:1.6
netpanzer/src/NetPanzer/Classes/Units/Abrams.cpp:1.7
--- netpanzer/src/NetPanzer/Classes/Units/Abrams.cpp:1.6 Tue Sep 16
16:16:11 2003
+++ netpanzer/src/NetPanzer/Classes/Units/Abrams.cpp Sat Nov 22 10:43:29 2003
@@ -19,10 +19,10 @@
#include "Abrams.hpp"
#include "UnitProfileInterface.hpp"
-#include "Color.hpp"
+#include "2D/Color.hpp"
#include "WorldViewInterface.hpp"
#include "Weapon.hpp"
-#include "Sound.hpp"
+#include "System/Sound.hpp"
#include "UnitGlobals.hpp"
Index: netpanzer/src/NetPanzer/Classes/Units/Archer.cpp
diff -u netpanzer/src/NetPanzer/Classes/Units/Archer.cpp:1.6
netpanzer/src/NetPanzer/Classes/Units/Archer.cpp:1.7
--- netpanzer/src/NetPanzer/Classes/Units/Archer.cpp:1.6 Tue Sep 16
16:16:11 2003
+++ netpanzer/src/NetPanzer/Classes/Units/Archer.cpp Sat Nov 22 10:43:30 2003
@@ -18,10 +18,10 @@
#include <config.h>
#include "Archer.hpp"
#include "UnitProfileInterface.hpp"
-#include "Color.hpp"
+#include "2D/Color.hpp"
#include "WorldViewInterface.hpp"
#include "Weapon.hpp"
-#include "Sound.hpp"
+#include "System/Sound.hpp"
#include "UnitGlobals.hpp"
Index: netpanzer/src/NetPanzer/Classes/Units/Hammerhead.cpp
diff -u netpanzer/src/NetPanzer/Classes/Units/Hammerhead.cpp:1.6
netpanzer/src/NetPanzer/Classes/Units/Hammerhead.cpp:1.7
--- netpanzer/src/NetPanzer/Classes/Units/Hammerhead.cpp:1.6 Tue Sep 16
16:16:11 2003
+++ netpanzer/src/NetPanzer/Classes/Units/Hammerhead.cpp Sat Nov 22
10:43:30 2003
@@ -18,10 +18,10 @@
#include <config.h>
#include "Hammerhead.hpp"
#include "UnitProfileInterface.hpp"
-#include "Color.hpp"
+#include "2D/Color.hpp"
#include "WorldViewInterface.hpp"
#include "Weapon.hpp"
-#include "Sound.hpp"
+#include "System/Sound.hpp"
#include "UnitGlobals.hpp"
Index: netpanzer/src/NetPanzer/Classes/Units/Humvee.cpp
diff -u netpanzer/src/NetPanzer/Classes/Units/Humvee.cpp:1.7
netpanzer/src/NetPanzer/Classes/Units/Humvee.cpp:1.8
--- netpanzer/src/NetPanzer/Classes/Units/Humvee.cpp:1.7 Fri Oct 3
10:45:04 2003
+++ netpanzer/src/NetPanzer/Classes/Units/Humvee.cpp Sat Nov 22 10:43:30 2003
@@ -18,10 +18,10 @@
#include <config.h>
#include "Humvee.hpp"
#include "UnitProfileInterface.hpp"
-#include "Color.hpp"
+#include "2D/Color.hpp"
#include "WorldViewInterface.hpp"
#include "Weapon.hpp"
-#include "Sound.hpp"
+#include "System/Sound.hpp"
#include "GameConfig.hpp"
#include "UnitGlobals.hpp"
Index: netpanzer/src/NetPanzer/Classes/Units/Leopard.cpp
diff -u netpanzer/src/NetPanzer/Classes/Units/Leopard.cpp:1.6
netpanzer/src/NetPanzer/Classes/Units/Leopard.cpp:1.7
--- netpanzer/src/NetPanzer/Classes/Units/Leopard.cpp:1.6 Tue Sep 16
16:16:11 2003
+++ netpanzer/src/NetPanzer/Classes/Units/Leopard.cpp Sat Nov 22 10:43:30 2003
@@ -18,10 +18,10 @@
#include <config.h>
#include "Leopard.hpp"
#include "UnitProfileInterface.hpp"
-#include "Color.hpp"
+#include "2D/Color.hpp"
#include "WorldViewInterface.hpp"
#include "Weapon.hpp"
-#include "Sound.hpp"
+#include "System/Sound.hpp"
#include "UnitGlobals.hpp"
Index: netpanzer/src/NetPanzer/Classes/Units/Lynx.cpp
diff -u netpanzer/src/NetPanzer/Classes/Units/Lynx.cpp:1.6
netpanzer/src/NetPanzer/Classes/Units/Lynx.cpp:1.7
--- netpanzer/src/NetPanzer/Classes/Units/Lynx.cpp:1.6 Tue Sep 16 16:16:11 2003
+++ netpanzer/src/NetPanzer/Classes/Units/Lynx.cpp Sat Nov 22 10:43:30 2003
@@ -18,10 +18,10 @@
#include <config.h>
#include "Lynx.hpp"
#include "UnitProfileInterface.hpp"
-#include "Color.hpp"
+#include "2D/Color.hpp"
#include "WorldViewInterface.hpp"
#include "Weapon.hpp"
-#include "Sound.hpp"
+#include "System/Sound.hpp"
#include "UnitGlobals.hpp"
Index: netpanzer/src/NetPanzer/Classes/Units/M109.cpp
diff -u netpanzer/src/NetPanzer/Classes/Units/M109.cpp:1.6
netpanzer/src/NetPanzer/Classes/Units/M109.cpp:1.7
--- netpanzer/src/NetPanzer/Classes/Units/M109.cpp:1.6 Tue Sep 16 16:16:11 2003
+++ netpanzer/src/NetPanzer/Classes/Units/M109.cpp Sat Nov 22 10:43:30 2003
@@ -18,10 +18,10 @@
#include <config.h>
#include "M109.hpp"
#include "UnitProfileInterface.hpp"
-#include "Color.hpp"
+#include "2D/Color.hpp"
#include "WorldViewInterface.hpp"
#include "Weapon.hpp"
-#include "Sound.hpp"
+#include "System/Sound.hpp"
#include "UnitGlobals.hpp"
Index: netpanzer/src/NetPanzer/Classes/Units/Scorpion.cpp
diff -u netpanzer/src/NetPanzer/Classes/Units/Scorpion.cpp:1.6
netpanzer/src/NetPanzer/Classes/Units/Scorpion.cpp:1.7
--- netpanzer/src/NetPanzer/Classes/Units/Scorpion.cpp:1.6 Tue Sep 16
16:16:11 2003
+++ netpanzer/src/NetPanzer/Classes/Units/Scorpion.cpp Sat Nov 22 10:43:30 2003
@@ -18,10 +18,10 @@
#include <config.h>
#include "Scorpion.hpp"
#include "UnitProfileInterface.hpp"
-#include "Color.hpp"
+#include "2D/Color.hpp"
#include "WorldViewInterface.hpp"
#include "Weapon.hpp"
-#include "Sound.hpp"
+#include "System/Sound.hpp"
#include "UnitGlobals.hpp"
Index: netpanzer/src/NetPanzer/Classes/Units/SpahPanzer.cpp
diff -u netpanzer/src/NetPanzer/Classes/Units/SpahPanzer.cpp:1.7
netpanzer/src/NetPanzer/Classes/Units/SpahPanzer.cpp:1.8
--- netpanzer/src/NetPanzer/Classes/Units/SpahPanzer.cpp:1.7 Tue Sep 16
16:16:11 2003
+++ netpanzer/src/NetPanzer/Classes/Units/SpahPanzer.cpp Sat Nov 22
10:43:30 2003
@@ -19,10 +19,10 @@
#include "SpahPanzer.hpp"
#include "UnitProfileInterface.hpp"
-#include "Color.hpp"
+#include "2D/Color.hpp"
#include "WorldViewInterface.hpp"
#include "Weapon.hpp"
-#include "Sound.hpp"
+#include "System/Sound.hpp"
#include "UnitGlobals.hpp"
Index: netpanzer/src/NetPanzer/Classes/Units/UnitGlobals.cpp
diff -u netpanzer/src/NetPanzer/Classes/Units/UnitGlobals.cpp:1.6
netpanzer/src/NetPanzer/Classes/Units/UnitGlobals.cpp:1.7
--- netpanzer/src/NetPanzer/Classes/Units/UnitGlobals.cpp:1.6 Mon Sep 22
09:53:51 2003
+++ netpanzer/src/NetPanzer/Classes/Units/UnitGlobals.cpp Sat Nov 22
10:43:31 2003
@@ -17,8 +17,8 @@
*/
#include <config.h>
#include "UnitGlobals.hpp"
-#include "Palette.hpp"
-#include "Surface.hpp"
+#include "2D/Palette.hpp"
+#include "2D/Surface.hpp"
// Comment this out if you want green units
#define _GRAY_MAPPED_UNITS
Index: netpanzer/src/NetPanzer/Classes/Units/UnitGlobals.hpp
diff -u netpanzer/src/NetPanzer/Classes/Units/UnitGlobals.hpp:1.2
netpanzer/src/NetPanzer/Classes/Units/UnitGlobals.hpp:1.3
--- netpanzer/src/NetPanzer/Classes/Units/UnitGlobals.hpp:1.2 Tue Sep 16
16:16:11 2003
+++ netpanzer/src/NetPanzer/Classes/Units/UnitGlobals.hpp Sat Nov 22
10:43:31 2003
@@ -18,7 +18,7 @@
#ifndef _UNITGLOBALS_HPP
#define _UNITGLOBALS_HPP
-#include "PackedSurface.hpp"
+#include "2D/PackedSurface.hpp"
extern PackedSurface gAbramsTurret;
extern PackedSurface gAbramsBody;
Index: netpanzer/src/NetPanzer/Classes/Units/Valentine.cpp
diff -u netpanzer/src/NetPanzer/Classes/Units/Valentine.cpp:1.6
netpanzer/src/NetPanzer/Classes/Units/Valentine.cpp:1.7
--- netpanzer/src/NetPanzer/Classes/Units/Valentine.cpp:1.6 Tue Sep 16
16:16:11 2003
+++ netpanzer/src/NetPanzer/Classes/Units/Valentine.cpp Sat Nov 22 10:43:31 2003
@@ -18,10 +18,10 @@
#include <config.h>
#include "Valentine.hpp"
#include "UnitProfileInterface.hpp"
-#include "Color.hpp"
+#include "2D/Color.hpp"
#include "WorldViewInterface.hpp"
#include "Weapon.hpp"
-#include "Sound.hpp"
+#include "System/Sound.hpp"
#include "UnitGlobals.hpp"
Index: netpanzer/src/NetPanzer/Classes/Units/Vehicle.cpp
diff -u netpanzer/src/NetPanzer/Classes/Units/Vehicle.cpp:1.14
netpanzer/src/NetPanzer/Classes/Units/Vehicle.cpp:1.15
--- netpanzer/src/NetPanzer/Classes/Units/Vehicle.cpp:1.14 Tue Nov 11
08:42:04 2003
+++ netpanzer/src/NetPanzer/Classes/Units/Vehicle.cpp Sat Nov 22 10:43:31 2003
@@ -18,13 +18,13 @@
#include <config.h>
#include <string.h>
-#include "Log.hpp"
+#include "Util/Log.hpp"
#include "Vehicle.hpp"
#include "MapInterface.hpp"
#include "PathScheduler.hpp"
#include "ProjectileInterface.hpp"
#include "NetworkState.hpp"
-#include "Sound.hpp"
+#include "System/Sound.hpp"
// NOTE: Temp unit new sprites put in
#include "GameConfig.hpp"
Index: netpanzer/src/NetPanzer/Classes/Units/Vehicle.hpp
diff -u netpanzer/src/NetPanzer/Classes/Units/Vehicle.hpp:1.6
netpanzer/src/NetPanzer/Classes/Units/Vehicle.hpp:1.7
--- netpanzer/src/NetPanzer/Classes/Units/Vehicle.hpp:1.6 Tue Sep 16
16:16:12 2003
+++ netpanzer/src/NetPanzer/Classes/Units/Vehicle.hpp Sat Nov 22 10:43:31 2003
@@ -19,7 +19,7 @@
#define _VEHICLE_HPP
#include "Unit.hpp"
-#include "Timer.hpp"
+#include "ArrayUtil/Timer.hpp"
#include "UnitMessageTypes.hpp"
#include "PathList.hpp"
Index: netpanzer/src/NetPanzer/Classes/WadMapTable.hpp
diff -u netpanzer/src/NetPanzer/Classes/WadMapTable.hpp:1.3
netpanzer/src/NetPanzer/Classes/WadMapTable.hpp:1.4
--- netpanzer/src/NetPanzer/Classes/WadMapTable.hpp:1.3 Tue Sep 16 16:16:11 2003
+++ netpanzer/src/NetPanzer/Classes/WadMapTable.hpp Sat Nov 22 10:43:25 2003
@@ -18,7 +18,7 @@
#ifndef _WADMAPTABLE_HPP
#define _WADMAPTABLE_HPP
-#include "ArrayTemplate.hpp"
+#include "ArrayUtil/ArrayTemplate.hpp"
#include "string.h"
class WadTileMapInfo
Index: netpanzer/src/NetPanzer/Classes/Weapons/BulletWeapon.cpp
diff -u netpanzer/src/NetPanzer/Classes/Weapons/BulletWeapon.cpp:1.10
netpanzer/src/NetPanzer/Classes/Weapons/BulletWeapon.cpp:1.11
--- netpanzer/src/NetPanzer/Classes/Weapons/BulletWeapon.cpp:1.10 Fri Oct
3 10:45:05 2003
+++ netpanzer/src/NetPanzer/Classes/Weapons/BulletWeapon.cpp Sat Nov 22
10:43:32 2003
@@ -22,7 +22,7 @@
#include "UnitInterface.hpp"
#include "NetworkState.hpp"
#include "WorldViewInterface.hpp"
-#include "Sound.hpp"
+#include "System/Sound.hpp"
#include "ParticleInterface.hpp"
#include "WeaponGlobals.hpp"
Index: netpanzer/src/NetPanzer/Classes/Weapons/MissleWeapon.cpp
diff -u netpanzer/src/NetPanzer/Classes/Weapons/MissleWeapon.cpp:1.11
netpanzer/src/NetPanzer/Classes/Weapons/MissleWeapon.cpp:1.12
--- netpanzer/src/NetPanzer/Classes/Weapons/MissleWeapon.cpp:1.11 Sat Oct
4 10:44:38 2003
+++ netpanzer/src/NetPanzer/Classes/Weapons/MissleWeapon.cpp Sat Nov 22
10:43:32 2003
@@ -22,10 +22,10 @@
#include "UnitInterface.hpp"
#include "NetworkState.hpp"
#include "WorldViewInterface.hpp"
-#include "Sound.hpp"
+#include "System/Sound.hpp"
#include "ParticleInterface.hpp"
#include "WeaponGlobals.hpp"
-#include "Math.hpp"
+#include "Util/Math.hpp"
#include "GameConfig.hpp"
#include "FlashParticle2D.hpp"
Index: netpanzer/src/NetPanzer/Classes/Weapons/MissleWeapon.hpp
diff -u netpanzer/src/NetPanzer/Classes/Weapons/MissleWeapon.hpp:1.3
netpanzer/src/NetPanzer/Classes/Weapons/MissleWeapon.hpp:1.4
--- netpanzer/src/NetPanzer/Classes/Weapons/MissleWeapon.hpp:1.3 Tue Sep
16 16:16:12 2003
+++ netpanzer/src/NetPanzer/Classes/Weapons/MissleWeapon.hpp Sat Nov 22
10:43:32 2003
@@ -19,7 +19,7 @@
#define __MissleWeapon_hpp__
#include "Weapon.hpp"
-#include "fXY.hpp"
+#include "Types/fXY.hpp"
#include "Particle2D.hpp"
class MissleWeapon : public Weapon
Index: netpanzer/src/NetPanzer/Classes/Weapons/ShellWeapon.cpp
diff -u netpanzer/src/NetPanzer/Classes/Weapons/ShellWeapon.cpp:1.11
netpanzer/src/NetPanzer/Classes/Weapons/ShellWeapon.cpp:1.12
--- netpanzer/src/NetPanzer/Classes/Weapons/ShellWeapon.cpp:1.11 Sat Oct
4 10:44:38 2003
+++ netpanzer/src/NetPanzer/Classes/Weapons/ShellWeapon.cpp Sat Nov 22
10:43:32 2003
@@ -22,11 +22,11 @@
#include "UnitInterface.hpp"
#include "NetworkState.hpp"
#include "WorldViewInterface.hpp"
-#include "Sound.hpp"
+#include "System/Sound.hpp"
#include "Particle2D.hpp"
#include "WeaponGlobals.hpp"
#include "ParticleInterface.hpp"
-#include "Math.hpp"
+#include "Util/Math.hpp"
#include "GameConfig.hpp"
#include "FlashParticle2D.hpp"
Index: netpanzer/src/NetPanzer/Classes/Weapons/Weapon.cpp
diff -u netpanzer/src/NetPanzer/Classes/Weapons/Weapon.cpp:1.15
netpanzer/src/NetPanzer/Classes/Weapons/Weapon.cpp:1.16
--- netpanzer/src/NetPanzer/Classes/Weapons/Weapon.cpp:1.15 Sat Oct 25
10:52:15 2003
+++ netpanzer/src/NetPanzer/Classes/Weapons/Weapon.cpp Sat Nov 22 10:43:32 2003
@@ -30,12 +30,12 @@
#include "WorldViewInterface.hpp"
#include "ScreenSurface.hpp"
-#include "Exception.hpp"
-#include "Sound.hpp"
+#include "Util/Exception.hpp"
+#include "System/Sound.hpp"
#include "ParticleInterface.hpp"
#include "WeaponGlobals.hpp"
-#include "Math.hpp"
-#include "UtilInterface.hpp"
+#include "Util/Math.hpp"
+#include "Util/UtilInterface.hpp"
void Weapon::init()
Index: netpanzer/src/NetPanzer/Classes/Weapons/Weapon.hpp
diff -u netpanzer/src/NetPanzer/Classes/Weapons/Weapon.hpp:1.5
netpanzer/src/NetPanzer/Classes/Weapons/Weapon.hpp:1.6
--- netpanzer/src/NetPanzer/Classes/Weapons/Weapon.hpp:1.5 Tue Sep 16
16:16:12 2003
+++ netpanzer/src/NetPanzer/Classes/Weapons/Weapon.hpp Sat Nov 22 10:43:32 2003
@@ -19,11 +19,11 @@
#define _WEAPON_HPP
#include "Projectile.hpp"
-#include "BresenhamLine.hpp"
+#include "Util/BresenhamLine.hpp"
#include "UnitID.hpp"
-#include "Timer.hpp"
+#include "ArrayUtil/Timer.hpp"
#include "Sprite.hpp"
-#include "fXY.hpp"
+#include "Types/fXY.hpp"
#include "Particle2D.hpp"
enum
Index: netpanzer/src/NetPanzer/Classes/Weapons/WeaponGlobals.hpp
diff -u netpanzer/src/NetPanzer/Classes/Weapons/WeaponGlobals.hpp:1.2
netpanzer/src/NetPanzer/Classes/Weapons/WeaponGlobals.hpp:1.3
--- netpanzer/src/NetPanzer/Classes/Weapons/WeaponGlobals.hpp:1.2 Tue Sep
16 16:16:12 2003
+++ netpanzer/src/NetPanzer/Classes/Weapons/WeaponGlobals.hpp Sat Nov 22
10:43:32 2003
@@ -19,7 +19,7 @@
#define __WeaponGlobals_hpp__
-#include "PackedSurface.hpp"
+#include "2D/PackedSurface.hpp"
extern int gShellVelocity;
Index: netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp
diff -u netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp:1.29
netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp:1.30
--- netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp:1.29 Sat Nov
22 04:18:46 2003
+++ netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp Sat Nov 22
10:43:25 2003
@@ -35,9 +35,9 @@
#include "Client.hpp"
#include "NetMessageEncoder.hpp"
#include "PlacementMatrix.hpp"
-#include "Sound.hpp"
+#include "System/Sound.hpp"
#include "ScreenSurface.hpp"
-#include "Log.hpp"
+#include "Util/Log.hpp"
#include "GameConfig.hpp"
Index: netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.hpp
diff -u netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.hpp:1.9
netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.hpp:1.10
--- netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.hpp:1.9 Fri Nov
21 09:23:55 2003
+++ netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.hpp Sat Nov 22
10:43:26 2003
@@ -20,7 +20,7 @@
#include "SelectionList.hpp"
#include "MouseInterface.hpp"
-#include "Timer.hpp"
+#include "ArrayUtil/Timer.hpp"
class WorldInputCmdProcessor
{
Index: netpanzer/src/NetPanzer/Classes/WorldMap.cpp
diff -u netpanzer/src/NetPanzer/Classes/WorldMap.cpp:1.7
netpanzer/src/NetPanzer/Classes/WorldMap.cpp:1.8
--- netpanzer/src/NetPanzer/Classes/WorldMap.cpp:1.7 Wed Sep 24 13:43:21 2003
+++ netpanzer/src/NetPanzer/Classes/WorldMap.cpp Sat Nov 22 10:43:26 2003
@@ -24,8 +24,8 @@
#include "WorldMap.hpp"
#include "MapData.hpp"
-#include "FileSystem.hpp"
-#include "Exception.hpp"
+#include "Util/FileSystem.hpp"
+#include "Util/Exception.hpp"
WorldMap::WorldMap()
{
Index: netpanzer/src/NetPanzer/Core/main.cpp
diff -u netpanzer/src/NetPanzer/Core/main.cpp:1.25
netpanzer/src/NetPanzer/Core/main.cpp:1.26
--- netpanzer/src/NetPanzer/Core/main.cpp:1.25 Fri Nov 21 09:47:11 2003
+++ netpanzer/src/NetPanzer/Core/main.cpp Sat Nov 22 10:43:32 2003
@@ -26,9 +26,9 @@
#include <optionmm/command_line.hpp>
-#include "Log.hpp"
-#include "Exception.hpp"
-#include "FileSystem.hpp"
+#include "Util/Log.hpp"
+#include "Util/Exception.hpp"
+#include "Util/FileSystem.hpp"
#include "MouseInterface.hpp"
#include "KeyboardInterface.hpp"
#include "cMouse.hpp"
Index: netpanzer/src/NetPanzer/Interfaces/BaseGameManager.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/BaseGameManager.cpp:1.7
netpanzer/src/NetPanzer/Interfaces/BaseGameManager.cpp:1.8
--- netpanzer/src/NetPanzer/Interfaces/BaseGameManager.cpp:1.7 Sat Nov 22
07:38:22 2003
+++ netpanzer/src/NetPanzer/Interfaces/BaseGameManager.cpp Sat Nov 22
10:43:34 2003
@@ -30,10 +30,10 @@
#include "ServerMessageRouter.hpp"
#include "NetworkState.hpp"
-#include "Log.hpp"
+#include "Util/Log.hpp"
#include "GameConfig.hpp"
#include "GameManager.hpp"
-#include "DummySound.hpp"
+#include "System/DummySound.hpp"
#include "PlayerInterface.hpp"
#include "UnitInterface.hpp"
#include "UnitBlackBoard.hpp"
@@ -48,21 +48,21 @@
#include "MapsManager.hpp"
#include "PowerUpInterface.hpp"
#include "GameControlRulesDaemon.hpp"
-#include "Exception.hpp"
-#include "FileSystem.hpp"
+#include "Util/Exception.hpp"
+#include "Util/FileSystem.hpp"
#include "LobbyView.hpp"
#include "ProgressView.hpp"
#include "ConsoleLoadingView.hpp"
#include "SelectionBoxSprite.hpp"
#include "UnitGlobals.hpp"
-#include "ColorTable.hpp"
-#include "Palette.hpp"
+#include "2D/ColorTable.hpp"
+#include "2D/Palette.hpp"
//** Physics/Particle Stuff
#include "Physics.hpp"
-#include "TimerInterface.hpp"
+#include "Util/TimerInterface.hpp"
//-----------------------------------------------------------------
void BaseGameManager::initializeVideoSubSystem()
Index: netpanzer/src/NetPanzer/Interfaces/BotGameManager.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/BotGameManager.cpp:1.3
netpanzer/src/NetPanzer/Interfaces/BotGameManager.cpp:1.4
--- netpanzer/src/NetPanzer/Interfaces/BotGameManager.cpp:1.3 Fri Nov 21
09:47:11 2003
+++ netpanzer/src/NetPanzer/Interfaces/BotGameManager.cpp Sat Nov 22
10:43:34 2003
@@ -26,7 +26,7 @@
#include "NetworkState.hpp"
#include "Client.hpp"
#include "ClientConnectDaemon.hpp"
-#include "Exception.hpp"
+#include "Util/Exception.hpp"
//-----------------------------------------------------------------
BotGameManager::BotGameManager(const std::string &serverHost)
Index: netpanzer/src/NetPanzer/Interfaces/ChatInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/ChatInterface.cpp:1.7
netpanzer/src/NetPanzer/Interfaces/ChatInterface.cpp:1.8
--- netpanzer/src/NetPanzer/Interfaces/ChatInterface.cpp:1.7 Thu Nov 20
19:19:26 2003
+++ netpanzer/src/NetPanzer/Interfaces/ChatInterface.cpp Sat Nov 22
10:43:34 2003
@@ -18,7 +18,7 @@
#include <config.h>
#include "ChatInterface.hpp"
-#include "Color.hpp"
+#include "2D/Color.hpp"
#include "PlayerInterface.hpp"
#include "NetworkState.hpp"
#include "Server.hpp"
Index: netpanzer/src/NetPanzer/Interfaces/ConfigVariable.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/ConfigVariable.cpp:1.4
netpanzer/src/NetPanzer/Interfaces/ConfigVariable.cpp:1.5
--- netpanzer/src/NetPanzer/Interfaces/ConfigVariable.cpp:1.4 Sat Nov 22
07:38:23 2003
+++ netpanzer/src/NetPanzer/Interfaces/ConfigVariable.cpp Sat Nov 22
10:43:34 2003
@@ -1,6 +1,6 @@
#include <config.h>
-#include "Exception.hpp"
+#include "Util/Exception.hpp"
#include "ConfigVariable.hpp"
ConfigVariable::ConfigVariable(const std::string& newname)
Index: netpanzer/src/NetPanzer/Interfaces/ConfigVariable.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/ConfigVariable.hpp:1.5
netpanzer/src/NetPanzer/Interfaces/ConfigVariable.hpp:1.6
--- netpanzer/src/NetPanzer/Interfaces/ConfigVariable.hpp:1.5 Sat Nov 22
07:38:23 2003
+++ netpanzer/src/NetPanzer/Interfaces/ConfigVariable.hpp Sat Nov 22
10:43:34 2003
@@ -20,7 +20,8 @@
#include <iostream>
#include <string>
-#include <iXY.hpp>
+
+#include "Types/iXY.hpp"
class ConfigVariable
{
Index: netpanzer/src/NetPanzer/Interfaces/ConsoleInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/ConsoleInterface.hpp:1.7
netpanzer/src/NetPanzer/Interfaces/ConsoleInterface.hpp:1.8
--- netpanzer/src/NetPanzer/Interfaces/ConsoleInterface.hpp:1.7 Thu Nov 20
19:19:26 2003
+++ netpanzer/src/NetPanzer/Interfaces/ConsoleInterface.hpp Sat Nov 22
10:43:34 2003
@@ -20,9 +20,9 @@
#include <stdarg.h>
#include <stdio.h>
-#include "ArrayTemplate.hpp"
-#include "Timer.hpp"
-#include "Surface.hpp"
+#include "ArrayUtil/ArrayTemplate.hpp"
+#include "ArrayUtil/Timer.hpp"
+#include "2D/Surface.hpp"
class ConsoleLine
Index: netpanzer/src/NetPanzer/Interfaces/DedicatedGameManager.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/DedicatedGameManager.cpp:1.6
netpanzer/src/NetPanzer/Interfaces/DedicatedGameManager.cpp:1.7
--- netpanzer/src/NetPanzer/Interfaces/DedicatedGameManager.cpp:1.6 Fri Nov
21 09:47:11 2003
+++ netpanzer/src/NetPanzer/Interfaces/DedicatedGameManager.cpp Sat Nov 22
10:43:34 2003
@@ -34,7 +34,7 @@
#include "Particle2D.hpp"
#include "ParticleInterface.hpp"
#include "Physics.hpp"
-#include "Log.hpp"
+#include "Util/Log.hpp"
#include "Server.hpp"
#include "IRCLobbyView.hpp"
Index: netpanzer/src/NetPanzer/Interfaces/GameConfig.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/GameConfig.cpp:1.22
netpanzer/src/NetPanzer/Interfaces/GameConfig.cpp:1.23
--- netpanzer/src/NetPanzer/Interfaces/GameConfig.cpp:1.22 Sat Nov 22
07:38:23 2003
+++ netpanzer/src/NetPanzer/Interfaces/GameConfig.cpp Sat Nov 22 10:43:34 2003
@@ -18,13 +18,13 @@
#include <config.h>
#include <sstream>
-#include "FileSystem.hpp"
-#include "Log.hpp"
-#include "Exception.hpp"
+#include "Util/FileSystem.hpp"
+#include "Util/Log.hpp"
+#include "Util/Exception.hpp"
#include "GameConfig.hpp"
#include "NetworkGlobals.hpp"
-#include "XmlConfig.hpp"
-#include "XmlStore.hpp"
+#include "Xml/XmlConfig.hpp"
+#include "Xml/XmlStore.hpp"
#include "MiniMapView.hpp"
#include "GameViewGlobals.hpp"
Index: netpanzer/src/NetPanzer/Interfaces/GameConfig.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/GameConfig.hpp:1.18
netpanzer/src/NetPanzer/Interfaces/GameConfig.hpp:1.19
--- netpanzer/src/NetPanzer/Interfaces/GameConfig.hpp:1.18 Sat Nov 22
07:38:23 2003
+++ netpanzer/src/NetPanzer/Interfaces/GameConfig.hpp Sat Nov 22 10:43:34 2003
@@ -24,9 +24,9 @@
#include <vector>
#include <string>
-#include "Surface.hpp"
-#include "Color.hpp"
-#include "NoCopy.hpp"
+#include "2D/Surface.hpp"
+#include "2D/Color.hpp"
+#include "Util/NoCopy.hpp"
#include "ConfigVariable.hpp"
#include "PlayerUnitConfig.hpp"
Index: netpanzer/src/NetPanzer/Interfaces/GameControlRulesDaemon.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/GameControlRulesDaemon.cpp:1.8
netpanzer/src/NetPanzer/Interfaces/GameControlRulesDaemon.cpp:1.9
--- netpanzer/src/NetPanzer/Interfaces/GameControlRulesDaemon.cpp:1.8 Fri Nov
7 20:28:45 2003
+++ netpanzer/src/NetPanzer/Interfaces/GameControlRulesDaemon.cpp Sat Nov
22 10:43:35 2003
@@ -33,7 +33,7 @@
#include "Desktop.hpp"
#include "ProgressView.hpp"
-#include "Log.hpp"
+#include "Util/Log.hpp"
enum { _map_cycle_server_state_idle,
_map_cycle_server_state_display_endgame_views,
Index: netpanzer/src/NetPanzer/Interfaces/GameControlRulesDaemon.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/GameControlRulesDaemon.hpp:1.5
netpanzer/src/NetPanzer/Interfaces/GameControlRulesDaemon.hpp:1.6
--- netpanzer/src/NetPanzer/Interfaces/GameControlRulesDaemon.hpp:1.5 Wed Oct
22 09:19:30 2003
+++ netpanzer/src/NetPanzer/Interfaces/GameControlRulesDaemon.hpp Sat Nov
22 10:43:35 2003
@@ -18,7 +18,7 @@
#ifndef _GAME_CONTROL_RULES_DAEMON_HPP
#define _GAME_CONTROL_RULES_DAEMON_HPP
-#include "Timer.hpp"
+#include "ArrayUtil/Timer.hpp"
#include "NetPacket.hpp"
class GameControlRulesDaemon
Index: netpanzer/src/NetPanzer/Interfaces/GameManager.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.68
netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.69
--- netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.68 Thu Nov 20
19:19:27 2003
+++ netpanzer/src/NetPanzer/Interfaces/GameManager.cpp Sat Nov 22 10:43:35 2003
@@ -21,11 +21,11 @@
#include <stdio.h>
#include <fcntl.h>
-#include "UILib/UIDraw.hpp"
-#include "UILib/Sound.hpp"
-#include "UILib/SDL/SDLSound.hpp"
-#include "UILib/SDL/SDLDraw.hpp"
-#include "UILib/DummySound.hpp"
+#include "System/UIDraw.hpp"
+#include "System/Sound.hpp"
+#include "System/SDL/SDLSound.hpp"
+#include "System/SDL/SDLDraw.hpp"
+#include "System/DummySound.hpp"
#include "NetworkServerUnix.hpp"
#include "NetworkClientUnix.hpp"
@@ -40,7 +40,7 @@
#include "SystemNetMessage.hpp"
#include "ConnectNetMessage.hpp"
-#include "Log.hpp"
+#include "Util/Log.hpp"
#include "MouseInterface.hpp"
#include "KeyboardInterface.hpp"
#include "ScreenSurface.hpp"
@@ -67,12 +67,12 @@
#include "MapsManager.hpp"
#include "PowerUpInterface.hpp"
#include "ChatInterface.hpp"
-#include "Exception.hpp"
-#include "FileSystem.hpp"
+#include "Util/Exception.hpp"
+#include "Util/FileSystem.hpp"
// ** GVS Includes
#include "cMouse.hpp"
-#include "Palette.hpp"
+#include "2D/Palette.hpp"
#include "Desktop.hpp"
#include "GameView.hpp"
#include "MainMenuView.hpp"
@@ -119,8 +119,8 @@
#include "ParticleSystem2D.hpp"
#include "ParticleInterface.hpp"
#include "Physics.hpp"
-#include "TimerInterface.hpp"
-#include "Math.hpp"
+#include "Util/TimerInterface.hpp"
+#include "Util/Math.hpp"
#include "Bot.hpp"
Index: netpanzer/src/NetPanzer/Interfaces/GameManager.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/GameManager.hpp:1.18
netpanzer/src/NetPanzer/Interfaces/GameManager.hpp:1.19
--- netpanzer/src/NetPanzer/Interfaces/GameManager.hpp:1.18 Thu Oct 23
13:37:26 2003
+++ netpanzer/src/NetPanzer/Interfaces/GameManager.hpp Sat Nov 22 10:43:35 2003
@@ -27,7 +27,7 @@
#include "ClientConnectDaemon.hpp"
#include "ServerConnectDaemon.hpp"
#include "GameControlRulesDaemon.hpp"
-#include "iXY.hpp"
+#include "Types/iXY.hpp"
enum { _mapload_result_success,
_mapload_result_no_map_file,
Index: netpanzer/src/NetPanzer/Interfaces/MapInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/MapInterface.hpp:1.7
netpanzer/src/NetPanzer/Interfaces/MapInterface.hpp:1.8
--- netpanzer/src/NetPanzer/Interfaces/MapInterface.hpp:1.7 Fri Oct 3
10:45:10 2003
+++ netpanzer/src/NetPanzer/Interfaces/MapInterface.hpp Sat Nov 22 10:43:35 2003
@@ -23,7 +23,7 @@
#include "SpawnList.hpp"
#include "WadMapTable.hpp"
-#include "Surface.hpp"
+#include "2D/Surface.hpp"
class MapLoadCallback
{
Index: netpanzer/src/NetPanzer/Interfaces/MapsManager.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/MapsManager.cpp:1.10
netpanzer/src/NetPanzer/Interfaces/MapsManager.cpp:1.11
--- netpanzer/src/NetPanzer/Interfaces/MapsManager.cpp:1.10 Wed Sep 24
13:43:21 2003
+++ netpanzer/src/NetPanzer/Interfaces/MapsManager.cpp Sat Nov 22 10:43:36 2003
@@ -20,7 +20,7 @@
#include <stdio.h>
#include <string.h>
#include <memory>
-#include "FileSystem.hpp"
+#include "Util/FileSystem.hpp"
#include "MapsManager.hpp"
#include "MapFileStruct.hpp"
Index: netpanzer/src/NetPanzer/Interfaces/MapsManager.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/MapsManager.hpp:1.4
netpanzer/src/NetPanzer/Interfaces/MapsManager.hpp:1.5
--- netpanzer/src/NetPanzer/Interfaces/MapsManager.hpp:1.4 Wed Sep 24
13:43:22 2003
+++ netpanzer/src/NetPanzer/Interfaces/MapsManager.hpp Sat Nov 22 10:43:36 2003
@@ -18,7 +18,7 @@
#ifndef _MAPS_MANAGER_HPP
#define _MAPS_MANAGER_HPP
-#include "FileList.hpp"
+#include "ArrayUtil/FileList.hpp"
enum { _mapfile_valid, _mapfile_not_found, _wadfile_not_found };
Index: netpanzer/src/NetPanzer/Interfaces/MiniMapInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/MiniMapInterface.hpp:1.6
netpanzer/src/NetPanzer/Interfaces/MiniMapInterface.hpp:1.7
--- netpanzer/src/NetPanzer/Interfaces/MiniMapInterface.hpp:1.6 Sun Nov 9
08:43:30 2003
+++ netpanzer/src/NetPanzer/Interfaces/MiniMapInterface.hpp Sat Nov 22
10:43:36 2003
@@ -19,9 +19,9 @@
#define _MINIMAPINTERFACE_HPP
#include "MapInterface.hpp"
-#include "Timer.hpp"
-#include "BitArray.hpp"
-#include "fXY.hpp"
+#include "ArrayUtil/Timer.hpp"
+#include "ArrayUtil/BitArray.hpp"
+#include "Types/fXY.hpp"
class MiniMapInterface
{
Index: netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp:1.19
netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp:1.20
--- netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp:1.19 Fri Nov 7
19:13:18 2003
+++ netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp Sat Nov 22
10:43:36 2003
@@ -20,9 +20,9 @@
#include <SDL.h>
#include "MouseInterface.hpp"
-#include "FileSystem.hpp"
-#include "Exception.hpp"
-#include "Log.hpp"
+#include "Util/FileSystem.hpp"
+#include "Util/Exception.hpp"
+#include "Util/Log.hpp"
#include "cMouse.hpp"
unsigned char MouseInterface::cursor_x_size;
Index: netpanzer/src/NetPanzer/Interfaces/MouseInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/MouseInterface.hpp:1.12
netpanzer/src/NetPanzer/Interfaces/MouseInterface.hpp:1.13
--- netpanzer/src/NetPanzer/Interfaces/MouseInterface.hpp:1.12 Fri Nov 7
19:13:17 2003
+++ netpanzer/src/NetPanzer/Interfaces/MouseInterface.hpp Sat Nov 22
10:43:37 2003
@@ -22,9 +22,9 @@
#include <map>
#include <deque>
-#include "Surface.hpp"
+#include "2D/Surface.hpp"
-#include "cTimeStamp.hpp"
+#include "Util/cTimeStamp.hpp"
#define _LEFT_BUTTON_MASK 0x01
#define _MIDDLE_BUTTON_MASK 0x02
Index: netpanzer/src/NetPanzer/Interfaces/ObjectiveInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/ObjectiveInterface.cpp:1.10
netpanzer/src/NetPanzer/Interfaces/ObjectiveInterface.cpp:1.11
--- netpanzer/src/NetPanzer/Interfaces/ObjectiveInterface.cpp:1.10 Wed Oct
22 09:19:30 2003
+++ netpanzer/src/NetPanzer/Interfaces/ObjectiveInterface.cpp Sat Nov 22
10:43:37 2003
@@ -23,7 +23,7 @@
#include "MapInterface.hpp"
#include "PlayerInterface.hpp"
-#include "FileSystem.hpp"
+#include "Util/FileSystem.hpp"
#include "Outpost.hpp"
#include "ObjectiveNetMessage.hpp"
Index: netpanzer/src/NetPanzer/Interfaces/ObjectiveInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/ObjectiveInterface.hpp:1.7
netpanzer/src/NetPanzer/Interfaces/ObjectiveInterface.hpp:1.8
--- netpanzer/src/NetPanzer/Interfaces/ObjectiveInterface.hpp:1.7 Wed Oct
22 09:19:31 2003
+++ netpanzer/src/NetPanzer/Interfaces/ObjectiveInterface.hpp Sat Nov 22
10:43:37 2003
@@ -19,7 +19,7 @@
#define _OBJECTIVEINTERFACE_HPP
#include "Objective.hpp"
-#include "ArrayTemplate.hpp"
+#include "ArrayUtil/ArrayTemplate.hpp"
#include "NetPacket.hpp"
#include "NetMessageEncoder.hpp"
Index: netpanzer/src/NetPanzer/Interfaces/PathScheduler.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/PathScheduler.cpp:1.7
netpanzer/src/NetPanzer/Interfaces/PathScheduler.cpp:1.8
--- netpanzer/src/NetPanzer/Interfaces/PathScheduler.cpp:1.7 Wed Nov 12
15:00:45 2003
+++ netpanzer/src/NetPanzer/Interfaces/PathScheduler.cpp Sat Nov 22
10:43:37 2003
@@ -19,7 +19,7 @@
#include <math.h>
-#include "Log.hpp"
+#include "Util/Log.hpp"
#include "PathScheduler.hpp"
#include "PathingState.hpp"
Index: netpanzer/src/NetPanzer/Interfaces/PathScheduler.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/PathScheduler.hpp:1.8
netpanzer/src/NetPanzer/Interfaces/PathScheduler.hpp:1.9
--- netpanzer/src/NetPanzer/Interfaces/PathScheduler.hpp:1.8 Thu Nov 20
19:19:27 2003
+++ netpanzer/src/NetPanzer/Interfaces/PathScheduler.hpp Sat Nov 22
10:43:38 2003
@@ -21,8 +21,8 @@
#include "Astar.hpp"
#include "PathList.hpp"
#include "UnitID.hpp"
-#include "QueueTemplate.hpp"
-#include "ArrayTemplate.hpp"
+#include "ArrayUtil/QueueTemplate.hpp"
+#include "ArrayUtil/ArrayTemplate.hpp"
class PathCacheEntry
Index: netpanzer/src/NetPanzer/Interfaces/PlayerGameManager.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/PlayerGameManager.cpp:1.8
netpanzer/src/NetPanzer/Interfaces/PlayerGameManager.cpp:1.9
--- netpanzer/src/NetPanzer/Interfaces/PlayerGameManager.cpp:1.8 Thu Nov
20 19:19:27 2003
+++ netpanzer/src/NetPanzer/Interfaces/PlayerGameManager.cpp Sat Nov 22
10:43:38 2003
@@ -29,7 +29,7 @@
#include "SystemNetMessage.hpp"
#include "ConnectNetMessage.hpp"
-#include "Log.hpp"
+#include "Util/Log.hpp"
#include "MouseInterface.hpp"
#include "KeyboardInterface.hpp"
#include "ScreenSurface.hpp"
@@ -56,12 +56,12 @@
#include "MapsManager.hpp"
#include "PowerUpInterface.hpp"
#include "ChatInterface.hpp"
-#include "Exception.hpp"
-#include "FileSystem.hpp"
+#include "Util/Exception.hpp"
+#include "Util/FileSystem.hpp"
// ** GVS Includes
#include "cMouse.hpp"
-#include "Palette.hpp"
+#include "2D/Palette.hpp"
#include "Desktop.hpp"
#include "GameView.hpp"
#include "MainMenuView.hpp"
@@ -109,14 +109,14 @@
#include "ParticleSystem2D.hpp"
#include "ParticleInterface.hpp"
#include "Physics.hpp"
-#include "TimerInterface.hpp"
-#include "Math.hpp"
+#include "Util/TimerInterface.hpp"
+#include "Util/Math.hpp"
-#include "Sound.hpp"
-#include "SDLSound.hpp"
-#include "DummySound.hpp"
-#include "UIDraw.hpp"
-#include "SDLDraw.hpp"
+#include "System/Sound.hpp"
+#include "System/SDL/SDLSound.hpp"
+#include "System/SDL/SDLDraw.hpp"
+#include "System/DummySound.hpp"
+#include "System/UIDraw.hpp"
#include "GameManager.hpp"
#include "GameControlRulesDaemon.hpp"
Index: netpanzer/src/NetPanzer/Interfaces/PowerUpInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/PowerUpInterface.cpp:1.12
netpanzer/src/NetPanzer/Interfaces/PowerUpInterface.cpp:1.13
--- netpanzer/src/NetPanzer/Interfaces/PowerUpInterface.cpp:1.12 Sat Nov
8 09:22:49 2003
+++ netpanzer/src/NetPanzer/Interfaces/PowerUpInterface.cpp Sat Nov 22
10:43:38 2003
@@ -30,7 +30,7 @@
#include "UnitPowerUp.hpp"
#include "EnemyRadarPowerUp.hpp"
-#include "Log.hpp"
+#include "Util/Log.hpp"
#include "NetworkState.hpp"
#include "Server.hpp"
#include "PowerUpNetMessage.hpp"
Index: netpanzer/src/NetPanzer/Interfaces/PowerUpInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/PowerUpInterface.hpp:1.5
netpanzer/src/NetPanzer/Interfaces/PowerUpInterface.hpp:1.6
--- netpanzer/src/NetPanzer/Interfaces/PowerUpInterface.hpp:1.5 Sat Nov 8
09:22:49 2003
+++ netpanzer/src/NetPanzer/Interfaces/PowerUpInterface.hpp Sat Nov 22
10:43:38 2003
@@ -21,7 +21,7 @@
#include <vector>
#include "PowerUp.hpp"
-#include "Timer.hpp"
+#include "ArrayUtil/Timer.hpp"
#include "PlayerID.hpp"
#include "NetPacket.hpp"
Index: netpanzer/src/NetPanzer/Interfaces/ProjectileInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/ProjectileInterface.cpp:1.8
netpanzer/src/NetPanzer/Interfaces/ProjectileInterface.cpp:1.9
--- netpanzer/src/NetPanzer/Interfaces/ProjectileInterface.cpp:1.8 Mon Sep
22 09:53:52 2003
+++ netpanzer/src/NetPanzer/Interfaces/ProjectileInterface.cpp Sat Nov 22
10:43:38 2003
@@ -23,7 +23,7 @@
#include "BulletWeapon.hpp"
#include "ShellWeapon.hpp"
#include "WorldViewInterface.hpp"
-#include "Math.hpp"
+#include "Util/Math.hpp"
InternalLink * ProjectileInterface::projectile_list_start = 0;
Index: netpanzer/src/NetPanzer/Interfaces/Stats.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/Stats.cpp:1.7
netpanzer/src/NetPanzer/Interfaces/Stats.cpp:1.8
--- netpanzer/src/NetPanzer/Interfaces/Stats.cpp:1.7 Thu Nov 20 19:19:27 2003
+++ netpanzer/src/NetPanzer/Interfaces/Stats.cpp Sat Nov 22 10:43:38 2003
@@ -20,7 +20,7 @@
#include <algorithm>
-#include "Exception.hpp"
+#include "Util/Exception.hpp"
#include "ObjectiveInterface.hpp"
#include "GameConfig.hpp"
Index: netpanzer/src/NetPanzer/Interfaces/Stats.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/Stats.hpp:1.4
netpanzer/src/NetPanzer/Interfaces/Stats.hpp:1.5
--- netpanzer/src/NetPanzer/Interfaces/Stats.hpp:1.4 Thu Nov 20 19:19:27 2003
+++ netpanzer/src/NetPanzer/Interfaces/Stats.hpp Sat Nov 22 10:43:38 2003
@@ -20,7 +20,7 @@
#include <vector>
-#include "PArray.hpp"
+#include "ArrayUtil/PArray.hpp"
#include "PlayerInterface.hpp"
//the way this works: menu system makes call to Initialize, then it
Index: netpanzer/src/NetPanzer/Interfaces/TileInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/TileInterface.hpp:1.6
netpanzer/src/NetPanzer/Interfaces/TileInterface.hpp:1.7
--- netpanzer/src/NetPanzer/Interfaces/TileInterface.hpp:1.6 Tue Sep 16
16:16:12 2003
+++ netpanzer/src/NetPanzer/Interfaces/TileInterface.hpp Sat Nov 22
10:43:38 2003
@@ -18,9 +18,9 @@
#ifndef _TILEINTERFACE_HPP
#define _TILEINTERFACE_HPP
-#include "Surface.hpp"
+#include "2D/Surface.hpp"
#include "TileSet.hpp"
-#include "Palette.hpp"
+#include "2D/Palette.hpp"
class TileInterface
{
Index: netpanzer/src/NetPanzer/Interfaces/UnitInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/UnitInterface.cpp:1.11
netpanzer/src/NetPanzer/Interfaces/UnitInterface.cpp:1.12
--- netpanzer/src/NetPanzer/Interfaces/UnitInterface.cpp:1.11 Sun Nov 9
08:43:30 2003
+++ netpanzer/src/NetPanzer/Interfaces/UnitInterface.cpp Sat Nov 22
10:43:38 2003
@@ -34,7 +34,7 @@
#include "M109.hpp"
#include "Archer.hpp"
-#include "Timer.hpp"
+#include "ArrayUtil/Timer.hpp"
#include "Server.hpp"
#include "NetworkState.hpp"
#include "NetMessageEncoder.hpp"
@@ -42,7 +42,7 @@
#include "UnitMessageTypes.hpp"
#include "PlayerNetMessage.hpp"
-#include "Sound.hpp"
+#include "System/Sound.hpp"
#include "ParticleInterface.hpp"
Index: netpanzer/src/NetPanzer/Interfaces/UnitInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/UnitInterface.hpp:1.6
netpanzer/src/NetPanzer/Interfaces/UnitInterface.hpp:1.7
--- netpanzer/src/NetPanzer/Interfaces/UnitInterface.hpp:1.6 Sun Nov 9
08:43:30 2003
+++ netpanzer/src/NetPanzer/Interfaces/UnitInterface.hpp Sat Nov 22
10:43:38 2003
@@ -22,7 +22,7 @@
#include "UnitBucketArray.hpp"
#include "UnitMessage.hpp"
#include "PlayerState.hpp"
-#include "Timer.hpp"
+#include "ArrayUtil/Timer.hpp"
#include "PlacementMatrix.hpp"
#include "UnitIDList.hpp"
Index: netpanzer/src/NetPanzer/Interfaces/UnitProfileInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/UnitProfileInterface.cpp:1.7
netpanzer/src/NetPanzer/Interfaces/UnitProfileInterface.cpp:1.8
--- netpanzer/src/NetPanzer/Interfaces/UnitProfileInterface.cpp:1.7 Tue Sep
23 21:26:19 2003
+++ netpanzer/src/NetPanzer/Interfaces/UnitProfileInterface.cpp Sat Nov 22
10:43:38 2003
@@ -18,8 +18,8 @@
#include <config.h>
#include "UnitProfileInterface.hpp"
-#include "Exception.hpp"
-#include "FileSystem.hpp"
+#include "Util/Exception.hpp"
+#include "Util/FileSystem.hpp"
#include <memory>
#include <string.h>
Index: netpanzer/src/NetPanzer/Interfaces/unix/NetworkClientUnix.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/unix/NetworkClientUnix.cpp:1.13
netpanzer/src/NetPanzer/Interfaces/unix/NetworkClientUnix.cpp:1.14
--- netpanzer/src/NetPanzer/Interfaces/unix/NetworkClientUnix.cpp:1.13 Thu Nov
20 19:19:27 2003
+++ netpanzer/src/NetPanzer/Interfaces/unix/NetworkClientUnix.cpp Sat Nov
22 10:43:39 2003
@@ -17,8 +17,8 @@
*/
#include <config.h>
-#include "Exception.hpp"
-#include "Log.hpp"
+#include "Util/Exception.hpp"
+#include "Util/Log.hpp"
#include "Desktop.hpp"
#include "NetworkGlobals.hpp"
#include "NetworkState.hpp"
Index: netpanzer/src/NetPanzer/Interfaces/unix/NetworkClientUnix.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/unix/NetworkClientUnix.hpp:1.5
netpanzer/src/NetPanzer/Interfaces/unix/NetworkClientUnix.hpp:1.6
--- netpanzer/src/NetPanzer/Interfaces/unix/NetworkClientUnix.hpp:1.5 Tue Sep
16 16:16:12 2003
+++ netpanzer/src/NetPanzer/Interfaces/unix/NetworkClientUnix.hpp Sat Nov
22 10:43:39 2003
@@ -19,7 +19,7 @@
#define _NETWORK_CLIENT_WINSOCK_HPP
#include "NetworkClient.hpp"
-#include "UILib/Network/ClientSocket.hpp"
+#include "Network/ClientSocket.hpp"
class NetworkClientUnix : public NetworkClient
{
Index: netpanzer/src/NetPanzer/Interfaces/unix/NetworkServerUnix.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/unix/NetworkServerUnix.cpp:1.10
netpanzer/src/NetPanzer/Interfaces/unix/NetworkServerUnix.cpp:1.11
--- netpanzer/src/NetPanzer/Interfaces/unix/NetworkServerUnix.cpp:1.10 Thu Nov
20 19:19:27 2003
+++ netpanzer/src/NetPanzer/Interfaces/unix/NetworkServerUnix.cpp Sat Nov
22 10:43:39 2003
@@ -18,11 +18,11 @@
#include <config.h>
#include <assert.h>
-#include "Log.hpp"
+#include "Util/Log.hpp"
#include "NetworkGlobals.hpp"
#include "GameConfig.hpp"
#include "NetworkState.hpp"
-#include "Exception.hpp"
+#include "Util/Exception.hpp"
#include "NetworkServerUnix.hpp"
//#define NETWORKDEBUG
Index: netpanzer/src/NetPanzer/Interfaces/unix/NetworkServerUnix.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/unix/NetworkServerUnix.hpp:1.5
netpanzer/src/NetPanzer/Interfaces/unix/NetworkServerUnix.hpp:1.6
--- netpanzer/src/NetPanzer/Interfaces/unix/NetworkServerUnix.hpp:1.5 Tue Sep
16 16:16:12 2003
+++ netpanzer/src/NetPanzer/Interfaces/unix/NetworkServerUnix.hpp Sat Nov
22 10:43:39 2003
@@ -19,7 +19,7 @@
#define _NETWORK_SERVER_UNIX_HPP
#include "NetworkServer.hpp"
-#include "UILib/Network/ServerSocket.hpp"
+#include "Network/ServerSocket.hpp"
/** This class implements a bsd/unix socket implementation of the
* NetworkServer interface.
Index: netpanzer/src/NetPanzer/Port/Gdatstct.cpp
diff -u netpanzer/src/NetPanzer/Port/Gdatstct.cpp:1.11
netpanzer/src/NetPanzer/Port/Gdatstct.cpp:1.12
--- netpanzer/src/NetPanzer/Port/Gdatstct.cpp:1.11 Wed Sep 24 13:43:22 2003
+++ netpanzer/src/NetPanzer/Port/Gdatstct.cpp Sat Nov 22 10:43:41 2003
@@ -24,9 +24,9 @@
#include <stdlib.h>
#include <memory>
-#include "Log.hpp"
-#include "Exception.hpp"
-#include "FileSystem.hpp"
+#include "Util/Log.hpp"
+#include "Util/Exception.hpp"
+#include "Util/FileSystem.hpp"
//*****************************************************************************
Index: netpanzer/src/NetPanzer/Port/blitters.cpp
diff -u netpanzer/src/NetPanzer/Port/blitters.cpp:1.9
netpanzer/src/NetPanzer/Port/blitters.cpp:1.10
--- netpanzer/src/NetPanzer/Port/blitters.cpp:1.9 Tue Sep 23 10:23:02 2003
+++ netpanzer/src/NetPanzer/Port/blitters.cpp Sat Nov 22 10:43:42 2003
@@ -20,7 +20,7 @@
#include <assert.h>
#include "blitters.hpp"
#include <string.h>
-#include "UIDraw.hpp"
+#include "System/UIDraw.hpp"
void blit_partial_xy(const unsigned char *tile_ptr, unsigned char *buffer_ptr,
short y_size, short x_size)
Index: netpanzer/src/NetPanzer/Views/Game/AreYouSureExitView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/AreYouSureExitView.cpp:1.7
netpanzer/src/NetPanzer/Views/Game/AreYouSureExitView.cpp:1.8
--- netpanzer/src/NetPanzer/Views/Game/AreYouSureExitView.cpp:1.7 Mon Oct
13 10:30:17 2003
+++ netpanzer/src/NetPanzer/Views/Game/AreYouSureExitView.cpp Sat Nov 22
10:43:44 2003
@@ -19,7 +19,7 @@
#include "AreYouSureExitView.hpp"
#include "Desktop.hpp"
-#include "Palette.hpp"
+#include "2D/Palette.hpp"
#include "ScreenSurface.hpp"
#include "GameManager.hpp"
Index: netpanzer/src/NetPanzer/Views/Game/AreYouSureExitView.hpp
diff -u netpanzer/src/NetPanzer/Views/Game/AreYouSureExitView.hpp:1.3
netpanzer/src/NetPanzer/Views/Game/AreYouSureExitView.hpp:1.4
--- netpanzer/src/NetPanzer/Views/Game/AreYouSureExitView.hpp:1.3 Mon Oct
13 10:30:17 2003
+++ netpanzer/src/NetPanzer/Views/Game/AreYouSureExitView.hpp Sat Nov 22
10:43:45 2003
@@ -19,7 +19,7 @@
#define __AreYouSureExitView_hpp__
#include "SpecialButtonView.hpp"
-#include "Surface.hpp"
+#include "2D/Surface.hpp"
//---------------------------------------------------------------------------
class AreYouSureExitView : public SpecialButtonView
Index: netpanzer/src/NetPanzer/Views/Game/AreYouSureResignView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/AreYouSureResignView.cpp:1.15
netpanzer/src/NetPanzer/Views/Game/AreYouSureResignView.cpp:1.16
--- netpanzer/src/NetPanzer/Views/Game/AreYouSureResignView.cpp:1.15 Mon Oct
13 10:30:17 2003
+++ netpanzer/src/NetPanzer/Views/Game/AreYouSureResignView.cpp Sat Nov 22
10:43:45 2003
@@ -23,12 +23,12 @@
#include "ParticleSystem2D.hpp"
#include "Particle2D.hpp"
#include "MenuTemplateView.hpp"
-#include "Sound.hpp"
+#include "System/Sound.hpp"
#include "SoundView.hpp"
#include "ScreenSurface.hpp"
#include "ControlsView.hpp"
#include "VisualsView.hpp"
-#include "Palette.hpp"
+#include "2D/Palette.hpp"
#include "InterfaceView.hpp"
//---------------------------------------------------------------------------
Index: netpanzer/src/NetPanzer/Views/Game/AreYouSureResignView.hpp
diff -u netpanzer/src/NetPanzer/Views/Game/AreYouSureResignView.hpp:1.3
netpanzer/src/NetPanzer/Views/Game/AreYouSureResignView.hpp:1.4
--- netpanzer/src/NetPanzer/Views/Game/AreYouSureResignView.hpp:1.3 Mon Oct
13 10:30:17 2003
+++ netpanzer/src/NetPanzer/Views/Game/AreYouSureResignView.hpp Sat Nov 22
10:43:45 2003
@@ -19,7 +19,7 @@
#define __AreYouSureResignView_hpp__
#include "SpecialButtonView.hpp"
-#include "Surface.hpp"
+#include "2D/Surface.hpp"
//---------------------------------------------------------------------------
class AreYouSureResignView : public SpecialButtonView
Index: netpanzer/src/NetPanzer/Views/Game/ChatView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/ChatView.cpp:1.10
netpanzer/src/NetPanzer/Views/Game/ChatView.cpp:1.11
--- netpanzer/src/NetPanzer/Views/Game/ChatView.cpp:1.10 Mon Oct 13
10:30:17 2003
+++ netpanzer/src/NetPanzer/Views/Game/ChatView.cpp Sat Nov 22 10:43:45 2003
@@ -17,7 +17,7 @@
*/
#include <config.h>
-#include "Exception.hpp"
+#include "Util/Exception.hpp"
#include "ChatView.hpp"
#include "Desktop.hpp"
#include "KeyboardInterface.hpp"
Index: netpanzer/src/NetPanzer/Views/Game/ChatView.hpp
diff -u netpanzer/src/NetPanzer/Views/Game/ChatView.hpp:1.4
netpanzer/src/NetPanzer/Views/Game/ChatView.hpp:1.5
--- netpanzer/src/NetPanzer/Views/Game/ChatView.hpp:1.4 Mon Oct 13 10:30:18 2003
+++ netpanzer/src/NetPanzer/Views/Game/ChatView.hpp Sat Nov 22 10:43:45 2003
@@ -20,7 +20,7 @@
#define __ChatView_hpp__
#include "View.hpp"
-#include "Surface.hpp"
+#include "2D/Surface.hpp"
#include "GameTemplateView.hpp"
#include "ScrollBar.hpp"
Index: netpanzer/src/NetPanzer/Views/Game/CodeStatsView.hpp
diff -u netpanzer/src/NetPanzer/Views/Game/CodeStatsView.hpp:1.3
netpanzer/src/NetPanzer/Views/Game/CodeStatsView.hpp:1.4
--- netpanzer/src/NetPanzer/Views/Game/CodeStatsView.hpp:1.3 Mon Oct 13
10:30:18 2003
+++ netpanzer/src/NetPanzer/Views/Game/CodeStatsView.hpp Sat Nov 22
10:43:45 2003
@@ -19,7 +19,7 @@
#define __CodeStatsView_hpp__
#include "GameTemplateView.hpp"
-#include "Surface.hpp"
+#include "2D/Surface.hpp"
#if _MSC_VER > 1000
Index: netpanzer/src/NetPanzer/Views/Game/ConsoleLoadingView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/ConsoleLoadingView.cpp:1.1
netpanzer/src/NetPanzer/Views/Game/ConsoleLoadingView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/Game/ConsoleLoadingView.cpp:1.1 Wed Oct
22 09:19:31 2003
+++ netpanzer/src/NetPanzer/Views/Game/ConsoleLoadingView.cpp Sat Nov 22
10:43:45 2003
@@ -18,7 +18,7 @@
#include <config.h>
#include "ConsoleLoadingView.hpp"
-#include "Log.hpp"
+#include "Util/Log.hpp"
#include "GameManager.hpp"
// update
Index: netpanzer/src/NetPanzer/Views/Game/ConsoleLoadingView.hpp
diff -u netpanzer/src/NetPanzer/Views/Game/ConsoleLoadingView.hpp:1.2
netpanzer/src/NetPanzer/Views/Game/ConsoleLoadingView.hpp:1.3
--- netpanzer/src/NetPanzer/Views/Game/ConsoleLoadingView.hpp:1.2 Fri Nov
7 04:38:40 2003
+++ netpanzer/src/NetPanzer/Views/Game/ConsoleLoadingView.hpp Sat Nov 22
10:43:45 2003
@@ -19,7 +19,7 @@
#define __CONSOLELOADINGVIEW_HPP__
#include "View.hpp"
-#include "Surface.hpp"
+#include "2D/Surface.hpp"
#include "LoadingView.hpp"
//---------------------------------------------------------------------------
Index: netpanzer/src/NetPanzer/Views/Game/GameInfoView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/GameInfoView.cpp:1.15
netpanzer/src/NetPanzer/Views/Game/GameInfoView.cpp:1.16
--- netpanzer/src/NetPanzer/Views/Game/GameInfoView.cpp:1.15 Sat Nov 22
07:38:23 2003
+++ netpanzer/src/NetPanzer/Views/Game/GameInfoView.cpp Sat Nov 22 10:43:45 2003
@@ -17,7 +17,7 @@
*/
#include <config.h>
-#include "Log.hpp"
+#include "Util/Log.hpp"
#include "GameInfoView.hpp"
#include "GameViewGlobals.hpp"
#include "Desktop.hpp"
@@ -26,7 +26,7 @@
#include "UnitInterface.hpp"
#include "PlayerInterface.hpp"
#include "NetworkState.hpp"
-#include "String.hpp"
+#include "Types/String.hpp"
#include "ScreenSurface.hpp"
static int getPlayerFrags()
Index: netpanzer/src/NetPanzer/Views/Game/GameInfoView.hpp
diff -u netpanzer/src/NetPanzer/Views/Game/GameInfoView.hpp:1.4
netpanzer/src/NetPanzer/Views/Game/GameInfoView.hpp:1.5
--- netpanzer/src/NetPanzer/Views/Game/GameInfoView.hpp:1.4 Sat Nov 22
04:46:40 2003
+++ netpanzer/src/NetPanzer/Views/Game/GameInfoView.hpp Sat Nov 22 10:43:45 2003
@@ -19,7 +19,7 @@
#define __GameInfoView_hpp__
#include "View.hpp"
-#include "Surface.hpp"
+#include "2D/Surface.hpp"
#include "GameTemplateView.hpp"
//---------------------------------------------------------------------------
Index: netpanzer/src/NetPanzer/Views/Game/GameTemplateView.hpp
diff -u netpanzer/src/NetPanzer/Views/Game/GameTemplateView.hpp:1.4
netpanzer/src/NetPanzer/Views/Game/GameTemplateView.hpp:1.5
--- netpanzer/src/NetPanzer/Views/Game/GameTemplateView.hpp:1.4 Sat Nov 22
04:46:40 2003
+++ netpanzer/src/NetPanzer/Views/Game/GameTemplateView.hpp Sat Nov 22
10:43:45 2003
@@ -20,7 +20,7 @@
#define __GameTemplateView_hpp__
#include "View.hpp"
-#include "Surface.hpp"
+#include "2D/Surface.hpp"
//---------------------------------------------------------------------------
class GameTemplateView : public View
Index: netpanzer/src/NetPanzer/Views/Game/GameToolbarView.hpp
diff -u netpanzer/src/NetPanzer/Views/Game/GameToolbarView.hpp:1.4
netpanzer/src/NetPanzer/Views/Game/GameToolbarView.hpp:1.5
--- netpanzer/src/NetPanzer/Views/Game/GameToolbarView.hpp:1.4 Sat Nov 22
04:46:40 2003
+++ netpanzer/src/NetPanzer/Views/Game/GameToolbarView.hpp Sat Nov 22
10:43:45 2003
@@ -19,7 +19,7 @@
#define __GameToolbarView_hpp__
#include "View.hpp"
-#include "Surface.hpp"
+#include "2D/Surface.hpp"
#include "GameTemplateView.hpp"
//---------------------------------------------------------------------------
Index: netpanzer/src/NetPanzer/Views/Game/GameView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/GameView.cpp:1.13
netpanzer/src/NetPanzer/Views/Game/GameView.cpp:1.14
--- netpanzer/src/NetPanzer/Views/Game/GameView.cpp:1.13 Fri Nov 7
19:13:18 2003
+++ netpanzer/src/NetPanzer/Views/Game/GameView.cpp Sat Nov 22 10:43:45 2003
@@ -33,7 +33,7 @@
#include "cMouse.hpp"
#include "ViewGlobals.hpp"
#include "ParticleInterface.hpp"
-#include "PackedSurface.hpp"
+#include "2D/PackedSurface.hpp"
#include "VehicleSelectionView.hpp"
#include "PowerUpInterface.hpp"
Index: netpanzer/src/NetPanzer/Views/Game/HelpScrollView.hpp
diff -u netpanzer/src/NetPanzer/Views/Game/HelpScrollView.hpp:1.5
netpanzer/src/NetPanzer/Views/Game/HelpScrollView.hpp:1.6
--- netpanzer/src/NetPanzer/Views/Game/HelpScrollView.hpp:1.5 Mon Oct 13
10:30:18 2003
+++ netpanzer/src/NetPanzer/Views/Game/HelpScrollView.hpp Sat Nov 22
10:43:45 2003
@@ -20,10 +20,10 @@
#define __HelpScrollView_hpp__
#include "SpecialButtonView.hpp"
-#include "Surface.hpp"
+#include "2D/Surface.hpp"
#include "ScrollBar.hpp"
-#include "String.hpp"
-#include "cGrowList.hpp"
+#include "Types/String.hpp"
+#include "Util/cGrowList.hpp"
#include "Button.hpp"
//---------------------------------------------------------------------------
Index: netpanzer/src/NetPanzer/Views/Game/LoadingView.hpp
diff -u netpanzer/src/NetPanzer/Views/Game/LoadingView.hpp:1.1
netpanzer/src/NetPanzer/Views/Game/LoadingView.hpp:1.2
--- netpanzer/src/NetPanzer/Views/Game/LoadingView.hpp:1.1 Wed Oct 22
09:19:31 2003
+++ netpanzer/src/NetPanzer/Views/Game/LoadingView.hpp Sat Nov 22 10:43:45 2003
@@ -19,7 +19,7 @@
#define __LOADINGVIEW_HPP__
#include "View.hpp"
-#include "Surface.hpp"
+#include "2D/Surface.hpp"
//---------------------------------------------------------------------------
class LoadingView : public View
Index: netpanzer/src/NetPanzer/Views/Game/LobbyView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/LobbyView.cpp:1.17
netpanzer/src/NetPanzer/Views/Game/LobbyView.cpp:1.18
--- netpanzer/src/NetPanzer/Views/Game/LobbyView.cpp:1.17 Fri Nov 7
04:38:40 2003
+++ netpanzer/src/NetPanzer/Views/Game/LobbyView.cpp Sat Nov 22 10:43:45 2003
@@ -17,7 +17,7 @@
*/
#include <config.h>
-#include "Exception.hpp"
+#include "Util/Exception.hpp"
#include "LobbyView.hpp"
#include "Desktop.hpp"
#include "GameManager.hpp"
Index: netpanzer/src/NetPanzer/Views/Game/LobbyView.hpp
diff -u netpanzer/src/NetPanzer/Views/Game/LobbyView.hpp:1.5
netpanzer/src/NetPanzer/Views/Game/LobbyView.hpp:1.6
--- netpanzer/src/NetPanzer/Views/Game/LobbyView.hpp:1.5 Wed Oct 22
09:19:31 2003
+++ netpanzer/src/NetPanzer/Views/Game/LobbyView.hpp Sat Nov 22 10:43:45 2003
@@ -19,7 +19,7 @@
#define __LobbyView_hpp__
#include "View.hpp"
-#include "Surface.hpp"
+#include "2D/Surface.hpp"
#include "LoadingView.hpp"
//---------------------------------------------------------------------------
Index: netpanzer/src/NetPanzer/Views/Game/MiniMapView.hpp
diff -u netpanzer/src/NetPanzer/Views/Game/MiniMapView.hpp:1.5
netpanzer/src/NetPanzer/Views/Game/MiniMapView.hpp:1.6
--- netpanzer/src/NetPanzer/Views/Game/MiniMapView.hpp:1.5 Sat Nov 22
04:46:40 2003
+++ netpanzer/src/NetPanzer/Views/Game/MiniMapView.hpp Sat Nov 22 10:43:45 2003
@@ -19,7 +19,7 @@
#define __MiniMapView_hpp__
#include "View.hpp"
-#include "Surface.hpp"
+#include "2D/Surface.hpp"
#include "GameTemplateView.hpp"
Index: netpanzer/src/NetPanzer/Views/Game/ProgressView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/ProgressView.cpp:1.19
netpanzer/src/NetPanzer/Views/Game/ProgressView.cpp:1.20
--- netpanzer/src/NetPanzer/Views/Game/ProgressView.cpp:1.19 Fri Nov 7
04:38:40 2003
+++ netpanzer/src/NetPanzer/Views/Game/ProgressView.cpp Sat Nov 22 10:43:45 2003
@@ -18,7 +18,7 @@
#include <config.h>
#include "ProgressView.hpp"
-#include "Exception.hpp"
+#include "Util/Exception.hpp"
#include "Desktop.hpp"
#include "ScreenSurface.hpp"
#include "GameManager.hpp"
Index: netpanzer/src/NetPanzer/Views/Game/ProgressView.hpp
diff -u netpanzer/src/NetPanzer/Views/Game/ProgressView.hpp:1.5
netpanzer/src/NetPanzer/Views/Game/ProgressView.hpp:1.6
--- netpanzer/src/NetPanzer/Views/Game/ProgressView.hpp:1.5 Wed Oct 22
09:19:31 2003
+++ netpanzer/src/NetPanzer/Views/Game/ProgressView.hpp Sat Nov 22 10:43:45 2003
@@ -19,7 +19,7 @@
#define __ProgressView_hpp__
#include "View.hpp"
-#include "Surface.hpp"
+#include "2D/Surface.hpp"
#include "LoadingView.hpp"
//---------------------------------------------------------------------------
Index: netpanzer/src/NetPanzer/Views/Game/RankView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/RankView.cpp:1.11
netpanzer/src/NetPanzer/Views/Game/RankView.cpp:1.12
--- netpanzer/src/NetPanzer/Views/Game/RankView.cpp:1.11 Sat Nov 22
04:46:40 2003
+++ netpanzer/src/NetPanzer/Views/Game/RankView.cpp Sat Nov 22 10:43:45 2003
@@ -17,7 +17,7 @@
*/
#include <config.h>
-#include "Exception.hpp"
+#include "Util/Exception.hpp"
#include "RankView.hpp"
#include "Stats.hpp"
#include "GameViewGlobals.hpp"
Index: netpanzer/src/NetPanzer/Views/Game/RankView.hpp
diff -u netpanzer/src/NetPanzer/Views/Game/RankView.hpp:1.5
netpanzer/src/NetPanzer/Views/Game/RankView.hpp:1.6
--- netpanzer/src/NetPanzer/Views/Game/RankView.hpp:1.5 Sat Nov 22 04:46:40 2003
+++ netpanzer/src/NetPanzer/Views/Game/RankView.hpp Sat Nov 22 10:43:45 2003
@@ -21,7 +21,7 @@
#define __RankView_hpp__
#include "View.hpp"
-#include "Surface.hpp"
+#include "2D/Surface.hpp"
#include "GameTemplateView.hpp"
#include "ScrollBar.hpp"
Index: netpanzer/src/NetPanzer/Views/Game/ResignView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/ResignView.cpp:1.7
netpanzer/src/NetPanzer/Views/Game/ResignView.cpp:1.8
--- netpanzer/src/NetPanzer/Views/Game/ResignView.cpp:1.7 Mon Oct 13
10:30:19 2003
+++ netpanzer/src/NetPanzer/Views/Game/ResignView.cpp Sat Nov 22 10:43:45 2003
@@ -19,7 +19,7 @@
#include "ResignView.hpp"
#include "Desktop.hpp"
-#include "Palette.hpp"
+#include "2D/Palette.hpp"
#include "AreYouSureResignView.hpp"
#include "AreYouSureExitView.hpp"
Index: netpanzer/src/NetPanzer/Views/Game/ResignView.hpp
diff -u netpanzer/src/NetPanzer/Views/Game/ResignView.hpp:1.3
netpanzer/src/NetPanzer/Views/Game/ResignView.hpp:1.4
--- netpanzer/src/NetPanzer/Views/Game/ResignView.hpp:1.3 Mon Oct 13
10:30:19 2003
+++ netpanzer/src/NetPanzer/Views/Game/ResignView.hpp Sat Nov 22 10:43:45 2003
@@ -19,7 +19,7 @@
#define __ResignView_hpp__
#include "View.hpp"
-#include "Surface.hpp"
+#include "2D/Surface.hpp"
//---------------------------------------------------------------------------
class ResignView : public View
Index: netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.cpp:1.21
netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.cpp:1.22
--- netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.cpp:1.21 Sat Oct
25 10:52:16 2003
+++ netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.cpp Sat Nov 22
10:43:45 2003
@@ -17,7 +17,7 @@
*/
#include <config.h>
-#include "Exception.hpp"
+#include "Util/Exception.hpp"
#include "VehicleSelectionView.hpp"
#include "UnitTypes.hpp"
#include "GameViewGlobals.hpp"
@@ -31,7 +31,7 @@
#include "ObjectiveInterface.hpp"
#include "UnitProfileInterface.hpp"
#include "ScreenSurface.hpp"
-#include "Math.hpp"
+#include "Util/Math.hpp"
#include "ObjectiveInterface.hpp"
#include "UnitTypes.hpp"
#include "UnitInterface.hpp"
Index: netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.hpp
diff -u netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.hpp:1.4
netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.hpp:1.5
--- netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.hpp:1.4 Mon Oct
13 10:30:20 2003
+++ netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.hpp Sat Nov 22
10:43:45 2003
@@ -18,7 +18,7 @@
#ifndef __VehicleSelectionView_hpp__
#define __VehicleSelectionView_hpp__
-#include "Surface.hpp"
+#include "2D/Surface.hpp"
#include "View.hpp"
#include "GameTemplateView.hpp"
#include "UnitProfileInterface.hpp"
Index: netpanzer/src/NetPanzer/Views/Game/WinnerMesgView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/WinnerMesgView.cpp:1.16
netpanzer/src/NetPanzer/Views/Game/WinnerMesgView.cpp:1.17
--- netpanzer/src/NetPanzer/Views/Game/WinnerMesgView.cpp:1.16 Thu Nov 20
19:19:28 2003
+++ netpanzer/src/NetPanzer/Views/Game/WinnerMesgView.cpp Sat Nov 22
10:43:45 2003
@@ -21,7 +21,7 @@
#include "GameViewGlobals.hpp"
#include "Desktop.hpp"
#include "Stats.hpp"
-#include "Sound.hpp"
+#include "System/Sound.hpp"
#include "ParticleSystem2D.hpp"
#include "Particle2D.hpp"
#include "GameManager.hpp"
Index: netpanzer/src/NetPanzer/Views/Game/WinnerMesgView.hpp
diff -u netpanzer/src/NetPanzer/Views/Game/WinnerMesgView.hpp:1.3
netpanzer/src/NetPanzer/Views/Game/WinnerMesgView.hpp:1.4
--- netpanzer/src/NetPanzer/Views/Game/WinnerMesgView.hpp:1.3 Mon Oct 13
10:30:20 2003
+++ netpanzer/src/NetPanzer/Views/Game/WinnerMesgView.hpp Sat Nov 22
10:43:45 2003
@@ -19,7 +19,7 @@
#define __WinnerMesgView_hpp__
#include "View.hpp"
-#include "Surface.hpp"
+#include "2D/Surface.hpp"
#include "GameTemplateView.hpp"
Index: netpanzer/src/NetPanzer/Views/GameViewGlobals.cpp
diff -u netpanzer/src/NetPanzer/Views/GameViewGlobals.cpp:1.8
netpanzer/src/NetPanzer/Views/GameViewGlobals.cpp:1.9
--- netpanzer/src/NetPanzer/Views/GameViewGlobals.cpp:1.8 Sat Nov 22
04:46:40 2003
+++ netpanzer/src/NetPanzer/Views/GameViewGlobals.cpp Sat Nov 22 10:43:44 2003
@@ -17,7 +17,7 @@
*/
#include <config.h>
-#include "Palette.hpp"
+#include "2D/Palette.hpp"
#include "GameViewGlobals.hpp"
#include "GameConfig.hpp"
Index: netpanzer/src/NetPanzer/Views/GameViewGlobals.hpp
diff -u netpanzer/src/NetPanzer/Views/GameViewGlobals.hpp:1.6
netpanzer/src/NetPanzer/Views/GameViewGlobals.hpp:1.7
--- netpanzer/src/NetPanzer/Views/GameViewGlobals.hpp:1.6 Sat Nov 22
04:46:40 2003
+++ netpanzer/src/NetPanzer/Views/GameViewGlobals.hpp Sat Nov 22 10:43:44 2003
@@ -18,9 +18,9 @@
#ifndef __GameViewGlobals_hpp__
#define __GameViewGlobals_hpp__
-#include "Surface.hpp"
-#include "iRect.hpp"
-#include "iXY.hpp"
+#include "2D/Surface.hpp"
+#include "Types/iRect.hpp"
+#include "Types/iXY.hpp"
// Globals meter colors.
#define windowTextColor (Color::white)
Index: netpanzer/src/NetPanzer/Views/MainMenu/HelpView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/HelpView.hpp:1.4
netpanzer/src/NetPanzer/Views/MainMenu/HelpView.hpp:1.5
--- netpanzer/src/NetPanzer/Views/MainMenu/HelpView.hpp:1.4 Mon Oct 13
10:30:20 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/HelpView.hpp Sat Nov 22 10:43:46 2003
@@ -19,7 +19,7 @@
#define __HelpView_hpp__
#include "View.hpp"
-#include "Surface.hpp"
+#include "2D/Surface.hpp"
#include "MenuTemplateView.hpp"
//--------------------------------------------------------------------------
Index: netpanzer/src/NetPanzer/Views/MainMenu/MainMenuView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/MainMenuView.hpp:1.4
netpanzer/src/NetPanzer/Views/MainMenu/MainMenuView.hpp:1.5
--- netpanzer/src/NetPanzer/Views/MainMenu/MainMenuView.hpp:1.4 Mon Oct 13
10:30:21 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/MainMenuView.hpp Sat Nov 22
10:43:46 2003
@@ -19,7 +19,7 @@
#define __MainMenuView_hpp__
#include "View.hpp"
-#include "Surface.hpp"
+#include "2D/Surface.hpp"
#include "MenuTemplateView.hpp"
//--------------------------------------------------------------------------
Index: netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp:1.23
netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp:1.24
--- netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp:1.23 Sun Nov
9 02:54:17 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp Sat Nov 22
10:43:46 2003
@@ -18,21 +18,21 @@
#include <config.h>
#include "MenuTemplateView.hpp"
-#include "Palette.hpp"
+#include "2D/Palette.hpp"
#include "Desktop.hpp"
#include "GameConfig.hpp"
#include "GameManager.hpp"
-#include "Sound.hpp"
+#include "System/Sound.hpp"
#include "cMouse.hpp"
#include "ViewGlobals.hpp"
#include "RadarPingParticle2D.hpp"
#include "ScreenSurface.hpp"
#include "Particle2D.hpp"
#include "ParticleSystem2D.hpp"
-#include "PackedSurface.hpp"
-#include "UtilInterface.hpp"
+#include "2D/PackedSurface.hpp"
+#include "Util/UtilInterface.hpp"
#include "GameManager.hpp"
-#include "Exception.hpp"
+#include "Util/Exception.hpp"
#include "GameViewGlobals.hpp"
Surface MenuTemplateView::backgroundSurface;
Index: netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.hpp:1.5
netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.hpp:1.6
--- netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.hpp:1.5 Mon Oct
13 10:30:21 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.hpp Sat Nov 22
10:43:46 2003
@@ -19,11 +19,11 @@
#define __MenuTemplateView_hpp__
#include "SpecialButtonView.hpp"
-#include "Surface.hpp"
-#include "PackedSurface.hpp"
-#include "iRect.hpp"
-#include "iXY.hpp"
-#include "String.hpp"
+#include "2D/Surface.hpp"
+#include "2D/PackedSurface.hpp"
+#include "Types/iRect.hpp"
+#include "Types/iXY.hpp"
+#include "Types/String.hpp"
//--------------------------------------------------------------------------
class MenuTemplateView : public SpecialButtonView
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/FlagSelectionView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/FlagSelectionView.cpp:1.18
netpanzer/src/NetPanzer/Views/MainMenu/Multi/FlagSelectionView.cpp:1.19
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/FlagSelectionView.cpp:1.18
Sat Nov 22 07:38:23 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/FlagSelectionView.cpp Sat Nov
22 10:43:48 2003
@@ -20,7 +20,7 @@
#include "FlagSelectionView.hpp"
#include "GameView.hpp"
#include "GameViewGlobals.hpp"
-#include "Exception.hpp"
+#include "Util/Exception.hpp"
#include "GameConfig.hpp"
Surface playerFlag;
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/FlagSelectionView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/FlagSelectionView.hpp:1.4
netpanzer/src/NetPanzer/Views/MainMenu/Multi/FlagSelectionView.hpp:1.5
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/FlagSelectionView.hpp:1.4
Mon Oct 13 10:30:21 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/FlagSelectionView.hpp Sat Nov
22 10:43:48 2003
@@ -19,7 +19,7 @@
#define __FlagSelectionView_hpp__
#include "RMouseHackView.hpp"
-#include "Surface.hpp"
+#include "2D/Surface.hpp"
#include "ScrollBar.hpp"
extern Surface playerFlag;
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionHostView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionHostView.cpp:1.9
netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionHostView.cpp:1.10
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionHostView.cpp:1.9
Mon Oct 13 10:30:21 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionHostView.cpp Sat Nov
22 10:43:48 2003
@@ -19,7 +19,7 @@
#include "GetSessionHostView.hpp"
#include "Desktop.hpp"
-#include "TimerInterface.hpp"
+#include "Util/TimerInterface.hpp"
#include "GameViewGlobals.hpp"
#include "Client.hpp"
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionHostView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionHostView.hpp:1.3
netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionHostView.hpp:1.4
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionHostView.hpp:1.3
Mon Oct 13 10:30:22 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionHostView.hpp Sat Nov
22 10:43:48 2003
@@ -19,8 +19,8 @@
#define __GetSessionHostView_hpp__
#include "View.hpp"
-#include "Surface.hpp"
-#include "cGrowList.hpp"
+#include "2D/Surface.hpp"
+#include "Util/cGrowList.hpp"
#include "ScrollBar.hpp"
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionView.hpp:1.3
netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionView.hpp:1.4
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionView.hpp:1.3 Mon Oct
13 10:30:22 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionView.hpp Sat Nov
22 10:43:48 2003
@@ -19,7 +19,7 @@
#define __GetSessionView_hpp__
#include "View.hpp"
-#include "Surface.hpp"
+#include "2D/Surface.hpp"
#include "MenuTemplateView.hpp"
void bNext();
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp
diff -u
netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp:1.27
netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp:1.28
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp:1.27
Thu Nov 20 19:19:28 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp
Sat Nov 22 10:43:48 2003
@@ -25,11 +25,11 @@
#include "GameConfig.hpp"
#include "PlayerGameManager.hpp"
#include "HostView.hpp"
-#include "Exception.hpp"
+#include "Util/Exception.hpp"
#include "MapSelectionView.hpp"
#include "PlayerNameView.hpp"
#include "FlagSelectionView.hpp"
-#include "Palette.hpp"
+#include "2D/Palette.hpp"
#include "GameViewGlobals.hpp"
#include "IPAddressView.hpp"
#include "IRCLobbyView.hpp"
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.hpp
diff -u
netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.hpp:1.4
netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.hpp:1.5
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.hpp:1.4
Mon Oct 13 10:30:22 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.hpp
Sat Nov 22 10:43:48 2003
@@ -19,7 +19,7 @@
#define __HostJoinTemplateView_hpp__
#include "View.hpp"
-#include "Surface.hpp"
+#include "2D/Surface.hpp"
#include "MenuTemplateView.hpp"
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostOptionsView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostOptionsView.hpp:1.3
netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostOptionsView.hpp:1.4
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostOptionsView.hpp:1.3
Mon Oct 13 10:30:22 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostOptionsView.hpp Sat Nov
22 10:43:48 2003
@@ -19,8 +19,8 @@
#define __HostOptionsView_hpp__
#include "RMouseHackView.hpp"
-#include "Surface.hpp"
-#include "String.hpp"
+#include "2D/Surface.hpp"
+#include "Types/String.hpp"
#include "Choice.hpp"
#include "CheckBox.hpp"
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostView.hpp:1.3
netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostView.hpp:1.4
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostView.hpp:1.3 Mon Oct
13 10:30:22 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostView.hpp Sat Nov 22
10:43:48 2003
@@ -19,7 +19,7 @@
#define __HostView_hpp__
#include "View.hpp"
-#include "Surface.hpp"
+#include "2D/Surface.hpp"
#include "HostJoinTemplateView.hpp"
#include "Choice.hpp"
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/IPAddressView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/IPAddressView.hpp:1.2
netpanzer/src/NetPanzer/Views/MainMenu/Multi/IPAddressView.hpp:1.3
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/IPAddressView.hpp:1.2 Mon Oct
13 10:30:23 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/IPAddressView.hpp Sat Nov
22 10:43:48 2003
@@ -19,8 +19,8 @@
#define __IPAddressView_h__
#include "View.hpp"
-#include "Surface.hpp"
-#include "cGrowList.hpp"
+#include "2D/Surface.hpp"
+#include "Util/cGrowList.hpp"
//---------------------------------------------------------------------------
class IPAddressView : public View
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/IRCLobbyView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/IRCLobbyView.cpp:1.14
netpanzer/src/NetPanzer/Views/MainMenu/Multi/IRCLobbyView.cpp:1.15
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/IRCLobbyView.cpp:1.14 Thu Nov
20 19:19:28 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/IRCLobbyView.cpp Sat Nov
22 10:43:48 2003
@@ -20,7 +20,7 @@
#include <sstream>
-#include "Log.hpp"
+#include "Util/Log.hpp"
#include "IRCLobbyView.hpp"
#include "IPAddressView.hpp"
#include "Desktop.hpp"
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/IRCLobbyView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/IRCLobbyView.hpp:1.11
netpanzer/src/NetPanzer/Views/MainMenu/Multi/IRCLobbyView.hpp:1.12
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/IRCLobbyView.hpp:1.11 Thu Nov
20 19:19:28 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/IRCLobbyView.hpp Sat Nov
22 10:43:48 2003
@@ -22,7 +22,7 @@
#include "IRCLobby.hpp"
#include "View.hpp"
-#include "Surface.hpp"
+#include "2D/Surface.hpp"
#include "GameServer.hpp"
#include "Button.hpp"
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/JoinView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/JoinView.hpp:1.3
netpanzer/src/NetPanzer/Views/MainMenu/Multi/JoinView.hpp:1.4
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/JoinView.hpp:1.3 Mon Oct
13 10:30:23 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/JoinView.hpp Sat Nov 22
10:43:48 2003
@@ -19,7 +19,7 @@
#define __JoinView_hpp__
#include "View.hpp"
-#include "Surface.hpp"
+#include "2D/Surface.hpp"
#include "HostJoinTemplateView.hpp"
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.cpp:1.18
netpanzer/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.cpp:1.19
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.cpp:1.18
Wed Oct 22 19:05:40 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.cpp Sat Nov
22 10:43:48 2003
@@ -19,16 +19,16 @@
#include <vector>
#include <string>
-#include "SplitPath.hpp"
+#include "Util/SplitPath.hpp"
#include "MapSelectionView.hpp"
#include "GameConfig.hpp"
#include "GameViewGlobals.hpp"
#include "HostOptionsView.hpp"
-#include "UtilInterface.hpp"
+#include "Util/UtilInterface.hpp"
#include "MapFileStruct.hpp"
-#include "FileSystem.hpp"
-#include "Exception.hpp"
-#include "Log.hpp"
+#include "Util/FileSystem.hpp"
+#include "Util/Exception.hpp"
+#include "Util/Log.hpp"
cGrowList <MapInfo> MapSelectionView::mapList;
int MapSelectionView::curMap = 0;
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.hpp:1.3
netpanzer/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.hpp:1.4
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.hpp:1.3
Mon Oct 13 10:30:23 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.hpp Sat Nov
22 10:43:48 2003
@@ -19,8 +19,8 @@
#define __MapSelectionView_hpp__
#include "RMouseHackView.hpp"
-#include "Surface.hpp"
-#include "cGrowList.hpp"
+#include "2D/Surface.hpp"
+#include "Util/cGrowList.hpp"
//---------------------------------------------------------------------------
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/PlayerNameView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/PlayerNameView.hpp:1.6
netpanzer/src/NetPanzer/Views/MainMenu/Multi/PlayerNameView.hpp:1.7
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/PlayerNameView.hpp:1.6 Mon Nov
17 08:14:31 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/PlayerNameView.hpp Sat Nov
22 10:43:48 2003
@@ -19,9 +19,9 @@
#define __PlayerNameView_hpp__
#include "View.hpp"
-#include "Surface.hpp"
+#include "2D/Surface.hpp"
#include "IRCLobby.hpp"
-#include "cGrowList.hpp"
+#include "Util/cGrowList.hpp"
//---------------------------------------------------------------------------
class PlayerNameView : public View,NotifyIRCChangeName
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitColorView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitColorView.cpp:1.10
netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitColorView.cpp:1.11
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitColorView.cpp:1.10 Mon Oct
13 10:30:23 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitColorView.cpp Sat Nov
22 10:43:48 2003
@@ -20,8 +20,8 @@
#include "UnitColorView.hpp"
#include "GameView.hpp"
#include "GameViewGlobals.hpp"
-#include "Palette.hpp"
-#include "ColorTable.hpp"
+#include "2D/Palette.hpp"
+#include "2D/ColorTable.hpp"
static float maxPercent = 3.5f;
static float minPercent = 0.5f;
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitColorView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitColorView.hpp:1.3
netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitColorView.hpp:1.4
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitColorView.hpp:1.3 Mon Oct
13 10:30:23 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitColorView.hpp Sat Nov
22 10:43:48 2003
@@ -19,8 +19,8 @@
#define __UnitColorView_hpp__
#include "View.hpp"
-#include "Surface.hpp"
-#include "PackedSurface.hpp"
+#include "2D/Surface.hpp"
+#include "2D/PackedSurface.hpp"
//---------------------------------------------------------------------------
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitSelectionView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitSelectionView.hpp:1.3
netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitSelectionView.hpp:1.4
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitSelectionView.hpp:1.3
Mon Oct 13 10:30:23 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitSelectionView.hpp Sat Nov
22 10:43:48 2003
@@ -19,7 +19,7 @@
#define __UnitSelectionView_hpp__
#include "View.hpp"
-#include "Surface.hpp"
+#include "2D/Surface.hpp"
#include "ScrollBar.hpp"
Index: netpanzer/src/NetPanzer/Views/MainMenu/Options/ControlsView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Options/ControlsView.hpp:1.3
netpanzer/src/NetPanzer/Views/MainMenu/Options/ControlsView.hpp:1.4
--- netpanzer/src/NetPanzer/Views/MainMenu/Options/ControlsView.hpp:1.3 Mon Oct
13 10:30:24 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Options/ControlsView.hpp Sat Nov
22 10:43:49 2003
@@ -19,7 +19,7 @@
#define __ControlsView_hpp__
#include "View.hpp"
-//#include "Surface.hpp"
+//#include "2D/Surface.hpp"
#include "OptionsTemplateView.hpp"
/////////////////////////////////////////////////////////////////////////////
Index: netpanzer/src/NetPanzer/Views/MainMenu/Options/VisualsView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Options/VisualsView.cpp:1.13
netpanzer/src/NetPanzer/Views/MainMenu/Options/VisualsView.cpp:1.14
--- netpanzer/src/NetPanzer/Views/MainMenu/Options/VisualsView.cpp:1.13 Sat Oct
25 10:52:17 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Options/VisualsView.cpp Sat Nov
22 10:43:49 2003
@@ -22,7 +22,7 @@
#include "GameConfig.hpp"
#include "GameManager.hpp"
#include "GameViewGlobals.hpp"
-#include "UILib/UIDraw.hpp"
+#include "System/UIDraw.hpp"
#include "Desktop.hpp"
// VisualsView
Index: netpanzer/src/NetPanzer/Views/MainMenu/OptionsTemplateView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/OptionsTemplateView.hpp:1.4
netpanzer/src/NetPanzer/Views/MainMenu/OptionsTemplateView.hpp:1.5
--- netpanzer/src/NetPanzer/Views/MainMenu/OptionsTemplateView.hpp:1.4 Mon Oct
13 10:30:21 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/OptionsTemplateView.hpp Sat Nov
22 10:43:46 2003
@@ -19,7 +19,7 @@
#define __OptionsTemplateView_hpp__
#include "View.hpp"
-#include "Surface.hpp"
+#include "2D/Surface.hpp"
#include "MenuTemplateView.hpp"
//--------------------------------------------------------------------------
Index: netpanzer/src/NetPanzer/Views/MainMenu/OrderingView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/OrderingView.hpp:1.3
netpanzer/src/NetPanzer/Views/MainMenu/OrderingView.hpp:1.4
--- netpanzer/src/NetPanzer/Views/MainMenu/OrderingView.hpp:1.3 Mon Oct 13
10:30:21 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/OrderingView.hpp Sat Nov 22
10:43:46 2003
@@ -19,7 +19,7 @@
#define __OrderingView_hpp__
#include "View.hpp"
-#include "Surface.hpp"
+#include "2D/Surface.hpp"
#include "MenuTemplateView.hpp"
//--------------------------------------------------------------------------
Index: netpanzer/src/NetPanzer/Views/MainMenu/SkirmishView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/SkirmishView.hpp:1.4
netpanzer/src/NetPanzer/Views/MainMenu/SkirmishView.hpp:1.5
--- netpanzer/src/NetPanzer/Views/MainMenu/SkirmishView.hpp:1.4 Mon Oct 13
10:30:21 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/SkirmishView.hpp Sat Nov 22
10:43:46 2003
@@ -19,7 +19,7 @@
#define __SkirmishView_hpp__
#include "View.hpp"
-#include "Surface.hpp"
+#include "2D/Surface.hpp"
#include "MenuTemplateView.hpp"
//--------------------------------------------------------------------------
Index: netpanzer/src/NetPanzer/Views/MainMenu/SpecialButtonView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/SpecialButtonView.cpp:1.9
netpanzer/src/NetPanzer/Views/MainMenu/SpecialButtonView.cpp:1.10
--- netpanzer/src/NetPanzer/Views/MainMenu/SpecialButtonView.cpp:1.9 Sat Oct
25 10:52:17 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/SpecialButtonView.cpp Sat Nov
22 10:43:46 2003
@@ -18,11 +18,11 @@
#include <config.h>
#include "SpecialButtonView.hpp"
-#include "Surface.hpp"
-#include "PackedSurface.hpp"
-#include "UtilInterface.hpp"
+#include "2D/Surface.hpp"
+#include "2D/PackedSurface.hpp"
+#include "Util/UtilInterface.hpp"
#include "Desktop.hpp"
-#include "Exception.hpp"
+#include "Util/Exception.hpp"
#include "WorldInputCmdProcessor.hpp"
// addSpecialButton
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [netPanzer-CVS] netpanzer ./ChangeLog mk/jam/application.jam sr...,
Matthias Braun <=