[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[netPanzer-CVS] netpanzer/src ChangeLog Lib/LibView.cpp Lib/Lib...
|
From: |
Matthias Braun |
|
Subject: |
[netPanzer-CVS] netpanzer/src ChangeLog Lib/LibView.cpp Lib/Lib... |
|
Date: |
Wed, 10 Sep 2003 08:03:20 -0400 |
CVSROOT: /cvsroot/netpanzer
Module name: netpanzer
Branch:
Changes by: Matthias Braun <address@hidden> 03/09/10 08:03:18
Modified files:
src : ChangeLog
src/Lib : LibView.cpp LibView.hpp
src/Lib/PObject/Classes: Angle.hpp BitArray.hpp
BresenhamLine.hpp FileList.cpp
PArray.cpp PArray.hpp
PArrayGrowable.cpp PArrayGrowable.hpp
PHeap.cpp PHeap.hpp PPriorityQueue.hpp
PQueue.hpp Point.hpp Timer.hpp
src/Lib/PObject/Templates: ArrayGrowableTemplate.hpp
ArrayTemplate.hpp
BucketArrayTemplate.hpp
LinkListDoubleTemplate.hpp
LinkListSingleTemplate.hpp
src/NetPanzer/Classes: InternalLink.hpp KeyBinder.hpp
Objective.hpp ObjectiveMessageTypes.hpp
PlacementMatrix.hpp PlayerID.hpp
PlayerState.hpp SelectionList.hpp
SpawnList.hpp Sprite.hpp SpriteSorter.hpp
TileSet.hpp UnitBlackBoard.hpp UnitID.hpp
UnitMessage.hpp UnitOpcodeEncoder.hpp
UnitOpcodes.hpp UnitState.hpp
WorldInputCmdProcessor.hpp WorldMap.hpp
src/NetPanzer/Classes/AI: Astar.cpp Astar.hpp PathList.hpp
PathingState.hpp
src/NetPanzer/Classes/Network: ClientConnectDaemon.hpp
ClientMessageRouter.hpp
NetMessageEncoder.hpp
NetPacket.hpp NetworkState.hpp
ServerConnectDaemon.hpp
ServerMessageRouter.hpp
src/NetPanzer/Interfaces: ChatInterface.hpp GameConfig.hpp
GameManager.hpp MapInterface.hpp
MiniMapInterface.hpp
MouseInterface.hpp
ObjectiveInterface.hpp
PathScheduler.hpp PlayerInterface.hpp
ProjectileInterface.hpp
StaticsInterface.hpp Stats.hpp
TileInterface.hpp UnitInterface.hpp
WorldViewInterface.hpp
Log message:
-removed the strange PObject class (still some utility classes which
formerly dealt with PObject are there and are - as before - quiet useless).
The long story:
It seemed like PObject was planed as some generic base type which
provided a
uniform interface to functions like comparing 2 objects. But since the
only
function is_equal in PObject wasn't virtual, and since it was never
used I
decided that this stuff is quiet useless.
Patches:
Index: netpanzer/src/ChangeLog
diff -u netpanzer/src/ChangeLog:1.15 netpanzer/src/ChangeLog:1.16
--- netpanzer/src/ChangeLog:1.15 Wed Sep 10 07:26:06 2003
+++ netpanzer/src/ChangeLog Wed Sep 10 08:03:16 2003
@@ -2,6 +2,13 @@
-more random cleanups
-more cleanups so that the Stub directory is empty now
-fixed the bug where the TileEngine didn't correctly draw the last line
+-removed the strange PObject class (still some utility classes which formerly
+ dealt with PObject are there and are - as before - quiet useless). The long
+ story:
+ It seemed like PObject was planed as some generic base type which provided a
+ uniform interface to functions like comparing 2 objects. But since the only
+ function is_equal in PObject wasn't virtual, and since it was never used I
+ decided that this stuff is quiet useless.
9-Sep-2003 by Matze Braun
-worked around issues with the block allocator code for Particl2D (new operator
Index: netpanzer/src/Lib/LibView.cpp
diff -u netpanzer/src/Lib/LibView.cpp:1.3 netpanzer/src/Lib/LibView.cpp:1.4
--- netpanzer/src/Lib/LibView.cpp:1.3 Fri Sep 5 22:01:17 2003
+++ netpanzer/src/Lib/LibView.cpp Wed Sep 10 08:03:16 2003
@@ -15,8 +15,8 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
#include <config.h>
+
#include "LibView.hpp"
#include "Desktop.hpp"
#include "ParticleSystem2D.hpp"
@@ -31,7 +31,6 @@
#include "Span.hpp"
#include "GameView.hpp"
#include "CraterParticle2D.hpp"
-
bool gDrawGameTiles = true;
bool gDrawUnitTips = false;
Index: netpanzer/src/Lib/LibView.hpp
diff -u netpanzer/src/Lib/LibView.hpp:1.2 netpanzer/src/Lib/LibView.hpp:1.3
--- netpanzer/src/Lib/LibView.hpp:1.2 Mon Sep 1 16:24:18 2003
+++ netpanzer/src/Lib/LibView.hpp Wed Sep 10 08:03:16 2003
@@ -18,20 +18,13 @@
#ifndef __LibView_hpp__
#define __LibView_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
#include "GameTemplateView.hpp"
#include "Surface.hpp"
#include "CheckBox.hpp"
-
extern bool gDrawGameTiles;
extern bool gDrawUnitTips;
-
enum
{
LIBVIEW_MODE_SURFACE_INFO,
@@ -39,7 +32,6 @@
LIBVIEW_MODE_ENVIRONMENT_INFO,
};
-
//--------------------------------------------------------------------------
class LibView : public GameTemplateView
{
@@ -67,8 +59,6 @@
virtual void actionPerformed(mMouseEvent me);
static int displayMode;
-
}; // end LibView
-
#endif // end __LibView_hpp__
Index: netpanzer/src/Lib/PObject/Classes/Angle.hpp
diff -u netpanzer/src/Lib/PObject/Classes/Angle.hpp:1.1
netpanzer/src/Lib/PObject/Classes/Angle.hpp:1.2
--- netpanzer/src/Lib/PObject/Classes/Angle.hpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/PObject/Classes/Angle.hpp Wed Sep 10 08:03:16 2003
@@ -19,152 +19,143 @@
#define _ANGLE_HPP
#include "math.h"
-#include "PObject.hpp"
#include "Point.hpp"
-class Angle : public PObject
- {
- protected:
- static double deg_const;
- static double pi_const;
+class Angle
+{
+protected:
+ static double deg_const;
+ static double pi_const;
- public:
- double angle;
+public:
+ double angle;
- public:
-
- Angle() { }
-
- Angle( double nAngle )
- {
- angle = nAngle;
- }
-
- Angle( long x, long y)
- {
- angle = (double) atan2( (double) -y, (double) x );
- }
+public:
+ Angle(double nAngle = 0.0)
+ {
+ angle = nAngle;
+ }
+
+ Angle(long x, long y)
+ {
+ angle = (double) atan2( (double) -y, (double) x );
+ }
- Angle( PointXYi &vec )
- {
- set( vec );
- }
+ Angle(const PointXYi& vec)
+ {
+ set( vec );
+ }
- inline void set( PointXYi &vec )
- {
- angle = (double) atan( ((double) -vec.y / (double) vec.x) );
+ inline void set( const PointXYi &vec )
+ {
+ angle = (double) atan( ((double) -vec.y / (double) vec.x) );
- if ( angle > 0 )
- {
- if ( vec.x < 0 )
- {
- angle -= pi_const;
- }
- }
- else
- if ( angle < 0 )
- {
- if ( ((vec.y) < 0) && (vec.x < 0) )
- {
- angle += pi_const;
- }
- }
- else
- if ( angle == 0 )
- {
- if ( vec.x < 0 )
- angle += pi_const;
- }
- }
+ if ( angle > 0 )
+ {
+ if ( vec.x < 0 )
+ {
+ angle -= pi_const;
+ }
+ }
+ else
+ if ( angle < 0 )
+ {
+ if ( ((vec.y) < 0) && (vec.x < 0) )
+ {
+ angle += pi_const;
+ }
+ }
+ else if ( angle == 0 )
+ {
+ if ( vec.x < 0 )
+ angle += pi_const;
+ }
+ }
- double DegreesFloat( void )
- {
- double degrees;
- degrees = deg_const * angle;
- if ( degrees < 0 )
- degrees = 360 - degrees;
- return( degrees );
- }
+ double DegreesFloat() const
+ {
+ double degrees;
+ degrees = deg_const * angle;
+ if ( degrees < 0 )
+ degrees = 360 - degrees;
+ return( degrees );
+ }
- long DegreesInt( void )
- {
- double degrees;
- degrees = deg_const * angle;
- if ( degrees < 0 )
- degrees = 360 + degrees;
- return( (unsigned long ) degrees );
- }
+ long DegreesInt() const
+ {
+ double degrees;
+ degrees = deg_const * angle;
+ if ( degrees < 0 )
+ degrees = 360 + degrees;
+ return( (unsigned long ) degrees );
+ }
- long DegreesInt( unsigned long granularity )
- {
- double degrees;
- degrees = deg_const * angle;
- if ( degrees < 0 )
- degrees = 360 + degrees;
-
- degrees = degrees / (double) granularity;
- return( (unsigned long ) degrees );
- }
-
- };
-
+ long DegreesInt( unsigned long granularity ) const
+ {
+ double degrees;
+ degrees = deg_const * angle;
+ if ( degrees < 0 )
+ degrees = 360 + degrees;
+
+ degrees = degrees / (double) granularity;
+ return( (unsigned long ) degrees );
+ }
+};
class AngleInt : public Angle
- {
- public:
- long angle_int;
- unsigned long grain;
- long angle_limit;
-
- AngleInt() { }
-
- AngleInt( long nAngle, unsigned long granularity )
- : Angle( (double) nAngle )
- {
- angle_int = nAngle;
- grain = granularity;
- angle_limit = (360 / grain);
- }
-
- AngleInt( long x, long y)
- : Angle( x, y )
- {
- angle_int = DegreesInt();
- }
+{
+public:
+ long angle_int;
+ unsigned long grain;
+ long angle_limit;
+
+ AngleInt( long nAngle = 0, unsigned long granularity = 360 )
+ : Angle( (double) nAngle )
+ {
+ angle_int = nAngle;
+ grain = granularity;
+ angle_limit = (360 / grain);
+ }
+
+ AngleInt( long x, long y)
+ : Angle( x, y )
+ {
+ angle_int = DegreesInt();
+ }
- AngleInt( PointXYi &vec )
- : Angle( vec )
- {
- angle_int = DegreesInt();
- }
+ AngleInt( PointXYi &vec )
+ : Angle( vec )
+ {
+ angle_int = DegreesInt();
+ }
- inline void set( long nAngle, unsigned long granularity )
- {
- angle_int = nAngle;
- grain = granularity;
- angle_limit = (360 / grain);
- }
+ inline void set( long nAngle, unsigned long granularity )
+ {
+ angle_int = nAngle;
+ grain = granularity;
+ angle_limit = (360 / grain);
+ }
- inline long operator++( )
- {
- angle_int++;
- if (angle_int == angle_limit )
- angle_int = 0;
- return( angle_int );
- }
+ inline long operator++( )
+ {
+ angle_int++;
+ if (angle_int == angle_limit )
+ angle_int = 0;
+ return( angle_int );
+ }
- inline long operator--( )
- {
- angle_int--;
- if (angle_int < 0 )
- angle_int = angle_limit - 1;
- return( angle_int );
- }
+ inline long operator--( )
+ {
+ angle_int--;
+ if (angle_int < 0 )
+ angle_int = angle_limit - 1;
+ return( angle_int );
+ }
- inline long Degrees()
- {
- return( angle_int * grain );
- }
- };
+ inline long Degrees() const
+ {
+ return( angle_int * grain );
+ }
+};
#endif
Index: netpanzer/src/Lib/PObject/Classes/BitArray.hpp
diff -u netpanzer/src/Lib/PObject/Classes/BitArray.hpp:1.2
netpanzer/src/Lib/PObject/Classes/BitArray.hpp:1.3
--- netpanzer/src/Lib/PObject/Classes/BitArray.hpp:1.2 Mon Sep 1 16:24:18 2003
+++ netpanzer/src/Lib/PObject/Classes/BitArray.hpp Wed Sep 10 08:03:16 2003
@@ -19,9 +19,8 @@
#define _BITARRAY_HPP
#include <stdlib.h>
-#include "PObject.hpp"
-class BitArray : public PObject
+class BitArray
{
private:
unsigned char *array;
Index: netpanzer/src/Lib/PObject/Classes/BresenhamLine.hpp
diff -u netpanzer/src/Lib/PObject/Classes/BresenhamLine.hpp:1.1
netpanzer/src/Lib/PObject/Classes/BresenhamLine.hpp:1.2
--- netpanzer/src/Lib/PObject/Classes/BresenhamLine.hpp:1.1 Sun Dec 1
12:51:40 2002
+++ netpanzer/src/Lib/PObject/Classes/BresenhamLine.hpp Wed Sep 10 08:03:16 2003
@@ -18,10 +18,9 @@
#ifndef _BRESENHAMLINE_HPP
#define _BRESENHAMLINE_HPP
-#include "PObject.hpp"
#include "Point.hpp"
-class BresenhamLine : public PObject
+class BresenhamLine
{
protected:
Index: netpanzer/src/Lib/PObject/Classes/FileList.cpp
diff -u netpanzer/src/Lib/PObject/Classes/FileList.cpp:1.5
netpanzer/src/Lib/PObject/Classes/FileList.cpp:1.6
--- netpanzer/src/Lib/PObject/Classes/FileList.cpp:1.5 Sat Sep 6 16:49:45 2003
+++ netpanzer/src/Lib/PObject/Classes/FileList.cpp Wed Sep 10 08:03:16 2003
@@ -79,8 +79,6 @@
void FileList::getDir( unsigned long index, char *directory )
{
- char* fullname = array[index];
-
_splitpath( array[ index ], 0, directory, 0, 0 );
}
Index: netpanzer/src/Lib/PObject/Classes/PArray.cpp
diff -u netpanzer/src/Lib/PObject/Classes/PArray.cpp:1.3
netpanzer/src/Lib/PObject/Classes/PArray.cpp:1.4
--- netpanzer/src/Lib/PObject/Classes/PArray.cpp:1.3 Fri Sep 5 22:01:18 2003
+++ netpanzer/src/Lib/PObject/Classes/PArray.cpp Wed Sep 10 08:03:16 2003
@@ -23,7 +23,7 @@
PArray::PArray( unsigned long size )
{
PArray::size = size;
- array = new PObject * [ size ];
+ array = new void* [ size ];
assert( array != 0 );
}
@@ -41,7 +41,7 @@
delete( array );
array = 0;
}
- array = new PObject * [ size ];
+ array = new void* [ size ];
assert( array != 0 );
}
@@ -53,5 +53,5 @@
return;
}
- qsort( array, sort_size, sizeof(PObject *), compare );
+ qsort( array, sort_size, sizeof(void*), compare );
}
Index: netpanzer/src/Lib/PObject/Classes/PArray.hpp
diff -u netpanzer/src/Lib/PObject/Classes/PArray.hpp:1.2
netpanzer/src/Lib/PObject/Classes/PArray.hpp:1.3
--- netpanzer/src/Lib/PObject/Classes/PArray.hpp:1.2 Mon Sep 1 16:24:18 2003
+++ netpanzer/src/Lib/PObject/Classes/PArray.hpp Wed Sep 10 08:03:16 2003
@@ -20,12 +20,11 @@
#include <assert.h>
#include <stdlib.h>
-#include "PObject.hpp"
-class PArray : public PObject
+class PArray
{
protected:
- PObject **array;
+ void **array;
unsigned long size;
public:
@@ -39,13 +38,13 @@
void sort( unsigned long sort_size, int (* compare)(const void
*elem1,const void *elem2 ) );
- inline PObject * operator[]( unsigned long index)
+ inline void* operator[]( unsigned long index)
{
assert( index < size );
return( array[index] );
}
- inline void add( PObject *object, unsigned long index )
+ inline void add(void* object, unsigned long index )
{
assert( index < size );
array[index] = object;
@@ -66,7 +65,6 @@
size = 0;
}
-
- };
+};
#endif // #ifndef __PARRAY_HPP__
Index: netpanzer/src/Lib/PObject/Classes/PArrayGrowable.cpp
diff -u netpanzer/src/Lib/PObject/Classes/PArrayGrowable.cpp:1.3
netpanzer/src/Lib/PObject/Classes/PArrayGrowable.cpp:1.4
--- netpanzer/src/Lib/PObject/Classes/PArrayGrowable.cpp:1.3 Fri Sep 5
22:01:18 2003
+++ netpanzer/src/Lib/PObject/Classes/PArrayGrowable.cpp Wed Sep 10
08:03:16 2003
@@ -65,17 +65,17 @@
array = 0;
}
- array = (PObject * *) malloc( sizeof(PObject *) * size );
+ array = (void**) malloc( sizeof(void*) * size );
assert( array != 0 );
}
-PArrayGrowable::~PArrayGrowable( void )
+PArrayGrowable::~PArrayGrowable()
{
free( array );
}
-PObject * PArrayGrowable::operator[]( unsigned long index)
+void* PArrayGrowable::operator[]( unsigned long index)
{
if ( index >= size )
{
@@ -83,8 +83,8 @@
new_size = (index + 1 + grow_increment);
if ( new_size <= grow_limit )
{
- array = (PObject * *) realloc( array, sizeof(PObject *) * new_size );
- memset( &array[ size ], 0, sizeof(PObject *) * (new_size - size) );
+ array = (void**) realloc( array, sizeof(void*) * new_size );
+ memset( &array[ size ], 0, sizeof(void*) * (new_size - size) );
size = new_size;
assert( array != 0 );
}
@@ -95,7 +95,7 @@
return( array[index] );
}
-void PArrayGrowable::add( PObject *object, unsigned long index )
+void PArrayGrowable::add(void *object, unsigned long index )
{
if ( index >= size )
{
@@ -103,8 +103,8 @@
new_size = (index + 1 + grow_increment);
if ( new_size <= grow_limit )
{
- array = (PObject * *) realloc( array, sizeof(PObject *) * new_size );
- memset( &array[ size ], 0, sizeof(PObject *) * (new_size - size) );
+ array = (void**) realloc( array, sizeof(void*) * new_size );
+ memset( &array[ size ], 0, sizeof(void*) * (new_size - size) );
size = new_size;
assert( array != 0 );
}
@@ -117,7 +117,7 @@
void PArrayGrowable::resize( unsigned long size )
{
- array = (PObject * *) realloc( array, sizeof(PObject *) * size );
+ array = (void**) realloc( array, sizeof(void*) * size );
PArrayGrowable::size = size;
assert( array != 0 );
}
@@ -132,8 +132,8 @@
grow_increment = growIncrement;
}
-
+// XXX what is sorting pointers good for?!?
void PArrayGrowable::sort( unsigned long sort_size, int (* compare)(const void
*elem1,const void *elem2 ) )
{
- qsort( array, sort_size, sizeof(PObject *), compare );
+ qsort( array, sort_size, sizeof(void*), compare );
}
Index: netpanzer/src/Lib/PObject/Classes/PArrayGrowable.hpp
diff -u netpanzer/src/Lib/PObject/Classes/PArrayGrowable.hpp:1.2
netpanzer/src/Lib/PObject/Classes/PArrayGrowable.hpp:1.3
--- netpanzer/src/Lib/PObject/Classes/PArrayGrowable.hpp:1.2 Mon Sep 1
16:24:18 2003
+++ netpanzer/src/Lib/PObject/Classes/PArrayGrowable.hpp Wed Sep 10
08:03:17 2003
@@ -18,16 +18,15 @@
#ifndef _PARRAYGROWABLE_HPP
#define _PARRAYGROWABLE_HPP
-#include "PObject.hpp"
-#include "stdlib.h"
+#include <stdlib.h>
-class PArrayGrowable : public PObject
+class PArrayGrowable
{
protected:
unsigned long size;
unsigned long grow_increment;
unsigned long grow_limit;
- PObject **array;
+ void **array;
public:
@@ -45,9 +44,9 @@
void initialize( unsigned long size, unsigned long growIncrement,
unsigned long growLimit );
- PObject * operator[]( unsigned long index);
+ void* operator[]( unsigned long index);
- void add( PObject *object, unsigned long index );
+ void add(void *object, unsigned long index );
void resize( unsigned long size );
@@ -71,8 +70,7 @@
}
size = 0;
- }
-
- };
+ }
+};
#endif
Index: netpanzer/src/Lib/PObject/Classes/PHeap.cpp
diff -u netpanzer/src/Lib/PObject/Classes/PHeap.cpp:1.3
netpanzer/src/Lib/PObject/Classes/PHeap.cpp:1.4
--- netpanzer/src/Lib/PObject/Classes/PHeap.cpp:1.3 Fri Sep 5 22:01:18 2003
+++ netpanzer/src/Lib/PObject/Classes/PHeap.cpp Wed Sep 10 08:03:17 2003
@@ -45,7 +45,7 @@
void PHeap::shiftUp( void )
{
- PObject *temp;
+ void *temp;
unsigned long pred;
unsigned long ptr;
@@ -69,7 +69,7 @@
void PHeap::shiftDown( void )
{
unsigned long ptr, succ;
- PObject *root_temp;
+ void *root_temp;
ptr = root;
succ = ptr << 1; // * 2
Index: netpanzer/src/Lib/PObject/Classes/PHeap.hpp
diff -u netpanzer/src/Lib/PObject/Classes/PHeap.hpp:1.2
netpanzer/src/Lib/PObject/Classes/PHeap.hpp:1.3
--- netpanzer/src/Lib/PObject/Classes/PHeap.hpp:1.2 Mon Sep 1 16:24:18 2003
+++ netpanzer/src/Lib/PObject/Classes/PHeap.hpp Wed Sep 10 08:03:17 2003
@@ -23,7 +23,7 @@
class PHeap : public PArrayGrowable
{
protected:
- int (* compare_func)( PObject *object1, PObject *object2);
+ int (* compare_func)(void *object1, void* object2);
unsigned long root;
unsigned long last;
@@ -42,7 +42,7 @@
last = 0;
}
- void setCompare( int (* compare_func_ptr)( PObject *object1, PObject
*object2) )
+ void setCompare( int (* compare_func_ptr)(void *object1, void *object2) )
{
compare_func = compare_func_ptr;
}
Index: netpanzer/src/Lib/PObject/Classes/PPriorityQueue.hpp
diff -u netpanzer/src/Lib/PObject/Classes/PPriorityQueue.hpp:1.2
netpanzer/src/Lib/PObject/Classes/PPriorityQueue.hpp:1.3
--- netpanzer/src/Lib/PObject/Classes/PPriorityQueue.hpp:1.2 Mon Sep 1
16:24:18 2003
+++ netpanzer/src/Lib/PObject/Classes/PPriorityQueue.hpp Wed Sep 10
08:03:17 2003
@@ -29,16 +29,16 @@
PPriorityQueue( void );
- inline void push( PObject *object )
+ inline void push(void *object )
{
last++;
add( object, last);
shiftUp();
}
- inline PObject * pop( void )
+ inline void* pop( void )
{
- PObject *object;
+ void *object;
if ( array[ root ] == 0 )
{
return( 0 );
Index: netpanzer/src/Lib/PObject/Classes/PQueue.hpp
diff -u netpanzer/src/Lib/PObject/Classes/PQueue.hpp:1.2
netpanzer/src/Lib/PObject/Classes/PQueue.hpp:1.3
--- netpanzer/src/Lib/PObject/Classes/PQueue.hpp:1.2 Mon Sep 1 16:24:18 2003
+++ netpanzer/src/Lib/PObject/Classes/PQueue.hpp Wed Sep 10 08:03:17 2003
@@ -34,14 +34,14 @@
void initialize( unsigned long size );
- inline void enqueue( PObject *object )
+ inline void enqueue(void *object )
{
rear = (rear + 1) % size;
assert( front != rear );
add( object, rear );
}
- inline PObject * dequeue( void )
+ inline void* dequeue()
{
if ( front == rear )
{ return ( 0 ); }
@@ -53,24 +53,15 @@
}
- inline bool isEmpty( void )
- {
- if( front == rear )
- return ( true );
-
- return( false );
- }
-
- inline bool isReady( void )
- {
- if( front == rear )
- return ( false );
-
- return( true );
- }
-
-
- };
+ inline bool isEmpty() const
+ {
+ return front == rear;
+ }
+ inline bool isReady() const
+ {
+ return front != rear;
+ }
+};
#endif // ** _PQUEUE_HPP
Index: netpanzer/src/Lib/PObject/Classes/Point.hpp
diff -u netpanzer/src/Lib/PObject/Classes/Point.hpp:1.2
netpanzer/src/Lib/PObject/Classes/Point.hpp:1.3
--- netpanzer/src/Lib/PObject/Classes/Point.hpp:1.2 Mon Sep 1 16:24:18 2003
+++ netpanzer/src/Lib/PObject/Classes/Point.hpp Wed Sep 10 08:03:17 2003
@@ -15,176 +15,14 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-//
-//---------------------------------------------------------------------------
-// Extended to be included in PObject System
-
-
#ifndef _POINT_HPP
#define _POINT_HPP
-#include <math.h>
-#include "codewiz.hpp"
#include "iXY.hpp"
#include "iRect.hpp"
-#include "PObject.hpp"
+// XXX bleh... we should remove this sometime...
typedef iXY PointXYi;
typedef iRect Recti;
-/*
-class PointXYi : public PObject
- {
- public:
- long x, y;
-
- inline PointXYi() {}
- inline PointXYi(const long nX, const long nY) {
- x = nX;
- y = nY;
- }
- inline PointXYi(const PointXYi &a) {
- x = a.x;
- y = a.y;
- }
- inline PointXYi &operator =(const PointXYi &a) {
- x = a.x;
- y = a.y;
- return *this;
- }
- inline PointXYi &operator =(long a) {
- x = a;
- y = a;
- return *this;
- }
-
- inline PointXYi &operator +=(const PointXYi &a) { x += a.x; y += a.y;
return *this; }
- inline PointXYi &operator -=(const PointXYi &a) { x -= a.x; y -= a.y;
return *this; }
- inline PointXYi &operator *=(const PointXYi &a) { x *= a.x; y *= a.y;
return *this; }
- inline PointXYi &operator /=(const PointXYi &a) { x /= a.x; y /= a.y;
return *this; }
- inline PointXYi &operator *=(long a ) { x *= a; y *= a; return
*this; }
- inline PointXYi &operator /=(long a ) { x /= a; y /= a; return
*this; }
-
- inline PointXYi operator + (const PointXYi &a) const { return
PointXYi(x + a.x, y + a.y); }
- inline PointXYi operator - (const PointXYi &a) const { return
PointXYi(x - a.x, y - a.y); }
- inline PointXYi operator * (const PointXYi &a) const { return
PointXYi(x * a.x, y * a.y); }
- inline PointXYi operator / (const PointXYi &a) const { return
PointXYi(x / a.x, y / a.y); }
- inline PointXYi operator * (long a ) const { return PointXYi(x *
a, y * a); }
- inline PointXYi operator / (long a ) const { return PointXYi(x /
a, y / a); }
-
- inline bool operator ==(const PointXYi &a) const
- {
- return x == a.x && y == a.y;
- }
-
- inline bool operator !=(const PointXYi &a) const
- {
- return x != a.x || y != a.y;
- }
-
- inline long mag () const { return (long) ( sqrt(x*x + y*y) ); }
- inline long mag2 () const { return x*x + y*y; }
- inline PointXYi getNormal() const { return *this / long(mag()); }
- inline PointXYi &normalize() { return *this /= long(mag()); }
-};
-
-inline double distance (const PointXYi &a, const PointXYi &b) { return (a -
b).mag(); }
-inline double distance2(const PointXYi &a, const PointXYi &b) { return (a -
b).mag2(); }
-*/
-
-/*
-class Recti : public PObject
-{
- public:
- PointXYi min, max;
-
- Recti() {}
-
- Recti(int x1, int y1, int x2, int y2)
- {
- min = PointXYi(x1, y1);
- max = PointXYi(x2, y2);
- }
-
- Recti(const Recti &a)
- {
- min = PointXYi(a.min);
- max = PointXYi(a.max);
- }
-
- Recti(PointXYi &nMin, PointXYi &nMax)
- {
- min = PointXYi(nMin);
- max = PointXYi(nMax);
- }
-
-
- inline bool isEmpty() const
- {
- return min.x > max.x || min.y > max.x;
- }
-
- void empty()
- {
- min.x = min.y = +1;
- max.x = max.y = -1;
- }
-
- inline PointXYi size() const
- {
- return max-min;
- }
-
- inline int area() const
- {
- PointXYi s = size();
- if (s.x <= 0) return 0;
- if (s.y <= 0) return 0;
- return s.x*s.y;
- }
-
- inline Recti operator | (const Recti &a)
- {
- if ( isEmpty()) return a;
- if (a.isEmpty()) return *this;
- return Recti(
- MIN(min.x, a.min.x), MIN(min.y, a.min.y),
- MAX(max.x, a.max.x), MAX(max.y, a.max.y)
- );
- }
-
- inline bool contains(const PointXYi &a) const
- {
- return
- a.x >= min.x && a.x < max.x &&
- a.y >= min.y && a.y < max.y;
- }
-
- inline bool intersects(const Recti &a) const
- {
- //Write me!
- //assert(0);
- return a.contains(a.min);
- }
-
- inline bool operator ==(const Recti &a)
- {
- return min == a.min && max == a.max;
- }
-
- inline bool operator !=(const Recti &a)
- {
- return min != a.min || max != a.max;
- }
-
- inline Recti &operator =(const unsigned a)
- {
- min.x = a;
- min.y = a;
- max.x = a;
- max.y = a;
- return *this;
- }
-};
-*/
#endif //#ifndef _POINT_HPP
Index: netpanzer/src/Lib/PObject/Classes/Timer.hpp
diff -u netpanzer/src/Lib/PObject/Classes/Timer.hpp:1.2
netpanzer/src/Lib/PObject/Classes/Timer.hpp:1.3
--- netpanzer/src/Lib/PObject/Classes/Timer.hpp:1.2 Mon Sep 1 16:24:18 2003
+++ netpanzer/src/Lib/PObject/Classes/Timer.hpp Wed Sep 10 08:03:17 2003
@@ -18,11 +18,10 @@
#ifndef _TIMER_HPP
#define _TIMER_HPP
-#include "PObject.hpp"
#include "cTimeStamp.hpp"
#include "TimerInterface.hpp"
-class Timer : public PObject
+class Timer
{
protected:
float period;
@@ -100,7 +99,7 @@
}
};
-class TimerFrameBase : public PObject
+class TimerFrameBase
{
protected:
float period;
Index: netpanzer/src/Lib/PObject/Templates/ArrayGrowableTemplate.hpp
diff -u netpanzer/src/Lib/PObject/Templates/ArrayGrowableTemplate.hpp:1.3
netpanzer/src/Lib/PObject/Templates/ArrayGrowableTemplate.hpp:1.4
--- netpanzer/src/Lib/PObject/Templates/ArrayGrowableTemplate.hpp:1.3 Wed Sep
3 04:26:34 2003
+++ netpanzer/src/Lib/PObject/Templates/ArrayGrowableTemplate.hpp Wed Sep
10 08:03:17 2003
@@ -18,13 +18,11 @@
#ifndef _ARRAYGROWABLETEMPLATE_HPP
#define _ARRAYGROWABLETEMPLATE_HPP
-#include "PObject.hpp"
#include <assert.h>
#include <stdlib.h>
-
template< class TYPE >
-class ArrayGrowableTemplate : public PObject
+class ArrayGrowableTemplate
{
protected:
unsigned long size;
Index: netpanzer/src/Lib/PObject/Templates/ArrayTemplate.hpp
diff -u netpanzer/src/Lib/PObject/Templates/ArrayTemplate.hpp:1.3
netpanzer/src/Lib/PObject/Templates/ArrayTemplate.hpp:1.4
--- netpanzer/src/Lib/PObject/Templates/ArrayTemplate.hpp:1.3 Wed Sep 3
04:26:34 2003
+++ netpanzer/src/Lib/PObject/Templates/ArrayTemplate.hpp Wed Sep 10
08:03:17 2003
@@ -20,10 +20,9 @@
#include <assert.h>
#include <stdlib.h>
-#include "PObject.hpp"
template< class TYPE >
-class ArrayTemplate : public PObject
+class ArrayTemplate
{
protected:
unsigned long size;
Index: netpanzer/src/Lib/PObject/Templates/BucketArrayTemplate.hpp
diff -u netpanzer/src/Lib/PObject/Templates/BucketArrayTemplate.hpp:1.3
netpanzer/src/Lib/PObject/Templates/BucketArrayTemplate.hpp:1.4
--- netpanzer/src/Lib/PObject/Templates/BucketArrayTemplate.hpp:1.3 Wed Sep
3 04:26:34 2003
+++ netpanzer/src/Lib/PObject/Templates/BucketArrayTemplate.hpp Wed Sep 10
08:03:17 2003
@@ -19,12 +19,11 @@
#define _BUCKETARRAYTEMPLATE_HPP
#include <assert.h>
-#include "PObject.hpp"
#include "LinkListDoubleTemplate.hpp"
template< class TYPE >
-class BucketArrayTemplate : public PObject
+class BucketArrayTemplate
{
protected:
unsigned long size;
Index: netpanzer/src/Lib/PObject/Templates/LinkListDoubleTemplate.hpp
diff -u netpanzer/src/Lib/PObject/Templates/LinkListDoubleTemplate.hpp:1.3
netpanzer/src/Lib/PObject/Templates/LinkListDoubleTemplate.hpp:1.4
--- netpanzer/src/Lib/PObject/Templates/LinkListDoubleTemplate.hpp:1.3 Wed Sep
3 04:26:34 2003
+++ netpanzer/src/Lib/PObject/Templates/LinkListDoubleTemplate.hpp Wed Sep
10 08:03:17 2003
@@ -19,10 +19,9 @@
#define _LINKLISTDOUBLETEMPLATE_HPP
#include <stdlib.h>
-#include "PObject.hpp"
template< class TYPE >
-class LinkListDoubleTemplate : public PObject
+class LinkListDoubleTemplate
{
protected:
TYPE *front;
Index: netpanzer/src/Lib/PObject/Templates/LinkListSingleTemplate.hpp
diff -u netpanzer/src/Lib/PObject/Templates/LinkListSingleTemplate.hpp:1.3
netpanzer/src/Lib/PObject/Templates/LinkListSingleTemplate.hpp:1.4
--- netpanzer/src/Lib/PObject/Templates/LinkListSingleTemplate.hpp:1.3 Wed Sep
3 04:26:34 2003
+++ netpanzer/src/Lib/PObject/Templates/LinkListSingleTemplate.hpp Wed Sep
10 08:03:17 2003
@@ -19,10 +19,9 @@
#define _LINKLISTSINGLETEMPLATE_HPP
#include <stdlib.h>
-#include "PObject.hpp"
template< class TYPE >
-class LinkListSingleTemplate : public PObject
+class LinkListSingleTemplate
{
protected:
TYPE *front;
Index: netpanzer/src/NetPanzer/Classes/AI/Astar.cpp
diff -u netpanzer/src/NetPanzer/Classes/AI/Astar.cpp:1.3
netpanzer/src/NetPanzer/Classes/AI/Astar.cpp:1.4
--- netpanzer/src/NetPanzer/Classes/AI/Astar.cpp:1.3 Fri Sep 5 22:01:18 2003
+++ netpanzer/src/NetPanzer/Classes/AI/Astar.cpp Wed Sep 10 08:03:17 2003
@@ -21,7 +21,7 @@
#include "Timer.hpp"
#include "PathingState.hpp"
-int compare( PObject *object1, PObject *object2 )
+int compare(void *object1, void *object2 )
{
AstarNode *node1, *node2;
node1 = (AstarNode *) object1;
Index: netpanzer/src/NetPanzer/Classes/AI/Astar.hpp
diff -u netpanzer/src/NetPanzer/Classes/AI/Astar.hpp:1.2
netpanzer/src/NetPanzer/Classes/AI/Astar.hpp:1.3
--- netpanzer/src/NetPanzer/Classes/AI/Astar.hpp:1.2 Mon Sep 1 16:24:20 2003
+++ netpanzer/src/NetPanzer/Classes/AI/Astar.hpp Wed Sep 10 08:03:17 2003
@@ -30,7 +30,7 @@
enum { _slot_status_free, _slot_status_busy, _slot_status_wait,
_slot_status_flush };
enum { _path_result_success, _path_result_goal_unreachable };
-class PathRequest : public PObject
+class PathRequest
{
public:
unsigned short status;
@@ -68,7 +68,7 @@
};
-class AstarNode : public PObject
+class AstarNode
{
public:
PointXYi map_loc;
Index: netpanzer/src/NetPanzer/Classes/AI/PathList.hpp
diff -u netpanzer/src/NetPanzer/Classes/AI/PathList.hpp:1.2
netpanzer/src/NetPanzer/Classes/AI/PathList.hpp:1.3
--- netpanzer/src/NetPanzer/Classes/AI/PathList.hpp:1.2 Mon Sep 1 16:24:20 2003
+++ netpanzer/src/NetPanzer/Classes/AI/PathList.hpp Wed Sep 10 08:03:17 2003
@@ -21,11 +21,10 @@
#include <stdlib.h>
#include <string.h>
-#include "PObject.hpp"
extern unsigned long DEFAULT_PATH_LIST_SIZE;
-class PathList : public PObject
+class PathList
{
protected:
unsigned long *list;
Index: netpanzer/src/NetPanzer/Classes/AI/PathingState.hpp
diff -u netpanzer/src/NetPanzer/Classes/AI/PathingState.hpp:1.1
netpanzer/src/NetPanzer/Classes/AI/PathingState.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/AI/PathingState.hpp:1.1 Sun Dec 1
12:51:46 2002
+++ netpanzer/src/NetPanzer/Classes/AI/PathingState.hpp Wed Sep 10 08:03:17 2003
@@ -18,9 +18,7 @@
#ifndef _PATHINGSTATE_HPP
#define _PATHINGSTATE_HPP
-#include "PObject.hpp"
-
-class PathingState : public PObject
+class PathingState
{
public:
static float astar_gen_time;
Index: netpanzer/src/NetPanzer/Classes/InternalLink.hpp
diff -u netpanzer/src/NetPanzer/Classes/InternalLink.hpp:1.2
netpanzer/src/NetPanzer/Classes/InternalLink.hpp:1.3
--- netpanzer/src/NetPanzer/Classes/InternalLink.hpp:1.2 Mon Sep 1
16:24:20 2003
+++ netpanzer/src/NetPanzer/Classes/InternalLink.hpp Wed Sep 10 08:03:17 2003
@@ -18,10 +18,9 @@
#ifndef _INTERNALLINK_HPP
#define _INTERNALLINK_HPP
-#include "PObject.hpp"
#include <stdlib.h>
-class InternalLink : public PObject
+class InternalLink
{
public:
Index: netpanzer/src/NetPanzer/Classes/KeyBinder.hpp
diff -u netpanzer/src/NetPanzer/Classes/KeyBinder.hpp:1.3
netpanzer/src/NetPanzer/Classes/KeyBinder.hpp:1.4
--- netpanzer/src/NetPanzer/Classes/KeyBinder.hpp:1.3 Mon Sep 8 11:32:04 2003
+++ netpanzer/src/NetPanzer/Classes/KeyBinder.hpp Wed Sep 10 08:03:17 2003
@@ -18,7 +18,6 @@
#ifndef _KEYBINDER_HPP
#define _KEYBINDER_HPP
-#include "PObject.hpp"
#include "ArrayGrowableTemplate.hpp"
#include "KeyScanCodeDefs.h"
Index: netpanzer/src/NetPanzer/Classes/Network/ClientConnectDaemon.hpp
diff -u netpanzer/src/NetPanzer/Classes/Network/ClientConnectDaemon.hpp:1.1
netpanzer/src/NetPanzer/Classes/Network/ClientConnectDaemon.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/Network/ClientConnectDaemon.hpp:1.1 Sun Dec
1 12:51:46 2002
+++ netpanzer/src/NetPanzer/Classes/Network/ClientConnectDaemon.hpp Wed Sep
10 08:03:17 2003
@@ -22,7 +22,7 @@
#include "NetPacket.hpp"
#include "Timer.hpp"
-class ClientConnectDaemon : public PObject
+class ClientConnectDaemon
{
protected:
static Timer failure_display_timer;
Index: netpanzer/src/NetPanzer/Classes/Network/ClientMessageRouter.hpp
diff -u netpanzer/src/NetPanzer/Classes/Network/ClientMessageRouter.hpp:1.1
netpanzer/src/NetPanzer/Classes/Network/ClientMessageRouter.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/Network/ClientMessageRouter.hpp:1.1 Sun Dec
1 12:51:46 2002
+++ netpanzer/src/NetPanzer/Classes/Network/ClientMessageRouter.hpp Wed Sep
10 08:03:17 2003
@@ -18,11 +18,10 @@
#ifndef _CLIENTMESSAGEROUTER_HPP
#define _CLIENTMESSAGEROUTER_HPP
-#include "PObject.hpp"
#include "NetPacket.hpp"
#include "NetMessageEncoder.hpp"
-class ClientMessageRouter : public PObject
+class ClientMessageRouter
{
protected:
static NetMessage *temp_message;
Index: netpanzer/src/NetPanzer/Classes/Network/NetMessageEncoder.hpp
diff -u netpanzer/src/NetPanzer/Classes/Network/NetMessageEncoder.hpp:1.2
netpanzer/src/NetPanzer/Classes/Network/NetMessageEncoder.hpp:1.3
--- netpanzer/src/NetPanzer/Classes/Network/NetMessageEncoder.hpp:1.2 Mon Sep
1 16:24:20 2003
+++ netpanzer/src/NetPanzer/Classes/Network/NetMessageEncoder.hpp Wed Sep
10 08:03:17 2003
@@ -20,7 +20,7 @@
#include "NetPacket.hpp"
-class NetMessageEncoder : public PObject
+class NetMessageEncoder
{
protected:
MultiMessage encode_message;
Index: netpanzer/src/NetPanzer/Classes/Network/NetPacket.hpp
diff -u netpanzer/src/NetPanzer/Classes/Network/NetPacket.hpp:1.3
netpanzer/src/NetPanzer/Classes/Network/NetPacket.hpp:1.4
--- netpanzer/src/NetPanzer/Classes/Network/NetPacket.hpp:1.3 Sun Sep 7
10:04:47 2003
+++ netpanzer/src/NetPanzer/Classes/Network/NetPacket.hpp Wed Sep 10
08:03:17 2003
@@ -18,7 +18,6 @@
#ifndef _NETPACKET_HPP
#define _NETPACKET_HPP
-#include "PObject.hpp"
#include "NetMessageEnums.hpp"
#include "UILib/Network/Client.hpp"
@@ -27,7 +26,7 @@
#ifdef MSVC
#pragma pack(1)
#endif
-class NetPacket : public PObject
+class NetPacket
{
public:
Client::ID toID;
Index: netpanzer/src/NetPanzer/Classes/Network/NetworkState.hpp
diff -u netpanzer/src/NetPanzer/Classes/Network/NetworkState.hpp:1.1
netpanzer/src/NetPanzer/Classes/Network/NetworkState.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/Network/NetworkState.hpp:1.1 Sun Dec
1 12:51:50 2002
+++ netpanzer/src/NetPanzer/Classes/Network/NetworkState.hpp Wed Sep 10
08:03:17 2003
@@ -18,12 +18,11 @@
#ifndef _NETWORKSTATE_HPP
#define _NETWORKSTATE_HPP
-#include "PObject.hpp"
#include "Timer.hpp"
enum{ _network_state_server, _network_state_client };
-class NetworkState : public PObject
+class NetworkState
{
public:
static unsigned short status;
Index: netpanzer/src/NetPanzer/Classes/Network/ServerConnectDaemon.hpp
diff -u netpanzer/src/NetPanzer/Classes/Network/ServerConnectDaemon.hpp:1.2
netpanzer/src/NetPanzer/Classes/Network/ServerConnectDaemon.hpp:1.3
--- netpanzer/src/NetPanzer/Classes/Network/ServerConnectDaemon.hpp:1.2 Mon Sep
1 16:24:20 2003
+++ netpanzer/src/NetPanzer/Classes/Network/ServerConnectDaemon.hpp Wed Sep
10 08:03:17 2003
@@ -60,7 +60,7 @@
};
-class ServerConnectDaemon : public PObject
+class ServerConnectDaemon
{
protected:
static unsigned char connection_state;
Index: netpanzer/src/NetPanzer/Classes/Network/ServerMessageRouter.hpp
diff -u netpanzer/src/NetPanzer/Classes/Network/ServerMessageRouter.hpp:1.1
netpanzer/src/NetPanzer/Classes/Network/ServerMessageRouter.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/Network/ServerMessageRouter.hpp:1.1 Sun Dec
1 12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/Network/ServerMessageRouter.hpp Wed Sep
10 08:03:17 2003
@@ -18,11 +18,10 @@
#ifndef _SERVERMESSAGEROUTER_HPP
#define _SERVERMESSAGEROUTER_HPP
-#include "PObject.hpp"
#include "NetPacket.hpp"
#include "NetMessageEncoder.hpp"
-class ServerMessageRouter : public PObject
+class ServerMessageRouter
{
protected:
static NetMessage *temp_message;
Index: netpanzer/src/NetPanzer/Classes/Objective.hpp
diff -u netpanzer/src/NetPanzer/Classes/Objective.hpp:1.2
netpanzer/src/NetPanzer/Classes/Objective.hpp:1.3
--- netpanzer/src/NetPanzer/Classes/Objective.hpp:1.2 Mon Sep 1 16:24:20 2003
+++ netpanzer/src/NetPanzer/Classes/Objective.hpp Wed Sep 10 08:03:17 2003
@@ -31,7 +31,7 @@
};
-class ObjectiveState : public PObject
+class ObjectiveState
{
public:
short ID;
@@ -63,7 +63,7 @@
float unit_generation_time_remaining;
};
-class Objective : public PObject
+class Objective
{
protected:
void objectiveMesgUpdateOccupation( ObjectiveMessage *message );
Index: netpanzer/src/NetPanzer/Classes/ObjectiveMessageTypes.hpp
diff -u netpanzer/src/NetPanzer/Classes/ObjectiveMessageTypes.hpp:1.2
netpanzer/src/NetPanzer/Classes/ObjectiveMessageTypes.hpp:1.3
--- netpanzer/src/NetPanzer/Classes/ObjectiveMessageTypes.hpp:1.2 Mon Sep
1 16:24:20 2003
+++ netpanzer/src/NetPanzer/Classes/ObjectiveMessageTypes.hpp Wed Sep 10
08:03:17 2003
@@ -24,7 +24,7 @@
#pragma pack(1)
#endif
-class ObjectiveMessage : public PObject
+class ObjectiveMessage
{
public:
unsigned char message_type;
Index: netpanzer/src/NetPanzer/Classes/PlacementMatrix.hpp
diff -u netpanzer/src/NetPanzer/Classes/PlacementMatrix.hpp:1.2
netpanzer/src/NetPanzer/Classes/PlacementMatrix.hpp:1.3
--- netpanzer/src/NetPanzer/Classes/PlacementMatrix.hpp:1.2 Mon Sep 1
16:24:20 2003
+++ netpanzer/src/NetPanzer/Classes/PlacementMatrix.hpp Wed Sep 10 08:03:17 2003
@@ -18,10 +18,9 @@
#ifndef _PLACEMENTMATRIX_HPP
#define _PLACEMENTMATRIX_HPP
-#include "PObject.hpp"
#include "Point.hpp"
-class PlacementMatrix : public PObject
+class PlacementMatrix
{
protected:
enum { _placement_state_base_case,
Index: netpanzer/src/NetPanzer/Classes/PlayerID.hpp
diff -u netpanzer/src/NetPanzer/Classes/PlayerID.hpp:1.3
netpanzer/src/NetPanzer/Classes/PlayerID.hpp:1.4
--- netpanzer/src/NetPanzer/Classes/PlayerID.hpp:1.3 Sun Sep 7 10:04:47 2003
+++ netpanzer/src/NetPanzer/Classes/PlayerID.hpp Wed Sep 10 08:03:17 2003
@@ -19,7 +19,6 @@
#define _PLAYERID_HPP
#include <string.h>
-#include "PObject.hpp"
#include "UILib/Network/Client.hpp"
class PlayerID
Index: netpanzer/src/NetPanzer/Classes/PlayerState.hpp
diff -u netpanzer/src/NetPanzer/Classes/PlayerState.hpp:1.3
netpanzer/src/NetPanzer/Classes/PlayerState.hpp:1.4
--- netpanzer/src/NetPanzer/Classes/PlayerState.hpp:1.3 Sun Sep 7 10:04:47 2003
+++ netpanzer/src/NetPanzer/Classes/PlayerState.hpp Wed Sep 10 08:03:17 2003
@@ -19,20 +19,16 @@
#define _PLAYERSTATE_HPP
#include <string.h>
-#include "PObject.hpp"
#include "PlayerID.hpp"
#include "PlayerUnitConfig.hpp"
-
-
-
enum { _player_state_free,
_player_state_allocated,
_player_state_connecting,
_player_state_active
};
-class PlayerState : public PObject
+class PlayerState
{
protected:
char name[64];
Index: netpanzer/src/NetPanzer/Classes/SelectionList.hpp
diff -u netpanzer/src/NetPanzer/Classes/SelectionList.hpp:1.2
netpanzer/src/NetPanzer/Classes/SelectionList.hpp:1.3
--- netpanzer/src/NetPanzer/Classes/SelectionList.hpp:1.2 Mon Sep 1
16:24:20 2003
+++ netpanzer/src/NetPanzer/Classes/SelectionList.hpp Wed Sep 10 08:03:17 2003
@@ -24,7 +24,7 @@
#include "UnitIDList.hpp"
#include "Point.hpp"
-class SelectionList : public PObject
+class SelectionList
{
protected:
unsigned long unit_cycle_index;
Index: netpanzer/src/NetPanzer/Classes/SpawnList.hpp
diff -u netpanzer/src/NetPanzer/Classes/SpawnList.hpp:1.1
netpanzer/src/NetPanzer/Classes/SpawnList.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/SpawnList.hpp:1.1 Sun Dec 1 12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/SpawnList.hpp Wed Sep 10 08:03:17 2003
@@ -22,7 +22,7 @@
#include "Timer.hpp"
#include "ArrayTemplate.hpp"
-class SpawnPoint : public PObject
+class SpawnPoint
{
public:
char name[32];
Index: netpanzer/src/NetPanzer/Classes/Sprite.hpp
diff -u netpanzer/src/NetPanzer/Classes/Sprite.hpp:1.3
netpanzer/src/NetPanzer/Classes/Sprite.hpp:1.4
--- netpanzer/src/NetPanzer/Classes/Sprite.hpp:1.3 Mon Sep 8 11:32:04 2003
+++ netpanzer/src/NetPanzer/Classes/Sprite.hpp Wed Sep 10 08:03:17 2003
@@ -18,14 +18,13 @@
#ifndef _SPRITE_HPP
#define _SPRITE_HPP
-#include "PObject.hpp"
#include "Surface.hpp"
#include "PackedSurface.hpp"
#include "Point.hpp"
#define _MAX_HEIGHT_LEVELS 8
-class Sprite : public PObject
+class Sprite
{
public:
PointXYi world_pos;
Index: netpanzer/src/NetPanzer/Classes/SpriteSorter.hpp
diff -u netpanzer/src/NetPanzer/Classes/SpriteSorter.hpp:1.2
netpanzer/src/NetPanzer/Classes/SpriteSorter.hpp:1.3
--- netpanzer/src/NetPanzer/Classes/SpriteSorter.hpp:1.2 Mon Sep 1
16:24:20 2003
+++ netpanzer/src/NetPanzer/Classes/SpriteSorter.hpp Wed Sep 10 08:03:17 2003
@@ -22,8 +22,7 @@
#include "PArrayGrowable.hpp"
#include "Point.hpp"
-
-class SpriteSorter : public PObject
+class SpriteSorter
{
protected:
Recti world_window;
Index: netpanzer/src/NetPanzer/Classes/TileSet.hpp
diff -u netpanzer/src/NetPanzer/Classes/TileSet.hpp:1.3
netpanzer/src/NetPanzer/Classes/TileSet.hpp:1.4
--- netpanzer/src/NetPanzer/Classes/TileSet.hpp:1.3 Mon Sep 8 08:12:19 2003
+++ netpanzer/src/NetPanzer/Classes/TileSet.hpp Wed Sep 10 08:03:17 2003
@@ -18,11 +18,10 @@
#ifndef _TILESET_HPP
#define _TILESET_HPP
-#include "PObject.hpp"
#include "TileSetStruct.hpp"
#include "WadMapTable.hpp"
-class TileSet : virtual PObject
+class TileSet
{
protected:
bool tile_set_loaded;
Index: netpanzer/src/NetPanzer/Classes/UnitBlackBoard.hpp
diff -u netpanzer/src/NetPanzer/Classes/UnitBlackBoard.hpp:1.2
netpanzer/src/NetPanzer/Classes/UnitBlackBoard.hpp:1.3
--- netpanzer/src/NetPanzer/Classes/UnitBlackBoard.hpp:1.2 Mon Sep 1
16:24:20 2003
+++ netpanzer/src/NetPanzer/Classes/UnitBlackBoard.hpp Wed Sep 10 08:03:17 2003
@@ -18,11 +18,10 @@
#ifndef _UNITBLACKBOARD_HPP
#define _UNITBLACKBOARD_HPP
-#include "PObject.hpp"
#include "BitArray.hpp"
#include "Point.hpp"
-class UnitBlackBoard : public PObject
+class UnitBlackBoard
{
protected:
static BitArray unit_loc_map;
Index: netpanzer/src/NetPanzer/Classes/UnitID.hpp
diff -u netpanzer/src/NetPanzer/Classes/UnitID.hpp:1.2
netpanzer/src/NetPanzer/Classes/UnitID.hpp:1.3
--- netpanzer/src/NetPanzer/Classes/UnitID.hpp:1.2 Mon Sep 1 16:24:20 2003
+++ netpanzer/src/NetPanzer/Classes/UnitID.hpp Wed Sep 10 08:03:17 2003
@@ -18,72 +18,70 @@
#ifndef _UNITID_HPP
#define _UNITID_HPP
-#include "PObject.hpp"
+class UnitID
+{
+public:
+ unsigned char player;
+ unsigned short index;
+ unsigned short unique;
-class UnitID : public PObject
- {
- public:
- unsigned char player;
- unsigned short index;
- unsigned short unique;
-
- inline void set(unsigned char player, unsigned short index, unsigned short
unique )
- {
- UnitID::player = player;
- UnitID::index = index;
- UnitID::unique = unique;
- }
+ inline void set(unsigned char player, unsigned short index, unsigned
short unique )
+ {
+ UnitID::player = player;
+ UnitID::index = index;
+ UnitID::unique = unique;
+ }
- inline void set( unsigned char player, unsigned short index )
- {
- UnitID::player = player;
- UnitID::index = index;
- }
+ inline void set( unsigned char player, unsigned short index )
+ {
+ UnitID::player = player;
+ UnitID::index = index;
+ }
- inline unsigned char getPlayer() const
- {
- return( player );
- }
+ inline unsigned char getPlayer() const
+ {
+ return( player );
+ }
- inline unsigned short getIndex() const
- {
- return( index );
- }
+ inline unsigned short getIndex() const
+ {
+ return( index );
+ }
- inline bool operator==( const UnitID& Uid ) const
- {
- if ( (player == Uid.player) && (index == Uid.index)
- && (unique == Uid.unique)
- )
- return( true );
+ inline bool operator==( const UnitID& Uid ) const
+ {
+ if ( (player == Uid.player) && (index == Uid.index)
+ && (unique == Uid.unique)
+ )
+ return true;
- return( false );
- }
+ return false;
+ }
- inline bool operator!=( const UnitID& Uid ) const
- {
- if ( (player != Uid.player) || (index != Uid.index)
- || (unique != Uid.unique)
- )
- return( true );
+ inline bool operator!=( const UnitID& Uid ) const
+ {
+ if ( (player != Uid.player) || (index != Uid.index)
+ || (unique != Uid.unique)
+ )
+ return true;
- return( false );
- }
+ return false;
+ }
- inline bool playerEqual( const UnitID& Uid ) const
- {
- if ( (player == Uid.player) )
- return( true );
+ inline bool playerEqual( const UnitID& Uid ) const
+ {
+ if ( (player == Uid.player) )
+ return true;
- return( false );
- }
+ return false;
+ }
- inline void operator=( const UnitID& Uid )
- {
- player = Uid.player;
- index = Uid.index;
- unique = Uid.unique;
- }
- };
+ inline void operator=( const UnitID& Uid )
+ {
+ player = Uid.player;
+ index = Uid.index;
+ unique = Uid.unique;
+ }
+};
#endif
Index: netpanzer/src/NetPanzer/Classes/UnitMessage.hpp
diff -u netpanzer/src/NetPanzer/Classes/UnitMessage.hpp:1.2
netpanzer/src/NetPanzer/Classes/UnitMessage.hpp:1.3
--- netpanzer/src/NetPanzer/Classes/UnitMessage.hpp:1.2 Mon Sep 1 16:24:20 2003
+++ netpanzer/src/NetPanzer/Classes/UnitMessage.hpp Wed Sep 10 08:03:17 2003
@@ -18,7 +18,6 @@
#ifndef _UNITMESSAGE_HPP
#define _UNITMESSAGE_HPP
-#include "PObject.hpp"
#include "UnitID.hpp"
enum { _umesg_flag_unique = 0x01,
@@ -31,7 +30,7 @@
};
-class UnitMessage : public PObject
+class UnitMessage
{
public:
UnitID unit_id;
Index: netpanzer/src/NetPanzer/Classes/UnitOpcodeEncoder.hpp
diff -u netpanzer/src/NetPanzer/Classes/UnitOpcodeEncoder.hpp:1.2
netpanzer/src/NetPanzer/Classes/UnitOpcodeEncoder.hpp:1.3
--- netpanzer/src/NetPanzer/Classes/UnitOpcodeEncoder.hpp:1.2 Mon Sep 1
16:24:20 2003
+++ netpanzer/src/NetPanzer/Classes/UnitOpcodeEncoder.hpp Wed Sep 10
08:03:17 2003
@@ -25,7 +25,7 @@
_opcode_encoder_send_method_no_guarantee
};
-class UnitOpcodeEncoder : public PObject
+class UnitOpcodeEncoder
{
protected:
UnitOpcodeMessage opcode_message;
Index: netpanzer/src/NetPanzer/Classes/UnitOpcodes.hpp
diff -u netpanzer/src/NetPanzer/Classes/UnitOpcodes.hpp:1.2
netpanzer/src/NetPanzer/Classes/UnitOpcodes.hpp:1.3
--- netpanzer/src/NetPanzer/Classes/UnitOpcodes.hpp:1.2 Mon Sep 1 16:24:20 2003
+++ netpanzer/src/NetPanzer/Classes/UnitOpcodes.hpp Wed Sep 10 08:03:17 2003
@@ -18,7 +18,6 @@
#ifndef _UNITOPCODES_HPP
#define _UNITOPCODES_HPP
-#include "PObject.hpp"
#include "QueueTemplate.hpp"
enum { _unit_opcode_flag_sync = 0x01 };
Index: netpanzer/src/NetPanzer/Classes/UnitState.hpp
diff -u netpanzer/src/NetPanzer/Classes/UnitState.hpp:1.3
netpanzer/src/NetPanzer/Classes/UnitState.hpp:1.4
--- netpanzer/src/NetPanzer/Classes/UnitState.hpp:1.3 Sat Sep 6 11:18:18 2003
+++ netpanzer/src/NetPanzer/Classes/UnitState.hpp Wed Sep 10 08:03:17 2003
@@ -19,7 +19,6 @@
#define _UNITSTATE_HPP
#include <string.h>
-#include "PObject.hpp"
#include "BoundBox.hpp"
#include "Point.hpp"
#include "Angle.hpp"
@@ -31,7 +30,7 @@
_threat_level_defending
};
-class UnitState : public PObject
+class UnitState
{
public:
unsigned long var_flags;
Index: netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.hpp
diff -u netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.hpp:1.2
netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.hpp:1.3
--- netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.hpp:1.2 Mon Sep
1 16:24:20 2003
+++ netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.hpp Wed Sep 10
08:03:17 2003
@@ -22,7 +22,7 @@
#include "MouseInterface.hpp"
#include "Timer.hpp"
-class WorldInputCmdProcessor : public PObject
+class WorldInputCmdProcessor
{
protected:
Recti world_win;
Index: netpanzer/src/NetPanzer/Classes/WorldMap.hpp
diff -u netpanzer/src/NetPanzer/Classes/WorldMap.hpp:1.2
netpanzer/src/NetPanzer/Classes/WorldMap.hpp:1.3
--- netpanzer/src/NetPanzer/Classes/WorldMap.hpp:1.2 Mon Sep 1 16:24:20 2003
+++ netpanzer/src/NetPanzer/Classes/WorldMap.hpp Wed Sep 10 08:03:17 2003
@@ -18,13 +18,12 @@
#ifndef _WORLDMAP_HPP
#define _WORLDMAP_HPP
-#include "PObject.hpp"
#include "MapFileStruct.hpp"
#include "WadMapTable.hpp"
typedef unsigned short MapElementType;
-class WorldMap : virtual PObject
+class WorldMap
{
protected:
bool map_loaded;
Index: netpanzer/src/NetPanzer/Interfaces/ChatInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/ChatInterface.hpp:1.1
netpanzer/src/NetPanzer/Interfaces/ChatInterface.hpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/ChatInterface.hpp:1.1 Sun Dec 1
12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/ChatInterface.hpp Wed Sep 10
08:03:17 2003
@@ -20,7 +20,7 @@
#include "SystemNetMessage.hpp"
-class ChatInterface : public PObject
+class ChatInterface
{
protected:
static SystemChatMesgRequest current_chat_mesg;
Index: netpanzer/src/NetPanzer/Interfaces/GameConfig.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/GameConfig.hpp:1.3
netpanzer/src/NetPanzer/Interfaces/GameConfig.hpp:1.4
--- netpanzer/src/NetPanzer/Interfaces/GameConfig.hpp:1.3 Wed Sep 10
07:26:09 2003
+++ netpanzer/src/NetPanzer/Interfaces/GameConfig.hpp Wed Sep 10 08:03:17 2003
@@ -21,7 +21,6 @@
#include <assert.h>
#include <string.h>
-#include "PObject.hpp"
#include "Point.hpp"
#include "Surface.hpp"
#include "Color.hpp"
@@ -132,9 +131,8 @@
#define _GAME_CONFIG_ATTACK_NOTIFICATION_TIME_LIMIT_LOWER 2
-class GameConfig : public PObject
+class GameConfig
{
-
protected:
static char UnitColor;
static char GameMode; //Skirmish or Multiplayer
Index: netpanzer/src/NetPanzer/Interfaces/GameManager.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/GameManager.hpp:1.4
netpanzer/src/NetPanzer/Interfaces/GameManager.hpp:1.5
--- netpanzer/src/NetPanzer/Interfaces/GameManager.hpp:1.4 Mon Sep 8
11:32:04 2003
+++ netpanzer/src/NetPanzer/Interfaces/GameManager.hpp Wed Sep 10 08:03:17 2003
@@ -19,6 +19,7 @@
#define _GAMEMANAGER_HPP
#include <time.h>
+#include <stdint.h>
#include "PlayerState.hpp"
#include "NetPacket.hpp"
#include "Point.hpp"
@@ -40,7 +41,6 @@
_mapload_result_no_wad_file
};
-
class GameManager
{
private:
@@ -62,7 +62,7 @@
static PointXYi previous_video_mode_res;
static PointXYi current_video_mode_res;
- static BYTE current_mode_flags;
+ static uint8_t current_mode_flags;
protected:
static unsigned char game_state;
Index: netpanzer/src/NetPanzer/Interfaces/MapInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/MapInterface.hpp:1.3
netpanzer/src/NetPanzer/Interfaces/MapInterface.hpp:1.4
--- netpanzer/src/NetPanzer/Interfaces/MapInterface.hpp:1.3 Mon Sep 8
08:12:19 2003
+++ netpanzer/src/NetPanzer/Interfaces/MapInterface.hpp Wed Sep 10 08:03:17 2003
@@ -18,7 +18,6 @@
#ifndef _MAPINTERFACE_HPP
#define _MAPINTERFACE_HPP
-#include "PObject.hpp"
#include "TileInterface.hpp"
#include "WorldMap.hpp"
#include "SpawnList.hpp"
Index: netpanzer/src/NetPanzer/Interfaces/MiniMapInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/MiniMapInterface.hpp:1.2
netpanzer/src/NetPanzer/Interfaces/MiniMapInterface.hpp:1.3
--- netpanzer/src/NetPanzer/Interfaces/MiniMapInterface.hpp:1.2 Mon Sep 1
16:24:20 2003
+++ netpanzer/src/NetPanzer/Interfaces/MiniMapInterface.hpp Wed Sep 10
08:03:17 2003
@@ -23,7 +23,7 @@
#include "BitArray.hpp"
#include "fXY.hpp"
-class MiniMapInterface : public PObject
+class MiniMapInterface
{
protected:
static fXY scale_factor;
Index: netpanzer/src/NetPanzer/Interfaces/MouseInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/MouseInterface.hpp:1.4
netpanzer/src/NetPanzer/Interfaces/MouseInterface.hpp:1.5
--- netpanzer/src/NetPanzer/Interfaces/MouseInterface.hpp:1.4 Wed Sep 10
07:26:09 2003
+++ netpanzer/src/NetPanzer/Interfaces/MouseInterface.hpp Wed Sep 10
08:03:17 2003
@@ -18,7 +18,6 @@
#ifndef _MOUSEINTERFACE_HPP
#define _MOUSEINTERFACE_HPP
-#include "PObject.hpp"
#include "Point.hpp"
#include "QueueTemplate.hpp"
#include "Surface.hpp"
@@ -29,7 +28,7 @@
#define _MIDDLE_BUTTON_MASK 0x02
#define _RIGHT_BUTTON_MASK 0x04
-class MouseEvent : public PObject
+class MouseEvent
{
public:
enum {
@@ -46,7 +45,7 @@
typedef QueueTemplate< MouseEvent > MouseEventQueue;
-class MouseInterface : public PObject
+class MouseInterface
{
private:
static Surface mouse_cursor;
Index: netpanzer/src/NetPanzer/Interfaces/ObjectiveInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/ObjectiveInterface.hpp:1.2
netpanzer/src/NetPanzer/Interfaces/ObjectiveInterface.hpp:1.3
--- netpanzer/src/NetPanzer/Interfaces/ObjectiveInterface.hpp:1.2 Mon Sep
1 16:24:20 2003
+++ netpanzer/src/NetPanzer/Interfaces/ObjectiveInterface.hpp Wed Sep 10
08:03:17 2003
@@ -38,7 +38,7 @@
_objective_disposition_enemy
};
-class ObjectiveInterface : public PObject
+class ObjectiveInterface
{
protected:
static ObjectiveList objective_list;
Index: netpanzer/src/NetPanzer/Interfaces/PathScheduler.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/PathScheduler.hpp:1.3
netpanzer/src/NetPanzer/Interfaces/PathScheduler.hpp:1.4
--- netpanzer/src/NetPanzer/Interfaces/PathScheduler.hpp:1.3 Mon Sep 1
18:46:54 2003
+++ netpanzer/src/NetPanzer/Interfaces/PathScheduler.hpp Wed Sep 10
08:03:17 2003
@@ -18,7 +18,6 @@
#ifndef _PATHSCHEDULER_HPP
#define _PATHSCHEDULER_HPP
-#include "PObject.hpp"
#include "Point.hpp"
#include "Astar.hpp"
#include "PathList.hpp"
Index: netpanzer/src/NetPanzer/Interfaces/PlayerInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/PlayerInterface.hpp:1.2
netpanzer/src/NetPanzer/Interfaces/PlayerInterface.hpp:1.3
--- netpanzer/src/NetPanzer/Interfaces/PlayerInterface.hpp:1.2 Mon Sep 1
16:24:21 2003
+++ netpanzer/src/NetPanzer/Interfaces/PlayerInterface.hpp Wed Sep 10
08:03:18 2003
@@ -18,12 +18,11 @@
#ifndef _PLAYERINTERFACE_HPP
#define _PLAYERINTERFACE_HPP
-#include "PObject.hpp"
#include "PlayerState.hpp"
#include "UnitInterface.hpp"
#include "NetMessageEncoder.hpp"
-class PlayerInterface : public PObject
+class PlayerInterface
{
private:
static PlayerState local_player_state;
Index: netpanzer/src/NetPanzer/Interfaces/ProjectileInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/ProjectileInterface.hpp:1.2
netpanzer/src/NetPanzer/Interfaces/ProjectileInterface.hpp:1.3
--- netpanzer/src/NetPanzer/Interfaces/ProjectileInterface.hpp:1.2 Mon Sep
1 16:24:21 2003
+++ netpanzer/src/NetPanzer/Interfaces/ProjectileInterface.hpp Wed Sep 10
08:03:18 2003
@@ -21,8 +21,7 @@
#include "Projectile.hpp"
#include "Weapon.hpp"
-
-class ProjectileInterface : public PObject
+class ProjectileInterface
{
protected:
static InternalLink *projectile_list_start;
Index: netpanzer/src/NetPanzer/Interfaces/StaticsInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/StaticsInterface.hpp:1.1
netpanzer/src/NetPanzer/Interfaces/StaticsInterface.hpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/StaticsInterface.hpp:1.1 Sun Dec 1
12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/StaticsInterface.hpp Wed Sep 10
08:03:18 2003
@@ -22,10 +22,9 @@
#include "PArrayGrowable.hpp"
#include "SpriteSorter.hpp"
-
#include "Gdatstct.hpp"
-class StaticsInterface : public PObject
+class StaticsInterface
{
protected:
static PArrayGrowable static_sprite_list;
Index: netpanzer/src/NetPanzer/Interfaces/Stats.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/Stats.hpp:1.1
netpanzer/src/NetPanzer/Interfaces/Stats.hpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/Stats.hpp:1.1 Sun Dec 1 12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/Stats.hpp Wed Sep 10 08:03:18 2003
@@ -18,7 +18,6 @@
#ifndef __STATS_HPP
#define __STATS_HPP
-#include "PObject.hpp"
#include "PArray.hpp"
#include "PlayerInterface.hpp"
@@ -39,7 +38,7 @@
_stats_display_type_default
};
-class Stats : public PObject
+class Stats
{
protected:
static int sort_order_enum;
Index: netpanzer/src/NetPanzer/Interfaces/TileInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/TileInterface.hpp:1.3
netpanzer/src/NetPanzer/Interfaces/TileInterface.hpp:1.4
--- netpanzer/src/NetPanzer/Interfaces/TileInterface.hpp:1.3 Wed Sep 10
07:26:09 2003
+++ netpanzer/src/NetPanzer/Interfaces/TileInterface.hpp Wed Sep 10
08:03:18 2003
@@ -18,13 +18,12 @@
#ifndef _TILEINTERFACE_HPP
#define _TILEINTERFACE_HPP
-#include "PObject.hpp"
#include "Surface.hpp"
#include "TileSet.hpp"
#include "Palette.hpp"
#include "Point.hpp"
-class TileInterface : virtual PObject
+class TileInterface
{
protected:
static TileSet tile_set;
Index: netpanzer/src/NetPanzer/Interfaces/UnitInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/UnitInterface.hpp:1.2
netpanzer/src/NetPanzer/Interfaces/UnitInterface.hpp:1.3
--- netpanzer/src/NetPanzer/Interfaces/UnitInterface.hpp:1.2 Mon Sep 1
16:24:21 2003
+++ netpanzer/src/NetPanzer/Interfaces/UnitInterface.hpp Wed Sep 10
08:03:18 2003
@@ -18,7 +18,6 @@
#ifndef _UNITINTERFACE_HPP
#define _UNITINTERFACE_HPP
-#include "PObject.hpp"
#include "UnitList.hpp"
#include "UnitBucketArray.hpp"
#include "UnitMessage.hpp"
@@ -38,7 +37,7 @@
enum { _no_unit_found, _unit_player, _unit_allied, _unit_enemy };
-class UnitInterface : public PObject
+class UnitInterface
{
protected:
static UnitList *unit_lists;
Index: netpanzer/src/NetPanzer/Interfaces/WorldViewInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/WorldViewInterface.hpp:1.3
netpanzer/src/NetPanzer/Interfaces/WorldViewInterface.hpp:1.4
--- netpanzer/src/NetPanzer/Interfaces/WorldViewInterface.hpp:1.3 Mon Sep
8 08:12:19 2003
+++ netpanzer/src/NetPanzer/Interfaces/WorldViewInterface.hpp Wed Sep 10
08:03:18 2003
@@ -19,10 +19,9 @@
#define _WORLDVIEWINTERFACE_HPP
#include "Point.hpp"
-#include "PObject.hpp"
#include "ViewCamera.hpp"
-class WorldViewInterface : virtual PObject
+class WorldViewInterface
{
protected:
static ViewCamera *main_camera;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [netPanzer-CVS] netpanzer/src ChangeLog Lib/LibView.cpp Lib/Lib...,
Matthias Braun <=