[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[netPanzer-CVS] netpanzer/src Lib/2D/Surface.hpp Lib/PObject/Cl...
|
From: |
Matthias Braun |
|
Subject: |
[netPanzer-CVS] netpanzer/src Lib/2D/Surface.hpp Lib/PObject/Cl... |
|
Date: |
Wed, 10 Sep 2003 08:32:58 -0400 |
CVSROOT: /cvsroot/netpanzer
Module name: netpanzer
Branch:
Changes by: Matthias Braun <address@hidden> 03/09/10 08:32:55
Modified files:
src/Lib/2D : Surface.hpp
src/Lib/PObject/Classes: Angle.hpp BoundBox.cpp BoundBox.hpp
BresenhamLine.cpp BresenhamLine.hpp
src/Lib/Particles: ChunkTrajectoryParticle2D.cpp
CloudParticle2D.cpp DirtKickParticle2D.cpp
FlameParticle2D.cpp FlashParticle2D.cpp
GroundExplosionParticle2D.cpp Particle2D.cpp
Particle2D.hpp ParticleInterface.cpp
PuffParticle2D.cpp RadarPingParticle2D.cpp
SparkParticle2D.cpp
src/NetPanzer/Classes: BonusUnitPowerUp.cpp BonusUnitPowerUp.hpp
EnemyRadarPowerUp.cpp
EnemyRadarPowerUp.hpp Objective.cpp
Objective.hpp Outpost.cpp Outpost.hpp
PlacementMatrix.cpp PlacementMatrix.hpp
PowerUp.cpp PowerUp.hpp
SelectionBoxSprite.cpp
SelectionBoxSprite.hpp SelectionList.cpp
SelectionList.hpp SpawnList.cpp
SpawnList.hpp Sprite.cpp Sprite.hpp
SpriteSorter.cpp SpriteSorter.hpp
SurfaceDesc.hpp UnitBlackBoard.cpp
UnitBlackBoard.hpp UnitBucketArray.cpp
UnitBucketArray.hpp UnitMessageTypes.hpp
UnitPowerUp.cpp UnitPowerUp.hpp
UnitState.cpp UnitState.hpp
ViewCamera.cpp ViewCamera.hpp
WorldInputCmdProcessor.cpp
WorldInputCmdProcessor.hpp
src/NetPanzer/Classes/AI: Astar.cpp Astar.hpp
src/NetPanzer/Classes/Network: PowerUpNetMessage.hpp
SystemNetMessage.hpp
UnitNetMessage.hpp
src/NetPanzer/Classes/Units: Abrams.cpp Abrams.hpp Archer.cpp
Archer.hpp Hammerhead.cpp
Hammerhead.hpp Humvee.cpp
Humvee.hpp Leopard.cpp Leopard.hpp
Lynx.cpp Lynx.hpp M109.cpp M109.hpp
Scorpion.cpp Scorpion.hpp
SpahPanzer.cpp SpahPanzer.hpp
Valentine.cpp Valentine.hpp
Vehicle.cpp Vehicle.hpp
src/NetPanzer/Classes/Weapons: BulletWeapon.cpp BulletWeapon.hpp
MissleWeapon.cpp MissleWeapon.hpp
ShellWeapon.cpp ShellWeapon.hpp
Weapon.cpp Weapon.hpp
src/NetPanzer/Interfaces: ConsoleInterface.cpp
ConsoleInterface.hpp GameConfig.hpp
GameManager.cpp GameManager.hpp
MapInterface.cpp MapInterface.hpp
MapsManager.hpp MiniMapInterface.cpp
MiniMapInterface.hpp
MouseInterface.cpp MouseInterface.hpp
ObjectiveInterface.cpp
ObjectiveInterface.hpp
PathScheduler.cpp PathScheduler.hpp
PlayerInterface.cpp
PlayerInterface.hpp
PowerUpInterface.cpp
ProjectileInterface.cpp
ProjectileInterface.hpp
StaticsInterface.cpp TileInterface.cpp
TileInterface.hpp UnitInterface.cpp
UnitInterface.hpp
WorldViewInterface.hpp
src/NetPanzer/Port: Wrldsprt.cpp
src/NetPanzer/Views/Game: ControlView.cpp GameView.cpp
MiniMapView.cpp
VehicleSelectionView.cpp
Removed files:
src/Lib/PObject/Classes: Point.cpp Point.hpp
Log message:
-renamed all PointXYi to iXY and Recti to iRect
Patches:
Index: netpanzer/src/Lib/2D/Surface.hpp
diff -u netpanzer/src/Lib/2D/Surface.hpp:1.5
netpanzer/src/Lib/2D/Surface.hpp:1.6
--- netpanzer/src/Lib/2D/Surface.hpp:1.5 Wed Sep 10 07:26:06 2003
+++ netpanzer/src/Lib/2D/Surface.hpp Wed Sep 10 08:32:51 2003
@@ -115,8 +115,8 @@
protected:
iXY offset; // Used like a hot spot for drawing.
float fps; // The speed to change the frames. Make sure
TimerInterface::getTimeSlice() is being updated.
- iXY pix; // # of pixels in the x and y diRection.
- iXY center; // Center of the pixels in the x and y diRection.
+ iXY pix; // # of pixels in the x and y diiRecton.
+ iXY center; // Center of the pixels in the x and y diiRecton.
int stride; // Number of bytes from one row to the next.
int frameCount; // Number of frames.
float curFrame; // Current frame of frameCount.
Index: netpanzer/src/Lib/PObject/Classes/Angle.hpp
diff -u netpanzer/src/Lib/PObject/Classes/Angle.hpp:1.2
netpanzer/src/Lib/PObject/Classes/Angle.hpp:1.3
--- netpanzer/src/Lib/PObject/Classes/Angle.hpp:1.2 Wed Sep 10 08:03:16 2003
+++ netpanzer/src/Lib/PObject/Classes/Angle.hpp Wed Sep 10 08:32:51 2003
@@ -18,8 +18,8 @@
#ifndef _ANGLE_HPP
#define _ANGLE_HPP
-#include "math.h"
-#include "Point.hpp"
+#include <math.h>
+#include "iXY.hpp"
class Angle
{
@@ -41,12 +41,12 @@
angle = (double) atan2( (double) -y, (double) x );
}
- Angle(const PointXYi& vec)
+ Angle(const iXY& vec)
{
set( vec );
}
- inline void set( const PointXYi &vec )
+ inline void set( const iXY &vec )
{
angle = (double) atan( ((double) -vec.y / (double) vec.x) );
@@ -123,7 +123,7 @@
angle_int = DegreesInt();
}
- AngleInt( PointXYi &vec )
+ AngleInt( iXY &vec )
: Angle( vec )
{
angle_int = DegreesInt();
Index: netpanzer/src/Lib/PObject/Classes/BoundBox.cpp
diff -u netpanzer/src/Lib/PObject/Classes/BoundBox.cpp:1.3
netpanzer/src/Lib/PObject/Classes/BoundBox.cpp:1.4
--- netpanzer/src/Lib/PObject/Classes/BoundBox.cpp:1.3 Fri Sep 5 22:01:18 2003
+++ netpanzer/src/Lib/PObject/Classes/BoundBox.cpp Wed Sep 10 08:32:51 2003
@@ -19,19 +19,19 @@
#include <config.h>
#include "BoundBox.hpp"
-bool BoundBox::bounds( PointXYi ¢er, PointXYi &test )
+bool BoundBox::bounds( iXY ¢er, iXY &test )
{
- PointXYi new_max( center + max );
- PointXYi new_min( center + min );
+ iXY new_max( center + max );
+ iXY new_min( center + min );
return( test.x >= new_min.x && test.x < new_max.x &&
test.y >= new_min.y && test.y < new_max.y
);
}
-void BoundBox::setBounds(const PointXYi &nMin, const PointXYi &nMax )
+void BoundBox::setBounds(const iXY &nMin, const iXY &nMax )
{
- min = PointXYi(nMin);
- max = PointXYi(nMax);
+ min = iXY(nMin);
+ max = iXY(nMax);
assert( min.x <= 0 && min.y <= 0 && max.x >= 0 && max.y >= 0 );
}
Index: netpanzer/src/Lib/PObject/Classes/BoundBox.hpp
diff -u netpanzer/src/Lib/PObject/Classes/BoundBox.hpp:1.3
netpanzer/src/Lib/PObject/Classes/BoundBox.hpp:1.4
--- netpanzer/src/Lib/PObject/Classes/BoundBox.hpp:1.3 Sat Sep 6 11:18:18 2003
+++ netpanzer/src/Lib/PObject/Classes/BoundBox.hpp Wed Sep 10 08:32:51 2003
@@ -19,39 +19,39 @@
#define _BOUNDBOX_HPP
#include <assert.h>
-#include "Point.hpp"
+#include "iRect.hpp"
-class BoundBox : public Recti
+class BoundBox : public iRect
{
public:
BoundBox( void ) {}
BoundBox(int x1, int y1, int x2, int y2)
- : Recti( x1, y1, x2, y2 )
+ : iRect( x1, y1, x2, y2 )
{
assert( min.x <= 0 && min.y <= 0 && max.x >= 0 && max.y >= 0 );
}
BoundBox(const BoundBox &a)
- : Recti( a )
+ : iRect( a )
{
assert( min.x <= 0 && min.y <= 0 && max.x >= 0 && max.y >= 0 );
}
- BoundBox(PointXYi &nMin, PointXYi &nMax)
- : Recti( nMin, nMax )
+ BoundBox(iXY &nMin, iXY &nMax)
+ : iRect( nMin, nMax )
{
assert( min.x <= 0 && min.y <= 0 && max.x >= 0 && max.y >= 0 );
}
- bool bounds( PointXYi ¢er, PointXYi &test );
+ bool bounds( iXY ¢er, iXY &test );
- void setBounds(const PointXYi &nMin, const PointXYi &nMax );
+ void setBounds(const iXY &nMin, const iXY &nMax );
- inline Recti getAbsRect( PointXYi ¢er )
+ inline iRect getAbsRect( iXY ¢er )
{
- return( Recti( center + min, center + max ) );
+ return( iRect( center + min, center + max ) );
}
};
Index: netpanzer/src/Lib/PObject/Classes/BresenhamLine.cpp
diff -u netpanzer/src/Lib/PObject/Classes/BresenhamLine.cpp:1.3
netpanzer/src/Lib/PObject/Classes/BresenhamLine.cpp:1.4
--- netpanzer/src/Lib/PObject/Classes/BresenhamLine.cpp:1.3 Fri Sep 5
22:01:18 2003
+++ netpanzer/src/Lib/PObject/Classes/BresenhamLine.cpp Wed Sep 10 08:32:51 2003
@@ -19,7 +19,7 @@
#include <config.h>
#include "BresenhamLine.hpp"
-void BresenhamLine::set_path( PointXYi &start, PointXYi &end )
+void BresenhamLine::set_path( iXY &start, iXY &end )
{
finished = 0;
@@ -100,7 +100,7 @@
}
-short BresenhamLine::increment( PointXYi *update, short times )
+short BresenhamLine::increment( iXY *update, short times )
{
while ( (times != 0) && (finished == false) )
Index: netpanzer/src/Lib/PObject/Classes/BresenhamLine.hpp
diff -u netpanzer/src/Lib/PObject/Classes/BresenhamLine.hpp:1.2
netpanzer/src/Lib/PObject/Classes/BresenhamLine.hpp:1.3
--- netpanzer/src/Lib/PObject/Classes/BresenhamLine.hpp:1.2 Wed Sep 10
08:03:16 2003
+++ netpanzer/src/Lib/PObject/Classes/BresenhamLine.hpp Wed Sep 10 08:32:51 2003
@@ -18,7 +18,7 @@
#ifndef _BRESENHAMLINE_HPP
#define _BRESENHAMLINE_HPP
-#include "Point.hpp"
+#include "iXY.hpp"
class BresenhamLine
{
@@ -53,9 +53,9 @@
BresenhamLine( void ) { }
- void set_path( PointXYi &start, PointXYi &end );
+ void set_path( iXY &start, iXY &end );
- short increment( PointXYi *update, short times );
+ short increment( iXY *update, short times );
};
Index: netpanzer/src/Lib/Particles/ChunkTrajectoryParticle2D.cpp
diff -u netpanzer/src/Lib/Particles/ChunkTrajectoryParticle2D.cpp:1.6
netpanzer/src/Lib/Particles/ChunkTrajectoryParticle2D.cpp:1.7
--- netpanzer/src/Lib/Particles/ChunkTrajectoryParticle2D.cpp:1.6 Wed Sep
10 07:26:07 2003
+++ netpanzer/src/Lib/Particles/ChunkTrajectoryParticle2D.cpp Wed Sep 10
08:32:51 2003
@@ -120,12 +120,12 @@
{
assert(this != 0);
- packedSurface.setAttrib(PointXYi((int) pos.x, (int) (pos.z - arcYPix)),
layer);
+ packedSurface.setAttrib(iXY((int) pos.x, (int) (pos.z - arcYPix)),
layer);
sorter.addSprite(&packedSurface);
if (GameConfig::getDisplayShadowsFlag())
{
- packedSurfaceShadow.setAttrib(PointXYi((int) (pos.x - arcYPix),
(int) pos.z), shadowLayer);
+ packedSurfaceShadow.setAttrib(iXY((int) (pos.x - arcYPix),
(int) pos.z), shadowLayer);
sorter.addSprite(&packedSurfaceShadow);
}
Index: netpanzer/src/Lib/Particles/CloudParticle2D.cpp
diff -u netpanzer/src/Lib/Particles/CloudParticle2D.cpp:1.7
netpanzer/src/Lib/Particles/CloudParticle2D.cpp:1.8
--- netpanzer/src/Lib/Particles/CloudParticle2D.cpp:1.7 Wed Sep 10 07:26:07 2003
+++ netpanzer/src/Lib/Particles/CloudParticle2D.cpp Wed Sep 10 08:32:51 2003
@@ -185,12 +185,12 @@
//---------------------------------------------------------------------------
void CloudParticle2D::draw(const Surface &dest, SpriteSorter &sorter)
{
- packedSurface.setAttrib(PointXYi(int(pos.x), int(pos.z)), layer);
+ packedSurface.setAttrib(iXY(int(pos.x), int(pos.z)), layer);
sorter.addSprite(&packedSurface);
if (GameConfig::getDisplayShadowsFlag())
{
- packedSurfaceShadow.setAttrib(PointXYi(int(pos.x - 300),
int(pos.z)), shadowLayer);
+ packedSurfaceShadow.setAttrib(iXY(int(pos.x - 300),
int(pos.z)), shadowLayer);
sorter.addSprite(&packedSurfaceShadow);
}
Index: netpanzer/src/Lib/Particles/DirtKickParticle2D.cpp
diff -u netpanzer/src/Lib/Particles/DirtKickParticle2D.cpp:1.4
netpanzer/src/Lib/Particles/DirtKickParticle2D.cpp:1.5
--- netpanzer/src/Lib/Particles/DirtKickParticle2D.cpp:1.4 Sat Sep 6
11:39:24 2003
+++ netpanzer/src/Lib/Particles/DirtKickParticle2D.cpp Wed Sep 10 08:32:51 2003
@@ -72,7 +72,7 @@
#if 0
// I can't use nextFrame() below, because there are multiple
// particles which share the same Surface.
- dirtKickSurface.setAttrib(PointXYi(pos.x, pos.z), 3);
+ dirtKickSurface.setAttrib(iXY(pos.x, pos.z), 3);
sorter.addSprite(&dirtKickSurface);
#endif
Index: netpanzer/src/Lib/Particles/FlameParticle2D.cpp
diff -u netpanzer/src/Lib/Particles/FlameParticle2D.cpp:1.6
netpanzer/src/Lib/Particles/FlameParticle2D.cpp:1.7
--- netpanzer/src/Lib/Particles/FlameParticle2D.cpp:1.6 Mon Sep 8 17:25:08 2003
+++ netpanzer/src/Lib/Particles/FlameParticle2D.cpp Wed Sep 10 08:32:51 2003
@@ -180,7 +180,7 @@
return;
}
- packedSurface.setAttrib(PointXYi((int)pos.x, (int)pos.z), layer);
+ packedSurface.setAttrib(iXY((int)pos.x, (int)pos.z), layer);
sorter.addSprite(&packedSurface);
} // end FlameParticle2D::draw
Index: netpanzer/src/Lib/Particles/FlashParticle2D.cpp
diff -u netpanzer/src/Lib/Particles/FlashParticle2D.cpp:1.7
netpanzer/src/Lib/Particles/FlashParticle2D.cpp:1.8
--- netpanzer/src/Lib/Particles/FlashParticle2D.cpp:1.7 Wed Sep 10 07:26:07 2003
+++ netpanzer/src/Lib/Particles/FlashParticle2D.cpp Wed Sep 10 08:32:51 2003
@@ -134,7 +134,7 @@
packedSurface.setFrame(frame);
- packedSurface.setAttrib(PointXYi((int)pos.x, (int)pos.z), layer);
+ packedSurface.setAttrib(iXY((int)pos.x, (int)pos.z), layer);
sorter.addSprite(&packedSurface);
// Since we only want a single frame of the flash, kill it after it is
done.
Index: netpanzer/src/Lib/Particles/GroundExplosionParticle2D.cpp
diff -u netpanzer/src/Lib/Particles/GroundExplosionParticle2D.cpp:1.6
netpanzer/src/Lib/Particles/GroundExplosionParticle2D.cpp:1.7
--- netpanzer/src/Lib/Particles/GroundExplosionParticle2D.cpp:1.6 Wed Sep
10 07:26:07 2003
+++ netpanzer/src/Lib/Particles/GroundExplosionParticle2D.cpp Wed Sep 10
08:32:51 2003
@@ -64,7 +64,7 @@
#if 0
groundParticleSurface.setTo(groundParticleSprite0);
- groundParticleSurface.setAttrib(PointXYi(pos.x, zPos), 3);
+ groundParticleSurface.setAttrib(iXY(pos.x, zPos), 3);
sorter.addSprite(&groundParticleSurface);
#endif
} // end GroundExplosionParticle2D::draw
Index: netpanzer/src/Lib/Particles/Particle2D.cpp
diff -u netpanzer/src/Lib/Particles/Particle2D.cpp:1.5
netpanzer/src/Lib/Particles/Particle2D.cpp:1.6
--- netpanzer/src/Lib/Particles/Particle2D.cpp:1.5 Tue Sep 9 12:21:06 2003
+++ netpanzer/src/Lib/Particles/Particle2D.cpp Wed Sep 10 08:32:51 2003
@@ -322,7 +322,7 @@
int Particle2D::getFarAway(const fXYZ &worldPos)
{
// Get the distance of the particle from the gameView.
- Recti gameViewRect;
+ iRect gameViewRect;
WorldViewInterface::getViewWindow(&gameViewRect);
iXY gameViewCenter;
Index: netpanzer/src/Lib/Particles/Particle2D.hpp
diff -u netpanzer/src/Lib/Particles/Particle2D.hpp:1.2
netpanzer/src/Lib/Particles/Particle2D.hpp:1.3
--- netpanzer/src/Lib/Particles/Particle2D.hpp:1.2 Mon Sep 1 16:24:18 2003
+++ netpanzer/src/Lib/Particles/Particle2D.hpp Wed Sep 10 08:32:51 2003
@@ -121,7 +121,7 @@
//class SpriteBltNormal : public SpriteSurface
//{
//public:
-// virtual void blit(Surface *surface, Recti &world_win);
+// virtual void blit(Surface *surface, iRect &world_win);
//
//}; // end SpriteBltNormal
//
@@ -130,7 +130,7 @@
//class SpriteBlt
//{
//public:
-// virtual void blit(Surface *surface, Recti &world_win);
+// virtual void blit(Surface *surface, iRect &world_win);
//
// ColorTable *colorTable;
//
@@ -143,7 +143,7 @@
//class SpriteBltTrans : public SpriteSurface
//{
//public:
-// virtual void blit(Surface *surface, Recti &world_win);
+// virtual void blit(Surface *surface, iRect &world_win);
//
//}; // end SpriteBltTrans
//
@@ -154,7 +154,7 @@
//public:
// float brightness;
//
-// virtual void blit(Surface *surface, Recti &world_win);
+// virtual void blit(Surface *surface, iRect &world_win);
//
//}; // end SpriteBltTrans
//
@@ -168,7 +168,7 @@
//public:
// SpriteBltBlendRandom();
//
-// virtual void blit(Surface *surface, Recti &world_win);
+// virtual void blit(Surface *surface, iRect &world_win);
//
//}; // end SpriteBltBlendRandom
//
@@ -183,7 +183,7 @@
// SpriteBltBlendRandomScale();
// float yPos;
//
-// virtual void blit(Surface *surface, Recti &world_win);
+// virtual void blit(Surface *surface, iRect &world_win);
//
//}; // end SpriteBltBlendRandomScale
//
@@ -197,7 +197,7 @@
// colorTable = 0;
// }
//
-// virtual void blit(Surface *surface, Recti &world_win);
+// virtual void blit(Surface *surface, iRect &world_win);
//
// ColorTable *colorTable;
// float scale;
@@ -215,7 +215,7 @@
// useBlend = 1;
// }
//
-// virtual void blit(Surface *surface, Recti &world_win);
+// virtual void blit(Surface *surface, iRect &world_win);
//
// ColorTable *colorTable;
// char useBlend;
@@ -229,7 +229,7 @@
//public:
// SpriteBltScale() {}
//
-// virtual void blit(Surface *surface, Recti &world_win);
+// virtual void blit(Surface *surface, iRect &world_win);
//
// float scale;
//
@@ -242,7 +242,7 @@
//public:
// PackedSurfacePreScaled() {}
//
-// virtual void blit(Surface *surface, Recti &world_win);
+// virtual void blit(Surface *surface, iRect &world_win);
// virtual void setTo(const PackedSurface &source);
//
//}; // end PackedSurfacePreScaled
@@ -254,7 +254,7 @@
//public:
// SpritePackedBlt() {}
//
-// virtual void blit( Surface *surface, Recti &world_win );
+// virtual void blit( Surface *surface, iRect &world_win );
//
//}; // end SpritePackedBlt
Index: netpanzer/src/Lib/Particles/ParticleInterface.cpp
diff -u netpanzer/src/Lib/Particles/ParticleInterface.cpp:1.6
netpanzer/src/Lib/Particles/ParticleInterface.cpp:1.7
--- netpanzer/src/Lib/Particles/ParticleInterface.cpp:1.6 Tue Sep 9
12:21:06 2003
+++ netpanzer/src/Lib/Particles/ParticleInterface.cpp Wed Sep 10 08:32:51 2003
@@ -410,7 +410,7 @@
//--------------------------------------------------------------------------
void ParticleInterface::addCloudParticle(const iXY &worldPos, const iXY
&worldSize)
{
- PointXYi shit;
+ iXY shit;
MapInterface::getMapPointSize(&shit);
fXYZ pos(worldPos.x, 0, worldPos.y);
@@ -424,7 +424,7 @@
//--------------------------------------------------------------------------
void ParticleInterface::addCloudParticleSystem(int maxParticleCount)
{
- PointXYi shit;
+ iXY shit;
MapInterface::getMapPointSize(&shit);
for (int i = 0; i < maxParticleCount; i++)
@@ -450,7 +450,7 @@
// XXX
// dsound.PlayAmbientSound( _not_applicable, _blow_up_tank, 0 );
- Recti gameViewRect;
+ iRect gameViewRect;
WorldViewInterface::getViewWindow(&gameViewRect);
UnitState unitState;
@@ -473,7 +473,7 @@
// XXX
// dsound.PlayAmbientSound( _not_applicable, _blow_up_tank, 0 );
- Recti gameViewRect;
+ iRect gameViewRect;
WorldViewInterface::getViewWindow(&gameViewRect);
iXY location;
@@ -876,7 +876,7 @@
{
assert(count >= 0);
- PointXYi shit;
+ iXY shit;
MapInterface::getMapPointSize(&shit);
for (int i = 0; i < count; i++)
@@ -904,7 +904,7 @@
//DirtKickParticle2D::init();
//RadarPingParticle2D::init();
- //PointXYi shit;
+ //iXY shit;
//MapInterface::getMapPointSize(&shit);
//addCloudParticle(iXY(400, 400), iXY(shit.x, shit.y));
Index: netpanzer/src/Lib/Particles/PuffParticle2D.cpp
diff -u netpanzer/src/Lib/Particles/PuffParticle2D.cpp:1.6
netpanzer/src/Lib/Particles/PuffParticle2D.cpp:1.7
--- netpanzer/src/Lib/Particles/PuffParticle2D.cpp:1.6 Wed Sep 10 07:26:07 2003
+++ netpanzer/src/Lib/Particles/PuffParticle2D.cpp Wed Sep 10 08:32:52 2003
@@ -159,7 +159,7 @@
packedSurfaceShadow.nextFrame();
- packedSurface.setAttrib(PointXYi((int) pos.x, (int) pos.z), layer);
+ packedSurface.setAttrib(iXY((int) pos.x, (int) pos.z), layer);
sorter.addSprite(&packedSurface);
if (GameConfig::getDisplayShadowsFlag())
@@ -169,7 +169,7 @@
shadowPos.x = pos.x - ((float(index) /
float(staticPackedSmokeLightPuff.getCount())) *
packedSurfaceShadow.getCurFrame() * 10);
}
- packedSurfaceShadow.setAttrib(PointXYi((int) shadowPos.x, (int)
shadowPos.z), shadowLayer);
+ packedSurfaceShadow.setAttrib(iXY((int) shadowPos.x, (int)
shadowPos.z), shadowLayer);
sorter.addSprite(&packedSurfaceShadow);
}
Index: netpanzer/src/Lib/Particles/RadarPingParticle2D.cpp
diff -u netpanzer/src/Lib/Particles/RadarPingParticle2D.cpp:1.4
netpanzer/src/Lib/Particles/RadarPingParticle2D.cpp:1.5
--- netpanzer/src/Lib/Particles/RadarPingParticle2D.cpp:1.4 Sat Sep 6
11:39:24 2003
+++ netpanzer/src/Lib/Particles/RadarPingParticle2D.cpp Wed Sep 10 08:32:52 2003
@@ -68,7 +68,7 @@
{
// I can't use nextFrame() below, because there are multiple
// particles which share the same Surface.
- radarPingSurface.setAttrib(PointXYi(pos.x, pos.z), 3);
+ radarPingSurface.setAttrib(iXY(pos.x, pos.z), 3);
sorter.addSprite(&radarPingSurface);
}
else if (Particle2D::bltTo == BLT_TO_SURFACE)
Index: netpanzer/src/Lib/Particles/SparkParticle2D.cpp
diff -u netpanzer/src/Lib/Particles/SparkParticle2D.cpp:1.4
netpanzer/src/Lib/Particles/SparkParticle2D.cpp:1.5
--- netpanzer/src/Lib/Particles/SparkParticle2D.cpp:1.4 Sat Sep 6 11:39:24 2003
+++ netpanzer/src/Lib/Particles/SparkParticle2D.cpp Wed Sep 10 08:32:52 2003
@@ -75,7 +75,7 @@
} else
{
packedSurface.setFrame(curFrame);
- packedSurface.setAttrib( PointXYi((int) pos.x, (int)
pos.z), 3);
+ packedSurface.setAttrib( iXY((int) pos.x, (int) pos.z),
3);
sorter.addSprite(&packedSurface);
//spark.blt(dest, iXY(x, z));
}
Index: netpanzer/src/NetPanzer/Classes/AI/Astar.cpp
diff -u netpanzer/src/NetPanzer/Classes/AI/Astar.cpp:1.4
netpanzer/src/NetPanzer/Classes/AI/Astar.cpp:1.5
--- netpanzer/src/NetPanzer/Classes/AI/Astar.cpp:1.4 Wed Sep 10 08:03:17 2003
+++ netpanzer/src/NetPanzer/Classes/AI/Astar.cpp Wed Sep 10 08:32:53 2003
@@ -155,7 +155,7 @@
}
-void Astar::initializePath( PointXYi &start, PointXYi &goal, unsigned short
path_type )
+void Astar::initializePath( iXY &start, iXY &goal, unsigned short path_type )
{
TIMESTAMP timer_ini_mark = now();
@@ -194,7 +194,7 @@
total_pathing_time += now() - timer_ini_mark;
}
-unsigned long Astar::mapXYtoAbsloc( PointXYi map_loc )
+unsigned long Astar::mapXYtoAbsloc( iXY map_loc )
{
unsigned long abs;
@@ -209,7 +209,7 @@
}
-long Astar::heuristic( PointXYi &pointA, PointXYi &pointB )
+long Astar::heuristic( iXY &pointA, iXY &pointB )
{
long delta_x;
long delta_y;
Index: netpanzer/src/NetPanzer/Classes/AI/Astar.hpp
diff -u netpanzer/src/NetPanzer/Classes/AI/Astar.hpp:1.3
netpanzer/src/NetPanzer/Classes/AI/Astar.hpp:1.4
--- netpanzer/src/NetPanzer/Classes/AI/Astar.hpp:1.3 Wed Sep 10 08:03:17 2003
+++ netpanzer/src/NetPanzer/Classes/AI/Astar.hpp Wed Sep 10 08:32:54 2003
@@ -23,7 +23,6 @@
#include "MapInterface.hpp"
#include "UnitID.hpp"
#include "UnitBlackBoard.hpp"
-#include "Point.hpp"
#include "PathList.hpp"
enum { _path_request_full, _path_request_update };
@@ -39,13 +38,13 @@
unsigned short request_type;
unsigned short path_type;
UnitID unit_id;
- PointXYi start;
- PointXYi goal;
+ iXY start;
+ iXY goal;
PathList *path;
void set( UnitID &unit_id,
- PointXYi &start,
- PointXYi &goal,
+ iXY &start,
+ iXY &goal,
unsigned short path_type,
PathList *path,
unsigned short request_type )
@@ -71,7 +70,7 @@
class AstarNode
{
public:
- PointXYi map_loc;
+ iXY map_loc;
unsigned long abs_loc;
long f;
long g;
@@ -99,7 +98,7 @@
bool dynamic_node_management_flag;
protected:
- unsigned long mapXYtoAbsloc( PointXYi map_loc );
+ unsigned long mapXYtoAbsloc( iXY map_loc );
AstarNode current_node;
@@ -133,9 +132,9 @@
PathRequest *path_request_ptr;
unsigned short path_merge_type;
- void initializePath( PointXYi &start, PointXYi &goal, unsigned short
path_type );
+ void initializePath( iXY &start, iXY &goal, unsigned short path_type );
- long heuristic( PointXYi &pointA, PointXYi &pointB );
+ long heuristic( iXY &pointA, iXY &pointB );
unsigned char generateSucc( unsigned short direction, AstarNode *node,
AstarNode *succ );
Index: netpanzer/src/NetPanzer/Classes/BonusUnitPowerUp.cpp
diff -u netpanzer/src/NetPanzer/Classes/BonusUnitPowerUp.cpp:1.4
netpanzer/src/NetPanzer/Classes/BonusUnitPowerUp.cpp:1.5
--- netpanzer/src/NetPanzer/Classes/BonusUnitPowerUp.cpp:1.4 Sat Sep 6
06:34:28 2003
+++ netpanzer/src/NetPanzer/Classes/BonusUnitPowerUp.cpp Wed Sep 10
08:32:52 2003
@@ -36,16 +36,16 @@
SpritePacked BONUS_POWERUP_ANIM;
SpritePacked BONUS_POWERUP_ANIM_SHADOW;
-BonusUnitPowerUp::BonusUnitPowerUp(PointXYi map_loc, int type)
+BonusUnitPowerUp::BonusUnitPowerUp(iXY map_loc, int type)
: PowerUp( map_loc, type )
{
bonus_unit_type = rand() % _unit_type_humvee;
bonus_unit_animation.setData( BONUS_POWERUP_ANIM );
- bonus_unit_animation.setAttrib( powerup_state.world_loc, PointXYi(0,0), 5 );
+ bonus_unit_animation.setAttrib( powerup_state.world_loc, iXY(0,0), 5 );
bonus_unit_animation_shadow.setData( BONUS_POWERUP_ANIM_SHADOW );
- bonus_unit_animation_shadow.setAttrib( powerup_state.world_loc,
PointXYi(0,0), 4 );
+ bonus_unit_animation_shadow.setAttrib( powerup_state.world_loc, iXY(0,0), 4
);
bonus_unit_animation_shadow.setDrawModeBlend(&Palette::colorTableDarkenALot);
}
@@ -56,7 +56,7 @@
UnitBase *unit;
PlacementMatrix placement_matrix;
PlayerID player_id;
- PointXYi map_loc;
+ iXY map_loc;
sound->PlayPowerUpSound();
@@ -72,7 +72,7 @@
for( int i = 0; i < 9; i++ )
{
UnitBase *new_unit;
- PointXYi spawn_loc;
+ iXY spawn_loc;
placement_matrix.getNextEmptyLoc( &spawn_loc );
Index: netpanzer/src/NetPanzer/Classes/BonusUnitPowerUp.hpp
diff -u netpanzer/src/NetPanzer/Classes/BonusUnitPowerUp.hpp:1.2
netpanzer/src/NetPanzer/Classes/BonusUnitPowerUp.hpp:1.3
--- netpanzer/src/NetPanzer/Classes/BonusUnitPowerUp.hpp:1.2 Mon Sep 1
16:24:20 2003
+++ netpanzer/src/NetPanzer/Classes/BonusUnitPowerUp.hpp Wed Sep 10
08:32:52 2003
@@ -38,7 +38,7 @@
virtual ~BonusUnitPowerUp()
{ }
- BonusUnitPowerUp(PointXYi map_loc, int type);
+ BonusUnitPowerUp(iXY map_loc, int type);
virtual void updateState( void );
Index: netpanzer/src/NetPanzer/Classes/EnemyRadarPowerUp.cpp
diff -u netpanzer/src/NetPanzer/Classes/EnemyRadarPowerUp.cpp:1.4
netpanzer/src/NetPanzer/Classes/EnemyRadarPowerUp.cpp:1.5
--- netpanzer/src/NetPanzer/Classes/EnemyRadarPowerUp.cpp:1.4 Sat Sep 6
06:34:28 2003
+++ netpanzer/src/NetPanzer/Classes/EnemyRadarPowerUp.cpp Wed Sep 10
08:32:52 2003
@@ -37,14 +37,14 @@
SpritePacked ENEMY_RADAR_POWERUP_ANIM;
SpritePacked ENEMY_RADAR_POWERUP_ANIM_SHADOW;
-EnemyRadarPowerUp::EnemyRadarPowerUp(PointXYi map_loc, int type)
+EnemyRadarPowerUp::EnemyRadarPowerUp(iXY map_loc, int type)
: PowerUp( map_loc, type )
{
enemy_radar_animation.setData( ENEMY_RADAR_POWERUP_ANIM );
- enemy_radar_animation.setAttrib( powerup_state.world_loc, PointXYi(0,0), 5
);
+ enemy_radar_animation.setAttrib( powerup_state.world_loc, iXY(0,0), 5 );
enemy_radar_animation_shadow.setData( ENEMY_RADAR_POWERUP_ANIM_SHADOW );
- enemy_radar_animation_shadow.setAttrib( powerup_state.world_loc,
PointXYi(0,0), 4 );
+ enemy_radar_animation_shadow.setAttrib( powerup_state.world_loc, iXY(0,0), 4
);
enemy_radar_animation_shadow.setDrawModeBlend(&Palette::colorTableDarkenALot);
}
Index: netpanzer/src/NetPanzer/Classes/EnemyRadarPowerUp.hpp
diff -u netpanzer/src/NetPanzer/Classes/EnemyRadarPowerUp.hpp:1.2
netpanzer/src/NetPanzer/Classes/EnemyRadarPowerUp.hpp:1.3
--- netpanzer/src/NetPanzer/Classes/EnemyRadarPowerUp.hpp:1.2 Mon Sep 1
16:24:20 2003
+++ netpanzer/src/NetPanzer/Classes/EnemyRadarPowerUp.hpp Wed Sep 10
08:32:52 2003
@@ -34,7 +34,7 @@
public:
- EnemyRadarPowerUp(PointXYi map_loc, int type);
+ EnemyRadarPowerUp(iXY map_loc, int type);
virtual ~EnemyRadarPowerUp()
{ }
Index: netpanzer/src/NetPanzer/Classes/Network/PowerUpNetMessage.hpp
diff -u netpanzer/src/NetPanzer/Classes/Network/PowerUpNetMessage.hpp:1.1
netpanzer/src/NetPanzer/Classes/Network/PowerUpNetMessage.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/Network/PowerUpNetMessage.hpp:1.1 Sun Dec
1 12:51:50 2002
+++ netpanzer/src/NetPanzer/Classes/Network/PowerUpNetMessage.hpp Wed Sep
10 08:32:54 2003
@@ -20,7 +20,6 @@
#include "NetPacket.hpp"
-#include "Point.hpp"
#include "UnitID.hpp"
#include "PlayerID.hpp"
@@ -31,11 +30,11 @@
class PowerUpCreateMesg : public NetMessage
{
public:
- PointXYi map_loc;
+ iXY map_loc;
int ID;
int type;
- void set( PointXYi map_loc, int ID, int type )
+ void set( iXY map_loc, int ID, int type )
{
PowerUpCreateMesg::map_loc = map_loc;
PowerUpCreateMesg::ID = ID;
Index: netpanzer/src/NetPanzer/Classes/Network/SystemNetMessage.hpp
diff -u netpanzer/src/NetPanzer/Classes/Network/SystemNetMessage.hpp:1.2
netpanzer/src/NetPanzer/Classes/Network/SystemNetMessage.hpp:1.3
--- netpanzer/src/NetPanzer/Classes/Network/SystemNetMessage.hpp:1.2 Mon Sep
1 16:24:20 2003
+++ netpanzer/src/NetPanzer/Classes/Network/SystemNetMessage.hpp Wed Sep
10 08:32:54 2003
@@ -20,9 +20,9 @@
#include <string.h>
-#include "Point.hpp"
#include "PlayerState.hpp"
#include "NetPacket.hpp"
+#include "iXY.hpp"
#ifdef MSVC
#pragma pack(1)
@@ -42,7 +42,7 @@
class SystemSetPlayerView : public NetMessage
{
public:
- PointXYi camera_loc;
+ iXY camera_loc;
SystemSetPlayerView()
{
Index: netpanzer/src/NetPanzer/Classes/Network/UnitNetMessage.hpp
diff -u netpanzer/src/NetPanzer/Classes/Network/UnitNetMessage.hpp:1.2
netpanzer/src/NetPanzer/Classes/Network/UnitNetMessage.hpp:1.3
--- netpanzer/src/NetPanzer/Classes/Network/UnitNetMessage.hpp:1.2 Mon Sep
1 16:24:20 2003
+++ netpanzer/src/NetPanzer/Classes/Network/UnitNetMessage.hpp Wed Sep 10
08:32:54 2003
@@ -59,7 +59,7 @@
public:
unsigned char unit_type;
UnitID unit_id;
- PointXYi location;
+ iXY location;
UnitState unit_state;
UnitIniSyncMessage()
@@ -95,7 +95,7 @@
{
public:
UnitID new_unit_id;
- PointXYi location;
+ iXY location;
unsigned char unit_type;
UnitRemoteCreate()
Index: netpanzer/src/NetPanzer/Classes/Objective.cpp
diff -u netpanzer/src/NetPanzer/Classes/Objective.cpp:1.3
netpanzer/src/NetPanzer/Classes/Objective.cpp:1.4
--- netpanzer/src/NetPanzer/Classes/Objective.cpp:1.3 Fri Sep 5 22:01:18 2003
+++ netpanzer/src/NetPanzer/Classes/Objective.cpp Wed Sep 10 08:32:52 2003
@@ -20,7 +20,7 @@
#include "PlayerInterface.hpp"
#include "ConsoleInterface.hpp"
-Objective::Objective( short ID, PointXYi location, BoundBox area )
+Objective::Objective( short ID, iXY location, BoundBox area )
{
objective_state.selection_state = false;
objective_state.ID = ID;
Index: netpanzer/src/NetPanzer/Classes/Objective.hpp
diff -u netpanzer/src/NetPanzer/Classes/Objective.hpp:1.3
netpanzer/src/NetPanzer/Classes/Objective.hpp:1.4
--- netpanzer/src/NetPanzer/Classes/Objective.hpp:1.3 Wed Sep 10 08:03:17 2003
+++ netpanzer/src/NetPanzer/Classes/Objective.hpp Wed Sep 10 08:32:52 2003
@@ -18,7 +18,6 @@
#ifndef _OBJECTIVE_HPP
#define _OBJECTIVE_HPP
-#include "Point.hpp"
#include "BoundBox.hpp"
#include "SpriteSorter.hpp"
#include "PlayerState.hpp"
@@ -36,17 +35,17 @@
public:
short ID;
bool selection_state;
- Recti selection_box;
+ iRect selection_box;
unsigned char outpost_type;
char name[64];
- PointXYi location;
+ iXY location;
BoundBox capture_area;
BoundBox area;
unsigned char objective_status;
unsigned char occupation_status;
PlayerID occupying_player;
- inline bool isBounded( PointXYi &test )
+ inline bool isBounded( iXY &test )
{
return( capture_area.bounds( location, test ) );
}
@@ -72,7 +71,7 @@
public:
ObjectiveState objective_state;
- Objective( short ID, PointXYi location, BoundBox area );
+ Objective( short ID, iXY location, BoundBox area );
void getSyncData( SyncObjective &objective_sync_mesg );
Index: netpanzer/src/NetPanzer/Classes/Outpost.cpp
diff -u netpanzer/src/NetPanzer/Classes/Outpost.cpp:1.3
netpanzer/src/NetPanzer/Classes/Outpost.cpp:1.4
--- netpanzer/src/NetPanzer/Classes/Outpost.cpp:1.3 Fri Sep 5 22:01:18 2003
+++ netpanzer/src/NetPanzer/Classes/Outpost.cpp Wed Sep 10 08:32:52 2003
@@ -32,22 +32,22 @@
#include "codewiz.hpp"
-Outpost::Outpost( short ID, PointXYi location, BoundBox area )
+Outpost::Outpost( short ID, iXY location, BoundBox area )
: Objective( ID, location, area )
{
MapInterface::pointXYtoMapXY( location, &outpost_map_loc );
- objective_state.selection_box.max = location + PointXYi( 64, 32 );
- objective_state.selection_box.min = location + PointXYi( -224, -128 );
- objective_state.area.min = PointXYi( -400, -144 );
- objective_state.area.max = PointXYi( 400, 240 );
+ objective_state.selection_box.max = location + iXY( 64, 32 );
+ objective_state.selection_box.min = location + iXY( -224, -128 );
+ objective_state.area.min = iXY( -400, -144 );
+ objective_state.area.max = iXY( 400, 240 );
unit_generation_type = _unit_type_humvee;
occupation_status_timer.changePeriod( 3 );
unit_generation_timer.changePeriod( 1 );
- unit_collection_loc = PointXYi( 13, 13 );
- unit_generation_loc = PointXYi( 1, 3 );
- occupation_pad_offset = PointXYi( 224, 48 );
+ unit_collection_loc = iXY( 13, 13 );
+ unit_generation_loc = iXY( 1, 3 );
+ occupation_pad_offset = iXY( 224, 48 );
unit_generation_on_flag = false;
select_box.setAttrib( location, 3 );
@@ -117,8 +117,8 @@
{
PlayerID null_id;
UnitBase *unit_ptr;
- Recti bounding_area;
- PointXYi occupation_pad_loc;
+ iRect bounding_area;
+ iXY occupation_pad_loc;
occupation_pad_loc = objective_state.location + occupation_pad_offset;
bounding_area = objective_state.capture_area.getAbsRect(
occupation_pad_loc );
@@ -131,7 +131,7 @@
if ( unit_ptr != 0 )
{
- PointXYi unit_loc;
+ iXY unit_loc;
unit_loc = unit_ptr->unit_state.location;
if ( objective_state.capture_area.bounds( occupation_pad_loc, unit_loc )
)
{
@@ -158,7 +158,7 @@
)
{
UnitBase *unit;
- PointXYi gen_loc;
+ iXY gen_loc;
gen_loc = outpost_map_loc + unit_generation_loc;
unit = UnitInterface::createUnit(unit_generation_type,
@@ -176,7 +176,7 @@
UMesgAICommand ai_command;
PlacementMatrix placement_matrix;
- PointXYi collection_loc, loc;
+ iXY collection_loc, loc;
collection_loc = outpost_map_loc + unit_collection_loc;
Index: netpanzer/src/NetPanzer/Classes/Outpost.hpp
diff -u netpanzer/src/NetPanzer/Classes/Outpost.hpp:1.1
netpanzer/src/NetPanzer/Classes/Outpost.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/Outpost.hpp:1.1 Mon Sep 1 16:30:11 2003
+++ netpanzer/src/NetPanzer/Classes/Outpost.hpp Wed Sep 10 08:32:52 2003
@@ -27,10 +27,10 @@
{
protected:
unsigned char outpost_state;
- PointXYi outpost_map_loc;
- PointXYi unit_generation_loc;
- PointXYi unit_collection_loc;
- PointXYi occupation_pad_offset;
+ iXY outpost_map_loc;
+ iXY unit_generation_loc;
+ iXY unit_collection_loc;
+ iXY occupation_pad_offset;
unsigned short unit_generation_type;
bool unit_generation_on_flag;
@@ -51,7 +51,7 @@
public:
- Outpost( short ID, PointXYi location, BoundBox area );
+ Outpost( short ID, iXY location, BoundBox area );
void getOutpostStatus( OutpostStatus &status );
Index: netpanzer/src/NetPanzer/Classes/PlacementMatrix.cpp
diff -u netpanzer/src/NetPanzer/Classes/PlacementMatrix.cpp:1.3
netpanzer/src/NetPanzer/Classes/PlacementMatrix.cpp:1.4
--- netpanzer/src/NetPanzer/Classes/PlacementMatrix.cpp:1.3 Fri Sep 5
22:01:18 2003
+++ netpanzer/src/NetPanzer/Classes/PlacementMatrix.cpp Wed Sep 10 08:32:52 2003
@@ -20,21 +20,21 @@
#include "MapInterface.hpp"
#include "UnitBlackBoard.hpp"
-void PlacementMatrix::reset( PointXYi ini_map_loc )
+void PlacementMatrix::reset( iXY ini_map_loc )
{
ini_loc = ini_map_loc;
- current_offset = PointXYi( 0, 0 );
+ current_offset = iXY( 0, 0 );
current_loc = ini_loc;
run_length = 0;
run_counter = 0;
placement_state = _placement_state_base_case;
}
-bool PlacementMatrix::verifyLocation( PointXYi &loc )
+bool PlacementMatrix::verifyLocation( iXY &loc )
{
long x_offset, y_offset;
long free_count = 0;
- PointXYi succ;
+ iXY succ;
unsigned long direction_index;
if ( ( MapInterface::getMovementValue( loc ) >= 0xFF) ||
@@ -79,7 +79,7 @@
}
-bool PlacementMatrix::getNextEmptyLoc( PointXYi *loc )
+bool PlacementMatrix::getNextEmptyLoc( iXY *loc )
{
bool end_cycle = false;
@@ -216,7 +216,7 @@
}
/*
-void PlacementMatrix::reset( PointXYi ini_map_loc )
+void PlacementMatrix::reset( iXY ini_map_loc )
{
*
ini_loc = ini_map_loc;
@@ -224,12 +224,12 @@
direction = 0;
}
-bool PlacementMatrix::getNextEmptyLoc( PointXYi *loc )
+bool PlacementMatrix::getNextEmptyLoc( iXY *loc )
{
long x_offset, y_offset;
- PointXYi succ;
- PointXYi succ_right;
- PointXYi succ_left;
+ iXY succ;
+ iXY succ_right;
+ iXY succ_left;
while ( level < 50 )
{
Index: netpanzer/src/NetPanzer/Classes/PlacementMatrix.hpp
diff -u netpanzer/src/NetPanzer/Classes/PlacementMatrix.hpp:1.3
netpanzer/src/NetPanzer/Classes/PlacementMatrix.hpp:1.4
--- netpanzer/src/NetPanzer/Classes/PlacementMatrix.hpp:1.3 Wed Sep 10
08:03:17 2003
+++ netpanzer/src/NetPanzer/Classes/PlacementMatrix.hpp Wed Sep 10 08:32:52 2003
@@ -18,7 +18,7 @@
#ifndef _PLACEMENTMATRIX_HPP
#define _PLACEMENTMATRIX_HPP
-#include "Point.hpp"
+#include "iXY.hpp"
class PlacementMatrix
{
@@ -33,21 +33,21 @@
unsigned char placement_state;
long run_length;
long run_counter;
- PointXYi current_offset;
- PointXYi current_loc;
- PointXYi ini_loc;
+ iXY current_offset;
+ iXY current_loc;
+ iXY ini_loc;
- bool verifyLocation( PointXYi &loc );
+ bool verifyLocation( iXY &loc );
protected:
//long level;
//long direction;
- //PointXYi ini_loc;
+ //iXY ini_loc;
public:
- void reset( PointXYi ini_map_loc );
+ void reset( iXY ini_map_loc );
- bool getNextEmptyLoc( PointXYi *loc );
+ bool getNextEmptyLoc( iXY *loc );
};
Index: netpanzer/src/NetPanzer/Classes/PowerUp.cpp
diff -u netpanzer/src/NetPanzer/Classes/PowerUp.cpp:1.3
netpanzer/src/NetPanzer/Classes/PowerUp.cpp:1.4
--- netpanzer/src/NetPanzer/Classes/PowerUp.cpp:1.3 Fri Sep 5 22:01:18 2003
+++ netpanzer/src/NetPanzer/Classes/PowerUp.cpp Wed Sep 10 08:32:52 2003
@@ -27,7 +27,7 @@
powerup_state.life_cycle_state = _power_up_lifecycle_state_active;
}
-PowerUp::PowerUp(PointXYi map_loc, int ID, int type)
+PowerUp::PowerUp(iXY map_loc, int ID, int type)
{
powerup_state.map_loc = map_loc;
powerup_state.ID = ID;
@@ -37,7 +37,7 @@
powerup_state.life_cycle_state = _power_up_lifecycle_state_active;
}
-PowerUp::PowerUp(PointXYi map_loc, int type)
+PowerUp::PowerUp(iXY map_loc, int type)
{
powerup_state.map_loc = map_loc;
powerup_state.ID = -1;
Index: netpanzer/src/NetPanzer/Classes/PowerUp.hpp
diff -u netpanzer/src/NetPanzer/Classes/PowerUp.hpp:1.2
netpanzer/src/NetPanzer/Classes/PowerUp.hpp:1.3
--- netpanzer/src/NetPanzer/Classes/PowerUp.hpp:1.2 Mon Sep 1 16:24:20 2003
+++ netpanzer/src/NetPanzer/Classes/PowerUp.hpp Wed Sep 10 08:32:52 2003
@@ -18,7 +18,6 @@
#ifndef _POWERUP_HPP
#define _POWERUP_HPP
-#include "Point.hpp"
#include "UnitID.hpp"
#include "SpriteSorter.hpp"
#include "PowerUpNetMessage.hpp"
@@ -30,8 +29,8 @@
class PowerUpState
{
public:
- PointXYi map_loc;
- PointXYi world_loc;
+ iXY map_loc;
+ iXY world_loc;
int ID;
int type;
int life_cycle_state;
@@ -48,9 +47,9 @@
public:
PowerUp();
- PowerUp(PointXYi map_loc, int ID, int type);
+ PowerUp(iXY map_loc, int ID, int type);
- PowerUp(PointXYi map_loc, int type);
+ PowerUp(iXY map_loc, int type);
virtual void updateState( void ) { }
Index: netpanzer/src/NetPanzer/Classes/SelectionBoxSprite.cpp
diff -u netpanzer/src/NetPanzer/Classes/SelectionBoxSprite.cpp:1.6
netpanzer/src/NetPanzer/Classes/SelectionBoxSprite.cpp:1.7
--- netpanzer/src/NetPanzer/Classes/SelectionBoxSprite.cpp:1.6 Wed Sep 10
07:26:07 2003
+++ netpanzer/src/NetPanzer/Classes/SelectionBoxSprite.cpp Wed Sep 10
08:32:52 2003
@@ -23,7 +23,7 @@
Surface UNIT_FLAGS_SURFACE;
-bool SelectionBoxSprite::isVisible(const Recti &world_win) const
+bool SelectionBoxSprite::isVisible(const iRect &world_win) const
{
if (
(world_win.contains( world_pos + selection_area.min ) && (visible ==
true ) ) ||
@@ -35,9 +35,9 @@
}
-void SelectionBoxSprite::blit( Surface *surface, const Recti &world_win )
+void SelectionBoxSprite::blit( Surface *surface, const iRect &world_win )
{
- PointXYi min_abs, max_abs;
+ iXY min_abs, max_abs;
if ( box_state == false )
return;
@@ -76,9 +76,9 @@
}
-void UnitSelectionBox::blit( Surface *surface, const Recti &world_win )
+void UnitSelectionBox::blit( Surface *surface, const iRect &world_win )
{
- PointXYi min_abs, max_abs;
+ iXY min_abs, max_abs;
min_abs = (world_pos + selection_area.min) - world_win.min;
max_abs = (world_pos + selection_area.max) - world_win.min;
Index: netpanzer/src/NetPanzer/Classes/SelectionBoxSprite.hpp
diff -u netpanzer/src/NetPanzer/Classes/SelectionBoxSprite.hpp:1.4
netpanzer/src/NetPanzer/Classes/SelectionBoxSprite.hpp:1.5
--- netpanzer/src/NetPanzer/Classes/SelectionBoxSprite.hpp:1.4 Mon Sep 8
18:50:28 2003
+++ netpanzer/src/NetPanzer/Classes/SelectionBoxSprite.hpp Wed Sep 10
08:32:52 2003
@@ -42,9 +42,9 @@
box_state = on_off;
}
- virtual bool isVisible(const Recti &world_win ) const;
+ virtual bool isVisible(const iRect &world_win ) const;
- virtual void blit( Surface *surface, const Recti &world_win );
+ virtual void blit( Surface *surface, const iRect &world_win );
};
class UnitSelectionBox : public SelectionBoxSprite
@@ -100,7 +100,7 @@
allie_state = is_allied;
}
- virtual void blit( Surface *surface, const Recti &world_win );
+ virtual void blit( Surface *surface, const iRect &world_win );
};
#endif // ** _SELECTION_BOX_SPRITE_HPP
Index: netpanzer/src/NetPanzer/Classes/SelectionList.cpp
diff -u netpanzer/src/NetPanzer/Classes/SelectionList.cpp:1.3
netpanzer/src/NetPanzer/Classes/SelectionList.cpp:1.4
--- netpanzer/src/NetPanzer/Classes/SelectionList.cpp:1.3 Fri Sep 5
22:01:18 2003
+++ netpanzer/src/NetPanzer/Classes/SelectionList.cpp Wed Sep 10 08:32:52 2003
@@ -22,9 +22,9 @@
int selectKey( void *key, UnitState *comp )
{
- PointXYi *point;
+ iXY *point;
- point = (PointXYi *) key;
+ point = (iXY *) key;
if ( comp->bounds( *point ) == true )
return( 0 );
@@ -34,9 +34,9 @@
int boundKey( void *key, UnitState *comp )
{
- Recti *bound;
+ iRect *bound;
- bound = (Recti *) key;
+ bound = (iRect *) key;
if ( bound->contains( comp->location ) == true )
return( 0 );
@@ -52,7 +52,7 @@
}
-bool SelectionList::selectUnit( PointXYi point )
+bool SelectionList::selectUnit( iXY point )
{
PlayerID player_id;
@@ -79,7 +79,7 @@
return( false );
}
-bool SelectionList::addUnit( PointXYi point )
+bool SelectionList::addUnit( iXY point )
{
PlayerID player_id;
@@ -106,7 +106,7 @@
}
-bool SelectionList::selectTarget( PointXYi point )
+bool SelectionList::selectTarget( iXY point )
{
PlayerID player_id;
@@ -133,7 +133,7 @@
}
-bool SelectionList::selectBounded( Recti bounds )
+bool SelectionList::selectBounded( iRect bounds )
{
PlayerID player_id;
bool found_units;
Index: netpanzer/src/NetPanzer/Classes/SelectionList.hpp
diff -u netpanzer/src/NetPanzer/Classes/SelectionList.hpp:1.3
netpanzer/src/NetPanzer/Classes/SelectionList.hpp:1.4
--- netpanzer/src/NetPanzer/Classes/SelectionList.hpp:1.3 Wed Sep 10
08:03:17 2003
+++ netpanzer/src/NetPanzer/Classes/SelectionList.hpp Wed Sep 10 08:32:52 2003
@@ -22,7 +22,6 @@
#include "UnitState.hpp"
#include "UnitInterface.hpp"
#include "UnitIDList.hpp"
-#include "Point.hpp"
class SelectionList
{
@@ -37,13 +36,13 @@
void initialize( unsigned long size, unsigned long growIncrement,
unsigned long growLimit );
- bool selectUnit( PointXYi point );
+ bool selectUnit( iXY point );
- bool addUnit( PointXYi point );
+ bool addUnit( iXY point );
- bool selectTarget( PointXYi point );
+ bool selectTarget( iXY point );
- bool selectBounded( Recti bounds );
+ bool selectBounded( iRect bounds );
inline bool isSelected( void )
{
Index: netpanzer/src/NetPanzer/Classes/SpawnList.cpp
diff -u netpanzer/src/NetPanzer/Classes/SpawnList.cpp:1.4
netpanzer/src/NetPanzer/Classes/SpawnList.cpp:1.5
--- netpanzer/src/NetPanzer/Classes/SpawnList.cpp:1.4 Sat Sep 6 14:59:06 2003
+++ netpanzer/src/NetPanzer/Classes/SpawnList.cpp Wed Sep 10 08:32:52 2003
@@ -59,7 +59,7 @@
last_spawn_index = 0;
}
-void SpawnList::getFreeSpawnPoint( PointXYi *spawn_loc )
+void SpawnList::getFreeSpawnPoint( iXY *spawn_loc )
{
unsigned long spawn_index;
Index: netpanzer/src/NetPanzer/Classes/SpawnList.hpp
diff -u netpanzer/src/NetPanzer/Classes/SpawnList.hpp:1.2
netpanzer/src/NetPanzer/Classes/SpawnList.hpp:1.3
--- netpanzer/src/NetPanzer/Classes/SpawnList.hpp:1.2 Wed Sep 10 08:03:17 2003
+++ netpanzer/src/NetPanzer/Classes/SpawnList.hpp Wed Sep 10 08:32:52 2003
@@ -18,15 +18,15 @@
#ifndef _SPAWNLIST_HPP
#define _SPAWNLIST_HPP
-#include "Point.hpp"
#include "Timer.hpp"
#include "ArrayTemplate.hpp"
+#include "iXY.hpp"
class SpawnPoint
{
public:
char name[32];
- PointXYi map_loc;
+ iXY map_loc;
unsigned char capacity;
Timer spawn_delay;
};
@@ -44,7 +44,7 @@
void loadSpawnFile( char *file_path );
- void getFreeSpawnPoint( PointXYi *spawn_loc );
+ void getFreeSpawnPoint( iXY *spawn_loc );
};
Index: netpanzer/src/NetPanzer/Classes/Sprite.cpp
diff -u netpanzer/src/NetPanzer/Classes/Sprite.cpp:1.4
netpanzer/src/NetPanzer/Classes/Sprite.cpp:1.5
--- netpanzer/src/NetPanzer/Classes/Sprite.cpp:1.4 Mon Sep 8 11:32:04 2003
+++ netpanzer/src/NetPanzer/Classes/Sprite.cpp Wed Sep 10 08:32:52 2003
@@ -40,7 +40,7 @@
setData( data, xPix, yPix, numFrames );
}
-bool SpriteSurface::isVisible(const Recti &world_win ) const
+bool SpriteSurface::isVisible(const iRect &world_win ) const
{
long min_x;
long min_y;
@@ -66,20 +66,20 @@
return( true );
/*
- PointXYi temp_pix = pix;
+ iXY temp_pix = pix;
temp_pix.x = temp_pix.x/2;
temp_pix.y = temp_pix.y/2;
- if ( world_win.clip( Recti( world_pos - temp_pix, world_pos + temp_pix) ) )
+ if ( world_win.clip( iRect( world_pos - temp_pix, world_pos + temp_pix) ) )
return( false );
return( true );
*/
}
-void SpriteSurface::blit( Surface *surface, const Recti &world_win )
+void SpriteSurface::blit( Surface *surface, const iRect &world_win )
{
- PointXYi blit_offset;
+ iXY blit_offset;
blit_offset = (world_pos + attach_offset) - world_win.min;
printf("NormalSpriteBlit %d %d\n", blit_offset.x, blit_offset.y);
@@ -102,7 +102,7 @@
drawMode = SOLID;
}
-bool SpritePacked::isVisible(const Recti &world_win ) const
+bool SpritePacked::isVisible(const iRect &world_win ) const
{
long min_x;
long min_y;
@@ -128,20 +128,20 @@
return( true );
/*
- PointXYi temp_pix = pix;
+ iXY temp_pix = pix;
temp_pix.x = temp_pix.x/2;
temp_pix.y = temp_pix.y/2;
- if ( world_win.clip( Recti( world_pos - temp_pix, world_pos + temp_pix) ) )
+ if ( world_win.clip( iRect( world_pos - temp_pix, world_pos + temp_pix) ) )
return( false );
return( true );
*/
}
-void SpritePacked::blit( Surface *surface, const Recti &world_win )
+void SpritePacked::blit( Surface *surface, const iRect &world_win )
{
- PointXYi blit_offset;
+ iXY blit_offset;
blit_offset = (world_pos + attach_offset) - world_win.min;
Index: netpanzer/src/NetPanzer/Classes/Sprite.hpp
diff -u netpanzer/src/NetPanzer/Classes/Sprite.hpp:1.4
netpanzer/src/NetPanzer/Classes/Sprite.hpp:1.5
--- netpanzer/src/NetPanzer/Classes/Sprite.hpp:1.4 Wed Sep 10 08:03:17 2003
+++ netpanzer/src/NetPanzer/Classes/Sprite.hpp Wed Sep 10 08:32:53 2003
@@ -20,15 +20,14 @@
#include "Surface.hpp"
#include "PackedSurface.hpp"
-#include "Point.hpp"
#define _MAX_HEIGHT_LEVELS 8
class Sprite
{
public:
- PointXYi world_pos;
- PointXYi attach_offset;
+ iXY world_pos;
+ iXY attach_offset;
unsigned char height;
bool visible;
@@ -38,12 +37,12 @@
Sprite( );
- inline void setWorldPos(const PointXYi &worldPos )
+ inline void setWorldPos(const iXY &worldPos )
{
world_pos = worldPos;
}
- virtual bool isVisible(const Recti &world_win ) const = 0;
+ virtual bool isVisible(const iRect &world_win ) const = 0;
inline void setWorldPos( int x, int y )
{
@@ -51,7 +50,7 @@
world_pos.y = y;
}
- inline void setAttrib(const PointXYi &worldPos, const PointXYi &attach,
+ inline void setAttrib(const iXY &worldPos, const iXY &attach,
unsigned char height )
{
world_pos = worldPos;
@@ -60,7 +59,7 @@
Sprite::height = height;
}
- inline void setAttrib(const PointXYi &worldPos, unsigned char height )
+ inline void setAttrib(const iXY &worldPos, unsigned char height )
{
world_pos = worldPos;
assert( height < _MAX_HEIGHT_LEVELS );
@@ -85,7 +84,7 @@
Sprite::visible = visible;
}
- inline void attachSprite( Sprite *sprite, const PointXYi &attach )
+ inline void attachSprite( Sprite *sprite, const iXY &attach )
{
Sprite *iterator;
@@ -99,9 +98,9 @@
iterator->next = sprite;
}
- virtual void blit( Surface *surface, const Recti &world_win ) = 0;
+ virtual void blit( Surface *surface, const iRect &world_win ) = 0;
- inline void blitAll( Surface *surface, const Recti &world_win )
+ inline void blitAll( Surface *surface, const iRect &world_win )
{
Sprite *iterator;
@@ -139,7 +138,7 @@
setOffsetCenter();
}
- inline void setAttrib( PointXYi &worldPos, PointXYi &attach, unsigned char
height, int frame )
+ inline void setAttrib( iXY &worldPos, iXY &attach, unsigned char height,
int frame )
{
world_pos = worldPos;
attach_offset = attach;
@@ -148,7 +147,7 @@
setFrame( frame );
}
- inline void setAttrib( PointXYi &worldPos, PointXYi &attach, unsigned char
height )
+ inline void setAttrib( iXY &worldPos, iXY &attach, unsigned char height )
{
world_pos = worldPos;
attach_offset = attach;
@@ -156,7 +155,7 @@
Sprite::height = height;
}
- inline void setAttrib( const PointXYi &worldPos, unsigned char height )
+ inline void setAttrib( const iXY &worldPos, unsigned char height )
{
world_pos = worldPos;
assert( height < _MAX_HEIGHT_LEVELS );
@@ -165,9 +164,9 @@
attach_offset.y = 0;
}
- virtual bool isVisible(const Recti &world_win ) const;
+ virtual bool isVisible(const iRect &world_win ) const;
- virtual void blit( Surface *surface, const Recti &world_win );
+ virtual void blit( Surface *surface, const iRect &world_win );
};
class SpritePacked : public PackedSurface, public Sprite
@@ -206,7 +205,7 @@
setOffsetCenter();
}
- inline void setAttrib( const PointXYi &worldPos, const PointXYi &attach,
+ inline void setAttrib( const iXY &worldPos, const iXY &attach,
unsigned char height, int
frame )
{
world_pos = worldPos;
@@ -217,7 +216,7 @@
}
- inline void setAttrib( const PointXYi &worldPos, const PointXYi &attach,
+ inline void setAttrib( const iXY &worldPos, const iXY &attach,
unsigned char height )
{
world_pos = worldPos;
@@ -226,7 +225,7 @@
Sprite::height = height;
}
- inline void setAttrib( const PointXYi &worldPos, unsigned char height )
+ inline void setAttrib( const iXY &worldPos, unsigned char height )
{
world_pos = worldPos;
assert( height < _MAX_HEIGHT_LEVELS );
@@ -235,9 +234,9 @@
attach_offset.y = 0;
}
- virtual bool isVisible(const Recti &world_win ) const;
+ virtual bool isVisible(const iRect &world_win ) const;
- virtual void blit( Surface *surface, const Recti &world_win );
+ virtual void blit( Surface *surface, const iRect &world_win );
};
#endif // ** _SPRITE_HPP
Index: netpanzer/src/NetPanzer/Classes/SpriteSorter.cpp
diff -u netpanzer/src/NetPanzer/Classes/SpriteSorter.cpp:1.4
netpanzer/src/NetPanzer/Classes/SpriteSorter.cpp:1.5
--- netpanzer/src/NetPanzer/Classes/SpriteSorter.cpp:1.4 Sun Sep 7
16:49:03 2003
+++ netpanzer/src/NetPanzer/Classes/SpriteSorter.cpp Wed Sep 10 08:32:53 2003
@@ -114,7 +114,7 @@
}
-void SpriteSorter::reset( Recti &world_win )
+void SpriteSorter::reset( iRect &world_win )
{
world_window = world_win;
reset();
Index: netpanzer/src/NetPanzer/Classes/SpriteSorter.hpp
diff -u netpanzer/src/NetPanzer/Classes/SpriteSorter.hpp:1.3
netpanzer/src/NetPanzer/Classes/SpriteSorter.hpp:1.4
--- netpanzer/src/NetPanzer/Classes/SpriteSorter.hpp:1.3 Wed Sep 10
08:03:17 2003
+++ netpanzer/src/NetPanzer/Classes/SpriteSorter.hpp Wed Sep 10 08:32:53 2003
@@ -20,12 +20,11 @@
#include "Sprite.hpp"
#include "PArrayGrowable.hpp"
-#include "Point.hpp"
class SpriteSorter
{
protected:
- Recti world_window;
+ iRect world_window;
PArrayGrowable sprite_lists[ _MAX_HEIGHT_LEVELS ];
unsigned long list_counts[ _MAX_HEIGHT_LEVELS ];
@@ -42,14 +41,14 @@
void reset( void );
- void reset( Recti &world_win );
+ void reset( iRect &world_win );
- inline void setWorldWindow( Recti &world_win )
+ inline void setWorldWindow( iRect &world_win )
{
world_window = world_win;
}
- inline Recti getWorldWindow( void )
+ inline iRect getWorldWindow( void )
{
return( world_window );
}
Index: netpanzer/src/NetPanzer/Classes/SurfaceDesc.hpp
diff -u netpanzer/src/NetPanzer/Classes/SurfaceDesc.hpp:1.1
netpanzer/src/NetPanzer/Classes/SurfaceDesc.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/SurfaceDesc.hpp:1.1 Sun Dec 1 12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/SurfaceDesc.hpp Wed Sep 10 08:32:53 2003
@@ -19,7 +19,6 @@
#define _SURFACEDESC_HPP
#include "PObject.hpp"
-#include "Point.hpp"
enum { _surfdesc_system_mem = 0x01, _surfdesc_hardware_mem = 0x02 };
enum { _surfdesc_double_buffer = 0x01, _surfdesc_page_flipped = 0x02,
@@ -28,9 +27,9 @@
class SurfaceDesc : virtual PObject
{
public:
- PointXYi size;
- Recti viewable;
- PointXYi clipOffset;
+ iXY size;
+ iRect viewable;
+ iXY clipOffset;
unsigned int bpp;
unsigned long offset_to_view;
Index: netpanzer/src/NetPanzer/Classes/UnitBlackBoard.cpp
diff -u netpanzer/src/NetPanzer/Classes/UnitBlackBoard.cpp:1.3
netpanzer/src/NetPanzer/Classes/UnitBlackBoard.cpp:1.4
--- netpanzer/src/NetPanzer/Classes/UnitBlackBoard.cpp:1.3 Fri Sep 5
22:01:18 2003
+++ netpanzer/src/NetPanzer/Classes/UnitBlackBoard.cpp Wed Sep 10 08:32:53 2003
@@ -48,7 +48,7 @@
for ( k = 0; k < x_limit; k++ )
{
if ( unit_loc_map.getBit( k, i ) == true )
- MapInterface::markLocHack( PointXYi( k, i ) );
+ MapInterface::markLocHack( iXY( k, i ) );
}
}
Index: netpanzer/src/NetPanzer/Classes/UnitBlackBoard.hpp
diff -u netpanzer/src/NetPanzer/Classes/UnitBlackBoard.hpp:1.3
netpanzer/src/NetPanzer/Classes/UnitBlackBoard.hpp:1.4
--- netpanzer/src/NetPanzer/Classes/UnitBlackBoard.hpp:1.3 Wed Sep 10
08:03:17 2003
+++ netpanzer/src/NetPanzer/Classes/UnitBlackBoard.hpp Wed Sep 10 08:32:53 2003
@@ -19,19 +19,19 @@
#define _UNITBLACKBOARD_HPP
#include "BitArray.hpp"
-#include "Point.hpp"
+#include "iXY.hpp"
class UnitBlackBoard
{
protected:
static BitArray unit_loc_map;
- static inline void markUnitLoc( PointXYi &unit_map_loc )
+ static inline void markUnitLoc( iXY &unit_map_loc )
{
unit_loc_map.setBit( unit_map_loc.x, unit_map_loc.y );
}
- static inline void unmarkUnitLoc( PointXYi &unit_map_loc )
+ static inline void unmarkUnitLoc( iXY &unit_map_loc )
{
unit_loc_map.clearBit( unit_map_loc.x, unit_map_loc.y );
}
@@ -43,7 +43,7 @@
static void updateUnitLocs( void );
- static inline bool unitOccupiesLoc( PointXYi &unit_map_loc )
+ static inline bool unitOccupiesLoc( iXY &unit_map_loc )
{
return( unit_loc_map.getBit( unit_map_loc.x, unit_map_loc.y ) );
}
Index: netpanzer/src/NetPanzer/Classes/UnitBucketArray.cpp
diff -u netpanzer/src/NetPanzer/Classes/UnitBucketArray.cpp:1.4
netpanzer/src/NetPanzer/Classes/UnitBucketArray.cpp:1.5
--- netpanzer/src/NetPanzer/Classes/UnitBucketArray.cpp:1.4 Wed Sep 10
07:26:08 2003
+++ netpanzer/src/NetPanzer/Classes/UnitBucketArray.cpp Wed Sep 10 08:32:53 2003
@@ -32,12 +32,12 @@
}
-void UnitBucketArray::initialize( PointXYi map_size, PointXYi tile_size )
+void UnitBucketArray::initialize( iXY map_size, iXY tile_size )
{
initialize( map_size, tile_size, 10, 10 );
}
-void UnitBucketArray::initialize( PointXYi map_size, PointXYi tile_size, long
x_super_sample, long y_super_sample )
+void UnitBucketArray::initialize( iXY map_size, iXY tile_size, long
x_super_sample, long y_super_sample )
{
unsigned long rows, columns;
@@ -67,7 +67,7 @@
UnitBucketArrayTemplate::initialize( rows, columns );
}
-Recti UnitBucketArray::worldRectToBucketRectClip( Recti &world_rect )
+iRect UnitBucketArray::worldRectToBucketRectClip( iRect &world_rect )
{
long bucket_max_x;
long bucket_max_y;
@@ -80,7 +80,7 @@
if ( bucket_max_y >= (long) row_size )
{ bucket_max_y = row_size - 1; }
- return( Recti( world_rect.min.x / pixel_x_sample_factor,
+ return( iRect( world_rect.min.x / pixel_x_sample_factor,
world_rect.min.y / pixel_y_sample_factor,
bucket_max_x,
bucket_max_y
@@ -89,7 +89,7 @@
}
-UnitBucketList * UnitBucketArray::getBucketAssocWorldLoc( PointXYi world_loc )
+UnitBucketList * UnitBucketArray::getBucketAssocWorldLoc( iXY world_loc )
{
long bucket_index;
@@ -101,7 +101,7 @@
return( &(array[ bucket_index ]) );
}
-UnitBucketList * UnitBucketArray::getBucketAssocMapLoc( PointXYi map_loc )
+UnitBucketList * UnitBucketArray::getBucketAssocMapLoc( iXY map_loc )
{
long bucket_index;
@@ -218,7 +218,7 @@
return( 0 );
}
-UnitBase * UnitBucketArray::getUnitAtWorldLoc( UnitID unit_id, PointXYi
world_loc )
+UnitBase * UnitBucketArray::getUnitAtWorldLoc( UnitID unit_id, iXY world_loc )
{
long bucket_index;
unsigned long unique_index;
@@ -245,7 +245,7 @@
return( 0 );
}
-UnitBase * UnitBucketArray::getUnitAtMapLoc( UnitID unit_id, PointXYi map_loc )
+UnitBase * UnitBucketArray::getUnitAtMapLoc( UnitID unit_id, iXY map_loc )
{
long bucket_index;
unsigned long unique_index;
@@ -313,7 +313,7 @@
return( true );
}
-bool UnitBucketArray::deleteUnitBucketPointer( UnitID unit_id, PointXYi
world_loc )
+bool UnitBucketArray::deleteUnitBucketPointer( UnitID unit_id, iXY world_loc )
{
long bucket_index;
unsigned long unique_index;
Index: netpanzer/src/NetPanzer/Classes/UnitBucketArray.hpp
diff -u netpanzer/src/NetPanzer/Classes/UnitBucketArray.hpp:1.2
netpanzer/src/NetPanzer/Classes/UnitBucketArray.hpp:1.3
--- netpanzer/src/NetPanzer/Classes/UnitBucketArray.hpp:1.2 Mon Sep 1
16:24:20 2003
+++ netpanzer/src/NetPanzer/Classes/UnitBucketArray.hpp Wed Sep 10 08:32:53 2003
@@ -22,7 +22,6 @@
#include "UnitBase.hpp"
#include "UnitID.hpp"
-#include "Point.hpp"
class UnitBucketPointer
{
@@ -69,18 +68,18 @@
long map_y_sample_factor;
long pixel_x_sample_factor;
long pixel_y_sample_factor;
- PointXYi map_size;
+ iXY map_size;
long map_size_x;
long map_size_y;
- PointXYi tile_size;
+ iXY tile_size;
public:
UnitBucketArray( );
~UnitBucketArray( );
- void initialize( PointXYi map_size, PointXYi tile_size);
- void initialize( PointXYi map_size, PointXYi tile_size, long x_super_sample,
long y_super_sample );
+ void initialize( iXY map_size, iXY tile_size);
+ void initialize( iXY map_size, iXY tile_size, long x_super_sample, long
y_super_sample );
inline long getXSample( void )
{ return( map_x_sample_factor ); }
@@ -88,10 +87,10 @@
inline long getYSample( void )
{ return( map_y_sample_factor ); }
- inline PointXYi getSample( void )
- { return( PointXYi( map_x_sample_factor, map_y_sample_factor) ); }
+ inline iXY getSample( void )
+ { return( iXY( map_x_sample_factor, map_y_sample_factor) ); }
- inline unsigned long mapLocToBucketIndex( PointXYi map_loc )
+ inline unsigned long mapLocToBucketIndex( iXY map_loc )
{
long bucket_index;
@@ -101,7 +100,7 @@
return( bucket_index );
}
- inline unsigned long worldLocToBucketIndex( PointXYi world_loc )
+ inline unsigned long worldLocToBucketIndex( iXY world_loc )
{
long bucket_index;
@@ -111,39 +110,39 @@
return( bucket_index );
}
- inline PointXYi mapLocToBucketLoc( PointXYi map_loc )
+ inline iXY mapLocToBucketLoc( iXY map_loc )
{
- return( PointXYi( (map_loc.x / map_x_sample_factor), (map_loc.y /
map_y_sample_factor) ) );
+ return( iXY( (map_loc.x / map_x_sample_factor), (map_loc.y /
map_y_sample_factor) ) );
}
- inline PointXYi worldLocToBucketLoc( PointXYi world_loc )
+ inline iXY worldLocToBucketLoc( iXY world_loc )
{
- return( PointXYi( (world_loc.x / pixel_x_sample_factor) , (world_loc.y /
pixel_y_sample_factor) ) );
+ return( iXY( (world_loc.x / pixel_x_sample_factor) , (world_loc.y /
pixel_y_sample_factor) ) );
}
- inline Recti worldRectToBucketRect( Recti &world_rect )
+ inline iRect worldRectToBucketRect( iRect &world_rect )
{
- return( Recti( world_rect.min.x / pixel_x_sample_factor,
+ return( iRect( world_rect.min.x / pixel_x_sample_factor,
world_rect.min.y / pixel_y_sample_factor,
world_rect.max.x / pixel_x_sample_factor,
world_rect.max.y / pixel_y_sample_factor )
);
}
- Recti worldRectToBucketRectClip( Recti &world_rect );
+ iRect worldRectToBucketRectClip( iRect &world_rect );
- inline Recti mapRectToBucketRect( Recti &map_rect )
+ inline iRect mapRectToBucketRect( iRect &map_rect )
{
- return( Recti( map_rect.min.x / map_x_sample_factor,
+ return( iRect( map_rect.min.x / map_x_sample_factor,
map_rect.min.y / map_y_sample_factor,
map_rect.max.x / map_x_sample_factor,
map_rect.max.y / map_y_sample_factor )
);
}
- UnitBucketList * getBucketAssocWorldLoc( PointXYi world_loc );
- UnitBucketList * getBucketAssocMapLoc( PointXYi map_loc );
+ UnitBucketList * getBucketAssocWorldLoc( iXY world_loc );
+ UnitBucketList * getBucketAssocMapLoc( iXY map_loc );
void addUnit( UnitBase *unit );
void addUnit( UnitBucketPointer *unit_bucket_ptr );
@@ -152,12 +151,12 @@
UnitBase * getUnit( UnitID unit_id );
UnitBase * getUnit( UnitID unit_id, unsigned long bucket_index );
- UnitBase * getUnitAtWorldLoc( UnitID unit_id, PointXYi world_loc );
- UnitBase * getUnitAtMapLoc( UnitID unit_id, PointXYi map_loc );
+ UnitBase * getUnitAtWorldLoc( UnitID unit_id, iXY world_loc );
+ UnitBase * getUnitAtMapLoc( UnitID unit_id, iXY map_loc );
bool moveUnit( UnitID unit_id, unsigned long from_bucket_index, unsigned
long to_bucket_index );
- bool deleteUnitBucketPointer( UnitID unit_id, PointXYi world_loc );
+ bool deleteUnitBucketPointer( UnitID unit_id, iXY world_loc );
};
Index: netpanzer/src/NetPanzer/Classes/UnitMessageTypes.hpp
diff -u netpanzer/src/NetPanzer/Classes/UnitMessageTypes.hpp:1.2
netpanzer/src/NetPanzer/Classes/UnitMessageTypes.hpp:1.3
--- netpanzer/src/NetPanzer/Classes/UnitMessageTypes.hpp:1.2 Mon Sep 1
16:24:20 2003
+++ netpanzer/src/NetPanzer/Classes/UnitMessageTypes.hpp Wed Sep 10
08:32:53 2003
@@ -20,7 +20,6 @@
#include "UnitMessage.hpp"
#include "UnitID.hpp"
-#include "Point.hpp"
enum { _umesg_ai_command,
_umesg_weapon_hit,
@@ -38,10 +37,10 @@
{
public:
unsigned char command;
- PointXYi goal_loc;
+ iXY goal_loc;
UnitID target_id;
unsigned char manual_move_orientation;
- PointXYi target_loc;
+ iXY target_loc;
UMesgAICommand() {}
@@ -51,7 +50,7 @@
}
- inline void setMoveToLoc( PointXYi &goal )
+ inline void setMoveToLoc( iXY &goal )
{
message_id = _umesg_ai_command;
command = _command_move_to_loc;
@@ -78,7 +77,7 @@
command = _command_stop_manual_move;
}
- inline void setManualFire( PointXYi &target )
+ inline void setManualFire( iXY &target )
{
message_id = _umesg_ai_command;
command = _command_manual_fire;
@@ -91,7 +90,7 @@
{
public:
UnitID owner_id;
- PointXYi hit_location;
+ iXY hit_location;
unsigned short damage_factor;
};
Index: netpanzer/src/NetPanzer/Classes/UnitPowerUp.cpp
diff -u netpanzer/src/NetPanzer/Classes/UnitPowerUp.cpp:1.4
netpanzer/src/NetPanzer/Classes/UnitPowerUp.cpp:1.5
--- netpanzer/src/NetPanzer/Classes/UnitPowerUp.cpp:1.4 Sat Sep 6 06:34:28 2003
+++ netpanzer/src/NetPanzer/Classes/UnitPowerUp.cpp Wed Sep 10 08:32:53 2003
@@ -50,15 +50,15 @@
SpritePacked UNIT_POWERUP_ANIM;
SpritePacked UNIT_POWERUP_ANIM_SHADOW;
-UnitPowerUp::UnitPowerUp(PointXYi map_loc, int type)
+UnitPowerUp::UnitPowerUp(iXY map_loc, int type)
: PowerUp( map_loc, type )
{
unit_powerup_type = rand() % _unit_powerup_enum_count;
unit_powerup_animation.setData( UNIT_POWERUP_ANIM );
- unit_powerup_animation.setAttrib( powerup_state.world_loc, PointXYi(0,0), 5
);
+ unit_powerup_animation.setAttrib( powerup_state.world_loc, iXY(0,0), 5 );
unit_powerup_animation_shadow.setData( UNIT_POWERUP_ANIM_SHADOW );
- unit_powerup_animation_shadow.setAttrib( powerup_state.world_loc,
PointXYi(0,0), 4 );
+ unit_powerup_animation_shadow.setAttrib( powerup_state.world_loc, iXY(0,0),
4 );
unit_powerup_animation_shadow.setDrawModeBlend(&Palette::colorTableDarkenALot);
}
Index: netpanzer/src/NetPanzer/Classes/UnitPowerUp.hpp
diff -u netpanzer/src/NetPanzer/Classes/UnitPowerUp.hpp:1.2
netpanzer/src/NetPanzer/Classes/UnitPowerUp.hpp:1.3
--- netpanzer/src/NetPanzer/Classes/UnitPowerUp.hpp:1.2 Mon Sep 1 16:24:20 2003
+++ netpanzer/src/NetPanzer/Classes/UnitPowerUp.hpp Wed Sep 10 08:32:53 2003
@@ -47,7 +47,7 @@
public:
- UnitPowerUp(PointXYi map_loc, int type);
+ UnitPowerUp(iXY map_loc, int type);
virtual ~UnitPowerUp()
{ }
Index: netpanzer/src/NetPanzer/Classes/UnitState.cpp
diff -u netpanzer/src/NetPanzer/Classes/UnitState.cpp:1.3
netpanzer/src/NetPanzer/Classes/UnitState.cpp:1.4
--- netpanzer/src/NetPanzer/Classes/UnitState.cpp:1.3 Fri Sep 5 22:01:18 2003
+++ netpanzer/src/NetPanzer/Classes/UnitState.cpp Wed Sep 10 08:32:53 2003
@@ -25,7 +25,7 @@
// ** NOTE: TEMPORARY UNTIL UNIT PROPERITIES CODED
- bbox.setBounds( PointXYi( -25, -15 ), PointXYi( 25, 35 ) );
+ bbox.setBounds( iXY( -25, -15 ), iXY( 25, 35 ) );
select = false;
orientation = 0;
Index: netpanzer/src/NetPanzer/Classes/UnitState.hpp
diff -u netpanzer/src/NetPanzer/Classes/UnitState.hpp:1.4
netpanzer/src/NetPanzer/Classes/UnitState.hpp:1.5
--- netpanzer/src/NetPanzer/Classes/UnitState.hpp:1.4 Wed Sep 10 08:03:17 2003
+++ netpanzer/src/NetPanzer/Classes/UnitState.hpp Wed Sep 10 08:32:53 2003
@@ -20,7 +20,6 @@
#include <string.h>
#include "BoundBox.hpp"
-#include "Point.hpp"
#include "Angle.hpp"
#include "UnitLifecycles.hpp"
@@ -38,7 +37,7 @@
unsigned char unit_type;
bool select;
- PointXYi location;
+ iXY location;
BoundBox bbox;
AngleInt body_angle;
@@ -63,7 +62,7 @@
UnitState( );
- inline bool bounds( PointXYi &loc )
+ inline bool bounds( iXY &loc )
{
return( bbox.bounds( location, loc ) );
}
Index: netpanzer/src/NetPanzer/Classes/Units/Abrams.cpp
diff -u netpanzer/src/NetPanzer/Classes/Units/Abrams.cpp:1.3
netpanzer/src/NetPanzer/Classes/Units/Abrams.cpp:1.4
--- netpanzer/src/NetPanzer/Classes/Units/Abrams.cpp:1.3 Fri Sep 5
22:01:18 2003
+++ netpanzer/src/NetPanzer/Classes/Units/Abrams.cpp Wed Sep 10 08:32:54 2003
@@ -44,7 +44,7 @@
}
-Abrams::Abrams( PointXYi initial_loc, unsigned char color, unsigned char flag )
+Abrams::Abrams( iXY initial_loc, unsigned char color, unsigned char flag )
: Vehicle( initial_loc )
{
setUnitProperties();
@@ -64,19 +64,19 @@
turret_anim_shadow.setData( gAbramsTurretShadow );
- body_anim.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer );
- turret_anim.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer );
- body_anim_shadow.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer);
- turret_anim_shadow.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer);
+ body_anim.setAttrib( iXY(0,0), iXY(0,0), unitLayer );
+ turret_anim.setAttrib( iXY(0,0), iXY(0,0), unitLayer );
+ body_anim_shadow.setAttrib( iXY(0,0), iXY(0,0), unitLayer);
+ turret_anim_shadow.setAttrib( iXY(0,0), iXY(0,0), unitLayer);
select_info_box.setBoxAttributes( BoundBox( -30, -30, 30, 30), Color::blue );
select_info_box.setBoxState( false );
select_info_box.setFlag( flag );
- body_anim_shadow.attachSprite( &body_anim, PointXYi(0,0) );
- body_anim_shadow.attachSprite( &turret_anim_shadow, PointXYi(0,0) );
- body_anim_shadow.attachSprite( &turret_anim, PointXYi(0,0) );
- body_anim_shadow.attachSprite( &select_info_box, PointXYi(0,0) );
+ body_anim_shadow.attachSprite( &body_anim, iXY(0,0) );
+ body_anim_shadow.attachSprite( &turret_anim_shadow, iXY(0,0) );
+ body_anim_shadow.attachSprite( &turret_anim, iXY(0,0) );
+ body_anim_shadow.attachSprite( &select_info_box, iXY(0,0) );
//FLAGS_DBASE.get_sprite_index( flag, select_info_box.unit_flag );
//FLAGS_DBASE.get_sprite_name( "allie", select_info_box.allie_flag );
@@ -84,7 +84,7 @@
}
-void Abrams::fireWeapon( PointXYi &target_loc )
+void Abrams::fireWeapon( iXY &target_loc )
{
reload_counter = 0;
ProjectileInterface::newProjectile( 3, unit_state.unit_type, unit_id,
unit_state.damage_factor,
Index: netpanzer/src/NetPanzer/Classes/Units/Abrams.hpp
diff -u netpanzer/src/NetPanzer/Classes/Units/Abrams.hpp:1.1
netpanzer/src/NetPanzer/Classes/Units/Abrams.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/Units/Abrams.hpp:1.1 Sun Dec 1
12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/Units/Abrams.hpp Wed Sep 10 08:32:54 2003
@@ -24,10 +24,10 @@
{
protected:
void setUnitProperties( void );
- virtual void fireWeapon( PointXYi &target_loc );
+ virtual void fireWeapon( iXY &target_loc );
public:
- Abrams( PointXYi initial_loc, unsigned char color, unsigned char flag );
+ Abrams( iXY initial_loc, unsigned char color, unsigned char flag );
};
Index: netpanzer/src/NetPanzer/Classes/Units/Archer.cpp
diff -u netpanzer/src/NetPanzer/Classes/Units/Archer.cpp:1.3
netpanzer/src/NetPanzer/Classes/Units/Archer.cpp:1.4
--- netpanzer/src/NetPanzer/Classes/Units/Archer.cpp:1.3 Fri Sep 5
22:01:18 2003
+++ netpanzer/src/NetPanzer/Classes/Units/Archer.cpp Wed Sep 10 08:32:54 2003
@@ -43,7 +43,7 @@
select_info_box.setHitBarAttributes( profile->hit_points, Color::yellow );
}
-Archer::Archer( PointXYi initial_loc, unsigned char color, unsigned char flag )
+Archer::Archer( iXY initial_loc, unsigned char color, unsigned char flag )
: Vehicle( initial_loc )
{
setUnitProperties();
@@ -59,29 +59,29 @@
turret_anim.setData( gArcherTurretDarkBlue );
}
- body_anim.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer );
- turret_anim.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer );
+ body_anim.setAttrib( iXY(0,0), iXY(0,0), unitLayer );
+ turret_anim.setAttrib( iXY(0,0), iXY(0,0), unitLayer );
body_anim_shadow.setData( gArcherBodyShadow );
turret_anim_shadow.setData( gArcherTurretShadow );
- body_anim_shadow.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer );
- turret_anim_shadow.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer );
+ body_anim_shadow.setAttrib( iXY(0,0), iXY(0,0), unitLayer );
+ turret_anim_shadow.setAttrib( iXY(0,0), iXY(0,0), unitLayer );
select_info_box.setBoxAttributes( BoundBox( -20, -20, 20, 20), Color::blue );
select_info_box.setBoxState( false );
select_info_box.setFlag( flag );
- body_anim_shadow.attachSprite( &body_anim, PointXYi(0,0) );
- body_anim_shadow.attachSprite( &turret_anim_shadow, PointXYi(0,0) );
- body_anim_shadow.attachSprite( &turret_anim, PointXYi(0,0) );
- body_anim_shadow.attachSprite( &select_info_box, PointXYi(0,0) );
+ body_anim_shadow.attachSprite( &body_anim, iXY(0,0) );
+ body_anim_shadow.attachSprite( &turret_anim_shadow, iXY(0,0) );
+ body_anim_shadow.attachSprite( &turret_anim, iXY(0,0) );
+ body_anim_shadow.attachSprite( &select_info_box, iXY(0,0) );
//FLAGS_DBASE.get_sprite_index( flag, select_info_box.unit_flag );
//FLAGS_DBASE.get_sprite_name( "allie", select_info_box.allie_flag );
}
-void Archer::fireWeapon( PointXYi &target_loc )
+void Archer::fireWeapon( iXY &target_loc )
{
reload_counter = 0;
ProjectileInterface::newProjectile( 4, unit_state.unit_type, unit_id,
unit_state.damage_factor,
Index: netpanzer/src/NetPanzer/Classes/Units/Archer.hpp
diff -u netpanzer/src/NetPanzer/Classes/Units/Archer.hpp:1.1
netpanzer/src/NetPanzer/Classes/Units/Archer.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/Units/Archer.hpp:1.1 Sun Dec 1
12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/Units/Archer.hpp Wed Sep 10 08:32:54 2003
@@ -24,10 +24,10 @@
{
protected:
void setUnitProperties( void );
- virtual void fireWeapon( PointXYi &target_loc );
+ virtual void fireWeapon( iXY &target_loc );
public:
- Archer( PointXYi initial_loc, unsigned char color, unsigned char flag );
+ Archer( iXY initial_loc, unsigned char color, unsigned char flag );
};
Index: netpanzer/src/NetPanzer/Classes/Units/Hammerhead.cpp
diff -u netpanzer/src/NetPanzer/Classes/Units/Hammerhead.cpp:1.3
netpanzer/src/NetPanzer/Classes/Units/Hammerhead.cpp:1.4
--- netpanzer/src/NetPanzer/Classes/Units/Hammerhead.cpp:1.3 Fri Sep 5
22:01:18 2003
+++ netpanzer/src/NetPanzer/Classes/Units/Hammerhead.cpp Wed Sep 10
08:32:54 2003
@@ -43,7 +43,7 @@
select_info_box.setHitBarAttributes( profile->hit_points, Color::yellow );
}
-Hammerhead::Hammerhead( PointXYi initial_loc, unsigned char color, unsigned
char flag )
+Hammerhead::Hammerhead( iXY initial_loc, unsigned char color, unsigned char
flag )
: Vehicle( initial_loc )
{
setUnitProperties();
@@ -59,29 +59,29 @@
turret_anim.setData( gHammerheadTurretDarkBlue );
}
- body_anim.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer );
- turret_anim.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer );
+ body_anim.setAttrib( iXY(0,0), iXY(0,0), unitLayer );
+ turret_anim.setAttrib( iXY(0,0), iXY(0,0), unitLayer );
body_anim_shadow.setData( gHammerheadBodyShadow );
turret_anim_shadow.setData( gHammerheadTurretShadow );
- body_anim_shadow.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer );
- turret_anim_shadow.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer );
+ body_anim_shadow.setAttrib( iXY(0,0), iXY(0,0), unitLayer );
+ turret_anim_shadow.setAttrib( iXY(0,0), iXY(0,0), unitLayer );
select_info_box.setBoxAttributes( BoundBox( -20, -20, 20, 20), Color::blue );
select_info_box.setBoxState( false );
select_info_box.setFlag( flag );
- body_anim_shadow.attachSprite( &body_anim, PointXYi(0,0) );
- body_anim_shadow.attachSprite( &turret_anim_shadow, PointXYi(0,0) );
- body_anim_shadow.attachSprite( &turret_anim, PointXYi(0,0) );
- body_anim_shadow.attachSprite( &select_info_box, PointXYi(0,0) );
+ body_anim_shadow.attachSprite( &body_anim, iXY(0,0) );
+ body_anim_shadow.attachSprite( &turret_anim_shadow, iXY(0,0) );
+ body_anim_shadow.attachSprite( &turret_anim, iXY(0,0) );
+ body_anim_shadow.attachSprite( &select_info_box, iXY(0,0) );
//FLAGS_DBASE.get_sprite_index( flag, select_info_box.unit_flag );
//FLAGS_DBASE.get_sprite_name( "allie", select_info_box.allie_flag );
}
-void Hammerhead::fireWeapon( PointXYi &target_loc )
+void Hammerhead::fireWeapon( iXY &target_loc )
{
reload_counter = 0;
ProjectileInterface::newProjectile( 1, unit_state.unit_type, unit_id,
unit_state.damage_factor,
Index: netpanzer/src/NetPanzer/Classes/Units/Hammerhead.hpp
diff -u netpanzer/src/NetPanzer/Classes/Units/Hammerhead.hpp:1.1
netpanzer/src/NetPanzer/Classes/Units/Hammerhead.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/Units/Hammerhead.hpp:1.1 Sun Dec 1
12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/Units/Hammerhead.hpp Wed Sep 10
08:32:54 2003
@@ -24,10 +24,10 @@
{
protected:
void setUnitProperties( void );
- virtual void fireWeapon( PointXYi &target_loc );
+ virtual void fireWeapon( iXY &target_loc );
public:
- Hammerhead( PointXYi initial_loc, unsigned char color, unsigned char flag );
+ Hammerhead( iXY initial_loc, unsigned char color, unsigned char flag );
};
Index: netpanzer/src/NetPanzer/Classes/Units/Humvee.cpp
diff -u netpanzer/src/NetPanzer/Classes/Units/Humvee.cpp:1.3
netpanzer/src/NetPanzer/Classes/Units/Humvee.cpp:1.4
--- netpanzer/src/NetPanzer/Classes/Units/Humvee.cpp:1.3 Fri Sep 5
22:01:18 2003
+++ netpanzer/src/NetPanzer/Classes/Units/Humvee.cpp Wed Sep 10 08:32:54 2003
@@ -72,7 +72,7 @@
}
*/
-Humvee::Humvee( PointXYi initial_loc, unsigned char color, unsigned char flag )
+Humvee::Humvee( iXY initial_loc, unsigned char color, unsigned char flag )
: Vehicle( initial_loc )
{
setUnitProperties();
@@ -92,26 +92,26 @@
turret_anim_shadow.setData( gSpahPanzerTurretShadow );
- body_anim.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer );
- turret_anim.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer );
- body_anim_shadow.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer);
- turret_anim_shadow.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer);
+ body_anim.setAttrib( iXY(0,0), iXY(0,0), unitLayer );
+ turret_anim.setAttrib( iXY(0,0), iXY(0,0), unitLayer );
+ body_anim_shadow.setAttrib( iXY(0,0), iXY(0,0), unitLayer);
+ turret_anim_shadow.setAttrib( iXY(0,0), iXY(0,0), unitLayer);
select_info_box.setBoxAttributes( BoundBox( -20, -20, 20, 20), Color::blue );
select_info_box.setBoxState( false );
select_info_box.setFlag( flag );
- body_anim_shadow.attachSprite( &body_anim, PointXYi(0,0) );
- body_anim_shadow.attachSprite( &turret_anim_shadow, PointXYi(0,0) );
- body_anim_shadow.attachSprite( &turret_anim, PointXYi(0,0) );
- body_anim_shadow.attachSprite( &select_info_box, PointXYi(0,0) );
+ body_anim_shadow.attachSprite( &body_anim, iXY(0,0) );
+ body_anim_shadow.attachSprite( &turret_anim_shadow, iXY(0,0) );
+ body_anim_shadow.attachSprite( &turret_anim, iXY(0,0) );
+ body_anim_shadow.attachSprite( &select_info_box, iXY(0,0) );
//FLAGS_DBASE.get_sprite_index( flag, select_info_box.unit_flag );
//FLAGS_DBASE.get_sprite_name( "allie", select_info_box.allie_flag );
}
-void Humvee::fireWeapon( PointXYi &target_loc )
+void Humvee::fireWeapon( iXY &target_loc )
{
reload_counter = 0;
ProjectileInterface::newProjectile( 3, unit_state.unit_type, unit_id,
unit_state.damage_factor,
Index: netpanzer/src/NetPanzer/Classes/Units/Humvee.hpp
diff -u netpanzer/src/NetPanzer/Classes/Units/Humvee.hpp:1.1
netpanzer/src/NetPanzer/Classes/Units/Humvee.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/Units/Humvee.hpp:1.1 Sun Dec 1
12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/Units/Humvee.hpp Wed Sep 10 08:32:54 2003
@@ -24,11 +24,11 @@
{
protected:
void setUnitProperties( void );
- virtual void fireWeapon( PointXYi &target_loc );
+ virtual void fireWeapon( iXY &target_loc );
public:
- Humvee( PointXYi initial_loc, unsigned char color, unsigned char flag );
+ Humvee( iXY initial_loc, unsigned char color, unsigned char flag );
//virtual void offloadGraphics( SpriteSorter &sorter );
Index: netpanzer/src/NetPanzer/Classes/Units/Leopard.cpp
diff -u netpanzer/src/NetPanzer/Classes/Units/Leopard.cpp:1.3
netpanzer/src/NetPanzer/Classes/Units/Leopard.cpp:1.4
--- netpanzer/src/NetPanzer/Classes/Units/Leopard.cpp:1.3 Fri Sep 5
22:01:18 2003
+++ netpanzer/src/NetPanzer/Classes/Units/Leopard.cpp Wed Sep 10 08:32:54 2003
@@ -44,7 +44,7 @@
}
-Leopard::Leopard( PointXYi initial_loc, unsigned char color, unsigned char
flag )
+Leopard::Leopard( iXY initial_loc, unsigned char color, unsigned char flag )
: Vehicle( initial_loc )
{
setUnitProperties();
@@ -61,29 +61,29 @@
}
- body_anim.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer );
- turret_anim.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer );
+ body_anim.setAttrib( iXY(0,0), iXY(0,0), unitLayer );
+ turret_anim.setAttrib( iXY(0,0), iXY(0,0), unitLayer );
body_anim_shadow.setData( gLeopardBodyShadow );
turret_anim_shadow.setData( gLeopardTurretShadow );
- body_anim_shadow.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer );
- turret_anim_shadow.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer );
+ body_anim_shadow.setAttrib( iXY(0,0), iXY(0,0), unitLayer );
+ turret_anim_shadow.setAttrib( iXY(0,0), iXY(0,0), unitLayer );
select_info_box.setBoxAttributes( BoundBox( -25, -25, 25, 25), Color::blue );
select_info_box.setBoxState( false );
select_info_box.setFlag( flag );
- body_anim_shadow.attachSprite( &body_anim, PointXYi(0,0) );
- body_anim_shadow.attachSprite( &turret_anim_shadow, PointXYi(0,0) );
- body_anim_shadow.attachSprite( &turret_anim, PointXYi(0,0) );
- body_anim_shadow.attachSprite( &select_info_box, PointXYi(0,0) );
+ body_anim_shadow.attachSprite( &body_anim, iXY(0,0) );
+ body_anim_shadow.attachSprite( &turret_anim_shadow, iXY(0,0) );
+ body_anim_shadow.attachSprite( &turret_anim, iXY(0,0) );
+ body_anim_shadow.attachSprite( &select_info_box, iXY(0,0) );
//FLAGS_DBASE.get_sprite_index( flag, select_info_box.unit_flag );
//FLAGS_DBASE.get_sprite_name( "allie", select_info_box.allie_flag );
}
-void Leopard::fireWeapon( PointXYi &target_loc )
+void Leopard::fireWeapon( iXY &target_loc )
{
reload_counter = 0;
ProjectileInterface::newProjectile( 3, unit_state.unit_type, unit_id,
unit_state.damage_factor,
Index: netpanzer/src/NetPanzer/Classes/Units/Leopard.hpp
diff -u netpanzer/src/NetPanzer/Classes/Units/Leopard.hpp:1.1
netpanzer/src/NetPanzer/Classes/Units/Leopard.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/Units/Leopard.hpp:1.1 Sun Dec 1
12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/Units/Leopard.hpp Wed Sep 10 08:32:54 2003
@@ -24,10 +24,10 @@
{
protected:
void setUnitProperties( void );
- virtual void fireWeapon( PointXYi &target_loc );
+ virtual void fireWeapon( iXY &target_loc );
public:
- Leopard( PointXYi initial_loc, unsigned char color, unsigned char flag );
+ Leopard( iXY initial_loc, unsigned char color, unsigned char flag );
};
Index: netpanzer/src/NetPanzer/Classes/Units/Lynx.cpp
diff -u netpanzer/src/NetPanzer/Classes/Units/Lynx.cpp:1.3
netpanzer/src/NetPanzer/Classes/Units/Lynx.cpp:1.4
--- netpanzer/src/NetPanzer/Classes/Units/Lynx.cpp:1.3 Fri Sep 5 22:01:18 2003
+++ netpanzer/src/NetPanzer/Classes/Units/Lynx.cpp Wed Sep 10 08:32:54 2003
@@ -44,7 +44,7 @@
}
-Lynx::Lynx( PointXYi initial_loc, unsigned char color, unsigned char flag )
+Lynx::Lynx( iXY initial_loc, unsigned char color, unsigned char flag )
: Vehicle( initial_loc )
{
setUnitProperties();
@@ -61,29 +61,29 @@
}
- body_anim.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer );
- turret_anim.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer );
+ body_anim.setAttrib( iXY(0,0), iXY(0,0), unitLayer );
+ turret_anim.setAttrib( iXY(0,0), iXY(0,0), unitLayer );
body_anim_shadow.setData( gLynxBodyShadow );
turret_anim_shadow.setData( gLynxTurretShadow );
- body_anim_shadow.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer );
- turret_anim_shadow.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer );
+ body_anim_shadow.setAttrib( iXY(0,0), iXY(0,0), unitLayer );
+ turret_anim_shadow.setAttrib( iXY(0,0), iXY(0,0), unitLayer );
select_info_box.setBoxAttributes( BoundBox( -30, -30, 30, 30), Color::blue );
select_info_box.setBoxState( false );
select_info_box.setFlag( flag );
- body_anim_shadow.attachSprite( &body_anim, PointXYi(0,0) );
- body_anim_shadow.attachSprite( &turret_anim_shadow, PointXYi(0,0) );
- body_anim_shadow.attachSprite( &turret_anim, PointXYi(0,0) );
- body_anim_shadow.attachSprite( &select_info_box, PointXYi(0,0) );
+ body_anim_shadow.attachSprite( &body_anim, iXY(0,0) );
+ body_anim_shadow.attachSprite( &turret_anim_shadow, iXY(0,0) );
+ body_anim_shadow.attachSprite( &turret_anim, iXY(0,0) );
+ body_anim_shadow.attachSprite( &select_info_box, iXY(0,0) );
//FLAGS_DBASE.get_sprite_index( flag, select_info_box.unit_flag );
//FLAGS_DBASE.get_sprite_name( "allie", select_info_box.allie_flag );
}
-void Lynx::fireWeapon( PointXYi &target_loc )
+void Lynx::fireWeapon( iXY &target_loc )
{
reload_counter = 0;
ProjectileInterface::newProjectile( 3, unit_state.unit_type, unit_id,
unit_state.damage_factor,
Index: netpanzer/src/NetPanzer/Classes/Units/Lynx.hpp
diff -u netpanzer/src/NetPanzer/Classes/Units/Lynx.hpp:1.1
netpanzer/src/NetPanzer/Classes/Units/Lynx.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/Units/Lynx.hpp:1.1 Sun Dec 1 12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/Units/Lynx.hpp Wed Sep 10 08:32:54 2003
@@ -24,10 +24,10 @@
{
protected:
void setUnitProperties( void );
- virtual void fireWeapon( PointXYi &target_loc );
+ virtual void fireWeapon( iXY &target_loc );
public:
- Lynx( PointXYi initial_loc, unsigned char color, unsigned char flag );
+ Lynx( iXY initial_loc, unsigned char color, unsigned char flag );
};
Index: netpanzer/src/NetPanzer/Classes/Units/M109.cpp
diff -u netpanzer/src/NetPanzer/Classes/Units/M109.cpp:1.3
netpanzer/src/NetPanzer/Classes/Units/M109.cpp:1.4
--- netpanzer/src/NetPanzer/Classes/Units/M109.cpp:1.3 Fri Sep 5 22:01:19 2003
+++ netpanzer/src/NetPanzer/Classes/Units/M109.cpp Wed Sep 10 08:32:54 2003
@@ -44,7 +44,7 @@
}
-M109::M109( PointXYi initial_loc, unsigned char color, unsigned char flag )
+M109::M109( iXY initial_loc, unsigned char color, unsigned char flag )
: Vehicle( initial_loc )
{
setUnitProperties();
@@ -63,26 +63,26 @@
body_anim_shadow.setData( gM109BodyShadow );
turret_anim_shadow.setData( gM109TurretShadow );
- body_anim.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer );
- turret_anim.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer );
- body_anim_shadow.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer);
- turret_anim_shadow.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer);
+ body_anim.setAttrib( iXY(0,0), iXY(0,0), unitLayer );
+ turret_anim.setAttrib( iXY(0,0), iXY(0,0), unitLayer );
+ body_anim_shadow.setAttrib( iXY(0,0), iXY(0,0), unitLayer);
+ turret_anim_shadow.setAttrib( iXY(0,0), iXY(0,0), unitLayer);
select_info_box.setBoxAttributes( BoundBox( -30, -30, 30, 30), Color::blue );
select_info_box.setBoxState( false );
select_info_box.setFlag( flag );
- body_anim_shadow.attachSprite( &body_anim, PointXYi(0,0) );
- body_anim_shadow.attachSprite( &turret_anim_shadow, PointXYi(0,0) );
- body_anim_shadow.attachSprite( &turret_anim, PointXYi(0,0) );
- body_anim_shadow.attachSprite( &select_info_box, PointXYi(0,0) );
+ body_anim_shadow.attachSprite( &body_anim, iXY(0,0) );
+ body_anim_shadow.attachSprite( &turret_anim_shadow, iXY(0,0) );
+ body_anim_shadow.attachSprite( &turret_anim, iXY(0,0) );
+ body_anim_shadow.attachSprite( &select_info_box, iXY(0,0) );
//FLAGS_DBASE.get_sprite_index( flag, select_info_box.unit_flag );
//FLAGS_DBASE.get_sprite_name( "allie", select_info_box.allie_flag );
}
-void M109::fireWeapon( PointXYi &target_loc )
+void M109::fireWeapon( iXY &target_loc )
{
reload_counter = 0;
ProjectileInterface::newProjectile( 3, unit_state.unit_type, unit_id,
unit_state.damage_factor,
Index: netpanzer/src/NetPanzer/Classes/Units/M109.hpp
diff -u netpanzer/src/NetPanzer/Classes/Units/M109.hpp:1.1
netpanzer/src/NetPanzer/Classes/Units/M109.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/Units/M109.hpp:1.1 Sun Dec 1 12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/Units/M109.hpp Wed Sep 10 08:32:54 2003
@@ -24,10 +24,10 @@
{
protected:
void setUnitProperties( void );
- virtual void fireWeapon( PointXYi &target_loc );
+ virtual void fireWeapon( iXY &target_loc );
public:
- M109( PointXYi initial_loc, unsigned char color, unsigned char flag );
+ M109( iXY initial_loc, unsigned char color, unsigned char flag );
};
Index: netpanzer/src/NetPanzer/Classes/Units/Scorpion.cpp
diff -u netpanzer/src/NetPanzer/Classes/Units/Scorpion.cpp:1.3
netpanzer/src/NetPanzer/Classes/Units/Scorpion.cpp:1.4
--- netpanzer/src/NetPanzer/Classes/Units/Scorpion.cpp:1.3 Fri Sep 5
22:01:19 2003
+++ netpanzer/src/NetPanzer/Classes/Units/Scorpion.cpp Wed Sep 10 08:32:54 2003
@@ -44,7 +44,7 @@
}
-Scorpion::Scorpion( PointXYi initial_loc, unsigned char color, unsigned char
flag )
+Scorpion::Scorpion( iXY initial_loc, unsigned char color, unsigned char flag )
: Vehicle( initial_loc )
{
setUnitProperties();
@@ -60,29 +60,29 @@
turret_anim.setData( gScorpionTurretDarkBlue );
}
- body_anim.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer );
- turret_anim.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer );
+ body_anim.setAttrib( iXY(0,0), iXY(0,0), unitLayer );
+ turret_anim.setAttrib( iXY(0,0), iXY(0,0), unitLayer );
body_anim_shadow.setData( gScorpionBodyShadow );
turret_anim_shadow.setData( gScorpionTurretShadow );
- body_anim_shadow.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer );
- turret_anim_shadow.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer );
+ body_anim_shadow.setAttrib( iXY(0,0), iXY(0,0), unitLayer );
+ turret_anim_shadow.setAttrib( iXY(0,0), iXY(0,0), unitLayer );
select_info_box.setBoxAttributes( BoundBox( -30, -30, 30, 30), Color::blue );
select_info_box.setBoxState( false );
select_info_box.setFlag( flag );
- body_anim_shadow.attachSprite( &body_anim, PointXYi(0,0) );
- body_anim_shadow.attachSprite( &turret_anim_shadow, PointXYi(0,0) );
- body_anim_shadow.attachSprite( &turret_anim, PointXYi(0,0) );
- body_anim_shadow.attachSprite( &select_info_box, PointXYi(0,0) );
+ body_anim_shadow.attachSprite( &body_anim, iXY(0,0) );
+ body_anim_shadow.attachSprite( &turret_anim_shadow, iXY(0,0) );
+ body_anim_shadow.attachSprite( &turret_anim, iXY(0,0) );
+ body_anim_shadow.attachSprite( &select_info_box, iXY(0,0) );
//FLAGS_DBASE.get_sprite_index( flag, select_info_box.unit_flag );
//FLAGS_DBASE.get_sprite_name( "allie", select_info_box.allie_flag );
}
-void Scorpion::fireWeapon( PointXYi &target_loc )
+void Scorpion::fireWeapon( iXY &target_loc )
{
reload_counter = 0;
ProjectileInterface::newProjectile( 3, unit_state.unit_type, unit_id,
unit_state.damage_factor,
Index: netpanzer/src/NetPanzer/Classes/Units/Scorpion.hpp
diff -u netpanzer/src/NetPanzer/Classes/Units/Scorpion.hpp:1.1
netpanzer/src/NetPanzer/Classes/Units/Scorpion.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/Units/Scorpion.hpp:1.1 Sun Dec 1
12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/Units/Scorpion.hpp Wed Sep 10 08:32:54 2003
@@ -24,10 +24,10 @@
{
protected:
void setUnitProperties( void );
- virtual void fireWeapon( PointXYi &target_loc );
+ virtual void fireWeapon( iXY &target_loc );
public:
- Scorpion( PointXYi initial_loc, unsigned char color, unsigned char flag );
+ Scorpion( iXY initial_loc, unsigned char color, unsigned char flag );
};
Index: netpanzer/src/NetPanzer/Classes/Units/SpahPanzer.cpp
diff -u netpanzer/src/NetPanzer/Classes/Units/SpahPanzer.cpp:1.4
netpanzer/src/NetPanzer/Classes/Units/SpahPanzer.cpp:1.5
--- netpanzer/src/NetPanzer/Classes/Units/SpahPanzer.cpp:1.4 Mon Sep 8
11:32:04 2003
+++ netpanzer/src/NetPanzer/Classes/Units/SpahPanzer.cpp Wed Sep 10
08:32:54 2003
@@ -45,7 +45,7 @@
}
-SpahPanzer::SpahPanzer( PointXYi initial_loc, unsigned char color, unsigned
char flag )
+SpahPanzer::SpahPanzer( iXY initial_loc, unsigned char color, unsigned char
flag )
: Vehicle( initial_loc )
{
setUnitProperties();
@@ -62,29 +62,29 @@
}
- body_anim.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer );
- turret_anim.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer );
+ body_anim.setAttrib( iXY(0,0), iXY(0,0), unitLayer );
+ turret_anim.setAttrib( iXY(0,0), iXY(0,0), unitLayer );
body_anim_shadow.setData( gBearBodyShadow );
turret_anim_shadow.setData( gBearTurretShadow );
- body_anim_shadow.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer );
- turret_anim_shadow.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer );
+ body_anim_shadow.setAttrib( iXY(0,0), iXY(0,0), unitLayer );
+ turret_anim_shadow.setAttrib( iXY(0,0), iXY(0,0), unitLayer );
select_info_box.setBoxAttributes( BoundBox( -30, -30, 30, 30), Color::blue );
select_info_box.setBoxState( false );
select_info_box.setFlag( flag );
- body_anim_shadow.attachSprite( &body_anim, PointXYi(0,0) );
- body_anim_shadow.attachSprite( &turret_anim_shadow, PointXYi(0,0) );
- body_anim_shadow.attachSprite( &turret_anim, PointXYi(0,0) );
- body_anim_shadow.attachSprite( &select_info_box, PointXYi(0,0) );
+ body_anim_shadow.attachSprite( &body_anim, iXY(0,0) );
+ body_anim_shadow.attachSprite( &turret_anim_shadow, iXY(0,0) );
+ body_anim_shadow.attachSprite( &turret_anim, iXY(0,0) );
+ body_anim_shadow.attachSprite( &select_info_box, iXY(0,0) );
//FLAGS_DBASE.get_sprite_index( flag, select_info_box.unit_flag );
//FLAGS_DBASE.get_sprite_name( "allie", select_info_box.allie_flag );
}
-void SpahPanzer::fireWeapon( PointXYi &target_loc )
+void SpahPanzer::fireWeapon( iXY &target_loc )
{
reload_counter = 0;
ProjectileInterface::newProjectile( 3, unit_state.unit_type, unit_id,
unit_state.damage_factor,
Index: netpanzer/src/NetPanzer/Classes/Units/SpahPanzer.hpp
diff -u netpanzer/src/NetPanzer/Classes/Units/SpahPanzer.hpp:1.1
netpanzer/src/NetPanzer/Classes/Units/SpahPanzer.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/Units/SpahPanzer.hpp:1.1 Sun Dec 1
12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/Units/SpahPanzer.hpp Wed Sep 10
08:32:54 2003
@@ -24,10 +24,10 @@
{
protected:
void setUnitProperties( void );
- virtual void fireWeapon( PointXYi &target_loc );
+ virtual void fireWeapon( iXY &target_loc );
public:
- SpahPanzer( PointXYi initial_loc, unsigned char color, unsigned char flag );
+ SpahPanzer( iXY initial_loc, unsigned char color, unsigned char flag );
};
Index: netpanzer/src/NetPanzer/Classes/Units/Valentine.cpp
diff -u netpanzer/src/NetPanzer/Classes/Units/Valentine.cpp:1.3
netpanzer/src/NetPanzer/Classes/Units/Valentine.cpp:1.4
--- netpanzer/src/NetPanzer/Classes/Units/Valentine.cpp:1.3 Fri Sep 5
22:01:19 2003
+++ netpanzer/src/NetPanzer/Classes/Units/Valentine.cpp Wed Sep 10 08:32:54 2003
@@ -44,7 +44,7 @@
}
-Valentine::Valentine( PointXYi initial_loc, unsigned char color, unsigned char
flag )
+Valentine::Valentine( iXY initial_loc, unsigned char color, unsigned char flag
)
: Vehicle( initial_loc )
{
setUnitProperties();
@@ -62,29 +62,29 @@
- body_anim.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer );
- turret_anim.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer );
+ body_anim.setAttrib( iXY(0,0), iXY(0,0), unitLayer );
+ turret_anim.setAttrib( iXY(0,0), iXY(0,0), unitLayer );
body_anim_shadow.setData( gValentineBodyShadow );
turret_anim_shadow.setData( gValentineTurretShadow );
- body_anim_shadow.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer );
- turret_anim_shadow.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer );
+ body_anim_shadow.setAttrib( iXY(0,0), iXY(0,0), unitLayer );
+ turret_anim_shadow.setAttrib( iXY(0,0), iXY(0,0), unitLayer );
select_info_box.setBoxAttributes( BoundBox( -20, -20, 20, 20), Color::blue );
select_info_box.setBoxState( false );
select_info_box.setFlag( flag );
- body_anim_shadow.attachSprite( &body_anim, PointXYi(0,0) );
- body_anim_shadow.attachSprite( &turret_anim_shadow, PointXYi(0,0) );
- body_anim_shadow.attachSprite( &turret_anim, PointXYi(0,0) );
- body_anim_shadow.attachSprite( &select_info_box, PointXYi(0,0) );
+ body_anim_shadow.attachSprite( &body_anim, iXY(0,0) );
+ body_anim_shadow.attachSprite( &turret_anim_shadow, iXY(0,0) );
+ body_anim_shadow.attachSprite( &turret_anim, iXY(0,0) );
+ body_anim_shadow.attachSprite( &select_info_box, iXY(0,0) );
//FLAGS_DBASE.get_sprite_index( flag, select_info_box.unit_flag );
//FLAGS_DBASE.get_sprite_name( "allie", select_info_box.allie_flag );
}
-void Valentine::fireWeapon( PointXYi &target_loc )
+void Valentine::fireWeapon( iXY &target_loc )
{
reload_counter = 0;
ProjectileInterface::newProjectile( 3, unit_state.unit_type, unit_id,
unit_state.damage_factor,
Index: netpanzer/src/NetPanzer/Classes/Units/Valentine.hpp
diff -u netpanzer/src/NetPanzer/Classes/Units/Valentine.hpp:1.1
netpanzer/src/NetPanzer/Classes/Units/Valentine.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/Units/Valentine.hpp:1.1 Sun Dec 1
12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/Units/Valentine.hpp Wed Sep 10 08:32:54 2003
@@ -24,10 +24,10 @@
{
protected:
void setUnitProperties( void );
- virtual void fireWeapon( PointXYi &target_loc );
+ virtual void fireWeapon( iXY &target_loc );
public:
- Valentine( PointXYi initial_loc, unsigned char color, unsigned char flag );
+ Valentine( iXY initial_loc, unsigned char color, unsigned char flag );
};
Index: netpanzer/src/NetPanzer/Classes/Units/Vehicle.cpp
diff -u netpanzer/src/NetPanzer/Classes/Units/Vehicle.cpp:1.4
netpanzer/src/NetPanzer/Classes/Units/Vehicle.cpp:1.5
--- netpanzer/src/NetPanzer/Classes/Units/Vehicle.cpp:1.4 Sat Sep 6
11:18:19 2003
+++ netpanzer/src/NetPanzer/Classes/Units/Vehicle.cpp Wed Sep 10 08:32:54 2003
@@ -40,12 +40,12 @@
enum{ _rotate_and_move, _rotate_stop_move };
-Vehicle::Vehicle( PointXYi initial_loc )
+Vehicle::Vehicle( iXY initial_loc )
{
smolderWait = 0.0f;
smolderWaitMin = 0.0f;
- PointXYi loc;
+ iXY loc;
MapInterface::mapXYtoPointXY( initial_loc, &loc );
unit_state.location = loc;
markUnitLoc( initial_loc );
@@ -122,7 +122,7 @@
unsigned short Vehicle::mapXYtoOrientation( unsigned long square, long
*goal_angle )
{
- PointXYi current_loc, next_loc;
+ iXY current_loc, next_loc;
MapInterface::pointXYtoMapXY( unit_state.location, ¤t_loc );
MapInterface::offsetToMapXY( square, &next_loc );
@@ -207,10 +207,10 @@
}
-void Vehicle::locationOffset( unsigned long square, PointXYi &offset )
+void Vehicle::locationOffset( unsigned long square, iXY &offset )
{
- PointXYi square_map_loc;
- PointXYi unit_map_loc;
+ iXY square_map_loc;
+ iXY unit_map_loc;
MapInterface::offsetToMapXY( square, &square_map_loc );
MapInterface::pointXYtoMapXY( unit_state.location, &unit_map_loc );
@@ -361,7 +361,7 @@
if ( NetworkState::status == _network_state_server )
{
- PointXYi loc_offset;
+ iXY loc_offset;
move_opcode.opcode = _UNIT_OPCODE_MOVE;
move_opcode.unit_index = unit_id.getIndex();
@@ -434,9 +434,9 @@
}
-void Vehicle::setFsmTurretTrackPoint( PointXYi &target )
+void Vehicle::setFsmTurretTrackPoint( iXY &target )
{
- PointXYi direction_vector;
+ iXY direction_vector;
fsmTurretTrackPoint_target = target;
direction_vector = fsmTurretTrackPoint_target - unit_state.location;
@@ -500,7 +500,7 @@
long goal_angle;
long delta;
unsigned short rotation;
- PointXYi direction_vector;
+ iXY direction_vector;
direction_vector = fsmTurretTrackPoint_target - unit_state.location;
fsmTurretTrackPoint_target_angle.set( direction_vector );
@@ -575,7 +575,7 @@
long delta;
unsigned short rotation;
UnitBase *target_unit_ptr;
- PointXYi direction_vector;
+ iXY direction_vector;
target_unit_ptr = getUnit( fsmTurretTrackTarget_target_id );
@@ -601,7 +601,7 @@
-void Vehicle::setFsmGunneryLocation( PointXYi &target )
+void Vehicle::setFsmGunneryLocation( iXY &target )
{
if ( fsm_active_list[ _control_gunnery_target ] == true )
{
@@ -621,7 +621,7 @@
void Vehicle::fsmGunneryLocation( void )
{
- PointXYi range_vector;
+ iXY range_vector;
range_vector = fsmGunneryLocation_target - unit_state.location;
@@ -663,7 +663,7 @@
{
UnitBase *target_unit_ptr;
UnitState *target_unit_state;
- PointXYi range_vector;
+ iXY range_vector;
target_unit_ptr = getUnit( fsmGunneryTarget_target_id );
if ( target_unit_ptr == 0 )
@@ -708,7 +708,7 @@
bool Vehicle::ruleMoveToLoc_GoalReached( void )
{
- PointXYi map_loc;
+ iXY map_loc;
MapInterface::pointXYtoMapXY( unit_state.location, &map_loc );
if ( map_loc == aiFsmMoveToLoc_goal )
return( true );
@@ -739,7 +739,7 @@
// Action : Exit fsm gracefully
aiFsmMoveToLoc_OnExitCleanUp();
- PointXYi current_map_loc;
+ iXY current_map_loc;
MapInterface::pointXYtoMapXY( unit_state.location, ¤t_map_loc );
unmarkUnitLoc( current_map_loc );
@@ -793,7 +793,7 @@
{
// Rule: GoalReached is false AND Unit is at the end of path
// Action : Request path generation to goal
- PointXYi start;
+ iXY start;
PathRequest path_request;
//LOG( ("Incomplete Path -- Regenerating Path") );
@@ -980,7 +980,7 @@
UnitBase *target_unit_ptr;
UnitState *target_unit_state = 0;
- PointXYi range_vector;
+ iXY range_vector;
target_unit_ptr = getUnit( aiFsmAttackUnit_target_ID );
if ( target_unit_ptr == 0 )
@@ -1022,7 +1022,7 @@
// Action : Exit fsm gracefully
aiFsmAttackUnit_OnExitCleanUp();
- PointXYi current_map_loc;
+ iXY current_map_loc;
MapInterface::pointXYtoMapXY( unit_state.location, ¤t_map_loc );
unmarkUnitLoc( current_map_loc );
@@ -1071,7 +1071,7 @@
{
if ( aiFsmAttackUnit_path_not_finished == false )
{
- PointXYi start;
+ iXY start;
MapInterface::pointXYtoMapXY( unit_state.location, &start );
PathRequest path_request;
@@ -1274,8 +1274,8 @@
case _aiFsmAttackUnit_check_path_deviation :
{
- PointXYi deviation_vector;
- PointXYi goal_point_loc;
+ iXY deviation_vector;
+ iXY goal_point_loc;
MapInterface::mapXYtoPointXY( aiFsmAttackUnit_target_goal_loc,
&goal_point_loc );
deviation_vector = target_unit_state->location - goal_point_loc;
@@ -1324,7 +1324,7 @@
UnitBase *target_unit_ptr;
UnitState *target_unit_state;
- PointXYi range_vector;
+ iXY range_vector;
do
{
@@ -1522,7 +1522,7 @@
}
-void Vehicle::fireWeapon( PointXYi &target_loc )
+void Vehicle::fireWeapon( iXY &target_loc )
{
reload_counter = 0;
ProjectileInterface::newProjectile( 0, unit_state.unit_type, unit_id,
unit_state.damage_factor,
@@ -1638,7 +1638,7 @@
void Vehicle::setCommandMoveToLoc( UMesgAICommand *message )
{
- PointXYi start;
+ iXY start;
if ( fsm_active_list[ _control_gunnery_location ] == true )
{
@@ -1664,14 +1664,14 @@
path_request.set( unit_id, start, aiFsmMoveToLoc_goal, 0, &path,
_path_request_full );
PathScheduler::requestPath( path_request );
- PointXYi target;
+ iXY target;
MapInterface::mapXYtoPointXY( aiFsmMoveToLoc_goal, &target);
setFsmTurretTrackPoint( target );
}
void Vehicle::setCommandAttackUnit( UMesgAICommand *message )
{
- PointXYi start;
+ iXY start;
UnitBase *target_unit_ptr;
UnitState *target_unit_state;
@@ -1777,7 +1777,7 @@
sendMessage( &lifecycle_update );
// ** Note: Temp
- PointXYi current_map_loc;
+ iXY current_map_loc;
MapInterface::pointXYtoMapXY( unit_state.location, ¤t_map_loc );
unmarkUnitLoc( current_map_loc );
}
@@ -1818,7 +1818,7 @@
external_ai_event = _external_event_pending_unit_destruct;
// ** Note: Temp
- PointXYi current_map_loc;
+ iXY current_map_loc;
MapInterface::pointXYtoMapXY( unit_state.location, ¤t_map_loc );
unmarkUnitLoc( current_map_loc );
}
@@ -1861,8 +1861,8 @@
move_opcode = (MoveOpcode *) opcode;
- PointXYi sync_loc;
- PointXYi current_loc;
+ iXY sync_loc;
+ iXY current_loc;
MapInterface::offsetToMapXY( move_opcode->square, &sync_loc );
sync_loc.x = sync_loc.x + move_opcode->loc_x_offset;
@@ -1891,7 +1891,7 @@
if ( track_point_opcode->activate == true )
{
- PointXYi target;
+ iXY target;
target.x = track_point_opcode->x;
target.y = track_point_opcode->y;
setFsmTurretTrackPoint( target );
@@ -1933,7 +1933,7 @@
void Vehicle::unitOpcodeFireWeapon( UnitOpcodeStruct *opcode )
{
- PointXYi target_loc;
+ iXY target_loc;
if ( ( (in_sync_flag == false) && !(opcode->flags & _unit_opcode_flag_sync)
) ||
( (in_sync_flag == true) && (opcode->flags & _unit_opcode_flag_sync) )
Index: netpanzer/src/NetPanzer/Classes/Units/Vehicle.hpp
diff -u netpanzer/src/NetPanzer/Classes/Units/Vehicle.hpp:1.2
netpanzer/src/NetPanzer/Classes/Units/Vehicle.hpp:1.3
--- netpanzer/src/NetPanzer/Classes/Units/Vehicle.hpp:1.2 Mon Sep 1
16:24:20 2003
+++ netpanzer/src/NetPanzer/Classes/Units/Vehicle.hpp Wed Sep 10 08:32:54 2003
@@ -108,7 +108,7 @@
unsigned short shortestRotation( AngleInt &angle, long goal_angle, long
*delta );
unsigned short mapXYtoOrientation( unsigned long square, long *goal_angle );
void orientationToOffset( unsigned short orientation, signed char *offset_x,
signed char *offset_y );
- void locationOffset( unsigned long square, PointXYi &offset );
+ void locationOffset( unsigned long square, iXY &offset );
// ** FSMs and AI FSMs
unsigned short fsmBodyRotate_rotation;
@@ -139,10 +139,10 @@
void setFsmMoveMapSquare( unsigned long square );
bool fsmMoveMapSquare( void );
- PointXYi fsmTurretTrackPoint_target;
+ iXY fsmTurretTrackPoint_target;
Angle fsmTurretTrackPoint_target_angle;
bool fsmTurretTrackPoint_on_target;
- void setFsmTurretTrackPoint( PointXYi &target );
+ void setFsmTurretTrackPoint( iXY &target );
void clearFsmTurretTrackPoint( void );
void syncFsmTurretTrackPoint( void );
void fsmTurretTrackPoint( void );
@@ -154,8 +154,8 @@
void syncFsmTurretTrackTarget( void );
void fsmTurretTrackTarget( void );
- PointXYi fsmGunneryLocation_target;
- void setFsmGunneryLocation( PointXYi &target );
+ iXY fsmGunneryLocation_target;
+ void setFsmGunneryLocation( iXY &target );
void clearFsmGunneryLocation( void );
void fsmGunneryLocation( void );
@@ -172,11 +172,11 @@
void setAiFsmDefendHold( void );
void aiFsmDefendHold( void );
- PointXYi aiFsmMoveToLoc_goal;
+ iXY aiFsmMoveToLoc_goal;
unsigned char aiFsmMoveToLoc_state;
unsigned long aiFsmMoveToLoc_next_square;
- PointXYi aiFsmMoveToLoc_next_loc;
- PointXYi aiFsmMoveToLoc_prev_loc;
+ iXY aiFsmMoveToLoc_next_loc;
+ iXY aiFsmMoveToLoc_prev_loc;
Timer aiFsmMoveToLoc_wait_timer;
bool aiFsmMoveToLoc_path_not_finished;
bool ruleMoveToLoc_GoalReached( void );
@@ -184,11 +184,11 @@
void aiFsmMoveToLoc( void );
UnitID aiFsmAttackUnit_target_ID;
- PointXYi aiFsmAttackUnit_target_goal_loc;
+ iXY aiFsmAttackUnit_target_goal_loc;
unsigned char aiFsmAttackUnit_state;
unsigned long aiFsmAttackUnit_next_square;
- PointXYi aiFsmAttackUnit_next_loc;
- PointXYi aiFsmAttackUnit_prev_loc;
+ iXY aiFsmAttackUnit_next_loc;
+ iXY aiFsmAttackUnit_prev_loc;
Timer aiFsmAttackUnit_wait_timer;
bool aiFsmAttackUnit_path_not_finished;
bool aiFsmAttackUnit_target_destroyed;
@@ -198,11 +198,11 @@
unsigned char aiFsmManualMove_move_orientation;
unsigned char aiFsmManualMove_state;
- PointXYi aiFsmManualMove_next_loc;
- PointXYi aiFsmManualMove_prev_loc;
+ iXY aiFsmManualMove_next_loc;
+ iXY aiFsmManualMove_prev_loc;
void aiFsmManualMove( void );
- virtual void fireWeapon( PointXYi &target_loc );
+ virtual void fireWeapon( iXY &target_loc );
TimerFrameBase threat_level_under_attack_timer;
@@ -242,7 +242,7 @@
public:
- Vehicle( PointXYi initial_loc );
+ Vehicle( iXY initial_loc );
virtual void updateState( void );
Index: netpanzer/src/NetPanzer/Classes/ViewCamera.cpp
diff -u netpanzer/src/NetPanzer/Classes/ViewCamera.cpp:1.4
netpanzer/src/NetPanzer/Classes/ViewCamera.cpp:1.5
--- netpanzer/src/NetPanzer/Classes/ViewCamera.cpp:1.4 Mon Sep 8 08:12:19 2003
+++ netpanzer/src/NetPanzer/Classes/ViewCamera.cpp Wed Sep 10 08:32:53 2003
@@ -26,8 +26,8 @@
void ViewCamera::scrollPlusX( long scroll_increment )
{
- PointXYi view;
- PointXYi map_size;
+ iXY view;
+ iXY map_size;
view.x = loc.x + scroll_increment;
view.x = view.x - (view.x % 4);
@@ -43,8 +43,8 @@
void ViewCamera::scrollMinusX( long scroll_increment )
{
- PointXYi view;
- PointXYi map_size;
+ iXY view;
+ iXY map_size;
view.x = loc.x - scroll_increment;
view.x = view.x - (view.x % 4);
@@ -60,8 +60,8 @@
void ViewCamera::scrollMinusY( long scroll_increment )
{
- PointXYi view;
- PointXYi map_size;
+ iXY view;
+ iXY map_size;
view.y = loc.y - scroll_increment;
view.y = view.y - (view.y % 4);
@@ -76,8 +76,8 @@
void ViewCamera::scrollPlusY( long scroll_increment )
{
- PointXYi view;
- PointXYi map_size;
+ iXY view;
+ iXY map_size;
view.y = loc.y + scroll_increment;
view.y = view.y - (view.y % 4);
@@ -94,7 +94,7 @@
void ViewCamera::getViewStart( unsigned long view_size_x, unsigned long
view_size_y,
unsigned long *view_start_x, unsigned long
*view_start_y )
{
- PointXYi map_size;
+ iXY map_size;
unsigned long view_offset_x;
unsigned long view_offset_y;
long start_x, start_y;
Index: netpanzer/src/NetPanzer/Classes/ViewCamera.hpp
diff -u netpanzer/src/NetPanzer/Classes/ViewCamera.hpp:1.3
netpanzer/src/NetPanzer/Classes/ViewCamera.hpp:1.4
--- netpanzer/src/NetPanzer/Classes/ViewCamera.hpp:1.3 Mon Sep 8 08:12:19 2003
+++ netpanzer/src/NetPanzer/Classes/ViewCamera.hpp Wed Sep 10 08:32:53 2003
@@ -20,13 +20,12 @@
#include "MapInterface.hpp"
#include "TileInterface.hpp"
-#include "Point.hpp"
class ViewCamera : private MapInterface
{
protected:
- PointXYi loc;
- PointXYi view_size;
+ iXY loc;
+ iXY view_size;
public:
ViewCamera();
@@ -35,13 +34,13 @@
void scrollMinusY( long scroll_increment );
void scrollPlusY( long scroll_increment );
- inline void setCamera( const PointXYi &new_loc )
+ inline void setCamera( const iXY &new_loc )
{
loc.x = new_loc.x - (new_loc.x % 4);
loc.y = new_loc.y - (new_loc.y % 4);
}
- inline void setCameraSize( const PointXYi &size )
+ inline void setCameraSize( const iXY &size )
{
view_size = size;
}
@@ -49,7 +48,7 @@
void getViewStart( unsigned long view_size_x, unsigned long view_size_y,
unsigned long *view_start_x, unsigned long
*view_start_y );
- inline void getViewWindow( Recti *view_win )
+ inline void getViewWindow( iRect *view_win )
{
unsigned long view_start_x, view_start_y;
getViewStart( view_size.x, view_size.y, &view_start_x,
&view_start_y );
@@ -59,7 +58,7 @@
view_win->max.y = view_start_y + view_size.y;
}
- inline long getCameraDistance( const PointXYi &world_loc )
+ inline long getCameraDistance( const iXY &world_loc )
{
return( (long) (loc - world_loc).mag2() );
}
Index: netpanzer/src/NetPanzer/Classes/Weapons/BulletWeapon.cpp
diff -u netpanzer/src/NetPanzer/Classes/Weapons/BulletWeapon.cpp:1.4
netpanzer/src/NetPanzer/Classes/Weapons/BulletWeapon.cpp:1.5
--- netpanzer/src/NetPanzer/Classes/Weapons/BulletWeapon.cpp:1.4 Sat Sep
6 06:34:29 2003
+++ netpanzer/src/NetPanzer/Classes/Weapons/BulletWeapon.cpp Wed Sep 10
08:32:54 2003
@@ -30,7 +30,7 @@
float BulletWeapon::velocity = gBulletVelocity;
-BulletWeapon:: BulletWeapon(UnitID &owner, unsigned short owner_type_id,
unsigned short damage, PointXYi &start, PointXYi &end)
+BulletWeapon:: BulletWeapon(UnitID &owner, unsigned short owner_type_id,
unsigned short damage, iXY &start, iXY &end)
: Weapon(owner, owner_type_id, damage, start, end)
{
setSurface();
Index: netpanzer/src/NetPanzer/Classes/Weapons/BulletWeapon.hpp
diff -u netpanzer/src/NetPanzer/Classes/Weapons/BulletWeapon.hpp:1.1
netpanzer/src/NetPanzer/Classes/Weapons/BulletWeapon.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/Weapons/BulletWeapon.hpp:1.1 Sun Dec
1 12:51:56 2002
+++ netpanzer/src/NetPanzer/Classes/Weapons/BulletWeapon.hpp Wed Sep 10
08:32:54 2003
@@ -29,7 +29,7 @@
virtual void setSurface();
public:
- BulletWeapon(UnitID &owner, unsigned short owner_type_id, unsigned
short damage, PointXYi &start, PointXYi &end);
+ BulletWeapon(UnitID &owner, unsigned short owner_type_id, unsigned
short damage, iXY &start, iXY &end);
virtual void updateStatus();
virtual void offloadGraphics( SpriteSorter &sorter );
Index: netpanzer/src/NetPanzer/Classes/Weapons/MissleWeapon.cpp
diff -u netpanzer/src/NetPanzer/Classes/Weapons/MissleWeapon.cpp:1.4
netpanzer/src/NetPanzer/Classes/Weapons/MissleWeapon.cpp:1.5
--- netpanzer/src/NetPanzer/Classes/Weapons/MissleWeapon.cpp:1.4 Sat Sep
6 06:34:29 2003
+++ netpanzer/src/NetPanzer/Classes/Weapons/MissleWeapon.cpp Wed Sep 10
08:32:54 2003
@@ -33,7 +33,7 @@
float MissleWeapon::thrustForce = gMissleThrustForce;
-MissleWeapon::MissleWeapon(UnitID &owner, unsigned short owner_type_id,
unsigned short damage, PointXYi &start, PointXYi &end)
+MissleWeapon::MissleWeapon(UnitID &owner, unsigned short owner_type_id,
unsigned short damage, iXY &start, iXY &end)
: Weapon(owner, owner_type_id, damage, start, end)
{
velocity = thrustForce * 2;
Index: netpanzer/src/NetPanzer/Classes/Weapons/MissleWeapon.hpp
diff -u netpanzer/src/NetPanzer/Classes/Weapons/MissleWeapon.hpp:1.1
netpanzer/src/NetPanzer/Classes/Weapons/MissleWeapon.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/Weapons/MissleWeapon.hpp:1.1 Sun Dec
1 12:51:56 2002
+++ netpanzer/src/NetPanzer/Classes/Weapons/MissleWeapon.hpp Wed Sep 10
08:32:54 2003
@@ -39,7 +39,7 @@
virtual void fsmFlight();
public:
- MissleWeapon(UnitID &owner, unsigned short owner_type_id, unsigned
short damage, PointXYi &start, PointXYi &end);
+ MissleWeapon(UnitID &owner, unsigned short owner_type_id, unsigned
short damage, iXY &start, iXY &end);
virtual void updateStatus();
virtual void offloadGraphics( SpriteSorter &sorter );
Index: netpanzer/src/NetPanzer/Classes/Weapons/ShellWeapon.cpp
diff -u netpanzer/src/NetPanzer/Classes/Weapons/ShellWeapon.cpp:1.4
netpanzer/src/NetPanzer/Classes/Weapons/ShellWeapon.cpp:1.5
--- netpanzer/src/NetPanzer/Classes/Weapons/ShellWeapon.cpp:1.4 Sat Sep 6
06:34:29 2003
+++ netpanzer/src/NetPanzer/Classes/Weapons/ShellWeapon.cpp Wed Sep 10
08:32:54 2003
@@ -32,7 +32,7 @@
#include "FlashParticle2D.hpp"
-ShellWeapon::ShellWeapon(UnitID &owner, unsigned short owner_type_id, unsigned
short damage, PointXYi &start, PointXYi &end)
+ShellWeapon::ShellWeapon(UnitID &owner, unsigned short owner_type_id, unsigned
short damage, iXY &start, iXY &end)
: Weapon(owner, owner_type_id, damage, start, end)
{
fXYZ muzzleStart(start.x + direction.x * 25, 0.0f, start.y +
direction.y * 25);
Index: netpanzer/src/NetPanzer/Classes/Weapons/ShellWeapon.hpp
diff -u netpanzer/src/NetPanzer/Classes/Weapons/ShellWeapon.hpp:1.1
netpanzer/src/NetPanzer/Classes/Weapons/ShellWeapon.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/Weapons/ShellWeapon.hpp:1.1 Sun Dec 1
12:51:56 2002
+++ netpanzer/src/NetPanzer/Classes/Weapons/ShellWeapon.hpp Wed Sep 10
08:32:54 2003
@@ -27,7 +27,7 @@
virtual void fsmFlight();
public:
- ShellWeapon(UnitID &owner, unsigned short owner_type_id, unsigned short
damage, PointXYi &start, PointXYi &end);
+ ShellWeapon(UnitID &owner, unsigned short owner_type_id, unsigned short
damage, iXY &start, iXY &end);
virtual void updateStatus();
Index: netpanzer/src/NetPanzer/Classes/Weapons/Weapon.cpp
diff -u netpanzer/src/NetPanzer/Classes/Weapons/Weapon.cpp:1.6
netpanzer/src/NetPanzer/Classes/Weapons/Weapon.cpp:1.7
--- netpanzer/src/NetPanzer/Classes/Weapons/Weapon.cpp:1.6 Sun Sep 7
16:49:03 2003
+++ netpanzer/src/NetPanzer/Classes/Weapons/Weapon.cpp Wed Sep 10 08:32:54 2003
@@ -137,7 +137,7 @@
//tempPackSurface.save("pics/particles/shells/pak/shells.pak");
}
-Weapon::Weapon(UnitID &owner, unsigned short owner_type_id, unsigned short
damage, PointXYi &start, PointXYi &end)
+Weapon::Weapon(UnitID &owner, unsigned short owner_type_id, unsigned short
damage, iXY &start, iXY &end)
{
// I use this to line things up, so leave this in here when this
// get redone. thank you.
@@ -223,7 +223,7 @@
fsmFlight();
// ** NOTE: Temp unit new sprites put in
- Recti world_win;
+ iRect world_win;
shell.setWorldPos( location );
Index: netpanzer/src/NetPanzer/Classes/Weapons/Weapon.hpp
diff -u netpanzer/src/NetPanzer/Classes/Weapons/Weapon.hpp:1.2
netpanzer/src/NetPanzer/Classes/Weapons/Weapon.hpp:1.3
--- netpanzer/src/NetPanzer/Classes/Weapons/Weapon.hpp:1.2 Mon Sep 1
16:24:20 2003
+++ netpanzer/src/NetPanzer/Classes/Weapons/Weapon.hpp Wed Sep 10 08:32:54 2003
@@ -50,7 +50,7 @@
unsigned short owner_type_id;
unsigned short damage_factor;
- PointXYi location;
+ iXY location;
BresenhamLine path;
Timer fsm_timer;
unsigned char fsmFlight_state;
@@ -61,7 +61,7 @@
public:
- Weapon(UnitID &owner, unsigned short owner_type_id, unsigned short
damage, PointXYi &start, PointXYi &end);
+ Weapon(UnitID &owner, unsigned short owner_type_id, unsigned short
damage, iXY &start, iXY &end);
virtual ~Weapon()
{ }
Index: netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp
diff -u netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp:1.9
netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp:1.10
--- netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp:1.9 Mon Sep
8 11:32:04 2003
+++ netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp Wed Sep 10
08:32:53 2003
@@ -121,9 +121,9 @@
working_list.cycleNextUnit();
}
-void WorldInputCmdProcessor::updateScrollStatus(const PointXYi &mouse_pos )
+void WorldInputCmdProcessor::updateScrollStatus(const iXY &mouse_pos )
{
- PointXYi screen_size;
+ iXY screen_size;
double time_slice;
long scroll_increment;
float scroll_rate;
@@ -156,9 +156,9 @@
}
-unsigned char WorldInputCmdProcessor::getCursorStatus( PointXYi &loc )
+unsigned char WorldInputCmdProcessor::getCursorStatus( iXY &loc )
{
- PointXYi map_loc;
+ iXY map_loc;
unsigned char unit_loc_status;
if( (manual_control_state == true) || (manual_fire_state == true) )
@@ -234,7 +234,7 @@
void WorldInputCmdProcessor::cycleNextUnitAndChangeFocus( void )
{
- PointXYi world_pos;
+ iXY world_pos;
world_pos = UnitInterface::unitPositionCycle( &unit_cycle_search_iterator );
WorldViewInterface::setCameraPosition( world_pos );
@@ -555,11 +555,11 @@
box_release.y = y;
}
- select_success = working_list.selectBounded( Recti( box_press, box_release )
);
+ select_success = working_list.selectBounded( iRect( box_press, box_release )
);
if ( select_success == false )
{
- PointXYi box_size;
+ iXY box_size;
box_size = box_release - box_press;
if ( (box_size.x > 40) || (box_size.y > 40) )
select_success = true;
@@ -576,8 +576,8 @@
void WorldInputCmdProcessor::evaluateMouseEvents( void )
{
- PointXYi world_pos;
- PointXYi mouse_pos;
+ iXY world_pos;
+ iXY mouse_pos;
MouseInterface::getMousePosition( (long *) &mouse_pos.x, (long *)
&mouse_pos.y );
@@ -626,7 +626,7 @@
void WorldInputCmdProcessor::evalLeftMButtonEvents( MouseEvent &event )
{
- PointXYi world_pos;
+ iXY world_pos;
unsigned char click_status;
if ( (manual_control_state == true) ||
@@ -713,7 +713,7 @@
void WorldInputCmdProcessor::evalRightMButtonEvents( MouseEvent &event )
{
- PointXYi world_pos;
+ iXY world_pos;
unsigned char click_status;
Objective *objective;
@@ -764,9 +764,9 @@
}
-void WorldInputCmdProcessor::sendMoveCommand( PointXYi &world_pos )
+void WorldInputCmdProcessor::sendMoveCommand( iXY &world_pos )
{
- PointXYi map_pos;
+ iXY map_pos;
PlacementMatrix matrix;
unsigned long id_list_index;
@@ -820,7 +820,7 @@
sound->PlayUnitVoice(working_list.getHeadUnitType(), Sound::_move_to);
}
-void WorldInputCmdProcessor::sendAttackCommand( PointXYi &world_pos )
+void WorldInputCmdProcessor::sendAttackCommand( iXY &world_pos )
{
TerminalUnitCmdRequest comm_mesg;
MultiMessage *encode_message;
@@ -921,7 +921,7 @@
}
-void WorldInputCmdProcessor::sendManualFireCommand( PointXYi &world_pos )
+void WorldInputCmdProcessor::sendManualFireCommand( iXY &world_pos )
{
TerminalUnitCmdRequest comm_mesg;
MultiMessage *encode_message;
@@ -969,7 +969,7 @@
}
-void WorldInputCmdProcessor::sendAllianceRequest( PointXYi &world_pos, bool
make_break )
+void WorldInputCmdProcessor::sendAllianceRequest( iXY &world_pos, bool
make_break )
{
UnitBase *target_ptr;
@@ -1037,8 +1037,8 @@
void WorldInputCmdProcessor::inFocus( void )
{
- PointXYi world_pos;
- PointXYi mouse_pos;
+ iXY world_pos;
+ iXY mouse_pos;
MouseInterface::getMousePosition( (long *) &mouse_pos.x, (long *)
&mouse_pos.y );
@@ -1052,8 +1052,8 @@
void WorldInputCmdProcessor::updateControls( void )
{
- PointXYi client_pos;
- PointXYi mouse_pos;
+ iXY client_pos;
+ iXY mouse_pos;
if ( selection_box_active == true )
{
@@ -1089,8 +1089,8 @@
void WorldInputCmdProcessor::closeSelectionBox( void )
{
- PointXYi world_pos;
- PointXYi mouse_pos;
+ iXY world_pos;
+ iXY mouse_pos;
MouseInterface::getMousePosition( (long *) &mouse_pos.x, (long *)
&mouse_pos.y );
@@ -1120,7 +1120,7 @@
{ return( false ); }
}
-bool WorldInputCmdProcessor::selectUnits( Recti bound_box )
+bool WorldInputCmdProcessor::selectUnits( iRect bound_box )
{
long x,y;
@@ -1141,7 +1141,7 @@
return( working_list.selectBounded( bound_box ) );
}
-bool WorldInputCmdProcessor::isValidMoveLocation( PointXYi location )
+bool WorldInputCmdProcessor::isValidMoveLocation( iXY location )
{
int click_status;
@@ -1152,7 +1152,7 @@
return( true );
}
-bool WorldInputCmdProcessor::sendMoveCommandExternal( PointXYi location )
+bool WorldInputCmdProcessor::sendMoveCommandExternal( iXY location )
{
int click_status;
@@ -1211,7 +1211,7 @@
return( objective_state->name );
}
-PointXYi WorldInputCmdProcessor::getSelectedObjectiveWorldPos( void )
+iXY WorldInputCmdProcessor::getSelectedObjectiveWorldPos( void )
{
ObjectiveState *objective_state;
Index: netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.hpp
diff -u netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.hpp:1.3
netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.hpp:1.4
--- netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.hpp:1.3 Wed Sep
10 08:03:17 2003
+++ netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.hpp Wed Sep 10
08:32:53 2003
@@ -25,12 +25,12 @@
class WorldInputCmdProcessor
{
protected:
- Recti world_win;
+ iRect world_win;
bool left_button_hold_action_complete;
bool selection_box_active;
- PointXYi box_press, box_release;
+ iXY box_press, box_release;
bool selectBoundBoxUnits( void );
bool local_key_table[256];
@@ -54,17 +54,17 @@
static bool unit_flag_visibility_state;
void toggleUnitFlagVisibility( void );
- unsigned char getCursorStatus( PointXYi &loc );
+ unsigned char getCursorStatus( iXY &loc );
void setMouseCursor( unsigned char world_cursor_status );
void getManualControlStatus( void );
void sendManualMoveCommand( unsigned char orientation,
bool start_stop );
- void sendManualFireCommand( PointXYi &world_pos );
- void sendMoveCommand( PointXYi &world_pos );
- void sendAttackCommand( PointXYi &world_pos );
- void sendAllianceRequest( PointXYi &world_pos, bool make_break );
+ void sendManualFireCommand( iXY &world_pos );
+ void sendMoveCommand( iXY &world_pos );
+ void sendAttackCommand( iXY &world_pos );
+ void sendAllianceRequest( iXY &world_pos, bool make_break );
void evalLeftMButtonEvents( MouseEvent &event );
void evalRightMButtonEvents( MouseEvent &event );
@@ -98,7 +98,7 @@
void inFocus( void );
- void updateScrollStatus( const PointXYi &mouse_pos );
+ void updateScrollStatus( const iXY &mouse_pos );
void updateControls( void );
@@ -106,9 +106,9 @@
// ** methods for external input control
bool isUnitSelected( void );
- bool selectUnits( Recti bound_box );
- bool isValidMoveLocation( PointXYi location );
- bool sendMoveCommandExternal( PointXYi location );
+ bool selectUnits( iRect bound_box );
+ bool isValidMoveLocation( iXY location );
+ bool sendMoveCommandExternal( iXY location );
void deselectUnitsExternal( void );
void startChatMessageAll( void );
@@ -119,7 +119,7 @@
static bool isObjectiveSelected( void );
static char * getSelectedObjectiveName( void );
- static PointXYi getSelectedObjectiveWorldPos( void );
+ static iXY getSelectedObjectiveWorldPos( void );
};
extern WorldInputCmdProcessor COMMAND_PROCESSOR;
Index: netpanzer/src/NetPanzer/Interfaces/ConsoleInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/ConsoleInterface.cpp:1.6
netpanzer/src/NetPanzer/Interfaces/ConsoleInterface.cpp:1.7
--- netpanzer/src/NetPanzer/Interfaces/ConsoleInterface.cpp:1.6 Sat Sep 6
06:34:29 2003
+++ netpanzer/src/NetPanzer/Interfaces/ConsoleInterface.cpp Wed Sep 10
08:32:54 2003
@@ -30,9 +30,9 @@
long ConsoleInterface::console_size;
ConsoleLineArray ConsoleInterface::line_list;
-PointXYi ConsoleInterface::surface_size;
-Recti ConsoleInterface::bounds;
-PointXYi ConsoleInterface::line_offset;
+iXY ConsoleInterface::surface_size;
+iRect ConsoleInterface::bounds;
+iXY ConsoleInterface::line_offset;
long ConsoleInterface::vertical_spacing;
long ConsoleInterface::horizontal_spacing;
long ConsoleInterface::max_char_per_line;
@@ -55,8 +55,8 @@
line_index = console_size - 1;
- surface_size = PointXYi( 640, 480 );
- bounds = Recti( 5, 5, 640 - 5, 480 - 5 );
+ surface_size = iXY( 640, 480 );
+ bounds = iRect( 5, 5, 640 - 5, 480 - 5 );
max_char_per_line = (bounds.max.x - bounds.min.x) / 8;
@@ -80,7 +80,7 @@
stdout_pipe = false;
}
-void ConsoleInterface::setToSurfaceSize( PointXYi pix )
+void ConsoleInterface::setToSurfaceSize( iXY pix )
{
surface_size = pix;
@@ -250,7 +250,7 @@
void ConsoleInterface::update_overlap( Surface &surface )
{
- PointXYi current_line;
+ iXY current_line;
long index;
short visible_count;
@@ -299,7 +299,7 @@
if( input_string_active == true )
{
- PointXYi input_offset;
+ iXY input_offset;
unsigned long max_char_space;
unsigned long input_string_length;
char *string_ptr;
Index: netpanzer/src/NetPanzer/Interfaces/ConsoleInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/ConsoleInterface.hpp:1.2
netpanzer/src/NetPanzer/Interfaces/ConsoleInterface.hpp:1.3
--- netpanzer/src/NetPanzer/Interfaces/ConsoleInterface.hpp:1.2 Mon Sep 1
16:24:20 2003
+++ netpanzer/src/NetPanzer/Interfaces/ConsoleInterface.hpp Wed Sep 10
08:32:54 2003
@@ -22,7 +22,6 @@
#include <stdio.h>
#include "ArrayTemplate.hpp"
#include "Timer.hpp"
-#include "Point.hpp"
#include "Surface.hpp"
@@ -49,9 +48,9 @@
static long console_size;
static ConsoleLineArray line_list;
- static PointXYi surface_size;
- static Recti bounds;
- static PointXYi line_offset;
+ static iXY surface_size;
+ static iRect bounds;
+ static iXY line_offset;
static long vertical_spacing;
static long horizontal_spacing;
static long max_char_per_line;
@@ -69,7 +68,7 @@
static void initialize( long size );
- static void setToSurfaceSize( PointXYi pix );
+ static void setToSurfaceSize( iXY pix );
static void openLogFile( void );
static void closeLogFile( void );
Index: netpanzer/src/NetPanzer/Interfaces/GameConfig.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/GameConfig.hpp:1.4
netpanzer/src/NetPanzer/Interfaces/GameConfig.hpp:1.5
--- netpanzer/src/NetPanzer/Interfaces/GameConfig.hpp:1.4 Wed Sep 10
08:03:17 2003
+++ netpanzer/src/NetPanzer/Interfaces/GameConfig.hpp Wed Sep 10 08:32:54 2003
@@ -21,7 +21,6 @@
#include <assert.h>
#include <string.h>
-#include "Point.hpp"
#include "Surface.hpp"
#include "Color.hpp"
#include "PlayerUnitConfig.hpp"
@@ -955,24 +954,24 @@
return( "Invalid Mode" );
}
- static inline PointXYi getGameScreenResolutionSize( void )
+ static inline iXY getGameScreenResolutionSize( void )
{
switch(screen_resolution_enum)
{
case _game_config_standard_res_640x480 :
- return( PointXYi( 640, 480) );
+ return( iXY( 640, 480) );
break;
case _game_config_standard_res_800x600 :
- return( PointXYi( 800, 600) );
+ return( iXY( 800, 600) );
break;
case _game_config_standard_res_1024x768 :
- return( PointXYi(1024, 768) );
+ return( iXY(1024, 768) );
break;
}
- return( PointXYi( 640, 480) );
+ return( iXY( 640, 480) );
}
//***********************************************************
Index: netpanzer/src/NetPanzer/Interfaces/GameManager.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.31
netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.32
--- netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.31 Wed Sep 10
07:26:09 2003
+++ netpanzer/src/NetPanzer/Interfaces/GameManager.cpp Wed Sep 10 08:32:54 2003
@@ -170,8 +170,8 @@
int GameManager::execution_mode;
unsigned char GameManager::game_state = _game_state_idle;
-PointXYi GameManager::previous_video_mode_res;
-PointXYi GameManager::current_video_mode_res;
+iXY GameManager::previous_video_mode_res;
+iXY GameManager::current_video_mode_res;
BYTE GameManager::current_mode_flags;
@@ -186,7 +186,7 @@
LOG( ( "Setting Default Video Sub-system" ) );
- current_video_mode_res = PointXYi(640,480);
+ current_video_mode_res = iXY(640,480);
// don't go fullscreen for now
setVideoMode(current_video_mode_res, false);
loadPalette("wads/netp.act");
@@ -296,7 +296,7 @@
}
// ******************************************************************
-void GameManager::setVideoMode(const PointXYi& mode_res, bool fullscreen)
+void GameManager::setVideoMode(const iXY& mode_res, bool fullscreen)
{
if(!Screen->isDisplayModeAvailable( mode_res.x, mode_res.y, 8 ))
throw Exception("desired Video mode not available.");
@@ -336,7 +336,7 @@
void GameManager::increaseDisplayResolution()
{
- PointXYi new_mode;
+ iXY new_mode;
drawTextCenteredOnScreen("Changing Resolution", Color::white);
@@ -367,7 +367,7 @@
void GameManager::decreaseDisplayResolution()
{
- PointXYi new_mode;
+ iXY new_mode;
drawTextCenteredOnScreen("Changing Resolution", Color::white);
@@ -1089,7 +1089,7 @@
void GameManager::spawnPlayer( const PlayerID &player )
{
- PointXYi spawn_point;
+ iXY spawn_point;
sound->StopTankIdle();
@@ -1098,7 +1098,7 @@
PlayerInterface::spawnPlayer( player, spawn_point );
//** Change the location of the view camera to the spawn point **
- PointXYi world_loc;
+ iXY world_loc;
MapInterface::mapXYtoPointXY( spawn_point, &world_loc );
if ( PlayerInterface::getLocalPlayerIndex() == player.getIndex() )
{
Index: netpanzer/src/NetPanzer/Interfaces/GameManager.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/GameManager.hpp:1.5
netpanzer/src/NetPanzer/Interfaces/GameManager.hpp:1.6
--- netpanzer/src/NetPanzer/Interfaces/GameManager.hpp:1.5 Wed Sep 10
08:03:17 2003
+++ netpanzer/src/NetPanzer/Interfaces/GameManager.hpp Wed Sep 10 08:32:54 2003
@@ -22,10 +22,10 @@
#include <stdint.h>
#include "PlayerState.hpp"
#include "NetPacket.hpp"
-#include "Point.hpp"
#include "ClientConnectDaemon.hpp"
#include "ServerConnectDaemon.hpp"
#include "GameControlRulesDaemon.hpp"
+#include "iXY.hpp"
enum { _execution_mode_loop_back_server,
_execution_mode_dedicated_server
@@ -60,8 +60,8 @@
static int execution_mode;
- static PointXYi previous_video_mode_res;
- static PointXYi current_video_mode_res;
+ static iXY previous_video_mode_res;
+ static iXY current_video_mode_res;
static uint8_t current_mode_flags;
protected:
@@ -176,7 +176,7 @@
static void processSystemMessage( NetMessage *message );
- static void setVideoMode(const PointXYi& newmode, bool fullscreen);
+ static void setVideoMode(const iXY& newmode, bool fullscreen);
static void restorePreviousVideoMode();
static void increaseDisplayResolution();
Index: netpanzer/src/NetPanzer/Interfaces/MapInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/MapInterface.cpp:1.5
netpanzer/src/NetPanzer/Interfaces/MapInterface.cpp:1.6
--- netpanzer/src/NetPanzer/Interfaces/MapInterface.cpp:1.5 Mon Sep 8
11:32:04 2003
+++ netpanzer/src/NetPanzer/Interfaces/MapInterface.cpp Wed Sep 10 08:32:54 2003
@@ -187,7 +187,7 @@
} // ** for y_index
}
-unsigned char MapInterface::getMovementValue( PointXYi map_loc )
+unsigned char MapInterface::getMovementValue( iXY map_loc )
{
unsigned short tile_val;
char move_val;
@@ -279,7 +279,7 @@
}
-unsigned char MapInterface::getAverageColorPointXY( PointXYi &point_loc )
+unsigned char MapInterface::getAverageColorPointXY( iXY &point_loc )
{
unsigned long offset;
unsigned short map_value;
@@ -291,7 +291,7 @@
return( tile_set.getAverageTileColor( map_value ) );
}
-unsigned char MapInterface::getAverageColorMapXY( PointXYi &map_loc )
+unsigned char MapInterface::getAverageColorMapXY( iXY &map_loc )
{
unsigned short map_value;
Index: netpanzer/src/NetPanzer/Interfaces/MapInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/MapInterface.hpp:1.4
netpanzer/src/NetPanzer/Interfaces/MapInterface.hpp:1.5
--- netpanzer/src/NetPanzer/Interfaces/MapInterface.hpp:1.4 Wed Sep 10
08:03:17 2003
+++ netpanzer/src/NetPanzer/Interfaces/MapInterface.hpp Wed Sep 10 08:32:54 2003
@@ -22,7 +22,6 @@
#include "WorldMap.hpp"
#include "SpawnList.hpp"
#include "WadMapTable.hpp"
-#include "Point.hpp"
#include "Surface.hpp"
@@ -40,21 +39,21 @@
static void buildMiniMapSurface( void );
public:
- static inline void getMapPointSize(PointXYi *map_size)
+ static inline void getMapPointSize(iXY *map_size)
{
map_size->x = main_map.getXsize() * tile_set.getTileXsize();
map_size->y = main_map.getYsize() * tile_set.getTileYsize();
}
- static inline void getMapSize(PointXYi *map_size)
+ static inline void getMapSize(iXY *map_size)
{
map_size->x = main_map.getXsize();
map_size->y = main_map.getYsize();
}
- static inline PointXYi getMapSize()
+ static inline iXY getMapSize()
{
- return( PointXYi( main_map.getXsize(), main_map.getYsize() ) );
+ return( iXY( main_map.getXsize(), main_map.getYsize() ) );
}
static inline unsigned long getMapXsize()
@@ -94,7 +93,7 @@
main_map.offsetToMapXY( offset, map_x, map_y );
}
- static inline void offsetToMapXY( unsigned long offset, PointXYi *map_loc )
+ static inline void offsetToMapXY( unsigned long offset, iXY *map_loc )
{
unsigned short map_x, map_y;
main_map.offsetToMapXY( offset, &map_x, &map_y );
@@ -109,7 +108,7 @@
*point_y = (map_y * 32) + (32 / 2);
}
- static void mapXYtoPointXY( PointXYi map_loc, PointXYi *loc )
+ static void mapXYtoPointXY( iXY map_loc, iXY *loc )
{
loc->x = (map_loc.x * 32) + (32 / 2);
loc->y = (map_loc.y * 32) + (32 / 2);
@@ -122,7 +121,7 @@
*map_y = (unsigned short ) point_y / 32;
}
- static inline void pointXYtoMapXY( PointXYi point, PointXYi *map_loc )
+ static inline void pointXYtoMapXY( iXY point, iXY *map_loc )
{
map_loc->x = (unsigned short ) point.x / 32;
map_loc->y = (unsigned short ) point.y / 32;
@@ -134,12 +133,12 @@
main_map.mapXYtoOffset( map_x, map_y, offset );
}
- static inline void mapXYtoOffset( PointXYi &map_loc, unsigned long *offset )
+ static inline void mapXYtoOffset( iXY &map_loc, unsigned long *offset )
{
main_map.mapXYtoOffset( map_loc.x, map_loc.y, offset );
}
- static inline void markLocHack( const PointXYi &loc )
+ static inline void markLocHack( const iXY &loc )
{
unsigned short *map_buffer;
unsigned long offset;
@@ -148,7 +147,7 @@
map_buffer[ offset ] = 27;
}
- static inline void unmarkLocHack( const PointXYi &loc )
+ static inline void unmarkLocHack( const iXY &loc )
{
unsigned short *map_buffer;
unsigned long offset;
@@ -189,13 +188,13 @@
return ( &mini_map_surface );
}
- static unsigned char getMovementValue( PointXYi map_loc );
+ static unsigned char getMovementValue( iXY map_loc );
- static unsigned char getAverageColorPointXY( PointXYi &point_loc );
+ static unsigned char getAverageColorPointXY( iXY &point_loc );
- static unsigned char getAverageColorMapXY( PointXYi &map_loc );
+ static unsigned char getAverageColorMapXY( iXY &map_loc );
- static inline void getFreeSpawnPoint( PointXYi *spawn_loc )
+ static inline void getFreeSpawnPoint( iXY *spawn_loc )
{
spawn_list.getFreeSpawnPoint( spawn_loc );
}
Index: netpanzer/src/NetPanzer/Interfaces/MapsManager.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/MapsManager.hpp:1.1
netpanzer/src/NetPanzer/Interfaces/MapsManager.hpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/MapsManager.hpp:1.1 Sun Dec 1
12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/MapsManager.hpp Wed Sep 10 08:32:54 2003
@@ -19,7 +19,6 @@
#define _MAPS_MANAGER_HPP
#include "FileList.hpp"
-#include "Point.hpp"
enum { _mapfile_valid, _mapfile_not_found, _wadfile_not_found };
Index: netpanzer/src/NetPanzer/Interfaces/MiniMapInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/MiniMapInterface.cpp:1.3
netpanzer/src/NetPanzer/Interfaces/MiniMapInterface.cpp:1.4
--- netpanzer/src/NetPanzer/Interfaces/MiniMapInterface.cpp:1.3 Fri Sep 5
22:01:19 2003
+++ netpanzer/src/NetPanzer/Interfaces/MiniMapInterface.cpp Wed Sep 10
08:32:54 2003
@@ -28,7 +28,7 @@
#include "GameConfig.hpp"
fXY MiniMapInterface::scale_factor;
-PointXYi MiniMapInterface::mini_map_size;
+iXY MiniMapInterface::mini_map_size;
bool MiniMapInterface::pathing_debug_mode = false;
PIX MiniMapInterface::player_unit_color;
@@ -44,9 +44,9 @@
TimerFrameBase MiniMapInterface::show_enemy_radar_timer;
bool MiniMapInterface::show_enemy_radar_flag;
-Recti MiniMapInterface::getWorldWindow( void )
+iRect MiniMapInterface::getWorldWindow( void )
{
- Recti world_win;
+ iRect world_win;
WorldViewInterface::getViewWindow( &world_win );
world_win.min.x = int(float(world_win.min.x) / scale_factor.x);
@@ -57,9 +57,9 @@
return( world_win );
}
-void MiniMapInterface::setMapScale(const PointXYi &mini_map_size)
+void MiniMapInterface::setMapScale(const iXY &mini_map_size)
{
- PointXYi map_size;
+ iXY map_size;
MiniMapInterface::mini_map_size = mini_map_size;
@@ -68,7 +68,7 @@
scale_factor.y = float(map_size.y) / float(mini_map_size.y);
}
-void MiniMapInterface::setWorldWindowPosition( PointXYi world_loc )
+void MiniMapInterface::setWorldWindowPosition( iXY world_loc )
{
world_loc.x = int(float(world_loc.x) * scale_factor.x);
world_loc.y = int(float(world_loc.y) * scale_factor.y);
@@ -78,7 +78,7 @@
void MiniMapInterface::annotateUnits( Surface &map_surface )
{
- PointXYi world_loc, map_loc;
+ iXY world_loc, map_loc;
unsigned char unit_dispostion;
unsigned char threat_level;
@@ -152,7 +152,7 @@
void MiniMapInterface::annotateObjectives( Surface &map_surface )
{
- Recti world_rect, map_rect;
+ iRect world_rect, map_rect;
unsigned char objective_disposition;
PIX color;
@@ -246,7 +246,7 @@
return( COMMAND_PROCESSOR.isUnitSelected() );
}
-bool MiniMapInterface::selectUnits( Recti bound_box )
+bool MiniMapInterface::selectUnits( iRect bound_box )
{
bound_box.min.x = int(float(bound_box.min.x) * scale_factor.x);
bound_box.min.y = int(float(bound_box.min.y) * scale_factor.y);
@@ -261,7 +261,7 @@
COMMAND_PROCESSOR.deselectUnitsExternal();
}
-bool MiniMapInterface::isValidUnitMove( PointXYi location )
+bool MiniMapInterface::isValidUnitMove( iXY location )
{
location.x = location.x * scale_factor.x;
location.y = location.y * scale_factor.y;
@@ -269,7 +269,7 @@
return( COMMAND_PROCESSOR.isValidMoveLocation( location ) );
}
-bool MiniMapInterface::moveUnits( PointXYi location )
+bool MiniMapInterface::moveUnits( iXY location )
{
location.x = location.x * scale_factor.x;
location.y = location.y * scale_factor.y;
@@ -309,7 +309,7 @@
show_enemy_radar_flag = false;
}
-void MiniMapInterface::drawLargeUnitDot( const Surface &dest, const PointXYi
&location, unsigned char color )
+void MiniMapInterface::drawLargeUnitDot( const Surface &dest, const iXY
&location, unsigned char color )
{
// Center
dest.putPixel( location.x, location.y, color );
@@ -330,7 +330,7 @@
//dest.putPixel( location.x + 2, location.y + 1, Color::black );
}
-void MiniMapInterface::drawSmallUnitDot( const Surface &dest, const PointXYi
&location, unsigned char color )
+void MiniMapInterface::drawSmallUnitDot( const Surface &dest, const iXY
&location, unsigned char color )
{
dest.putPixel( location, color );
}
Index: netpanzer/src/NetPanzer/Interfaces/MiniMapInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/MiniMapInterface.hpp:1.3
netpanzer/src/NetPanzer/Interfaces/MiniMapInterface.hpp:1.4
--- netpanzer/src/NetPanzer/Interfaces/MiniMapInterface.hpp:1.3 Wed Sep 10
08:03:17 2003
+++ netpanzer/src/NetPanzer/Interfaces/MiniMapInterface.hpp Wed Sep 10
08:32:54 2003
@@ -27,7 +27,7 @@
{
protected:
static fXY scale_factor;
- static PointXYi mini_map_size;
+ static iXY mini_map_size;
static bool pathing_debug_mode;
static TimerFrameBase radar_blink_timer;
@@ -45,8 +45,8 @@
static void annotateUnits( Surface &map_surface );
static void annotateObjectives( Surface &map_surface );
- static void drawLargeUnitDot( const Surface &dest, const PointXYi
&location, unsigned char color );
- static void drawSmallUnitDot( const Surface &dest, const PointXYi
&location, unsigned char color );
+ static void drawLargeUnitDot( const Surface &dest, const iXY &location,
unsigned char color );
+ static void drawSmallUnitDot( const Surface &dest, const iXY &location,
unsigned char color );
public:
@@ -55,20 +55,20 @@
return( MapInterface::getMiniMapSurface() );
}
- static Recti getWorldWindow( void );
+ static iRect getWorldWindow( void );
- static void setMapScale(const PointXYi &mini_map_size);
- static const PointXYi &getMapScale() { return mini_map_size; }
+ static void setMapScale(const iXY &mini_map_size);
+ static const iXY &getMapScale() { return mini_map_size; }
- static void setWorldWindowPosition( PointXYi world_loc );
+ static void setWorldWindowPosition( iXY world_loc );
static void annotateMiniMap( Surface &map_surface );
static bool isUnitSelected( void );
static void deselectUnits( void );
- static bool selectUnits( Recti bound_box );
- static bool isValidUnitMove( PointXYi location );
- static bool moveUnits( PointXYi location );
+ static bool selectUnits( iRect bound_box );
+ static bool isValidUnitMove( iXY location );
+ static bool moveUnits( iXY location );
static void setPathingDebugMode( bool on_off );
Index: netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp:1.6
netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp:1.7
--- netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp:1.6 Sat Sep 6
18:31:20 2003
+++ netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp Wed Sep 10
08:32:54 2003
@@ -39,29 +39,29 @@
unsigned char MouseInterface::cursor_y_size;
Surface MouseInterface::mouse_cursor( false );
-PointXYi MouseInterface::mouse_pos;
+iXY MouseInterface::mouse_pos;
float MouseInterface::button_hold_threshold = (const float) .10;
bool MouseInterface::left_button_down = false;
bool MouseInterface::left_button_up = false;
bool MouseInterface::left_button_dbclick_active = false;
-PointXYi MouseInterface::left_button_down_pos;
-PointXYi MouseInterface::left_button_up_pos;
+iXY MouseInterface::left_button_down_pos;
+iXY MouseInterface::left_button_up_pos;
TIMESTAMP MouseInterface::left_button_hold_time;
bool MouseInterface::right_button_down = false;
bool MouseInterface::right_button_up = false;
bool MouseInterface::right_button_dbclick_active = false;
-PointXYi MouseInterface::right_button_down_pos;
-PointXYi MouseInterface::right_button_up_pos;
+iXY MouseInterface::right_button_down_pos;
+iXY MouseInterface::right_button_up_pos;
TIMESTAMP MouseInterface::right_button_hold_time;
bool MouseInterface::middle_button_down = false;
bool MouseInterface::middle_button_up = false;
bool MouseInterface::middle_button_dbclick_active = false;
-PointXYi MouseInterface::middle_button_down_pos;
-PointXYi MouseInterface::middle_button_up_pos;
+iXY MouseInterface::middle_button_down_pos;
+iXY MouseInterface::middle_button_up_pos;
TIMESTAMP MouseInterface::middle_button_hold_time;
unsigned char MouseInterface::button_mask;
Index: netpanzer/src/NetPanzer/Interfaces/MouseInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/MouseInterface.hpp:1.5
netpanzer/src/NetPanzer/Interfaces/MouseInterface.hpp:1.6
--- netpanzer/src/NetPanzer/Interfaces/MouseInterface.hpp:1.5 Wed Sep 10
08:03:17 2003
+++ netpanzer/src/NetPanzer/Interfaces/MouseInterface.hpp Wed Sep 10
08:32:54 2003
@@ -18,7 +18,6 @@
#ifndef _MOUSEINTERFACE_HPP
#define _MOUSEINTERFACE_HPP
-#include "Point.hpp"
#include "QueueTemplate.hpp"
#include "Surface.hpp"
@@ -39,8 +38,8 @@
};
unsigned char button;
unsigned char event;
- PointXYi down_pos;
- PointXYi up_pos;
+ iXY down_pos;
+ iXY up_pos;
};
typedef QueueTemplate< MouseEvent > MouseEventQueue;
@@ -53,29 +52,29 @@
static unsigned char cursor_y_size;
protected:
- static PointXYi mouse_pos;
+ static iXY mouse_pos;
static float button_hold_threshold;
static bool left_button_down;
static bool left_button_up;
static bool left_button_dbclick_active;
- static PointXYi left_button_down_pos;
- static PointXYi left_button_up_pos;
+ static iXY left_button_down_pos;
+ static iXY left_button_up_pos;
static TIMESTAMP left_button_hold_time;
static bool right_button_down;
static bool right_button_up;
static bool right_button_dbclick_active;
- static PointXYi right_button_down_pos;
- static PointXYi right_button_up_pos;
+ static iXY right_button_down_pos;
+ static iXY right_button_up_pos;
static TIMESTAMP right_button_hold_time;
static bool middle_button_down;
static bool middle_button_up;
static bool middle_button_dbclick_active;
- static PointXYi middle_button_down_pos;
- static PointXYi middle_button_up_pos;
+ static iXY middle_button_down_pos;
+ static iXY middle_button_up_pos;
static TIMESTAMP middle_button_hold_time;
static unsigned char button_mask;
Index: netpanzer/src/NetPanzer/Interfaces/ObjectiveInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/ObjectiveInterface.cpp:1.5
netpanzer/src/NetPanzer/Interfaces/ObjectiveInterface.cpp:1.6
--- netpanzer/src/NetPanzer/Interfaces/ObjectiveInterface.cpp:1.5 Sun Sep
7 14:39:32 2003
+++ netpanzer/src/NetPanzer/Interfaces/ObjectiveInterface.cpp Wed Sep 10
08:32:54 2003
@@ -86,7 +86,7 @@
MapInterface::mapXYtoPointXY( loc_x, loc_y, &world_x, &world_y );
- objective_obj = new Outpost( objective_index, PointXYi( world_x, world_y ),
+ objective_obj = new Outpost( objective_index, iXY( world_x, world_y ),
BoundBox( -48, -32, 48, 32 )
);
@@ -98,7 +98,7 @@
}
unsigned char ObjectiveInterface::
- quearyObjectiveLocationStatus( PointXYi &loc,
+ quearyObjectiveLocationStatus( iXY &loc,
PlayerID &player,
Objective **objective_ptr )
{
@@ -298,7 +298,7 @@
objective_position_enum_player_id = PlayerInterface::getLocalPlayerID();
}
-bool ObjectiveInterface::objectivePositionEnumeration( Recti *objective_rect,
unsigned char *objective_disposition, int *objective_id )
+bool ObjectiveInterface::objectivePositionEnumeration( iRect *objective_rect,
unsigned char *objective_disposition, int *objective_id )
{
ObjectiveState *objective_state;
Index: netpanzer/src/NetPanzer/Interfaces/ObjectiveInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/ObjectiveInterface.hpp:1.3
netpanzer/src/NetPanzer/Interfaces/ObjectiveInterface.hpp:1.4
--- netpanzer/src/NetPanzer/Interfaces/ObjectiveInterface.hpp:1.3 Wed Sep
10 08:03:17 2003
+++ netpanzer/src/NetPanzer/Interfaces/ObjectiveInterface.hpp Wed Sep 10
08:32:54 2003
@@ -51,7 +51,7 @@
static void loadObjectiveList( char *file_path );
- static unsigned char quearyObjectiveLocationStatus( PointXYi &loc,
+ static unsigned char quearyObjectiveLocationStatus( iXY &loc,
PlayerID &player,
Objective
**objective_ptr );
@@ -87,7 +87,7 @@
public:
static void startObjectivePositionEnumeration( void );
- static bool objectivePositionEnumeration( Recti *objective_rect, unsigned
char *objective_disposition, int *objective_id );
+ static bool objectivePositionEnumeration( iRect *objective_rect, unsigned
char *objective_disposition, int *objective_id );
};
Index: netpanzer/src/NetPanzer/Interfaces/PathScheduler.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/PathScheduler.cpp:1.3
netpanzer/src/NetPanzer/Interfaces/PathScheduler.cpp:1.4
--- netpanzer/src/NetPanzer/Interfaces/PathScheduler.cpp:1.3 Fri Sep 5
22:01:19 2003
+++ netpanzer/src/NetPanzer/Interfaces/PathScheduler.cpp Wed Sep 10
08:32:54 2003
@@ -216,7 +216,7 @@
case _pathing_fsm_state_initialize :
{
unsigned long abs_new_goal;
- PointXYi new_goal;
+ iXY new_goal;
unsigned long path_length;
path_length = path_request.path->listCount();
@@ -276,7 +276,7 @@
case _pathing_fsm_state_initialize_part_a :
{
unsigned long abs_new_goal;
- PointXYi new_goal;
+ iXY new_goal;
working_start = path_request.start;
working_goal = path_request.goal;
@@ -311,7 +311,7 @@
case _pathing_fsm_state_initialize_part_b :
{
unsigned long abs_new_goal;
- PointXYi new_goal;
+ iXY new_goal;
for ( unsigned long i = 0; i < path_splice_length; i++ )
{ path_request.path->popLast( &abs_new_goal ); }
Index: netpanzer/src/NetPanzer/Interfaces/PathScheduler.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/PathScheduler.hpp:1.4
netpanzer/src/NetPanzer/Interfaces/PathScheduler.hpp:1.5
--- netpanzer/src/NetPanzer/Interfaces/PathScheduler.hpp:1.4 Wed Sep 10
08:03:17 2003
+++ netpanzer/src/NetPanzer/Interfaces/PathScheduler.hpp Wed Sep 10
08:32:54 2003
@@ -18,7 +18,6 @@
#ifndef _PATHSCHEDULER_HPP
#define _PATHSCHEDULER_HPP
-#include "Point.hpp"
#include "Astar.hpp"
#include "PathList.hpp"
#include "UnitID.hpp"
@@ -29,12 +28,12 @@
class PathCacheEntry
{
public:
- PointXYi start;
- PointXYi goal;
+ iXY start;
+ iXY goal;
PathList path;
bool valid;
- inline void set( PointXYi start, PointXYi goal, PathList &path )
+ inline void set( iXY start, iXY goal, PathList &path )
{
PathCacheEntry::start = start;
PathCacheEntry::goal = goal;
@@ -115,8 +114,8 @@
unsigned long path_update_length;
void pathingFsmUpdatePath( void );
- PointXYi working_start;
- PointXYi working_goal;
+ iXY working_start;
+ iXY working_goal;
unsigned long path_splice_length;
void pathingFsmCachePath( void );
Index: netpanzer/src/NetPanzer/Interfaces/PlayerInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/PlayerInterface.cpp:1.4
netpanzer/src/NetPanzer/Interfaces/PlayerInterface.cpp:1.5
--- netpanzer/src/NetPanzer/Interfaces/PlayerInterface.cpp:1.4 Sun Sep 7
14:39:32 2003
+++ netpanzer/src/NetPanzer/Interfaces/PlayerInterface.cpp Wed Sep 10
08:32:54 2003
@@ -254,7 +254,7 @@
return( 0 );
}
-void PlayerInterface::spawnPlayer( unsigned short player_index, const PointXYi
&location )
+void PlayerInterface::spawnPlayer( unsigned short player_index, const iXY
&location )
{
assert( player_index < max_players );
@@ -263,7 +263,7 @@
);
}
-void PlayerInterface::spawnPlayer( const PlayerID &player, const PointXYi
&location )
+void PlayerInterface::spawnPlayer( const PlayerID &player, const iXY &location
)
{
unsigned short player_index;
Index: netpanzer/src/NetPanzer/Interfaces/PlayerInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/PlayerInterface.hpp:1.3
netpanzer/src/NetPanzer/Interfaces/PlayerInterface.hpp:1.4
--- netpanzer/src/NetPanzer/Interfaces/PlayerInterface.hpp:1.3 Wed Sep 10
08:03:18 2003
+++ netpanzer/src/NetPanzer/Interfaces/PlayerInterface.hpp Wed Sep 10
08:32:54 2003
@@ -127,8 +127,8 @@
static PlayerState * allocateNewPlayer( void );
- static void spawnPlayer( unsigned short player_index, const PointXYi
&location );
- static void spawnPlayer( const PlayerID &player, const PointXYi &location );
+ static void spawnPlayer( unsigned short player_index, const iXY &location );
+ static void spawnPlayer( const PlayerID &player, const iXY &location );
static bool testRuleScoreLimit( long score_limit, PlayerState **
player_state );
Index: netpanzer/src/NetPanzer/Interfaces/PowerUpInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/PowerUpInterface.cpp:1.5
netpanzer/src/NetPanzer/Interfaces/PowerUpInterface.cpp:1.6
--- netpanzer/src/NetPanzer/Interfaces/PowerUpInterface.cpp:1.5 Sun Sep 7
14:39:32 2003
+++ netpanzer/src/NetPanzer/Interfaces/PowerUpInterface.cpp Wed Sep 10
08:32:54 2003
@@ -173,7 +173,7 @@
PowerUp *power_up;
float next_regen_interval;
PowerUpCreateMesg create_mesg;
- PointXYi loc;
+ iXY loc;
if( (powerup_list.getItemCount() < power_up_limit) )
{
Index: netpanzer/src/NetPanzer/Interfaces/ProjectileInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/ProjectileInterface.cpp:1.4
netpanzer/src/NetPanzer/Interfaces/ProjectileInterface.cpp:1.5
--- netpanzer/src/NetPanzer/Interfaces/ProjectileInterface.cpp:1.4 Sat Sep
6 06:34:29 2003
+++ netpanzer/src/NetPanzer/Interfaces/ProjectileInterface.cpp Wed Sep 10
08:32:54 2003
@@ -70,7 +70,7 @@
void ProjectileInterface::newProjectile( unsigned short projectile_type,
unsigned short owner_type_id,
UnitID &owner, unsigned short damage,
- PointXYi &start, PointXYi &end )
+ iXY &start, iXY &end )
{
Projectile *temp;
@@ -86,8 +86,8 @@
{
// The following code launches 4 missles spaced out evenly like they
would be in a
// missle bay.
- PointXYi startPos;
- PointXYi endPos;
+ iXY startPos;
+ iXY endPos;
const float startRadius = 5.0f;
const int endRadius = 50;
@@ -96,7 +96,7 @@
fXY offsetPos;
//// West outer
- endPos = PointXYi(end.x + (rand() % endRadius << 1) - endRadius,
end.y + (rand() % endRadius << 1) - endRadius);
+ endPos = iXY(end.x + (rand() % endRadius << 1) - endRadius, end.y
+ (rand() % endRadius << 1) - endRadius);
offsetPos = Math::unitDirectionWest(direction) * startRadius * 2;
startPos = start + iXY(offsetPos.x, offsetPos.y);
temp = new MissleWeapon( owner, owner_type_id, damage, startPos,
endPos);
@@ -105,7 +105,7 @@
ParticleInterface::addMissleLaunchPuff(startPos, direction,
owner_type_id);
// West inner
- endPos = PointXYi(end.x + (rand() % endRadius << 1) - endRadius,
end.y + (rand() % endRadius << 1) - endRadius);
+ endPos = iXY(end.x + (rand() % endRadius << 1) - endRadius, end.y
+ (rand() % endRadius << 1) - endRadius);
offsetPos = Math::unitDirectionWest(direction) * startRadius;
startPos = start + iXY(offsetPos.x, offsetPos.y);
temp = new MissleWeapon( owner, owner_type_id, damage, startPos,
endPos);
@@ -113,7 +113,7 @@
ParticleInterface::addMissleLaunchPuff(startPos, direction,
owner_type_id);
// East inner
- endPos = PointXYi(end.x + (rand() % endRadius << 1) - endRadius,
end.y + (rand() % endRadius << 1) - endRadius);
+ endPos = iXY(end.x + (rand() % endRadius << 1) - endRadius, end.y
+ (rand() % endRadius << 1) - endRadius);
offsetPos = Math::unitDirectionEast(direction) * startRadius;
startPos = start + iXY(offsetPos.x, offsetPos.y);
temp = new MissleWeapon( owner, owner_type_id, damage, startPos,
endPos);
@@ -121,7 +121,7 @@
ParticleInterface::addMissleLaunchPuff(startPos, direction,
owner_type_id);
//// East outer
- endPos = PointXYi(end.x + (rand() % endRadius << 1) - endRadius,
end.y + (rand() % endRadius << 1) - endRadius);
+ endPos = iXY(end.x + (rand() % endRadius << 1) - endRadius, end.y
+ (rand() % endRadius << 1) - endRadius);
offsetPos = Math::unitDirectionEast(direction) * startRadius * 2;
startPos = start + iXY(offsetPos.x, offsetPos.y);
temp = new MissleWeapon( owner, owner_type_id, damage, startPos,
endPos);
@@ -142,8 +142,8 @@
{
// The following code launches 4 missles spaced out evenly like they
would be in a
// missle bay.
- PointXYi startPos;
- PointXYi endPos;
+ iXY startPos;
+ iXY endPos;
const float startRadius = 5.0f;
const int endRadius = 30;
@@ -152,7 +152,7 @@
fXY offsetPos;
//// West outer
- //endPos = PointXYi(end.x + (rand() % endRadius << 1) - endRadius,
end.y + (rand() % endRadius << 1) - endRadius);
+ //endPos = iXY(end.x + (rand() % endRadius << 1) - endRadius,
end.y + (rand() % endRadius << 1) - endRadius);
//offsetPos = Math::unitDirectionWest(direction) * startRadius * 2;
//startPos = start + iXY(offsetPos.x, offsetPos.y);
//temp = new MissleWeapon( owner, owner_type_id, damage, startPos,
endPos);
@@ -161,7 +161,7 @@
ParticleInterface::addMissleLaunchPuff(startPos, direction,
owner_type_id);
// West inner
- endPos = PointXYi(end.x + (rand() % endRadius << 1) - endRadius,
end.y + (rand() % endRadius << 1) - endRadius);
+ endPos = iXY(end.x + (rand() % endRadius << 1) - endRadius, end.y
+ (rand() % endRadius << 1) - endRadius);
offsetPos = Math::unitDirectionWest(direction) * startRadius;
startPos = start + iXY(offsetPos.x, offsetPos.y);
temp = new MissleWeapon( owner, owner_type_id, damage, startPos,
endPos);
@@ -169,7 +169,7 @@
ParticleInterface::addMissleLaunchPuff(startPos, direction,
owner_type_id);
// East inner
- endPos = PointXYi(end.x + (rand() % endRadius << 1) - endRadius,
end.y + (rand() % endRadius << 1) - endRadius);
+ endPos = iXY(end.x + (rand() % endRadius << 1) - endRadius, end.y
+ (rand() % endRadius << 1) - endRadius);
offsetPos = Math::unitDirectionEast(direction) * startRadius;
startPos = start + iXY(offsetPos.x, offsetPos.y);
temp = new MissleWeapon( owner, owner_type_id, damage, startPos,
endPos);
@@ -177,7 +177,7 @@
ParticleInterface::addMissleLaunchPuff(startPos, direction,
owner_type_id);
//// East outer
- //endPos = PointXYi(end.x + (rand() % endRadius << 1) - endRadius,
end.y + (rand() % endRadius << 1) - endRadius);
+ //endPos = iXY(end.x + (rand() % endRadius << 1) - endRadius,
end.y + (rand() % endRadius << 1) - endRadius);
//offsetPos = Math::unitDirectionEast(direction) * startRadius * 2;
//startPos = start + iXY(offsetPos.x, offsetPos.y);
//temp = new MissleWeapon( owner, owner_type_id, damage, startPos,
endPos);
Index: netpanzer/src/NetPanzer/Interfaces/ProjectileInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/ProjectileInterface.hpp:1.3
netpanzer/src/NetPanzer/Interfaces/ProjectileInterface.hpp:1.4
--- netpanzer/src/NetPanzer/Interfaces/ProjectileInterface.hpp:1.3 Wed Sep
10 08:03:18 2003
+++ netpanzer/src/NetPanzer/Interfaces/ProjectileInterface.hpp Wed Sep 10
08:32:54 2003
@@ -36,7 +36,7 @@
static void newProjectile( unsigned short projectile_type,
unsigned short owner_type_id,
UnitID &owner, unsigned short damage,
- PointXYi &start, PointXYi &end );
+ iXY &start, iXY &end );
static void updateStatus( void );
Index: netpanzer/src/NetPanzer/Interfaces/StaticsInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/StaticsInterface.cpp:1.3
netpanzer/src/NetPanzer/Interfaces/StaticsInterface.cpp:1.4
--- netpanzer/src/NetPanzer/Interfaces/StaticsInterface.cpp:1.3 Fri Sep 5
22:01:19 2003
+++ netpanzer/src/NetPanzer/Interfaces/StaticsInterface.cpp Wed Sep 10
08:32:54 2003
@@ -42,7 +42,7 @@
{
fscanf( input_file, "%d %d %d", &type, &x_loc, &y_loc );
- sprite->setAttrib( PointXYi( x_loc, y_loc ), 0 );
+ sprite->setAttrib( iXY( x_loc, y_loc ), 0 );
static_sprite_list.add( sprite, static_count );
static_count++;
Index: netpanzer/src/NetPanzer/Interfaces/TileInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/TileInterface.cpp:1.3
netpanzer/src/NetPanzer/Interfaces/TileInterface.cpp:1.4
--- netpanzer/src/NetPanzer/Interfaces/TileInterface.cpp:1.3 Fri Sep 5
22:01:19 2003
+++ netpanzer/src/NetPanzer/Interfaces/TileInterface.cpp Wed Sep 10
08:32:54 2003
@@ -27,9 +27,9 @@
tile_set.loadTileSet( file_path );
}
-PointXYi TileInterface::getTileSize( void )
+iXY TileInterface::getTileSize( void )
{
- return( PointXYi( tile_set.getTileXsize(), tile_set.getTileYsize() ) );
+ return( iXY( tile_set.getTileXsize(), tile_set.getTileYsize() ) );
}
PIX TileInterface::getWorldPixColor(int worldX, int worldY)
Index: netpanzer/src/NetPanzer/Interfaces/TileInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/TileInterface.hpp:1.4
netpanzer/src/NetPanzer/Interfaces/TileInterface.hpp:1.5
--- netpanzer/src/NetPanzer/Interfaces/TileInterface.hpp:1.4 Wed Sep 10
08:03:18 2003
+++ netpanzer/src/NetPanzer/Interfaces/TileInterface.hpp Wed Sep 10
08:32:54 2003
@@ -21,7 +21,6 @@
#include "Surface.hpp"
#include "TileSet.hpp"
#include "Palette.hpp"
-#include "Point.hpp"
class TileInterface
{
@@ -36,7 +35,7 @@
return ( &tile_set );
}
- static PointXYi getTileSize( void );
+ static iXY getTileSize( void );
static PIX getWorldPixColor(int worldX, int worldY);
static long getWorldPixMovementValue(int worldX, int worldY);
Index: netpanzer/src/NetPanzer/Interfaces/UnitInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/UnitInterface.cpp:1.5
netpanzer/src/NetPanzer/Interfaces/UnitInterface.cpp:1.6
--- netpanzer/src/NetPanzer/Interfaces/UnitInterface.cpp:1.5 Sun Sep 7
14:39:32 2003
+++ netpanzer/src/NetPanzer/Interfaces/UnitInterface.cpp Wed Sep 10
08:32:54 2003
@@ -251,8 +251,8 @@
void UnitInterface::offloadGraphics( SpriteSorter &sorter )
{
- Recti world_window_rect;
- Recti bucket_rect;
+ iRect world_window_rect;
+ iRect bucket_rect;
UnitBucketList *bucket_list;
UnitBucketPointer *traversal_ptr;
@@ -310,7 +310,7 @@
UnitBase * UnitInterface::newUnit( unsigned short unit_type,
- const PointXYi &location,
+ const iXY &location,
unsigned short player_index )
{
UnitBase *unit = 0;
@@ -461,7 +461,7 @@
// ******************************************************************
UnitBase * UnitInterface::createUnit( unsigned short unit_type,
- const PointXYi &location,
+ const iXY &location,
const PlayerID &player
)
{
@@ -482,10 +482,10 @@
// ******************************************************************
-void UnitInterface::spawnPlayerUnits( const PointXYi &location,
+void UnitInterface::spawnPlayerUnits( const iXY &location,
const PlayerID &player, const PlayerUnitConfig &unit_config )
{
- PointXYi next_loc;
+ iXY next_loc;
UnitBase *unit;
UnitRemoteCreate create_mesg;
unsigned long unit_type_index;
@@ -504,11 +504,11 @@
{
for( long map_x = 0; map_x < map_x_size; map_x++ )
{
- if ( MapInterface::getMovementValue( PointXYi( map_x, map_y ) ) !=
0xFF )
+ if ( MapInterface::getMovementValue( iXY( map_x, map_y ) ) != 0xFF )
{
if( unit_count < 1000 ) // <- CHANGE YOUR UNIT COUNT HERE
{
- unit = createUnit( _unit_type_humvee, PointXYi( map_x, map_y ),
player );
+ unit = createUnit( _unit_type_humvee, iXY( map_x, map_y ), player );
unit_count++;
}
}
@@ -600,7 +600,7 @@
// ******************************************************************
bool UnitInterface::quearyClosestUnit( UnitBase **closest_unit_ptr,
- PointXYi &loc,
+ iXY &loc,
PlayerID &player_id,
unsigned char search_flags )
{
@@ -625,7 +625,7 @@
unit_ptr = unit_lists[ list_index ].incIteratorPtr( &iterator );
while( unit_ptr != 0 )
{
- PointXYi delta;
+ iXY delta;
long temp_mag;
if ( closest_unit == 0 )
@@ -663,11 +663,11 @@
return( false );
}
-bool UnitInterface::quearyClosestUnit( UnitBase **closest_unit_ptr, Recti
&bounding_rect, PointXYi &loc )
+bool UnitInterface::quearyClosestUnit( UnitBase **closest_unit_ptr, iRect
&bounding_rect, iXY &loc )
{
UnitBase *closest_unit = 0;
long closest_magnitude;
- Recti bucket_rect;
+ iRect bucket_rect;
UnitBucketList *bucket_list;
UnitBucketPointer *traversal_ptr;
@@ -683,7 +683,7 @@
while( traversal_ptr != 0 )
{
- PointXYi delta;
+ iXY delta;
long temp_mag;
if ( closest_unit == 0 )
@@ -721,7 +721,7 @@
// ******************************************************************
bool UnitInterface::quearyClosestEnemyUnit( UnitBase **closest_unit_ptr,
- PointXYi &loc,
+ iXY &loc,
unsigned short player_index
)
{
@@ -742,7 +742,7 @@
unit_ptr = unit_lists[ list_index ].incIteratorPtr( &iterator );
while( unit_ptr != 0 )
{
- PointXYi delta;
+ iXY delta;
long temp_mag;
if ( closest_unit == 0 )
@@ -783,7 +783,7 @@
// ******************************************************************
-unsigned char UnitInterface::quearyUnitLocationStatus( PointXYi loc )
+unsigned char UnitInterface::quearyUnitLocationStatus( iXY loc )
{
PlayerID player_id;
unsigned long player_index;
@@ -824,13 +824,13 @@
// ******************************************************************
-bool UnitInterface::quearyUnitAtMapLoc( PointXYi map_loc, UnitID
*queary_unit_id )
+bool UnitInterface::quearyUnitAtMapLoc( iXY map_loc, UnitID *queary_unit_id )
{
UnitBase *unit_ptr;
UnitState *unit_state;
UnitPointer *iterator;
unsigned long list_index;
- PointXYi unit_map_loc;
+ iXY unit_map_loc;
for( list_index = 0; list_index < max_players; list_index++)
@@ -869,7 +869,7 @@
// ******************************************************************
-bool UnitInterface::unitPositionEnumeration( PointXYi *position, unsigned char
*unit_disposition, unsigned char *threat_level )
+bool UnitInterface::unitPositionEnumeration( iXY *position, unsigned char
*unit_disposition, unsigned char *threat_level )
{
UnitBase *unit_ptr;
@@ -912,13 +912,13 @@
}
// ******************************************************************
-PointXYi UnitInterface::unitPositionCycle( unsigned long *iterator )
+iXY UnitInterface::unitPositionCycle( unsigned long *iterator )
{
UnitBase *unit_ptr;
bool completed;
if ( unit_lists[ unit_cycle_player_index ].containsItems() == 0 )
- return( PointXYi( 0, 0 ) );
+ return( iXY( 0, 0 ) );
unit_ptr = unit_lists[ unit_cycle_player_index ].incIteratorAsync( iterator,
&completed );
@@ -1145,7 +1145,7 @@
}
else
{
- PointXYi unit_map_loc;
+ iXY unit_map_loc;
MapInterface::pointXYtoMapXY( unit->unit_state.location, &unit_map_loc );
sync_message.unit_type = unit->unit_state.unit_type;
Index: netpanzer/src/NetPanzer/Interfaces/UnitInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/UnitInterface.hpp:1.3
netpanzer/src/NetPanzer/Interfaces/UnitInterface.hpp:1.4
--- netpanzer/src/NetPanzer/Interfaces/UnitInterface.hpp:1.3 Wed Sep 10
08:03:18 2003
+++ netpanzer/src/NetPanzer/Interfaces/UnitInterface.hpp Wed Sep 10
08:32:54 2003
@@ -51,7 +51,7 @@
static UnitBase * newUnit( unsigned short unit_type,
- const PointXYi &location,
+ const iXY &location,
unsigned short player_index );
static void addNewUnit( UnitBase *unit, const PlayerID &player );
@@ -133,10 +133,10 @@
static void offloadGraphics( SpriteSorter &sorter );
static UnitBase * createUnit( unsigned short unit_type,
- const PointXYi
&location,
+ const iXY
&location,
const PlayerID
&player );
- static void spawnPlayerUnits( const PointXYi &location,
+ static void spawnPlayerUnits( const iXY &location,
const PlayerID
&player,
const
PlayerUnitConfig &unit_config );
@@ -147,21 +147,21 @@
bool find_first );
static bool quearyClosestUnit( UnitBase **closest_unit_ptr,
- PointXYi &loc,
+ iXY &loc,
PlayerID &player_id,
unsigned char search_flags );
static bool quearyClosestUnit( UnitBase **closest_unit_ptr,
- Recti &bounding_rect,
- PointXYi &loc );
+ iRect &bounding_rect,
+ iXY &loc );
static bool quearyClosestEnemyUnit( UnitBase **closest_unit_ptr,
- PointXYi &loc,
+ iXY &loc,
unsigned short player_index );
- static bool quearyUnitAtMapLoc( PointXYi map_loc, UnitID *queary_unit_id );
+ static bool quearyUnitAtMapLoc( iXY map_loc, UnitID *queary_unit_id );
- static unsigned char quearyUnitLocationStatus( PointXYi loc );
+ static unsigned char quearyUnitLocationStatus( iXY loc );
protected:
@@ -174,10 +174,10 @@
public:
// Unit positions, almost exclusivly for mini map
static void startUnitPositionEnumeration( void );
- static bool unitPositionEnumeration( PointXYi *position, unsigned char
*unit_disposition, unsigned char *threat_level );
+ static bool unitPositionEnumeration( iXY *position, unsigned char
*unit_disposition, unsigned char *threat_level );
static void resetUnitCycleIterator( unsigned long *iterator );
- static PointXYi unitPositionCycle( unsigned long *iterator );
+ static iXY unitPositionCycle( unsigned long *iterator );
protected:
// Unit Message Handler Methods
Index: netpanzer/src/NetPanzer/Interfaces/WorldViewInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/WorldViewInterface.hpp:1.4
netpanzer/src/NetPanzer/Interfaces/WorldViewInterface.hpp:1.5
--- netpanzer/src/NetPanzer/Interfaces/WorldViewInterface.hpp:1.4 Wed Sep
10 08:03:18 2003
+++ netpanzer/src/NetPanzer/Interfaces/WorldViewInterface.hpp Wed Sep 10
08:32:54 2003
@@ -18,7 +18,6 @@
#ifndef _WORLDVIEWINTERFACE_HPP
#define _WORLDVIEWINTERFACE_HPP
-#include "Point.hpp"
#include "ViewCamera.hpp"
class WorldViewInterface
@@ -42,50 +41,50 @@
static inline void scroll_down( long scroll_increment )
{ main_camera->scrollPlusY(scroll_increment); }
- static inline void setCameraPosition( const PointXYi &world_loc )
+ static inline void setCameraPosition( const iXY &world_loc )
{
main_camera->setCamera( world_loc );
}
static inline void setCameraSize( unsigned long view_size_x, unsigned
long view_size_y )
{
- main_camera->setCameraSize( PointXYi( view_size_x, view_size_y
) );
+ main_camera->setCameraSize( iXY( view_size_x, view_size_y ) );
}
- static inline void getViewWindow( Recti *view_win )
+ static inline void getViewWindow( iRect *view_win )
{
main_camera->getViewWindow( view_win );
}
- static inline void clientXYtoWorldXY( Recti &view_win,
- PointXYi &client, PointXYi *world )
+ static inline void clientXYtoWorldXY( iRect &view_win,
+ iXY &client, iXY *world )
{
world->x = view_win.min.x + client.x;
world->y = view_win.min.y + client.y;
}
- static inline void worldXYtoClientXY( Recti &view_win,
- PointXYi &world, PointXYi *client )
+ static inline void worldXYtoClientXY( iRect &view_win,
+ iXY &world, iXY *client )
{
client->x = world.x - view_win.min.x;
client->y = world.y - view_win.min.y;
}
- static inline Recti getViewWindow( void )
+ static inline iRect getViewWindow( void )
{
- Recti view_win;
+ iRect view_win;
main_camera->getViewWindow( &view_win );
return( view_win );
}
- static inline PointXYi getViewWindowMin( void )
+ static inline iXY getViewWindowMin( void )
{
- Recti view_win;
+ iRect view_win;
main_camera->getViewWindow( &view_win );
return( view_win.min );
}
- static inline long getCameraDistance( PointXYi &world_loc )
+ static inline long getCameraDistance( iXY &world_loc )
{
return( main_camera->getCameraDistance( world_loc ) );
}
Index: netpanzer/src/NetPanzer/Port/Wrldsprt.cpp
diff -u netpanzer/src/NetPanzer/Port/Wrldsprt.cpp:1.7
netpanzer/src/NetPanzer/Port/Wrldsprt.cpp:1.8
--- netpanzer/src/NetPanzer/Port/Wrldsprt.cpp:1.7 Wed Sep 10 07:26:10 2003
+++ netpanzer/src/NetPanzer/Port/Wrldsprt.cpp Wed Sep 10 08:32:54 2003
@@ -59,7 +59,7 @@
short world_sprite::is_visible( void )
{
- PointXYi loc( x_loc + bbox_x1 + attach_x, y_loc + bbox_y1 + attach_y );
+ iXY loc( x_loc + bbox_x1 + attach_x, y_loc + bbox_y1 + attach_y );
//return( WorldViewInterface::inView( 640, 480, loc ) );
return( true );
@@ -164,7 +164,7 @@
short world_animation::is_visible( void )
{
- PointXYi loc( x_loc + bbox_x1 + attach_x, y_loc + bbox_y1 + attach_y );
+ iXY loc( x_loc + bbox_x1 + attach_x, y_loc + bbox_y1 + attach_y );
//return( WorldViewInterface::inView( 640, 480, loc ) );
return( true );
Index: netpanzer/src/NetPanzer/Views/Game/ControlView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/ControlView.cpp:1.4
netpanzer/src/NetPanzer/Views/Game/ControlView.cpp:1.5
--- netpanzer/src/NetPanzer/Views/Game/ControlView.cpp:1.4 Tue Sep 9
13:16:13 2003
+++ netpanzer/src/NetPanzer/Views/Game/ControlView.cpp Wed Sep 10 08:32:55 2003
@@ -117,7 +117,7 @@
void ControlView::drawZoomMap(const Surface &dest)
{
- Recti world_win;
+ iRect world_win;
world_win = MiniMapInterface::getWorldWindow();
// Offset the map drawing area from the sector markers.
Index: netpanzer/src/NetPanzer/Views/Game/GameView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/GameView.cpp:1.4
netpanzer/src/NetPanzer/Views/Game/GameView.cpp:1.5
--- netpanzer/src/NetPanzer/Views/Game/GameView.cpp:1.4 Fri Sep 5 22:01:19 2003
+++ netpanzer/src/NetPanzer/Views/Game/GameView.cpp Wed Sep 10 08:32:55 2003
@@ -100,7 +100,7 @@
//ParticleInterface::testSimText(viewArea);
}
- Recti world_win;
+ iRect world_win;
WorldViewInterface::getViewWindow( &world_win );
SPRITE_SORTER.reset(world_win);
Index: netpanzer/src/NetPanzer/Views/Game/MiniMapView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/MiniMapView.cpp:1.7
netpanzer/src/NetPanzer/Views/Game/MiniMapView.cpp:1.8
--- netpanzer/src/NetPanzer/Views/Game/MiniMapView.cpp:1.7 Tue Sep 9
13:16:13 2003
+++ netpanzer/src/NetPanzer/Views/Game/MiniMapView.cpp Wed Sep 10 08:32:55 2003
@@ -260,7 +260,7 @@
if ((pos.x >= 0) && (pos.x < size.x) && (pos.y >= 0) && (pos.y <
size.y))
{
- MiniMapInterface::setWorldWindowPosition( PointXYi( pos.x,
pos.y ) );
+ MiniMapInterface::setWorldWindowPosition( iXY( pos.x, pos.y ) );
}
} // end MiniMapView::setViewWindow
@@ -567,8 +567,8 @@
// }
//static bool isUnitSelected( void );
- //static bool selectUnits( Recti bound_box );
- //static void moveUnits( PointXYi location );
+ //static bool selectUnits( iRect bound_box );
+ //static void moveUnits( iXY location );
} // end MiniMapView::mouseMove
Index: netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.cpp:1.5
netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.cpp:1.6
--- netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.cpp:1.5 Sun Sep
7 16:49:03 2003
+++ netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.cpp Wed Sep 10
08:32:55 2003
@@ -513,7 +513,7 @@
{if (WorldInputCmdProcessor::isObjectiveSelected())
{
// Draw a line connecting the vehicleSelectionView and the
objective.
- Recti gameViewRect;
+ iRect gameViewRect;
WorldViewInterface::getViewWindow(&gameViewRect);
iXY
objectivePos(WorldInputCmdProcessor::getSelectedObjectiveWorldPos());
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [netPanzer-CVS] netpanzer/src Lib/2D/Surface.hpp Lib/PObject/Cl...,
Matthias Braun <=