[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[netPanzer-CVS] netpanzer/src Makefile DirectX/DDraw/DirectDraw...
|
From: |
Matthias Braun |
|
Subject: |
[netPanzer-CVS] netpanzer/src Makefile DirectX/DDraw/DirectDraw... |
|
Date: |
Mon, 01 Sep 2003 16:24:32 -0400 |
CVSROOT: /cvsroot/netpanzer
Module name: netpanzer
Branch:
Changes by: Matthias Braun <address@hidden> 03/09/01 16:24:22
Modified files:
src : Makefile
src/DirectX/DDraw: DirectDraw.cpp DirectDraw.hpp
DirectDrawError.cpp DirectDrawError.hpp
DirectDrawPalette.cpp DirectDrawPalette.hpp
DirectDrawglobals.hpp
src/DirectX/DirectInput: DirectInput.cpp DirectInput.hpp
src/DirectX/DirectPlay: DPlayError.cpp DirectPlay.cpp
DirectPlay.h
src/DirectX/DirectSound: DSound.cpp DSound.hpp wave.cpp wave.h
src/Lib : LibView.cpp LibView.hpp List.hpp Math.cpp
Math.hpp Physics.cpp Physics.hpp cGrowList.hpp
cMouse.cpp cMouse.hpp cTimeStamp.cpp
cTimeStamp.hpp codewiz.hpp log.cpp
terminate.cpp
src/Lib/2D : Color.cpp Color.hpp ColorTable.cpp
ColorTable.hpp DigitText.cpp FontSystem2D.cpp
FontSystem2D.hpp PackedSurface.cpp
PackedSurface.hpp Palette.cpp Palette.hpp
RGBColor.cpp RGBColor.hpp Span.cpp Surface.cpp
Surface.hpp
src/Lib/Interfaces: JoystickInterface.cpp JoystickInterface.hpp
TimerInterface.cpp TimerInterface.hpp
UtilInterface.cpp UtilInterface.hpp
src/Lib/PObject/Classes: Angle.cpp BitArray.cpp BitArray.hpp
BoundBox.cpp BoundBox.hpp
BresenhamLine.cpp FileList.cpp
PArray.cpp PArray.hpp
PArrayGrowable.cpp PArrayGrowable.hpp
PHeap.cpp PHeap.hpp PObject.cpp
PObject.hpp PPriorityQueue.cpp
PPriorityQueue.hpp PQueue.cpp
PQueue.hpp Point.cpp Point.hpp
SafePointer.hpp Timer.cpp Timer.hpp
src/Lib/PObject/Templates: ArrayGrowableTemplate.hpp
ArrayTemplate.hpp
BucketArrayTemplate.hpp
LinkListDoubleTemplate.hpp
LinkListSingleTemplate.hpp
QueueTemplate.hpp
src/Lib/Particles: ChunkTrajectoryParticle2D.cpp
CloudParticle2D.cpp CraterParticle2D.cpp
DirtKickParticle2D.cpp DirtKickParticle2D.hpp
ExplosionFlashParticle2D.hpp
FireParticle2D.cpp FireParticle2D.hpp
FireParticleSystem2D.cpp
FireParticleSystem2D.hpp FlameParticle2D.cpp
FlameParticle2D.hpp FlashParticle2D.cpp
GroundExplosionParticle2D.cpp
GroundExplosionParticle2D.hpp
GroundExplosionParticleSystem2D.cpp
GroundExplosionParticleSystem2D.hpp
MovementDirtPuffParticle2D.hpp Particle2D.cpp
Particle2D.hpp ParticleInterface.cpp
ParticleInterface.hpp ParticleSystem2D.cpp
ParticleSystem2D.hpp
ParticleSystemGlobals.cpp
ParticleTweakView.cpp PuffParticle2D.cpp
RadarPingParticle2D.cpp
SmokingTrajectoryParticle2D.cpp
SmokingTrajectoryParticle2D.hpp
SmolderParticleSystem2D.cpp
SmolderParticleSystem2D.hpp
SnowParticle2D.cpp SnowParticle2D.hpp
SnowParticleSystem2D.cpp
SnowParticleSystem2D.hpp SparkParticle2D.cpp
SparkParticle2D.hpp
TemplateExplosionSystem.cpp
TemplateMuzzleSystem.cpp
TrajectoryParticle2D.cpp
VectorPuffParticle2D.cpp
VectorPuffParticle2D.hpp WindParticle2D.cpp
src/Lib/Types : LibTypes.hpp fRect.cpp fRect.hpp fXYZ.cpp
fXYZ.hpp iRect.cpp iRect.hpp iXY.cpp
src/Lib/View : AbstractButton.cpp AbstractButton.hpp
Button.cpp Button.hpp CheckBox.cpp Choice.cpp
Component.cpp Component.hpp Cursor.cpp
Desktop.cpp Desktop.hpp Dialog.cpp
FileDialog.cpp Icon.cpp InputEvent.hpp
Label.cpp List.cpp MouseEvent.hpp ScrollBar.cpp
String.cpp String.hpp TextArea.cpp
TextComponent.cpp TextField.cpp
TitledBorder.cpp View.cpp View.hpp
ViewGlobals.cpp Window.cpp cButton.cpp
cButton.hpp cInputField.cpp cInputField.hpp
src/NetPanzer/Classes: BonusUnitPowerUp.cpp BonusUnitPowerUp.hpp
DDHardSurface.cpp DDHardSurface.hpp
EnemyRadarPowerUp.cpp
EnemyRadarPowerUp.hpp InternalLink.hpp
KeyBinder.cpp KeyBinder.hpp Objective.cpp
Objective.hpp ObjectiveMessageTypes.hpp
Outpost.cpp PlacementMatrix.cpp
PlacementMatrix.hpp PlayerID.cpp
PlayerID.hpp PlayerState.cpp
PlayerState.hpp PlayerUnitConfig.cpp
PlayerUnitConfig.hpp PowerUp.cpp
PowerUp.hpp Projectile.cpp
SelectionBoxSprite.cpp
SelectionBoxSprite.hpp SelectionList.cpp
SelectionList.hpp SpawnList.cpp
Sprite.cpp Sprite.hpp SpriteSorter.cpp
SpriteSorter.hpp TileEngine.cpp
TileSet.cpp TileSet.hpp Unit.cpp
UnitBase.hpp UnitBlackBoard.cpp
UnitBlackBoard.hpp UnitBucketArray.cpp
UnitBucketArray.hpp UnitID.hpp
UnitList.cpp UnitList.hpp UnitMessage.cpp
UnitMessage.hpp UnitMessageTypes.hpp
UnitOpcodeEncoder.cpp
UnitOpcodeEncoder.hpp UnitOpcodes.hpp
UnitPowerUp.cpp UnitPowerUp.hpp
UnitState.cpp UnitState.hpp
ViewCamera.cpp ViewCamera.hpp
WadMapTable.hpp
WorldInputCmdProcessor.cpp
WorldInputCmdProcessor.hpp WorldMap.cpp
WorldMap.hpp
src/NetPanzer/Classes/AI: Astar.cpp Astar.hpp PathList.cpp
PathList.hpp PathingState.cpp
src/NetPanzer/Classes/Network: ClientConnectDaemon.cpp
ClientMessageRouter.cpp
ClientServerNetMessage.hpp
ConnectNetMessage.hpp
GameControlNetMessage.hpp
NetMessageEncoder.cpp
NetMessageEncoder.hpp
NetMessageLog.cpp
NetMessageLog.hpp NetPacket.hpp
NetPacketQueues.cpp
NetPacketQueues.hpp
NetworkClient.cpp
NetworkClient.hpp
NetworkInterface.cpp
NetworkServer.cpp
NetworkServer.hpp
NetworkState.cpp
ObjectiveNetMessage.hpp
PlayerNetMessage.hpp
ServerConnectDaemon.cpp
ServerConnectDaemon.hpp
ServerMessageRouter.cpp
SystemNetMessage.hpp
TerminalNetMesg.hpp
UnitNetMessage.cpp
UnitNetMessage.hpp
src/NetPanzer/Classes/Units: Abrams.cpp Archer.cpp
Hammerhead.cpp Humvee.cpp
Leopard.cpp Lynx.cpp M109.cpp
Scorpion.cpp SpahPanzer.cpp
UnitGlobals.cpp Valentine.cpp
Vehicle.cpp Vehicle.hpp
src/NetPanzer/Classes/Weapons: BulletWeapon.cpp MissleWeapon.cpp
ShellWeapon.cpp Weapon.cpp
Weapon.hpp WeaponGlobals.cpp
src/NetPanzer/Core: loadPics.cpp netPanzerGlobals.cpp
netPanzerMain.cpp netPanzerMain.h
netPanzerThread.cpp netPanzerThread.h
netPanzerWinMain.cpp netPanzerWinMain.h
netPanzerWinProc.cpp netPanzerWinProc.h
src/NetPanzer/Interfaces: ChatInterface.cpp Client.cpp
Client.hpp ConsoleInterface.cpp
ConsoleInterface.hpp GameConfig.cpp
GameConfig.hpp
GameControlRulesDaemon.cpp
GameControlRulesDaemon.hpp
GameManager.cpp GameManager.hpp
KeyboardInterface.cpp
KeyboardInterface.hpp MapInterface.cpp
MapInterface.hpp MapsManager.cpp
MiniMapInterface.cpp
MiniMapInterface.hpp
MouseInterface.cpp MouseInterface.hpp
ObjectiveInterface.cpp
ObjectiveInterface.hpp
PathScheduler.cpp PathScheduler.hpp
PlayerInterface.cpp
PlayerInterface.hpp
PowerUpInterface.cpp
PowerUpInterface.hpp
ProjectileInterface.cpp
ProjectileInterface.hpp Server.cpp
Server.hpp StaticsInterface.cpp
Stats.cpp TileInterface.cpp
TileInterface.hpp UnitInterface.cpp
UnitInterface.hpp
UnitProfileInterface.cpp
WorldViewInterface.cpp
WorldViewInterface.hpp
src/NetPanzer/Port: Gdatstct.cpp Gdatstct.hpp Globals.h
Wrldsprt.cpp Wrldsprt.hpp blitters.cpp
pzrportglobals.cpp
src/NetPanzer/Views: GameViewGlobals.cpp GameViewGlobals.hpp
src/NetPanzer/Views/Game: AreYouSureExitView.cpp
AreYouSureResignView.cpp ChatView.cpp
ChatView.hpp CodeStatsView.cpp
ControlPaletteView.cpp
ControlPaletteView.hpp ControlView.cpp
ControlView.hpp GameInfoView.cpp
GameTemplateView.cpp
GameToolbarView.cpp GameView.cpp
GameView.hpp HelpScrollView.cpp
LobbyView.cpp MiniMapOptionsView.cpp
MiniMapView.cpp MiniMapView.hpp
MiniRankView.hpp ProgressView.cpp
RankView.cpp RankView.hpp
ResignView.cpp
VehicleSelectionView.cpp
VehicleSelectionView.hpp
WinnerMesgView.cpp _MiniMapView.cpp
oldCodeStatsView.cpp
src/NetPanzer/Views/MainMenu: HelpView.cpp MainMenuView.cpp
MenuTemplateView.cpp
MenuTemplateView.hpp
OptionsTemplateView.cpp
OrderingView.cpp
RMouseHackView.cpp
SkirmishView.cpp SkirmishView.hpp
SpecialButtonView.cpp
src/NetPanzer/Views/MainMenu/Multi:
DirectPlayErrorExceptionView.cpp
FlagSelectionView.cpp
GetConnectionTypeView.cpp
GetSessionHostView.cpp
GetSessionView.cpp
HostJoinTemplateView.cpp
HostOptionsView.cpp
HostView.cpp
IPAddressView.cpp
ImageSelectorView.cpp
ImageSelectorView.hpp
JoinView.cpp
MapSelectionView.cpp
MultiMapSelectorView.cpp
MultiMapSelectorView.hpp
MultiVehicleSelectorView.cpp
MultiVehicleSelectorView.hpp
PlayerNameView.cpp
UnitColorView.cpp
UnitSelectionView.cpp
src/NetPanzer/Views/MainMenu/Options: ControlsView.cpp
InterfaceView.cpp
SoundView.cpp
VisualsView.cpp
src/PyroUtil/ImgRobot: ArrayTemplate.hpp ColorPakDialog.cpp
ImageRobot.cpp ImageRobotDlg.cpp
ImageRobotGlobals.cpp ImageUtils.cpp
PObject.cpp PackFileDialog.cpp
RenameInfoDialog.cpp StdAfx.cpp
cropinfodialog.cpp
src/PyroUtil/PaletteFix: PaletteFix.cpp
src/Setup/source: netPanzerSetup.cpp
src/UILib : UIDraw.cpp UIDraw.hpp
src/UILib/SDL : SDLDraw.cpp SDLDraw.hpp
src/Win32 : Win32Console.cpp Win32Console.hpp
Win32Mouse.cpp WinTimer.cpp WinTimer.hpp
gapp.cpp
src/Win32/Winsock: WinSockClientList.cpp WinSockClientList.h
WinSockMessage.hpp WinsockClient.cpp
WinsockClient.h WinsockServer.cpp
WinsockServer.h
Added files:
src : ChangeLog TODO config.h
src/DirectX/DirectPlay: NetPanzerGUID.cpp
src/Lib : FileUtil.cpp FileUtil.hpp Util.hpp
src/NetPanzer/Interfaces/unix: NetworkServerUnix.cpp
NetworkServerUnix.hpp
src/NetPanzer/Interfaces/win32: NetworkClientDPlay.cpp
NetworkClientDPlay.hpp
NetworkClientWinSock.cpp
NetworkClientWinSock.hpp
NetworkServerDPlay.cpp
NetworkServerDPlay.hpp
NetworkServerWinSock.cpp
NetworkServerWinSock.hpp
src/Stub : README
Removed files:
src/Lib : cSafeString.cpp loadSaveData.cpp
loadSaveData.hpp
src/NetPanzer/Interfaces: NetworkClientDPlay.cpp
NetworkClientDPlay.hpp
NetworkClientWinSock.cpp
NetworkClientWinSock.hpp
NetworkServerDPlay.cpp
NetworkServerDPlay.hpp
NetworkServerWinSock.cpp
NetworkServerWinSock.hpp
Log message:
The big commit. The source compiles and links in mingw now. (and
somewhat runs,
but not really because lots of msvc assembler blitting routines are
commented
out). It also compiles (but not links) on unix. Changes:
-Added very basic makefile
-removed #include "Stdafx.h" from all source files, gcc doesn't have
precompiled headers like msvc.
-Added some missing include in several files
-Removed strange double-include protection from codewiz.hpp
-Removed DOS-compilation stuff from codewiz.hpp
-Renamed TRUE to true, FALSE to false, BOOL to bool and removed the
definitions
for them from codewiz.hpp
-Removed BYTE,WORD,DWORD definitions from codewiz.hpp these are already
defined
in Types/LibTypes.hpp
-Commented memset assembler routines in codewiz.hpp
-removed special WATCOM/MSVC #pragmas in lots of places in codewiz.hpp
-changed type of PALETTE_LENGTH to size_t
-added a SWAP function to codewiz.hpp, couldn't find one elsewhere in
the
project. Also added a SWAP function with an explicit temporary variable
which
is used at some places in the project (does this bring speed?)
-made destructor of Surface, Component, SpritePacked virtual
-changed usage of zeroMem to memset
-use memcpy instead of memcpyB
-Added a stub of RDTSC function to cTimeStamp.cpp, need an
implementation there.-Added a dummy GameTemplateView.hpp. Needs investigation
why the Lib includes
files from the main game.
-copied KeyScanCodeDefs.h from main game
-removed #if _MSC_VER > 1000 #pragma once #endif randomly from several
files...
-removed /= (const float&) in fXYZ class (/= (float) is enough)
-gave up with the Lib/Main Game dependencies and added include paths to
the maingame in the Makefiles...
-removed "aliasdef.h" from several files (it contained yet another
definition of a boolean type...), several renames again :-/
-added int return type to getUnitInfoDrawLayer in GameConfig
-changed iRect constructor to use const types
-disabled all joystick code
-casted several floats to ints in ColorTable.cpp to avoid warnings
-Commented out several uses of _splitpath (which is win32 only) at
FileList.cpp
-fixed some upper/lowercase errors in #include statements
-commented out code that uses _findfirst in Surface.cpp and
PackedSurface.cpp,
this is a win32 only function
-casted some floats to int in Palette.cpp to avoid warnings
-commented out several assembler routines in Span.cpp
-removed custom memcpy from Surface.cpp
-changed a MessageBox to fprintf(stderr, ...) in Surface.cpp
-added implementation of MIN and MAX to codewiz.hpp
-renamed stricmp to strcasecmp in UtilInterface.cpp
-made some functions in SpritePacked and Sprite const-correct
-commented out lots of code in DirtKickParticle2D, because a variable
didn't
seem to be defined. Did teh same in GroundExplosionParticle
-some more const-correctness fixes in GroundExplosionParticle and
TrajectoryParticle.
-made some functions in WorldViewInterface const-correct, same in
ViewCamera
-commented out some direct sound code in ParticleInterface.cpp
-renamed some occurences of NULL to 0 in ParticleSystem2D
-commented out isRolloverEnabled in AbstractButton.hpp, this variable
doesn't
seem to exist.
-removed Lib/loadSaveData.* it wasn't used (some joystick stuff, we
wanna remove the joystick anyway).
Patches:
Index: netpanzer/src/DirectX/DDraw/DirectDraw.cpp
diff -u netpanzer/src/DirectX/DDraw/DirectDraw.cpp:1.2
netpanzer/src/DirectX/DDraw/DirectDraw.cpp:1.3
--- netpanzer/src/DirectX/DDraw/DirectDraw.cpp:1.2 Sun Aug 31 20:03:02 2003
+++ netpanzer/src/DirectX/DDraw/DirectDraw.cpp Mon Sep 1 16:24:18 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 "stdafx.hpp"
+#include <windows.h>
+#include <windowsx.h>
#include "DirectDraw.hpp"
#include "DirectDrawError.hpp"
#include "gapp.hpp"
@@ -43,7 +43,9 @@
//extern globalApp gapp;
-unsigned char *DOUBLE_BUFFER = NULL;
+DirectDraw DDraw;
+
+unsigned char *DOUBLE_BUFFER = 0;
unsigned long DBUFFER_WIDTH;
unsigned long DBUFFER_HEIGHT;
@@ -80,34 +82,34 @@
//---------------------------------------------------------------------------
DirectDraw::DirectDraw()
{
- lpDirectDraw = NULL;
- lpFrontBuffer = NULL;
- lpBackBuffer = NULL;
- lpDoubleBuffer = NULL;
+ lpDirectDraw = 0;
+ lpFrontBuffer = 0;
+ lpBackBuffer = 0;
+ lpDoubleBuffer = 0;
memset((void *) &DDPrimaryDesc, 0, sizeof(DDPrimaryDesc));
memset((void *) &DDDoubleBuffDesc, 0, sizeof(DDDoubleBuffDesc));
memset((void *) &ddscapsPrim, 0, sizeof(ddscapsPrim));
memset((void *) &ddscapsDBuff, 0, sizeof(ddscapsDBuff));
- doubleBufferLocked = FALSE;
- GDIEnabled = FALSE;
- DBufferTransferInProgress = FALSE;
- VideoBufferingModeInitialized = FALSE;
+ doubleBufferLocked = false;
+ GDIEnabled = false;
+ DBufferTransferInProgress = false;
+ VideoBufferingModeInitialized = false;
} // end DirectDraw constructor
// initialize
//---------------------------------------------------------------------------
-BOOL DirectDraw::initialize( )
+bool DirectDraw::initialize( )
{
- if ( DDrawCreate() == FALSE)
- { return( FALSE ); }
+ if ( DDrawCreate() == false)
+ { return( false ); }
enumDisplayModes();
checkCPUTechnology();
selectBlittingFunction();
- return( TRUE );
+ return( true );
} // end initialize
// shutdown
@@ -118,10 +120,10 @@
cleanUpSurfaces();
- if (lpDirectDraw != NULL)
+ if (lpDirectDraw != 0)
{
lpDirectDraw->Release();
- lpDirectDraw = NULL;
+ lpDirectDraw = 0;
}
} // end shutdown
@@ -147,7 +149,7 @@
// isDisplayModeAvailable
//---------------------------------------------------------------------------
-BOOL DirectDraw::isDisplayModeAvailable(int width, int height, int bpp)
+bool DirectDraw::isDisplayModeAvailable(int width, int height, int bpp)
{
for (DWORD i = 0; i < displayModeCount; i++)
{
@@ -156,15 +158,15 @@
(displayModeList[ i ].height == height) &&
(displayModeList[ i ].bpp == bpp))
{
- return TRUE;
+ return true;
}
}
- return FALSE;
+ return false;
} // end isDisplayModeAvailable
// sets the video mode using the current mode flags.
-BOOL DirectDraw::setVideoMode(int width, int height, int bpp)
+bool DirectDraw::setVideoMode(int width, int height, int bpp)
{
if (currentDisplayMode.width != width ||
currentDisplayMode.height != height ||
@@ -192,7 +194,7 @@
// EXAMPLE
// -----------
//
-// DisplayMode *list = NULL;
+// DisplayMode *list = 0;
// int num;
//
// ...
@@ -212,9 +214,9 @@
// Decreases the screen resolution if possible, otherwise
// leaves the display mode as is.
//---------------------------------------------------------------------------
-BOOL DirectDraw::decreaseDisplayModeResolution(int *width, int *height )
+bool DirectDraw::decreaseDisplayModeResolution(int *width, int *height )
{
- DisplayMode *newDisplay = NULL;
+ DisplayMode *newDisplay = 0;
int newNumPixels = 0;
int currNumPixels = currentDisplayMode.width *
currentDisplayMode.height;
@@ -227,7 +229,7 @@
if (displayModeList[i].bpp == currentDisplayMode.bpp &&
numPixels < currNumPixels)
{
- if (newDisplay == NULL ||
+ if (newDisplay == 0 ||
numPixels > newNumPixels)
{
newDisplay = &displayModeList[i];
@@ -237,7 +239,7 @@
}
- if (newDisplay != NULL)
+ if (newDisplay != 0)
{
setVideoMode(newDisplay->width,
newDisplay->height,
@@ -247,10 +249,10 @@
*width = newDisplay->width;
*height = newDisplay->height;
- return ( TRUE );
+ return ( true );
}
- return ( FALSE );
+ return ( false );
} // end decreaseDisplayModeResolution
// increaseDisplayModeResolution();
@@ -258,9 +260,9 @@
// Increases the screen resolution if possible, otherwise
// leaves the display mode as is.
//---------------------------------------------------------------------------
-BOOL DirectDraw::increaseDisplayModeResolution( int *width, int *height )
+bool DirectDraw::increaseDisplayModeResolution( int *width, int *height )
{
- DisplayMode *newDisplay = NULL;
+ DisplayMode *newDisplay = 0;
int newNumPixels = 0;
int currNumPixels = currentDisplayMode.width *
currentDisplayMode.height;
@@ -273,7 +275,7 @@
if (displayModeList[i].bpp == currentDisplayMode.bpp &&
numPixels > currNumPixels)
{
- if (newDisplay == NULL ||
+ if (newDisplay == 0 ||
numPixels < newNumPixels)
{
newDisplay = &displayModeList[i];
@@ -283,7 +285,7 @@
}
- if (newDisplay != NULL)
+ if (newDisplay != 0)
{
setVideoMode(newDisplay->width,
newDisplay->height,
@@ -293,67 +295,67 @@
*width = newDisplay->width;
*height = newDisplay->height;
- return ( TRUE );
+ return ( true );
}
- return ( FALSE );
+ return ( false );
} // end increaseDisplayModeResolution
// enumDisplayModes
//---------------------------------------------------------------------------
-BOOL DirectDraw::enumDisplayModes()
+bool DirectDraw::enumDisplayModes()
{
HRESULT hr;
resetDisplayModeList();
- hr = lpDirectDraw->EnumDisplayModes(0, NULL, (void *) this,
enumDisplayModesCallback);
+ hr = lpDirectDraw->EnumDisplayModes(0, 0, (void *) this,
enumDisplayModesCallback);
if(hr != DD_OK)
{
DDErrorBox("enumDisplayModes" , hr);
- return FALSE;
+ return false;
}
- return FALSE;
+ return false;
} // end enumDisplayModes
// DDrawCreate
//---------------------------------------------------------------------------
-BOOL DirectDraw::DDrawCreate()
+bool DirectDraw::DDrawCreate()
{
HRESULT hr;
- hr = DirectDrawCreate(NULL, &lpDirectDraw, NULL);
+ hr = DirectDrawCreate(0, &lpDirectDraw, 0);
if(hr != DD_OK)
{
free(lpDirectDraw);
- lpDirectDraw = NULL;
+ lpDirectDraw = 0;
DDErrorBox("DDrawCreate", hr);
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
} // end DDrawCreate
// cleanUpSurfaces
//---------------------------------------------------------------------------
void DirectDraw::cleanUpSurfaces()
{
- if (lpDirectDraw != NULL)
+ if (lpDirectDraw != 0)
{
- if (lpFrontBuffer != NULL)
+ if (lpFrontBuffer != 0)
{
lpFrontBuffer->Release();
- lpFrontBuffer = NULL;
+ lpFrontBuffer = 0;
}
- if (lpDoubleBuffer != NULL)
+ if (lpDoubleBuffer != 0)
{
lpDoubleBuffer->Release();
- lpDoubleBuffer = NULL;
+ lpDoubleBuffer = 0;
}
}
} // end cleanUpSurfaces
@@ -375,9 +377,9 @@
// setVideoMode
//---------------------------------------------------------------------------
-BOOL DirectDraw::setVideoMode(DWORD width, DWORD height, DWORD bpp, BYTE
modeFlags)
+bool DirectDraw::setVideoMode(DWORD width, DWORD height, DWORD bpp, BYTE
modeFlags)
{
- BOOL result;
+ bool result;
cleanUpSurfaces();
@@ -399,18 +401,19 @@
#pragma optimize( "", off )
#endif
-BOOL DirectDraw::checkCPUTechnology( void )
- {
-
- // MMX detection code courtesy of some bloak on the net
- // nice execption handling routines :)
+bool DirectDraw::checkCPUTechnology( void )
+{
+ // MMX detection code courtesy of some bloak on the net
+ // nice execption handling routines :)
- volatile BOOL retval = TRUE;
- volatile DWORD RegEDX;
+ volatile bool retval = true;
+ volatile DWORD RegEDX;
+ (void) RegEDX;
- MMXAvailable = 1;
+ MMXAvailable = 1;
FPUAvailable = 1;
+#ifdef MSVC
__try {
_asm {
mov eax, 1 // set up CPUID to return
processor version and features
@@ -427,30 +430,30 @@
if (retval == 0)
{
MMXAvailable = 0;
- return FALSE; // processor does not support CPUID
+ return false; // processor does not support CPUID
}
if (RegEDX & 0x800000) // bit 23 is set for MMX technology
{
__try { _asm emms } // try executing the MMX instruction
"emms"
- __except(EXCEPTION_EXECUTE_HANDLER) { MMXAvailable = 0; retval =
FALSE; }
+ __except(EXCEPTION_EXECUTE_HANDLER) { MMXAvailable = 0; retval =
false; }
return retval;
}
else
{
MMXAvailable = 0;
- return FALSE; // processor supports CPUID but does not
support MMX technology
+ return false; // processor supports CPUID but does not
support MMX technology
}
+#endif
// if retval == 0 here, it means the processor has MMX technology but
// floating-point emulation is on; so MMX technology is unavailable
MMXAvailable = 0;
- FPUAvailable = 0;
+ FPUAvailable = 0;
return retval;
-
- }
+}
#if _MSC_VER > 1000
#pragma optimize( "", on )
@@ -458,12 +461,12 @@
void DirectDraw::selectBlittingFunction( void )
{
- if ( MMXAvailable == TRUE )
+ if ( MMXAvailable == true )
{
BlitRectsFuncPtr = BlitRectsMMX;
}
else
- if ( FPUAvailable == TRUE )
+ if ( FPUAvailable == true )
{
BlitRectsFuncPtr = BlitRectsFPU;
}
@@ -473,46 +476,46 @@
}
}
-BOOL DirectDraw::setBlittingFunction( int blitFuncEnum )
+bool DirectDraw::setBlittingFunction( int blitFuncEnum )
{
switch ( blitFuncEnum )
{
case BLIT_FUNC_MMX :
{
- if ( MMXAvailable == TRUE )
+ if ( MMXAvailable == true )
{
BlitRectsFuncPtr = BlitRectsMMX;
- return( TRUE );
+ return( true );
}
- return( FALSE );
+ return( false );
} break;
case BLIT_FUNC_FPU :
{
- if ( FPUAvailable == TRUE )
+ if ( FPUAvailable == true )
{
BlitRectsFuncPtr = BlitRectsFPU;
- return( TRUE );
+ return( true );
}
- return( FALSE );
+ return( false );
} break;
case BLIT_FUNC_MEMCPY :
{
BlitRectsFuncPtr = BlitRectsMemcpy;
- return( TRUE );
+ return( true );
} break;
} // switch
- return( FALSE );
+ return( false );
}
// windowedSurfaceInitialization
//---------------------------------------------------------------------------
-BOOL DirectDraw::windowedSurfaceInitialization(DWORD width, DWORD height,
DWORD bpp, BYTE modeFlags)
+bool DirectDraw::windowedSurfaceInitialization(DWORD width, DWORD height,
DWORD bpp, BYTE modeFlags)
{
- BOOL maximize_window_area = FALSE;
+ bool maximize_window_area = false;
DDSURFACEDESC currentVideoMode;
int bitsPerPlane, planes;
HRESULT hr;
@@ -522,7 +525,7 @@
if(hr != DD_OK)
{
DDErrorBox("DDSetCooperativeLevel" , hr);
- return FALSE;
+ return false;
}
cooperationLevelFlags = DDSCL_NORMAL;
@@ -536,7 +539,7 @@
if(hr != DD_OK)
{
DDErrorBox("GetDisplayMode:" , hr);
- return FALSE;
+ return false;
}
if (currentVideoMode.ddpfPixelFormat.dwRGBBitCount != bpp)
@@ -547,11 +550,11 @@
"Warning",
MB_OK);
- return FALSE;
+ return false;
}
if ( currentVideoMode.dwWidth == width && currentVideoMode.dwHeight ==
height )
- { maximize_window_area = TRUE; }
+ { maximize_window_area = true; }
currentDisplayMode.width = currentVideoMode.dwWidth;
@@ -563,10 +566,10 @@
{
enumDisplayModes();
- if (isDisplayModeAvailable(width, height, bpp) == FALSE)
+ if (isDisplayModeAvailable(width, height, bpp) == false)
{
MessageBox(gapp.hwndApp, "Video Mode Not Supported",
"Error", MB_OK);
- return(FALSE );
+ return(false );
}
hr = lpDirectDraw->SetDisplayMode(width, height, bpp);
@@ -574,11 +577,11 @@
if(hr != DD_OK)
{
DDErrorBox("DDSetVideoMode" , hr);
- return FALSE;
+ return false;
}
}
- if ( maximize_window_area == TRUE )
+ if ( maximize_window_area == true )
{
SetWindowLong( gapp.hwndApp, GWL_STYLE, WS_POPUP | WS_VISIBLE);
}
@@ -592,26 +595,26 @@
RECT rc;
HDC hdc;
- hdc = GetDC(NULL);
+ hdc = GetDC(0);
- if ( hdc == NULL )
+ if ( hdc == 0 )
{ MessageBox( gapp.hwndApp, "GetDC Failed in Windowed Initialization",
"DirectDraw", MB_OK ); }
planes = GetDeviceCaps(hdc, PLANES);
bitsPerPlane = GetDeviceCaps(hdc, BITSPIXEL);
bitsPerPlane = planes * bitsPerPlane;
- ReleaseDC(NULL, hdc);
+ ReleaseDC(0, hdc);
SetRect(&rc, 0, 0, width, height);
AdjustWindowRectEx(
&rc,
GetWindowStyle(gapp.hwndApp),
- GetMenu(gapp.hwndApp) != NULL,
+ GetMenu(gapp.hwndApp) != 0,
GetWindowExStyle(gapp.hwndApp));
- SetWindowPos(gapp.hwndApp, NULL, 0, 0, rc.right-rc.left,
rc.bottom-rc.top, SWP_NOZORDER | SWP_NOACTIVATE);
+ SetWindowPos(gapp.hwndApp, 0, 0, 0, rc.right-rc.left, rc.bottom-rc.top,
SWP_NOZORDER | SWP_NOACTIVATE);
SetWindowPos(gapp.hwndApp, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE |
SWP_NOACTIVATE);
@@ -627,26 +630,26 @@
rc.top = rcWork.top;
}
- SetWindowPos(gapp.hwndApp, NULL, rc.left, rc.top, 0, 0, SWP_NOSIZE |
SWP_NOZORDER | SWP_NOACTIVATE);
+ SetWindowPos(gapp.hwndApp, 0, rc.left, rc.top, 0, 0, SWP_NOSIZE |
SWP_NOZORDER | SWP_NOACTIVATE);
DDPrimaryDesc.dwSize = sizeof(DDPrimaryDesc);
DDPrimaryDesc.dwFlags = DDSD_CAPS;
DDPrimaryDesc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;
- hr = lpDirectDraw->CreateSurface(&DDPrimaryDesc, &lpFrontBuffer, NULL);
+ hr = lpDirectDraw->CreateSurface(&DDPrimaryDesc, &lpFrontBuffer, 0);
if(hr != DD_OK)
{
DDErrorBox("CreatePrimarySurface", hr);
- return FALSE;
+ return false;
}
- hr = lpDirectDraw->CreateClipper(0, &lpClipper, NULL);
+ hr = lpDirectDraw->CreateClipper(0, &lpClipper, 0);
if(hr != DD_OK)
{
DDErrorBox("CreateClipper", hr);
- return FALSE;
+ return false;
}
hr = lpClipper->SetHWnd(0, gapp.hwndApp);
@@ -654,7 +657,7 @@
if(hr != DD_OK)
{
DDErrorBox("Clipper: SetHWnd", hr);
- return FALSE;
+ return false;
}
hr = lpFrontBuffer->SetClipper( lpClipper );
@@ -662,7 +665,7 @@
if (hr != DD_OK)
{
DDErrorBox("SetClipper", hr);
- return FALSE;
+ return false;
}
palette.initialize(lpDirectDraw, _palette_mode_window );
@@ -671,13 +674,13 @@
currentModeFlags = modeFlags;
- VideoBufferingModeInitialized = TRUE;
- return TRUE;
+ VideoBufferingModeInitialized = true;
+ return true;
} // end windowedSurfaceInitialization
// fullScreenSurfaceInitialization
//---------------------------------------------------------------------------
-BOOL DirectDraw::fullScreenSurfaceInitialization(DWORD width, DWORD height,
DWORD bpp, BYTE modeFlags)
+bool DirectDraw::fullScreenSurfaceInitialization(DWORD width, DWORD height,
DWORD bpp, BYTE modeFlags)
{
HRESULT hr;
@@ -688,17 +691,17 @@
if(hr != DD_OK)
{
DDErrorBox("DDSetCooperativeLevel", hr);
- return FALSE;
+ return false;
}
cooperationLevelFlags = DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN |
DDSCL_ALLOWREBOOT;
enumDisplayModes();
- if (isDisplayModeAvailable(width, height, bpp) == FALSE)
+ if (isDisplayModeAvailable(width, height, bpp) == false)
{
MessageBox(gapp.hwndApp, "Video Mode Not Supported", "Error",
MB_OK);
- return( FALSE );
+ return( false );
}
hr = lpDirectDraw->SetDisplayMode(width, height, bpp);
@@ -706,7 +709,7 @@
if(hr != DD_OK)
{
DDErrorBox( "DDSetVideoMode", hr);
- return FALSE;
+ return false;
}
currentDisplayMode.width = width;
@@ -724,12 +727,12 @@
DDPrimaryDesc.ddsCaps.dwCaps = DDPrimaryDesc.ddsCaps.dwCaps
| DDSCAPS_COMPLEX | DDSCAPS_FLIP;
}
- hr = lpDirectDraw->CreateSurface(&DDPrimaryDesc, &lpFrontBuffer, NULL);
+ hr = lpDirectDraw->CreateSurface(&DDPrimaryDesc, &lpFrontBuffer, 0);
if (hr != DD_OK)
{
DDErrorBox("CreatePrimarySurface", hr);
- return(FALSE);
+ return(false);
}
if ((modeFlags & VIDEO_MODE_TRIPLE_BUFFER))
@@ -743,7 +746,7 @@
if( ( hr == DDERR_INVALIDOBJECT) || (hr ==
DDERR_INVALIDPARAMS) )
{
DDErrorBox("CreateBackBuffer", hr);
- return FALSE;
+ return false;
}
else
{
@@ -753,14 +756,14 @@
DDPrimaryDesc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;
lpFrontBuffer->Release();
- lpFrontBuffer = NULL;
+ lpFrontBuffer = 0;
- hr = lpDirectDraw->CreateSurface(&DDPrimaryDesc, &lpFrontBuffer,
NULL);
+ hr = lpDirectDraw->CreateSurface(&DDPrimaryDesc, &lpFrontBuffer,
0);
if (hr != DD_OK)
{
DDErrorBox("CreatePrimarySurface", hr);
- return(FALSE);
+ return(false);
}
modeFlags = modeFlags & (~VIDEO_MODE_TRIPLE_BUFFER);
@@ -776,14 +779,14 @@
currentModeFlags = modeFlags;
- VideoBufferingModeInitialized = TRUE;
+ VideoBufferingModeInitialized = true;
- return TRUE;
+ return true;
} // end fullScreenSurfaceInitialization
// createFrameBuffer
//---------------------------------------------------------------------------
-BOOL DirectDraw::createFrameBuffer(DWORD width, DWORD height, DWORD bpp)
+bool DirectDraw::createFrameBuffer(DWORD width, DWORD height, DWORD bpp)
{
memset( (void *) &DDDoubleBuffDesc, 0, sizeof(DDDoubleBuffDesc) );
@@ -807,12 +810,12 @@
HRESULT hr;
- hr = lpDirectDraw->CreateSurface(&DDDoubleBuffDesc, &lpDoubleBuffer,
NULL);
+ hr = lpDirectDraw->CreateSurface(&DDDoubleBuffDesc, &lpDoubleBuffer, 0);
if(hr != DD_OK)
{
DDErrorBox( "CreateDoubleBufferSurface", hr);
- return FALSE;
+ return false;
}
DBufferDesc.width = DBUFFER_WIDTH = width;
@@ -824,12 +827,12 @@
DBufferDesc.offset_to_view = OFFSET_TO_VIEW = 0;
DBufferDesc.offset_to_screen_start = 0;
- return TRUE;
+ return true;
} // end createFrameBuffer
// createFrameBuffer
//---------------------------------------------------------------------------
-BOOL DirectDraw::createFrameBuffer(DWORD width, DWORD height, DWORD bpp, DWORD
clipWidth, DWORD clipHeight)
+bool DirectDraw::createFrameBuffer(DWORD width, DWORD height, DWORD bpp, DWORD
clipWidth, DWORD clipHeight)
{
DWORD bufferWidth;
DWORD bufferHeight;
@@ -849,47 +852,47 @@
DBufferDesc.offset_to_view = OFFSET_TO_VIEW = bufferWidth *
clipHeight + clipWidth;
DBufferDesc.offset_to_screen_start = bufferWidth * clipHeight + clipWidth;
- return TRUE;
+ return true;
} // end createFrameBuffer
// lockDoubleBuffer
//---------------------------------------------------------------------------
-BOOL DirectDraw::lockDoubleBuffer(unsigned char **DoubleBuffer)
+bool DirectDraw::lockDoubleBuffer(unsigned char **DoubleBuffer)
{
HRESULT result;
- if (doubleBufferLocked == TRUE)
+ if (doubleBufferLocked == true)
{
- return FALSE;
+ return false;
}
memset(&ddDbufferPtrSurf, 0, sizeof(ddDbufferPtrSurf));
ddDbufferPtrSurf.dwSize = sizeof(ddDbufferPtrSurf);
- result = lpDoubleBuffer->Lock(NULL, &ddDbufferPtrSurf, DDLOCK_WAIT |
DDLOCK_SURFACEMEMORYPTR, NULL);
+ result = lpDoubleBuffer->Lock(0, &ddDbufferPtrSurf, DDLOCK_WAIT |
DDLOCK_SURFACEMEMORYPTR, 0);
if (result != DD_OK)
{
DDErrorBox("LockDoubleBuffer", result);
- return FALSE;
+ return false;
}
*DoubleBuffer = (unsigned char *) ddDbufferPtrSurf.lpSurface;
- doubleBufferLocked = TRUE;
+ doubleBufferLocked = true;
- return TRUE;
+ return true;
} // end lockDoubleBuffer
// unlockDoubleBuffer
//---------------------------------------------------------------------------
-BOOL DirectDraw::unlockDoubleBuffer()
+bool DirectDraw::unlockDoubleBuffer()
{
HRESULT result;
if (!doubleBufferLocked)
{
- return FALSE;
+ return false;
}
result = lpDoubleBuffer->Unlock(ddDbufferPtrSurf.lpSurface);
@@ -897,26 +900,26 @@
if (result != DD_OK)
{
DDErrorBox("UnlockDoubleBuffer", result);
- return FALSE;
+ return false;
}
- doubleBufferLocked = FALSE;
+ doubleBufferLocked = false;
- return TRUE;
+ return true;
} // end unlockDoubleBuffer
// copyDoubleBufferandFlip
//---------------------------------------------------------------------------
-BOOL DirectDraw::copyDoubleBufferandFlip()
+bool DirectDraw::copyDoubleBufferandFlip()
{
HRESULT result;
- DBufferTransferInProgress = TRUE;
+ DBufferTransferInProgress = true;
if (GDIEnabled)
{
- DBufferTransferInProgress = FALSE;
- return TRUE;
+ DBufferTransferInProgress = false;
+ return true;
}
RECT rect;
@@ -937,14 +940,14 @@
if(result != DD_OK)
{
DDErrorBox("CopyDoubleBufferandFlip : Get
Attached", result);
- return FALSE;
+ return false;
}
if( (DD_OK != lpBackBuffer->GetBltStatus( DDGBS_CANBLT ) )
||
(DD_OK != lpDoubleBuffer->GetBltStatus( DDGBS_CANBLT) )
)
{
- result = lpFrontBuffer->Flip( NULL, 0 );
+ result = lpFrontBuffer->Flip( 0, 0 );
if(result == DDERR_SURFACELOST)
{
@@ -954,10 +957,10 @@
if( (result != DD_OK) && (result !=
DDERR_WASSTILLDRAWING) )
{
DDErrorBox("CopyDoubleBufferandFlip : Flip",
result);
- return FALSE;
+ return false;
}
- return( TRUE );
+ return( true );
}
//result = lpBackBuffer->BltFast( 0,0, lpDoubleBuffer, &rect,
DDBLTFAST_NOCOLORKEY );
@@ -972,11 +975,11 @@
if(result != DD_OK)
{
DDErrorBox("CopyDoubleBufferandFlip : Blit",
result);
- return FALSE;
+ return false;
}
- //result = lpFrontBuffer->Flip( NULL, DDFLIP_WAIT);
- result = lpFrontBuffer->Flip( NULL, 0 );
+ //result = lpFrontBuffer->Flip( 0, DDFLIP_WAIT);
+ result = lpFrontBuffer->Flip( 0, 0 );
if(result == DDERR_SURFACELOST)
{
@@ -986,7 +989,7 @@
if( (result != DD_OK) && (result !=
DDERR_WASSTILLDRAWING) )
{
DDErrorBox("CopyDoubleBufferandFlip : Flip",
result);
- return FALSE;
+ return false;
}
} else
@@ -994,7 +997,7 @@
if( (DD_OK != lpFrontBuffer->GetBltStatus( DDGBS_CANBLT ) ) ||
(DD_OK != lpDoubleBuffer->GetBltStatus( DDGBS_CANBLT ) )
)
- { return( TRUE ); }
+ { return( true ); }
//result = lpFrontBuffer->BltFast( 0,0, lpDoubleBuffer,
&rect, DDBLTFAST_NOCOLORKEY );
@@ -1008,7 +1011,7 @@
if( result != DD_OK)
{
DDErrorBox("DoubeBufferedCopy : Blt", result);
- return FALSE;
+ return false;
}
}
@@ -1019,9 +1022,9 @@
if( (DD_OK != lpFrontBuffer->GetBltStatus( DDGBS_CANBLT ) ) ||
(DD_OK != lpDoubleBuffer->GetBltStatus( DDGBS_CANBLT ) )
)
- { return( TRUE ); }
+ { return( true ); }
- //result = lpFrontBuffer->Blt(&gapp.wndRectangle,
lpDoubleBuffer, &rect, DDBLT_WAIT, NULL);
+ //result = lpFrontBuffer->Blt(&gapp.wndRectangle,
lpDoubleBuffer, &rect, DDBLT_WAIT, 0);
result = DDBltRects( lpDoubleBuffer, lpFrontBuffer, 1, &rect,
&gapp.wndRectangle );
@@ -1031,13 +1034,13 @@
if(result != DD_OK)
{
DDErrorBox("WindowedCopy : Blt", result);
- return ( FALSE );
+ return ( false );
}
}
- DBufferTransferInProgress = FALSE;
+ DBufferTransferInProgress = false;
- return TRUE;
+ return true;
} // end copyDoubleBufferandFlip
// restoreAll
@@ -1046,9 +1049,9 @@
{
HRESULT result;
- if ( (lpDirectDraw == NULL) ||
- (GDIEnabled == FALSE) ||
- (VideoBufferingModeInitialized == FALSE) )
+ if ( (lpDirectDraw == 0) ||
+ (GDIEnabled == false) ||
+ (VideoBufferingModeInitialized == false) )
{
return;
}
@@ -1101,9 +1104,9 @@
// setGDIStatus
//---------------------------------------------------------------------------
-void DirectDraw::setGDIStatus(BOOL enable)
+void DirectDraw::setGDIStatus(bool enable)
{
- if ( (lpDirectDraw == NULL) || (VideoBufferingModeInitialized == FALSE)
)
+ if ( (lpDirectDraw == 0) || (VideoBufferingModeInitialized == false) )
{
return;
}
@@ -1115,23 +1118,23 @@
return;
}
- GDIEnabled = TRUE;
+ GDIEnabled = true;
while(DBufferTransferInProgress);
lpDirectDraw->FlipToGDISurface();
- while( ShowCursor( TRUE ) <= 0 );
+ while( ShowCursor( true ) <= 0 );
}
if (!enable)
{
- while( ShowCursor( FALSE ) > 0 );
+ while( ShowCursor( false ) > 0 );
if (!GDIEnabled)
{
return;
}
- GDIEnabled = FALSE;
+ GDIEnabled = false;
}
} // end setGDIStatus
@@ -1218,7 +1221,7 @@
void BlitRectsMMX( unsigned char *pSrc, long srcPitch, unsigned char *pDest,
long destPitch,
long bytesPerPixel, long nRects, RECT *pSrcRects, RECT
*pDestRects )
{
-
+#ifdef MSVC
long y, rows, prebytes, qwords, postbytes;
unsigned char *src, *dest;
@@ -1295,6 +1298,9 @@
{
EMMS
}
+#else
+ printf ("No BlitMMX version for gcc yet.\n");
+#endif
}
#if _MSC_VER > 1000
@@ -1336,7 +1342,7 @@
void BlitRectsFPU( unsigned char *pSrc, long srcPitch, unsigned char *pDest,
long destPitch,
long bytesPerPixel, long nRects, RECT *pSrcRects, RECT
*pDestRects )
{
-
+#if 0
long y, rows, prebytes, qdwords, postbytes;
unsigned char *src, *dest;
@@ -1410,6 +1416,9 @@
pSrcRects++;
pDestRects++;
}
+#else
+ printf ("NoBlit rects FPU version for gcc yet.\n");
+#endif
}
#if _MSC_VER > 1000
Index: netpanzer/src/DirectX/DDraw/DirectDraw.hpp
diff -u netpanzer/src/DirectX/DDraw/DirectDraw.hpp:1.2
netpanzer/src/DirectX/DDraw/DirectDraw.hpp:1.3
--- netpanzer/src/DirectX/DDraw/DirectDraw.hpp:1.2 Sun Aug 31 20:03:02 2003
+++ netpanzer/src/DirectX/DDraw/DirectDraw.hpp Mon Sep 1 16:24:18 2003
@@ -19,7 +19,6 @@
#ifndef __DirectDraw_hpp__
#define __DirectDraw_hpp__
-#include "stdafx.hpp"
#include "DirectDrawPalette.hpp"
#include "UIDraw.hpp"
@@ -63,27 +62,27 @@
protected:
int defaultVideoMode;
- BOOL doubleBufferLocked;
+ bool doubleBufferLocked;
DDSURFACEDESC ddDbufferPtrSurf;
DoubleBufferDesc DBufferDesc;
DWORD displayModeCount;
DisplayMode displayModeList[MAX_VIDEO_MODES];
- BOOL GDIEnabled;
- BOOL DBufferTransferInProgress;
- BOOL VideoBufferingModeInitialized;
+ bool GDIEnabled;
+ bool DBufferTransferInProgress;
+ bool VideoBufferingModeInitialized;
void getViewableRect(RECT *rect);
- BOOL enumDisplayModes();
- BOOL DDrawCreate();
+ bool enumDisplayModes();
+ bool DDrawCreate();
void cleanUpSurfaces();
- BOOL MMXAvailable;
- BOOL FPUAvailable;
- BOOL checkCPUTechnology( void );
+ bool MMXAvailable;
+ bool FPUAvailable;
+ bool checkCPUTechnology( void );
void selectBlittingFunction( void );
- BOOL windowedSurfaceInitialization(DWORD width, DWORD height,DWORD
bpp,BYTE modeFlags);
- BOOL fullScreenSurfaceInitialization(DWORD width,DWORD height,DWORD
bpp,BYTE modeFlags);
+ bool windowedSurfaceInitialization(DWORD width, DWORD height,DWORD
bpp,BYTE modeFlags);
+ bool fullScreenSurfaceInitialization(DWORD width,DWORD height,DWORD
bpp,BYTE modeFlags);
void (*BlitRectsFuncPtr)( unsigned char *pSrc, long srcPitch, unsigned
char *pDest, long destPitch,
@@ -109,7 +108,7 @@
LPDIRECTDRAWCLIPPER lpClipper;
- BOOL fEnabled; //DirectDraw enabled
+ bool fEnabled; //DirectDraw enabled
DWORD cooperationLevelFlags;
BYTE currentModeFlags;
@@ -119,23 +118,23 @@
DirectDraw();
- BOOL initialize();
+ bool initialize();
void shutdown();
- BOOL setVideoMode(int width, int height, int bpp = 8);
+ bool setVideoMode(int width, int height, int bpp = 8);
void getVideoMode(DWORD &width, DWORD &height, DWORD &bpp);
void getDisplayModes(DisplayMode **modes, int &num);
- BOOL setBlittingFunction( int blitFuncEnum );
+ bool setBlittingFunction( int blitFuncEnum );
- BOOL setVideoMode(DWORD width, DWORD height, DWORD bpp, BYTE mode_flags);
- BOOL createFrameBuffer(DWORD width, DWORD height, DWORD bpp);
- BOOL createFrameBuffer(DWORD width, DWORD height, DWORD bpp, DWORD
clip_width, DWORD clip_height);
- BOOL lockDoubleBuffer(BYTE **DoubleBuffer);
- BOOL unlockDoubleBuffer();
- BOOL copyDoubleBufferandFlip();
- void setGDIStatus(BOOL enable);
- BOOL getGDIStatus( void ) { return( GDIEnabled ); }
+ bool setVideoMode(DWORD width, DWORD height, DWORD bpp, BYTE mode_flags);
+ bool createFrameBuffer(DWORD width, DWORD height, DWORD bpp);
+ bool createFrameBuffer(DWORD width, DWORD height, DWORD bpp, DWORD
clip_width, DWORD clip_height);
+ bool lockDoubleBuffer(BYTE **DoubleBuffer);
+ bool unlockDoubleBuffer();
+ bool copyDoubleBufferandFlip();
+ void setGDIStatus(bool enable);
+ bool getGDIStatus( void ) { return( GDIEnabled ); }
void restoreAll();
void loadPaletteACT(char *filename);
void resetDisplayModeList();
@@ -143,9 +142,9 @@
void setPalette(RGBColor *color);
- BOOL isDisplayModeAvailable(int width, int height, int bpp);
- BOOL decreaseDisplayModeResolution( int *width, int *height );
- BOOL increaseDisplayModeResolution( int *width, int *height );
+ bool isDisplayModeAvailable(int width, int height, int bpp);
+ bool decreaseDisplayModeResolution( int *width, int *height );
+ bool increaseDisplayModeResolution( int *width, int *height );
}; // end DirectDraw
#endif // end __DirectDraw_hpp__
Index: netpanzer/src/DirectX/DDraw/DirectDrawError.cpp
diff -u netpanzer/src/DirectX/DDraw/DirectDrawError.cpp:1.1
netpanzer/src/DirectX/DDraw/DirectDrawError.cpp:1.2
--- netpanzer/src/DirectX/DDraw/DirectDrawError.cpp:1.1 Sun Dec 1 12:19:35 2002
+++ netpanzer/src/DirectX/DDraw/DirectDrawError.cpp Mon Sep 1 16:24:18 2003
@@ -15,7 +15,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+#include <windows.h>
#include <ddraw.h>
#include <d3d.h>
#include <d3drmwin.h>
@@ -39,7 +39,7 @@
va_end(args);
lstrcat(buff, "\r\n");
- MessageBox( NULL, buff, "D3DRM Example Message", MB_OK );
+ MessageBox( 0, buff, "D3DRM Example Message", MB_OK );
}
@@ -53,7 +53,7 @@
error_string = D3DRMErrorToString( error );
- MessageBox( NULL, error_string, title, MB_OK );
+ MessageBox( 0, error_string, title, MB_OK );
}
Index: netpanzer/src/DirectX/DDraw/DirectDrawError.hpp
diff -u netpanzer/src/DirectX/DDraw/DirectDrawError.hpp:1.1
netpanzer/src/DirectX/DDraw/DirectDrawError.hpp:1.2
--- netpanzer/src/DirectX/DDraw/DirectDrawError.hpp:1.1 Sun Dec 1 12:19:35 2002
+++ netpanzer/src/DirectX/DDraw/DirectDrawError.hpp Mon Sep 1 16:24:18 2003
@@ -15,13 +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
*/
-
-
#ifndef __ERROR_H__
#define __ERROR_H__
-
-#include "stdafx.hpp"
-
#ifdef __cplusplus
extern "C" {
Index: netpanzer/src/DirectX/DDraw/DirectDrawPalette.cpp
diff -u netpanzer/src/DirectX/DDraw/DirectDrawPalette.cpp:1.2
netpanzer/src/DirectX/DDraw/DirectDrawPalette.cpp:1.3
--- netpanzer/src/DirectX/DDraw/DirectDrawPalette.cpp:1.2 Sun Aug 31
20:03:02 2003
+++ netpanzer/src/DirectX/DDraw/DirectDrawPalette.cpp Mon Sep 1 16:24:18 2003
@@ -15,8 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-#include "stdafx.hpp"
#include "DirectDrawPalette.hpp"
#include "DirectDrawError.hpp"
#include "gapp.hpp"
@@ -25,10 +23,10 @@
//---------------------------------------------------------------------------
DirectDrawPalette::DirectDrawPalette()
{
- DirectDrawPalette::logPaletteHandle = NULL;
- DirectDrawPalette::systemPaletteHandle = NULL;
- DirectDrawPalette::lpDDPalette = NULL;
- DirectDrawPalette::lpDDLink = NULL;
+ DirectDrawPalette::logPaletteHandle = 0;
+ DirectDrawPalette::systemPaletteHandle = 0;
+ DirectDrawPalette::lpDDPalette = 0;
+ DirectDrawPalette::lpDDLink = 0;
DirectDrawPalette::paletteMode = _palette_mode_fullscreen;
}
@@ -56,7 +54,7 @@
FILE *fp = fopen(filename, "rt");
- assert(fp != NULL);
+ assert(fp != 0);
for(int i = 0; i < 256; i++)
{
@@ -77,26 +75,26 @@
{
HRESULT result;
- if(lpDDPalette != NULL)
+ if(lpDDPalette != 0)
{
lpDDPalette->Release();
}
- if ( systemPaletteHandle != NULL )
+ if ( systemPaletteHandle != 0 )
{
DeleteObject( systemPaletteHandle );
- systemPaletteHandle = NULL;
+ systemPaletteHandle = 0;
}
- if ( logPaletteHandle != NULL )
+ if ( logPaletteHandle != 0 )
{
DeleteObject( logPaletteHandle );
- logPaletteHandle = NULL;
+ logPaletteHandle = 0;
}
- DirectDrawPalette::logPaletteHandle = NULL;
- DirectDrawPalette::systemPaletteHandle = NULL;
- DirectDrawPalette::lpDDPalette = NULL;
+ DirectDrawPalette::logPaletteHandle = 0;
+ DirectDrawPalette::systemPaletteHandle = 0;
+ DirectDrawPalette::lpDDPalette = 0;
DirectDrawPalette::lpDDLink = lpDirectDraw;
DirectDrawPalette::paletteMode = paletteMode;
@@ -104,7 +102,7 @@
build332Palette(paletteTable);
- result = lpDDLink->CreatePalette(DDPCAPS_8BIT, paletteTable,
&lpDDPalette, NULL);
+ result = lpDDLink->CreatePalette(DDPCAPS_8BIT, paletteTable,
&lpDDPalette, 0);
if(result != DD_OK)
{
@@ -118,21 +116,21 @@
{
activateSystemPalette();
- if(lpDDPalette != NULL)
+ if(lpDDPalette != 0)
{
lpDDPalette->Release();
}
- if ( systemPaletteHandle != NULL )
+ if ( systemPaletteHandle != 0 )
{
DeleteObject( systemPaletteHandle );
- systemPaletteHandle = NULL;
+ systemPaletteHandle = 0;
}
- if ( logPaletteHandle != NULL )
+ if ( logPaletteHandle != 0 )
{
DeleteObject( logPaletteHandle );
- logPaletteHandle = NULL;
+ logPaletteHandle = 0;
}
} // end cleanUp
@@ -154,7 +152,7 @@
HDC hdc;
UINT error;
- hdc = GetDC( NULL );
+ hdc = GetDC( 0 );
error = GetSystemPaletteEntries( hdc, 0, 256, systemPalette.palPalEntry );
if ( error == 0 )
@@ -166,7 +164,7 @@
systemPalette.palNumEntries = 256;
systemPaletteHandle = CreatePalette( (CONST LOGPALETTE *) &systemPalette );
- if ( systemPaletteHandle == NULL )
+ if ( systemPaletteHandle == 0 )
{
MessageBox(gapp.hwndApp, "Create System Palette Failed", "Error", MB_OK);
}
@@ -179,27 +177,29 @@
//---------------------------------------------------------------------------
void DirectDrawPalette::createLogicalPalette()
{
- for(int i = 0; i < 256; i++)
- {
+ int i;
+
+ for(i = 0; i < 256; i++)
+ {
logicalPalette.palPalEntry[i].peRed = paletteTable[i].peRed;
logicalPalette.palPalEntry[i].peGreen = paletteTable[i].peGreen;
logicalPalette.palPalEntry[i].peBlue = paletteTable[i].peBlue;
logicalPalette.palPalEntry[i].peFlags = 0;
- }
+ }
for(i = 1; i < 256; i++)
- {
- logicalPalette.palPalEntry[i].peFlags = PC_NOCOLLAPSE;
+ {
+ logicalPalette.palPalEntry[i].peFlags = PC_NOCOLLAPSE;
}
logicalPalette.palVersion = 0x300;
logicalPalette.palNumEntries = 256;
- if (logPaletteHandle != NULL)
+ if (logPaletteHandle != 0)
{
DeleteObject(logPaletteHandle);
- logPaletteHandle = NULL;
+ logPaletteHandle = 0;
}
logPaletteHandle = CreatePalette((CONST LOGPALETTE *) &logicalPalette);
@@ -228,13 +228,13 @@
UINT error;
HPALETTE palHandle;
- if (systemPaletteHandle == NULL)
+ if (systemPaletteHandle == 0)
{ return; }
if ( paletteMode == _palette_mode_fullscreen )
{ return; }
- hdc = GetDC(NULL);
+ hdc = GetDC(0);
error = SetSystemPaletteUse(hdc, SYSPAL_STATIC);
if (error == SYSPAL_ERROR)
@@ -242,9 +242,9 @@
MessageBox(gapp.hwndApp, "SetSystemPaletteUse Failed", "Error",
MB_OK);
}
- palHandle = SelectPalette(hdc, systemPaletteHandle, FALSE);
+ palHandle = SelectPalette(hdc, systemPaletteHandle, false);
- if (palHandle == NULL)
+ if (palHandle == 0)
{
MessageBox(gapp.hwndApp, "SelectPalette Failed", "Error",
MB_OK);
}
@@ -276,13 +276,13 @@
UINT error;
HPALETTE palHandle;
- if(logPaletteHandle == NULL)
+ if(logPaletteHandle == 0)
{ return; }
if ( paletteMode == _palette_mode_fullscreen )
{ return; }
- hdc = GetDC(NULL);
+ hdc = GetDC(0);
error = SetSystemPaletteUse(hdc, SYSPAL_NOSTATIC);
@@ -292,9 +292,9 @@
}
- palHandle = SelectPalette(hdc, logPaletteHandle, FALSE);
+ palHandle = SelectPalette(hdc, logPaletteHandle, false);
- if (palHandle == NULL)
+ if (palHandle == 0)
{
MessageBox(gapp.hwndApp, "SelectPalette Failed", "Error",
MB_OK);
}
@@ -307,7 +307,7 @@
}
- if (lpDDPalette != NULL)
+ if (lpDDPalette != 0)
{
lpDDPalette->SetEntries(0, 0, 256, logicalPalette.palPalEntry);
}
@@ -335,7 +335,7 @@
BYTE blue;
FILE *in_file = fopen(filename, "rb");
- assert(in_file != NULL);
+ assert(in_file != 0);
for(int i = 0; i < 256; i++)
{
@@ -352,15 +352,15 @@
fclose(in_file);
HRESULT result;
- if (lpDDPalette != NULL)
+ if (lpDDPalette != 0)
{
lpDDPalette->Release();
- lpDDPalette = NULL;
+ lpDDPalette = 0;
}
createLogicalPalette();
- result = lpDDLink->CreatePalette(DDPCAPS_8BIT, logicalPalette.palPalEntry,
&lpDDPalette, NULL);
+ result = lpDDLink->CreatePalette(DDPCAPS_8BIT, logicalPalette.palPalEntry,
&lpDDPalette, 0);
if (result != DD_OK)
{
@@ -398,15 +398,15 @@
}
HRESULT result;
- if (lpDDPalette != NULL)
+ if (lpDDPalette != 0)
{
lpDDPalette->Release();
- lpDDPalette = NULL;
+ lpDDPalette = 0;
}
createLogicalPalette();
- result = lpDDLink->CreatePalette(DDPCAPS_8BIT, logicalPalette.palPalEntry,
&lpDDPalette, NULL);
+ result = lpDDLink->CreatePalette(DDPCAPS_8BIT, logicalPalette.palPalEntry,
&lpDDPalette, 0);
if (result != DD_OK)
{
Index: netpanzer/src/DirectX/DDraw/DirectDrawPalette.hpp
diff -u netpanzer/src/DirectX/DDraw/DirectDrawPalette.hpp:1.2
netpanzer/src/DirectX/DDraw/DirectDrawPalette.hpp:1.3
--- netpanzer/src/DirectX/DDraw/DirectDrawPalette.hpp:1.2 Sun Aug 31
20:03:02 2003
+++ netpanzer/src/DirectX/DDraw/DirectDrawPalette.hpp Mon Sep 1 16:24:18 2003
@@ -15,12 +15,12 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
#ifndef __DirectDrawPalette_hpp__
#define __DirectDrawPalette_hpp__
-#include "stdafx.hpp"
#include "Palette.hpp"
+
+#include <ddraw.h>
struct LogicalPalette
Index: netpanzer/src/DirectX/DDraw/DirectDrawglobals.hpp
diff -u netpanzer/src/DirectX/DDraw/DirectDrawglobals.hpp:1.2
netpanzer/src/DirectX/DDraw/DirectDrawglobals.hpp:1.3
--- netpanzer/src/DirectX/DDraw/DirectDrawglobals.hpp:1.2 Sun Aug 31
20:03:02 2003
+++ netpanzer/src/DirectX/DDraw/DirectDrawglobals.hpp Mon Sep 1 16:24:18 2003
@@ -20,6 +20,8 @@
#include "DirectDraw.hpp"
+extern DirectDraw DDraw;
+
extern unsigned long DBUFFER_WIDTH;
extern unsigned long DBUFFER_HEIGHT;
extern unsigned long DBUFFER_VIEW_WIDTH;
Index: netpanzer/src/DirectX/DirectInput/DirectInput.cpp
diff -u netpanzer/src/DirectX/DirectInput/DirectInput.cpp:1.1
netpanzer/src/DirectX/DirectInput/DirectInput.cpp:1.2
--- netpanzer/src/DirectX/DirectInput/DirectInput.cpp:1.1 Sun Dec 1
12:51:40 2002
+++ netpanzer/src/DirectX/DirectInput/DirectInput.cpp Mon Sep 1 16:24:18 2003
@@ -15,56 +15,56 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+#include <windows.h>
#include "DirectInput.hpp"
#include "gapp.hpp"
-LPDIRECTINPUT DirectInput::lpDInput = NULL;
-LPDIRECTINPUTDEVICE DirectInput::lpDIKeyDevice = NULL;
+LPDIRECTINPUT DirectInput::lpDInput = 0;
+LPDIRECTINPUTDEVICE DirectInput::lpDIKeyDevice = 0;
-BOOL DirectInput::initialize( void )
+bool DirectInput::initialize( void )
{
HRESULT hresult;
hresult = DirectInputCreate( gapp.hinstance,
DIRECTINPUT_VERSION,
&lpDInput,
- NULL);
+ 0);
if ( hresult != DI_OK )
{
MessageBox(gapp.hwndApp, "Direct Input Initalization Failed"
,"DirectInput: ERROR", MB_OK);
- return( FALSE );
+ return( false );
}
- return( TRUE );
+ return( true );
}
void DirectInput::shutdown( void )
{
- if ( lpDIKeyDevice != NULL )
+ if ( lpDIKeyDevice != 0 )
{
lpDIKeyDevice->Unacquire();
lpDIKeyDevice->Release();
}
- if ( lpDInput != NULL )
+ if ( lpDInput != 0 )
{
lpDInput->Release();
}
}
-BOOL DirectInput::initializeDirectKeyboard( void )
+bool DirectInput::initializeDirectKeyboard( void )
{
HRESULT hresult;
- hresult = lpDInput->CreateDevice( GUID_SysKeyboard, &lpDIKeyDevice, NULL);
+ hresult = lpDInput->CreateDevice( GUID_SysKeyboard, &lpDIKeyDevice, 0);
if ( hresult != DI_OK )
{
MessageBox(gapp.hwndApp, "Could Not Create KeyBoard Device"
,"DirectInput: ERROR", MB_OK);
- return FALSE;
+ return false;
}
hresult = lpDIKeyDevice->SetDataFormat(&c_dfDIKeyboard);
@@ -75,7 +75,7 @@
,"DirectInput: ERROR", MB_OK);
lpDIKeyDevice->Release();
- return FALSE;
+ return false;
}
hresult = lpDIKeyDevice->SetCooperativeLevel(gapp.hwndApp,
@@ -85,13 +85,13 @@
{
MessageBox(gapp.hwndApp, "Could Not Set KeyBoard Cooperative Level"
,"DirectInput: ERROR", MB_OK);
- return FALSE;
+ return false;
}
lpDIKeyDevice->Acquire();
- return ( TRUE );
+ return ( true );
}
void DirectInput::shutdownDirectKeyboard( void )
Index: netpanzer/src/DirectX/DirectInput/DirectInput.hpp
diff -u netpanzer/src/DirectX/DirectInput/DirectInput.hpp:1.1
netpanzer/src/DirectX/DirectInput/DirectInput.hpp:1.2
--- netpanzer/src/DirectX/DirectInput/DirectInput.hpp:1.1 Sun Dec 1
12:51:40 2002
+++ netpanzer/src/DirectX/DirectInput/DirectInput.hpp Mon Sep 1 16:24:18 2003
@@ -28,11 +28,11 @@
public:
- static BOOL initialize( void );
+ static bool initialize( void );
static void shutdown( void );
// ** Direct Input Keyboard Methods
- static BOOL initializeDirectKeyboard( void );
+ static bool initializeDirectKeyboard( void );
static void shutdownDirectKeyboard( void );
static void getKeyboardState( char *key_table );
Index: netpanzer/src/DirectX/DirectPlay/DPlayError.cpp
diff -u netpanzer/src/DirectX/DirectPlay/DPlayError.cpp:1.1
netpanzer/src/DirectX/DirectPlay/DPlayError.cpp:1.2
--- netpanzer/src/DirectX/DirectPlay/DPlayError.cpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/DirectX/DirectPlay/DPlayError.cpp Mon Sep 1 16:24:18 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "DPlayError.hpp"
Index: netpanzer/src/DirectX/DirectPlay/DirectPlay.cpp
diff -u netpanzer/src/DirectX/DirectPlay/DirectPlay.cpp:1.1
netpanzer/src/DirectX/DirectPlay/DirectPlay.cpp:1.2
--- netpanzer/src/DirectX/DirectPlay/DirectPlay.cpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/DirectX/DirectPlay/DirectPlay.cpp Mon Sep 1 16:24:18 2003
@@ -15,14 +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
*/
-#define INITGUID
-#include <stdafx.hpp>
#include <windows.h>
#include <windowsx.h>
#include <cguid.h>
#include <string.h>
+#include <shlobj.h>
#include <shlguid.h> //not included by shlobj.h because INITGUID is defined
WILL THIS MEAN PROBLEMS?
//#include <wininet.h>
+#include <dplay.h>
#include "DirectPlay.h"
@@ -37,21 +37,21 @@
DPNAME dpName;
int DPlayMode = 0;
-int ConnectionBroken = FALSE;
+int ConnectionBroken = false;
struct DPlayDrivers dpDrivers[8]; //twice the max known number of
//service providers
struct ListOfGames gamelist[MAXGAMES];
struct PlayerInfo dpPlayerInfo[MAXPLAYERS];
-HANDLE ghDPReceiveThread = NULL; //handle of DP recieve thread
+HANDLE ghDPReceiveThread = 0; //handle of DP recieve thread
DWORD gidDPReceiveThread = 0; //id of the DP recieve thread
-HANDLE ghDPKillReceiveEvent = NULL; //event used to kill DP recieve thread
+HANDLE ghDPKillReceiveEvent = 0; //event used to kill DP recieve thread
-BOOL AlreadyConnected = FALSE;
-BOOL DirectPlayFailure = FALSE;
-BOOL AutoDial = TRUE; //FOR SAFETY SAKE, ASSUME IT IS ON
-BOOL AutoDialCheck = FALSE;
+bool AlreadyConnected = false;
+bool DirectPlayFailure = false;
+bool AutoDial = true; //FOR SAFETY SAKE, ASSUME IT IS ON
+bool AutoDialCheck = false;
int driverindex = 0;
int gameindex = 0;
@@ -61,7 +61,7 @@
int SelectedGame = 999; //an unreasonable number in this scheme
char SelectedGameName[64]; //used for catching failures
-LPVOID glpvReceiveBuffer = NULL;
+LPVOID glpvReceiveBuffer = 0;
DWORD gdwReceiveBufferSize = 0;
char Message[200];
@@ -83,54 +83,54 @@
HRESULT hr;
//create an IDirectPlay3 interace--
- hr = CoCreateInstance(CLSID_DirectPlay, NULL, CLSCTX_INPROC_SERVER,
+ hr = CoCreateInstance(CLSID_DirectPlay, 0, CLSCTX_INPROC_SERVER,
IID_IDirectPlay3A,
(LPVOID*)&lpDirectPlay3A);
//NOTE: WINERROR.H defines S_OK to be 0--
if(hr == S_OK)
{
//MessageBox(hWnd,"DirectPlay object created.", "Result",
MB_OK);
- hr = TRUE;
+ hr = true;
}
else
if(hr == REGDB_E_CLASSNOTREG)
{
//MessageBox(hWnd,"Class not registered. DirectPlay won't
work!", "Error", MB_OK);
- hr = FALSE;
+ hr = false;
}
else
if(hr == CLASS_E_NOAGGREGATION)
{
//MessageBox(hWnd,"No aggregate. DirectPlay won't work!",
"Error", MB_OK);
- hr = FALSE;
+ hr = false;
}
else
if(hr == E_INVALIDARG)
{
//MessageBox(hWnd,"Invalid Argument. DirectPlay won't work!",
"Error", MB_OK);
- hr = FALSE;
+ hr = false;
}
else
if(hr == E_UNEXPECTED)
{
//MessageBox(hWnd,"Unexpected Error. DirectPlay won't work!",
"Error", MB_OK);
- hr = FALSE;
+ hr = false;
}
else
if(hr == E_OUTOFMEMORY)
{
//MessageBox(hWnd,"Out of Memory. DirectPlay won't work!",
"Error", MB_OK);
- hr = FALSE;
+ hr = false;
}
else
{
//MessageBox(hWnd,"Now what's wrong? DirectPlay won't work!",
"Error", MB_OK);
- hr = FALSE;
+ hr = false;
}
//if cocreate worked--
- if(hr == TRUE) return 1;
+ if(hr == true) return 1;
return 0; //catchall errors return value
@@ -265,9 +265,9 @@
{
HRESULT hr;
- //set global driverindex = 0 so that I can enumconnections numerous times
- //without overwriting any arrays. Bug#15
- driverindex = 0;
+ //set global driverindex = 0 so that I can enumconnections numerous
times
+ //without overwriting any arrays. Bug#15
+ driverindex = 0;
hr = lpDirectPlay3A -> EnumConnections(&NETPANZER_GUID,
EnumServProviders, hWnd, 0);
@@ -275,11 +275,11 @@
//EnumConnections returns a DP_OK if everything went right on its side.
My callback
//function balks when it gets a null pointer for a connection type --
and I
//popup a message box then and call shutdownconnection from there,
because after
- //that I return a 'FALSE' which tells EnumConnections to exit. But if
all went
+ //that I return a 'false' which tells EnumConnections to exit. But if
all went
//well with EnumConnections to that point, then it will return DP_OK
when in fact
//it is not. Once again, the following code only handles EnumConnection
failures,
//not my callback (EnumServProviders) function failures. My callback
also sets
- //the global DirectPlayFailure = TRUE if an error occurred within its
scope.
+ //the global DirectPlayFailure = true if an error occurred within its
scope.
if(hr != DP_OK)
{
MessageBox(hWnd,"DPlay EnumConnections failed. DirectPlay won't
work!", "Error", MB_OK);
@@ -287,7 +287,7 @@
return 0;
}
- if(DirectPlayFailure == TRUE) return 0;
+ if(DirectPlayFailure == true) return 0;
else return 1;
}
////////////////////////////////////////////
@@ -318,7 +318,7 @@
gameindex = 0;
//check for valid interface--
- if(lpDirectPlay3A == NULL) return DPERR_INVALIDOBJECT;
+ if(lpDirectPlay3A == 0) return DPERR_INVALIDOBJECT;
//prepare to enum sessions by cleaning out a temporary session
description--
@@ -338,7 +338,7 @@
-//return TRUE if the directPlay function returns DP_OK,
+//return true if the directPlay function returns DP_OK,
//false otherwise
HRESULT StopAsyncGameEnumeration(HWND hWnd)
{
@@ -384,7 +384,7 @@
//now that the lists are cleared let's enum the players again,
//the lists are actually rebuilt in the callback function--
- hr = lpDirectPlay3A -> EnumPlayers( NULL, EnumPlayersInGame, NULL,
DPENUMPLAYERS_ALL);
+ hr = lpDirectPlay3A -> EnumPlayers( 0, EnumPlayersInGame, 0,
DPENUMPLAYERS_ALL);
if(hr == DP_OK) return 1;
else return 0;
@@ -410,10 +410,10 @@
DPlayMode = SERVER;
- if(lpDirectPlay3A == NULL)
+ if(lpDirectPlay3A == 0)
{
MessageBox(hWnd,"DPlay pointer invalid", "Error", MB_OK);
- return FALSE;
+ return false;
}
//attempt to close any open session (in case a user backed out of, say, host,
@@ -485,10 +485,10 @@
ZeroMemory(&dpName, sizeof(DPNAME));
dpName.dwSize = sizeof(DPNAME);
dpName.lpszShortNameA = szPlayerName;
- dpName.lpszLongNameA = NULL;
+ dpName.lpszLongNameA = 0;
// create a player with this name
- hr = lpDirectPlay3A->CreatePlayer(&dpidPlayer, &dpName,
hPlayerEvent, NULL, 0, 0);
+ hr = lpDirectPlay3A->CreatePlayer(&dpidPlayer, &dpName,
hPlayerEvent, 0, 0, 0);
if(hr == DP_OK) return 1;
else return 0;
@@ -515,7 +515,7 @@
//SET MY INTERNAL CLIENT FLAG FOR LATER USE--
DPlayMode = CLIENT;
- if(lpDirectPlay3A == NULL)
+ if(lpDirectPlay3A == 0)
{
MessageBox(hWnd,"DPlay pointer invalid", "Error", MB_OK);
return 0;
@@ -587,11 +587,11 @@
ZeroMemory(&dpName, sizeof(DPNAME));
dpName.dwSize = sizeof(DPNAME);
dpName.lpszShortNameA = szPlayerName;
- dpName.lpszLongNameA = NULL;
+ dpName.lpszLongNameA = 0;
//add the player to directplay with the user's name--
hr = lpDirectPlay3A->CreatePlayer(&dpidPlayer, &dpName,
- hPlayerEvent, NULL, 0,
0);
+ hPlayerEvent, 0, 0, 0);
if(hr != DP_OK)
{
@@ -608,9 +608,9 @@
MessageBox(hWnd,"Failed to enumerate players", "Error",
MB_OK);
return 0;
}
- else return TRUE;
+ else return true;
}
- else return FALSE;
+ else return false;
}
////////////////////////////////////////////
@@ -630,10 +630,10 @@
{
hr = lpDirectPlay3A->Close();
- if(hr != DP_OK) return FALSE;
+ if(hr != DP_OK) return false;
}
- return TRUE;
+ return true;
}
////////////////////////////////////////////
@@ -677,11 +677,11 @@
//copy pointer info for this connection (service provider)--
dpDrivers[driverindex].Connection = GlobalAllocPtr(GHND,
dwConnectionSize);
- if((dpDrivers[driverindex].Connection == NULL) && (driverindex <
NUMDRIVERS))
+ if((dpDrivers[driverindex].Connection == 0) && (driverindex <
NUMDRIVERS))
{
MessageBox(hWnd,"EnumServProvs failed. DirectPlay won't work!",
"Error", MB_OK);
- DirectPlayFailure = TRUE;
- return FALSE;
+ DirectPlayFailure = true;
+ return false;
}
memcpy(dpDrivers[driverindex].Connection, lpConnection,
dwConnectionSize);
@@ -698,23 +698,23 @@
upper = _strupr( servprovname);
provider = strstr( upper, tcpip);
- if(provider != NULL) dpDrivers[driverindex].ConnectionType = TCPIP;
+ if(provider != 0) dpDrivers[driverindex].ConnectionType = TCPIP;
provider = strstr( upper, ipx);
- if(provider != NULL) dpDrivers[driverindex].ConnectionType = IPX;
+ if(provider != 0) dpDrivers[driverindex].ConnectionType = IPX;
provider = strstr( upper, direct);
- if(provider != NULL) dpDrivers[driverindex].ConnectionType = DIRECT;
+ if(provider != 0) dpDrivers[driverindex].ConnectionType = DIRECT;
provider = strstr( upper, modem);
- if(provider != NULL) dpDrivers[driverindex].ConnectionType = MODEM;
+ if(provider != 0) dpDrivers[driverindex].ConnectionType = MODEM;
//increment driverindex for next call (and don't let it
- //increment too much). return TRUE to continue enumerating
- //or FALSE to stop--
- if(++driverindex >= NUMDRIVERS) return FALSE;
+ //increment too much). return true to continue enumerating
+ //or false to stop--
+ if(++driverindex >= NUMDRIVERS) return false;
- return TRUE;
+ return true;
}
////////////////////////////////////////////
@@ -738,12 +738,12 @@
if(dwFlags & DPESC_TIMEDOUT)
{
NumberOfGames = gameindex;
- return FALSE;
+ return false;
}
//make space for a session instance guid--
lpGuid = (LPGUID) GlobalAllocPtr(GHND, sizeof(GUID));
- if(lpGuid == NULL) return FALSE;
+ if(lpGuid == 0) return false;
//store pointer to guid in global game description array--
*lpGuid = lpSessionDesc -> guidInstance;
@@ -759,9 +759,9 @@
//make sure we aren't out of space for number of games--
- if(++gameindex >= MAXGAMES) return FALSE;
+ if(++gameindex >= MAXGAMES) return false;
- return TRUE;
+ return true;
}
////////////////////////////////////////////
@@ -792,9 +792,9 @@
lpString = (char *)&dpPlayerInfo[playerindex].Name;
strcpy(lpString, lpName->lpszShortNameA);
- if(++playerindex >= MAXPLAYERS) return FALSE;
+ if(++playerindex >= MAXPLAYERS) return false;
- return TRUE;
+ return true;
}
////////////////////////////////////////////
////////////////////////////////////////////
@@ -814,7 +814,7 @@
// loop waiting for player events. If the kill event is signaled
// the thread will exit
- while (WaitForMultipleObjects(2, eventHandles, FALSE, INFINITE) ==
WAIT_OBJECT_0)
+ while (WaitForMultipleObjects(2, eventHandles, false, INFINITE) ==
WAIT_OBJECT_0)
{
// Receive any packets in the queue
ReceivePacket();
@@ -844,7 +844,7 @@
AutoDialCheck = SetAutoDialState();
- hr = CoInitialize(NULL);
+ hr = CoInitialize(0);
if(FAILED(hr))
{
MessageBox(hWnd,"COM not initialized. DirectPlay won't work!",
"Error", MB_OK);
@@ -855,12 +855,12 @@
//this event is used to signal that
//a message has arrived--
- hPlayerEvent = CreateEvent( NULL, //no security
- FALSE, //auto
reset
- FALSE,
//initial event reset
- NULL); //no
name
+ hPlayerEvent = CreateEvent( 0, //no security
+ false, //auto
reset
+ false,
//initial event reset
+ 0); //no
name
- if(hPlayerEvent == NULL)
+ if(hPlayerEvent == 0)
{
MessageBox(hWnd,"Create PlayerEvent failed. DirectPlay won't
work!", "Error", MB_OK);
ShutDownConnection();
@@ -869,12 +869,12 @@
//this event is used to signal that the Receive thread
//should exit--
- ghDPKillReceiveEvent = CreateEvent( NULL, //no security
-
FALSE, //auto reset
-
FALSE, //initial event reset
-
NULL); //no name
+ ghDPKillReceiveEvent = CreateEvent( 0, //no security
+
false, //auto reset
+
false, //initial event reset
+
0); //no name
- if(ghDPKillReceiveEvent == NULL)
+ if(ghDPKillReceiveEvent == 0)
{
MessageBox(hWnd,"Create KillReceiveEvent failed. DirectPlay
won't work!", "Error", MB_OK);
ShutDownConnection();
@@ -882,14 +882,14 @@
}
//create a thread to receive player messages--
- ghDPReceiveThread = CreateThread( NULL,
//default security
+ ghDPReceiveThread = CreateThread( 0,
//default security
0, //default stack size
DPReceiveThread,//pointer to thread routine
-
NULL, //argument for thread
+
0, //argument for thread
0, //start it right away
&gidDPReceiveThread); //global id of thread
- if(ghDPReceiveThread == NULL)
+ if(ghDPReceiveThread == 0)
{
MessageBox(hWnd,"Create ReceiveThread failed. DirectPlay won't
work!", "Error", MB_OK);
ShutDownConnection();
@@ -901,7 +901,7 @@
//GlobalAllocPtr(flags, cb) (GlobalLock(GlobalAlloc((flags), (cb))))
ReceiveBuffer = GlobalAllocPtr(GHND, ReceiveBufferSize); //currently
set to 4096 bytes
- if(ReceiveBuffer == NULL)
+ if(ReceiveBuffer == 0)
{
MessageBox(hWnd,"No ReceiveBuffer. DirectPlay won't work!",
"Error", MB_OK);
ShutDownConnection();
@@ -935,10 +935,10 @@
//NOTE: this may be too simple. but calling 'Initialize' wouldn't
//seem to work, since according to the documentation it ALWAYS
//returns DPERR_ALREADYINITIALIZED
-BOOL IsDPlayObjectValid()
+bool IsDPlayObjectValid()
{
- if(lpDirectPlay3A == NULL) return NO;
+ if(lpDirectPlay3A == 0) return NO;
return YES;
}
@@ -947,7 +947,7 @@
-BOOL SetServProv(HWND hWnd, int SelectedProvider)
+bool SetServProv(HWND hWnd, int SelectedProvider)
{
HRESULT hr;
LPVOID lpDPConnection;
@@ -964,9 +964,9 @@
lpDPConnection = dpDrivers[index].Connection;
hr = InitializeServProvider(hWnd, lpDPConnection,
SelectedProvider);
- //if successful, return TRUE--
- if(hr == 1) return TRUE;
- else return FALSE;
+ //if successful, return true--
+ if(hr == 1) return true;
+ else return false;
}
@@ -975,7 +975,7 @@
}
//if we didn't find the driver in 4 iterations something is wrong--
- return FALSE;
+ return false;
}
@@ -1021,13 +1021,13 @@
{
SelectedGame = game_index;
strcpy( SelectedGameName, game_name );
- return( TRUE );
+ return( true );
}
}
SelectedGame = 999;
strcpy( SelectedGameName, "" );
- return( FALSE );
+ return( false );
}
@@ -1039,11 +1039,11 @@
if( stricmp( SelectedGameName, gamelist[game_index].SessionNameA) == 0 )
{
SelectedGame = game_index;
- return( TRUE );
+ return( true );
}
}
- return( FALSE );
+ return( false );
}
////////////////////////////////////////////
////////////////////////////////////////////
@@ -1054,18 +1054,18 @@
//make sure my game index is valid (in range of 0 to NumberOfGames),
- //if not return FALSE (we need to test this by selecting the first and
last
+ //if not return false (we need to test this by selecting the first and
last
//game in the menu list and selecting them)--
if((SelectedGame < 0) || (SelectedGame >= NumberOfGames) ||
(SelectedGame == 999))
- return FALSE;
+ return false;
//now get the correct game guid and set it
//equal to my pointer that is passed in. NOTE: i'm not positive
//about this syntax--
*lpguidGameInstance = *(gamelist[SelectedGame].lpSessionGuid);
- //return TRUE
- return TRUE;
+ //return true
+ return true;
}
////////////////////////////////////////////
@@ -1088,7 +1088,7 @@
dwMsgBufferSize = gdwReceiveBufferSize;
lpvMsgBuffer = glpvReceiveBuffer;
- while(TRUE)
+ while(true)
{
idFrom = 0;
idTo = 0;
@@ -1099,10 +1099,10 @@
//we may need to add code here to resize the buffer--
if (hr == DPERR_BUFFERTOOSMALL)
{
- if (lpvMsgBuffer == NULL)
+ if (lpvMsgBuffer == 0)
{
lpvMsgBuffer = GlobalAllocPtr(GHND,
dwMsgBufferSize);
- if (lpvMsgBuffer == NULL)
+ if (lpvMsgBuffer == 0)
return (DPERR_NOMEMORY);
glpvReceiveBuffer = lpvMsgBuffer;
gdwReceiveBufferSize = dwMsgBufferSize;
@@ -1110,7 +1110,7 @@
else if (dwMsgBufferSize > gdwReceiveBufferSize)
{
lpvMsgBuffer = GlobalReAllocPtr(lpvMsgBuffer,
dwMsgBufferSize, 0);
- if (lpvMsgBuffer == NULL)
+ if (lpvMsgBuffer == 0)
return (DPERR_NOMEMORY);
glpvReceiveBuffer = lpvMsgBuffer;
gdwReceiveBufferSize = dwMsgBufferSize;
@@ -1151,7 +1151,7 @@
}
if(DPlayMode == CLIENT)
{
- ConnectionBroken = TRUE;
+ ConnectionBroken = true;
}
}
@@ -1164,7 +1164,7 @@
}
if(DPlayMode == CLIENT)
{
- ConnectionBroken = TRUE;
+ ConnectionBroken = true;
}
}
@@ -1177,7 +1177,7 @@
}
if(DPlayMode == CLIENT)
{
- ConnectionBroken = TRUE;
+ ConnectionBroken = true;
}
}
@@ -1211,10 +1211,10 @@
void HandleSystemMessage(LPDPMSG_GENERIC lpMsg, DWORD dwMsgSize,
DPID idFrom, DPID idTo)
{
- BOOL added_player = FALSE;
- LPSTR pName = NULL;
- HWND hClient = NULL;
- HWND hServer = NULL;
+ bool added_player = false;
+ LPSTR pName = 0;
+ HWND hClient = 0;
+ HWND hServer = 0;
int index =0;
// The body of each case is there so you can set a breakpoint and examine
@@ -1228,7 +1228,7 @@
LPDPMSG_SESSIONLOST lp = (LPDPMSG_SESSIONLOST)lpMsg;
if(DPlayMode == CLIENT)
{
- ConnectionBroken = TRUE;
+ ConnectionBroken = true;
}
}
@@ -1268,8 +1268,8 @@
void HandleApplicationMessage(LPDPMSG_GENERIC lpMsg, DWORD dwMsgSize,
DPID idFrom, DPID
idTo)
{
- LPSTR lpString = NULL;
- LPSTR lpTempMessage = NULL;
+ LPSTR lpString = 0;
+ LPSTR lpTempMessage = 0;
AddPacketFunc( (void *) lpMsg, dwMsgSize, idTo, idFrom );
@@ -1283,7 +1283,7 @@
{
HRESULT hr;
- if(guarantee == TRUE)
+ if(guarantee == true)
{
hr = lpDirectPlay3A -> Send(dpidPlayer, DPID_ALLPLAYERS,
DPSEND_GUARANTEED, lpData, dwDataSize);
return( hr );
@@ -1305,7 +1305,7 @@
{
HRESULT hr;
- if(guarantee == TRUE)
+ if(guarantee == true)
{
hr = lpDirectPlay3A -> Send(dpidPlayer, idTo,
DPSEND_GUARANTEED, lpData, dwDataSize);
return( hr );
@@ -1328,7 +1328,7 @@
{
HRESULT hr;
- if(ConnectionBroken == TRUE)
+ if(ConnectionBroken == true)
{
hr = DPERR_SESSIONLOST;
return hr;
@@ -1350,11 +1350,11 @@
//END Destroy///////////////////////////////
-BOOL MinimizeOrNot(HWND hWnd)
+bool MinimizeOrNot(HWND hWnd)
{
- BOOL AutoDialupEnabled = TRUE; //be on the safe side
- BOOL Exist = FALSE;
- BOOL Active = FALSE;
+ bool AutoDialupEnabled = true; //be on the safe side
+ bool Exist = false;
+ bool Active = false;
//fix dialup bug
if(GetAutoDialCheck()) //was i successful examining the registry?
@@ -1363,25 +1363,25 @@
AutoDialupEnabled = GetAutoDialState();
//if autodial is enabled, let's do the routine--
- if(AutoDialupEnabled == TRUE)
+ if(AutoDialupEnabled == true)
{
DoesDialupConnectionExist(&Exist, &Active);
- if(Exist == TRUE)
+ if(Exist == true)
{
- if(Active == FALSE)
+ if(Active == false)
{
- SendMessage(hWnd, WM_ACTIVATEAPP, FALSE, 0);
+ SendMessage(hWnd, WM_ACTIVATEAPP, false, 0);
//InternetAttemptConnect(0);
- return( TRUE );
+ return( true );
}
}//end DoesDialupConnectionExist
else
{
- SendMessage(hWnd, WM_ACTIVATEAPP, FALSE, 0);
+ SendMessage(hWnd, WM_ACTIVATEAPP, false, 0);
//InternetAttemptConnect(0);
- return( TRUE );
+ return( true );
}
}//end if AutoDialupEnabled
@@ -1395,26 +1395,26 @@
/*
DoesDialupConnectionExist(&Exist, &Active);
- if(Exist == TRUE)
+ if(Exist == true)
{
- if(Active == FALSE)
+ if(Active == false)
{
- SendMessage(hWnd, WM_ACTIVATEAPP, FALSE, 0);
+ SendMessage(hWnd, WM_ACTIVATEAPP, false, 0);
InternetAttemptConnect(0);
- return( TRUE );
+ return( true );
}
}//end DoesDialupConnectionExist
*/
}//end else
- return( FALSE );
+ return( false );
}
////////////////////////////////////////////
//END MinimizeOrNot/////////////////////////
-BOOL GetAutoDialCheck()
+bool GetAutoDialCheck()
{
return AutoDialCheck;
@@ -1423,13 +1423,13 @@
//END GetAutoDialCheck//////////////////////
-BOOL SetAutoDialState()
+bool SetAutoDialState()
{
HKEY hKey;
LONG return_value;
DWORD dwType;
DWORD dwSize;
- LPBYTE autodial = NULL;
+ LPBYTE autodial = 0;
int compare = 0;
char registrypath[63];
@@ -1448,17 +1448,17 @@
{
return_value = RegQueryValueEx(hKey,
"EnableAutoDial",
- NULL,
+ 0,
&dwType,
- NULL,
+ 0,
&dwSize);
if(return_value == ERROR_SUCCESS) autodial = new unsigned char[dwSize];
- else return FALSE;
+ else return false;
return_value = RegQueryValueEx(hKey,
"EnableAutoDial",
- NULL,
+ 0,
&dwType,
autodial,
&dwSize);
@@ -1467,26 +1467,26 @@
if(return_value == ERROR_SUCCESS)
{
if((autodial[0] == 0x00) && (autodial[1] == 0x00) &&
- (autodial[2] == 0x00) && (autodial[3] == 0x00)) AutoDial = FALSE;
- else AutoDial = TRUE;
+ (autodial[2] == 0x00) && (autodial[3] == 0x00)) AutoDial = false;
+ else AutoDial = true;
//since i successfully read the registry for value of EnableAutoDial
//and since AutoDial global has been set one way or the other i can
- //return from this function with a TRUE -- other code knows that the
+ //return from this function with a true -- other code knows that the
//check went well and we don't have to resort to minimizing and launching
//the My Connection box to protect ourselves against hanging up the system--
- return TRUE;
+ return true;
}
- else return FALSE;
+ else return false;
}
- else return FALSE;
+ else return false;
}
////////////////////////////////////////////
//END SetAutoDialState//////////////////////
-BOOL GetAutoDialState()
+bool GetAutoDialState()
{
return AutoDial;
@@ -1495,7 +1495,7 @@
//END GetAutoDialState//////////////////////
-void DoesDialupConnectionExist(BOOL *exist, BOOL *active)
+void DoesDialupConnectionExist(bool *exist, bool *active)
{
HRESULT hr;
HWND hWnd;
@@ -1517,8 +1517,8 @@
//FAILS DOESN'T MEAN THAT A DIALUP CONNECTION ISN'T CONFIGURED--
if(FAILED(SHGetDesktopFolder(&pDesktop)))
{
- *exist = FALSE;
- *active = FALSE;
+ *exist = false;
+ *active = false;
return;
}
@@ -1530,13 +1530,13 @@
{
//get the IShellFolder for Dial-Up Networking
hr = pDesktop->BindToObject( pidlDialUp,
- NULL,
+ 0,
IID_IShellFolder,
(LPVOID*)&pDialUp);
if(SUCCEEDED(hr))
{
- if(SUCCEEDED(pDialUp->EnumObjects(NULL, SHCONTF_FOLDERS |
SHCONTF_NONFOLDERS, &pEnum)))
+ if(SUCCEEDED(pDialUp->EnumObjects(0, SHCONTF_FOLDERS | SHCONTF_NONFOLDERS,
&pEnum)))
{
//enumerate the item's PIDLs, looking for the one requested
do
@@ -1549,23 +1549,23 @@
if(i && SUCCEEDED(hr) && dwRetrieved)
{
//here's where i find out if a connection exists and is active.
- //set exist == TRUE iff szTemp != "Make New Connection" && dwRetrieved
+ //set exist == true iff szTemp != "Make New Connection" && dwRetrieved
comparison = strcmp( szTemp, "Make New Connection");
if((comparison != 0) && (dwRetrieved != 0))
{
- *exist = TRUE;
+ *exist = true;
//append szTemp to the string "Connected to "--
strcat(tempstring, szTemp);
//now use that string with FindWindow to see if it's up and running--
- hWnd = FindWindow( NULL, tempstring);
+ hWnd = FindWindow( 0, tempstring);
//if I found the window set active == true, release the interfaces and
return--
if(hWnd)
{
- *active = TRUE;
+ *active = true;
pEnum->Release();
pDialUp->Release();
pDesktop->Release();
@@ -1599,17 +1599,17 @@
HRESULT hr;
LPITEMIDLIST pidlDialUp;
- if(!pDesktop) return NULL;
+ if(!pDesktop) return 0;
//get the pidl for Dial-Up Networking
- hr = pDesktop->ParseDisplayName( NULL,
- NULL,
+ hr = pDesktop->ParseDisplayName( 0,
+ 0,
L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{992CFFA0-F557-101A-88EC-00DD010CCC48}",
- NULL,
+ 0,
&pidlDialUp,
- NULL);
+ 0);
- if(FAILED(hr)) return NULL;
+ if(FAILED(hr)) return 0;
return pidlDialUp;
}
@@ -1618,13 +1618,13 @@
-BOOL GetItemIdName( LPSHELLFOLDER pFolder,
+bool GetItemIdName( LPSHELLFOLDER pFolder,
LPITEMIDLIST pidl,
DWORD dwFlags,
LPTSTR pszName,
UINT cchMax)
{
-BOOL fSuccess = TRUE;
+bool fSuccess = true;
STRRET str;
if(SUCCEEDED(pFolder->GetDisplayNameOf(pidl, dwFlags, &str)))
@@ -1638,8 +1638,8 @@
-1,
pszName,
cchMax,
- NULL,
- NULL);
+ 0,
+ 0);
break;
case STRRET_OFFSET:
@@ -1651,13 +1651,13 @@
break;
default:
- fSuccess = FALSE;
+ fSuccess = false;
break;
}
}
else
{
- fSuccess = FALSE;
+ fSuccess = false;
}
return (fSuccess);
@@ -1676,13 +1676,13 @@
WaitForSingleObject(ghDPReceiveThread, INFINITE);
CloseHandle(ghDPReceiveThread);
- ghDPReceiveThread = NULL;
+ ghDPReceiveThread = 0;
}
if(ghDPKillReceiveEvent)
{
CloseHandle(ghDPKillReceiveEvent);
- ghDPKillReceiveEvent = NULL;
+ ghDPKillReceiveEvent = 0;
}
if(lpDirectPlay3A)
@@ -1695,15 +1695,15 @@
lpDirectPlay3A -> Close();
lpDirectPlay3A -> Release();
- //lpDirectPlay3A = NULL;
+ //lpDirectPlay3A = 0;
}
- lpDirectPlay3A = NULL;
+ lpDirectPlay3A = 0;
if(hPlayerEvent)
{
CloseHandle(hPlayerEvent);
- hPlayerEvent = NULL;
+ hPlayerEvent = 0;
}
Index: netpanzer/src/DirectX/DirectPlay/DirectPlay.h
diff -u netpanzer/src/DirectX/DirectPlay/DirectPlay.h:1.1
netpanzer/src/DirectX/DirectPlay/DirectPlay.h:1.2
--- netpanzer/src/DirectX/DirectPlay/DirectPlay.h:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/DirectX/DirectPlay/DirectPlay.h Mon Sep 1 16:24:18 2003
@@ -127,8 +127,8 @@
////////////////////////////////////////////////////////////////
//functions called related to menu code/////////////////////////
-BOOL IsDPlayObjectValid();
-BOOL SetServProv(HWND hWnd, int SelectedProvider);
+bool IsDPlayObjectValid();
+bool SetServProv(HWND hWnd, int SelectedProvider);
int GetNumGames();
void GetGameName(int index, char *game);
@@ -155,13 +155,13 @@
////////////////////////////////////////////////////////////////
//detect a dialup connection before it's too late
-BOOL MinimizeOrNot(HWND hWnd);
-BOOL GetAutoDialCheck();
-BOOL SetAutoDialState(); //returns false if unable to correctly access
registry data
-BOOL GetAutoDialState(); //returns the value of AutoDial, TRUE=ON, FALSE=OFF
-void DoesDialupConnectionExist(BOOL *exist, BOOL *active);
+bool MinimizeOrNot(HWND hWnd);
+bool GetAutoDialCheck();
+bool SetAutoDialState(); //returns false if unable to correctly access
registry data
+bool GetAutoDialState(); //returns the value of AutoDial, TRUE=ON, FALSE=OFF
+void DoesDialupConnectionExist(bool *exist, bool *active);
LPITEMIDLIST GetDialUpNetworkingPidl(LPSHELLFOLDER);
-BOOL GetItemIdName(LPSHELLFOLDER, LPITEMIDLIST, DWORD, LPTSTR, UINT);
+bool GetItemIdName(LPSHELLFOLDER, LPITEMIDLIST, DWORD, LPTSTR, UINT);
////////////////////////////////////////////////////////////////
Index: netpanzer/src/DirectX/DirectSound/DSound.cpp
diff -u netpanzer/src/DirectX/DirectSound/DSound.cpp:1.1
netpanzer/src/DirectX/DirectSound/DSound.cpp:1.2
--- netpanzer/src/DirectX/DirectSound/DSound.cpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/DirectX/DirectSound/DSound.cpp Mon Sep 1 16:24:18 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include <windows.h>
#include "DSound.hpp"
@@ -37,7 +36,7 @@
DirectSound::DirectSound()
{
- Enabled = FALSE;
+ Enabled = false;
}
//////////////////////////////////
//////////////////////////////////
@@ -50,18 +49,18 @@
for(index = 0; index < MAX_NUM_SFX; index++)
{
- m_pDSBuffer[index] = NULL;
+ m_pDSBuffer[index] = 0;
PreviousVolume[index] = DSBVOLUME_MAX;
/* if(index >= AMBIENT_START)
{
- m_pDSBufferDup1[index] = NULL;
- m_pDSBufferDup2[index] = NULL;
+ m_pDSBufferDup1[index] = 0;
+ m_pDSBufferDup2[index] = 0;
} */
}
- m_lpDirectSound = NULL;
+ m_lpDirectSound = 0;
ZeroMemory(&m_DSCaps, sizeof(DSCAPS));
@@ -74,22 +73,22 @@
hr = InitDirectSound(hWnd);
- if(hr == FALSE)
+ if(hr == false)
{
- Enabled = FALSE;
- return FALSE;
+ Enabled = false;
+ return false;
}
hr = InitSoundEngine(hWnd);
- if(hr == FALSE)
+ if(hr == false)
{
- Enabled = FALSE;
- return FALSE;
+ Enabled = false;
+ return false;
}
- Enabled = TRUE;
- return TRUE;
+ Enabled = true;
+ return true;
}
//////////////////////////////////
@@ -102,7 +101,7 @@
//here's where i want to create a directsound object--
HRESULT hr;
- hr = DirectSoundCreate(NULL, &m_lpDirectSound, NULL);
+ hr = DirectSoundCreate(0, &m_lpDirectSound, 0);
if(hr != DS_OK)
{
@@ -119,7 +118,7 @@
MessageBox(hWnd, "Not enough memory to run DirectSound.
You can still play netPanzer, but there won't be any sound.", "Error", MB_OK);
ShutDownDirectSound();
- return FALSE;
+ return false;
}
//according to spec, the next thing i have to do is set
@@ -130,7 +129,7 @@
{
MessageBox(hWnd, "DirectSound initialization failed. You can
still play netPanzer, but there won't be any sound.", "Error", MB_OK);
ShutDownDirectSound();
- return FALSE;
+ return false;
}
//i don't have to get device caps, but i will just for the hell
@@ -143,10 +142,10 @@
{
MessageBox(hWnd, "DirectSound can't get sound card info. You
can still play netPanzer, but there won't be any sound.", "Error", MB_OK);
ShutDownDirectSound();
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
//////////////////////////////////
//////////////////////////////////
@@ -162,7 +161,7 @@
HRESULT hr;
- //declare all the pointers and variables and set them to NULL--
+ //declare all the pointers and variables and set them to 0--
//for loading the .wav file--
UINT cbSize[MAX_NUM_SFX];
DWORD cSamples[MAX_NUM_SFX];
@@ -174,17 +173,17 @@
DWORD dwLength[MAX_NUM_SFX];
DWORD dwLength2[MAX_NUM_SFX];
- //set all these guys to NULL--
+ //set all these guys to 0--
for(index = 0; index < MAX_NUM_SFX; index++)
{
- cbSize[index] = NULL;
- cSamples[index] = NULL;
- pbData1[index] = NULL;
-
- pbData[index] = NULL;
- pbData2[index] = NULL;
- dwLength[index] = NULL;
- dwLength2[index] = NULL;
+ cbSize[index] = 0;
+ cSamples[index] = 0;
+ pbData1[index] = 0;
+
+ pbData[index] = 0;
+ pbData2[index] = 0;
+ dwLength[index] = 0;
+ dwLength2[index] = 0;
}
@@ -202,7 +201,7 @@
{
MessageBox(hWnd, "DirectSound couldn't initialize
completely. You can still play netPanzer, but there will be no sound.",
"Error", MB_OK);
ShutDownDirectSound();
- return FALSE;
+ return false;
}
//now make a secondary direct sound buffer for it--
@@ -214,7 +213,7 @@
m_DSBufferDesc[index].dwBufferBytes = cbSize[index];
m_DSBufferDesc[index].lpwfxFormat = m_pWaveFormatEx[index];
- hr = m_lpDirectSound -> CreateSoundBuffer(
&m_DSBufferDesc[index], &m_pDSBuffer[index], NULL);
+ hr = m_lpDirectSound -> CreateSoundBuffer(
&m_DSBufferDesc[index], &m_pDSBuffer[index], 0);
if(hr == DS_OK)
{
@@ -224,9 +223,9 @@
memcpy(pbData[index], pbData1[index], cbSize[index]);
// Ok, now unlock the buffer--
- m_pDSBuffer[index]->Unlock( pbData[index],
cbSize[index], NULL, 0);
+ m_pDSBuffer[index]->Unlock( pbData[index],
cbSize[index], 0, 0);
- pbData[index] = NULL;
+ pbData[index] = 0;
//make duplicate buffers for the ambient sound effects.
i have to hard code this
//for now (less than 16 is not ambient) make sure to
change the value in the
@@ -241,7 +240,7 @@
{
MessageBox(hWnd, "DirectSound couldn't
initialize completely. You can still play netPanzer, but there will be no
sound.", "Error", MB_OK);
ShutDownDirectSound();
- return FALSE;
+ return false;
}
}
@@ -252,14 +251,14 @@
{
MessageBox(hWnd, "DirectSound couldn't initialize
completely. You can still play netPanzer, but there will be no sound.",
"Error", MB_OK);
ShutDownDirectSound();
- return FALSE;
+ return false;
}
}
//Do the distance sfx buffers here--
- return TRUE;
+ return true;
}
//////////////////////////////////
@@ -276,36 +275,36 @@
for(index = 0; index < MAX_NUM_SFX; index++)
{
- if(m_pDSBuffer[index] != NULL)
+ if(m_pDSBuffer[index] != 0)
{
m_pDSBuffer[index] -> Release();
- m_pDSBuffer[index] = NULL;
+ m_pDSBuffer[index] = 0;
}
//this if statement needs to match the one in
//the initialize function--
/* if( index >= AMBIENT_START)
{
- if(m_pDSBufferDup1[index] != NULL)
m_pDSBufferDup1[index] = NULL;
- if(m_pDSBufferDup2[index] != NULL)
m_pDSBufferDup2[index] = NULL;
+ if(m_pDSBufferDup1[index] != 0) m_pDSBufferDup1[index]
= 0;
+ if(m_pDSBufferDup2[index] != 0) m_pDSBufferDup2[index]
= 0;
}
*/
}
-/* if(m_pDSDistantSFX1 != NULL)
+/* if(m_pDSDistantSFX1 != 0)
{
m_pDSDistantSFX1 -> Release();
- m_pDSDistantSFX1 = NULL;
+ m_pDSDistantSFX1 = 0;
}
- if(m_pDSDistantSFX2 != NULL)
+ if(m_pDSDistantSFX2 != 0)
{
m_pDSDistantSFX2 -> Release();
- m_pDSDistantSFX2 = NULL;
+ m_pDSDistantSFX2 = 0;
}
- if(m_pDSDistantSFX3 != NULL)
+ if(m_pDSDistantSFX3 != 0)
{
m_pDSDistantSFX3 -> Release();
- m_pDSDistantSFX3 = NULL;
+ m_pDSDistantSFX3 = 0;
}
*/
@@ -318,13 +317,13 @@
{
HRESULT hr;
- if ( Enabled == FALSE )
+ if ( Enabled == false )
return;
- if(m_pDSBuffer[0] != NULL)
+ if(m_pDSBuffer[0] != 0)
{
hr = m_pDSBuffer[0] -> Play(0,0,DSBPLAY_LOOPING);
- if(hr == DSERR_BUFFERLOST) m_pDSBuffer[0] = NULL;
+ if(hr == DSERR_BUFFERLOST) m_pDSBuffer[0] = 0;
}
}
@@ -335,7 +334,7 @@
void DirectSound::StopTankIdle()
{
- if ( Enabled == FALSE )
+ if ( Enabled == false )
return;
StopUnitBuffer(0);
@@ -349,13 +348,13 @@
{
HRESULT hr;
- if ( Enabled == FALSE )
+ if ( Enabled == false )
return;
- if(m_pDSBuffer[1] != NULL)
+ if(m_pDSBuffer[1] != 0)
{
hr = m_pDSBuffer[1] -> Play(0,0,0);
- if(hr == DSERR_BUFFERLOST) m_pDSBuffer[1] = NULL;
+ if(hr == DSERR_BUFFERLOST) m_pDSBuffer[1] = 0;
}
}
@@ -367,13 +366,13 @@
{
HRESULT hr;
- if ( Enabled == FALSE )
+ if ( Enabled == false )
return;
- if(m_pDSBuffer[2] != NULL)
+ if(m_pDSBuffer[2] != 0)
{
hr = m_pDSBuffer[2] -> Play(0,0,0);
- if(hr == DSERR_BUFFERLOST) m_pDSBuffer[2] = NULL;
+ if(hr == DSERR_BUFFERLOST) m_pDSBuffer[2] = 0;
}
}
@@ -382,14 +381,14 @@
{
HRESULT hr;
- if ( Enabled == FALSE )
+ if ( Enabled == false )
return;
- if(m_pDSBuffer[_sfx_powerup] != NULL)
+ if(m_pDSBuffer[_sfx_powerup] != 0)
{
hr = m_pDSBuffer[_sfx_powerup] -> Play(0,0,0);
- if(hr == DSERR_BUFFERLOST) m_pDSBuffer[_sfx_powerup] = NULL;
+ if(hr == DSERR_BUFFERLOST) m_pDSBuffer[_sfx_powerup] = 0;
}
}
@@ -402,7 +401,7 @@
{
int buffer;
- if ( Enabled == FALSE )
+ if ( Enabled == false )
return;
if((unit_type == _unit_type_humvee) || (unit_type ==
_unit_type_hover_craft)) return;
@@ -421,7 +420,7 @@
{
int buffer;
- if ( Enabled == FALSE )
+ if ( Enabled == false )
return;
buffer = GetVoiceBuffer(unit_type, event);
@@ -439,7 +438,7 @@
int buffer;
long volume;
- if ( Enabled == FALSE )
+ if ( Enabled == false )
return;
buffer = GetAmbientBuffer(unit_type, event);
@@ -461,10 +460,10 @@
HRESULT hr;
if((buffer < 0) || (buffer >= MAX_NUM_SFX)) return;
- if(m_pDSBuffer[buffer] != NULL)
+ if(m_pDSBuffer[buffer] != 0)
{
hr = m_pDSBuffer[buffer] -> Play(0,0,0);
- if(hr == DSERR_BUFFERLOST) m_pDSBuffer[buffer] = NULL;
+ if(hr == DSERR_BUFFERLOST) m_pDSBuffer[buffer] = 0;
}
}
@@ -476,7 +475,7 @@
{
if((buffer < 0) || (buffer >= MAX_NUM_SFX)) return;
- if(m_pDSBuffer[buffer] != NULL)
+ if(m_pDSBuffer[buffer] != 0)
{
m_pDSBuffer[buffer]-> Stop();
m_pDSBuffer[buffer]-> SetCurrentPosition(0);
@@ -492,10 +491,10 @@
HRESULT hr;
if((buffer < 0) || (buffer >= MAX_NUM_SFX)) return;
- if(m_pDSBuffer[buffer] != NULL)
+ if(m_pDSBuffer[buffer] != 0)
{
hr = m_pDSBuffer[buffer] -> Play(0,0,0);
- if(hr == DSERR_BUFFERLOST) m_pDSBuffer[buffer] = NULL;
+ if(hr == DSERR_BUFFERLOST) m_pDSBuffer[buffer] = 0;
}
}
@@ -512,7 +511,7 @@
// if(DupBufferIndex == 0)
// {
- if(m_pDSBuffer[buffer] != NULL)
+ if(m_pDSBuffer[buffer] != 0)
{
if( PreviousVolume[buffer] != volume)
@@ -526,11 +525,11 @@
hr = m_pDSBuffer[buffer] -> Play(0,0,0);
if(hr == DSERR_BUFFERLOST)
{
- m_pDSBuffer[buffer] = NULL;
- //m_pDSBufferDup1[buffer] = NULL;
- //m_pDSBufferDup2[buffer] = NULL;
+ m_pDSBuffer[buffer] = 0;
+ //m_pDSBufferDup1[buffer] = 0;
+ //m_pDSBufferDup2[buffer] = 0;
}
- }//if m_pDSBuffer[buffer] != NULL
+ }//if m_pDSBuffer[buffer] != 0
// }//if DupBufferIndex == 0
@@ -539,7 +538,7 @@
/* else
if(DupBufferIndex == 1)
{
- if(m_pDSBufferDup1[buffer] != NULL)
+ if(m_pDSBufferDup1[buffer] != 0)
{
hr = m_pDSBufferDup1[buffer] -> Play(0,0,0);
@@ -550,7 +549,7 @@
else
if(DupBufferIndex == 2)
{
- if(m_pDSBufferDup2[buffer] != NULL)
+ if(m_pDSBufferDup2[buffer] != 0)
{
hr = m_pDSBufferDup2[buffer] -> Play(0,0,0);
}
@@ -569,30 +568,30 @@
HRESULT hr;
UINT cbSize = 0;
DWORD cSamples = 0;
- BYTE *pbData1 = NULL;
+ BYTE *pbData1 = 0;
- void *pbData = NULL;
- void *pbData2 = NULL;
+ void *pbData = 0;
+ void *pbData2 = 0;
DWORD dwLength = 0;
DWORD dwLength2 = 0;
hr = m_pDSBuffer[buffer] -> Restore();
- if(hr != DS_OK) m_pDSBuffer[buffer] = NULL;
+ if(hr != DS_OK) m_pDSBuffer[buffer] = 0;
//load the wave file--
if(WaveLoadFile( filenames[buffer], &cbSize, &cSamples,
&m_pWaveFormatEx[buffer], &pbData1) != 0)
- m_pDSBuffer[buffer] = NULL;
+ m_pDSBuffer[buffer] = 0;
hr = m_pDSBuffer[buffer] -> Lock( 0, cbSize, &pbData, &dwLength, &pbData2,
&dwLength2, 0L);
- if(hr != DS_OK) m_pDSBuffer[buffer] = NULL;
+ if(hr != DS_OK) m_pDSBuffer[buffer] = 0;
memcpy(pbData, pbData1, cbSize);
- hr = m_pDSBuffer[buffer]->Unlock( pbData, cbSize, NULL, 0);
- if(hr != DS_OK) m_pDSBuffer[buffer] = NULL;
+ hr = m_pDSBuffer[buffer]->Unlock( pbData, cbSize, 0, 0);
+ if(hr != DS_OK) m_pDSBuffer[buffer] = 0;
- pbData = NULL;
+ pbData = 0;
}
//////////////////////////////////
@@ -604,7 +603,7 @@
HRESULT hr;
hr = m_pDSBufferDup1[buffer] -> Restore();
- if(hr != DS_OK) m_pDSBufferDup1[buffer] = NULL;
+ if(hr != DS_OK) m_pDSBufferDup1[buffer] = 0;
}
//////////////////////////////////
@@ -616,7 +615,7 @@
HRESULT hr;
hr = m_pDSBufferDup2[buffer] -> Restore();
- if(hr != DS_OK) m_pDSBufferDup2[buffer] = NULL;
+ if(hr != DS_OK) m_pDSBufferDup2[buffer] = 0;
}
//////////////////////////////////
Index: netpanzer/src/DirectX/DirectSound/DSound.hpp
diff -u netpanzer/src/DirectX/DirectSound/DSound.hpp:1.1
netpanzer/src/DirectX/DirectSound/DSound.hpp:1.2
--- netpanzer/src/DirectX/DirectSound/DSound.hpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/DirectX/DirectSound/DSound.hpp Mon Sep 1 16:24:18 2003
@@ -20,8 +20,8 @@
#include <windows.h>
#include "mmsystem.h"
-#include "mmreg.h"
-#include "msacm.h"
+//#include "mmreg.h"
+//#include "msacm.h"
#include "dsound.h"
#include "PObject.hpp"
@@ -122,7 +122,7 @@
public:
- BOOL Enabled;
+ bool Enabled;
DirectSound();
Index: netpanzer/src/DirectX/DirectSound/wave.cpp
diff -u netpanzer/src/DirectX/DirectSound/wave.cpp:1.1
netpanzer/src/DirectX/DirectSound/wave.cpp:1.2
--- netpanzer/src/DirectX/DirectSound/wave.cpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/DirectX/DirectSound/wave.cpp Mon Sep 1 16:24:18 2003
@@ -15,8 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-#include "stdafx.hpp"
#include <windows.h>
#include <mmsystem.h>
#include "wave.h"
@@ -50,17 +48,17 @@
// Initialization...
- *ppwfxInfo = NULL;
+ *ppwfxInfo = 0;
nError = 0;
- hmmioIn = NULL;
+ hmmioIn = 0;
- if ((hmmioIn = mmioOpen(pszFileName, NULL, MMIO_ALLOCBUF | MMIO_READ))
== NULL)
+ if ((hmmioIn = mmioOpen(pszFileName, 0, MMIO_ALLOCBUF | MMIO_READ)) ==
0)
{
nError = ER_CANNOTOPEN;
goto ERROR_READING_WAVE;
}
- if ((nError = (int)mmioDescend(hmmioIn, pckInRIFF, NULL, 0)) != 0)
+ if ((nError = (int)mmioDescend(hmmioIn, pckInRIFF, 0, 0)) != 0)
{
goto ERROR_READING_WAVE;
}
@@ -115,7 +113,7 @@
}
// Ok, now allocate that waveformatex structure.
- if ((*ppwfxInfo = (WAVEFORMATEX *)GlobalAlloc(GMEM_FIXED,
sizeof(WAVEFORMATEX)+cbExtraAlloc)) == NULL)
+ if ((*ppwfxInfo = (WAVEFORMATEX *)GlobalAlloc(GMEM_FIXED,
sizeof(WAVEFORMATEX)+cbExtraAlloc)) == 0)
{
nError = ER_MEM;
goto ERROR_READING_WAVE;
@@ -147,16 +145,16 @@
goto TEMPCLEANUP;
ERROR_READING_WAVE:
- if (*ppwfxInfo != NULL)
+ if (*ppwfxInfo != 0)
{
GlobalFree(*ppwfxInfo);
- *ppwfxInfo = NULL;
+ *ppwfxInfo = 0;
}
- if (hmmioIn != NULL)
+ if (hmmioIn != 0)
{
mmioClose(hmmioIn, 0);
- hmmioIn = NULL;
+ hmmioIn = 0;
}
TEMPCLEANUP:
@@ -189,7 +187,7 @@
// Do a nice little seek...
if ((nError = mmioSeek(*phmmioIn, pckInRIFF->dwDataOffset +
sizeof(FOURCC), SEEK_SET)) == -1)
{
- assert(FALSE);
+ assert(false);
}
nError = 0;
@@ -296,16 +294,16 @@
)
{
- if (*ppwfxSrc != NULL)
+ if (*ppwfxSrc != 0)
{
GlobalFree(*ppwfxSrc);
- *ppwfxSrc = NULL;
+ *ppwfxSrc = 0;
}
- if (*phmmio != NULL)
+ if (*phmmio != 0)
{
mmioClose(*phmmio, 0);
- *phmmio = NULL;
+ *phmmio = 0;
}
return(0);
@@ -343,8 +341,8 @@
int nError;
UINT cbActualRead;
- *ppbData = NULL;
- *ppwfxInfo = NULL;
+ *ppbData = 0;
+ *ppwfxInfo = 0;
*cbSize = 0;
if ((nError = WaveOpenFile(pszFileName, &hmmioIn, ppwfxInfo,
&ckInRiff)) != 0)
@@ -358,7 +356,7 @@
}
// Ok, size of wave data is in ckIn, allocate that buffer.
- if ((*ppbData = (BYTE *)GlobalAlloc(GMEM_FIXED, ckIn.cksize)) == NULL)
+ if ((*ppbData = (BYTE *)GlobalAlloc(GMEM_FIXED, ckIn.cksize)) == 0)
{
nError = ER_MEM;
goto ERROR_LOADING;
@@ -373,23 +371,23 @@
goto DONE_LOADING;
ERROR_LOADING:
- if (*ppbData != NULL)
+ if (*ppbData != 0)
{
GlobalFree(*ppbData);
- *ppbData = NULL;
+ *ppbData = 0;
}
- if (*ppwfxInfo != NULL)
+ if (*ppwfxInfo != 0)
{
GlobalFree(*ppwfxInfo);
- *ppwfxInfo = NULL;
+ *ppwfxInfo = 0;
}
DONE_LOADING:
// Close the wave file.
- if (hmmioIn != NULL)
+ if (hmmioIn != 0)
{
mmioClose(hmmioIn, 0);
- hmmioIn = NULL;
+ hmmioIn = 0;
}
return(nError);
Index: netpanzer/src/DirectX/DirectSound/wave.h
diff -u netpanzer/src/DirectX/DirectSound/wave.h:1.1
netpanzer/src/DirectX/DirectSound/wave.h:1.2
--- netpanzer/src/DirectX/DirectSound/wave.h:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/DirectX/DirectSound/wave.h Mon Sep 1 16:24:18 2003
@@ -55,12 +55,12 @@
DWORD dwFreq; // Frequency.
DWORD dwPan; // Panning info.
DWORD dwVol; // Total volume.
- BOOL fLooped; // Looped?
+ bool fLooped; // Looped?
- BOOL fPlaying; // Is this one playing?
- BOOL fLost; // Is this one lost?
- BOOL fHardware; // Is this a hardware buffer?
- BOOL fSticky; // Is this a sticky buffer?
+ bool fPlaying; // Is this one playing?
+ bool fLost; // Is this one lost?
+ bool fHardware; // Is this a hardware buffer?
+ bool fSticky; // Is this a sticky buffer?
int cox; // Coordinates of where the
structure is
int coy; // printed.
Index: netpanzer/src/Lib/2D/Color.cpp
diff -u netpanzer/src/Lib/2D/Color.cpp:1.1 netpanzer/src/Lib/2D/Color.cpp:1.2
--- netpanzer/src/Lib/2D/Color.cpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/2D/Color.cpp Mon Sep 1 16:24:18 2003
@@ -16,7 +16,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "Color.hpp"
BYTE Color::unitAqua;
Index: netpanzer/src/Lib/2D/Color.hpp
diff -u netpanzer/src/Lib/2D/Color.hpp:1.1 netpanzer/src/Lib/2D/Color.hpp:1.2
--- netpanzer/src/Lib/2D/Color.hpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/2D/Color.hpp Mon Sep 1 16:24:18 2003
@@ -15,14 +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
*/
-
#ifndef __Color_hpp__
#define __Color_hpp__
-
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
#include "LibTypes.hpp"
Index: netpanzer/src/Lib/2D/ColorTable.cpp
diff -u netpanzer/src/Lib/2D/ColorTable.cpp:1.1
netpanzer/src/Lib/2D/ColorTable.cpp:1.2
--- netpanzer/src/Lib/2D/ColorTable.cpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/2D/ColorTable.cpp Mon Sep 1 16:24:18 2003
@@ -15,7 +15,9 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+#ifdef WIN32
+#include <io.h>
+#endif
#include "ColorTable.hpp"
#include "Palette.hpp"
#include "UtilInterface.hpp"
@@ -32,7 +34,7 @@
ColorTable::ColorTable()
{
colorCount = 0;
- colorArray = NULL;
+ colorArray = 0;
totalColorArrayCount++;
totalByteCount += sizeof(ColorTable);
@@ -64,7 +66,7 @@
int numBytes = sizeof(PIX) * colorCount;
colorArray = (PIX *) malloc(numBytes);
- if (colorArray == NULL) FUBAR("ERROR: Unable to allocate color table.");
+ if (colorArray == 0) FUBAR("ERROR: Unable to allocate color table.");
totalByteCount += numBytes;
@@ -86,12 +88,12 @@
//---------------------------------------------------------------------------
void ColorTable::free()
{
- if (colorArray != NULL)
+ if (colorArray != 0)
{
::free(colorArray);
totalByteCount -= colorCount * sizeof(PIX);
- colorArray = NULL;
+ colorArray = 0;
colorCount = 0;
}
@@ -132,9 +134,9 @@
curOffset = (y * 256) + x;
// !SOMDEDAY! Try holding a threshold when any
value gets to 255.
- curRed = nb + Palette::color[y].red;
- curGreen = nb + Palette::color[y].green;
- curBlue = nb + Palette::color[y].blue;
+ curRed = (int) (nb + Palette::color[y].red);
+ curGreen = (int) (nb + Palette::color[y].green);
+ curBlue = (int) (nb + Palette::color[y].blue);
if (curRed > 255) curRed = 255;
if (curGreen > 255) curGreen = 255;
@@ -178,9 +180,9 @@
curPercent = (float(255 - x) / 255.0f) *
percent + 1.0f - percent;
curOffset = (y * 256) + x;
- curColor.red = curPercent *
float(Palette::color[y].red);
- curColor.green = curPercent *
float(Palette::color[y].green);
- curColor.blue = curPercent *
float(Palette::color[y].blue);
+ curColor.red = (BYTE) (curPercent *
float(Palette::color[y].red));
+ curColor.green = (BYTE) (curPercent *
float(Palette::color[y].green));
+ curColor.blue = (BYTE) (curPercent *
float(Palette::color[y].blue));
setColor(curOffset,
Palette::findNearestColor(curColor));
}
@@ -208,10 +210,10 @@
} else
{
//float curPercent;
- int totalColors = colorCount;
- int curColorIndex = 0;
- int num = 0;
- int numInterval = (totalColors) / 100;
+ //int totalColors = colorCount;
+ //int curColorIndex = 0;
+ //int num = 0;
+ //int numInterval = (totalColors) / 100;
char strBuf[256];
@@ -234,9 +236,9 @@
curOffset = (int(index) << 8) + indexPic;
- RGBColor curColor((color1 * col.red + color2
* colPic.red),
- (color1 *
col.green + color2 * colPic.green),
- (color1 *
col.blue + color2 * colPic.blue));
+ RGBColor curColor((BYTE) (color1 * col.red +
color2 * colPic.red),
+ (BYTE)
(color1 * col.green + color2 * colPic.green),
+ (BYTE)
(color1 * col.blue + color2 * colPic.blue));
// Makes the color table use color 0 as
transparent.
if (indexPic == 0)
@@ -278,13 +280,15 @@
char tableFilename[256];
//void _splitpath( const char *path, char *drive, char *dir, char
*fname, char *ext );
- _splitpath(Palette::getName(), NULL, NULL, paletteFilename, NULL);
- _splitpath(filename, NULL, tablePath, NULL, NULL);
- _splitpath(filename, NULL, NULL, tableFilename, NULL);
+#ifdef WIN32
+ _splitpath(Palette::getName(), 0, 0, paletteFilename, 0);
+ _splitpath(filename, 0, tablePath, 0, 0);
+ _splitpath(filename, 0, 0, tableFilename, 0);
// This is dangerous, so make sure the filename can handle the length
of the possible
// sprintf.
sprintf(destname, "%s%s%s%s", tablePath, tableFilename,
paletteFilename, extension);
+#endif
return;
@@ -311,7 +315,7 @@
FILE *fp = fopen(strBuf, "rb");
- if (fp == NULL) { return false; }
+ if (fp == 0) { return false; }
loadTable(fp);
@@ -325,7 +329,7 @@
//---------------------------------------------------------------------------
void ColorTable::loadTable(FILE *fp)
{
- assert(fp != NULL);
+ assert(fp != 0);
char strBuf[768];
@@ -359,8 +363,7 @@
getDiskName(strBuf, filename);
FILE *fp = fopen(strBuf, "wb");
-
- if (fp == NULL) { return false; }
+ if (fp == 0) { return false; }
saveTable(fp);
@@ -374,7 +377,7 @@
//---------------------------------------------------------------------------
void ColorTable::saveTable(FILE *fp) const
{
- assert(fp != NULL);
+ assert(fp != 0);
// Dump the colorTable source palette.
fwrite(&Palette::color, 768, sizeof(BYTE), fp);
@@ -397,22 +400,22 @@
getDiskName(strBuf, filename);
- if (UtilInterface::getFileSize(strBuf) == colorCount + 768)
+ if (UtilInterface::getFileSize(strBuf) == (size_t) (colorCount + 768))
{
// Check and make sure the file palette matches the loaded
palette.
FILE *fp = fopen(strBuf, "rb");
- if (fp == NULL) { return false; }
+ if (fp == 0) { return false; }
RGBColor checkPal[PALETTE_LENGTH];
- for (int i = 0; i < PALETTE_LENGTH; i++)
+ for (size_t i = 0; i < PALETTE_LENGTH; i++)
{
fread(&checkPal[i], 3, sizeof(BYTE), fp);
}
fclose(fp);
- for (int j = 0; j < PALETTE_LENGTH; j++)
+ for (size_t j = 0; j < PALETTE_LENGTH; j++)
{
if (Palette::originalColor[j].red != checkPal[j].red ||
Palette::originalColor[j].green !=
checkPal[j].green ||
@@ -448,10 +451,10 @@
{
float color1 = float(color1Percent) / 100.0f;
float color2 = float(color2Percent) / 100.0f;
- int totalColors = colorCount;
- int curColorIndex = 0;
- int num = 0;
- int numInterval = (totalColors) / 100;
+ //int totalColors = colorCount;
+ //int curColorIndex = 0;
+ //int num = 0;
+ //int numInterval = (totalColors) / 100;
// Since the file was not found, create the color tables and
dump
// it to a file.
@@ -467,9 +470,9 @@
curOffset = (int(index) << 8) + indexPic;
- RGBColor curColor((color1 * col.red + color2
* colPic.red),
- (color1 *
col.green + color2 * colPic.green),
- (color1 *
col.blue + color2 * colPic.blue));
+ RGBColor curColor((int) (color1 * col.red +
color2 * colPic.red),
+ (int) (color1
* col.green + color2 * colPic.green),
+ (int) (color1
* col.blue + color2 * colPic.blue));
// Makes the color table use color 0 as
transparent.
Index: netpanzer/src/Lib/2D/ColorTable.hpp
diff -u netpanzer/src/Lib/2D/ColorTable.hpp:1.1
netpanzer/src/Lib/2D/ColorTable.hpp:1.2
--- netpanzer/src/Lib/2D/ColorTable.hpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/2D/ColorTable.hpp Mon Sep 1 16:24:18 2003
@@ -18,14 +18,10 @@
#ifndef __ColorTable_hpp__
#define __ColorTable_hpp__
+#include <stdio.h>
+#include <assert.h>
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
-#include "stdafx.hpp"
-
+#include "codewiz.hpp"
//--------------------------------------------------------------------------
class ColorTable
Index: netpanzer/src/Lib/2D/DigitText.cpp
diff -u netpanzer/src/Lib/2D/DigitText.cpp:1.1
netpanzer/src/Lib/2D/DigitText.cpp:1.2
--- netpanzer/src/Lib/2D/DigitText.cpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/2D/DigitText.cpp Mon Sep 1 16:24:18 2003
@@ -15,7 +15,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "DigitText.hpp"
@@ -38,7 +38,7 @@
char charfilename[] = "pics\\chars11x17digit.raw";
FILE *fp = fopen(charfilename, "rb");
- if (fp == NULL)
+ if (fp == 0)
{
FUBAR("ERROR: Unable to load %s", charfilename);
assert(false);
Index: netpanzer/src/Lib/2D/FontSystem2D.cpp
diff -u netpanzer/src/Lib/2D/FontSystem2D.cpp:1.1
netpanzer/src/Lib/2D/FontSystem2D.cpp:1.2
--- netpanzer/src/Lib/2D/FontSystem2D.cpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/2D/FontSystem2D.cpp Mon Sep 1 16:24:18 2003
@@ -16,7 +16,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "FontSystem2D.hpp"
#include "TimerInterface.hpp"
@@ -34,7 +34,7 @@
void FontSystem2D::create(iXY pos, const char *string, const Surface &dest,
float delay, PIX color)
{
- if (string == NULL) { return; }
+ if (string == 0) { return; }
//if (dest.getDoesExist == false) { return; }
reset();
@@ -49,14 +49,14 @@
prev = next = zFontSystem2D;
} else
{
- prev = next = NULL;
+ prev = next = 0;
insertMe();
}
}
void FontSystem2D::create(iXY pos, const char *string, const Surface &dest,
float delay, const ColorTable &colrorTable)
{
- if (string == NULL) { return; }
+ if (string == 0) { return; }
//if (dest.getDoesExist == false) { return; }
reset();
@@ -71,7 +71,7 @@
prev = next = zFontSystem2D;
} else
{
- prev = next = NULL;
+ prev = next = 0;
insertMe();
}
}
@@ -87,7 +87,7 @@
delay = 0.0f;
groupWait = 0.0f;
charCount = 0;
- string = NULL;
+ string = 0;
stringLength = 0;
} // end FontSystem2D::reset
@@ -107,8 +107,8 @@
void FontSystem2D::insertMe()
{
// If we're inserting, we should not already be in the list...
- assert(prev == NULL);
- assert(next == NULL);
+ assert(prev == 0);
+ assert(next == 0);
// Insert me into the list
prev = zFontSystem2D;
@@ -125,13 +125,13 @@
//---------------------------------------------------------------------------
void FontSystem2D::removeMe()
{
- if (string != NULL)
+ if (string != 0)
{
::free(string);
}
- if (prev != NULL) prev->next = next;
- if (next != NULL) next->prev = prev;
+ if (prev != 0) prev->next = next;
+ if (next != 0) next->prev = prev;
prev = next = this;
@@ -202,7 +202,7 @@
if (charCount < stringLength)
{
- charCount = groupWait / delay;
+ charCount = (int) (groupWait / delay);
}
if (charCount > stringLength)
Index: netpanzer/src/Lib/2D/FontSystem2D.hpp
diff -u netpanzer/src/Lib/2D/FontSystem2D.hpp:1.1
netpanzer/src/Lib/2D/FontSystem2D.hpp:1.2
--- netpanzer/src/Lib/2D/FontSystem2D.hpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/2D/FontSystem2D.hpp Mon Sep 1 16:24:18 2003
@@ -15,15 +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
*/
-
#ifndef __FontSystem2D_hpp__
#define __FontSystem2D_hpp__
-
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
#include "iXY.hpp"
#include "Surface.hpp"
Index: netpanzer/src/Lib/2D/PackedSurface.cpp
diff -u netpanzer/src/Lib/2D/PackedSurface.cpp:1.1
netpanzer/src/Lib/2D/PackedSurface.cpp:1.2
--- netpanzer/src/Lib/2D/PackedSurface.cpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/2D/PackedSurface.cpp Mon Sep 1 16:24:18 2003
@@ -15,23 +15,24 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
-#include "packedsurface.hpp"
+
+#include "PackedSurface.hpp"
#include "Surface.hpp"
#include "TimerInterface.hpp"
#include "Span.hpp"
#include "UtilInterface.hpp"
-extern void fastMemcpy(void *dest, const void *src, int n);
-//#define memcpy fastMemcpy
-
+#ifdef MSVC
#pragma pack (1)
+#endif
struct SpanHead
{
unsigned short x1;
unsigned short len;
-};
+} __attribute__((packed));
+#ifdef MSVC
#pragma pack ()
+#endif
#define TRANSPIX 0
@@ -61,7 +62,7 @@
//--------------------------------------------------------------------------
void PackedSurface::free()
{
- if (myMem && rowOffsetTable != NULL)
+ if (myMem && rowOffsetTable != 0)
{
totalByteCount -= (pix.y * frameCount + 1) *
sizeof(*rowOffsetTable);
@@ -69,7 +70,7 @@
//assert(totalByteCount >= 0);
}
- if (myMem && packedDataChunk != NULL)
+ if (myMem && packedDataChunk != 0)
{
totalByteCount -= pix.y * frameCount;
@@ -85,8 +86,8 @@
void PackedSurface::reset()
{
pix = 0;
- rowOffsetTable = NULL;
- packedDataChunk = NULL;
+ rowOffsetTable = 0;
+ packedDataChunk = 0;
frameCount = 0;
curFrame = 0.0;
fps = 30.0;
@@ -107,13 +108,13 @@
fps = source.getFPS();
rowOffsetTable = (int *) malloc((pix.y*frameCount + 1) *
sizeof(*rowOffsetTable));
- if (rowOffsetTable == NULL)
+ if (rowOffsetTable == 0)
{
FUBAR("ERROR: Unable to allocate rowTableOffset for
PackedSurface.");
}
int bytesAlloced = 0;
- packedDataChunk = NULL;
+ packedDataChunk = 0;
int curByteOffset = 0;
float saveFrame = source.getCurFrame();
@@ -150,7 +151,7 @@
if (newSize > bytesAlloced) {
bytesAlloced = newSize + 16*1024;
packedDataChunk = (BYTE
*)realloc(packedDataChunk, bytesAlloced);
- if (packedDataChunk == NULL)
+ if (packedDataChunk == 0)
{
FUBAR("ERROR: Out of memory for
packedDataChunk for PackedSurface.");
}
@@ -175,7 +176,7 @@
// Shrink buffer to the size we really need
packedDataChunk = (BYTE *) realloc(packedDataChunk, curByteOffset);
- if (packedDataChunk == NULL) FUBAR("Hell froze");
+ if (packedDataChunk == 0) FUBAR("Hell froze");
// Restore source surface frame number, so the function
// is logically const
@@ -186,7 +187,7 @@
//--------------------------------------------------------------------------
void PackedSurface::load(const char *filename) {
FILE *f = fopen(filename, "rb");
- if (f == NULL) FUBAR("Can't open %s", filename);
+ if (f == 0) FUBAR("Can't open %s", filename);
load(f);
fclose(f);
}
@@ -194,7 +195,7 @@
//--------------------------------------------------------------------------
void PackedSurface::save(const char *filename) const {
FILE *f = fopen(filename, "wb");
- if (f == NULL) FUBAR("Can't create %s", filename);
+ if (f == 0) FUBAR("Can't create %s", filename);
save(f);
fclose(f);
}
@@ -218,13 +219,13 @@
fread(&fps, sizeof(fps), 1, f);
fread(&offset, sizeof(offset), 1, f);
rowOffsetTable = (int *) malloc((pix.y * frameCount + 1) *
sizeof(*rowOffsetTable));
- if (rowOffsetTable == NULL)
+ if (rowOffsetTable == 0)
{
FUBAR("ERROR: Unable to allocate rowTableOffset for
PackedSurface.");
}
fread(rowOffsetTable, (pix.y*frameCount + 1)*sizeof(*rowOffsetTable),
1, f);
packedDataChunk = (BYTE *)malloc(rowOffsetTable[pix.y*frameCount]);
- if (packedDataChunk == NULL)
+ if (packedDataChunk == 0)
{
FUBAR("ERROR: Unable to allocate packedDataChunk for
PackedSurface.");
}
@@ -596,6 +597,8 @@
//---------------------------------------------------------------------------
int loadAllPAKInDirectory(const char *path, cGrowList <PackedSurface>
&growList)
{
+ // XXX disabled because the _findfirst below is win32 only
+#ifdef MSVC
char strBuf[256];
char pathWild[256];
@@ -606,7 +609,7 @@
{
return 0;
}
-
+
struct _finddata_t myFile;
long hFile;
@@ -640,6 +643,7 @@
{
growList[i].load(filenames[i].name);
}
+#endif
return 1;
Index: netpanzer/src/Lib/2D/PackedSurface.hpp
diff -u netpanzer/src/Lib/2D/PackedSurface.hpp:1.1
netpanzer/src/Lib/2D/PackedSurface.hpp:1.2
--- netpanzer/src/Lib/2D/PackedSurface.hpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/2D/PackedSurface.hpp Mon Sep 1 16:24:18 2003
@@ -18,12 +18,6 @@
#ifndef __PackedSurface_hpp__
#define __PackedSurface_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
#include "iRect.hpp"
#include "iXY.hpp"
#include "ColorTable.hpp"
@@ -107,7 +101,7 @@
//inline int getCenterX() const { return center.x; }
//inline int getCenterY() const { return center.y; }
inline int getFrameCount() const { return frameCount; }
- inline int getCurFrame () const { return curFrame; }
+ inline int getCurFrame () const { return (int) curFrame; }
inline iXY getOffset() const { return offset; }
inline int getOffsetX() const { return offset.x; }
inline int getOffsetY() const { return offset.y; }
@@ -167,7 +161,7 @@
WINDOW::buttonPushed() {
- if (buttonFunc != NULL) {
+ if (buttonFunc != 0) {
(*buttonFunc)(this);
}
}
Index: netpanzer/src/Lib/2D/Palette.cpp
diff -u netpanzer/src/Lib/2D/Palette.cpp:1.1
netpanzer/src/Lib/2D/Palette.cpp:1.2
--- netpanzer/src/Lib/2D/Palette.cpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/2D/Palette.cpp Mon Sep 1 16:24:18 2003
@@ -15,9 +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 "stdafx.hpp"
#include "Palette.hpp"
+#include "FileUtil.hpp"
#include "UtilInterface.hpp"
#include "gapp.hpp"
@@ -181,7 +180,8 @@
// 16 shades of gray.
gray16.init(16);
- for (int num = 0; num < 16; num++)
+ int num;
+ for (num = 0; num < 16; num++)
gray16.setColor(num, findNearestColor(RGBColor(16*(16-num)-1,
16*(16-num)-1, 16*(16-num)-1)));
// 64 shades of gray.
@@ -204,7 +204,9 @@
for (num = 0; num < 256; num++)
{
int c = color[num].getBrightnessInt();
- int nearestColor = findNearestColor(RGBColor(c * 1.2f, c *
1.2f, c * 1.2f));
+ int nearestColor = findNearestColor(RGBColor((int) (c * 1.2f),
+
(int) (c * 1.2f),
+
(int) (c * 1.2f)));
gray256.setColor(num, nearestColor);
}
@@ -213,7 +215,9 @@
for (num = 0; num < 256; num++)
{
int c = color[num].getBrightnessInt();
- int nearestColor = findNearestColor(RGBColor((float(c) / 2.0f),
(float(c) / 2.0f), (float(c) / 2.0f)));
+ int nearestColor = findNearestColor(RGBColor((int) (float(c) /
2.0f),
+
(int) (float(c) / 2.0f),
+
(int) (float(c) / 2.0f)));
darkGray256.setColor(num, nearestColor);
}
@@ -298,8 +302,8 @@
}
}
- mkdir("pics");
- mkdir("pics\\colorFilters");
+ FileUtil::mkdir("pics");
+ FileUtil::mkdir("pics\\colorFilters");
char strBuf[256];
char tablePath[] = "pics\\colorFilters\\";
@@ -357,9 +361,9 @@
UtilInterface::getFilename(filename);
- char *dotPtr = NULL;
+ char *dotPtr = 0;
- if ((dotPtr = strchr(strBuf, '.')) != NULL)
+ if ((dotPtr = strchr(strBuf, '.')) != 0)
{
// Remove the extension.
*dotPtr = '\0';
@@ -376,13 +380,13 @@
//---------------------------------------------------------------------------
void Palette::loadACT(const char *filename)
{
- assert(filename != NULL);
+ assert(filename != 0);
FILE *fp;
setName(filename);
- if ((fp = fopen(filename, "rb")) == NULL)
+ if ((fp = fopen(filename, "rb")) == 0)
{
FUBAR("Unable to open palette file: %s", filename);
}
@@ -555,15 +559,15 @@
for (int i = 0; i < 256; i++)
{
// Set the colors based on the original colors.
- int red = float(originalColor[i].red) * brightness;
+ int red = (int) (float(originalColor[i].red) * brightness);
if (red > 255) { red = 255; }
else if (red < 0) { red = 0; }
- int green = float(originalColor[i].green) * brightness;
+ int green = (int) (float(originalColor[i].green) * brightness);
if (green > 255) { green = 255; }
else if (green < 0) { green = 0; }
- int blue = float(originalColor[i].blue) * brightness;
+ int blue = (int) (float(originalColor[i].blue) * brightness);
if (blue > 255) { blue = 255; }
else if (blue < 0) { blue = 0; }
Index: netpanzer/src/Lib/2D/Palette.hpp
diff -u netpanzer/src/Lib/2D/Palette.hpp:1.1
netpanzer/src/Lib/2D/Palette.hpp:1.2
--- netpanzer/src/Lib/2D/Palette.hpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/2D/Palette.hpp Mon Sep 1 16:24:18 2003
@@ -15,15 +15,10 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
#ifndef __Palette_hpp__
#define __Palette_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
+#include <stdio.h>
#include "Color.hpp"
#include "ColorTable.hpp"
@@ -34,7 +29,7 @@
typedef BYTE PIX; // Used for variable color depths.
-const int PALETTE_LENGTH = 256;
+const size_t PALETTE_LENGTH = 256;
//--------------------------------------------------------------------------
@@ -113,13 +108,13 @@
static bool read(FILE *fp)
{
- assert(fp != NULL);
+ assert(fp != 0);
return fread(&color, sizeof(color[0]), PALETTE_LENGTH, fp) ==
PALETTE_LENGTH;
}
//static bool write(FILE *fp)
//{
- //assert(fp != NULL);
+ //assert(fp != 0);
//return fwrite(this, sizeof(color[0]), PALETTE_LENGTH, fp) ==
PALETTE_LENGTH;
//}
Index: netpanzer/src/Lib/2D/RGBColor.cpp
diff -u netpanzer/src/Lib/2D/RGBColor.cpp:1.1
netpanzer/src/Lib/2D/RGBColor.cpp:1.2
--- netpanzer/src/Lib/2D/RGBColor.cpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/2D/RGBColor.cpp Mon Sep 1 16:24:18 2003
@@ -15,7 +15,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "RGBColor.hpp"
@@ -32,7 +32,7 @@
//--------------------------------------------------------------------------
int RGBColor::getBrightnessInt()
{
- return 255.0f / 768.0f * float(red + blue + green);
+ return (int) (255.0f / 768.0f * float(red + blue + green));
}
// getBrightnessFloat
@@ -41,5 +41,5 @@
//--------------------------------------------------------------------------
int RGBColor::getBrightnessFloat()
{
- return float(red + blue + green) / 768.0f;
+ return (int) (float(red + blue + green) / 768.0f);
}
Index: netpanzer/src/Lib/2D/RGBColor.hpp
diff -u netpanzer/src/Lib/2D/RGBColor.hpp:1.1
netpanzer/src/Lib/2D/RGBColor.hpp:1.2
--- netpanzer/src/Lib/2D/RGBColor.hpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/2D/RGBColor.hpp Mon Sep 1 16:24:18 2003
@@ -18,14 +18,7 @@
#ifndef __RGBColor_hpp__
#define __RGBColor_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
-#include "stdafx.hpp"
-
+#include "codewiz.hpp"
//--------------------------------------------------------------------------
class RGBColor
Index: netpanzer/src/Lib/2D/Span.cpp
diff -u netpanzer/src/Lib/2D/Span.cpp:1.1 netpanzer/src/Lib/2D/Span.cpp:1.2
--- netpanzer/src/Lib/2D/Span.cpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/2D/Span.cpp Mon Sep 1 16:24:18 2003
@@ -15,20 +15,18 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "Span.hpp"
int allowSpanBlitting = 1;
-#if _MSC_VER > 1000
- #pragma optimize( "", off )
-#endif
-
//--------------------------------------------------------------------------
void bltTransSpan(PIX *dRow, const PIX *sRow, int pixelsPerRow)
{
+ // XXX msvc assembler disabled...
+#ifdef MSVC
_asm {
mov edi, [dRow]
mov esi, [sRow]
@@ -108,6 +106,7 @@
spanDone:
}
+#endif
} // end bltTransSpan
@@ -116,6 +115,8 @@
{
if (!allowSpanBlitting) { return; } // Remove for release candidate.
+ // XXX disable msvc assembler
+#ifdef MSVC
_asm {
mov edi, [dRow]
mov esi, [sRow]
@@ -189,6 +190,7 @@
spanDone:
}
+#endif
} // end bltBlendSpan
@@ -197,6 +199,8 @@
{
if (!allowSpanBlitting) { return; } // Remove for release candidate.
+ // XXX disabled msvc assembler routines
+#ifdef MSVC
_asm {
mov edi, [dRow]
mov esi, [sRow]
@@ -278,14 +282,18 @@
spanDone:
}
+#endif
} // end bltBlendScaleSpan
//--------------------------------------------------------------------------
void bltLookupSpan(PIX *dRow, int pixelsPerRow, const PIX *table)
{
+
if (!allowSpanBlitting) { return; } // Remove for release candidate.
+ // XXX disabled msvc assembler
+#ifdef MSVC
_asm {
mov edi, [dRow]
mov ecx, [pixelsPerRow]
@@ -344,6 +352,7 @@
spanDone:
}
+#endif
} // end bltLookupSpan
@@ -352,6 +361,8 @@
{
if (!allowSpanBlitting) { return; } // Remove for release candidate.
+ // XXX disabled msvc assembler
+#ifdef MSVC
_asm {
mov edi, [dRow]
mov esi, [sRow]
@@ -421,9 +432,7 @@
spanDone:
pop ebp
}
+#endif
} // end bltScaleSpan
-#if _MSC_VER > 1000
- #pragma optimize( "", on )
-#endif
Index: netpanzer/src/Lib/2D/Surface.cpp
diff -u netpanzer/src/Lib/2D/Surface.cpp:1.1
netpanzer/src/Lib/2D/Surface.cpp:1.2
--- netpanzer/src/Lib/2D/Surface.cpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/2D/Surface.cpp Mon Sep 1 16:24:18 2003
@@ -15,8 +15,10 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#ifdef WIN32
+#include <io.h>
+#endif
-#include "stdafx.hpp"
#include "Surface.hpp"
#include "UtilInterface.hpp"
#include "cGrowList.hpp"
@@ -25,82 +27,9 @@
#include "TimerInterface.hpp"
#include "Span.hpp"
-
-#if _MSC_VER > 1000
- #pragma optimize( "", off )
-#endif
-
-// This shit is damn slow right now, so do not use!!!
-void fastMemcpy(void *dest, const void *src, int n) {
-
- if (n < 1) return;
-
- _asm {
-
- pushad
- mov esi, [src]
- mov edi, [dest]
- mov ecx, [n]
-
-// align to qword boundary. This could be a lot faster with
-// jump table, but the main speedup will be the qword moves
-alignQword:
- test edi, 7
- jz qwordAlignedStart
-
- mov al, [esi]
- inc esi
-
- mov [edi], al
- inc edi
-
- dec ecx
- jnz alignQword
-
- jmp done
-
-qwordAlignedStart:
- sub ecx, 8
- jl leftovers
-
-// Copy data in 8-byte chunks using the FPU
-
-qwordAligned:
- fild qword ptr [esi]
- add esi, 8
- fistp qword ptr [edi]
- add edi, 8
- sub ecx, 8
- jge qwordAligned
-
-leftovers:
- add ecx, 8
- jle done
-
-leftover:
- mov al, [esi]
- inc esi
-
- mov [edi], al
- inc edi
-
- dec ecx
- jnz leftover
-
-done:
- popad
- }
-
-}
-
-#if _MSC_VER > 1000
- #pragma optimize( "", on )
-#endif
-
-
-//#define memcpy fastMemcpy
-
+#ifdef MSVC
#pragma pack(1)
+#endif
struct PcxHeader
{
@@ -118,7 +47,7 @@
WORD bytes_per_line;
WORD palette_type;
BYTE padding[58];
- };
+ } __attribute__((packed));
struct TGAHeader
{
@@ -134,7 +63,7 @@
WORD yPix;
BYTE bitsPerPixel;
BYTE imageDescriptor;
-}; // end cTGA
+} __attribute__((packed)); // end cTGA
class SurfaceHeader
{
@@ -146,14 +75,14 @@
DWORD frameCount;
float fps;
-}; // end SurfaceHeader
+} __attribute__((packed)); // end SurfaceHeader
struct PIC_HEAD
{
DWORD xPix; // Horizontal pixel count.
DWORD yPix; // Vertical pixel count.
DWORD frameCount; // Number of frames.
-};
+} __attribute__((packed));
class BitmapFileHeader
{
@@ -163,7 +92,7 @@
WORD bfReserved1;
WORD bfReserved2;
DWORD bfOffBits;
- };
+ } __attribute__((packed));
#define BI_RGB 0L
#define BI_RLE8 1L
@@ -183,7 +112,7 @@
DWORD biYPelsPerMeter;
DWORD biClrUsed;
DWORD biClrImportant;
- };
+ } __attribute__((packed));
class RGBQuad
{
@@ -192,10 +121,11 @@
BYTE rgbGreen;
BYTE rgbRed;
BYTE rgbReserved;
- };
-
+ } __attribute__((packed));
+#ifdef MSVC
#pragma pack()
+#endif
PIX Surface::transPix = 0;
bool Surface::screenLocked = true;
@@ -243,7 +173,7 @@
reset();
alloc(nPix, true, nStride, nFrameCount);
- assert(frame0 != NULL);
+ assert(frame0 != 0);
totalSurfaceCount++;
totalByteCount += sizeof(Surface);
@@ -292,7 +222,7 @@
//---------------------------------------------------------------------------
Surface::Surface(void *nFrame0, const iXY &nPix, int nStride, int nFrameCount)
{
- assert(nFrame0 != NULL);
+ assert(nFrame0 != 0);
assert(isValidPtr(this));
reset();
@@ -322,7 +252,7 @@
//---------------------------------------------------------------------------
void Surface::free()
{
- if (myMem && frame0 != NULL)
+ if (myMem && frame0 != 0)
{
::free(frame0);
@@ -331,8 +261,8 @@
assert(totalByteCount >= 0);
}
- frame0 = NULL;
- mem = NULL;
+ frame0 = 0;
+ mem = 0;
myMem = false;
doesExist = false;
frameCount = 0;
@@ -347,8 +277,8 @@
pix = 0;
stride = 0;
center = 0;
- mem = NULL;
- frame0 = NULL;
+ mem = 0;
+ frame0 = 0;
myMem = false;
frameCount = 0;
curFrame = 0;
@@ -398,7 +328,7 @@
// Add the number of bytes for this surface.
totalByteCount += requestedBytes;
- if (frame0 == NULL)
+ if (frame0 == 0)
{
if (gottaHaveIt)
{
@@ -489,7 +419,7 @@
int stride,
int frameCount)
{
- assert(frame0 != NULL);
+ assert(frame0 != 0);
assert(isValidPtr(this));
free();
@@ -587,9 +517,9 @@
// Something is overlapping, so we need to verify that both
// surfaces are valid.
- assert(mem != NULL);
- assert(dest.mem != NULL);
- if (mem == NULL || dest.mem == NULL) return;
+ assert(mem != 0);
+ assert(dest.mem != 0);
+ if (mem == 0 || dest.mem == 0) return;
int pixelsPerRow = pix.x;
int numRows = pix.y;
@@ -686,9 +616,9 @@
// Something is overlapping, so we need to verify that both
// surfaces are valid.
- assert(mem != NULL);
- assert(dest.mem != NULL);
- if (mem == NULL || dest.mem == NULL) return;
+ assert(mem != 0);
+ assert(dest.mem != 0);
+ if (mem == 0 || dest.mem == 0) return;
int pixelsPerRow = pix.x;
int numRows = pix.y;
@@ -783,9 +713,9 @@
// Something is overlapping, so we need to verify that both
// surfaces are valid.
- assert(mem != NULL);
- assert(dest.mem != NULL);
- if (mem == NULL || dest.mem == NULL) return;
+ assert(mem != 0);
+ assert(dest.mem != 0);
+ if (mem == 0 || dest.mem == 0) return;
int pixelsPerRow = pix.x;
int numRows = pix.y;
@@ -866,8 +796,8 @@
// Check for trivial rejection
if (y < 0 || x2 <= 0 || y >= pix.y || x1 >= pix.x) return;
- assert(mem != NULL);
- if (mem == NULL) return;
+ assert(mem != 0);
+ if (mem == 0) return;
orderCoords(x1, x2);
@@ -903,8 +833,8 @@
// Check for trivial rejection
if (x < 0 || y2 <= 0 || x >= pix.x || y1 >= pix.y) return;
- assert(mem != NULL);
- if (mem == NULL) return;
+ assert(mem != 0);
+ if (mem == 0) return;
orderCoords(y1, y2);
@@ -1132,7 +1062,8 @@
{
assert(false);
- MessageBox(gapp.hwndApp, "ERROR: Surface out of memory.", "Error",
MB_OK);
+ fprintf(stderr, "ERROR: Surface out of memory.");
+ //MessageBox(gapp.hwndApp, "ERROR: Surface out of memory.", "Error",
MB_OK);
exit(1);
@@ -1181,7 +1112,9 @@
setFrame(0);
} // end Surface::extractPCX
+#ifdef MSVC
#pragma pack (1)
+#endif
struct PCX_HEADER
{
char manufacturer;
@@ -1200,8 +1133,10 @@
short bytesPerLine;
short paletteType;
char padding[58];
-};
+} __attribute__((packed));
+#ifdef MSVC
#pragma pack ()
+#endif
// loadPCX
//---------------------------------------------------------------------------
@@ -1211,7 +1146,7 @@
// into the palette field.
//---------------------------------------------------------------------------
void Surface::loadPCX(const char *fileName, bool needAlloc /* = true */,
- void *returnPalette /* = NULL */)
+ void *returnPalette /* = 0 */)
{
assert(isValidPtr(this));
@@ -1219,7 +1154,7 @@
// Open the PCX file
FILE *fp = fopen(fileName,"rb");
- if (fp == NULL) { FUBAR("Unable to open %s", fileName); }
+ if (fp == 0) { FUBAR("Unable to open %s", fileName); }
// Read in the header
PCX_HEADER header;
@@ -1245,7 +1180,7 @@
if (pix.x < header.width || pix.y <
header.height)
FUBAR("Not enough memory to load PCX
image %s", fileName);
}
- if (returnPalette != NULL)
+ if (returnPalette != 0)
{
// Move to the end of the file and back up to the start
of the palette
fseek(fp, -768L, SEEK_END);
@@ -1367,7 +1302,7 @@
//---------------------------------------------------------------------------
void Surface::rotate(int angle)
{
- assert(this != NULL);
+ assert(this != 0);
for (int i = 0; i < frameCount; i++)
{
@@ -1421,7 +1356,7 @@
// Open the TIL file
FILE *fp = fopen(filename, "rb");
- if (fp == NULL) { FUBAR("ERROR: Unable to load raw %s", filename); }
+ if (fp == 0) { FUBAR("ERROR: Unable to load raw %s", filename); }
// Read in the header
PIC_HEAD head;
@@ -1462,8 +1397,8 @@
//FUBAR("Error reading file %s", fileName);
}
- assert(frame0 != NULL);
- assert(mem != NULL);
+ assert(frame0 != 0);
+ assert(mem != 0);
assert(unsigned(pix.x) == head.xPix);
assert(unsigned(pix.y) == head.yPix);
@@ -1536,7 +1471,8 @@
iRect r(0, 0, pix.x, pix.y);
// Go through all the frames of the surface.
- for (int frame = 0; frame < tempSurface.getFrameCount(); frame++)
+ int frame;
+ for (frame = 0; frame < tempSurface.getFrameCount(); frame++)
{
tempSurface.setFrame(frame);
Surface::setFrame(frame);
@@ -1618,7 +1554,7 @@
for (int curFrame = 0; curFrame < frameCount; curFrame++)
{
setFrame(curFrame);
- verticalWave3D(numWaves, percent, curOffset);
+ verticalWave3D(numWaves, percent, (int) curOffset);
curOffset += offsetStep;
}
} // end Surface::verticalWave3DAll
@@ -1663,7 +1599,7 @@
for (int curFrame = 0; curFrame < frameCount; curFrame++)
{
setFrame(curFrame);
- horizontalWave3D(numWaves, percent, curOffset);
+ horizontalWave3D(numWaves, percent, (int) curOffset);
curOffset += offsetStep;
}
} // end Surface::horizontalWave3DAll
@@ -1708,7 +1644,7 @@
for (int curFrame = 0; curFrame < frameCount; curFrame++)
{
setFrame(curFrame);
- ripple(numWaves, percent, curOffset);
+ ripple(numWaves, percent, (int) curOffset);
curOffset += offsetStep;
}
} // end Surface::rippleAll
@@ -1729,7 +1665,7 @@
float maxDist = sqrt(pix.x * pix.x + pix.y * pix.y);
float scale = (piTimes2 * numWaves) / maxDist;
- offset = (offset * piTimes2) / 100.0;
+ offset = (int) ((offset * piTimes2) / 100.0);
blt(temp, 0, 0);
@@ -1764,16 +1700,11 @@
for (int frame = 0; frame < frameCount; frame++)
{
setFrame(frame);
- horizontalWave(numWaves, percent, curOffset);
+ horizontalWave(numWaves, percent, (int) curOffset);
curOffset += offsetStep;
}
} // end Surface::horizontalWaveAll
-static float round(float num)
-{
- return num += 0.5;
-}
-
// horizontalWave
//---------------------------------------------------------------------------
void Surface::horizontalWave(int numWaves, float percent, int offset)
@@ -1817,7 +1748,7 @@
for (int frame = 0; frame < frameCount; frame++)
{
setFrame(frame);
- verticalWave(numWaves, percent, curOffset);
+ verticalWave(numWaves, percent, (int) curOffset);
curOffset += offsetStep;
}
} // end Surface::verticalWaveAll
@@ -1904,8 +1835,8 @@
// Something is overlapping, so we need to verify that both
// surfaces are valid.
- assert(mem != NULL);
- assert(source.mem != NULL);
+ assert(mem != 0);
+ assert(source.mem != 0);
int pixelsPerRow = source.pix.x;
int numRows = source.pix.y;
@@ -1975,8 +1906,8 @@
// Something is overlapping, so we need to verify that both
// surfaces are valid.
- assert(mem != NULL);
- assert(source.mem != NULL);
+ assert(mem != 0);
+ assert(source.mem != 0);
int pixelsPerRow = max.x-min.x;
int numRows = max.y-min.y;
@@ -2062,7 +1993,7 @@
if (max.x > pix.x) max.x = pix.x;
if (max.y > pix.y) max.y = pix.y;
- assert(mem != NULL);
+ assert(mem != 0);
int pixelsPerRow = max.x - min.x;
int numRows = max.y - min.y;
@@ -2093,8 +2024,8 @@
// Something is overlapping, so we need to verify that both
// surfaces are valid.
- assert(mem != NULL);
- assert(source.mem != NULL);
+ assert(mem != 0);
+ assert(source.mem != 0);
int pixelsPerRow = max.x-min.x;
int numRows = max.y-min.y;
@@ -2196,8 +2127,8 @@
if (bounds.min.x >= pix.x) return;
if (bounds.min.y >= pix.y) return;
- assert(mem != NULL);
- if (mem == NULL) return;
+ assert(mem != 0);
+ if (mem == 0) return;
// Check for clipping
if (bounds.min.x < 0) bounds.min.x = 0;
@@ -2244,7 +2175,8 @@
{
for (int x = 0; x < diff.x; x++)
{
- index = (float(Palette::brightness256[*ptr]) / 100.0f)
* colorTable.getColorCount();
+ index = (int) ((float(Palette::brightness256[*ptr]) /
100.0f) *
+ colorTable.getColorCount());
assert(index < colorTable.getColorCount());
*ptr = colorTable[index];
ptr++;
@@ -2267,7 +2199,8 @@
bounds.min.y = center.y;
bounds.max.y = center.y;
- for (int num = 0; num < frameCount; num++)
+ int num;
+ for (num = 0; num < frameCount; num++)
{
setFrame(num);
//LOG(("curFrame: %d", curFrame));
@@ -2359,7 +2292,7 @@
//---------------------------------------------------------------------------
void frac(int *matrix, int stride, int x1, int y1, int x2, int y2, float
ruggedness)
{
- assert(matrix != NULL);
+ assert(matrix != 0);
int xm, zm;
@@ -2386,7 +2319,8 @@
if (matrix[zm * stride + x1] == -10000)
{
// Not filled in - generate a random cell value
- matrix[zm * stride + x1] = calcY((tl+bl)/2.0,
ruggedness, y2-y1);
+ matrix[zm * stride + x1] = (int) (calcY((tl+bl)/2.0,
ruggedness,
+ y2-y1));
}
// Fill in the middle right cell. We know it hasn't
@@ -2394,17 +2328,20 @@
// the smaller squares
if (matrix[zm * stride + x2] != -10000.0) { FUBAR("1.
matrix[%u, %u] != -10000 - value: %d", zm, x2, matrix[zm * stride + x2]); }
if (x1 < x2)
- matrix[zm * stride + x2] = calcY((tr+br)/2.0,
ruggedness, y2-y1);
+ matrix[zm * stride + x2] = (int) (calcY((tr+br)/2.0,
ruggedness,
+ y2-y1));
}
// Do the same for the top-middle and bottom-middle cells
if (xm < x2)
{
if (matrix[y1 * stride + xm] == -10000.0)
- matrix[y1 * stride + xm] = calcY((tl+tr)/2.0,
ruggedness, x2-x1);
+ matrix[y1 * stride + xm] = (int) (calcY((tl+tr)/2.0,
ruggedness,
+ x2-x1));
if (matrix[y2 * stride + xm] != -10000.0) { FUBAR("2.
matrix[%u, %u] != -10000 - value: %d", y2, xm, matrix[y2 * stride + xm]); }
if (y1 < y2)
- matrix[y2 * stride + xm] = calcY((bl+tr)/2.0,
ruggedness, x2-x1);
+ matrix[y2 * stride + xm] = (int) (calcY((bl+tr)/2.0,
ruggedness,
+ x2-x1));
}
// Fill in the middle cell value. If our square is at
@@ -2412,7 +2349,8 @@
if (xm < x2 && zm < y2)
{
if (matrix[zm * stride + xm] != -10000.0) { FUBAR("3.
matrix[%u, %u] != -10000 - value: %d", zm, xm, matrix[zm * stride + xm]); }
- matrix[zm * stride + xm] = calcY((tl+tr+bl+br)/4.0, ruggedness,
(x2-x1)+(y2-y1));
+ matrix[zm * stride + xm] = (int) (calcY((tl+tr+bl+br)/4.0,
ruggedness,
+ (x2-x1)+(y2-y1)));
}
// Now recursivly do the smaller squares
@@ -2446,7 +2384,7 @@
// Create some temp buffer to generate the values in.
int *tempBuf = (int *) malloc(stride * pix.y * sizeof(int));
- if (tempBuf == NULL) { FUBAR("ERROR: Unable to allocate temp fractal
surface."); }
+ if (tempBuf == 0) { FUBAR("ERROR: Unable to allocate temp fractal
surface."); }
// Initialize everything to some bogus value.
for (int x = 0; x < stride; x++)
@@ -2458,10 +2396,10 @@
//FUBAR("!EXIT!");;
// Initialize the corners to some value.
- tempBuf[0] = getRand(minY, maxY);
- tempBuf[stride-1] = getRand(minY, maxY);
- tempBuf[pix.y-1 * stride-1] = getRand(minY, maxY);
- tempBuf[pix.y-1 * stride + stride-1] = getRand(minY, maxY);
+ tempBuf[0] = (int) getRand(minY, maxY);
+ tempBuf[stride-1] = (int) getRand(minY, maxY);
+ tempBuf[pix.y-1 * stride-1] = (int) getRand(minY, maxY);
+ tempBuf[pix.y-1 * stride + stride-1] = (int) getRand(minY, maxY);
// Recursively generate the fractal surface
frac(tempBuf, stride, 0, 0, stride-1, pix.y-1, ruggedness);
@@ -2469,7 +2407,7 @@
int yMin = tempBuf[0];
int yMax = tempBuf[0];
- for (x = 0; x < stride; x++)
+ for (int x = 0; x < stride; x++)
{
for (int y = 0; y < pix.y; y++)
{
@@ -2484,7 +2422,7 @@
int difference = yMax - yMin;
float ratio = 255.0/float(difference);
- for (x = 0; x < stride; x++)
+ for (int x = 0; x < stride; x++)
{
for (int y = 0; y < pix.y; y++)
{
@@ -2494,7 +2432,7 @@
tempBuf[y * stride + x] -= yMin;
}
// Move the land to be within the range [0, 255].
- int value = tempBuf[y * stride + x]*ratio;
+ int value = (int) (tempBuf[y * stride + x]*ratio);
assert(value < 256);
tempBuf[y * stride + x] = value;
//LOG(("tempBuf[y * stride + x], value: %d", tempBuf[y
* stride + x]));
@@ -2520,6 +2458,8 @@
void Surface::fire(int *dest, int xSize, int ySize)
{
+ // XXX no msvc assembler
+#ifdef MSVC
_asm {
mov edi, [dest]
@@ -2549,13 +2489,9 @@
mov [edi+esi-4], eax
jnz fl1
}
-
-
-}
-#if _MSC_VER > 1000
- #pragma optimize( "", on )
#endif
-
+
+}
// smooth
//---------------------------------------------------------------------------
@@ -2581,7 +2517,7 @@
putPixel(x, 0, (getPixel(x-1, 1)+getPixel(x, 1)+getPixel(x+1,
1))/3);
// SOUTH EDGE
- for (x = 1; x < pix.x; x++)
+ for (int x = 1; x < pix.x; x++)
putPixel(x, ZP, (getPixel(x-1, ZP-1)+getPixel(x,
ZP-1)+getPixel(x+1, ZP-1))/3);
// WEST EDGE
@@ -2589,12 +2525,12 @@
putPixel(0, y, (getPixel(1, y-1)+getPixel(1, y)+getPixel(1,
y+1))/3);
// EAST EDGE
- for (y = 1; y < pix.y; y++)
+ for (int y = 1; y < pix.y; y++)
putPixel(XP, y, (getPixel(XP, y-1)+getPixel(XP, y)+getPixel(XP,
y+1))/3);
// Then erode the inner area
- for (x = 1; x < pix.x; x++)
- for (y = 1; y < pix.y; y++)
+ for (int x = 1; x < pix.x; x++)
+ for (int y = 1; y < pix.y; y++)
putPixel(x, y, (getPixel(x-1, y)+getPixel(x+1,
y)+getPixel(x, y-1)+getPixel(x, y+1))/4);
} // end smooth
@@ -2636,12 +2572,12 @@
//---------------------------------------------------------------------------
void Surface::saveRAW(FILE *fp) const
{
- if (fp == NULL) return;
+ if (fp == 0) return;
int numBytes = pix.x * pix.y * sizeof(PIX);
if (numBytes <= 0) return;
- if (frame0 == NULL) return;
+ if (frame0 == 0) return;
fwrite(frame0, numBytes, 1, fp);
@@ -2655,7 +2591,7 @@
int Surface::saveRAW(const char *filename) const
{
FILE *fp = fopen(filename, "wb");
- if (fp == NULL) return 0;
+ if (fp == 0) return 0;
saveRAW(fp);
@@ -2671,7 +2607,7 @@
{
FILE *fp = fopen((const char *) filename, "rb");
- if (fp == NULL)
+ if (fp == 0)
{
return 0;
}
@@ -2688,12 +2624,12 @@
//---------------------------------------------------------------------------
void Surface::loadTIL(FILE *fp)
{
- if (fp == NULL) return;
+ if (fp == 0) return;
FletchTileHeader fletchTileHeader;
fread(&fletchTileHeader, sizeof(FletchTileHeader), 1, fp);
- if (frame0 == NULL || mem == NULL || pix.x !=
int(fletchTileHeader.xSize) || pix.y != int(fletchTileHeader.ySize))
+ if (frame0 == 0 || mem == 0 || pix.x != int(fletchTileHeader.xSize) ||
pix.y != int(fletchTileHeader.ySize))
{
create(fletchTileHeader.xSize, fletchTileHeader.ySize,
fletchTileHeader.xSize, 1);
}
@@ -2701,7 +2637,7 @@
int numBytes = pix.x * pix.y * sizeof(BYTE);
if (numBytes <= 0) return;
- if (mem == NULL) { FUBAR("ERROR: This should not happen."); }
+ if (mem == 0) { FUBAR("ERROR: This should not happen."); }
fread(mem, numBytes, 1, fp);
@@ -2719,7 +2655,7 @@
setFrame(num);
FILE *fp = fopen(strBuf, "wb");
- if (fp == NULL) { continue; }
+ if (fp == 0) { continue; }
saveTIL(fp);
@@ -2733,7 +2669,7 @@
int Surface::saveTIL(const char *filename)
{
FILE *fp = fopen(filename, "wb");
- if (fp == NULL) return 0;
+ if (fp == 0) return 0;
saveTIL(fp);
@@ -2746,7 +2682,7 @@
// saveTIL
void Surface::saveTIL(FILE *fp)
{
- if (fp == NULL) return;
+ if (fp == 0) return;
FletchTileHeader fletchTileHeader;
@@ -2768,7 +2704,7 @@
int numBytes = pix.x * pix.y * sizeof(BYTE);
if (numBytes <= 0) { FUBAR("ERROR: Trying to write surface when
(numBytes <= 0)."); }
- if (mem == NULL) { FUBAR("ERROR: Trying to write surface when (mem ==
NULL)."); }
+ if (mem == 0) { FUBAR("ERROR: Trying to write surface when (mem ==
0)."); }
fwrite(mem, numBytes, 1, fp);
@@ -2778,7 +2714,7 @@
int Surface::loadRAW(const char *filename, const iXY pix)
{
FILE *fp = fopen(filename, "rb");
- if (fp == NULL) return 0;
+ if (fp == 0) return 0;
loadRAW(fp, pix);
@@ -2791,11 +2727,11 @@
// loadRAW
void Surface::loadRAW(FILE *fp, const iXY pix)
{
- if (fp == NULL) return;
+ if (fp == 0) return;
if (pix.x <= 0) return;
if (pix.y <= 0) return;
- if (frame0 == NULL || mem == NULL || this->pix.x != pix.x ||
this->pix.y != pix.y)
+ if (frame0 == 0 || mem == 0 || this->pix.x != pix.x || this->pix.y !=
pix.y)
{
create(pix.x, pix.y, pix.x, 1);
}
@@ -2803,7 +2739,7 @@
int numBytes = pix.x * pix.y * sizeof(BYTE);
if (numBytes <= 0) return;
- if (mem == NULL) { FUBAR("ERROR: This should not happen."); }
+ if (mem == 0) { FUBAR("ERROR: This should not happen."); }
fread(mem, numBytes, 1, fp);
@@ -2847,8 +2783,8 @@
// Something is overlapping, so we need to verify that both
// surfaces are valid.
- assert(mem != NULL);
- assert(dest.mem != NULL);
+ assert(mem != 0);
+ assert(dest.mem != 0);
int pixelsPerRow = pix.x;
int numRows = pix.y;
@@ -2899,7 +2835,8 @@
while (xCount > 0)
{
//*d = Palette::colorTableBrighten[((*d) * 256) +
(Palette::brightness256[(*s)] * percent)];
- *d = Palette::colorTableBrighten[((*d) << 8) +
(Palette::brightness256[(*s)] * percent)];
+ *d = Palette::colorTableBrighten[
+ (int) (((*d) << 8) +
(Palette::brightness256[(*s)] * percent))];
xCount--;
s++;
@@ -2934,8 +2871,8 @@
// Something is overlapping, so we need to verify that both
// surfaces are valid.
- assert(mem != NULL);
- assert(dest.mem != NULL);
+ assert(mem != 0);
+ assert(dest.mem != 0);
int pixelsPerRow = pix.x;
int numRows = pix.y;
@@ -3006,9 +2943,6 @@
static BYTE quickHack[65536];
-#if _MSC_VER > 1000
- #pragma optimize( "", off )
-#endif
static void bltLightDarkSpan(int n, PIX *d, const BYTE *i, const PIX *s)
{
@@ -3041,6 +2975,8 @@
}
if (n > 3) {
+ // XXX no msvc assembler
+#ifdef MSVC
_asm {
// load vars into regs
@@ -3092,6 +3028,7 @@
mov d, edi
mov n, eax
}
+#endif
}
while (n > 0)
@@ -3106,9 +3043,6 @@
}
}
-#if _MSC_VER > 1000
- #pragma optimize( "", on )
-#endif
void Surface::bltLightDark(const Surface &source, const Surface &lightTable)
const
{
@@ -3126,10 +3060,10 @@
while (numRows > 0)
{
- int xCount = pix.x;
- BYTE const *i = rowI;
- PIX const *s = rowS;
- PIX *d = rowD;
+ //int xCount = pix.x;
+ //BYTE const *i = rowI;
+ //PIX const *s = rowS;
+ //PIX *d = rowD;
//while (xCount > 0)
//{
@@ -3156,7 +3090,8 @@
{
for (int y = 0; y < pix.y; y++)
{
- putPixel(x, y, Palette::brightness256[getPixel(x, y)] *
(128.0/100.0));
+ putPixel(x, y, (int)
(Palette::brightness256[getPixel(x, y)] *
+ (128.0/100.0)));
}
}
}
@@ -3166,10 +3101,6 @@
// Purpose:
//---------------------------------------------------------------------------
-#if _MSC_VER > 1000
- #pragma optimize( "", off )
-#endif
-
void Surface::bltAdd(const Surface &dest, iXY min) const
{
@@ -3206,9 +3137,9 @@
// Something is overlapping, so we need to verify that both
// surfaces are valid.
- assert(mem != NULL);
- assert(dest.mem != NULL);
- if (mem == NULL || dest.mem == NULL) return;
+ assert(mem != 0);
+ assert(dest.mem != 0);
+ if (mem == 0 || dest.mem == 0) return;
int pixelsPerRow = pix.x;
int numRows = pix.y;
@@ -3285,6 +3216,8 @@
// Do 4-byte chunks
if (0 && n > 3) {
+ // XXX no msvc assembler
+#ifdef MSVC
_asm {
// load vars into regs
@@ -3334,6 +3267,7 @@
mov n, ebp
}
+#endif
}
// Cleanup
@@ -3350,15 +3284,13 @@
} // end bltAdd
-#if _MSC_VER > 1000
- #pragma optimize( "", on )
-#endif
-
// loadAllTILInDirectory
//---------------------------------------------------------------------------
int Surface::loadAllTILInDirectory(const char *path)
{
+ // XXX _findfirst below is win32 only
+#ifdef WIN32
char strBuf[256];
char pathWild[256];
@@ -3434,6 +3366,7 @@
tempSurface.blt(*this, myOffset);
}
}
+#endif
return 1;
} // end loadAllTILInDirectory
@@ -3442,6 +3375,8 @@
//---------------------------------------------------------------------------
int Surface::loadAllPCXInDirectory(const char *path)
{
+ // XXX _findfirst below is win32 only
+#ifdef WIN32
char strBuf[256];
char pathWild[256];
@@ -3511,6 +3446,7 @@
fill(Color::black);
tempSurface.blt(*this, myOffset);
}
+#endif
return 1;
} // end loadAllPCXInDirectory
@@ -3519,6 +3455,8 @@
//---------------------------------------------------------------------------
int Surface::loadAllBMPInDirectory(const char *path)
{
+ // XXX _findfirst below is win32 only
+#ifdef WIN32
char strBuf[256];
char pathWild[256];
@@ -3588,6 +3526,7 @@
fill(Color::black);
tempSurface.blt(*this, myOffset);
}
+#endif
return 1;
} // end loadAllBMPInDirectory
@@ -3596,6 +3535,8 @@
//---------------------------------------------------------------------------
int Surface::loadAllRAWInDirectory(const char *path, const iXY &pix)
{
+ // XXX _findfirst below is win32 only
+#ifdef WIN32
char strBuf[256];
char pathWild[256];
@@ -3643,6 +3584,7 @@
return 0;
}
}
+#endif
return 1;
} // end loadAllRAWInDirectory
@@ -3660,7 +3602,7 @@
//int[] zBuffer = new int[width * height];
int *zBuffer = new int[getArea()];
- if (zBuffer == NULL)
+ if (zBuffer == 0)
{
FUBAR("Unable to allocate zBuffer.");
}
@@ -3726,7 +3668,7 @@
int Surface::loadTGA(const char *filename)
{
FILE *fp = fopen(filename, "rb");
- if (fp == NULL) return 0;
+ if (fp == 0) return 0;
loadTGA(fp);
@@ -3764,9 +3706,9 @@
fread(&TGAheader, sizeof(TGAheader), 1, fp);
// Check for uncompressed/true-color.
- if (TGAheader.imageType != UNCOMPRESSED_trueCOLOR)
+ if (TGAheader.imageType != UNCOMPRESSEDtrueCOLOR)
{
- FUBAR("ERROR: TGAheader.imageType != UNCOMPRESSED_trueCOLOR");
+ FUBAR("ERROR: TGAheader.imageType != UNCOMPRESSEDtrueCOLOR");
}
// Check for 24-bits per pixel.
@@ -3792,7 +3734,7 @@
default: return 0;
}
- if (dest != NULL)
+ if (dest != 0)
{
delete [] dest;
}
@@ -3931,13 +3873,11 @@
}
//--------------------------------------------------------------------------
-#if _MSC_VER > 1000
- #pragma optimize( "", off )
-#endif
-
void fireByte(BYTE *dest, int xSize, int ySize)
{
+ // XXX no msvc assembler
+#ifdef MSVC
_asm {
mov edi, [dest]
@@ -3969,11 +3909,9 @@
mov [edi+esi-1], al
jnz fl1
}
+#endif
}
-#if _MSC_VER > 1000
- #pragma optimize( "", on )
-#endif
//--------------------------------------------------------------------------
void Surface::erode()
@@ -4011,7 +3949,7 @@
char charfilename[] = "pics\\chars8x8.raw";
FILE *fp = fopen(charfilename, "rb");
- if (fp == NULL)
+ if (fp == 0)
{
assert(false);
}
@@ -4038,7 +3976,7 @@
char charfilename[] = "pics\\chars5x5.raw";
FILE *fp = fopen(charfilename, "rb");
- if (fp == NULL)
+ if (fp == 0)
{
assert(false);
}
@@ -4302,9 +4240,9 @@
// Something is overlapping, so we need to verify that both
// surfaces are valid.
- assert(mem != NULL);
- assert(dest.mem != NULL);
- if (mem == NULL || dest.mem == NULL) return;
+ assert(mem != 0);
+ assert(dest.mem != 0);
+ if (mem == 0 || dest.mem == 0) return;
int pixelsPerRow = pix.x;
int numRows = pix.y;
@@ -4360,7 +4298,8 @@
for (int row = 0; row < numRows; row++)
{
- int index = float(row) / float(numRows) *
(colorTable.getColorCount() - 1);
+ int index = (int)
+ (float(row) / float(numRows)
*(colorTable.getColorCount() - 1));
int color = colorTable[index];
for (int col = 0; col < pixelsPerRow; col++)
@@ -4448,7 +4387,10 @@
};
if ( csave != -1 )
- { if ( i = pcx_putc( csave, n, fp ) )
+ {
+ // XXX is this = intended here? (I added the braces to avoid
the
+ // warning now...)
+ if ( (i = pcx_putc( csave, n, fp )) )
return i;
csave = n = -1;
};
@@ -4530,7 +4472,7 @@
{
FILE *fp = fopen(filename, "wb");
- if (fp == NULL) return 0;
+ if (fp == 0) return 0;
savePCX(fp, pal);
@@ -4565,7 +4507,7 @@
int Surface::saveSUR(const char *filename)
{
FILE *fp = fopen(filename, "wb");
- if (fp == NULL) { return 0; }
+ if (fp == 0) { return 0; }
saveSUR(fp);
@@ -4605,7 +4547,7 @@
int Surface::loadSUR(const char *filename)
{
FILE *fp = fopen(filename, "rb");
- if (fp == NULL) { return 0; }
+ if (fp == 0) { return 0; }
loadSUR(fp);
@@ -4626,7 +4568,7 @@
create(surfaceHeader.pixX, surfaceHeader.pixY, surfaceHeader.pixX,
surfaceHeader.frameCount);
setOffset(iXY(surfaceHeader.offsetX, surfaceHeader.offsetY));
- setFPS(surfaceHeader.fps);
+ setFPS((int) surfaceHeader.fps);
// Write the actual data...
for (int i = 0; i < frameCount; i++)
@@ -4654,7 +4596,7 @@
void Surface::unlock()
{
screenLocked = true;
- frame0 = mem = NULL;
+ frame0 = mem = 0;
doesExist = false;
@@ -4707,7 +4649,7 @@
} // end Surface::drawStatic
void Surface::loadBMP(const char *fileName, bool needAlloc /* = true */,
- void *returnPalette /* = NULL */)
+ void *returnPalette /* = 0 */)
{
BitmapFileHeader file_header;
BitmapInfoHeader info_header;
@@ -4717,7 +4659,7 @@
if (needAlloc) free();
FILE *fp = fopen(fileName,"rb");
- if (fp == NULL) { FUBAR("Unable to open %s", fileName); }
+ if (fp == 0) { FUBAR("Unable to open %s", fileName); }
fread( &file_header, sizeof(BitmapFileHeader), 1, fp );
@@ -4772,7 +4714,7 @@
PIX buffer[10];
int numRows = pix.y;
- PIX *sPtr = mem;
+ //PIX *sPtr = mem;
for (int row = 0; row < numRows; row++)
{
@@ -4845,7 +4787,7 @@
PIX buffer[10];
int numRows = pix.y;
- PIX *sPtr = mem;
+ //PIX *sPtr = mem;
for (int row = 0; row < numRows; row++)
{
@@ -4896,7 +4838,7 @@
{
FILE *fp = fopen(filename, "wb");
- if (fp == NULL) return 0;
+ if (fp == 0) return 0;
saveBMP(fp, pal);
@@ -5001,7 +4943,7 @@
strBuf[strBufLength] = '\0';
- if (pos.x + strlen(strBuf) * CHAR_XPIX > rect.max.x)
+ if ((int) (pos.x + strlen(strBuf) * CHAR_XPIX) > rect.max.x)
{
pos.x = rect.min.x;
pos.y += gapSpace;
@@ -5033,7 +4975,7 @@
FILE *fp;
- if ((fp = fopen(oldPalette, "rb")) == NULL)
+ if ((fp = fopen(oldPalette, "rb")) == 0)
{
FUBAR("Unable to open palette file: %s", (const char *)
oldPalette);
}
Index: netpanzer/src/Lib/2D/Surface.hpp
diff -u netpanzer/src/Lib/2D/Surface.hpp:1.1
netpanzer/src/Lib/2D/Surface.hpp:1.2
--- netpanzer/src/Lib/2D/Surface.hpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/2D/Surface.hpp Mon Sep 1 16:24:18 2003
@@ -15,20 +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
*/
-
#ifndef __Surface_hpp__
#define __Surface_hpp__
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
#include "iXY.hpp"
#include "iRect.hpp"
#include "Palette.hpp"
#include "String.hpp"
-
// This must be called before any of the string blitting functions are used.
void initFont();
@@ -81,12 +75,14 @@
#define SCREEN_XCENTER (screen.getCenterX())
#define SCREEN_YCENTER (screen.getCenterY())
-#pragma pack (1)
-
/////////////////////////////////////////////////////////////////////////////
// structs
/////////////////////////////////////////////////////////////////////////////
+#ifdef MSVC
+#pragma pack (1)
+#endif
+
// A ".til" file.
class FletchTileHeader
{
@@ -101,16 +97,18 @@
BYTE avgG; // .
BYTE avgB; // .
BYTE avgIndex; // Closest palette entry to the average color
-}; // end FletchTileHeader
+} __attribute__((packed)); // end FletchTileHeader
//struct PIC_HEAD
//{
// DWORD xPix; // Horizontal pixel count.
// DWORD yPix; // Vertical pixel count.
// DWORD frameCount; // Number of frames.
-//};
+//} __attribute__((packed));
+#ifdef MSVC
#pragma pack ()
+#endif
/////////////////////////////////////////////////////////////////////////////
// class Surface
@@ -122,7 +120,8 @@
public:
void setTransPix()
{
- assert(transPix >= 0);
+ // XXX transPix is unisgned long, so >= 0 doesn't make sense...
+ //assert(transPix >= 0);
Surface::transPix = transPix;
}
void setOffset(const iXY &offset) { Surface::offset = offset; }
@@ -132,7 +131,7 @@
void setFPS(int fps) { Surface::fps = fps; }
void setFrame0(PIX *frame0)
{
- assert(frame0 != NULL);
+ assert(frame0 != 0);
Surface::frame0 = frame0;
}
@@ -175,7 +174,7 @@
inline int getCenterY() const { return center.y; }
inline int getStride() const { return stride; }
inline int getFrameCount() const { return frameCount; }
- inline int getCurFrame () const { return curFrame; }
+ inline int getCurFrame () const { return (int) curFrame; }
inline PIX *getMem() const { return mem; }
inline PIX *getFrame0() const { return frame0; }
inline iXY getOffset() const { return offset; }
@@ -204,7 +203,7 @@
//Surface(const Surface &source, int x1, int y1, int x2, int y2, bool
doGrab);
Surface(void *nFrame0, const iXY &nPix, int nStride, int nFrameCount);
- ~Surface();
+ virtual ~Surface();
bool alloc(const iXY &pix, bool gottaHaveIt, int stride, int
frameCount);
@@ -414,7 +413,7 @@
}
PIX getAverageColor();
- void loadPCX(const char *filename, bool needAlloc = true, void
*returnPalette = NULL);
+ void loadPCX(const char *filename, bool needAlloc = true, void
*returnPalette = 0);
void extractPCX(const char *filename, int nCols, int gapSpace);
void loadRAW(const char *fileName, bool needAlloc = true);
int saveRAW(const char *filename) const;
@@ -544,7 +543,7 @@
void savePCX(FILE *fp, Palette &pal );
int savePCX( const char *filename, Palette &pal );
- void loadBMP(const char *fileName, bool needAlloc = true, void
*returnPalette = NULL);
+ void loadBMP(const char *fileName, bool needAlloc = true, void
*returnPalette = 0);
int saveBMP(Palette &pal);
void saveBMP(FILE *fp, Palette &pal );
int saveBMP( const char *filename, Palette &pal );
Index: netpanzer/src/Lib/Interfaces/JoystickInterface.cpp
diff -u netpanzer/src/Lib/Interfaces/JoystickInterface.cpp:1.1
netpanzer/src/Lib/Interfaces/JoystickInterface.cpp:1.2
--- netpanzer/src/Lib/Interfaces/JoystickInterface.cpp:1.1 Sun Dec 1
12:51:40 2002
+++ netpanzer/src/Lib/Interfaces/JoystickInterface.cpp Mon Sep 1 16:24:18 2003
@@ -15,7 +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
*/
-#include "stdafx.hpp"
+#include "JoystickInterface.hpp"
+
+// XXX dummy code
+float JoystickInterface::errorThreshold = 0;
+
+// XXX disabled for now
+#if 0
+
#include "JoystickInterface.hpp"
#include "TimerInterface.hpp"
#include "KeyboardInterface.hpp"
@@ -489,3 +496,5 @@
// gSetupJoystickInterfaceFlag = false;
//
} // end JoystickInterface::setupJoystickInterface
+
+#endif
Index: netpanzer/src/Lib/Interfaces/JoystickInterface.hpp
diff -u netpanzer/src/Lib/Interfaces/JoystickInterface.hpp:1.1
netpanzer/src/Lib/Interfaces/JoystickInterface.hpp:1.2
--- netpanzer/src/Lib/Interfaces/JoystickInterface.hpp:1.1 Sun Dec 1
12:51:40 2002
+++ netpanzer/src/Lib/Interfaces/JoystickInterface.hpp Mon Sep 1 16:24:18 2003
@@ -18,18 +18,14 @@
#ifndef __JoystickInterface_hpp__
#define __JoystickInterface_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
-#include "stdafx.hpp"
#include "iXY.hpp"
#include "fXY.hpp"
#include "iRect.hpp"
#include "Surface.hpp"
+// disabled for now
+#if 0
+
extern bool gSetupJoystickFlag;
class JoystickInterface
@@ -87,3 +83,18 @@
}; // end __JoystickInterface_hpp__
#endif // __JoystickInterface_hpp__
+
+// Dummy implementation
+class JoystickInterface {
+public:
+ static void setCenterPos(const iXY& ) {}
+ static void setExtents(const iRect& ) {}
+ static iXY getCenterPos() { return iXY(0,0); }
+ static iRect getExtents() { return iRect(0,0,0,0); }
+ static bool button_down(int button) { return false; }
+ static void setupJoystick() { }
+
+ static float errorThreshold;
+};
+
+#endif
Index: netpanzer/src/Lib/Interfaces/TimerInterface.cpp
diff -u netpanzer/src/Lib/Interfaces/TimerInterface.cpp:1.1
netpanzer/src/Lib/Interfaces/TimerInterface.cpp:1.2
--- netpanzer/src/Lib/Interfaces/TimerInterface.cpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/Interfaces/TimerInterface.cpp Mon Sep 1 16:24:18 2003
@@ -15,7 +15,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "TimerInterface.hpp"
TIMESTAMP TimerInterface::frameStartTime;
Index: netpanzer/src/Lib/Interfaces/TimerInterface.hpp
diff -u netpanzer/src/Lib/Interfaces/TimerInterface.hpp:1.1
netpanzer/src/Lib/Interfaces/TimerInterface.hpp:1.2
--- netpanzer/src/Lib/Interfaces/TimerInterface.hpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/Interfaces/TimerInterface.hpp Mon Sep 1 16:24:18 2003
@@ -24,7 +24,7 @@
#endif
-#include "stdafx.hpp"
+
#include "cTimeStamp.hpp"
extern bool gTimeSliceFlag;
Index: netpanzer/src/Lib/Interfaces/UtilInterface.cpp
diff -u netpanzer/src/Lib/Interfaces/UtilInterface.cpp:1.1
netpanzer/src/Lib/Interfaces/UtilInterface.cpp:1.2
--- netpanzer/src/Lib/Interfaces/UtilInterface.cpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/Interfaces/UtilInterface.cpp Mon Sep 1 16:24:18 2003
@@ -15,9 +15,10 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-
-#include "stdafx.hpp"
+#ifdef WIN32
+#include <io.h>
+#endif
+#include <string.h>
#include "UtilInterface.hpp"
bool gSpanBlittingFlag = false;
@@ -29,7 +30,7 @@
const Filename *p1 = (const Filename *)a;
const Filename *p2 = (const Filename *)b;
- return stricmp(p1->name, p2->name);
+ return strcasecmp(p1->name, p2->name);
} // end FilenameSortFunction
@@ -44,8 +45,11 @@
{
char strBuf[256];
+ // XXX
+#ifdef WIN32
//void _splitpath( const char *path, char *drive, char *dir, char
*fname, char *ext );
- _splitpath(path, strBuf, NULL, NULL, NULL);
+ _splitpath(path, strBuf, 0, 0, 0);
+#endif
return strBuf;
@@ -57,8 +61,11 @@
{
char strBuf[256];
+ // XXX
+#ifdef WIN32
//void _splitpath( const char *path, char *drive, char *dir, char
*fname, char *ext );
- _splitpath(path, NULL, strBuf, NULL, NULL);
+ _splitpath(path, 0, strBuf, 0, 0);
+#endif
return strBuf;
@@ -70,8 +77,11 @@
{
char strBuf[256];
+ // XXX
+#ifdef WIN32
//void _splitpath( const char *path, char *drive, char *dir, char
*fname, char *ext );
- _splitpath(path, NULL, NULL, strBuf, NULL);
+ _splitpath(path, 0, 0, strBuf, 0);
+#endif
return strBuf;
@@ -83,8 +93,11 @@
{
char strBuf[256];
+ // XXX
+#ifdef WIN32
//void _splitpath( const char *path, char *drive, char *dir, char
*fname, char *ext );
- _splitpath(path, NULL, NULL, NULL, strBuf);
+ _splitpath(path, 0, 0, 0, strBuf);
+#endif
return strBuf;
@@ -96,6 +109,8 @@
//---------------------------------------------------------------------------
DWORD UtilInterface::getFileSize(String filename)
{
+ // XXX
+#ifdef WIN32
struct _finddata_t myFile;
if (_findfirst((const char *) filename, &myFile) == -1)
@@ -104,6 +119,8 @@
}
return myFile.size;
+#endif
+ return 0;
} // end UtilInterface::getFileSize
@@ -113,6 +130,8 @@
//---------------------------------------------------------------------------
DWORD UtilInterface::getNumFilesInDirectory(String path)
{
+ // XXX
+#ifdef WIN32
struct _finddata_t myFile;
long hFile;
@@ -131,6 +150,8 @@
_findclose(hFile);
return numFiles;
+#endif
+ return 0;
} // end UtilInterface::getNumFilesInDirectory
@@ -141,6 +162,8 @@
//---------------------------------------------------------------------------
void UtilInterface::deleteFile(String path)
{
+ // XXX
+#ifdef WIN32
struct _finddata_t myFile;
long hFile;
@@ -151,7 +174,7 @@
{
do
{
- _splitpath(myFile.name, NULL, NULL, strBuf, NULL);
+ _splitpath(myFile.name, 0, 0, strBuf, 0);
remove(strBuf);
@@ -159,6 +182,7 @@
}
_findclose(hFile);
+#endif
} // end UtilInterface::deleteFile
@@ -182,6 +206,6 @@
return;
#endif
- srand((unsigned)time(NULL));
+ srand((unsigned)time(0));
} // end UtilInterface::startRandomNumberGenerator
Index: netpanzer/src/Lib/Interfaces/UtilInterface.hpp
diff -u netpanzer/src/Lib/Interfaces/UtilInterface.hpp:1.1
netpanzer/src/Lib/Interfaces/UtilInterface.hpp:1.2
--- netpanzer/src/Lib/Interfaces/UtilInterface.hpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/Interfaces/UtilInterface.hpp Mon Sep 1 16:24:18 2003
@@ -25,7 +25,7 @@
#endif
-#include "stdafx.hpp"
+
#include "String.hpp"
class Filename
@@ -40,7 +40,7 @@
void setName(const char *name)
{
- if (name == NULL)
+ if (name == 0)
{
return;
}
Index: netpanzer/src/Lib/LibView.cpp
diff -u netpanzer/src/Lib/LibView.cpp:1.1 netpanzer/src/Lib/LibView.cpp:1.2
--- netpanzer/src/Lib/LibView.cpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/LibView.cpp Mon Sep 1 16:24:18 2003
@@ -15,7 +15,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "LibView.hpp"
#include "Desktop.hpp"
#include "ParticleSystem2D.hpp"
@@ -125,7 +125,7 @@
int x = 5;
int y = 135;
- int yOffset = 15;
+ //int yOffset = 15;
switch(displayMode)
{
@@ -288,7 +288,7 @@
void LibView::drawEnvironmentInfo(const Surface &dest, iXY pos)
{
int yOffset = 15;
- int xOffset = 15;
+ //int xOffset = 15;
char strBuf[256];
Index: netpanzer/src/Lib/LibView.hpp
diff -u netpanzer/src/Lib/LibView.hpp:1.1 netpanzer/src/Lib/LibView.hpp:1.2
--- netpanzer/src/Lib/LibView.hpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/LibView.hpp Mon Sep 1 16:24:18 2003
@@ -23,7 +23,6 @@
#pragma once
#endif
-
#include "GameTemplateView.hpp"
#include "Surface.hpp"
#include "CheckBox.hpp"
Index: netpanzer/src/Lib/List.hpp
diff -u netpanzer/src/Lib/List.hpp:1.1 netpanzer/src/Lib/List.hpp:1.2
--- netpanzer/src/Lib/List.hpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/List.hpp Mon Sep 1 16:24:18 2003
@@ -29,13 +29,13 @@
ListNode *next;
ListNode *prev;
- ListNode(T item, ListNode<T> *next = NULL)
+ ListNode(T item, ListNode<T> *next = 0)
{
ListNode::item = item;
ListNode::next = next;
- ListNode::prev = NULL;
+ ListNode::prev = 0;
- if (ListNode::next != NULL)
+ if (ListNode::next != 0)
{
ListNode::next->prev = this;
}
@@ -60,7 +60,7 @@
template <class T>
List<T>::List()
{
- head = NULL;
+ head = 0;
numItems = 0;
}
@@ -98,7 +98,7 @@
numItems--;
return item;
}
- return NULL;
+ return 0;
}
template <class T>
@@ -113,16 +113,16 @@
numItems--;
return item;
}
- return NULL;
+ return 0;
}
{
- if (string != NULL)
+ if (string != 0)
{
::free(string);
}
- if (prev != NULL) prev->next = next;
- if (next != NULL) next->prev = prev;
+ if (prev != 0) prev->next = next;
+ if (next != 0) next->prev = prev;
prev = next = this;
}
@@ -131,7 +131,7 @@
T List<T>::getItem(int index)
{
if (index < 0 || index >= numItems)
- return NULL;
+ return 0;
ListNode<T> *node = head;
int count = 0;
Index: netpanzer/src/Lib/Math.cpp
diff -u netpanzer/src/Lib/Math.cpp:1.1 netpanzer/src/Lib/Math.cpp:1.2
--- netpanzer/src/Lib/Math.cpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/Math.cpp Mon Sep 1 16:24:18 2003
@@ -15,7 +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 "stdafx.hpp"
+
+#include <assert.h>
#include "Math.hpp"
Index: netpanzer/src/Lib/Math.hpp
diff -u netpanzer/src/Lib/Math.hpp:1.1 netpanzer/src/Lib/Math.hpp:1.2
--- netpanzer/src/Lib/Math.hpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/Math.hpp Mon Sep 1 16:24:18 2003
@@ -18,20 +18,18 @@
#ifndef __Math_hpp__
#define __Math_hpp__
+#include <math.h>
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
-#include "stdafx.hpp"
#include "fXY.hpp"
#include "iXY.hpp"
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
-const double PI_DIV_2 = 3.14159265358979323846 / 2.0;
-static double deg2RadConversion = PI / 180.0;
-static double rad2DegConversion = 180.0 / PI;
+const double PI_DIV_2 = M_PI / 2.0;
+const double deg2RadConversion = M_PI / 180.0;
+const double rad2DegConversion = 180.0 / M_PI;
//--------------------------------------------------------------------------
class Math
Index: netpanzer/src/Lib/PObject/Classes/Angle.cpp
diff -u netpanzer/src/Lib/PObject/Classes/Angle.cpp:1.1
netpanzer/src/Lib/PObject/Classes/Angle.cpp:1.2
--- netpanzer/src/Lib/PObject/Classes/Angle.cpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/PObject/Classes/Angle.cpp Mon Sep 1 16:24:18 2003
@@ -15,7 +15,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "Angle.hpp"
double Angle::deg_const = 57.2957795132;
Index: netpanzer/src/Lib/PObject/Classes/BitArray.cpp
diff -u netpanzer/src/Lib/PObject/Classes/BitArray.cpp:1.1
netpanzer/src/Lib/PObject/Classes/BitArray.cpp:1.2
--- netpanzer/src/Lib/PObject/Classes/BitArray.cpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/PObject/Classes/BitArray.cpp Mon Sep 1 16:24:18 2003
@@ -15,23 +15,25 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
+#include <assert.h>
+#include <string.h>
#include "BitArray.hpp"
BitArray::BitArray( void )
{
- array = NULL;
+ array = 0;
}
//************************************************************************
BitArray::~BitArray( void )
{
- if ( array != NULL )
+ if ( array != 0 )
{
- delete [size] array;
- array = NULL;
+ delete [] array;
+ array = 0;
}
}
@@ -54,14 +56,14 @@
if ( remain )
rawsize = rawsize + 1;
- if ( array != NULL )
+ if ( array != 0 )
{
- delete [size] array;
- array = NULL;
+ delete [] array;
+ array = 0;
}
array = new unsigned char [ rawsize ];
- assert( array != NULL );
+ assert( array != 0 );
x_size = x;
y_size = y;
@@ -74,10 +76,10 @@
void BitArray::deallocate( void )
{
- if ( array != NULL )
+ if ( array != 0 )
{
- delete [ size ] array;
- array = NULL;
+ delete [] array;
+ array = 0;
}
}
@@ -126,7 +128,7 @@
}
//************************************************************************
-boolean BitArray::getBit( unsigned long x, unsigned long y )
+bool BitArray::getBit( unsigned long x, unsigned long y )
{
unsigned long index;
unsigned char shift;
@@ -141,8 +143,8 @@
value = array[index] & mask;
if ( value )
- return( _TRUE );
+ return( true );
- return( _FALSE );
+ return( false );
}
Index: netpanzer/src/Lib/PObject/Classes/BitArray.hpp
diff -u netpanzer/src/Lib/PObject/Classes/BitArray.hpp:1.1
netpanzer/src/Lib/PObject/Classes/BitArray.hpp:1.2
--- netpanzer/src/Lib/PObject/Classes/BitArray.hpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/PObject/Classes/BitArray.hpp Mon Sep 1 16:24:18 2003
@@ -18,8 +18,6 @@
#ifndef _BITARRAY_HPP
#define _BITARRAY_HPP
-#include "aliasdef.h"
-
#include <stdlib.h>
#include "PObject.hpp"
@@ -52,7 +50,7 @@
void clearBit( unsigned long x, unsigned long y );
- boolean getBit( unsigned long x, unsigned long y );
+ bool getBit( unsigned long x, unsigned long y );
};
Index: netpanzer/src/Lib/PObject/Classes/BoundBox.cpp
diff -u netpanzer/src/Lib/PObject/Classes/BoundBox.cpp:1.1
netpanzer/src/Lib/PObject/Classes/BoundBox.cpp:1.2
--- netpanzer/src/Lib/PObject/Classes/BoundBox.cpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/PObject/Classes/BoundBox.cpp Mon Sep 1 16:24:18 2003
@@ -15,10 +15,10 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "BoundBox.hpp"
-boolean BoundBox::bounds( PointXYi ¢er, PointXYi &test )
+bool BoundBox::bounds( PointXYi ¢er, PointXYi &test )
{
PointXYi new_max( center + max );
PointXYi new_min( center + min );
@@ -28,7 +28,7 @@
);
}
-void BoundBox::setBounds( PointXYi &nMin, PointXYi &nMax )
+void BoundBox::setBounds(const PointXYi &nMin, const PointXYi &nMax )
{
min = PointXYi(nMin);
max = PointXYi(nMax);
Index: netpanzer/src/Lib/PObject/Classes/BoundBox.hpp
diff -u netpanzer/src/Lib/PObject/Classes/BoundBox.hpp:1.1
netpanzer/src/Lib/PObject/Classes/BoundBox.hpp:1.2
--- netpanzer/src/Lib/PObject/Classes/BoundBox.hpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/PObject/Classes/BoundBox.hpp Mon Sep 1 16:24:18 2003
@@ -44,15 +44,15 @@
assert( min.x <= 0 && min.y <= 0 && max.x >= 0 && max.y >= 0 );
}
- boolean bounds( PointXYi ¢er, PointXYi &test );
+ bool bounds( PointXYi ¢er, PointXYi &test );
- void setBounds( PointXYi &nMin, PointXYi &nMax );
+ void setBounds(const PointXYi &nMin, const PointXYi &nMax );
inline Recti getAbsRect( PointXYi ¢er )
- {
+ {
return( Recti( center + min, center + max ) );
- }
+ }
- };
+};
#endif
Index: netpanzer/src/Lib/PObject/Classes/BresenhamLine.cpp
diff -u netpanzer/src/Lib/PObject/Classes/BresenhamLine.cpp:1.1
netpanzer/src/Lib/PObject/Classes/BresenhamLine.cpp:1.2
--- netpanzer/src/Lib/PObject/Classes/BresenhamLine.cpp:1.1 Sun Dec 1
12:51:40 2002
+++ netpanzer/src/Lib/PObject/Classes/BresenhamLine.cpp Mon Sep 1 16:24:18 2003
@@ -15,7 +15,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "BresenhamLine.hpp"
void BresenhamLine::set_path( PointXYi &start, PointXYi &end )
@@ -102,7 +102,7 @@
short BresenhamLine::increment( PointXYi *update, short times )
{
- while ( (times != 0) && (finished == _FALSE) )
+ while ( (times != 0) && (finished == false) )
{
switch(Octant)
{
Index: netpanzer/src/Lib/PObject/Classes/FileList.cpp
diff -u netpanzer/src/Lib/PObject/Classes/FileList.cpp:1.1
netpanzer/src/Lib/PObject/Classes/FileList.cpp:1.2
--- netpanzer/src/Lib/PObject/Classes/FileList.cpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/PObject/Classes/FileList.cpp Mon Sep 1 16:24:18 2003
@@ -15,92 +15,108 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "FileList.hpp"
+#include <string.h>
#include <stdlib.h>
FileList::FileList() : ArrayTemplate< char * >()
- {
+{
contains = 0;
- }
+}
FileList::FileList( unsigned long size ) : ArrayTemplate< char * >( )
- {
+{
initialize( size );
- }
+}
void FileList::initialize( unsigned long size )
- {
+{
contains = 0;
ArrayTemplate< char * >::initialize( size );
for ( unsigned long i = 0; i < size; i++ )
- {
+ {
array[i] = new char[_FILESTRING_SIZE];
- }
- }
+ }
+}
FileList::~FileList()
- {
+{
for ( unsigned long i = 0; i < size; i++ )
{
- delete [_FILESTRING_SIZE] (array[i]);
+ delete[] (array[i]);
}
- }
+}
void FileList::addString( char *string )
- {
+{
strcpy( array[contains], string );
contains++;
- }
+}
char * FileList::getString( unsigned long index )
- {
+{
return( array[ index ] );
- }
+}
void FileList::resetList( void )
- {
+{
contains = 0;
- }
+}
unsigned long FileList::containsItems( void )
- {
+{
return( contains );
- }
+}
void FileList::getFullPath( unsigned long index, char *full_path )
- {
+{
strcpy( full_path, array[ index ] );
- }
+}
void FileList::getDrive( unsigned long index, char *drive )
- {
- _splitpath( array[ index ], drive, NULL, NULL, NULL );
- }
+{
+ // XXX
+#ifdef WIN32
+ _splitpath( array[ index ], drive, 0, 0, 0 );
+#endif
+}
void FileList::getDir( unsigned long index, char *directory )
- {
- _splitpath( array[ index ], NULL, directory, NULL, NULL );
- }
+{
+ // XXX
+#ifdef WIN32
+ _splitpath( array[ index ], 0, directory, 0, 0 );
+#endif
+}
void FileList::getFullFilename( unsigned long index, char *full_fname )
- {
+{
char ext[256];
-
- _splitpath( array[ index ], NULL, NULL, full_fname, NULL );
- _splitpath( array[ index ], NULL, NULL, NULL, ext );
+
+ // XXX
+#ifdef WIN32
+ _splitpath( array[ index ], 0, 0, full_fname, 0 );
+ _splitpath( array[ index ], 0, 0, 0, ext );
+#endif
strcat( full_fname, ext );
- }
+}
void FileList::getFilename( unsigned long index, char *fname )
- {
- _splitpath( array[ index ], NULL, NULL, fname, NULL );
- }
+{
+ // XXX
+#ifdef WIN32
+ _splitpath( array[ index ], 0, 0, fname, 0 );
+#endif
+}
void FileList::getExtension( unsigned long index, char *extension )
- {
- _splitpath( array[ index ], NULL, NULL, NULL, extension );
- }
+{
+ // XXX
+#ifdef WIN32
+ _splitpath( array[ index ], 0, 0, 0, extension );
+#endif
+}
Index: netpanzer/src/Lib/PObject/Classes/PArray.cpp
diff -u netpanzer/src/Lib/PObject/Classes/PArray.cpp:1.1
netpanzer/src/Lib/PObject/Classes/PArray.cpp:1.2
--- netpanzer/src/Lib/PObject/Classes/PArray.cpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/PObject/Classes/PArray.cpp Mon Sep 1 16:24:18 2003
@@ -15,15 +15,15 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "PArray.hpp"
-#include <Stdlib.h>
+#include <stdlib.h>
PArray::PArray( unsigned long size )
{
PArray::size = size;
array = new PObject * [ size ];
- assert( array != NULL );
+ assert( array != 0 );
}
PArray::~PArray( void )
@@ -35,13 +35,13 @@
{
PArray::size = size;
- if( array != NULL )
+ if( array != 0 )
{
delete( array );
- array = NULL;
+ array = 0;
}
array = new PObject * [ size ];
- assert( array != NULL );
+ assert( array != 0 );
}
void PArray::sort( unsigned long sort_size, int (* compare)(const void
*elem1,const void *elem2 ) )
Index: netpanzer/src/Lib/PObject/Classes/PArray.hpp
diff -u netpanzer/src/Lib/PObject/Classes/PArray.hpp:1.1
netpanzer/src/Lib/PObject/Classes/PArray.hpp:1.2
--- netpanzer/src/Lib/PObject/Classes/PArray.hpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/PObject/Classes/PArray.hpp Mon Sep 1 16:24:18 2003
@@ -15,29 +15,29 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef _PARRAY_HPP
-#define _PARRAY_HPP
-
-#include "aliasdef.h"
+#ifndef __PARRAY_HPP__
+#define __PARRAY_HPP__
+#include <assert.h>
#include <stdlib.h>
-#include "Pobject.hpp"
+#include "PObject.hpp"
class PArray : public PObject
- {
- protected:
- unsigned long size;
- PObject **array;
+{
+protected:
+ PObject **array;
+ unsigned long size;
- public:
-
- PArray() { array = NULL; }
- PArray( unsigned long size );
- ~PArray( void );
+public:
+ PArray()
+ : array(0), size(0)
+ { }
+ PArray(unsigned long size);
+ ~PArray();
- void initialize( unsigned long size );
+ void initialize( unsigned long size );
- void sort( unsigned long sort_size, int (* compare)(const void *elem1,const
void *elem2 ) );
+ void sort( unsigned long sort_size, int (* compare)(const void
*elem1,const void *elem2 ) );
inline PObject * operator[]( unsigned long index)
{
@@ -58,10 +58,10 @@
inline void deallocate( void )
{
- if ( array != NULL )
+ if ( array != 0 )
{
delete( array );
- array = NULL;
+ array = 0;
}
size = 0;
@@ -69,4 +69,4 @@
};
-#endif
+#endif // #ifndef __PARRAY_HPP__
Index: netpanzer/src/Lib/PObject/Classes/PArrayGrowable.cpp
diff -u netpanzer/src/Lib/PObject/Classes/PArrayGrowable.cpp:1.1
netpanzer/src/Lib/PObject/Classes/PArrayGrowable.cpp:1.2
--- netpanzer/src/Lib/PObject/Classes/PArrayGrowable.cpp:1.1 Sun Dec 1
12:51:40 2002
+++ netpanzer/src/Lib/PObject/Classes/PArrayGrowable.cpp Mon Sep 1
16:24:18 2003
@@ -15,15 +15,16 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "PArrayGrowable.hpp"
+#include <assert.h>
#include <stdlib.h>
#include <malloc.h>
#include <string.h>
PArrayGrowable::PArrayGrowable()
{
- array = NULL;
+ array = 0;
size = 0;
grow_increment = 1;
grow_limit = 0xFFFFFFFF;
@@ -57,15 +58,15 @@
assert( (size > 0) && (growIncrement > 0) );
- if ( array != NULL )
+ if ( array != 0 )
{
free( array );
- array = NULL;
+ array = 0;
}
array = (PObject * *) malloc( sizeof(PObject *) * size );
- assert( array != NULL );
+ assert( array != 0 );
}
PArrayGrowable::~PArrayGrowable( void )
@@ -84,7 +85,7 @@
array = (PObject * *) realloc( array, sizeof(PObject *) * new_size );
memset( &array[ size ], 0, sizeof(PObject *) * (new_size - size) );
size = new_size;
- assert( array != NULL );
+ assert( array != 0 );
}
else
assert( 0 );
@@ -104,7 +105,7 @@
array = (PObject * *) realloc( array, sizeof(PObject *) * new_size );
memset( &array[ size ], 0, sizeof(PObject *) * (new_size - size) );
size = new_size;
- assert( array != NULL );
+ assert( array != 0 );
}
else
assert( 0 );
@@ -117,7 +118,7 @@
{
array = (PObject * *) realloc( array, sizeof(PObject *) * size );
PArrayGrowable::size = size;
- assert( array != NULL );
+ assert( array != 0 );
}
void PArrayGrowable::setGrowLimit( unsigned long limit )
Index: netpanzer/src/Lib/PObject/Classes/PArrayGrowable.hpp
diff -u netpanzer/src/Lib/PObject/Classes/PArrayGrowable.hpp:1.1
netpanzer/src/Lib/PObject/Classes/PArrayGrowable.hpp:1.2
--- netpanzer/src/Lib/PObject/Classes/PArrayGrowable.hpp:1.1 Sun Dec 1
12:51:40 2002
+++ netpanzer/src/Lib/PObject/Classes/PArrayGrowable.hpp Mon Sep 1
16:24:18 2003
@@ -18,8 +18,7 @@
#ifndef _PARRAYGROWABLE_HPP
#define _PARRAYGROWABLE_HPP
-#include "aliasdef.h"
-#include "Pobject.hpp"
+#include "PObject.hpp"
#include "stdlib.h"
class PArrayGrowable : public PObject
@@ -65,10 +64,10 @@
inline void deallocate( void )
{
- if ( array != NULL )
+ if ( array != 0 )
{
free( array );
- array = NULL;
+ array = 0;
}
size = 0;
Index: netpanzer/src/Lib/PObject/Classes/PHeap.cpp
diff -u netpanzer/src/Lib/PObject/Classes/PHeap.cpp:1.1
netpanzer/src/Lib/PObject/Classes/PHeap.cpp:1.2
--- netpanzer/src/Lib/PObject/Classes/PHeap.cpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/PObject/Classes/PHeap.cpp Mon Sep 1 16:24:18 2003
@@ -15,7 +15,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "PHeap.hpp"
PHeap::PHeap( unsigned long heap_size )
Index: netpanzer/src/Lib/PObject/Classes/PHeap.hpp
diff -u netpanzer/src/Lib/PObject/Classes/PHeap.hpp:1.1
netpanzer/src/Lib/PObject/Classes/PHeap.hpp:1.2
--- netpanzer/src/Lib/PObject/Classes/PHeap.hpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/PObject/Classes/PHeap.hpp Mon Sep 1 16:24:18 2003
@@ -18,7 +18,6 @@
#ifndef _PHEAP_HPP
#define _PHEAP_HPP
-#include "aliasdef.h"
#include "PArrayGrowable.hpp"
class PHeap : public PArrayGrowable
Index: netpanzer/src/Lib/PObject/Classes/PObject.cpp
diff -u netpanzer/src/Lib/PObject/Classes/PObject.cpp:1.1
netpanzer/src/Lib/PObject/Classes/PObject.cpp:1.2
--- netpanzer/src/Lib/PObject/Classes/PObject.cpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/PObject/Classes/PObject.cpp Mon Sep 1 16:24:18 2003
@@ -15,18 +15,18 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "PObject.hpp"
- boolean PObject::is_equal( PObject *object )
- {
- if ( this == object )
- return ( _TRUE );
+bool PObject::is_equal( PObject *object ) const
+{
+ if ( this == object )
+ return ( true );
- return( _FALSE );
- }
+ return( false );
+}
- PObject::PObject( void )
- {
- }
+PObject::PObject()
+{
+}
Index: netpanzer/src/Lib/PObject/Classes/PObject.hpp
diff -u netpanzer/src/Lib/PObject/Classes/PObject.hpp:1.1
netpanzer/src/Lib/PObject/Classes/PObject.hpp:1.2
--- netpanzer/src/Lib/PObject/Classes/PObject.hpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/PObject/Classes/PObject.hpp Mon Sep 1 16:24:18 2003
@@ -18,14 +18,13 @@
#ifndef _POBJECT_HPP
#define _POBJECT_HPP
-#include "aliasdef.h"
-
class PObject
- {
- public:
- boolean is_equal( PObject *object );
+{
+public:
+ bool is_equal(PObject *object) const;
+
+ PObject();
+};
- PObject( void );
- };
+#endif
- #endif
Index: netpanzer/src/Lib/PObject/Classes/PPriorityQueue.cpp
diff -u netpanzer/src/Lib/PObject/Classes/PPriorityQueue.cpp:1.1
netpanzer/src/Lib/PObject/Classes/PPriorityQueue.cpp:1.2
--- netpanzer/src/Lib/PObject/Classes/PPriorityQueue.cpp:1.1 Sun Dec 1
12:51:40 2002
+++ netpanzer/src/Lib/PObject/Classes/PPriorityQueue.cpp Mon Sep 1
16:24:18 2003
@@ -15,7 +15,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "PPriorityQueue.hpp"
Index: netpanzer/src/Lib/PObject/Classes/PPriorityQueue.hpp
diff -u netpanzer/src/Lib/PObject/Classes/PPriorityQueue.hpp:1.1
netpanzer/src/Lib/PObject/Classes/PPriorityQueue.hpp:1.2
--- netpanzer/src/Lib/PObject/Classes/PPriorityQueue.hpp:1.1 Sun Dec 1
12:51:40 2002
+++ netpanzer/src/Lib/PObject/Classes/PPriorityQueue.hpp Mon Sep 1
16:24:18 2003
@@ -18,7 +18,6 @@
#ifndef _PPRIORITYQUEUE_HPP
#define _PPRIORITYQUEUE_HPP
-#include "aliasdef.h"
#include <stdlib.h>
#include "PHeap.hpp"
@@ -40,14 +39,14 @@
inline PObject * pop( void )
{
PObject *object;
- if ( array[ root ] == NULL )
+ if ( array[ root ] == 0 )
{
- return( NULL );
+ return( 0 );
}
else
{
object = array[ root ];
- array[ root ] = NULL;
+ array[ root ] = 0;
array[ root ] = array[ last ];
last--;
shiftDown();
Index: netpanzer/src/Lib/PObject/Classes/PQueue.cpp
diff -u netpanzer/src/Lib/PObject/Classes/PQueue.cpp:1.1
netpanzer/src/Lib/PObject/Classes/PQueue.cpp:1.2
--- netpanzer/src/Lib/PObject/Classes/PQueue.cpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/PObject/Classes/PQueue.cpp Mon Sep 1 16:24:18 2003
@@ -15,7 +15,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "PQueue.hpp"
PQueue::PQueue( unsigned long size )
Index: netpanzer/src/Lib/PObject/Classes/PQueue.hpp
diff -u netpanzer/src/Lib/PObject/Classes/PQueue.hpp:1.1
netpanzer/src/Lib/PObject/Classes/PQueue.hpp:1.2
--- netpanzer/src/Lib/PObject/Classes/PQueue.hpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/PObject/Classes/PQueue.hpp Mon Sep 1 16:24:18 2003
@@ -44,7 +44,7 @@
inline PObject * dequeue( void )
{
if ( front == rear )
- { return ( NULL ); }
+ { return ( 0 ); }
else
{
front = ( front + 1 ) % size;
@@ -53,20 +53,20 @@
}
- inline boolean isEmpty( void )
+ inline bool isEmpty( void )
{
if( front == rear )
- return ( _TRUE );
+ return ( true );
- return( _FALSE );
+ return( false );
}
- inline boolean isReady( void )
+ inline bool isReady( void )
{
if( front == rear )
- return ( _FALSE );
+ return ( false );
- return( _TRUE );
+ return( true );
}
Index: netpanzer/src/Lib/PObject/Classes/Point.cpp
diff -u netpanzer/src/Lib/PObject/Classes/Point.cpp:1.1
netpanzer/src/Lib/PObject/Classes/Point.cpp:1.2
--- netpanzer/src/Lib/PObject/Classes/Point.cpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/PObject/Classes/Point.cpp Mon Sep 1 16:24:18 2003
@@ -15,5 +15,5 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
-#include "point.hpp"
+
+#include "Point.hpp"
Index: netpanzer/src/Lib/PObject/Classes/Point.hpp
diff -u netpanzer/src/Lib/PObject/Classes/Point.hpp:1.1
netpanzer/src/Lib/PObject/Classes/Point.hpp:1.2
--- netpanzer/src/Lib/PObject/Classes/Point.hpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/PObject/Classes/Point.hpp Mon Sep 1 16:24:18 2003
@@ -72,12 +72,12 @@
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 boolean operator ==(const PointXYi &a) const
+ inline bool operator ==(const PointXYi &a) const
{
return x == a.x && y == a.y;
}
- inline boolean operator !=(const PointXYi &a) const
+ inline bool operator !=(const PointXYi &a) const
{
return x != a.x || y != a.y;
}
@@ -119,7 +119,7 @@
}
- inline boolean isEmpty() const
+ inline bool isEmpty() const
{
return min.x > max.x || min.y > max.x;
}
@@ -153,26 +153,26 @@
);
}
- inline boolean contains(const PointXYi &a) const
+ 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 boolean intersects(const Recti &a) const
+ inline bool intersects(const Recti &a) const
{
//Write me!
//assert(0);
return a.contains(a.min);
}
- inline boolean operator ==(const Recti &a)
+ inline bool operator ==(const Recti &a)
{
return min == a.min && max == a.max;
}
- inline boolean operator !=(const Recti &a)
+ inline bool operator !=(const Recti &a)
{
return min != a.min || max != a.max;
}
Index: netpanzer/src/Lib/PObject/Classes/SafePointer.hpp
diff -u netpanzer/src/Lib/PObject/Classes/SafePointer.hpp:1.1
netpanzer/src/Lib/PObject/Classes/SafePointer.hpp:1.2
--- netpanzer/src/Lib/PObject/Classes/SafePointer.hpp:1.1 Sun Dec 1
12:51:40 2002
+++ netpanzer/src/Lib/PObject/Classes/SafePointer.hpp Mon Sep 1 16:24:18 2003
@@ -26,42 +26,42 @@
class SafePointer : public PObject
{
public:
- boolean valid;
+ bool valid;
PObject *object_ptr;
SafePointer()
{
- valid = _FALSE;
- object_ptr = NULL;
+ valid = false;
+ object_ptr = 0;
}
SafePointer( PObject *object )
{
object_ptr = object;
- valid = _TRUE;
+ valid = true;
}
- inline boolean isValid( void )
+ inline bool isValid( void )
{
return ( valid );
}
inline void destroy( void )
{
- if( valid == _TRUE )
+ if( valid == true )
{
delete( object_ptr );
- object_ptr = NULL;
+ object_ptr = 0;
}
- valid = _FALSE;
+ valid = false;
}
inline void assign( PObject *object )
{
object_ptr = object;
- valid = _TRUE;
+ valid = true;
}
inline void operator=( SafePointer &pointer )
@@ -72,7 +72,7 @@
inline PObject * operator->()
{
- assert( valid == _TRUE );
+ assert( valid == true );
return( object_ptr );
}
};
@@ -83,41 +83,41 @@
class SafePointerTemplate : public PObject
{
public:
- boolean valid;
+ bool valid;
TYPE *object_ptr;
SafePointerTemplate()
{
- valid = _FALSE;
- object_ptr = NULL;
+ valid = false;
+ object_ptr = 0;
}
SafePointerTemplate( TYPE *object )
{
object_ptr = object;
- valid = _TRUE;
+ valid = true;
}
- inline boolean isValid( void )
+ inline bool isValid( void )
{
return ( valid );
}
inline void destroy( void )
{
- if( valid == _TRUE )
+ if( valid == true )
{
delete( object_ptr );
- object_ptr = NULL;
+ object_ptr = 0;
}
- valid = _FALSE;
+ valid = false;
}
inline void assign( TYPE *object )
{
object_ptr = object;
- valid = _TRUE;
+ valid = true;
}
inline void operator=( SafePointerTemplate &pointer )
@@ -128,7 +128,7 @@
inline TYPE * operator->()
{
- assert( valid == _TRUE );
+ assert( valid == true );
return( object_ptr );
}
};
Index: netpanzer/src/Lib/PObject/Classes/Timer.cpp
diff -u netpanzer/src/Lib/PObject/Classes/Timer.cpp:1.1
netpanzer/src/Lib/PObject/Classes/Timer.cpp:1.2
--- netpanzer/src/Lib/PObject/Classes/Timer.cpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/PObject/Classes/Timer.cpp Mon Sep 1 16:24:18 2003
@@ -15,5 +15,5 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "Timer.hpp"
Index: netpanzer/src/Lib/PObject/Classes/Timer.hpp
diff -u netpanzer/src/Lib/PObject/Classes/Timer.hpp:1.1
netpanzer/src/Lib/PObject/Classes/Timer.hpp:1.2
--- netpanzer/src/Lib/PObject/Classes/Timer.hpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/PObject/Classes/Timer.hpp Mon Sep 1 16:24:18 2003
@@ -18,90 +18,87 @@
#ifndef _TIMER_HPP
#define _TIMER_HPP
-#include "aliasdef.h"
#include "PObject.hpp"
#include "cTimeStamp.hpp"
#include "TimerInterface.hpp"
class Timer : public PObject
- {
- protected:
- float period;
- TIMESTAMP last_count;
-
- public:
-
- Timer() { }
-
- Timer( float rate )
- {
- period = 1/rate;
- }
+{
+protected:
+ float period;
+ TIMESTAMP last_count;
+
+public:
+ Timer() { }
+
+ Timer( float rate )
+ {
+ period = 1/rate;
+ }
- inline void changeRate( float rate )
- {
- period = 1/rate;
- last_count = now();
- }
-
- inline void changePeriod( float period )
- {
- Timer::period = period;
- last_count = now();
- }
-
- inline void reset( void )
- {
- last_count = now();
- }
-
- inline void zero( void )
- {
- last_count = now() - period;
- }
-
- inline boolean count( void )
- {
- float difference;
+ inline void changeRate( float rate )
+ {
+ period = 1/rate;
+ last_count = now();
+ }
+
+ inline void changePeriod( float period )
+ {
+ Timer::period = period;
+ last_count = now();
+ }
+
+ inline void reset( void )
+ {
+ last_count = now();
+ }
+
+ inline void zero( void )
+ {
+ last_count = now() - period;
+ }
+
+ inline bool count( void )
+ {
+ float difference;
float remainder;
difference = now() - last_count;
if ( difference >= period )
- {
- remainder = difference - period;
-
- if ( remainder >= period )
- remainder = 0;
+ {
+ remainder = difference - period;
+
+ if ( remainder >= period )
+ remainder = 0;
- last_count = now() - remainder;
+ last_count = now() - remainder;
- return( _TRUE );
- }
- return( _FALSE );
- }
+ return true;
+ }
+ return false;
+ }
- inline float getPeriod( void )
- {
- return( period );
- }
-
- inline float getRate( void )
- {
- return( 1/period );
- }
-
- inline float getTime( void )
- {
- return( (float) (now() - last_count) );
- }
-
- inline float getTimeLeft( void )
- {
- return( (float) ( period - (now() - last_count) ) );
- }
- };
-
+ inline float getPeriod() const
+ {
+ return period;
+ }
+
+ inline float getRate() const
+ {
+ return 1/period;
+ }
+
+ inline float getTime() const
+ {
+ return( (float) (now() - last_count) );
+ }
+
+ inline float getTimeLeft() const
+ {
+ return( (float) ( period - (now() - last_count) ) );
+ }
+};
class TimerFrameBase : public PObject
{
@@ -140,7 +137,7 @@
last_count = TimerInterface::getFrameStartTime() - period;
}
- inline boolean count( void )
+ inline bool count( void )
{
float difference;
float remainder;
@@ -156,9 +153,9 @@
last_count = TimerInterface::getFrameStartTime() - remainder;
- return( _TRUE );
+ return( true );
}
- return( _FALSE );
+ return( false );
}
inline float getPeriod( void )
Index: netpanzer/src/Lib/PObject/Templates/ArrayGrowableTemplate.hpp
diff -u netpanzer/src/Lib/PObject/Templates/ArrayGrowableTemplate.hpp:1.1
netpanzer/src/Lib/PObject/Templates/ArrayGrowableTemplate.hpp:1.2
--- netpanzer/src/Lib/PObject/Templates/ArrayGrowableTemplate.hpp:1.1 Sun Dec
1 12:51:40 2002
+++ netpanzer/src/Lib/PObject/Templates/ArrayGrowableTemplate.hpp Mon Sep
1 16:24:18 2003
@@ -19,6 +19,7 @@
#define _ARRAYGROWABLETEMPLATE_HPP
#include "PObject.hpp"
+#include <assert.h>
#include <stdlib.h>
@@ -64,10 +65,10 @@
inline void deallocate( void )
{
- if ( array != NULL )
+ if ( array != 0 )
{
free( array );
- array = NULL;
+ array = 0;
}
size = 0;
@@ -78,7 +79,7 @@
template< class TYPE >
ArrayGrowableTemplate< TYPE >::ArrayGrowableTemplate()
{
- array = NULL;
+ array = 0;
size = 0;
grow_increment = 1;
grow_limit = 0xFFFFFFFF;
@@ -121,15 +122,15 @@
assert( (size > 0) && (growIncrement > 0) );
- if ( array != NULL )
+ if ( array != 0 )
{
free( array );
- array = NULL;
+ array = 0;
}
array = (TYPE *) malloc( sizeof(TYPE) * size );
- assert( array != NULL );
+ assert( array != 0 );
}
template< class TYPE >
@@ -150,7 +151,7 @@
array = (TYPE *) realloc( array, sizeof(TYPE) * new_size );
memset( &array[ size ], 0, sizeof(TYPE) * (new_size - size) );
size = new_size;
- assert( array != NULL );
+ assert( array != 0 );
}
else
assert( 0 );
@@ -171,7 +172,7 @@
array = (TYPE *) realloc( array, sizeof(TYPE) * new_size );
memset( &array[ size ], 0, sizeof(TYPE) * (new_size - size) );
size = new_size;
- assert( array != NULL );
+ assert( array != 0 );
}
else
return;
@@ -184,7 +185,7 @@
void ArrayGrowableTemplate< TYPE >::resize( unsigned long size )
{
array = (TYPE *) realloc( array, sizeof(TYPE) * size );
- assert( array != NULL );
+ assert( array != 0 );
}
template< class TYPE >
Index: netpanzer/src/Lib/PObject/Templates/ArrayTemplate.hpp
diff -u netpanzer/src/Lib/PObject/Templates/ArrayTemplate.hpp:1.1
netpanzer/src/Lib/PObject/Templates/ArrayTemplate.hpp:1.2
--- netpanzer/src/Lib/PObject/Templates/ArrayTemplate.hpp:1.1 Sun Dec 1
12:51:40 2002
+++ netpanzer/src/Lib/PObject/Templates/ArrayTemplate.hpp Mon Sep 1
16:24:18 2003
@@ -18,10 +18,9 @@
#ifndef _ARRAYTEMPLATE_HPP
#define _ARRAYTEMPLATE_HPP
-#include "aliasdef.h"
-
+#include <assert.h>
#include <stdlib.h>
-#include "Pobject.hpp"
+#include "PObject.hpp"
template< class TYPE >
class ArrayTemplate : public PObject
@@ -35,7 +34,7 @@
ArrayTemplate()
{
size = 0;
- array = NULL;
+ array = 0;
}
ArrayTemplate( unsigned long size );
@@ -62,10 +61,10 @@
inline void deallocate( void )
{
- if ( array != NULL )
+ if ( array != 0 )
{
delete [size] array;
- array = NULL;
+ array = 0;
}
size = 0;
@@ -80,13 +79,13 @@
{
ArrayTemplate< TYPE >::size = size;
array = new TYPE [ size ];
- assert( array != NULL );
+ assert( array != 0 );
}
template< class TYPE >
ArrayTemplate< TYPE >::~ArrayTemplate( void )
{
- if ( array != NULL )
+ if ( array != 0 )
delete [size] array;
}
@@ -95,14 +94,14 @@
{
ArrayTemplate< TYPE >::size = size;
- if ( array != NULL )
+ if ( array != 0 )
{
delete [size] array ;
- array = NULL;
+ array = 0;
}
array = new TYPE [ size ];
- assert( array != NULL );
+ assert( array != 0 );
}
Index: netpanzer/src/Lib/PObject/Templates/BucketArrayTemplate.hpp
diff -u netpanzer/src/Lib/PObject/Templates/BucketArrayTemplate.hpp:1.1
netpanzer/src/Lib/PObject/Templates/BucketArrayTemplate.hpp:1.2
--- netpanzer/src/Lib/PObject/Templates/BucketArrayTemplate.hpp:1.1 Sun Dec
1 12:51:40 2002
+++ netpanzer/src/Lib/PObject/Templates/BucketArrayTemplate.hpp Mon Sep 1
16:24:18 2003
@@ -18,8 +18,8 @@
#ifndef _BUCKETARRAYTEMPLATE_HPP
#define _BUCKETARRAYTEMPLATE_HPP
-
-#include "Pobject.hpp"
+#include <assert.h>
+#include "PObject.hpp"
#include "LinkListDoubleTemplate.hpp"
@@ -90,7 +90,7 @@
template< class TYPE >
BucketArrayTemplate< TYPE >::BucketArrayTemplate( )
{
- array = NULL;
+ array = 0;
size = 0;
row_size = 0;
column_size = 0;
@@ -106,7 +106,7 @@
template< class TYPE >
BucketArrayTemplate< TYPE >::BucketArrayTemplate( unsigned long size )
{
- array = NULL;
+ array = 0;
size = 0;
row_size = 0;
column_size = 0;
@@ -116,7 +116,7 @@
template< class TYPE >
BucketArrayTemplate< TYPE >::BucketArrayTemplate( unsigned long rows, unsigned
long columns )
{
- array = NULL;
+ array = 0;
size = 0;
row_size = 0;
column_size = 0;
@@ -126,20 +126,20 @@
template< class TYPE >
void BucketArrayTemplate< TYPE >::initialize( unsigned long size )
{
- if ( array != NULL )
+ if ( array != 0 )
{ deallocate(); }
BucketArrayTemplate< TYPE >::size = size;
array = new LinkListDoubleTemplate< TYPE > [ size ];
- assert( array != NULL );
+ assert( array != 0 );
}
template< class TYPE >
void BucketArrayTemplate< TYPE >::initialize( unsigned long rows, unsigned
long columns )
{
- if ( array != NULL )
+ if ( array != 0 )
{ deallocate(); }
row_size = rows;
@@ -149,7 +149,7 @@
array = new LinkListDoubleTemplate< TYPE > [ size ];
- assert( array != NULL );
+ assert( array != 0 );
}
@@ -163,7 +163,7 @@
delete [size] array;
- array = NULL;
+ array = 0;
size = 0;
row_size = 0;
column_size = 0;
Index: netpanzer/src/Lib/PObject/Templates/LinkListDoubleTemplate.hpp
diff -u netpanzer/src/Lib/PObject/Templates/LinkListDoubleTemplate.hpp:1.1
netpanzer/src/Lib/PObject/Templates/LinkListDoubleTemplate.hpp:1.2
--- netpanzer/src/Lib/PObject/Templates/LinkListDoubleTemplate.hpp:1.1 Sun Dec
1 12:51:40 2002
+++ netpanzer/src/Lib/PObject/Templates/LinkListDoubleTemplate.hpp Mon Sep
1 16:24:18 2003
@@ -18,10 +18,8 @@
#ifndef _LINKLISTDOUBLETEMPLATE_HPP
#define _LINKLISTDOUBLETEMPLATE_HPP
-#include "aliasdef.h"
-
#include <stdlib.h>
-#include "Pobject.hpp"
+#include "PObject.hpp"
template< class TYPE >
class LinkListDoubleTemplate : public PObject
@@ -34,8 +32,8 @@
LinkListDoubleTemplate()
{
- front = NULL;
- rear = NULL;
+ front = 0;
+ rear = 0;
}
LinkListDoubleTemplate( unsigned long size );
@@ -52,10 +50,10 @@
inline void addRear( TYPE *object )
{
- object->next = NULL;
- object->prev = NULL;
+ object->next = 0;
+ object->prev = 0;
- if ( (front == NULL) && (rear == NULL) )
+ if ( (front == 0) && (rear == 0) )
{
front = object;
rear = object;
@@ -70,10 +68,10 @@
inline void addFront( TYPE *object )
{
- object->next = NULL;
- object->prev = NULL;
+ object->next = 0;
+ object->prev = 0;
- if ( (front == NULL) && (rear == NULL) )
+ if ( (front == 0) && (rear == 0) )
{
front = object;
rear = object;
@@ -88,12 +86,12 @@
inline void insertAfter( TYPE *after, TYPE *object )
{
- assert( after != NULL );
+ assert( after != 0 );
- object->next = NULL;
- object->prev = NULL;
+ object->next = 0;
+ object->prev = 0;
- if( after->next != NULL )
+ if( after->next != 0 )
{ after->next->prev = object; }
object->next = after->next;
@@ -108,12 +106,12 @@
inline void insertBefore( TYPE *before, TYPE *object )
{
- assert( before != NULL );
+ assert( before != 0 );
- object->next = NULL;
- object->prev = NULL;
+ object->next = 0;
+ object->prev = 0;
- if( before->prev != NULL )
+ if( before->prev != 0 )
{ before->prev->next = object; }
object->prev = before->prev;
@@ -128,10 +126,10 @@
inline void deleteObject( TYPE *object )
{
- if( object->prev != NULL )
+ if( object->prev != 0 )
{ object->prev->next = object->next; }
- if( object->next != NULL )
+ if( object->next != 0 )
{ object->next->prev = object->prev; }
if( object == front )
@@ -149,17 +147,17 @@
delete_ptr = front;
- if ( front != NULL )
+ if ( front != 0 )
{
if (front == rear)
{
- front = NULL;
- rear = NULL;
+ front = 0;
+ rear = 0;
}
else
{
front = front->next;
- front->prev = NULL;
+ front->prev = 0;
}
delete( delete_ptr );
@@ -172,17 +170,17 @@
delete_ptr = rear;
- if ( rear != NULL )
+ if ( rear != 0 )
{
if (front == rear)
{
- front = NULL;
- rear = NULL;
+ front = 0;
+ rear = 0;
}
else
{
rear = rear->prev;
- rear->next = NULL;
+ rear->next = 0;
}
delete( delete_ptr );
@@ -192,19 +190,19 @@
inline void deleteAfter( TYPE *after )
{
TYPE *delete_ptr;
- assert( after != NULL );
+ assert( after != 0 );
delete_ptr = after->next;
- if( after->next != NULL )
+ if( after->next != 0 )
{
- if( after->next->next != NULL )
+ if( after->next->next != 0 )
{
after->next->next->prev = after;
after->next = after->next->next ;
}
else
- { after->next = NULL; }
+ { after->next = 0; }
if( delete_ptr == rear )
{
@@ -218,19 +216,19 @@
inline void deleteBefore( TYPE *before )
{
TYPE *delete_ptr;
- assert( before != NULL );
+ assert( before != 0 );
delete_ptr = before->prev;
- if( before->prev != NULL )
+ if( before->prev != 0 )
{
- if( before->prev->prev != NULL )
+ if( before->prev->prev != 0 )
{
before->prev->prev->next = before;
before->prev = before->prev->prev;
}
else
- { before->prev = NULL; }
+ { before->prev = 0; }
if( delete_ptr == front )
{
@@ -243,10 +241,10 @@
inline void removeObject( TYPE *object )
{
- if( object->prev != NULL )
+ if( object->prev != 0 )
{ object->prev->next = object->next; }
- if( object->next != NULL )
+ if( object->next != 0 )
{ object->next->prev = object->prev; }
if( object == front )
@@ -263,23 +261,23 @@
delete_ptr = front;
- if ( front != NULL )
+ if ( front != 0 )
{
if (front == rear)
{
- front = NULL;
- rear = NULL;
+ front = 0;
+ rear = 0;
}
else
{
front = front->next;
- front->prev = NULL;
+ front->prev = 0;
}
return( delete_ptr );
}
- return( NULL );
+ return( 0 );
}
inline TYPE* removeRear( void )
@@ -288,40 +286,40 @@
delete_ptr = rear;
- if ( rear != NULL )
+ if ( rear != 0 )
{
if (front == rear)
{
- front = NULL;
- rear = NULL;
+ front = 0;
+ rear = 0;
}
else
{
rear = rear->prev;
- rear->next = NULL;
+ rear->next = 0;
}
return( delete_ptr );
}
- return( NULL );
+ return( 0 );
}
inline TYPE* removeAfter( TYPE *after )
{
TYPE *delete_ptr;
- assert( after != NULL );
+ assert( after != 0 );
delete_ptr = after->next;
- if( after->next != NULL )
+ if( after->next != 0 )
{
- if( after->next->next != NULL )
+ if( after->next->next != 0 )
{
after->next->next->prev = after;
after->next = after->next->next ;
}
else
- { after->next = NULL; }
+ { after->next = 0; }
if( delete_ptr == rear )
{
@@ -331,25 +329,25 @@
return( delete_ptr );
}
- return( NULL );
+ return( 0 );
}
inline TYPE* removeBefore( TYPE *before )
{
TYPE *delete_ptr;
- assert( before != NULL );
+ assert( before != 0 );
delete_ptr = before->prev;
- if( before->prev != NULL )
+ if( before->prev != 0 )
{
- if( before->prev->prev != NULL )
+ if( before->prev->prev != 0 )
{
before->prev->prev->next = before;
before->prev = before->prev->prev;
}
else
- { before->prev = NULL; }
+ { before->prev = 0; }
if( delete_ptr == front )
{
@@ -358,7 +356,7 @@
return( delete_ptr );
}
- return( NULL );
+ return( 0 );
}
@@ -368,7 +366,7 @@
unsigned long count = 0;
traversal_ptr = front;
- while( traversal_ptr != NULL )
+ while( traversal_ptr != 0 )
{
traversal_ptr = traversal_ptr->next;
count++;
@@ -384,15 +382,15 @@
traversal_ptr = front;
- while( traversal_ptr != NULL )
+ while( traversal_ptr != 0 )
{
delete_ptr = traversal_ptr;
traversal_ptr = traversal_ptr->next;
delete( delete_ptr );
}
- front = NULL;
- rear = NULL;
+ front = 0;
+ rear = 0;
}
};
@@ -416,8 +414,8 @@
{
TYPE *object;
- if( front != NULL )
- { deallocate() };
+ if( front != 0 )
+ { deallocate(); }
for( unsigned long i; i < size; i++ )
{
Index: netpanzer/src/Lib/PObject/Templates/LinkListSingleTemplate.hpp
diff -u netpanzer/src/Lib/PObject/Templates/LinkListSingleTemplate.hpp:1.1
netpanzer/src/Lib/PObject/Templates/LinkListSingleTemplate.hpp:1.2
--- netpanzer/src/Lib/PObject/Templates/LinkListSingleTemplate.hpp:1.1 Sun Dec
1 12:51:40 2002
+++ netpanzer/src/Lib/PObject/Templates/LinkListSingleTemplate.hpp Mon Sep
1 16:24:18 2003
@@ -18,10 +18,8 @@
#ifndef _LINKLISTSINGLETEMPLATE_HPP
#define _LINKLISTSINGLETEMPLATE_HPP
-#include "aliasdef.h"
-
#include <stdlib.h>
-#include "Pobject.hpp"
+#include "PObject.hpp"
template< class TYPE >
class LinkListSingleTemplate : public PObject
@@ -34,8 +32,8 @@
LinkListSingleTemplate()
{
- front = NULL;
- rear = NULL;
+ front = 0;
+ rear = 0;
}
LinkListSingleTemplate( unsigned long size );
@@ -46,9 +44,9 @@
inline void addRear( TYPE *object )
{
- object->next = NULL;
+ object->next = 0;
- if ( (front == NULL) && (rear == NULL) )
+ if ( (front == 0) && (rear == 0) )
{
front = object;
rear = object;
@@ -62,13 +60,13 @@
inline void addFront( TYPE *object )
{
- object->next = NULL;
+ object->next = 0;
- if ( (front == NULL) && (rear == NULL) )
+ if ( (front == 0) && (rear == 0) )
{
front = object;
rear = object;
- object->next = NULL;
+ object->next = 0;
}
else
{
@@ -79,7 +77,7 @@
inline void insertAfter( TYPE *after, TYPE *object )
{
- assert( after != NULL );
+ assert( after != 0 );
object->next = after->next;
after->next = object;
@@ -95,12 +93,12 @@
delete_ptr = front;
- if ( front != NULL )
+ if ( front != 0 )
{
if (front == rear)
{
- front = NULL;
- rear = NULL;
+ front = 0;
+ rear = 0;
}
else
{ front = front->next; }
@@ -112,7 +110,7 @@
inline void deleteAfter( TYPE *after )
{
TYPE *delete_ptr;
- assert( after != NULL );
+ assert( after != 0 );
delete_ptr = after->next;
@@ -129,16 +127,16 @@
inline TYPE * removeFront( void )
{
TYPE *delete_ptr;
- assert( front != NULL );
+ assert( front != 0 );
delete_ptr = front;
- if ( front != NULL )
+ if ( front != 0 )
{
if (front == rear)
{
- front = NULL;
- rear = NULL;
+ front = 0;
+ rear = 0;
}
else
{ front = front->next; }
@@ -146,13 +144,13 @@
return( delete_ptr );
}
- return( NULL );
+ return( 0 );
}
inline TYPE * removeAfter( TYPE *after )
{
TYPE *delete_ptr;
- assert( after != NULL );
+ assert( after != 0 );
delete_ptr = after->next;
@@ -174,7 +172,7 @@
unsigned long count = 0;
traversal_ptr = front;
- while( traversal_ptr != NULL )
+ while( traversal_ptr != 0 )
{
traversal_ptr = traversal_ptr->next;
count++;
@@ -190,15 +188,15 @@
traversal_ptr = front;
- while( traversal_ptr != NULL )
+ while( traversal_ptr != 0 )
{
delete_ptr = traversal_ptr;
traversal_ptr = traversal_ptr->next;
delete( delete_ptr );
}
- front = NULL;
- rear = NULL;
+ front = 0;
+ rear = 0;
}
};
@@ -218,12 +216,12 @@
}
template< class TYPE >
-void LinkListSingleTemplate< TYPE >::initialize( unsigned long size )
+void LinkListSingleTemplate<TYPE>::initialize( unsigned long size )
{
TYPE *object;
- if( front != NULL )
- { deallocate() };
+ if( front != 0 )
+ { deallocate(); }
for( unsigned long i; i < size; i++ )
{
Index: netpanzer/src/Lib/PObject/Templates/QueueTemplate.hpp
diff -u netpanzer/src/Lib/PObject/Templates/QueueTemplate.hpp:1.1
netpanzer/src/Lib/PObject/Templates/QueueTemplate.hpp:1.2
--- netpanzer/src/Lib/PObject/Templates/QueueTemplate.hpp:1.1 Sun Dec 1
12:51:40 2002
+++ netpanzer/src/Lib/PObject/Templates/QueueTemplate.hpp Mon Sep 1
16:24:18 2003
@@ -39,15 +39,15 @@
rear = 0;
}
- inline boolean enqueue( TYPE & object )
+ inline bool enqueue( TYPE & object )
{
add( object, (rear + 1) % size );
rear = (rear + 1) % size;
if ( front == rear )
- return( _FALSE );
+ return( false );
- return( _TRUE );
+ return( true );
}
inline TYPE dequeue( void )
@@ -80,28 +80,28 @@
}
- inline boolean isEmpty( void )
+ inline bool isEmpty( void )
{
if( front == rear )
- return ( _TRUE );
+ return ( true );
- return( _FALSE );
+ return( false );
}
- inline boolean isFull ( void )
+ inline bool isFull ( void )
{
if ( front == (rear + 1) % size )
- return( _TRUE );
+ return( true );
- return( _FALSE );
+ return( false );
}
- inline boolean isReady( void )
+ inline bool isReady( void )
{
if( front == rear )
- return ( _FALSE );
+ return ( false );
- return( _TRUE );
+ return( true );
}
inline unsigned long itemCount( void )
@@ -116,7 +116,7 @@
template< class TYPE >
QueueTemplate< TYPE >::QueueTemplate( unsigned long size )
- : ArrayTemplate( size )
+ : ArrayTemplate<TYPE>( size )
{
front = 0;
rear = 0;
Index: netpanzer/src/Lib/Particles/ChunkTrajectoryParticle2D.cpp
diff -u netpanzer/src/Lib/Particles/ChunkTrajectoryParticle2D.cpp:1.1
netpanzer/src/Lib/Particles/ChunkTrajectoryParticle2D.cpp:1.2
--- netpanzer/src/Lib/Particles/ChunkTrajectoryParticle2D.cpp:1.1 Sun Dec
1 12:51:40 2002
+++ netpanzer/src/Lib/Particles/ChunkTrajectoryParticle2D.cpp Mon Sep 1
16:24:18 2003
@@ -15,7 +15,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "ChunkTrajectoryParticle2D.hpp"
#include "TimerInterface.hpp"
#include "PuffParticle2D.hpp"
@@ -69,7 +69,7 @@
//TileInterface::getWorldPixColor(int worldX, int worldY)
- int randChunk = rand() % staticPackedGroundChunks.getFrameCount();
+ // int randChunk = rand() % staticPackedGroundChunks.getFrameCount();
packedSurface.setData(staticPackedGroundChunks);
packedSurface.setDrawModeSolid();
@@ -82,7 +82,7 @@
} else
{
- index = TileInterface::getWorldPixColor(pos.x, pos.z);
+ index = TileInterface::getWorldPixColor((int) pos.x, (int)
pos.z);
}
//int randFrame = rand() %
staticPackedChunks[randChunk].getFrameCount();
@@ -119,12 +119,12 @@
{
assert(isValidPtr(this));
- packedSurface.setAttrib(PointXYi(pos.x, pos.z - arcYPix), layer);
+ packedSurface.setAttrib(PointXYi((int) pos.x, (int) (pos.z - arcYPix)),
layer);
sorter.addSprite(&packedSurface);
if (GameConfig::getDisplayShadowsFlag())
{
- packedSurfaceShadow.setAttrib(PointXYi(pos.x - arcYPix, pos.z),
shadowLayer);
+ packedSurfaceShadow.setAttrib(PointXYi((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.1
netpanzer/src/Lib/Particles/CloudParticle2D.cpp:1.2
--- netpanzer/src/Lib/Particles/CloudParticle2D.cpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/Particles/CloudParticle2D.cpp Mon Sep 1 16:24:18 2003
@@ -15,11 +15,12 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "CloudParticle2D.hpp"
#include "TimerInterface.hpp"
#include "PackedSurface.hpp"
#include "GameConfig.hpp"
+#include "Sprite.hpp"
// Statics.
Index: netpanzer/src/Lib/Particles/CraterParticle2D.cpp
diff -u netpanzer/src/Lib/Particles/CraterParticle2D.cpp:1.1
netpanzer/src/Lib/Particles/CraterParticle2D.cpp:1.2
--- netpanzer/src/Lib/Particles/CraterParticle2D.cpp:1.1 Sun Dec 1
12:51:40 2002
+++ netpanzer/src/Lib/Particles/CraterParticle2D.cpp Mon Sep 1 16:24:18 2003
@@ -15,7 +15,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "CraterParticle2D.hpp"
#include "UtilInterface.hpp"
#include "ConsoleInterface.hpp"
@@ -45,7 +45,7 @@
// Check to see if this is valid crater ground.
// Check the crater cache for a hit.
- iXY destPos(pos.x, pos.z);
+ iXY destPos((int) pos.x, (int) pos.z);
for (int i = 0; i < craterCache.getCount(); i++)
{
@@ -112,7 +112,7 @@
{
if (!isAlive) { return; }
- packedSurface.setAttrib(iXY(pos.x, pos.z), 0);
+ packedSurface.setAttrib(iXY((int) pos.x, (int) pos.z), 0);
sorter.addSprite(&packedSurface);
} // end CraterParticle2D::draw
@@ -126,7 +126,7 @@
isAlive = false;
// Check to see if the cache index is still in list and remove
it if so.
- if (craterCache[cacheIndex].pos == iXY(pos.x, pos.z))
+ if (craterCache[cacheIndex].pos == iXY((int) pos.x, (int)
pos.z))
{
// Since it is still in the list, but the particle is
dead,
// remove it from the list.
Index: netpanzer/src/Lib/Particles/DirtKickParticle2D.cpp
diff -u netpanzer/src/Lib/Particles/DirtKickParticle2D.cpp:1.1
netpanzer/src/Lib/Particles/DirtKickParticle2D.cpp:1.2
--- netpanzer/src/Lib/Particles/DirtKickParticle2D.cpp:1.1 Sun Dec 1
12:51:40 2002
+++ netpanzer/src/Lib/Particles/DirtKickParticle2D.cpp Mon Sep 1 16:24:18 2003
@@ -15,7 +15,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "DirtKickParticle2D.hpp"
@@ -23,6 +23,8 @@
const int dirtKickFPS = 24;
+/** XXX distKickSurface doesn't seem to be defined ?!?! */
+
// DirtKickParticle2D
//---------------------------------------------------------------------------
@@ -30,7 +32,8 @@
{
assert(dirtKickSprite.getDoesExist());
- dirtKickSurface.setTo(dirtKickSprite);
+ // XXX
+ //dirtKickSurface.setTo(dirtKickSprite);
}; // end DirtKickParticle2D::DirtKickParticle2D
@@ -41,7 +44,7 @@
dirtKickSprite.create(iXY(48, 46), 48, 6);
dirtKickSprite.extractPCX("pics\\particles\\dirtKick.pcx", 1, 0);
- dirtKickSprite.scale(48 * 0.5f, 46 * 0.5f);
+ dirtKickSprite.scale((int) (48 * 0.5f), (int) (46 * 0.5f));
dirtKickSprite.setFPS(dirtKickFPS);
dirtKickSprite.setOffset(iXY(-dirtKickSprite.getCenter().x,
-dirtKickSprite.getPix().y));
@@ -52,17 +55,24 @@
//---------------------------------------------------------------------------
void DirtKickParticle2D::draw(const Surface &dest, SpriteSorter &sorter)
{
- assert(dirtKickSurface.getDoesExist());
+ // XXX
+ //assert(dirtKickSurface.getDoesExist());
+ // XXX
+#if 0
if (!dirtKickSurface.nextFrame())
{
- isAlive = FALSE;
+ isAlive = false;
return;
}
-
+#endif
+
+ // XXX
+#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);
sorter.addSprite(&dirtKickSurface);
+#endif
} // end DirtKickParticle2D::draw
Index: netpanzer/src/Lib/Particles/DirtKickParticle2D.hpp
diff -u netpanzer/src/Lib/Particles/DirtKickParticle2D.hpp:1.1
netpanzer/src/Lib/Particles/DirtKickParticle2D.hpp:1.2
--- netpanzer/src/Lib/Particles/DirtKickParticle2D.hpp:1.1 Sun Dec 1
12:51:40 2002
+++ netpanzer/src/Lib/Particles/DirtKickParticle2D.hpp Mon Sep 1 16:24:18 2003
@@ -20,7 +20,7 @@
#define __DirtKickParticle2D_hpp__
-#include "stdafx.hpp"
+
#include "Particle2D.hpp"
Index: netpanzer/src/Lib/Particles/ExplosionFlashParticle2D.hpp
diff -u netpanzer/src/Lib/Particles/ExplosionFlashParticle2D.hpp:1.1
netpanzer/src/Lib/Particles/ExplosionFlashParticle2D.hpp:1.2
--- netpanzer/src/Lib/Particles/ExplosionFlashParticle2D.hpp:1.1 Sun Dec
1 12:51:40 2002
+++ netpanzer/src/Lib/Particles/ExplosionFlashParticle2D.hpp Mon Sep 1
16:24:18 2003
@@ -20,7 +20,7 @@
#define __FlashParticle2D_hpp__
-#include "stdafx.hpp"
+
#include "ExplosionFireParticle2D.hpp"
Index: netpanzer/src/Lib/Particles/FireParticle2D.cpp
diff -u netpanzer/src/Lib/Particles/FireParticle2D.cpp:1.1
netpanzer/src/Lib/Particles/FireParticle2D.cpp:1.2
--- netpanzer/src/Lib/Particles/FireParticle2D.cpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/Particles/FireParticle2D.cpp Mon Sep 1 16:24:18 2003
@@ -15,7 +15,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "FireParticle2D.hpp"
#include "TimerInterface.hpp"
@@ -58,9 +58,9 @@
//if (!isAlive) return;
dest.fillRect(100, 100, 110, 110, Color::red);
- int x = pos.x;
+ //int x = (int) pos.x;
//int y = pos.y;
- int z = pos.z;
+ //int z = (int) pos.z;
//color = BYTE(totalTime * 44); // This 44 is based on the life of 0.25
secs and 12 colors possible.
color = BYTE(totalTime * 22); // This 22 is based on the life of 0.50
secs and 12 colors possible.
@@ -68,7 +68,7 @@
//if (color >= 12) FUBAR("ERROR: Invalid color reached for fire.");
assert(color < 12);
- const unsigned halfSize = 1;
+ // const unsigned halfSize = 1;
//dest.fillRect(iRect(x - halfSize, z - halfSize, x + halfSize, z +
halfSize), cFireParticleSystem2D::fireColor[color]);
Index: netpanzer/src/Lib/Particles/FireParticle2D.hpp
diff -u netpanzer/src/Lib/Particles/FireParticle2D.hpp:1.1
netpanzer/src/Lib/Particles/FireParticle2D.hpp:1.2
--- netpanzer/src/Lib/Particles/FireParticle2D.hpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/Particles/FireParticle2D.hpp Mon Sep 1 16:24:18 2003
@@ -21,7 +21,7 @@
#define __FireParticle2D_hpp_
-#include "stdafx.hpp"
+
#include "Surface.hpp"
#include "SpriteSorter.hpp"
#include "fXYZ.hpp"
Index: netpanzer/src/Lib/Particles/FireParticleSystem2D.cpp
diff -u netpanzer/src/Lib/Particles/FireParticleSystem2D.cpp:1.1
netpanzer/src/Lib/Particles/FireParticleSystem2D.cpp:1.2
--- netpanzer/src/Lib/Particles/FireParticleSystem2D.cpp:1.1 Sun Dec 1
12:51:40 2002
+++ netpanzer/src/Lib/Particles/FireParticleSystem2D.cpp Mon Sep 1
16:24:18 2003
@@ -15,7 +15,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "FireParticleSystem2D.hpp"
#include "TimerInterface.hpp"
@@ -97,7 +97,8 @@
if (!fireParticles[num].isAlive)
{
fireParticles[num].reset();
- fireParticles[num].isAlive;
+ // XXX statement with no effect
+ //fireParticles[num].isAlive;
fireParticles[num].pos.x =
pos.x-offset+float(rand()%int(offset*offset*2))/offset; // [-n .. n-1]
fireParticles[num].pos.z =
pos.z-offset+float(rand()%int(offset*offset*2))/offset; // [-n .. n-1]
} else
Index: netpanzer/src/Lib/Particles/FireParticleSystem2D.hpp
diff -u netpanzer/src/Lib/Particles/FireParticleSystem2D.hpp:1.1
netpanzer/src/Lib/Particles/FireParticleSystem2D.hpp:1.2
--- netpanzer/src/Lib/Particles/FireParticleSystem2D.hpp:1.1 Sun Dec 1
12:51:40 2002
+++ netpanzer/src/Lib/Particles/FireParticleSystem2D.hpp Mon Sep 1
16:24:18 2003
@@ -21,7 +21,7 @@
#define __FireParticleSystem2D_hpp__
-#include "stdafx.hpp"
+
#include "ParticleSystem2D.hpp"
#include "FireParticle2D.hpp"
Index: netpanzer/src/Lib/Particles/FlameParticle2D.cpp
diff -u netpanzer/src/Lib/Particles/FlameParticle2D.cpp:1.1
netpanzer/src/Lib/Particles/FlameParticle2D.cpp:1.2
--- netpanzer/src/Lib/Particles/FlameParticle2D.cpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/Particles/FlameParticle2D.cpp Mon Sep 1 16:24:18 2003
@@ -15,7 +15,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "FlameParticle2D.hpp"
cGrowList <PackedSurface> FlameParticle2D::staticPackedExplosion0;
Index: netpanzer/src/Lib/Particles/FlameParticle2D.hpp
diff -u netpanzer/src/Lib/Particles/FlameParticle2D.hpp:1.1
netpanzer/src/Lib/Particles/FlameParticle2D.hpp:1.2
--- netpanzer/src/Lib/Particles/FlameParticle2D.hpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/Particles/FlameParticle2D.hpp Mon Sep 1 16:24:18 2003
@@ -20,7 +20,7 @@
#define __FlameParticle2D_hpp__
-#include "stdafx.hpp"
+
#include "Particle2D.hpp"
#include "PackedSurface.hpp"
#include "cGrowList.hpp"
Index: netpanzer/src/Lib/Particles/FlashParticle2D.cpp
diff -u netpanzer/src/Lib/Particles/FlashParticle2D.cpp:1.1
netpanzer/src/Lib/Particles/FlashParticle2D.cpp:1.2
--- netpanzer/src/Lib/Particles/FlashParticle2D.cpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/Particles/FlashParticle2D.cpp Mon Sep 1 16:24:18 2003
@@ -15,7 +15,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "FlashParticle2D.hpp"
#include "UtilInterface.hpp"
Index: netpanzer/src/Lib/Particles/GroundExplosionParticle2D.cpp
diff -u netpanzer/src/Lib/Particles/GroundExplosionParticle2D.cpp:1.1
netpanzer/src/Lib/Particles/GroundExplosionParticle2D.cpp:1.2
--- netpanzer/src/Lib/Particles/GroundExplosionParticle2D.cpp:1.1 Sun Dec
1 12:51:40 2002
+++ netpanzer/src/Lib/Particles/GroundExplosionParticle2D.cpp Mon Sep 1
16:24:18 2003
@@ -15,7 +15,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "GroundExplosionParticle2D.hpp"
@@ -24,14 +24,18 @@
// GroundExplosionParticle2D constructor
//---------------------------------------------------------------------------
-GroundExplosionParticle2D::GroundExplosionParticle2D(fXYZ pos, int maxSpeed) :
TrajectoryParticle2D(pos, maxSpeed)
+GroundExplosionParticle2D::GroundExplosionParticle2D(const fXYZ& pos,
+
int maxSpeed)
+ // XXX trajectoryAngle was missing here, I added 0
+ : TrajectoryParticle2D(pos, maxSpeed, 0)
{
FUNC("GroundExplosionParticle2D::init");
airLifetime = lifetime;
lifetime = 10;
- groundParticleSurface.setOffsetCenter();
+ // XXX
+ // groundParticleSurface.setOffsetCenter();
} // end GroundExplosionParticle2D::GroundExplosionParticle2D
@@ -52,12 +56,15 @@
{
// Calculate some projection to get the 3D angle effect. The greater
the particleYScale,
// the greater the particle bend in the air.
- float zPos = pos.z;// - pos.y * particleYScale;
+ //float zPos = pos.z;// - pos.y * particleYScale;
+ // XXX
+#if 0
groundParticleSurface.setTo(groundParticleSprite0);
groundParticleSurface.setAttrib(PointXYi(pos.x, zPos), 3);
sorter.addSprite(&groundParticleSurface);
+#endif
} // end GroundExplosionParticle2D::draw
/*
@@ -75,7 +82,7 @@
if (age >= lifetime)
{
- isAlive = FALSE;
+ isAlive = false;
}
cParticle2D::sim();
Index: netpanzer/src/Lib/Particles/GroundExplosionParticle2D.hpp
diff -u netpanzer/src/Lib/Particles/GroundExplosionParticle2D.hpp:1.1
netpanzer/src/Lib/Particles/GroundExplosionParticle2D.hpp:1.2
--- netpanzer/src/Lib/Particles/GroundExplosionParticle2D.hpp:1.1 Sun Dec
1 12:51:40 2002
+++ netpanzer/src/Lib/Particles/GroundExplosionParticle2D.hpp Mon Sep 1
16:24:18 2003
@@ -21,7 +21,7 @@
#define __GroundExplosionParticle2D_hpp__
-#include "stdafx.hpp"
+
#include "TrajectoryParticle2D.hpp"
@@ -35,7 +35,7 @@
float airLifetime;
public:
- GroundExplosionParticle2D(fXYZ pos, int maxSpeed);
+ GroundExplosionParticle2D(const fXYZ& pos, int maxSpeed);
static void init();
Index: netpanzer/src/Lib/Particles/GroundExplosionParticleSystem2D.cpp
diff -u netpanzer/src/Lib/Particles/GroundExplosionParticleSystem2D.cpp:1.1
netpanzer/src/Lib/Particles/GroundExplosionParticleSystem2D.cpp:1.2
--- netpanzer/src/Lib/Particles/GroundExplosionParticleSystem2D.cpp:1.1 Sun Dec
1 12:51:40 2002
+++ netpanzer/src/Lib/Particles/GroundExplosionParticleSystem2D.cpp Mon Sep
1 16:24:18 2003
@@ -15,7 +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 "stdafx.hpp"
+
+#include "codewiz.hpp"
#include "GroundExplosionParticleSystem2D.hpp"
#include "Physics.hpp"
#include "GroundExplosionParticle2D.hpp"
@@ -51,7 +52,7 @@
fXYZ offset;
// Calculate the maximum height of any particle spawned from this
explosion.
- float midTime = float(maxParticleSpeed) / Physics::getGravity();
+ //float midTime = float(maxParticleSpeed) / Physics::getGravity();
//float maxParticleHeight =
Physics::getVerticalPosition(maxParticleSpeed, deg2Rad(90), midTime);
for (int i = 0; i < particleCount; i++)
Index: netpanzer/src/Lib/Particles/GroundExplosionParticleSystem2D.hpp
diff -u netpanzer/src/Lib/Particles/GroundExplosionParticleSystem2D.hpp:1.1
netpanzer/src/Lib/Particles/GroundExplosionParticleSystem2D.hpp:1.2
--- netpanzer/src/Lib/Particles/GroundExplosionParticleSystem2D.hpp:1.1 Sun Dec
1 12:51:40 2002
+++ netpanzer/src/Lib/Particles/GroundExplosionParticleSystem2D.hpp Mon Sep
1 16:24:18 2003
@@ -20,7 +20,7 @@
#define __GroundExplosionParticle2D_hpp__
-#include "stdafx.hpp"
+
#include "ParticleSystem2D.hpp"
Index: netpanzer/src/Lib/Particles/MovementDirtPuffParticle2D.hpp
diff -u netpanzer/src/Lib/Particles/MovementDirtPuffParticle2D.hpp:1.1
netpanzer/src/Lib/Particles/MovementDirtPuffParticle2D.hpp:1.2
--- netpanzer/src/Lib/Particles/MovementDirtPuffParticle2D.hpp:1.1 Sun Dec
1 12:51:40 2002
+++ netpanzer/src/Lib/Particles/MovementDirtPuffParticle2D.hpp Mon Sep 1
16:24:18 2003
@@ -21,7 +21,7 @@
#define __MovementDirtPuffParticle2D_hpp__
-#include "stdafx.hpp"
+
#include "PuffParticle2D.hpp"
Index: netpanzer/src/Lib/Particles/Particle2D.cpp
diff -u netpanzer/src/Lib/Particles/Particle2D.cpp:1.1
netpanzer/src/Lib/Particles/Particle2D.cpp:1.2
--- netpanzer/src/Lib/Particles/Particle2D.cpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/Particles/Particle2D.cpp Mon Sep 1 16:24:18 2003
@@ -17,7 +17,7 @@
*/
//---------------------------------------------------------------------------
-#include "stdafx.hpp"
+
#include "Particle2D.hpp"
#include "TimerInterface.hpp"
#include "PackedSurface.hpp"
@@ -35,9 +35,9 @@
int Particle2D::drawParticles = 1;
// Pre-allocation variables.
-const int MAX_PARTICLE_CLASS_SIZE = 340;
+const size_t MAX_PARTICLE_CLASS_SIZE = 340;
const int MAX_PARTICLES = 3000;
-static size_t biggestParticle = 0;
+//static size_t biggestParticle = 0;
static Particle2D *firstAvailableParticle;
static char particleArray[MAX_PARTICLES][MAX_PARTICLE_CLASS_SIZE];
@@ -60,13 +60,16 @@
((Particle2D *)particleArray[i])->next = (Particle2D
*)particleArray[i + 1];
}
- ((Particle2D *)particleArray[MAX_PARTICLES - 1])->next = NULL;
+ ((Particle2D *)particleArray[MAX_PARTICLES - 1])->next = 0;
}
// Check global particle disable flag.
if (!createParticles)
{
- return NULL;
+ // XXX my compiler claims that new mustn't return 0, so I'm
throwing an
+ // exception...
+ throw "allocation error.";
+ //return 0;
}
// Check for trying to create a particle that's too big.
@@ -76,9 +79,12 @@
}
// Check if all slots used.
- if (firstAvailableParticle == NULL)
+ if (firstAvailableParticle == 0)
{
- return NULL;
+ // XXX my compiler claims that new mustn't return 0, so I'm
throwing an
+ // exception...
+ throw "allocation error.";
+ //return 0;
}
// Remove particle from available list and return it.
@@ -123,7 +129,7 @@
prev = next = zParticle2D;
} else
{
- prev = next = NULL;
+ prev = next = 0;
insertMe();
}
@@ -164,8 +170,8 @@
void Particle2D::insertMe()
{
// If we're inserting, we should not already be in the list.
- assert(prev == NULL);
- assert(next == NULL);
+ assert(prev == 0);
+ assert(next == 0);
// Insert me into the list
prev = zParticle2D;
@@ -189,8 +195,8 @@
void Particle2D::removeMe()
{
// removeMe from the list
- if (prev != NULL) prev->next = next;
- if (next != NULL) next->prev = prev;
+ if (prev != 0) prev->next = next;
+ if (next != 0) next->prev = prev;
prev = next = this;
@@ -564,7 +570,7 @@
//--------------------------------------------------------------------------
int Particle2D::getPakIndex(float scale, int pakImageCount)
{
- int destIndex = scale * float(pakImageCount);
+ int destIndex = (int) (scale * float(pakImageCount));
if (destIndex > pakImageCount - 1)
{
Index: netpanzer/src/Lib/Particles/Particle2D.hpp
diff -u netpanzer/src/Lib/Particles/Particle2D.hpp:1.1
netpanzer/src/Lib/Particles/Particle2D.hpp:1.2
--- netpanzer/src/Lib/Particles/Particle2D.hpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/Particles/Particle2D.hpp Mon Sep 1 16:24:18 2003
@@ -20,12 +20,6 @@
#ifndef __Particle2D_hpp__
#define __Particle2D_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
#include "iRect.hpp"
#include "iXY.hpp"
#include "fXYZ.hpp"
@@ -200,7 +194,7 @@
//public:
// SpriteBltBlendScale()
// {
-// colorTable = NULL;
+// colorTable = 0;
// }
//
// virtual void blit(Surface *surface, Recti &world_win);
@@ -217,7 +211,7 @@
//public:
// SpriteBltBlend()
// {
-// colorTable = NULL;
+// colorTable = 0;
// useBlend = 1;
// }
//
Index: netpanzer/src/Lib/Particles/ParticleInterface.cpp
diff -u netpanzer/src/Lib/Particles/ParticleInterface.cpp:1.1
netpanzer/src/Lib/Particles/ParticleInterface.cpp:1.2
--- netpanzer/src/Lib/Particles/ParticleInterface.cpp:1.1 Sun Dec 1
12:51:40 2002
+++ netpanzer/src/Lib/Particles/ParticleInterface.cpp Mon Sep 1 16:24:18 2003
@@ -15,7 +15,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "KeyScanCodeDefs.h"
#include "ParticleInterface.hpp"
#include "PuffParticle2D.hpp"
@@ -29,7 +29,7 @@
#include "MapInterface.hpp"
#include "KeyboardInterface.hpp"
#include "Physics.hpp"
-#include "DSound.hpp"
+//#include "DSound.hpp"
//#include "DirtKickParticle2D.hpp"
#include "SparkParticle2D.hpp"
#include "FireParticleSystem2D.hpp"
@@ -395,7 +395,8 @@
groupTime0 = 0.0f;
//SFX
- dsound.PlayAmbientSound( _not_applicable, _blow_up_tank, 0 );
+ // XXX
+ // dsound.PlayAmbientSound( _not_applicable, _blow_up_tank, 0 );
Recti gameViewRect;
WorldViewInterface::getViewWindow(&gameViewRect);
@@ -417,7 +418,8 @@
groupTime1 = 0.0f;
//SFX
- dsound.PlayAmbientSound( _not_applicable, _blow_up_tank, 0 );
+ // XXX
+ // dsound.PlayAmbientSound( _not_applicable, _blow_up_tank, 0 );
Recti gameViewRect;
WorldViewInterface::getViewWindow(&gameViewRect);
@@ -467,7 +469,7 @@
float hitPointScale = 1.0f;
UnitProfile *p =
UnitProfileInterface::getUnitProfile(unitState.unit_type);
- if (p != NULL)
+ if (p != 0)
{
hitPointScale = float(unitHitPointTable[unitState.unit_type]) /
18.0f;
} else
@@ -628,7 +630,7 @@
float attackScale = 1.0f;
UnitProfile *p = UnitProfileInterface::getUnitProfile(unitType);
- if (p != NULL)
+ if (p != 0)
{
attackScale = float(unitAttackFactorTable[unitType]) / 15.0f;
} else
Index: netpanzer/src/Lib/Particles/ParticleInterface.hpp
diff -u netpanzer/src/Lib/Particles/ParticleInterface.hpp:1.1
netpanzer/src/Lib/Particles/ParticleInterface.hpp:1.2
--- netpanzer/src/Lib/Particles/ParticleInterface.hpp:1.1 Sun Dec 1
12:51:40 2002
+++ netpanzer/src/Lib/Particles/ParticleInterface.hpp Mon Sep 1 16:24:18 2003
@@ -25,7 +25,7 @@
#endif
-#include "stdafx.hpp"
+
#include "iXY.hpp"
#include "iRect.hpp"
#include "PuffParticle2D.hpp"
Index: netpanzer/src/Lib/Particles/ParticleSystem2D.cpp
diff -u netpanzer/src/Lib/Particles/ParticleSystem2D.cpp:1.1
netpanzer/src/Lib/Particles/ParticleSystem2D.cpp:1.2
--- netpanzer/src/Lib/Particles/ParticleSystem2D.cpp:1.1 Sun Dec 1
12:51:40 2002
+++ netpanzer/src/Lib/Particles/ParticleSystem2D.cpp Mon Sep 1 16:24:18 2003
@@ -15,7 +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 "stdafx.hpp"
+
+#include <assert.h>
#include "ParticleSystem2D.hpp"
#include "TimerInterface.hpp"
#include "ParticleSystemGlobals.hpp"
@@ -42,7 +43,7 @@
prev = next = zParticleSystem2D;
} else
{
- prev = next = NULL;
+ prev = next = 0;
insertMe();
}
@@ -88,8 +89,8 @@
void ParticleSystem2D::insertMe()
{
// If we're inserting, we should not already be in the list...
- assert(prev == NULL);
- assert(next == NULL);
+ assert(prev == 0);
+ assert(next == 0);
// Insert me into the list
prev = zParticleSystem2D;
@@ -112,12 +113,12 @@
void ParticleSystem2D::removeMe()
{
// removeMe from the list
- if (prev != NULL)
+ if (prev != 0)
{
prev->next = next;
}
- if (next != NULL)
+ if (next != 0)
{
next->prev = prev;
}
Index: netpanzer/src/Lib/Particles/ParticleSystem2D.hpp
diff -u netpanzer/src/Lib/Particles/ParticleSystem2D.hpp:1.1
netpanzer/src/Lib/Particles/ParticleSystem2D.hpp:1.2
--- netpanzer/src/Lib/Particles/ParticleSystem2D.hpp:1.1 Sun Dec 1
12:51:40 2002
+++ netpanzer/src/Lib/Particles/ParticleSystem2D.hpp Mon Sep 1 16:24:18 2003
@@ -66,7 +66,7 @@
static int particleSystemCount;
static int peakParticleSystemCount;
- BOOL isAlive;
+ bool isAlive;
float age; // How old the system is.
float lifetime; // How long the system will live.
fXYZ pos;
Index: netpanzer/src/Lib/Particles/ParticleSystemGlobals.cpp
diff -u netpanzer/src/Lib/Particles/ParticleSystemGlobals.cpp:1.1
netpanzer/src/Lib/Particles/ParticleSystemGlobals.cpp:1.2
--- netpanzer/src/Lib/Particles/ParticleSystemGlobals.cpp:1.1 Sun Dec 1
12:51:40 2002
+++ netpanzer/src/Lib/Particles/ParticleSystemGlobals.cpp Mon Sep 1
16:24:19 2003
@@ -15,7 +15,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "ParticleSystemGlobals.hpp"
Index: netpanzer/src/Lib/Particles/ParticleTweakView.cpp
diff -u netpanzer/src/Lib/Particles/ParticleTweakView.cpp:1.1
netpanzer/src/Lib/Particles/ParticleTweakView.cpp:1.2
--- netpanzer/src/Lib/Particles/ParticleTweakView.cpp:1.1 Sun Dec 1
12:51:40 2002
+++ netpanzer/src/Lib/Particles/ParticleTweakView.cpp Mon Sep 1 16:24:19 2003
@@ -15,7 +15,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "ParticleTweakView.hpp"
#include "Desktop.hpp"
Index: netpanzer/src/Lib/Particles/PuffParticle2D.cpp
diff -u netpanzer/src/Lib/Particles/PuffParticle2D.cpp:1.1
netpanzer/src/Lib/Particles/PuffParticle2D.cpp:1.2
--- netpanzer/src/Lib/Particles/PuffParticle2D.cpp:1.1 Sun Dec 1 12:51:40 2002
+++ netpanzer/src/Lib/Particles/PuffParticle2D.cpp Mon Sep 1 16:24:19 2003
@@ -16,7 +16,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "PuffParticle2D.hpp"
#include "PackedSurface.hpp"
#include "TimerInterface.hpp"
@@ -157,7 +157,7 @@
packedSurfaceShadow.nextFrame();
- packedSurface.setAttrib(PointXYi(pos.x, pos.z), layer);
+ packedSurface.setAttrib(PointXYi((int) pos.x, (int) pos.z), layer);
sorter.addSprite(&packedSurface);
if (GameConfig::getDisplayShadowsFlag())
@@ -167,13 +167,15 @@
shadowPos.x = pos.x - ((float(index) /
float(staticPackedSmokeLightPuff.getCount())) *
packedSurfaceShadow.getCurFrame() * 10);
}
- packedSurfaceShadow.setAttrib(PointXYi(shadowPos.x,
shadowPos.z), shadowLayer);
+ packedSurfaceShadow.setAttrib(PointXYi((int) shadowPos.x, (int)
shadowPos.z), shadowLayer);
sorter.addSprite(&packedSurfaceShadow);
}
} // end PuffParticle2D::draw
//---------------------------------------------------------------------------
+// not used
+#if 0
static void pakFiles()
{
const int maxSize = 70;
@@ -236,6 +238,7 @@
tempPackedSurface.save(strBuf);
}
}
+#endif
// init
//---------------------------------------------------------------------------
Index: netpanzer/src/Lib/Particles/RadarPingParticle2D.cpp
diff -u netpanzer/src/Lib/Particles/RadarPingParticle2D.cpp:1.1
netpanzer/src/Lib/Particles/RadarPingParticle2D.cpp:1.2
--- netpanzer/src/Lib/Particles/RadarPingParticle2D.cpp:1.1 Sun Dec 1
12:51:40 2002
+++ netpanzer/src/Lib/Particles/RadarPingParticle2D.cpp Mon Sep 1 16:24:19 2003
@@ -15,7 +15,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "RadarPingParticle2D.hpp"
@@ -30,8 +30,11 @@
FPS = rand() % 20 + 20;
+ // XXX
+#if 0
radarPingSurface.setTo(radarPingSprite);
radarPingSurface.setFPS(FPS);
+#endif
}; // end RadarPingParticle2D::RadarPingParticle2D
@@ -50,6 +53,8 @@
//---------------------------------------------------------------------------
void RadarPingParticle2D::draw(const Surface &dest, SpriteSorter &sorter)
{
+ // XXX
+#if 0
assert(radarPingSurface.getDoesExist());
if (!radarPingSurface.nextFrame())
@@ -74,5 +79,6 @@
{
assert(false);
}
+#endif
} // end RadarPingParticle2D::draw
Index: netpanzer/src/Lib/Particles/SmokingTrajectoryParticle2D.cpp
diff -u netpanzer/src/Lib/Particles/SmokingTrajectoryParticle2D.cpp:1.1
netpanzer/src/Lib/Particles/SmokingTrajectoryParticle2D.cpp:1.2
--- netpanzer/src/Lib/Particles/SmokingTrajectoryParticle2D.cpp:1.1 Sun Dec
1 12:51:40 2002
+++ netpanzer/src/Lib/Particles/SmokingTrajectoryParticle2D.cpp Mon Sep 1
16:24:19 2003
@@ -15,9 +15,9 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "SmokingTrajectoryParticle2D.hpp"
-#include "TimerINterface.hpp"
+#include "TimerInterface.hpp"
//---------------------------------------------------------------------------
@@ -25,7 +25,9 @@
int maxSpeed,
float waitMin,
float waitRand,
-
PUFF_PARTICLE_TYPE particleType) :
TrajectoryParticle2D(pos, maxSpeed)
+
PUFF_PARTICLE_TYPE particleType)
+ // XXX had to add an angle here
+ : TrajectoryParticle2D(pos, maxSpeed, 0)
{
assert(isValidPtr(this));
Index: netpanzer/src/Lib/Particles/SmokingTrajectoryParticle2D.hpp
diff -u netpanzer/src/Lib/Particles/SmokingTrajectoryParticle2D.hpp:1.1
netpanzer/src/Lib/Particles/SmokingTrajectoryParticle2D.hpp:1.2
--- netpanzer/src/Lib/Particles/SmokingTrajectoryParticle2D.hpp:1.1 Sun Dec
1 12:51:45 2002
+++ netpanzer/src/Lib/Particles/SmokingTrajectoryParticle2D.hpp Mon Sep 1
16:24:19 2003
@@ -33,11 +33,14 @@
float waitRand;
float waitTime;
float incrementScale;
-
+
+ // XXX PUFF_PARTICLE_TYPE ?!? added a definition here
+ typedef int PUFF_PARTICLE_TYPE;
PUFF_PARTICLE_TYPE particleType; // Which kind of particle to use for
this explosion.
public:
- SmokingTrajectoryParticle2D(const fXYZ &pos, int maxSpeed, float
waitMin, float waitRand, PUFF_PARTICLE_TYPE particleType);
+ SmokingTrajectoryParticle2D(const fXYZ &pos, int maxSpeed, float
waitMin,
+ float waitRand,
PUFF_PARTICLE_TYPE particleType);
virtual void sim();
Index: netpanzer/src/Lib/Particles/SmolderParticleSystem2D.cpp
diff -u netpanzer/src/Lib/Particles/SmolderParticleSystem2D.cpp:1.1
netpanzer/src/Lib/Particles/SmolderParticleSystem2D.cpp:1.2
--- netpanzer/src/Lib/Particles/SmolderParticleSystem2D.cpp:1.1 Sun Dec 1
12:51:45 2002
+++ netpanzer/src/Lib/Particles/SmolderParticleSystem2D.cpp Mon Sep 1
16:24:19 2003
@@ -15,7 +15,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "SmolderParticleSystem2D.hpp"
#include "TimerInterface.hpp"
Index: netpanzer/src/Lib/Particles/SmolderParticleSystem2D.hpp
diff -u netpanzer/src/Lib/Particles/SmolderParticleSystem2D.hpp:1.1
netpanzer/src/Lib/Particles/SmolderParticleSystem2D.hpp:1.2
--- netpanzer/src/Lib/Particles/SmolderParticleSystem2D.hpp:1.1 Sun Dec 1
12:51:45 2002
+++ netpanzer/src/Lib/Particles/SmolderParticleSystem2D.hpp Mon Sep 1
16:24:19 2003
@@ -20,7 +20,7 @@
#define __SmolderParticleSystem2D_hpp__
-#include "stdafx.hpp"
+
#include "ParticleSystem2D.hpp"
#include "PuffParticle2D.hpp"
Index: netpanzer/src/Lib/Particles/SnowParticle2D.cpp
diff -u netpanzer/src/Lib/Particles/SnowParticle2D.cpp:1.1
netpanzer/src/Lib/Particles/SnowParticle2D.cpp:1.2
--- netpanzer/src/Lib/Particles/SnowParticle2D.cpp:1.1 Sun Dec 1 12:51:45 2002
+++ netpanzer/src/Lib/Particles/SnowParticle2D.cpp Mon Sep 1 16:24:19 2003
@@ -15,7 +15,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "SnowParticle2D.hpp"
Index: netpanzer/src/Lib/Particles/SnowParticle2D.hpp
diff -u netpanzer/src/Lib/Particles/SnowParticle2D.hpp:1.1
netpanzer/src/Lib/Particles/SnowParticle2D.hpp:1.2
--- netpanzer/src/Lib/Particles/SnowParticle2D.hpp:1.1 Sun Dec 1 12:51:45 2002
+++ netpanzer/src/Lib/Particles/SnowParticle2D.hpp Mon Sep 1 16:24:19 2003
@@ -20,7 +20,7 @@
#define __SnowParticle2D_hpp__
-#include "stdafx.hpp"
+
#include "Surface.hpp"
#include "fXYZ.hpp"
#include "SpriteSorter.hpp"
Index: netpanzer/src/Lib/Particles/SnowParticleSystem2D.cpp
diff -u netpanzer/src/Lib/Particles/SnowParticleSystem2D.cpp:1.1
netpanzer/src/Lib/Particles/SnowParticleSystem2D.cpp:1.2
--- netpanzer/src/Lib/Particles/SnowParticleSystem2D.cpp:1.1 Sun Dec 1
12:51:45 2002
+++ netpanzer/src/Lib/Particles/SnowParticleSystem2D.cpp Mon Sep 1
16:24:19 2003
@@ -15,7 +15,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "SnowParticleSystem2D.hpp"
#include "TimerInterface.hpp"
@@ -56,7 +56,7 @@
FUNC("SnowParticleSystem2D::init");
snowParticles = new SnowParticle2D [SNOW_PARTICLE_COUNT];
- assert(snowParticles != NULL);
+ assert(snowParticles != 0);
for (unsigned num = 0; num < SNOW_PARTICLE_COUNT; num++)
{
Index: netpanzer/src/Lib/Particles/SnowParticleSystem2D.hpp
diff -u netpanzer/src/Lib/Particles/SnowParticleSystem2D.hpp:1.1
netpanzer/src/Lib/Particles/SnowParticleSystem2D.hpp:1.2
--- netpanzer/src/Lib/Particles/SnowParticleSystem2D.hpp:1.1 Sun Dec 1
12:51:45 2002
+++ netpanzer/src/Lib/Particles/SnowParticleSystem2D.hpp Mon Sep 1
16:24:19 2003
@@ -20,7 +20,7 @@
#define __SnowParticleSystem2D_hpp__
-#include "stdafx.hpp"
+
#include "ParticleSystem2D.hpp"
#include "SnowParticle2D.hpp"
Index: netpanzer/src/Lib/Particles/SparkParticle2D.cpp
diff -u netpanzer/src/Lib/Particles/SparkParticle2D.cpp:1.1
netpanzer/src/Lib/Particles/SparkParticle2D.cpp:1.2
--- netpanzer/src/Lib/Particles/SparkParticle2D.cpp:1.1 Sun Dec 1 12:51:45 2002
+++ netpanzer/src/Lib/Particles/SparkParticle2D.cpp Mon Sep 1 16:24:19 2003
@@ -15,7 +15,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "SparkParticle2D.hpp"
#include "TimerInterface.hpp"
@@ -28,9 +28,11 @@
{
curFrame = 0;
- packedSurface.setData(sparkSprite);
+ // XXX only a setData for packedSurface defined?!?
+ // packedSurface.setData(sparkSprite);
- packedSurface.yPos = rand() % 20 + 10;
+ // XXX
+ //packedSurface.yPos = rand() % 20 + 10;
} // end SparkParticle2D
@@ -72,7 +74,7 @@
} else
{
packedSurface.setFrame(curFrame);
- packedSurface.setAttrib( PointXYi(pos.x, pos.z), 3);
+ packedSurface.setAttrib( PointXYi((int) pos.x, (int)
pos.z), 3);
sorter.addSprite(&packedSurface);
//spark.blt(dest, iXY(x, z));
}
Index: netpanzer/src/Lib/Particles/SparkParticle2D.hpp
diff -u netpanzer/src/Lib/Particles/SparkParticle2D.hpp:1.1
netpanzer/src/Lib/Particles/SparkParticle2D.hpp:1.2
--- netpanzer/src/Lib/Particles/SparkParticle2D.hpp:1.1 Sun Dec 1 12:51:45 2002
+++ netpanzer/src/Lib/Particles/SparkParticle2D.hpp Mon Sep 1 16:24:19 2003
@@ -20,7 +20,7 @@
#define __SparkParticle2D_hpp__
-#include "stdafx.hpp"
+
#include "Particle2D.hpp"
Index: netpanzer/src/Lib/Particles/TemplateExplosionSystem.cpp
diff -u netpanzer/src/Lib/Particles/TemplateExplosionSystem.cpp:1.1
netpanzer/src/Lib/Particles/TemplateExplosionSystem.cpp:1.2
--- netpanzer/src/Lib/Particles/TemplateExplosionSystem.cpp:1.1 Sun Dec 1
12:51:45 2002
+++ netpanzer/src/Lib/Particles/TemplateExplosionSystem.cpp Mon Sep 1
16:24:19 2003
@@ -15,7 +15,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "TemplateExplosionSystem.hpp"
#include "ChunkTrajectoryParticle2D.hpp"
#include "FlameParticle2D.hpp"
Index: netpanzer/src/Lib/Particles/TemplateMuzzleSystem.cpp
diff -u netpanzer/src/Lib/Particles/TemplateMuzzleSystem.cpp:1.1
netpanzer/src/Lib/Particles/TemplateMuzzleSystem.cpp:1.2
--- netpanzer/src/Lib/Particles/TemplateMuzzleSystem.cpp:1.1 Sun Dec 1
12:51:45 2002
+++ netpanzer/src/Lib/Particles/TemplateMuzzleSystem.cpp Mon Sep 1
16:24:19 2003
@@ -15,7 +15,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "TemplateMuzzleSystem.hpp"
#include "VectorPuffParticle2D.hpp"
#include "Math.hpp"
Index: netpanzer/src/Lib/Particles/TrajectoryParticle2D.cpp
diff -u netpanzer/src/Lib/Particles/TrajectoryParticle2D.cpp:1.1
netpanzer/src/Lib/Particles/TrajectoryParticle2D.cpp:1.2
--- netpanzer/src/Lib/Particles/TrajectoryParticle2D.cpp:1.1 Sun Dec 1
12:51:45 2002
+++ netpanzer/src/Lib/Particles/TrajectoryParticle2D.cpp Mon Sep 1
16:24:19 2003
@@ -15,7 +15,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "TrajectoryParticle2D.hpp"
#include "Physics.hpp"
#include "Math.hpp"
Index: netpanzer/src/Lib/Particles/VectorPuffParticle2D.cpp
diff -u netpanzer/src/Lib/Particles/VectorPuffParticle2D.cpp:1.1
netpanzer/src/Lib/Particles/VectorPuffParticle2D.cpp:1.2
--- netpanzer/src/Lib/Particles/VectorPuffParticle2D.cpp:1.1 Sun Dec 1
12:51:45 2002
+++ netpanzer/src/Lib/Particles/VectorPuffParticle2D.cpp Mon Sep 1
16:24:19 2003
@@ -15,7 +15,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "VectorPuffParticle2D.hpp"
#include "PuffParticle2D.hpp"
#include "TimerInterface.hpp"
Index: netpanzer/src/Lib/Particles/VectorPuffParticle2D.hpp
diff -u netpanzer/src/Lib/Particles/VectorPuffParticle2D.hpp:1.1
netpanzer/src/Lib/Particles/VectorPuffParticle2D.hpp:1.2
--- netpanzer/src/Lib/Particles/VectorPuffParticle2D.hpp:1.1 Sun Dec 1
12:51:45 2002
+++ netpanzer/src/Lib/Particles/VectorPuffParticle2D.hpp Mon Sep 1
16:24:19 2003
@@ -20,7 +20,7 @@
#define __VectorPuffParticle2D_hpp__
-#include "stdafx.hpp"
+
#include "WindParticle2D.hpp"
Index: netpanzer/src/Lib/Particles/WindParticle2D.cpp
diff -u netpanzer/src/Lib/Particles/WindParticle2D.cpp:1.1
netpanzer/src/Lib/Particles/WindParticle2D.cpp:1.2
--- netpanzer/src/Lib/Particles/WindParticle2D.cpp:1.1 Sun Dec 1 12:51:45 2002
+++ netpanzer/src/Lib/Particles/WindParticle2D.cpp Mon Sep 1 16:24:19 2003
@@ -15,7 +15,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "WindParticle2D.hpp"
#include "Physics.hpp"
Index: netpanzer/src/Lib/Physics.cpp
diff -u netpanzer/src/Lib/Physics.cpp:1.1 netpanzer/src/Lib/Physics.cpp:1.2
--- netpanzer/src/Lib/Physics.cpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/Physics.cpp Mon Sep 1 16:24:18 2003
@@ -15,7 +15,9 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
+#include <string.h>
+#include <stdlib.h>
#include "Physics.hpp"
#include "TimerInterface.hpp"
#include "Math.hpp"
Index: netpanzer/src/Lib/Physics.hpp
diff -u netpanzer/src/Lib/Physics.hpp:1.1 netpanzer/src/Lib/Physics.hpp:1.2
--- netpanzer/src/Lib/Physics.hpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/Physics.hpp Mon Sep 1 16:24:18 2003
@@ -18,11 +18,6 @@
#ifndef __Physics_hpp__
#define __Physics_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
#include "fXYZ.hpp"
////////////////////////////////////////////////////////////////////////////
@@ -32,7 +27,6 @@
class Physics
{
public:
-
class Wind
{
friend class Physics;
Index: netpanzer/src/Lib/Types/LibTypes.hpp
diff -u netpanzer/src/Lib/Types/LibTypes.hpp:1.1
netpanzer/src/Lib/Types/LibTypes.hpp:1.2
--- netpanzer/src/Lib/Types/LibTypes.hpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/Types/LibTypes.hpp Mon Sep 1 16:24:19 2003
@@ -19,23 +19,14 @@
#ifndef __LibTypes_hpp__
#define __LibTypes_hpp__
-
#if _MSC_VER > 1000
#pragma once
#endif
-
typedef unsigned char BYTE; // 8 - bits
typedef unsigned short WORD; // 16 - bits
typedef unsigned long DWORD; // 32 - bits
-typedef int BOOL;
-
-#ifndef TRUE
- const BOOL TRUE = (7 == 7);
- const BOOL FALSE = (7 != 7);
-#endif
-
enum
{
HORIZONTAL = 0,
@@ -46,6 +37,6 @@
#define PI 3.14159265358979323846
#endif
-#define randomize() srand(time(NULL))
+#define randomize() srand(time(0))
#endif // __LibTypes_hpp__
Index: netpanzer/src/Lib/Types/fRect.cpp
diff -u netpanzer/src/Lib/Types/fRect.cpp:1.1
netpanzer/src/Lib/Types/fRect.cpp:1.2
--- netpanzer/src/Lib/Types/fRect.cpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/Types/fRect.cpp Mon Sep 1 16:24:19 2003
@@ -15,7 +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 "stdafx.hpp"
+
+#include "codewiz.hpp"
#include "fRect.hpp"
fRect fRect::operator | (const fRect &a)
Index: netpanzer/src/Lib/Types/fRect.hpp
diff -u netpanzer/src/Lib/Types/fRect.hpp:1.1
netpanzer/src/Lib/Types/fRect.hpp:1.2
--- netpanzer/src/Lib/Types/fRect.hpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/Types/fRect.hpp Mon Sep 1 16:24:19 2003
@@ -18,14 +18,7 @@
#ifndef __fRect_hpp__
#define __fRect_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
#include "fXY.hpp"
-
//--------------------------------------------------------------------------
struct fRect
Index: netpanzer/src/Lib/Types/fXYZ.cpp
diff -u netpanzer/src/Lib/Types/fXYZ.cpp:1.1
netpanzer/src/Lib/Types/fXYZ.cpp:1.2
--- netpanzer/src/Lib/Types/fXYZ.cpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/Types/fXYZ.cpp Mon Sep 1 16:24:19 2003
@@ -15,7 +15,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "fXYZ.hpp"
const fXYZ fXYZ::ZERO(0.0, 0.0, 0.0);
Index: netpanzer/src/Lib/Types/fXYZ.hpp
diff -u netpanzer/src/Lib/Types/fXYZ.hpp:1.1
netpanzer/src/Lib/Types/fXYZ.hpp:1.2
--- netpanzer/src/Lib/Types/fXYZ.hpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/Types/fXYZ.hpp Mon Sep 1 16:24:19 2003
@@ -18,13 +18,8 @@
#ifndef __fXYZ_hpp__
#define __fXYZ_hpp__
+#include <math.h>
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
-#include "stdafx.hpp"
#include "fXY.hpp"
class Matrix;
@@ -94,7 +89,6 @@
inline fXYZ &operator *=( float a) { x *= a; y *= a; z *=
a; return *this; }
inline fXYZ &operator *=(const fXYZ &a) { x *= a.x; y *= a.y; z *=
a.z; return *this; }
inline fXYZ &operator /=( float a) { x /= a; y /= a; z /=
a; return *this; }
- inline fXYZ &operator /=(const float &a) { x /= a; y /= a; z /=
a; return *this; }
inline int operator <=(const float &a)
{
@@ -115,7 +109,7 @@
return fXYZ(x * a, y * a, z * a);
}
- inline fXYZ &normalize() { return *this /= float(mag()); }
+ inline fXYZ &normalize() { return *this /= float(mag()); }
inline fXY project() const
{
Index: netpanzer/src/Lib/Types/iRect.cpp
diff -u netpanzer/src/Lib/Types/iRect.cpp:1.1
netpanzer/src/Lib/Types/iRect.cpp:1.2
--- netpanzer/src/Lib/Types/iRect.cpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/Types/iRect.cpp Mon Sep 1 16:24:19 2003
@@ -15,7 +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 "stdafx.hpp"
+
+#include "codewiz.hpp"
#include "iRect.hpp"
iRect iRect::operator | (const iRect &a)
Index: netpanzer/src/Lib/Types/iRect.hpp
diff -u netpanzer/src/Lib/Types/iRect.hpp:1.1
netpanzer/src/Lib/Types/iRect.hpp:1.2
--- netpanzer/src/Lib/Types/iRect.hpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/Types/iRect.hpp Mon Sep 1 16:24:19 2003
@@ -18,15 +18,8 @@
#ifndef __iRect_hpp__
#define __iRect_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
#include "iXY.hpp"
-
struct iRect
{
iXY min;
@@ -48,7 +41,7 @@
max = a.max;
}
- inline iRect(iXY &min, iXY &max)
+ inline iRect(const iXY &min, const iXY &max)
{
iRect::min = min;
iRect::max = max;
Index: netpanzer/src/Lib/Types/iXY.cpp
diff -u netpanzer/src/Lib/Types/iXY.cpp:1.1 netpanzer/src/Lib/Types/iXY.cpp:1.2
--- netpanzer/src/Lib/Types/iXY.cpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/Types/iXY.cpp Mon Sep 1 16:24:19 2003
@@ -15,7 +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 "stdafx.hpp"
+
+#include <math.h>
#include "iXY.hpp"
double iXY::mag() const
Index: netpanzer/src/Lib/View/AbstractButton.cpp
diff -u netpanzer/src/Lib/View/AbstractButton.cpp:1.1
netpanzer/src/Lib/View/AbstractButton.cpp:1.2
--- netpanzer/src/Lib/View/AbstractButton.cpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/View/AbstractButton.cpp Mon Sep 1 16:24:19 2003
@@ -16,7 +16,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "AbstractButton.hpp"
// actionPerformed
Index: netpanzer/src/Lib/View/AbstractButton.hpp
diff -u netpanzer/src/Lib/View/AbstractButton.hpp:1.1
netpanzer/src/Lib/View/AbstractButton.hpp:1.2
--- netpanzer/src/Lib/View/AbstractButton.hpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/View/AbstractButton.hpp Mon Sep 1 16:24:19 2003
@@ -70,7 +70,8 @@
const Surface &getSelectedIcon() { return selectedIcon; }
const String &getText() { return text; }
- bool isRolloverEnabled() { return isRolloverEnabled; }
+ // XXX doesn't seem to be defined
+ //bool isRolloverEnabled() { return isRolloverEnabled; }
void setDisabledIcon(const Icon &disabledIcon) {}
void setEnabled(bool b) { enabled = b; }
Index: netpanzer/src/Lib/View/Button.cpp
diff -u netpanzer/src/Lib/View/Button.cpp:1.1
netpanzer/src/Lib/View/Button.cpp:1.2
--- netpanzer/src/Lib/View/Button.cpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/View/Button.cpp Mon Sep 1 16:24:19 2003
@@ -16,7 +16,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "Button.hpp"
#include "ViewGlobals.hpp"
#include "MouseEvent.hpp"
Index: netpanzer/src/Lib/View/Button.hpp
diff -u netpanzer/src/Lib/View/Button.hpp:1.1
netpanzer/src/Lib/View/Button.hpp:1.2
--- netpanzer/src/Lib/View/Button.hpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/View/Button.hpp Mon Sep 1 16:24:19 2003
@@ -19,12 +19,6 @@
#ifndef __Button_hpp__
#define __Button_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
#include "Component.hpp"
Index: netpanzer/src/Lib/View/CheckBox.cpp
diff -u netpanzer/src/Lib/View/CheckBox.cpp:1.1
netpanzer/src/Lib/View/CheckBox.cpp:1.2
--- netpanzer/src/Lib/View/CheckBox.cpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/View/CheckBox.cpp Mon Sep 1 16:24:19 2003
@@ -16,7 +16,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "CheckBox.hpp"
#include "MouseEvent.hpp"
Index: netpanzer/src/Lib/View/Choice.cpp
diff -u netpanzer/src/Lib/View/Choice.cpp:1.1
netpanzer/src/Lib/View/Choice.cpp:1.2
--- netpanzer/src/Lib/View/Choice.cpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/View/Choice.cpp Mon Sep 1 16:24:19 2003
@@ -16,7 +16,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "Choice.hpp"
#include "View.hpp"
Index: netpanzer/src/Lib/View/Component.cpp
diff -u netpanzer/src/Lib/View/Component.cpp:1.1
netpanzer/src/Lib/View/Component.cpp:1.2
--- netpanzer/src/Lib/View/Component.cpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/View/Component.cpp Mon Sep 1 16:24:19 2003
@@ -16,7 +16,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "Component.hpp"
#include "ViewGlobals.hpp"
#include "View.hpp"
@@ -33,10 +33,10 @@
min.zero();
enabled = true;
visible = true;
- parent = NULL;
+ parent = 0;
//name = strdup("");
- //if (name = NULL)
+ //if (name = 0)
//{
// FUBAR("ERROR: Unable to allocate component name.");
//}
@@ -56,10 +56,10 @@
//---------------------------------------------------------------------------
void Component::setParent(void *parent)
{
- assert(parent != NULL);
- if (parent == NULL)
+ assert(parent != 0);
+ if (parent == 0)
{
- FUBAR("ERROR: Component parent == NULL");
+ FUBAR("ERROR: Component parent == 0");
}
Component::parent = parent;
Index: netpanzer/src/Lib/View/Component.hpp
diff -u netpanzer/src/Lib/View/Component.hpp:1.1
netpanzer/src/Lib/View/Component.hpp:1.2
--- netpanzer/src/Lib/View/Component.hpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/View/Component.hpp Mon Sep 1 16:24:19 2003
@@ -87,7 +87,7 @@
//const Component &operator=(const Component &)
- ~Component() {}
+ virtual ~Component() {}
// Accessor functions.
bool contains(int x, int y) const;
Index: netpanzer/src/Lib/View/Cursor.cpp
diff -u netpanzer/src/Lib/View/Cursor.cpp:1.1
netpanzer/src/Lib/View/Cursor.cpp:1.2
--- netpanzer/src/Lib/View/Cursor.cpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/View/Cursor.cpp Mon Sep 1 16:24:19 2003
@@ -16,5 +16,5 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "Cursor.hpp"
Index: netpanzer/src/Lib/View/Desktop.cpp
diff -u netpanzer/src/Lib/View/Desktop.cpp:1.1
netpanzer/src/Lib/View/Desktop.cpp:1.2
--- netpanzer/src/Lib/View/Desktop.cpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/View/Desktop.cpp Mon Sep 1 16:24:19 2003
@@ -15,14 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
-#include "stdafx.hpp"
#include "Desktop.hpp"
#include "KeyboardInterface.hpp"
#include "loadPics.hpp"
@@ -61,8 +53,8 @@
//--------------------------------------------------------------------------
Desktop::Desktop()
{
- top = NULL;
- focus = NULL;
+ top = 0;
+ focus = 0;
mouseActions = 0;
prevButton = 0;
@@ -89,17 +81,17 @@
// Check for mouseEnter and mouseExit.
if (mouseView != prevMouseView)
{
- if (mouseView != NULL)
+ if (mouseView != 0)
{
mouseView->mouseEnter(mouseView->getScreenToClientPos(mousePos));
}
- if (prevMouseView != NULL)
+ if (prevMouseView != 0)
{
prevMouseView->mouseExit(prevMouseView->getScreenToClientPos(mousePos));
}
}
- if (mouseView != NULL)
+ if (mouseView != 0)
{
mouseView->mouseMove(mouseView->getScreenToClientPos(prevMousePos),
mouseView->getScreenToClientPos(mousePos));
}
@@ -125,9 +117,10 @@
lMouseDownPos = mousePos;
// Is this a double click? **FIX THE DOUBLE CLICK
SENSITIVITY**
- if (lMouseView != NULL)
+ if (lMouseView != 0)
{
- int shit = 123456789;
+ // XXX what is this? ;-) commented out to avoid
warning
+ //int shit = 123456789;
} else
{
@@ -135,7 +128,7 @@
// Not a double click. See what window we're
over
lMouseView = mouseView;
- if (lMouseView != NULL)
+ if (lMouseView != 0)
{
//LOG_BLOCK(("Setting lMouseView"));
@@ -195,7 +188,7 @@
// The mouse was down before and is still down. Are we
performing
// and standard window actions?
- if (lMouseView != NULL && mouseActions != 0)
+ if (lMouseView != 0 && mouseActions != 0)
{
//FUBAR("Double click!");
@@ -233,7 +226,7 @@
// No standard mouse actions. Tell the
window where the mouse
// was originally clicked that the
mouse is being dragged over
// it.
- if (lMouseView != NULL)
+ if (lMouseView != 0)
{
lMouseView->lMouseDrag(lMouseView->getScreenToClientPos(lMouseDownPos),
lMouseView->getScreenToClientPos(prevMousePos),
lMouseView->getScreenToClientPos(mousePos));
}
@@ -247,7 +240,7 @@
{
// The mouse button just got released. If it was on
top of a window
// before, then tell the window that the button was
released
- if (lMouseView != NULL)
+ if (lMouseView != 0)
{
lMouseView->lMouseUp(lMouseView->getScreenToClientPos(lMouseDownPos),
lMouseView->getScreenToClientPos(mousePos));
}
@@ -256,7 +249,7 @@
}
//LOG(("Button released - clearing lMouseView and
mouseActions"));
- lMouseView = NULL;
+ lMouseView = 0;
mouseActions = 0;
}
@@ -277,7 +270,7 @@
rMouseDownPos = mousePos;
// Is this a double click? **FIX THE DOUBLE CLICK
SENSITIVITY**
- if (rMouseView != NULL && now() <= rDoubleClickDeadline
&& 0)
+ if (rMouseView != 0 && now() <= rDoubleClickDeadline &&
0)
{
//FUBAR("Double click!");
@@ -287,7 +280,7 @@
{
// Not a double click. See what window we're
over.
rMouseView = mouseView;
- if (rMouseView != NULL)
+ if (rMouseView != 0)
{
// No standard mouse actions. Tell the
window that the mouse
// just got pressed.
@@ -301,7 +294,7 @@
// No standard mouse actions. Tell the window where the mouse
// was originally clicked that the mouse is being dragged over
// it.
- if (rMouseView != NULL) {
+ if (rMouseView != 0) {
rMouseView->rMouseDrag(rMouseView->getScreenToClientPos(rMouseDownPos),
rMouseView->getScreenToClientPos(prevMousePos),
rMouseView->getScreenToClientPos(mousePos));
}
}
@@ -313,7 +306,7 @@
{
// The mouse button just got released. If it was on top of a window
// before, then tell the window that the button was released
- if (rMouseView != NULL)
+ if (rMouseView != 0)
{
rMouseView->rMouseUp(rMouseView->getScreenToClientPos(rMouseDownPos),
rMouseView->getScreenToClientPos(mousePos));
}
@@ -321,7 +314,7 @@
// Set double click deadline
rDoubleClickDeadline = now() + doubleClickTime;
}
- rMouseView = NULL;
+ rMouseView = 0;
}
//if (curButton & 2)
@@ -338,7 +331,7 @@
// Send a message to the top (active) window of the position
// of the mouse.
- //if (focus != NULL)
+ //if (focus != 0)
//focus->mouseMove(focus->getScreenToClientPos(prevMousePos),
focus->getScreenToClientPos(mousePos));
@@ -353,11 +346,11 @@
//mouseView = findViewContaining(mousePos);
unsigned effActions = mouseActions;
- if (mouseView != NULL && effActions == 0) {
+ if (mouseView != 0 && effActions == 0) {
effActions =
mouseView->getMouseActions(mousePos-mouseView->min);
}
- Surface *pointer = &mouseArrow;
+ //Surface *pointer = &mouseArrow;
//if (mouseView->status & View::STATUS_ALLOW_RESIZE &&
mouseView->status & View::STATUS_ACTIVE)
//{
@@ -471,7 +464,7 @@
*/
//mouse.setPointer(pointer);
- if (focus != NULL)
+ if (focus != 0)
{
focus->processEvents();
KeyboardInterface::flushCharBuffer();
@@ -490,7 +483,7 @@
size_t viewCount = 0;
View *list[MAX_WINDOWS];
- for (View *w = top ; w != NULL ; w = w->next)
+ for (View *w = top ; w != 0 ; w = w->next)
{
list[viewCount++] = w;
}
@@ -501,14 +494,14 @@
list[n]->draw();
}
- //if (mouseView != NULL) mouseView->drawToolTip(screen);
+ //if (mouseView != 0) mouseView->drawToolTip(screen);
} // end draw
// add
//--------------------------------------------------------------------------
// Purpose: Adds a new window to the end of the current window list.
//--------------------------------------------------------------------------
-void Desktop::add(View *view, bool autoActivate /* = TRUE */)
+void Desktop::add(View *view, bool autoActivate /* = true */)
{
assert(isValidPtr(view));
@@ -520,11 +513,11 @@
// Insert the guy at the end of the list, while checking that the
window is
// not inserted before some window which should always remain on the bottom.
View **prevLink = ⊤
- while (*prevLink != NULL /*&& !((*prevLink)->status &
View::STATUS_ALWAYS_ON_BOTTOM)*/)
+ while (*prevLink != 0 /*&& !((*prevLink)->status &
View::STATUS_ALWAYS_ON_BOTTOM)*/)
prevLink = &(*prevLink)->next;
*prevLink = view;
- view->next = NULL;
+ view->next = 0;
if (autoActivate) activate(view);
@@ -536,13 +529,13 @@
//---------------------------------------------------------------------------
void Desktop::activate(View *view)
{
- assert(view != NULL);
+ assert(view != 0);
// If the top window equals the window to activate, then nothing needs
to
// be done.
if (focus != view)
{
- if (focus != NULL)
+ if (focus != 0)
{
focus->deactivate();
}
@@ -573,7 +566,7 @@
{
View **prevLink = ⊤
- while (*prevLink != NULL)
+ while (*prevLink != 0)
{
if (*prevLink == view)
{
@@ -589,12 +582,12 @@
//--------------------------------------------------------------------------
View *Desktop::findViewContaining(iXY pos)
{
- for (View *view = top ; view != NULL ; view = view->next)
+ for (View *view = top ; view != 0 ; view = view->next)
{
if (view->status & View::STATUS_VISIBLE)
if (view->contains(pos)) return view;
}
- return NULL;
+ return 0;
} // end findViewContaining
// removeView
@@ -603,12 +596,12 @@
//--------------------------------------------------------------------------
bool Desktop::removeView(const char *searchName)
{
- for (View *view = top; view != NULL; view = view->next)
+ for (View *view = top; view != 0; view = view->next)
{
if (strcmp(view->searchName, searchName) == 0)
{
remove(view);
- return TRUE;
+ return true;
}
}
return false;
@@ -620,7 +613,7 @@
//--------------------------------------------------------------------------
void Desktop::removeAllViewAlwaysOnBottom()
{
- for (View *view = top; view != NULL; view = view->next)
+ for (View *view = top; view != 0; view = view->next)
{
if (view->getAlwaysOnBottom())
{
@@ -636,7 +629,7 @@
//--------------------------------------------------------------------------
void Desktop::toggleVisibility(const char *searchName)
{
- for (View *view = top; view != NULL; view = view->next)
+ for (View *view = top; view != 0; view = view->next)
{
if (strcmp(view->searchName, searchName) == 0)
{
@@ -662,7 +655,7 @@
//--------------------------------------------------------------------------
void Desktop::checkViewPositions()
{
- for (View *view = top; view != NULL; view = view->next)
+ for (View *view = top; view != 0; view = view->next)
{
view->moveTo(view->min);
}
@@ -676,7 +669,7 @@
//--------------------------------------------------------------------------
void Desktop::toggleVisibilityNoDoAnything(const char *searchName)
{
- for (View *view = top; view != NULL; view = view->next)
+ for (View *view = top; view != 0; view = view->next)
{
if (strcmp(view->searchName, searchName) == 0)
{
@@ -692,7 +685,7 @@
//--------------------------------------------------------------------------
void Desktop::setActiveView(const char *searchName)
{
- for (View *view = top; view != NULL; view = view->next)
+ for (View *view = top; view != 0; view = view->next)
{
if (strcmp(view->searchName, searchName) == 0)
{
@@ -711,7 +704,7 @@
//--------------------------------------------------------------------------
void Desktop::setActiveView(View *view)
{
- for (View *v = top; v != NULL; v = v->next)
+ for (View *v = top; v != 0; v = v->next)
{
if (v == view)
{
@@ -732,7 +725,7 @@
iXY mouse(mouseX, mouseY);
View *mouseView = findViewContaining(mouse);
- if (mouseView == NULL) return 0;
+ if (mouseView == 0) return 0;
// Only let the top window be resized
if (mouseView == top) return mouseView->getMouseActions(mouse);
@@ -745,7 +738,7 @@
//--------------------------------------------------------------------------
void Desktop::doMouseActions(const iXY &mousePos)
{
- if (lMouseView == NULL) return;
+ if (lMouseView == 0) return;
if (mouseActions & View::MA_MOVE)
{
@@ -795,7 +788,7 @@
//--------------------------------------------------------------------------
char *Desktop::getTopViewTitle()
{
- if (top != NULL)
+ if (top != 0)
{
return top->title;
}
@@ -810,7 +803,7 @@
//--------------------------------------------------------------------------
char *Desktop::getMouseViewTitle()
{
- if (mouseView != NULL)
+ if (mouseView != 0)
{
return mouseView->title;
}
@@ -825,7 +818,7 @@
//--------------------------------------------------------------------------
unsigned Desktop::getMouseViewStatus()
{
- if (mouseView != NULL) return mouseView->status;
+ if (mouseView != 0) return mouseView->status;
else return 0;
} // end getMouseViewStatus
@@ -840,7 +833,7 @@
int viewCount = 0;
View *list[MAX_WINDOWS];
- for (View *view = top ; view != NULL ; view = view->next)
+ for (View *view = top ; view != 0 ; view = view->next)
{
if (viewCount > MAX_WINDOWS) assert(false);
list[viewCount++] = view;
@@ -862,7 +855,7 @@
// Goes through the window list till we get the requested window.
for (int num = 0; num < winNum; num++)
{
- assert(w != NULL);
+ assert(w != 0);
w = w->next;
}
@@ -884,7 +877,7 @@
// Goes through the window list till we get the requested window.
for (int num = 0; num < winNum; num++)
{
- assert(w != NULL);
+ assert(w != 0);
w = w->next;
}
@@ -899,7 +892,7 @@
//--------------------------------------------------------------------------
int Desktop::getViewStatus(const char *searchName)
{
- for (View *view = top; view != NULL; view = view->next)
+ for (View *view = top; view != 0; view = view->next)
{
if (strcmp(view->searchName, searchName) == 0)
{
@@ -921,7 +914,7 @@
int viewCount = 0;
View *list[MAX_WINDOWS];
- for (View *w = top ; w != NULL ; w = w->next)
+ for (View *w = top ; w != 0 ; w = w->next)
{
// Bounds checking.
if (viewCount > MAX_WINDOWS) assert(false);
@@ -931,7 +924,7 @@
{
w->status &= ~View::STATUS_VISIBLE;
- return TRUE;
+ return true;
}
list[viewCount++] = w;
@@ -947,7 +940,7 @@
//--------------------------------------------------------------------------
void Desktop::setVisibility(const char *searchName, int isVisible)
{
- for (View *view = top; view != NULL; view = view->next)
+ for (View *view = top; view != 0; view = view->next)
{
if (strcmp(view->searchName, searchName) == 0)
{
@@ -973,7 +966,7 @@
//--------------------------------------------------------------------------
void Desktop::setVisibilityNoDoAnything(const char *searchName, int isVisible)
{
- for (View *view = top; view != NULL; view = view->next)
+ for (View *view = top; view != 0; view = view->next)
{
if (strcmp(view->searchName, searchName) == 0)
{
Index: netpanzer/src/Lib/View/Desktop.hpp
diff -u netpanzer/src/Lib/View/Desktop.hpp:1.1
netpanzer/src/Lib/View/Desktop.hpp:1.2
--- netpanzer/src/Lib/View/Desktop.hpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/View/Desktop.hpp Mon Sep 1 16:24:20 2003
@@ -93,7 +93,7 @@
static void setVisibility(const char *viewName, int isVisible);
static void toggleVisibilityNoDoAnything(const char *viewName);
static void setVisibilityNoDoAnything(const char *viewName, int
isVisible);
- static void add(View *view, bool autoActivate = TRUE);
+ static void add(View *view, bool autoActivate = true);
static void remove(View *view);
static void draw();
@@ -154,7 +154,7 @@
static View *getView(const char *searchName)
{
- for (View *view = top ; view != NULL ; view = view->next)
+ for (View *view = top ; view != 0 ; view = view->next)
{
if (strcmp(view->searchName, searchName) == 0)
{
@@ -162,7 +162,7 @@
}
}
- return NULL;
+ return 0;
}
static void checkViewPositions();
Index: netpanzer/src/Lib/View/Dialog.cpp
diff -u netpanzer/src/Lib/View/Dialog.cpp:1.1
netpanzer/src/Lib/View/Dialog.cpp:1.2
--- netpanzer/src/Lib/View/Dialog.cpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/View/Dialog.cpp Mon Sep 1 16:24:20 2003
@@ -16,5 +16,5 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "Dialog.hpp"
Index: netpanzer/src/Lib/View/FileDialog.cpp
diff -u netpanzer/src/Lib/View/FileDialog.cpp:1.1
netpanzer/src/Lib/View/FileDialog.cpp:1.2
--- netpanzer/src/Lib/View/FileDialog.cpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/View/FileDialog.cpp Mon Sep 1 16:24:20 2003
@@ -16,5 +16,5 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "FileDialog.hpp"
Index: netpanzer/src/Lib/View/Icon.cpp
diff -u netpanzer/src/Lib/View/Icon.cpp:1.1 netpanzer/src/Lib/View/Icon.cpp:1.2
--- netpanzer/src/Lib/View/Icon.cpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/View/Icon.cpp Mon Sep 1 16:24:20 2003
@@ -16,5 +16,5 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "Icon.hpp"
Index: netpanzer/src/Lib/View/InputEvent.hpp
diff -u netpanzer/src/Lib/View/InputEvent.hpp:1.1
netpanzer/src/Lib/View/InputEvent.hpp:1.2
--- netpanzer/src/Lib/View/InputEvent.hpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/View/InputEvent.hpp Mon Sep 1 16:24:20 2003
@@ -25,7 +25,7 @@
#endif
-#include "stdafx.hpp"
+
#include "cTimeStamp.hpp"
Index: netpanzer/src/Lib/View/Label.cpp
diff -u netpanzer/src/Lib/View/Label.cpp:1.1
netpanzer/src/Lib/View/Label.cpp:1.2
--- netpanzer/src/Lib/View/Label.cpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/View/Label.cpp Mon Sep 1 16:24:20 2003
@@ -16,5 +16,5 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "Label.hpp"
Index: netpanzer/src/Lib/View/List.cpp
diff -u netpanzer/src/Lib/View/List.cpp:1.1 netpanzer/src/Lib/View/List.cpp:1.2
--- netpanzer/src/Lib/View/List.cpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/View/List.cpp Mon Sep 1 16:24:20 2003
@@ -16,5 +16,5 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "List.hpp"
Index: netpanzer/src/Lib/View/MouseEvent.hpp
diff -u netpanzer/src/Lib/View/MouseEvent.hpp:1.1
netpanzer/src/Lib/View/MouseEvent.hpp:1.2
--- netpanzer/src/Lib/View/MouseEvent.hpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/View/MouseEvent.hpp Mon Sep 1 16:24:20 2003
@@ -25,7 +25,7 @@
#endif
-#include "stdafx.hpp"
+
#include "Component.hpp"
#include "iXY.hpp"
#include "InputEvent.hpp"
Index: netpanzer/src/Lib/View/ScrollBar.cpp
diff -u netpanzer/src/Lib/View/ScrollBar.cpp:1.1
netpanzer/src/Lib/View/ScrollBar.cpp:1.2
--- netpanzer/src/Lib/View/ScrollBar.cpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/View/ScrollBar.cpp Mon Sep 1 16:24:20 2003
@@ -17,7 +17,7 @@
*/
-#include "stdafx.hpp"
+
#include "ScrollBar.hpp"
@@ -75,7 +75,7 @@
//---------------------------------------------------------------------------
void ScrollBar::setLocation()
{
- if (parent != NULL)
+ if (parent != 0)
{
if (orientation == HORIZONTAL)
{
@@ -100,7 +100,7 @@
//---------------------------------------------------------------------------
void ScrollBar::setSize()
{
- if (parent != NULL)
+ if (parent != 0)
{
if (orientation == HORIZONTAL)
{
@@ -173,7 +173,7 @@
//surface.drawButtonBorder(Color::gray192, Color::gray64);
if (orientation == VERTICAL)
{
- int midHandlePos = float(size.y) * percent;
+ int midHandlePos = (int) (float(size.y) * percent);
r = iRect(0, midHandlePos, size.x, midHandlePos);
surface.fillRect(r, Color::gray128);
@@ -181,7 +181,7 @@
} else if (orientation == HORIZONTAL)
{
- int midHandlePos = float(size.x) * percent;
+ int midHandlePos = (int) (float(size.x) * percent);
r = iRect(midHandlePos, 0, midHandlePos, size.y);
surface.fillRect(r, Color::gray128);
@@ -264,7 +264,7 @@
//---------------------------------------------------------------------------
void ScrollBar::actionPerformed(const iXY &pos)
{
- if (parent != NULL)
+ if (parent != 0)
{
iRect cr(((View *) parent)->getClientRect());
Index: netpanzer/src/Lib/View/String.cpp
diff -u netpanzer/src/Lib/View/String.cpp:1.1
netpanzer/src/Lib/View/String.cpp:1.2
--- netpanzer/src/Lib/View/String.cpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/View/String.cpp Mon Sep 1 16:24:20 2003
@@ -16,7 +16,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "String.hpp"
// String
@@ -27,7 +27,7 @@
{
length = strlen(string);
mem = new char [length + 1];
- if (mem == NULL)
+ if (mem == 0)
{
FUBAR("ERROR: Unable to allocate string.");
}
@@ -43,7 +43,7 @@
{
length = string.length;
mem = new char [length + 1];
- if (mem == NULL)
+ if (mem == 0)
{
FUBAR("ERROR: Unable to allocate string.");
}
@@ -71,7 +71,7 @@
delete [] mem;
length = string.length;
mem = new char [length + 1];
- if (mem == NULL)
+ if (mem == 0)
{
FUBAR("ERROR: Unable to allocate string.");
}
@@ -90,7 +90,7 @@
char *tempPtr = mem;
length += string.length;
mem = new char [length + 1];
- if (mem == NULL)
+ if (mem == 0)
{
FUBAR("ERROR: Unable to allocate string.");
}
Index: netpanzer/src/Lib/View/String.hpp
diff -u netpanzer/src/Lib/View/String.hpp:1.1
netpanzer/src/Lib/View/String.hpp:1.2
--- netpanzer/src/Lib/View/String.hpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/View/String.hpp Mon Sep 1 16:24:20 2003
@@ -19,6 +19,12 @@
#ifndef __String_hpp__
#define __String_hpp__
+#include <iostream>
+
+#include "codewiz.hpp"
+
+using std::ostream;
+using std::istream;
#if _MSC_VER > 1000
#pragma once
@@ -43,7 +49,10 @@
{
char temp[256];
- input >> setw(256) >> temp;
+ // XXX setw doesn't seem to be known...
+ //input >> setw(256) >> temp;
+ input >> temp;
+
string = temp;
return input;
Index: netpanzer/src/Lib/View/TextArea.cpp
diff -u netpanzer/src/Lib/View/TextArea.cpp:1.1
netpanzer/src/Lib/View/TextArea.cpp:1.2
--- netpanzer/src/Lib/View/TextArea.cpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/View/TextArea.cpp Mon Sep 1 16:24:20 2003
@@ -16,5 +16,5 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "TextArea.hpp"
Index: netpanzer/src/Lib/View/TextComponent.cpp
diff -u netpanzer/src/Lib/View/TextComponent.cpp:1.1
netpanzer/src/Lib/View/TextComponent.cpp:1.2
--- netpanzer/src/Lib/View/TextComponent.cpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/View/TextComponent.cpp Mon Sep 1 16:24:20 2003
@@ -16,5 +16,5 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "TextComponent.hpp"
Index: netpanzer/src/Lib/View/TextField.cpp
diff -u netpanzer/src/Lib/View/TextField.cpp:1.1
netpanzer/src/Lib/View/TextField.cpp:1.2
--- netpanzer/src/Lib/View/TextField.cpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/View/TextField.cpp Mon Sep 1 16:24:20 2003
@@ -16,5 +16,5 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "TextField.hpp"
Index: netpanzer/src/Lib/View/TitledBorder.cpp
diff -u netpanzer/src/Lib/View/TitledBorder.cpp:1.1
netpanzer/src/Lib/View/TitledBorder.cpp:1.2
--- netpanzer/src/Lib/View/TitledBorder.cpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/View/TitledBorder.cpp Mon Sep 1 16:24:20 2003
@@ -15,7 +15,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "TitledBorder.hpp"
#include "Surface.hpp"
#include "iRect.hpp"
Index: netpanzer/src/Lib/View/View.cpp
diff -u netpanzer/src/Lib/View/View.cpp:1.1 netpanzer/src/Lib/View/View.cpp:1.2
--- netpanzer/src/Lib/View/View.cpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/View/View.cpp Mon Sep 1 16:24:20 2003
@@ -17,14 +17,14 @@
*/
-#include "stdafx.hpp"
+
#include "View.hpp"
#include "Desktop.hpp"
#include "MouseInterface.hpp"
#include "KeyboardInterface.hpp"
#include "fXY.hpp"
#include "loadPics.hpp"
-#include "viewGlobals.hpp"
+#include "ViewGlobals.hpp"
#include "InputEvent.hpp"
@@ -63,8 +63,8 @@
//---------------------------------------------------------------------------
void View::add(Component *component)
{
- assert(component != NULL);
- if (component == NULL) { return; }
+ assert(component != 0);
+ if (component == 0) { return; }
if (componentsUsedCount < MAX_COMPONENT_COUNT - 1)
{
@@ -193,19 +193,19 @@
highlightedButton = -1;
prevHighlightedButton = -1;
selectedInputField = -1;
- searchName = NULL;
- title = NULL;
- subTitle = NULL;
- statusText = NULL;
- focusComponent = NULL;
+ searchName = 0;
+ title = 0;
+ subTitle = 0;
+ statusText = 0;
+ focusComponent = 0;
setSearchName("donut");
setTitle("donut");
setSubTitle("donut");
- buttons = NULL;
- //scrollBar = NULL;
- labels = NULL;
+ buttons = 0;
+ //scrollBar = 0;
+ labels = 0;
componentsUsedCount = 0;
assert(MAX_COMPONENT_COUNT > 0);
@@ -500,7 +500,7 @@
void View::loadPics()
{
// Are we already loaded? Then bail.
- if (pics.getFrame0() != NULL) return;
+ if (pics.getFrame0() != 0) return;
//pics.create(iXY(12, 11), 12, 2);
//pics.extractPCX("pics\\buttons.pcx", 6, 1);
@@ -580,7 +580,7 @@
// Draw all non-selected components.
for (int i = 0; i < componentsUsedCount; i++)
{
- assert(componentList[i] != NULL);
+ assert(componentList[i] != 0);
if (componentList[i] != focusComponent)
{
@@ -589,7 +589,7 @@
}
// Now draw the selected component.
- if (focusComponent != NULL)
+ if (focusComponent != 0)
{
focusComponent->draw(clientArea);
}
@@ -615,7 +615,7 @@
// Tell all the components the mouse entered the view.
for (int i = 0; i < componentsUsedCount; i++)
{
- assert(componentList[i] != NULL);
+ assert(componentList[i] != 0);
if (componentList[i]->contains(mouse.getScreenPos()))
{
@@ -926,7 +926,7 @@
// Check all components for a clicked event.
for (int i = 0; i < componentsUsedCount; i++)
{
- assert(componentList[i] != NULL);
+ assert(componentList[i] != 0);
if (componentList[i]->contains(prevPos) &&
!componentList[i]->contains(newPos))
{
@@ -985,12 +985,12 @@
selectedInputField = findInputFieldContaining(pos);
}
- focusComponent = NULL;
+ focusComponent = 0;
// Check all components for a pressed event.
for (int i = 0; i < componentsUsedCount; i++)
{
- assert(componentList[i] != NULL);
+ assert(componentList[i] != 0);
if (componentList[i]->contains(pos))
{
mMouseEvent me(componentList[i],
mMouseEvent::MOUSE_EVENT_PRESSED, now(), InputEvent::BUTTON1_MASK, pos.x,
pos.y, 0, false);
@@ -1016,9 +1016,9 @@
if (pressedButton >= 0)
{
//if (mouse.getCurButton() & 0)
- if (buttons[pressedButton].leftClickFunc != NULL)
buttons[pressedButton].leftClickFunc();
+ if (buttons[pressedButton].leftClickFunc != 0)
buttons[pressedButton].leftClickFunc();
//else
- //if (buttons[pressedButton].rightClickFunc != NULL)
buttons[pressedButton].rightClickFunc();
+ //if (buttons[pressedButton].rightClickFunc != 0)
buttons[pressedButton].rightClickFunc();
}
}
@@ -1028,7 +1028,7 @@
// Check all components for a clicked event.
{for (int i = 0; i < componentsUsedCount; i++)
{
- assert(componentList[i] != NULL);
+ assert(componentList[i] != 0);
if (componentList[i]->contains(downPos) &&
componentList[i]->contains(upPos))
{
mMouseEvent me(componentList[i],
mMouseEvent::MOUSE_EVENT_CLICKED, now(), InputEvent::BUTTON1_MASK, upPos.x,
upPos.y, 0, false);
@@ -1042,7 +1042,7 @@
// Report a mouse release to all components except for a clicked one.
{for (int i = 0; i < componentsUsedCount; i++)
{
- assert(componentList[i] != NULL);
+ assert(componentList[i] != 0);
if (!componentList[i]->contains(upPos))
{
mMouseEvent me(componentList[i],
mMouseEvent::MOUSE_EVENT_RELEASED, now(), InputEvent::BUTTON1_MASK, upPos.x,
upPos.y, 0, false);
@@ -1069,7 +1069,7 @@
// Check all components for a dragged event.
for (int i = 0; i < componentsUsedCount; i++)
{
- assert(componentList[i] != NULL);
+ assert(componentList[i] != 0);
if (componentList[i]->contains(newPos) &&
componentList[i]->contains(downPos))
{
mMouseEvent me(componentList[i],
mMouseEvent::MOUSE_EVENT_DRAGGED, now(), InputEvent::BUTTON1_MASK, newPos.x,
newPos.y, 0, false);
@@ -1096,12 +1096,12 @@
//---------------------------------------------------------------------------
void View::rMouseDown(const iXY &pos)
{
- focusComponent = NULL;
+ focusComponent = 0;
// Check all components for a pressed event.
for (int i = 0; i < componentsUsedCount; i++)
{
- assert(componentList[i] != NULL);
+ assert(componentList[i] != 0);
if (componentList[i]->contains(pos))
{
mMouseEvent me(componentList[i],
mMouseEvent::MOUSE_EVENT_PRESSED, now(), InputEvent::BUTTON2_MASK, pos.x,
pos.y, 0, false);
@@ -1125,7 +1125,7 @@
// Check all components for a clicked event.
for (int i = 0; i < componentsUsedCount; i++)
{
- assert(componentList[i] != NULL);
+ assert(componentList[i] != 0);
if (componentList[i]->contains(downPos) &&
componentList[i]->contains(upPos))
{
mMouseEvent me(componentList[i],
mMouseEvent::MOUSE_EVENT_CLICKED, now(), InputEvent::BUTTON2_MASK, upPos.x,
upPos.y, 0, false);
@@ -1145,7 +1145,7 @@
// Check all components for a release event.
for (int i = 0; i < componentsUsedCount; i++)
{
- assert(componentList[i] != NULL);
+ assert(componentList[i] != 0);
if (componentList[i]->contains(upPos))
{
mMouseEvent me(componentList[i],
mMouseEvent::MOUSE_EVENT_RELEASED, now(), InputEvent::BUTTON2_MASK, upPos.x,
upPos.y, 0, false);
@@ -1173,12 +1173,12 @@
{
rMouseDown(newPos);
- focusComponent = NULL;
+ focusComponent = 0;
// Check all components for a moved event.
for (int i = 0; i < componentsUsedCount; i++)
{
- assert(componentList[i] != NULL);
+ assert(componentList[i] != 0);
if (componentList[i]->contains(newPos))
{
mMouseEvent me(componentList[i],
mMouseEvent::MOUSE_EVENT_DRAGGED, now(), InputEvent::BUTTON2_MASK, newPos.x,
newPos.y, 0, false);
@@ -1210,7 +1210,7 @@
// Check all components for a entered event.
for (int i = 0; i < componentsUsedCount; i++)
{
- assert(componentList[i] != NULL);
+ assert(componentList[i] != 0);
if (componentList[i]->contains(pos))
{
mMouseEvent me(componentList[i],
mMouseEvent::MOUSE_EVENT_ENTERED, now(), 0, pos.x, pos.y, 0, false);
@@ -1234,7 +1234,7 @@
// Check all components for a exited event.
for (int i = 0; i < componentsUsedCount; i++)
{
- assert(componentList[i] != NULL);
+ assert(componentList[i] != 0);
if (componentList[i]->contains(pos))
{
mMouseEvent me(componentList[i],
mMouseEvent::MOUSE_EVENT_EXITED, now(), 0, pos.x, pos.y, 0, false);
@@ -1253,7 +1253,7 @@
//---------------------------------------------------------------------------
void View::scrollBarMove(const iXY &prevPos, const iXY &newPos)
{
- //if (scrollBar != NULL)
+ //if (scrollBar != 0)
//{
// scrollBar->actionPerformed(newPos);
//}
@@ -1288,10 +1288,10 @@
const PIX &backColor)
{
labels = (cLabel *) realloc(labels, (numLabels+1)*sizeof(cLabel));
- if (labels == NULL) FUBAR("ERROR: Unable to allocate label.");
+ if (labels == 0) FUBAR("ERROR: Unable to allocate label.");
labels[numLabels].label = strdup(label);
- assert(labels[numLabels].label != NULL);
+ assert(labels[numLabels].label != 0);
labels[numLabels].foreColor = foreColor;
labels[numLabels].backColor = backColor;
labels[numLabels].isShadowed = isShadowed;
@@ -1523,16 +1523,16 @@
//---------------------------------------------------------------------------
void View::setSearchName(const char *searchName)
{
- if (View::searchName != NULL)
+ if (View::searchName != 0)
{
free(View::searchName);
- View::searchName = NULL;
+ View::searchName = 0;
}
- if (searchName != NULL)
+ if (searchName != 0)
{
View::searchName = strdup(searchName);
- if (View::searchName == NULL)
+ if (View::searchName == 0)
{
FUBAR("ERROR: Unable to allocate searchName: ",
searchName);
}
@@ -1545,16 +1545,16 @@
//---------------------------------------------------------------------------
void View::setTitle(const char *title)
{
- if (View::title != NULL)
+ if (View::title != 0)
{
free(View::title);
- View::title = NULL;
+ View::title = 0;
}
- if (title != NULL)
+ if (title != 0)
{
View::title = strdup(title);
- if (View::title == NULL)
+ if (View::title == 0)
{
FUBAR("ERROR: Unable to allocate title: ", title);
}
@@ -1567,16 +1567,16 @@
//---------------------------------------------------------------------------
void View::setSubTitle(const char *subTitle)
{
- if (View::subTitle != NULL)
+ if (View::subTitle != 0)
{
free(View::subTitle);
- View::subTitle = NULL;
+ View::subTitle = 0;
}
- if (subTitle != NULL)
+ if (subTitle != 0)
{
View::subTitle = strdup(subTitle);
- if (View::subTitle == NULL)
+ if (View::subTitle == 0)
{
FUBAR("ERROR: Unable to allocate subTitle: ", subTitle);
}
@@ -1589,16 +1589,16 @@
//---------------------------------------------------------------------------
void View::showStatus(const char *string)
{
- if (statusText != NULL)
+ if (statusText != 0)
{
free(statusText);
- statusText = NULL;
+ statusText = 0;
}
- if (string != NULL)
+ if (string != 0)
{
statusText = strdup(string);
- if(statusText == NULL) { FUBAR("ERROR: statusText == NULL"); }
+ if(statusText == 0) { FUBAR("ERROR: statusText == 0"); }
}
} // end View::showStatus
@@ -1620,7 +1620,7 @@
s.fill(Color::gray192);
// Draw the status text.
- if (statusText != NULL)
+ if (statusText != 0)
{
int pos = (DEFAULT_STATUS_BAR_HEIGHT - CHAR_YPIX) >> 1;
@@ -1704,7 +1704,7 @@
if (highlightedButton < 0)
{
- if (statusText != NULL)
+ if (statusText != 0)
{
iRect tRect(rect.min.x, rect.min.y, rect.max.x,
rect.max.y);
dest.fillRect(tRect, Color::black);
@@ -2150,13 +2150,13 @@
//
// Component **prevLink = ⊤
//
-// while (*prevLink != NULL)
+// while (*prevLink != 0)
// {
// prevLink = &(*prevLink)->next;
// }
//
// *prevLink = Component;
-// Component->next = NULL;
+// Component->next = 0;
//
//} // end View::add
//
@@ -2168,7 +2168,7 @@
//{
// Component **prevLink = ⊤
//
-// while (*prevLink != NULL)
+// while (*prevLink != 0)
// {
// if (*prevLink == Component)
// {
Index: netpanzer/src/Lib/View/View.hpp
diff -u netpanzer/src/Lib/View/View.hpp:1.1 netpanzer/src/Lib/View/View.hpp:1.2
--- netpanzer/src/Lib/View/View.hpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/View/View.hpp Mon Sep 1 16:24:20 2003
@@ -26,7 +26,7 @@
#endif
-#include "stdafx.hpp"
+
#include "cMouse.hpp"
#include "cGrowList.hpp"
#include "cButton.hpp"
@@ -319,7 +319,7 @@
memset(componentList, 0, sizeof(Component *) *
MAX_COMPONENT_COUNT);
componentsUsedCount = 0;
- focusComponent = NULL;
+ focusComponent = 0;
}
// Accessor Functions.
Index: netpanzer/src/Lib/View/ViewGlobals.cpp
diff -u netpanzer/src/Lib/View/ViewGlobals.cpp:1.1
netpanzer/src/Lib/View/ViewGlobals.cpp:1.2
--- netpanzer/src/Lib/View/ViewGlobals.cpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/View/ViewGlobals.cpp Mon Sep 1 16:24:20 2003
@@ -15,7 +15,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "ViewGlobals.hpp"
Index: netpanzer/src/Lib/View/Window.cpp
diff -u netpanzer/src/Lib/View/Window.cpp:1.1
netpanzer/src/Lib/View/Window.cpp:1.2
--- netpanzer/src/Lib/View/Window.cpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/View/Window.cpp Mon Sep 1 16:24:20 2003
@@ -16,5 +16,5 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "Window.hpp"
Index: netpanzer/src/Lib/View/cButton.cpp
diff -u netpanzer/src/Lib/View/cButton.cpp:1.1
netpanzer/src/Lib/View/cButton.cpp:1.2
--- netpanzer/src/Lib/View/cButton.cpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/View/cButton.cpp Mon Sep 1 16:24:20 2003
@@ -16,7 +16,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "cButton.hpp"
#include "Surface.hpp"
#include "ViewGlobals.hpp"
@@ -36,7 +36,7 @@
topSurface.pack(tempTopSurface);
- cButton::toolTip = strdup(toolTip); assert(toolTip != NULL);
+ cButton::toolTip = strdup(toolTip); assert(toolTip != 0);
cButton::bounds = iRect(pos.x, pos.y, pos.x +
tempTopSurface.getPix().x, pos.y + tempTopSurface.getPix().y);
cButton::leftClickFunc = leftClickFunc;
}
@@ -70,8 +70,8 @@
tempTopSurface.drawButtonBorder(iRect(0, 0, xSize, ySize),
bottomRightBorderColor, topLeftBorderColor);
tempTopSurface.bltString(GAP_SPACE / 2 + 2, GAP_SPACE / 2 + 1, nName,
componentActiveTextColor);
- setName(nName); assert(name != NULL);
- toolTip = strdup(nToolTip); assert(toolTip != NULL);
+ setName(nName); assert(name != 0);
+ toolTip = strdup(nToolTip); assert(toolTip != 0);
bounds = iRect(pos.x, pos.y, pos.x + tempTopSurface.getPix().x,
pos.y + tempTopSurface.getPix().y);
leftClickFunc = nLeftClickFunc;
@@ -101,7 +101,7 @@
// Find out the horizontal offset to put the button name on the button.
int xOffset;
- if (nName != NULL) xOffset = (xSize-(strlen(nName)*CHAR_XPIX))/2;
+ if (nName != 0) xOffset = (xSize-(strlen(nName)*CHAR_XPIX))/2;
else xOffset = xSize/2;
// Make the unselected button
@@ -122,10 +122,10 @@
tempTopSurface.bltString(xOffset+1, GAP_SPACE/2+1, nName,
componentActiveTextColor);
// Save the button name.
- setName(nName); assert(name != NULL);
+ setName(nName); assert(name != 0);
// Save the button tool tip.
- toolTip = strdup(nToolTip); assert(toolTip != NULL);
+ toolTip = strdup(nToolTip); assert(toolTip != 0);
// Save the bounds of the button.
bounds = iRect(pos.x, pos.y, pos.x+tempTopSurface.getPix().x,
pos.y+tempTopSurface.getPix().y);
@@ -182,7 +182,7 @@
tempTopSurface.setFrame(0);
setName("TIL file");
- toolTip = strdup(nToolTip); assert(toolTip != NULL);
+ toolTip = strdup(nToolTip); assert(toolTip != 0);
bounds = iRect(pos.x, pos.y, pos.x + tempTopSurface.getPix().x,
pos.y + tempTopSurface.getPix().y);
leftClickFunc = nLeftClickFunc;
@@ -246,7 +246,7 @@
tempTopSurface.setFrame(0);
setName("Surface Single");
- toolTip = strdup(nToolTip); assert(toolTip != NULL);
+ toolTip = strdup(nToolTip); assert(toolTip != 0);
bounds = iRect(pos.x, pos.y, pos.x + tempTopSurface.getPix().x,
pos.y + tempTopSurface.getPix().y);
leftClickFunc = nLeftClickFunc;
@@ -281,7 +281,7 @@
tempTopSurface.setFrame(0);
setName("Surface Single");
- toolTip = strdup(nToolTip); assert(toolTip != NULL);
+ toolTip = strdup(nToolTip); assert(toolTip != 0);
bounds = iRect(pos.x, pos.y, pos.x + tempTopSurface.getPix().x,
pos.y + tempTopSurface.getPix().y);
leftClickFunc = nLeftClickFunc;
@@ -303,13 +303,13 @@
tempTopSurface.create(iXY(32, 32), 32, 3);
tempTopSurface.setFrame(0);
- tempTopSurface.loadRAW(imageName0, FALSE);
+ tempTopSurface.loadRAW(imageName0, false);
tempTopSurface.setFrame(1);
- tempTopSurface.loadRAW(imageName1, FALSE);
+ tempTopSurface.loadRAW(imageName1, false);
tempTopSurface.setFrame(2);
- tempTopSurface.loadRAW(imageName2, FALSE);
- setName(nName); assert(name != NULL);
- toolTip = strdup(nToolTip); assert(toolTip != NULL);
+ tempTopSurface.loadRAW(imageName2, false);
+ setName(nName); assert(name != 0);
+ toolTip = strdup(nToolTip); assert(toolTip != 0);
bounds = iRect(pos.x, pos.y, pos.x+tempTopSurface.getPix().x,
pos.y+tempTopSurface.getPix().y);
leftClickFunc = nLeftClickFunc;
@@ -331,7 +331,7 @@
tempTopSurface.create(iXY(topButton.size.x, topButton.size.y),
topButton.size.x, topButton.numFrames);
tempTopSurface.extractPCX(topButton.filename, topButton.numColumns,
topButton.gapSpace);
tempTopSurface.scale(iXY(topButton.scale.x, topButton.scale.y));
- tempTopSurface.setFPS(topButton.fps);
+ tempTopSurface.setFPS((int) topButton.fps);
/*
bottomSurface.create(iXY(bottomButton.size.x, bottomButton.size.y),
bottomButton.size.x, bottomButton.numFrames);
bottomSurface.extractPCX(bottomButton.filename,
bottomButton.numColumns, bottomButton.gapSpace);
@@ -342,7 +342,7 @@
assert(tempTopSurface.getPix().x == bottomSurface.getPix().x &&
tempTopSurface.getPix().y == bottomSurface.getPix().y);
*/
- toolTip = strdup(nToolTip); assert(toolTip != NULL);
+ toolTip = strdup(nToolTip); assert(toolTip != 0);
bounds = iRect(pos.x, pos.y, pos.x+tempTopSurface.getPix().x,
pos.y+tempTopSurface.getPix().y);
leftClickFunc = nLeftClickFunc;
@@ -356,11 +356,11 @@
//---------------------------------------------------------------------------
void cButton::reset()
{
- toolTip = NULL;
- name = NULL;
- isSelected = FALSE;
- leftClickFunc = NULL;
- rightClickFunc = NULL;
+ toolTip = 0;
+ name = 0;
+ isSelected = false;
+ leftClickFunc = 0;
+ rightClickFunc = 0;
} // end RESET
// SET NAME
@@ -368,7 +368,7 @@
void cButton::setName(const char *buttonName)
{
name = strdup(buttonName);
- if (buttonName == NULL) FUBAR("ERROR: Unable to allocate button name:
%s", buttonName);
+ if (buttonName == 0) FUBAR("ERROR: Unable to allocate button name: %s",
buttonName);
} // end SET NAME
// createPCX
@@ -390,21 +390,21 @@
// Make the unselected button
tempTopSurface.setFrame(0);
- tempTopSurface.loadPCX(filename, FALSE, NULL);
+ tempTopSurface.loadPCX(filename, false, 0);
tempTopSurface.drawButtonBorder(Color::white, Color::gray64);
// Make the mouse-over button
tempTopSurface.setFrame(1);
- tempTopSurface.loadPCX(filename, FALSE, NULL);
+ tempTopSurface.loadPCX(filename, false, 0);
tempTopSurface.drawButtonBorder(Color::red, Color::red);
// Make the selected button
tempTopSurface.setFrame(2);
- tempTopSurface.loadPCX(filename, FALSE, NULL);
+ tempTopSurface.loadPCX(filename, false, 0);
tempTopSurface.drawButtonBorder(Color::gray64, Color::white);
- setName(filename); assert(name != NULL);
- toolTip = strdup(nToolTip); assert(toolTip != NULL);
+ setName(filename); assert(name != 0);
+ toolTip = strdup(nToolTip); assert(toolTip != 0);
bounds = iRect(pos.x, pos.y, pos.x+tempTopSurface.getPix().x,
pos.y+tempTopSurface.getPix().y);
leftClickFunc = nLeftClickFunc;
Index: netpanzer/src/Lib/View/cButton.hpp
diff -u netpanzer/src/Lib/View/cButton.hpp:1.1
netpanzer/src/Lib/View/cButton.hpp:1.2
--- netpanzer/src/Lib/View/cButton.hpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/View/cButton.hpp Mon Sep 1 16:24:20 2003
@@ -50,8 +50,8 @@
cButton() { reset(); }
~cButton()
{
- if (name != NULL) free(name);
- if (toolTip != NULL) free(toolTip);
+ if (name != 0) free(name);
+ if (toolTip != 0) free(toolTip);
}
//typedef void (WINDOW::*ITEM_FUNC)(void);
@@ -67,7 +67,7 @@
iRect getBounds () const { return bounds; }
char *getName () const { return name; }
char *getToolTip () const { return toolTip; }
- BOOL getIsSelected() const { return isSelected; }
+ bool getIsSelected() const { return isSelected; }
void createPacked(const iXY &pos, PackedSurface &source, const char
*toolTip, ITEM_FUNC leftClickFunc);
@@ -106,7 +106,7 @@
const char *nToolTip,
ITEM_FUNC nLeftClickFunc,
ITEM_FUNC nRightClickFunc);
- inline BOOL contains(iXY pos)
+ inline bool contains(iXY pos)
{
assert(isValidPtr(this));
@@ -122,7 +122,7 @@
return false;
}
}
- BOOL isSelected;
+ bool isSelected;
private:
iRect bounds;
Index: netpanzer/src/Lib/View/cInputField.cpp
diff -u netpanzer/src/Lib/View/cInputField.cpp:1.1
netpanzer/src/Lib/View/cInputField.cpp:1.2
--- netpanzer/src/Lib/View/cInputField.cpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/View/cInputField.cpp Mon Sep 1 16:24:20 2003
@@ -16,7 +16,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+
#include "cInputField.hpp"
#include "TimerInterface.hpp"
@@ -33,12 +33,12 @@
assert(maxCharCount > 0);
cInputFieldString::string = new char [maxCharCount + 1];
- if (this->string == NULL)
+ if (this->string == 0)
{
FUBAR("ERROR: Unable to allocate cInputFieldString string.");
}
- if (strlen(string) > 0 && strlen(string) < maxCharCount)
+ if (strlen(string) > 0 && strlen(string) < (size_t) maxCharCount)
{
strcpy(cInputFieldString::string, string);
} else
@@ -59,7 +59,7 @@
//--------------------------------------------------------------------------
void cInputFieldString::reset()
{
- string = NULL;
+ string = 0;
maxCharCount = 0;
} // end reset
@@ -75,8 +75,8 @@
cursorPos = 0;
pos = iXY(0, 0);
maxCharCount = 0;
- destString = NULL;
- excludedCharacters = NULL;
+ destString = 0;
+ excludedCharacters = 0;
} // end reset
// setPos
@@ -93,7 +93,7 @@
//--------------------------------------------------------------------------
void cInputField::setInputFieldString(cInputFieldString *string)
{
- //assert(string->string != NULL);
+ //assert(string->string != 0);
assert(string->maxCharCount > 0);
this->destString = string->string;
@@ -115,7 +115,7 @@
void cInputField::setExcludedCharacters(const char *excludedCharacters)
{
this->excludedCharacters = new char [strlen(excludedCharacters) + 1];
- if (this->excludedCharacters == NULL)
+ if (this->excludedCharacters == 0)
{
FUBAR("ERROR: Unable to allocate cInputField
excludedCharacters.");
}
@@ -128,7 +128,7 @@
void cInputField::addChar(int newChar)
{
// Check if the character should be excluded.
- if (strchr(excludedCharacters, newChar) == NULL)
+ if (strchr(excludedCharacters, newChar) == 0)
{
// Add the character.
destString[cursorPos] = newChar;
Index: netpanzer/src/Lib/View/cInputField.hpp
diff -u netpanzer/src/Lib/View/cInputField.hpp:1.1
netpanzer/src/Lib/View/cInputField.hpp:1.2
--- netpanzer/src/Lib/View/cInputField.hpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/View/cInputField.hpp Mon Sep 1 16:24:20 2003
@@ -52,10 +52,10 @@
void free()
{
- if (string != NULL)
+ if (string != 0)
{
delete [] string;
- string = NULL;
+ string = 0;
}
}
@@ -74,7 +74,7 @@
cInputField() { reset(); }
~cInputField()
{
- if (excludedCharacters != NULL)
+ if (excludedCharacters != 0)
{
delete [] excludedCharacters;
}
Index: netpanzer/src/Lib/cGrowList.hpp
diff -u netpanzer/src/Lib/cGrowList.hpp:1.1 netpanzer/src/Lib/cGrowList.hpp:1.2
--- netpanzer/src/Lib/cGrowList.hpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/cGrowList.hpp Mon Sep 1 16:24:18 2003
@@ -18,13 +18,7 @@
#ifndef __cGrowlist_hpp__
#define __cGrowlist_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
-#include "stdafx.hpp"
+#include <assert.h>
#include "codewiz.hpp"
@@ -41,8 +35,8 @@
cGrowList(int initSize = 0);
TYPE *add(const TYPE &a);
- BOOL setAlloced(int nAlloced, BOOL gottaHaveIt = GOTTA_HAVE_IT);
- BOOL setNum(int nNum, BOOL gottaHaveIt = GOTTA_HAVE_IT);
+ bool setAlloced(int nAlloced, bool gottaHaveIt = GOTTA_HAVE_IT);
+ bool setNum(int nNum, bool gottaHaveIt = GOTTA_HAVE_IT);
void free();
void removeByIndex(int index);
void sort( int (* compare)( const void *elem1, const void *elem2 ));
@@ -52,8 +46,8 @@
inline int getCount() const { return count; }
inline int getAlloced() const { return alloced; }
- inline TYPE &operator [](int index) { assert(index < count);
assert(array != NULL); return array[index]; }
- inline TYPE const &operator [](int index) const { assert(index <
count); assert(array != NULL); return array[index]; }
+ inline TYPE &operator [](int index) { assert(index < count);
assert(array != 0); return array[index]; }
+ inline TYPE const &operator [](int index) const { assert(index <
count); assert(array != 0); return array[index]; }
inline void shrinkToFit() {
setAlloced(getCount());
@@ -69,7 +63,7 @@
a.alloced = alloced;
count = 0;
- array = NULL;
+ array = 0;
alloced = 0;
}
@@ -89,8 +83,8 @@
cGrowList<TYPE>::cGrowList(int initSize /* = 0 */) {
count = 0;
- array = NULL;
- alloced = NULL;
+ array = 0;
+ alloced = 0;
setNum(initSize, GOTTA_HAVE_IT);
@@ -101,10 +95,10 @@
//---------------------------------------------------------------------------
template <class TYPE>
-BOOL cGrowList<TYPE>::setAlloced(int nAlloced, BOOL gottaHaveIt /* =
GOTTA_HAVE_IT */) {
+bool cGrowList<TYPE>::setAlloced(int nAlloced, bool gottaHaveIt /* =
GOTTA_HAVE_IT */) {
assertValid();
- if (nAlloced == alloced) return TRUE;
+ if (nAlloced == alloced) return true;
if (nAlloced < count) setNum(nAlloced);
@@ -119,18 +113,18 @@
// Grow the array.
//FIXME - change to MERLMEM realloc function...
TYPE *nArray = (TYPE *)realloc(array, nAlloced *
sizeof(array[0]));
- if (nArray == NULL) {
+ if (nArray == 0) {
if (gottaHaveIt) {
FUBAR("Unable to alloc cGrowList to %u elements
size %u\n", nAlloced,
sizeof(array[0]));
}
- return FALSE;
+ return false;
}
array = nArray;
} else {
// We're completely emptying the list.
::free(array);
- array = NULL;
+ array = 0;
}
// If we're growing the list, clear out the memory and then go through
and
@@ -139,9 +133,9 @@
// In release build, let's play it as safe as possible...
if (alloced < nAlloced) {
#ifdef _DEBUG
- memsetB(array + alloced, 0xfd, sizeof(array[0]) *
(nAlloced - alloced));
+ memset(array + alloced, 0xfd, sizeof(array[0]) *
(nAlloced - alloced));
#else
- memsetB(array + alloced, 0x00, sizeof(array[0]) *
(nAlloced - alloced));
+ memset(array + alloced, 0x00, sizeof(array[0]) *
(nAlloced - alloced));
#endif
do {
new (array + alloced) TYPE();
@@ -149,7 +143,7 @@
} while (alloced < nAlloced);
}
- return TRUE;
+ return true;
}
//---------------------------------------------------------------------------
@@ -164,15 +158,15 @@
//---------------------------------------------------------------------------
template <class TYPE>
-BOOL cGrowList<TYPE>::setNum(int nNum, BOOL gottaHaveIt /* = GOTTA_HAVE_IT */)
{
+bool cGrowList<TYPE>::setNum(int nNum, bool gottaHaveIt /* = GOTTA_HAVE_IT */)
{
assertValid();
if (nNum > alloced) {
- //if (!setAlloced(nNum + (512*100/sizeof(TYPE))+5,
gottaHaveIt)) return FALSE;
- if (!setAlloced(nNum + (20*100/sizeof(TYPE))+5, gottaHaveIt))
return FALSE;
+ //if (!setAlloced(nNum + (512*100/sizeof(TYPE))+5,
gottaHaveIt)) return false;
+ if (!setAlloced(nNum + (20*100/sizeof(TYPE))+5, gottaHaveIt))
return false;
}
count = nNum;
- return TRUE;
+ return true;
}
//---------------------------------------------------------------------------
@@ -236,14 +230,14 @@
//---------------------------------------------------------------------------
template <class TYPE>
void cGrowList<TYPE>::assertValid() const {
- assert(this != NULL);
+ assert(this != 0);
assert(count <= alloced);
if (alloced > 0) {
- assert(array != NULL);
+ assert(array != 0);
} else {
- assert(array == NULL);
+ assert(array == 0);
}
}
Index: netpanzer/src/Lib/cMouse.cpp
diff -u netpanzer/src/Lib/cMouse.cpp:1.1 netpanzer/src/Lib/cMouse.cpp:1.2
--- netpanzer/src/Lib/cMouse.cpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/cMouse.cpp Mon Sep 1 16:24:18 2003
@@ -16,8 +16,6 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-#include "stdafx.hpp"
#include "cMouse.hpp"
@@ -27,7 +25,7 @@
cMouse mouse;
-Surface *cMouse::pointer = NULL;
+Surface *cMouse::pointer = 0;
unsigned char cMouse::button_mask = 0;
@@ -42,7 +40,7 @@
//---------------------------------------------------------------------------
void cMouse::draw(const Surface &dest)
{
- assert(pointer != NULL);
+ assert(pointer != 0);
if (pointer)
{
@@ -58,7 +56,7 @@
//---------------------------------------------------------------------------
void cMouse::setPointer(Surface *pointer)
{
- assert(pointer != NULL);
+ assert(pointer != 0);
cMouse::pointer = pointer;
Index: netpanzer/src/Lib/cMouse.hpp
diff -u netpanzer/src/Lib/cMouse.hpp:1.1 netpanzer/src/Lib/cMouse.hpp:1.2
--- netpanzer/src/Lib/cMouse.hpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/cMouse.hpp Mon Sep 1 16:24:18 2003
@@ -24,7 +24,7 @@
#endif
-#include "stdafx.hpp"
+
#include "Surface.hpp"
#include "Surface.hpp"
#include "iXY.hpp"
Index: netpanzer/src/Lib/cTimeStamp.cpp
diff -u netpanzer/src/Lib/cTimeStamp.cpp:1.1
netpanzer/src/Lib/cTimeStamp.cpp:1.2
--- netpanzer/src/Lib/cTimeStamp.cpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/cTimeStamp.cpp Mon Sep 1 16:24:18 2003
@@ -16,7 +16,8 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+#include <time.h>
+#include <assert.h>
#include "cTimeStamp.hpp"
@@ -28,7 +29,7 @@
bool gTimeSliceFlag = false;
float timeElapsed;
-static BOOL calibrated = FALSE;
+static bool calibrated = false;
static long double ticksPerClock;
/////////////////////////////////////////////////////////////////////////////
@@ -37,20 +38,7 @@
//
/////////////////////////////////////////////////////////////////////////////
-#if COMPILER_WATCOM
- extern "C" long double RDTSC();
- #pragma aux RDTSC \
- modify exact [eax edx 8087] \
- value [8087] = \
- "db 0fh " \
- "db 31h " \
- "sub esp, 8 " \
- "mov [esp + 4], edx " \
- "mov [esp], eax " \
- "fild qword ptr [esp] " \
- "add esp, 8 "
-
-#elif COMPILER_MICROSOFT
+#ifdef MSVC
#if _MSC_VER > 1000
#pragma optimize( "", off )
@@ -73,10 +61,15 @@
#pragma optimize( "", on )
#endif
-
#else
- #error How do I RDTSC?
+// XXX Implement me
+#include <stdio.h>
+long double RDTSC()
+{
+ printf ("RDTSC not implemented for gcc yet.\n");
+ return 0;
+}
#endif
@@ -84,15 +77,6 @@
// global code
//***************************************************************************
-#if 0
-// New version
-//---------------------------------------------------------------------------
-TIMESTAMP now() {
- if (!calibrated) TIMESTAMP::calibrate();
- return TIMESTAMP(DWORD(RDTSC() * ticksPerClock));
-}
-#endif
-
#if 1
// Old version
//---------------------------------------------------------------------------
@@ -106,66 +90,11 @@
// class TIMESTAMP member functions
//***************************************************************************
-#if 0
-// New version
-//---------------------------------------------------------------------------
-void TIMESTAMP::calibrate() {
- calibrated = FALSE;
-
- // use calibration period of about 1/2 a second. Figure out the nearest
- // number of low res clock ticks that fit into that amount of time.
- const unsigned goalLoResTicks = unsigned(CLK_TCK / 2.0);
- assert(goalLoResTicks > 2);
-
- clock_t startTimeLoRes, endTimeLoRes;
- long double elapsedHiRes;
-
- do {
-
- // Wait for the lo resolution clock to reach a tick boundary
- clock_t waitTimerValue = clock() + 1;
- do {
- startTimeLoRes = clock();
- } while (startTimeLoRes <= waitTimerValue);
-
- // Grab the current high resolution timer value
- long double startTimeHiRes = RDTSC();
-
- // Figure out about when we want to stop timing.
- clock_t goalEndTimeLoRes = startTimeLoRes + goalLoResTicks;
-
- // Wait until the lo resolution timer times out
- do {
- endTimeLoRes = clock();
- } while (endTimeLoRes < goalEndTimeLoRes);
-
- // Calculate the number of elapsed hi res ticks
- elapsedHiRes = RDTSC() - startTimeHiRes;
-
- // Since the timer tick counter could theoretically have wrapped
- // in this short period of time, we check for this, and if it
- // did wrap, then we just do it again. (What are the odds of
this?)
- } while (elapsedHiRes <= 0.0);
-
- // Now determine exactly how long the calibration time was. (Will be
- // a multiple of the number of ticks per second. We can't assume
- // that the ending time will be equal to the ending time we calculated.)
- clock_t elapsedTimeLoRes = endTimeLoRes - startTimeLoRes;
- long double calibrationTime = double(elapsedTimeLoRes) /
double(CLK_TCK);
-
- // Now calculate the calibration constant.
- ticksPerClock = (long double)RESOLUTION * calibrationTime /
elapsedHiRes;
-
- // We're calibrated!
- calibrated = TRUE;
-}
-#endif
-
#if 1
// Old version
//---------------------------------------------------------------------------
void TIMESTAMP::calibrate() {
- calibrated = FALSE;
+ calibrated = false;
// use calibration period of about 1/2 a second. Figure out the
nearest
// number of low res clock ticks that fit into that amount of time.
@@ -212,6 +141,6 @@
ticksPerClock = (long double)WinTimer::TimerFrequency *
calibrationTime / elapsedHiRes;
// We're calibrated!
- calibrated = TRUE;
+ calibrated = true;
}
#endif
Index: netpanzer/src/Lib/cTimeStamp.hpp
diff -u netpanzer/src/Lib/cTimeStamp.hpp:1.1
netpanzer/src/Lib/cTimeStamp.hpp:1.2
--- netpanzer/src/Lib/cTimeStamp.hpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/cTimeStamp.hpp Mon Sep 1 16:24:18 2003
@@ -18,95 +18,8 @@
#ifndef __cTimeStamp_hpp__
#define __cTimeStamp_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
-#include "stdafx.hpp"
#include "WinTimer.hpp"
-
-// ***** REMOVED FOR WIN95 PORTING
-
-
-#if _MSC_VER > 1000
-#pragma once
-#endif
-
-
-//***************************************************************************
-// includes
-//***************************************************************************
-
-// ***** REMOVED FOR WIN95 PORTING
-
-#if 0 // New version.
-
-#ifndef __CODEWIZ_H_INCLUDED__
- #include "Codewiz.hpp"
-#endif
-
-//***************************************************************************
-// types
-//***************************************************************************
-
-//---------------------------------------------------------------------------
-// class TIMESTAMP defines a way to record a point in time. The actual value
-// recorded is irrelevent (and hidden), but the user of this class is able
-// to determine if one timestamp is before or after another timestamp, and
-// how much time is marked between two timestamps (returned as a float, in
-// seconds), and adjust a timestamp by a certain number of seconds. The
-// accuracy of the timestamp calculations is dependent on the method used to
-// querry the current time. On a pentium, this is extremely accurate, we
-// use RTDSC, so it's as accurate as RESOLUTION.
-
-class TIMESTAMP {
-private:
-
- friend TIMESTAMP now();
-
- // RESOLUTION defines the number of ticks that equal one second, but
this
- // doesn't necessarily mean that a timestamp is accurate to the nearest
- // RESOLTUIONth of a second
- enum { RESOLUTION = 2500UL };
-
- unsigned long v; // tick count (actual value is meaningless, only for
relative comparisons)
-
- inline static float ticksToSecs(long t) { return float(t) *
(1.0/RESOLUTION); }
- inline static long secsToTicks(float s) { return long(s *
float(RESOLUTION)); }
-
- inline TIMESTAMP(unsigned long nV) { v = nV; }
-
-public:
- inline TIMESTAMP() {}
- inline TIMESTAMP(const TIMESTAMP &a) { v = a.v; }
-
- inline TIMESTAMP &operator =(const TIMESTAMP &a) { v = a.v; return
*this; }
-
- inline TIMESTAMP &operator +=(float seconds) { v +=
secsToTicks(seconds); return *this; }
- inline TIMESTAMP &operator -=(float seconds) { v -=
secsToTicks(seconds); return *this; }
-
- inline TIMESTAMP operator +(float seconds) const { return TIMESTAMP(v +
secsToTicks(seconds)); }
- inline TIMESTAMP operator -(float seconds) const { return TIMESTAMP(v -
secsToTicks(seconds)); }
-
- inline float operator -(const TIMESTAMP &a) const { return
ticksToSecs(long(v - a.v)); }
-
- inline int operator < (const TIMESTAMP &a) const { return long(v - a.v)
< 0L; }
- inline int operator <=(const TIMESTAMP &a) const { return long(v - a.v)
<= 0L; }
- inline int operator >=(const TIMESTAMP &a) const { return long(v - a.v)
>= 0L; }
- inline int operator > (const TIMESTAMP &a) const { return long(v - a.v)
> 0L; }
- inline int operator ==(const TIMESTAMP &a) const { return v == a.v; }
-
- // calibrate the timestamp system for this computer
- static void calibrate();
-};
-
-#endif
-
-#if 1 // Old version
-
////---------------------------------------------------------------------------
//// class TIMESTAMP defines a way to record a point in time. The actual value
//// recorded is irrelevent (and hidden), but the user of this class is able
@@ -116,7 +29,6 @@
//// accuracy of the timestamp calculations is dependent on the method used to
//// querry the current time. On a pentium, this is extremely accurate, we
//// use RTDSC, so it's as accurate as RESOLUTION.
-
class TIMESTAMP {
private:
// RESOLUTION defines the number of ticks that equal one second, but
this
@@ -155,8 +67,6 @@
// calibrate the timestamp system for this computer
static void calibrate();
};
-
-#endif
//***************************************************************************
// global functions
Index: netpanzer/src/Lib/codewiz.hpp
diff -u netpanzer/src/Lib/codewiz.hpp:1.1 netpanzer/src/Lib/codewiz.hpp:1.2
--- netpanzer/src/Lib/codewiz.hpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/codewiz.hpp Mon Sep 1 16:24:18 2003
@@ -19,13 +19,7 @@
#ifndef __CODEWIZ_H_INCLUDED__
#define __CODEWIZ_H_INCLUDED__
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-#ifndef __cplusplus
- #error This file requiers c++ Compilation
-#endif
+#include "Util.hpp"
//***************************************************************************
// includes
@@ -33,145 +27,23 @@
#include <assert.h>
-#if !defined( __STDDEF_H ) && !defined( _STDDEF_H_INCLUDED ) && !defined(
_INC_STDDEF )
- #include <stddef.h>
-#endif
-
-#if !defined( __STDIO_H ) && !defined( _STDIO_H_INCLUDED ) && !defined(
_INC_STDIO )
- #include <stdio.h>
-#endif
-
-#if !defined( __STDLIB_H ) && !defined( _STDLIB_H_INCLUDED ) && !defined(
_INC_STDLIB )
- #include <stdlib.h>
-#endif
-
-#if !defined( __STDARG_H ) && !defined( _STDARG_H_INCLUDED ) && !defined(
_INC_STDARG )
- #include <stdarg.h>
-#endif
-
-#if !defined( __STRING_H ) && !defined( _STRING_H_INCLUDED ) && !defined(
_INC_STRING )
- #include <string.h>
-#endif
-
-#if !defined( __MATH_H ) && !defined( _MATH_H_INCLUDED ) && !defined(
_INC_MATH )
- #include <math.h>
-#endif
-
-#if !defined( __NEW_H ) && !defined ( _NEW_H_INCLUDED ) && !defined( _INC_NEW )
- #include <new.h>
-#endif
-
-#if !defined( __IOSTREAM_H ) && !defined ( _IOSTREAM_H_INCLUDED ) && !defined(
_INC_IOSTREAM )
- #include <iostream.h>
-#endif
-
-#if !defined( __FSTREAM_H ) && !defined ( _FSTREAM_H_INCLUDED ) && !defined(
_INC_FSTREAM )
- #include <fstream.h>
-#endif
-
-#if !defined( __CTYPE_H ) && !defined ( _CTYPE_H_INCLUDED ) && !defined(
_INC_CTYPE )
- #include <ctype.h>
-#endif
-
-#if !defined( __FLOAT_H ) && !defined ( _FLOAT_H_INCLUDED ) && !defined(
_INC_FLOAT )
- #include <float.h>
-#endif
-
-#if !defined( __LIMITS_H ) && !defined ( _LIMITS_H_INCLUDED ) && !defined(
_INC_LIMITS )
- #include <limits.h>
-#endif
-
-#include <io.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <math.h>
+#include <ctype.h>
+#include <float.h>
+#include <limits.h>
-
-//***************************************************************************
-// detect build
-//***************************************************************************
-
-#if defined( WIN32 ) || defined( _WIN32 )
- #define DOS_BUILD 0
- #define WIN_BUILD 1
-#else
- #define DOS_BUILD 1
- #define WIN_BUILD 0
-#endif
-
-//***************************************************************************
-// detect compiler
-//***************************************************************************
-
-#ifdef _MSC_VER
- #define COMPILER_MICROSOFT 1
-#else
- #define COMPILER_MICROSOFT 0
-#endif
-
-#ifdef __WATCOMC__
- #define COMPILER_WATCOM 1
-#else
- #define COMPILER_WATCOM 0
-#endif
-
-//FIXME - figure out how to detect
-#define COMPILER_GNU 0
-
-#if (COMPILER_MICROSOFT + COMPILER_WATCOM + COMPILER_GNU) != 1
- #error Can't detect compiler
-#endif
-
-//***************************************************************************
-// compiler specific options
-//***************************************************************************
-
-#if COMPILER_MICROSOFT
- #pragma warning(disable: 4244) // conversion from '???' to '???',
possible loss of data
- #pragma warning(disable: 4514) // unreferenced inline function has been
removed
-
- #define ASMPROC __fastcall
-#endif
-
-#if COMPILER_WATCOM
- #pragma warning 604 9; // must look ahead to determine whether
construct is a declaration/type or an expression
- #pragma warning 594 9; // construct resolved as a declaration/type
- #pragma warning 849 9; // base class virtual function has not been
overridden
-
-
- #pragma aux _ASMPROC "*" parm [ecx][edx] routine modify exact [eax ecx
edx] value [eax];
-
- #define ASMPROC
-
-#endif
-
-//***************************************************************************
-// types
-//***************************************************************************
-
-typedef unsigned char BYTE;
-typedef unsigned short WORD;
-typedef unsigned long DWORD;
-typedef int BOOL;
+#include "Types/LibTypes.hpp"
//***************************************************************************
// favorite consts
//***************************************************************************
-
-#ifndef TRUE
- #define TRUE (1==1)
-#endif
-
-#ifndef FALSE
- #define FALSE (1!=1)
-#endif
-
-const BOOL NOPROB = TRUE;
-const BOOL YIKES = FALSE;
-
-const BOOL GOTTA_HAVE_IT = TRUE;
-const BOOL LIVE_WITHOUT_IT = FALSE;
-
-const DWORD KILO = (1UL << 10);
-const DWORD MEGA = (1UL << 20);
-const DWORD GIGA = (1UL << 30);
+const bool GOTTA_HAVE_IT = true;
+const bool LIVE_WITHOUT_IT = false;
//***************************************************************************
// Persional favorite logging macros
@@ -235,19 +107,19 @@
class __LOG_PLACEHOLDER {
private:
unsigned savedDepth;
- BOOL closed;
+ bool closed;
public:
// Create a placeholder for log depth info, so log depth will
// automatically be restored
inline __LOG_PLACEHOLDER() {
savedDepth = __logDepth;
- closed = FALSE;
+ closed = false;
}
// Restore the log depth
inline ~__LOG_PLACEHOLDER() {
- __logFile = NULL;
+ __logFile = 0;
__logLine = 0;
__logDepth = savedDepth;
if (!closed) __log("}");
@@ -279,218 +151,21 @@
#endif
//***************************************************************************
-// Dos extender issues (mostly curtesy of Paul Nettle)
-//***************************************************************************
-#if DOS_BUILD
-
- //#if !defined( __I86_H ) && !defined ( _I86_H_INCLUDED ) && !defined(
_INC_I86 )
- //#include <i86.h>
- //#endif
-
- #if COMPILER_GNU
- #define CONVENTIONAL_BASE __djgpp_conventional_base
- #define DOS_MEM_START() (__djgpp_nearptr_enable() ?
DONOTHING : FUBAR("Unable to enable nearptr access") )
- #define DOS_MEM_END() __djgpp_nearptr_disable()
- #else
- #define CONVENTIONAL_BASE 0UL
- #define DOS_MEM_START() DONOTHING
- #define DOS_MEM_END() DONOTHING
- #endif
-
- #define MK_REAL(s, o) (void *)((DWORD(WORD(s)) << 16) + WORD(o))
- #define MK_PROT(s, o) (void *)((DWORD(WORD(s)) << 4) + WORD(o) +
CONVENTIONAL_BASE)
- #define REAL_SEG(ptr) WORD(DWORD(ptr) >> 16)
- #define REAL_OFF(ptr) WORD(DWORD(ptr))
- #define PROT_SEG(ptr) WORD((DWORD(ptr) - CONVENTIONAL_BASE) >> 4)
- #define PROT_OFF(ptr) WORD((DWORD(ptr) - CONVENTIONAL_BASE) & 0xf)
- #define REAL_TO_PROT(ptr) MK_PROT(REAL_SEG(ptr), REAL_OFF(ptr))
- #define PROT_TO_REAL(ptr) MK_REAL(PROT_SEG(ptr), PROT_OFF(ptr))
-
- void realModeInt86X(BYTE intNo, const REGS *inRegs, REGS *outRegs,
SREGS *segRegs);
-
- inline void realModeInt86(BYTE intNo, const REGS *inRegs, REGS
*outRegs) {
- realModeInt86X(intNo, inRegs, outRegs, NULL);
- }
-
- void *mapPhysicalToLinear(DWORD physicalAddress, DWORD sizeLimit);
-
-#endif // #if DOS_BUILD
-
-//***************************************************************************
-// My version of the assert macro
-//***************************************************************************
-
-#if COMPILER_WATCOM
- extern "C" void hardBreak(void);
- #pragma aux hardBreak = "int 03";
-#endif
-
-#if COMPILER_BORLAND
- #define hardBreak() __emit__(0xcc)
-#endif
-
-#if COMPILER_MICROSOFT
- inline void hardBreak() { __asm int 3 }
-#endif
-
-/* OLD ASSERT
-#undef assert
-#ifdef _DEBUG
- #define Assert(x) ((x) ? ((void)0) : (void)(hardBreak(),
FUBAR("\n\nAssert failed: %s, file %s, line %u\n\n", #x, __FILE__, __LINE__) ))
- #define Verify(x) ((x) ? ((void)0) : (void)(hardBreak(),
FUBAR("\n\nVerify failed: %s, file %s, line %u\n\n", #x, __FILE__, __LINE__) ))
-#else
- #define Assert(x) ((void)0)
- #define Verify(x) ((void)(x))
-#endif
-
-#define assert Assert
-*/
-
-
-#undef assert
-#ifdef _DEBUG
- #define assert(x) ((x) ? ((void)0) : (void)( ( LOG(("assert failed: %s,
file %s, line %u", #x, __FILE__, __LINE__ )) ), (_assert(#x, __FILE__,
__LINE__), 0) ) )
-#else
- #define assert(x) ((void)0)
-#endif
-
-//***************************************************************************
-// Assembler routines and data
-//***************************************************************************
-
-extern "C" ASMPROC zeroMemAsm(void *dest, size_t numBytes);
-extern "C" ASMPROC memsetBAsm(void *dest, BYTE fillVal, size_t numBytes );
-extern "C" ASMPROC memsetWAsm(void *dest, WORD fillVal, size_t numWords );
-extern "C" ASMPROC memset3Asm(void *dest, DWORD fillVal, size_t numTrips );
-extern "C" ASMPROC memsetDAsm(void *dest, DWORD fillVal, size_t numDWords);
-
-union BYTE_FILL {
- BYTE byte;
- WORD word;
- DWORD dword;
- double qword;
-};
-
-extern "C" BYTE_FILL byteFill[0x100];
-
-#if COMPILER_WATCOM
- #pragma aux (_ASMPROC) zeroMemAsm;
-#endif
-
-//***************************************************************************
// Standard program control/cleanup functions
//***************************************************************************
-void cleanup(BOOL fubed);
-void term(int returnCode, BOOL fubed, const char *msg, ...);
-void vterm(int returnCode, BOOL fubed, const char *msg, va_list ap);
+void cleanup(bool fubed);
+void term(int returnCode, bool fubed, const char *msg, ...);
+void vterm(int returnCode, bool fubed, const char *msg, va_list ap);
void quitOK(const char *msg, ...);
void FUBAR(const char *msg, ...);
void vQuitOK(const char *msg, va_list ap);
void vFUBAR(const char *msg, va_list ap);
-void _addCleanupFunc(void (*func)(), BOOL doEvenOnFubed,
+void _addCleanupFunc(void (*func)(), bool doEvenOnFubed,
const char *sourceFile, unsigned lineNum);
#define addCleanupFunc(f, d) _addCleanupFunc((f), (d), __FILE__, __LINE__)
-#if COMPILER_WATCOM
- #pragma aux term aborts;
- #pragma aux vterm aborts;
- #pragma aux quitOK aborts;
- #pragma aux FUBAR aborts;
- #pragma aux vQuitOK aborts;
- #pragma aux vFUBAR aborts;
-#endif
-
-const size_t __MAX_FILL_SIZE = 5000000;
-
-inline void zeroMem(void *dest, size_t numBytes) {
- #ifdef _DEBUG
- if (numBytes <= 0) return;
- assert(dest != NULL);
- assert(numBytes < __MAX_FILL_SIZE/sizeof(BYTE));
- #endif
- //FIXME - get assembler version working
- memset(dest, 0, numBytes);
-}
-
-inline void memsetB(void *dest, BYTE fillVal, size_t numBytes) {
- #ifdef _DEBUG
- if (numBytes <= 0) return;
- assert(dest != NULL);
- assert(numBytes < __MAX_FILL_SIZE/sizeof(BYTE));
- #endif
- //FIXME - supply assembler version
- memset(dest, fillVal, numBytes);
-}
-
-inline void memsetW(void *dest, WORD fillVal, size_t numWords) {
- #ifdef _DEBUG
- if (numWords <= 0) return;
- assert(dest != NULL);
- assert(numWords < __MAX_FILL_SIZE/sizeof(WORD));
- #endif
- memsetWAsm(dest, fillVal, numWords);
-}
-
-inline void memset3(void *dest, DWORD fillVal, size_t numTrips) {
- #ifdef _DEBUG
- if (numTrips <= 0) return;
- assert(dest != NULL);
- assert(numTrips < __MAX_FILL_SIZE/3);
- #endif
- memset3Asm(dest, fillVal, numTrips);
-}
-
-inline void memsetD(void *dest, DWORD fillVal, size_t numDWords) {
- #ifdef _DEBUG
- if (numDWords <= 0) return;
- assert(dest != NULL);
- assert(numDWords < __MAX_FILL_SIZE/sizeof(DWORD));
- #endif
- memsetDAsm(dest, fillVal, numDWords);
-}
-
-inline void memcpyB(void *dest, const void *src, size_t numBytes) {
- #ifdef _DEBUG
- if (numBytes <= 0) return;
- assert(dest != NULL);
- assert(src != NULL);
- #endif
- //FIXME - supply assembler version
- memcpy(dest, src, numBytes);
-}
-
-inline void memcpyW(void *dest, const void *src, size_t numWords) {
- #ifdef _DEBUG
- if (numWords <= 0) return;
- assert(dest != NULL);
- assert(src != NULL);
- #endif
- //FIXME - supply assembler version
- memcpy(dest, src, numWords * sizeof(WORD));
-}
-
-inline void memcpyD(void *dest, const void *src, size_t numDWords) {
- #ifdef _DEBUG
- if (numDWords <= 0) return;
- assert(dest != NULL);
- assert(src != NULL);
- #endif
- //FIXME - supply assembler version
- memcpy(dest, src, numDWords * sizeof(DWORD));
-}
-
-template <class T> inline void zeroStruct(T &a) {
- assert(&a != NULL);
- //FIXME - figure out why this doesn't work!
- //zeroMemAsm(&a, sizeof(a));
- memset(&a, 0, sizeof(a));
-}
-
-//#define memset HEY_USE_memsetB
-//#define memcpy HEY_USE_memcpyB
-
template <class T> inline T align4(T x) {
return (x + T(3)) & T(~3U);
}
@@ -503,8 +178,8 @@
return T((DWORD(a) >> unsigned(count)) | (DWORD(a) <<
unsigned(sizeof(T)*8 - count)));
}
-inline BOOL isValidPtr(const void *ptr) {
- return (ptr > NULL) && (ptr < (void *)0x90000000);
+inline bool isValidPtr(const void *ptr) {
+ return (ptr > 0) && (ptr < (void *)0x90000000);
}
template <class T> inline T squared(T a) { return a*a; }
@@ -529,10 +204,6 @@
// Other standard prototypes
//***************************************************************************
-void safeStrCpy (char *dest, size_t destSize, const char *src);
-void safeSprintf (char *dest, size_t destSize, const char *fmt, ...);
-void safeVsprintf(char *dest, size_t destSize, const char *fmt, va_list ap);
-
void trimLeadingWhitespace (char *str);
void trimTrailingWhitespace(char *str);
void concatenateWhitespace (char *str);
@@ -542,7 +213,6 @@
void reverseBytes(void *buf, size_t numBytes); // A B C D <->
D C B A
void reverseWords(void *buf, size_t numWords); // AB CD EF GH <->
GH EF CD AB
void reverseDWords(void *buf, size_t numDWords); // ABCD EFGH IJKL MNOP <->
MNOP IJKL EFGH ABCD
-
//***************************************************************************
#endif // #ifndef __CODEWIZ_H_INCLUDED__
Index: netpanzer/src/Lib/log.cpp
diff -u netpanzer/src/Lib/log.cpp:1.1 netpanzer/src/Lib/log.cpp:1.2
--- netpanzer/src/Lib/log.cpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/log.cpp Mon Sep 1 16:24:18 2003
@@ -25,15 +25,15 @@
// includes
//***************************************************************************
-#include "stdafx.hpp"
+
//***************************************************************************
// global data
//***************************************************************************
-const CALL_STACK *CALL_STACK::top = NULL;
+const CALL_STACK *CALL_STACK::top = 0;
-char const *__logFile = NULL;
+char const *__logFile = 0;
unsigned __logLine = 0;
unsigned __logDepth = 0;
@@ -45,7 +45,7 @@
void __log(const char *msg, ...) {
va_list ap;
va_start(ap, msg);
- __vlog(NULL, NULL, msg, ap);
+ __vlog(0, 0, msg, ap);
va_end(ap);
}
@@ -54,7 +54,7 @@
--__logDepth;
va_list ap;
va_start(ap, msg);
- __vlog("} ", NULL, msg, ap);
+ __vlog("} ", 0, msg, ap);
va_end(ap);
}
@@ -62,7 +62,7 @@
void __logOpen(const char *msg, ...) {
va_list ap;
va_start(ap, msg);
- __vlog(NULL, " {", msg, ap);
+ __vlog(0, " {", msg, ap);
va_end(ap);
++__logDepth;
}
@@ -72,7 +72,7 @@
va_list ap) {
static const char FILENAME[] = "DEBUG.LOG";
- static BOOL initted = FALSE;
+ static bool initted = false;
if (!initted) {
#if COMPILER_MICROSOFT
@@ -82,11 +82,11 @@
#else
#error
#endif
- initted = TRUE;
+ initted = true;
}
FILE *fp = fopen(FILENAME, "a+b");
- if (fp == NULL) return;
+ if (fp == 0) return;
char buf[1024];
@@ -97,11 +97,11 @@
size_t len = __logDepth * TAB_EXPAND;
memsetB(buf, ' ', len);
- if (leader != NULL) len += sprintf(buf + len, leader);
- if (msg != NULL) len += vsprintf(buf + len, msg, ap);
- if (trailer != NULL) len += sprintf(buf + len, trailer);
+ if (leader != 0) len += sprintf(buf + len, leader);
+ if (msg != 0) len += vsprintf(buf + len, msg, ap);
+ if (trailer != 0) len += sprintf(buf + len, trailer);
- if (__logFile != NULL || __logLine > 0 || CALL_STACK::top != NULL) {
+ if (__logFile != 0 || __logLine > 0 || CALL_STACK::top != 0) {
buf[len++] = ' ';
buf[len++] = ' ';
buf[len++] = ' ';
@@ -109,9 +109,9 @@
buf[len++] = ' ';
}
buf[len++] = '[';
- if (CALL_STACK::top != NULL) len += sprintf(buf + len, "%s%s",
CALL_STACK::top->strPtr, (__logFile != NULL || __logLine > 0) ? ", " : "");
- if (__logFile != NULL) len += sprintf(buf + len, "%s",
__logFile);
- if (__logLine > 0 ) len += sprintf(buf + len, "%s%u",
(__logFile != NULL) ? ":" : "line ", __logLine);
+ if (CALL_STACK::top != 0) len += sprintf(buf + len, "%s%s",
CALL_STACK::top->strPtr, (__logFile != 0 || __logLine > 0) ? ", " : "");
+ if (__logFile != 0) len += sprintf(buf + len, "%s",
__logFile);
+ if (__logLine > 0 ) len += sprintf(buf + len, "%s%u",
(__logFile != 0) ? ":" : "line ", __logLine);
buf[len++] = ']';
}
@@ -130,16 +130,16 @@
__logDepth = savedDepth;
va_list ap;
va_start(ap, fmt);
- __vlog("} returning ", NULL, fmt, ap);
+ __vlog("} returning ", 0, fmt, ap);
va_end(ap);
- closed = TRUE;
+ closed = true;
}
//---------------------------------------------------------------------------
void CALL_STACK::setMyBuf(const char *fmt, ...) {
va_list ap;
va_start(ap, fmt);
- safeVsprintf(myBuf, sizeof(myBuf), fmt, ap);
+ vsnprintf(myBuf, sizeof(myBuf), fmt, ap);
va_end(ap);
}
Index: netpanzer/src/Lib/terminate.cpp
diff -u netpanzer/src/Lib/terminate.cpp:1.1 netpanzer/src/Lib/terminate.cpp:1.2
--- netpanzer/src/Lib/terminate.cpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/Lib/terminate.cpp Mon Sep 1 16:24:18 2003
@@ -20,9 +20,14 @@
// includes
//***************************************************************************
-#include "stdafx.hpp"
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdarg.h>
+// XXX win32 only include it seems
+//#include <process.h>
-#include <process.h>
+#include "codewiz.hpp"
//***************************************************************************
// constants
@@ -36,7 +41,7 @@
typedef struct {
void (*func)();
- BOOL doEvenOnFubed;
+ bool doEvenOnFubed;
} CLEANUP_FUNC;
//***************************************************************************
@@ -57,7 +62,7 @@
//***************************************************************************
//---------------------------------------------------------------------------
-void cleanup(BOOL fubed) {
+void cleanup(bool fubed) {
while (numCleanupFuncs > 0) {
--numCleanupFuncs;
if (!fubed || cleanupFunc[numCleanupFuncs].doEvenOnFubed &&
@@ -65,38 +70,40 @@
cleanupFunc[numCleanupFuncs].func();
}
}
- zeroMem(cleanupFunc, sizeof(cleanupFunc));
+ memset(cleanupFunc, 0, sizeof(cleanupFunc));
}
//---------------------------------------------------------------------------
-void term(int returnCode, BOOL fubed, const char *msg, ...) {
+void vterm(int returnCode, bool fubed, const char *msg, va_list ap);
+
+void term(int returnCode, bool fubed, const char *msg, ...) {
va_list ap;
va_start(ap, msg);
vterm(returnCode, fubed, msg, ap);
}
//---------------------------------------------------------------------------
-void vterm(int returnCode, BOOL fubed, const char *msg, va_list ap) {
+void vterm(int returnCode, bool fubed, const char *msg, va_list ap) {
cleanup(fubed);
#if COMPILER_WATCOM
flushall();
#endif
// const CALL_STACK *s = CALL_STACK::top;
-// CALL_STACK::top = NULL;
+// CALL_STACK::top = 0;
//
// __logDepth = 0;
-// __logFile = NULL;
+// __logFile = 0;
// __logLine = 0;
- if (msg != NULL) {
+ if (msg != 0) {
static char buf[4096];
vsprintf(buf, msg, ap);
#ifdef _LOGGING_ON
__log("\nFUBAR:\n");
//CALL_STACK::top = s;
__log(buf);
- //CALL_STACK::top = NULL;
+ //CALL_STACK::top = 0;
#endif
#if WIN_BUILD
@@ -104,24 +111,24 @@
if (fubed) {
static char prompt[sizeof(buf) + 200];
sprintf(prompt, "%s\n\nPress RETRY to
debug the application.", buf);
- if (MessageBox(NULL, prompt, "GTFO!",
MB_RETRYCANCEL) == IDRETRY) {
+ if (MessageBox(0, prompt, "GTFO!",
MB_RETRYCANCEL) == IDRETRY) {
hardBreak();
}
} else
#endif
- MessageBox(NULL, buf, "GTFO!", MB_OK);
+ MessageBox(0, buf, "GTFO!", MB_OK);
#else
fprintf(fubed ? stderr : stdout, "\n%s\n", buf);
- //if (fubed && s != NULL) {
+ //if (fubed && s != 0) {
// //fprintf(stderr, "\n\nCall stack:\n");
// __log("\nCall stack:");
// do {
// //fprintf(stderr, " %s [%s:%u]\n",
s->strPtr, s->srcFile, s->srcLine);
// __log(" %s [%s:%u]", s->strPtr,
s->srcFile, s->srcLine);
// s = s->nextDown;
- // } while (s != NULL);
+ // } while (s != 0);
// fprintf(stderr, "\n");
//}
#endif
@@ -134,36 +141,36 @@
void quitOK(const char *msg, ...) {
va_list ap;
va_start(ap, msg);
- vterm(0, FALSE, msg, ap);
+ vterm(0, false, msg, ap);
}
//---------------------------------------------------------------------------
void FUBAR(const char *msg, ...) {
va_list ap;
va_start(ap, msg);
- vterm(255, TRUE, msg, ap);
+ vterm(255, true, msg, ap);
}
//---------------------------------------------------------------------------
void vQuitOK(const char *msg, va_list ap) {
- vterm(0, FALSE, msg, ap);
+ vterm(0, false, msg, ap);
}
//---------------------------------------------------------------------------
void vFUBAR(const char *msg, va_list ap) {
- vterm(255, TRUE, msg, ap);
+ vterm(255, true, msg, ap);
}
//---------------------------------------------------------------------------
-void _addCleanupFunc(void (*func)(), BOOL doEvenOnFubed,
+void _addCleanupFunc(void (*func)(), bool doEvenOnFubed,
const char *sourceFile, unsigned lineNumber) {
FUNCF(("_addCleanupFunc(doEvenOnFubed=%d, sourceFile=%s,
lineNumber=%u)", doEvenOnFubed, sourceFile, lineNumber));
- static BOOL initted = FALSE;
+ static bool initted = false;
if (!initted) {
if (atexit(atexit_cleanup))
FUBAR("Cannot register cleanup function with atexit");
- initted = TRUE;
+ initted = true;
}
if (numCleanupFuncs >= MAX_CLEANUP_FUNCS) {
FUBAR("Attempted to add more than %u cleanup functions in %s,
line %u",
@@ -179,5 +186,5 @@
//***************************************************************************
void atexit_cleanup() {
- cleanup(FALSE);
+ cleanup(false);
}
Index: netpanzer/src/Makefile
diff -u netpanzer/src/Makefile:1.1 netpanzer/src/Makefile:1.2
--- netpanzer/src/Makefile:1.1 Mon Sep 1 13:20:41 2003
+++ netpanzer/src/Makefile Mon Sep 1 16:24:18 2003
@@ -1,5 +1,5 @@
-#SYSTEM=WIN32
-SYSTEM=UNIX
+SYSTEM=WIN32
+#SYSTEM=UNIX
DIRS = . Lib Lib/2D Lib/Environment Lib/Interfaces Lib/Particles \
Lib/PObject/Classes Lib/PObject/Templates Lib/Types Lib/View \
@@ -15,7 +15,7 @@
ifeq ($(SYSTEM),UNIX)
DIRS += NetPanzer/Interfaces/unix Stub
-GOAL = netpanzer
+GOAL = ../netpanzer
LINKFLAGS += -g3 `sdl-config --libs`
CFLAGS += `sdl-config --cflags` -DUNIX
endif
@@ -23,7 +23,7 @@
DIRS += NetPanzer/Interfaces/win32 DirectX/DDraw DirectX/DirectInput \
DirectX/DirectPlay DirectX/DirectSound \
Win32 Win32/Winsock
-GOAL = netpanzer.exe
+GOAL = ../netpanzer.exe
CFLAGS += -DWIN32 -Iw32api
LINKFLAGS += -lgdi32 -lshell32 -lddraw -ldinput -ldplayx -ldsound -lws2_32
-ldsetup -lwinmm -ldxguid -lole32
endif
Index: netpanzer/src/NetPanzer/Classes/AI/Astar.cpp
diff -u netpanzer/src/NetPanzer/Classes/AI/Astar.cpp:1.1
netpanzer/src/NetPanzer/Classes/AI/Astar.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/AI/Astar.cpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/NetPanzer/Classes/AI/Astar.cpp Mon Sep 1 16:24:20 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "Astar.hpp"
#include "Timer.hpp"
@@ -39,7 +38,7 @@
Astar::Astar( void )
{
- node_list = NULL;
+ node_list = 0;
}
void Astar::initializeAstar( unsigned long node_list_size,
@@ -57,7 +56,7 @@
Astar::step_limit = step_limit;
Astar::heuristic_weight = heuristic_weight;
- ini_flag = _TRUE;
+ ini_flag = true;
}
void Astar::initializeAstar( unsigned long node_list_size )
@@ -76,11 +75,11 @@
{
AstarNode *node_ptr;
- if ( dynamic_node_management_flag == _TRUE )
+ if ( dynamic_node_management_flag == true )
{
- if (free_list_ptr == NULL)
+ if (free_list_ptr == 0)
{
- return( NULL );
+ return( 0 );
}
else
{
@@ -94,7 +93,7 @@
{
if ( node_index >= node_list_size )
{
- return( NULL );
+ return( 0 );
}
node_ptr = &node_list[ node_index ];
@@ -107,7 +106,7 @@
void Astar::releaseNode( AstarNode *node )
{
- if ( dynamic_node_management_flag == _TRUE )
+ if ( dynamic_node_management_flag == true )
{
node->parent = free_list_ptr;
free_list_ptr = node;
@@ -119,14 +118,14 @@
{
node_index = 0;
- if ( dynamic_node_management_flag == _TRUE )
+ if ( dynamic_node_management_flag == true )
{
int node_list_index;
int node_list_start;
node_list_start = node_list_size - 2;
- node_list[ node_list_size - 1].parent = NULL;
+ node_list[ node_list_size - 1].parent = 0;
for ( node_list_index = node_list_start; node_list_index >= 0;
node_list_index-- )
{
@@ -143,14 +142,14 @@
node_index = 0;
node_list_size = initial_size;
- if ( node_list != NULL )
+ if ( node_list != 0 )
{
free( node_list );
- node_list = NULL;
+ node_list = 0;
}
node_list = (AstarNode *) malloc( sizeof( AstarNode) * node_list_size );
- assert( node_list != NULL );
+ assert( node_list != 0 );
}
@@ -159,15 +158,15 @@
{
TIMESTAMP timer_ini_mark = now();
- if ( sample_set_array_flag == _TRUE )
- start_sampling_flag = _TRUE;
+ if ( sample_set_array_flag == true )
+ start_sampling_flag = true;
resetNodeList();
total_pathing_time = 0;
steps = 0;
total_steps = 0;
- succ_swap_flag = _FALSE;
+ succ_swap_flag = false;
path_type_flag = path_type;
goal_node.map_loc = goal;
@@ -175,17 +174,17 @@
goal_node.g = getMovementValue( goal );
goal_node.abs_loc = mapXYtoAbsloc( goal );
- best_node = NULL;
+ best_node = 0;
best_node = getNewNode();
- assert( best_node != NULL );
+ assert( best_node != 0 );
best_node->map_loc = start;
best_node->abs_loc = mapXYtoAbsloc( start );
best_node->g = 0;
best_node->h = heuristic( best_node->map_loc, goal );
best_node->f = best_node->g + best_node->h;
- best_node->parent = NULL;
+ best_node->parent = 0;
open.push( best_node );
@@ -248,7 +247,7 @@
movement_val = getMovementValue( succ->map_loc );
if ( movement_val != 0xFF )
- if ( ( (UnitBlackBoard::unitOccupiesLoc( succ->map_loc ) == _TRUE ) &&
+ if ( ( (UnitBlackBoard::unitOccupiesLoc( succ->map_loc ) == true ) &&
(succ->map_loc != goal_node.map_loc) )
)
{
@@ -260,14 +259,14 @@
succ->h = heuristic( succ->map_loc, goal_node.map_loc );
succ->f = succ->h + succ->g ;
- succ->parent = NULL;
+ succ->parent = 0;
return( movement_val );
}
-boolean Astar::generatePath( PathRequest *path_request,
+bool Astar::generatePath( PathRequest *path_request,
unsigned short path_merge_type,
- boolean dynamic_node_managment,
+ bool dynamic_node_managment,
int *result_code )
{
if ( ini_flag )
@@ -276,21 +275,21 @@
Astar::path_merge_type = path_merge_type;
Astar::dynamic_node_management_flag = dynamic_node_managment;
initializePath( path_request->start, path_request->goal,
path_request->path_type );
- ini_flag = _FALSE;
+ ini_flag = false;
}
return ( process_succ( path_request->path, result_code ) );
}
-boolean Astar::process_succ( PathList *path, int *result_code )
+bool Astar::process_succ( PathList *path, int *result_code )
{
AstarNode *node;
AstarNode temp_node;
unsigned long temp;
- boolean done = _FALSE;
+ bool done = false;
unsigned short succ_loop;
- boolean steps_comp = _FALSE ;
- boolean goal_reachable = _TRUE;
+ bool steps_comp = false ;
+ bool goal_reachable = true;
unsigned short path_length;
unsigned short *map_buffer;
@@ -303,16 +302,16 @@
{
best_node = (AstarNode *) open.pop( );
- if ( best_node == NULL )
+ if ( best_node == 0 )
{
- goal_reachable = _FALSE;
- done = _TRUE;
+ goal_reachable = false;
+ done = true;
}
else
{
if ( (best_node->map_loc == goal_node.map_loc) )
{
- done = _TRUE;
+ done = true;
}
else
{
@@ -336,14 +335,14 @@
} // ** if in closed
else
{
- node = NULL;
+ node = 0;
node = getNewNode();
- if ( node == NULL )
+ if ( node == 0 )
{
- done = _TRUE;
- goal_reachable = _FALSE;
+ done = true;
+ goal_reachable = false;
}
else
{
@@ -353,7 +352,7 @@
open_set.setBit( node->map_loc.x, node->map_loc.y );
- if ( start_sampling_flag == _TRUE)
+ if ( start_sampling_flag == true)
astar_set_array.setBit( node->map_loc.x, node->map_loc.y );
open.push( node );
@@ -371,7 +370,7 @@
closed_set.setBit( best_node->map_loc.x, best_node->map_loc.y );
- if ( start_sampling_flag == _TRUE)
+ if ( start_sampling_flag == true)
astar_set_array.setBit( best_node->map_loc.x, best_node->map_loc.y );
releaseNode( best_node );
@@ -379,13 +378,13 @@
} // ** else
if ( succ_swap_flag )
- succ_swap_flag = _FALSE;
+ succ_swap_flag = false;
else
- succ_swap_flag = _TRUE;
+ succ_swap_flag = true;
if ( steps > step_limit )
{
- steps_comp = _TRUE;
+ steps_comp = true;
steps = 0;
}
else
@@ -400,11 +399,11 @@
if ( done && goal_reachable )
{
- boolean insert_successful = _TRUE;
+ bool insert_successful = true;
path_length = 0;
node = best_node;
- while ( (node != NULL) && (insert_successful == _TRUE) )
+ while ( (node != 0) && (insert_successful == true) )
{
if ( path_merge_type == _path_merge_front )
@@ -417,7 +416,7 @@
}
- if ( insert_successful == _FALSE )
+ if ( insert_successful == false )
{
path->reset();
}
@@ -430,27 +429,27 @@
}
cleanUp();
- ini_flag = _TRUE;
+ ini_flag = true;
PathingState::path_length = path_length;
PathingState::astar_gen_time = total_pathing_time;
PathingState::astar_gen_time_total += total_pathing_time;
*result_code = _path_result_success;
- return( _TRUE );
+ return( true );
}
else
if ( !goal_reachable )
{
- ini_flag = _TRUE;
+ ini_flag = true;
cleanUp();
PathingState::astar_gen_time = total_pathing_time;
PathingState::astar_gen_time_total += total_pathing_time;
*result_code = _path_result_goal_unreachable;
- return( _TRUE );
+ return( true );
}
- return( _FALSE );
+ return( false );
}
void Astar::cleanUp( void )
@@ -462,19 +461,19 @@
open.reset();
resetNodeList();
- ini_flag = _TRUE;
+ ini_flag = true;
- sample_set_array_flag = _FALSE;
- start_sampling_flag = _FALSE;
+ sample_set_array_flag = false;
+ start_sampling_flag = false;
total_pathing_time += now() - timer_cleanup_mark;
}
-void Astar::setDebugMode( boolean on_off )
+void Astar::setDebugMode( bool on_off )
{
debug_mode_flag = on_off;
- if ( debug_mode_flag == _TRUE )
+ if ( debug_mode_flag == true )
{
astar_set_array.initialize( MapInterface::getMapXsize(),
MapInterface::getMapYsize() );
}
@@ -486,11 +485,11 @@
void Astar::sampleSetArrays( void )
{
- if ( debug_mode_flag == _TRUE )
+ if ( debug_mode_flag == true )
{
astar_set_array.clear();
- sample_set_array_flag = _TRUE;
- start_sampling_flag = _FALSE;
+ sample_set_array_flag = true;
+ start_sampling_flag = false;
}
}
Index: netpanzer/src/NetPanzer/Classes/AI/Astar.hpp
diff -u netpanzer/src/NetPanzer/Classes/AI/Astar.hpp:1.1
netpanzer/src/NetPanzer/Classes/AI/Astar.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/AI/Astar.hpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/NetPanzer/Classes/AI/Astar.hpp Mon Sep 1 16:24:20 2003
@@ -18,7 +18,6 @@
#ifndef _ASTAR_HPP
#define _ASTAR_HPP
-#include "aliasdef.h"
#include "PPriorityQueue.hpp"
#include "BitArray.hpp"
#include "MapInterface.hpp"
@@ -61,7 +60,7 @@
}
- void operator=( PathRequest &rhs )
+ void operator=( const PathRequest &rhs )
{
memmove( this, &rhs, sizeof( PathRequest ) );
}
@@ -97,7 +96,7 @@
void initializeNodeList( unsigned long initial_size );
AstarNode *free_list_ptr;
- boolean dynamic_node_management_flag;
+ bool dynamic_node_management_flag;
protected:
unsigned long mapXYtoAbsloc( PointXYi map_loc );
@@ -114,9 +113,9 @@
// ** For pathing debugging **
BitArray astar_set_array;
- boolean sample_set_array_flag;
- boolean start_sampling_flag;
- boolean debug_mode_flag;
+ bool sample_set_array_flag;
+ bool start_sampling_flag;
+ bool debug_mode_flag;
unsigned long steps;
unsigned long step_limit;
@@ -126,9 +125,9 @@
long heuristic_weight; // factor for heuristic f = g() + w
* h()
- boolean succ_swap_flag;
+ bool succ_swap_flag;
unsigned short path_type_flag;
- boolean ini_flag;
+ bool ini_flag;
PathRequest *path_request_ptr;
@@ -140,7 +139,7 @@
unsigned char generateSucc( unsigned short direction, AstarNode *node,
AstarNode *succ );
- boolean process_succ( PathList *path, int *result_code );
+ bool process_succ( PathList *path, int *result_code );
public:
@@ -154,14 +153,14 @@
void initializeAstar( void );
- boolean generatePath( PathRequest *path_request,
+ bool generatePath( PathRequest *path_request,
unsigned short path_merge_type,
- boolean dynamic_node_managment,
+ bool dynamic_node_managment,
int *result_code );
void cleanUp( void );
- void setDebugMode( boolean on_off );
+ void setDebugMode( bool on_off );
void sampleSetArrays( void );
Index: netpanzer/src/NetPanzer/Classes/AI/PathList.cpp
diff -u netpanzer/src/NetPanzer/Classes/AI/PathList.cpp:1.1
netpanzer/src/NetPanzer/Classes/AI/PathList.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/AI/PathList.cpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/NetPanzer/Classes/AI/PathList.cpp Mon Sep 1 16:24:20 2003
@@ -15,14 +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
*/
-#include "stdafx.hpp"
+#include <assert.h>
#include "PathList.hpp"
unsigned long DEFAULT_PATH_LIST_SIZE = 1000;
PathList::PathList( void )
{
- list = NULL;
+ list = 0;
first = 0;
last = first;
}
@@ -34,12 +34,12 @@
last = first;
list = (unsigned long *) malloc( sizeof(unsigned long) * list_size );
- assert( list != NULL );
+ assert( list != 0 );
}
PathList::~PathList( void )
{
- if( list != NULL )
+ if( list != 0 )
{ free( list ); }
}
@@ -50,7 +50,7 @@
last = first;
list = (unsigned long *) malloc( sizeof(unsigned long) * size );
- assert( list != NULL );
+ assert( list != 0 );
}
@@ -61,5 +61,5 @@
last = first;
list = (unsigned long *) malloc( sizeof(unsigned long) * list_size );
- assert( list != NULL );
+ assert( list != 0 );
}
Index: netpanzer/src/NetPanzer/Classes/AI/PathList.hpp
diff -u netpanzer/src/NetPanzer/Classes/AI/PathList.hpp:1.1
netpanzer/src/NetPanzer/Classes/AI/PathList.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/AI/PathList.hpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/NetPanzer/Classes/AI/PathList.hpp Mon Sep 1 16:24:20 2003
@@ -18,7 +18,6 @@
#ifndef _PATHLIST_HPP
#define _PATHLIST_HPP
-#include "aliasdef.h"
#include <stdlib.h>
#include <string.h>
@@ -48,14 +47,14 @@
last = first;
}
- inline boolean pushFirst( unsigned long tile )
+ inline bool pushFirst( unsigned long tile )
{
long next_first;
next_first = (first + 1) % size;
if ( next_first == last )
- return( _FALSE );
+ return( false );
//assert( next_first != last );
@@ -65,20 +64,20 @@
{
size = size + 50;
list = (unsigned long *) realloc( list, sizeof(unsigned long) * size );
- assert( list != NULL );
+ assert( list != 0 );
}
*/
first = next_first;
list[ first ] = tile;
- return( _TRUE );
+ return( true );
}
- inline boolean popFirst( unsigned long *tile )
+ inline bool popFirst( unsigned long *tile )
{
if ( first == last )
- return( _FALSE );
+ return( false );
*tile = list[ first ];
@@ -86,10 +85,10 @@
if ( first < 0 )
first = size+first;
- return( _TRUE );
+ return( true );
}
- inline boolean pushLast( unsigned long tile )
+ inline bool pushLast( unsigned long tile )
{
long next_last;
@@ -99,7 +98,7 @@
next_last = size+next_last;
if ( first == next_last )
- return( _FALSE );
+ return( false );
//assert( first != next_last );
@@ -108,7 +107,7 @@
{
size = size + 50;
list = (unsigned long *) realloc( list, sizeof(unsigned long) * size );
- assert( list != NULL );
+ assert( list != 0 );
}
*/
@@ -116,39 +115,39 @@
last = next_last;
- return( _TRUE );
+ return( true );
}
- inline boolean popLast( unsigned long *tile )
+ inline bool popLast( unsigned long *tile )
{
if ( first == last )
- return( _FALSE );
+ return( false );
last = (last + 1) % size;
*tile = list[ last ];
- return( _TRUE );
+ return( true );
}
- inline boolean take( long count )
+ inline bool take( long count )
{
if ( (first - count) < last )
- return( _FALSE );
+ return( false );
first = first - count;
- return( _TRUE );
+ return( true );
}
- inline boolean drop( long count )
+ inline bool drop( long count )
{
if ( (last + count) > first )
- return( _FALSE );
+ return( false );
last = last + count;
- return( _TRUE );
+ return( true );
}
inline long listCount( void )
Index: netpanzer/src/NetPanzer/Classes/AI/PathingState.cpp
diff -u netpanzer/src/NetPanzer/Classes/AI/PathingState.cpp:1.1
netpanzer/src/NetPanzer/Classes/AI/PathingState.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/AI/PathingState.cpp:1.1 Sun Dec 1
12:51:46 2002
+++ netpanzer/src/NetPanzer/Classes/AI/PathingState.cpp Mon Sep 1 16:24:20 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "PathingState.hpp"
float PathingState::astar_gen_time = 0.0;
Index: netpanzer/src/NetPanzer/Classes/BonusUnitPowerUp.cpp
diff -u netpanzer/src/NetPanzer/Classes/BonusUnitPowerUp.cpp:1.1
netpanzer/src/NetPanzer/Classes/BonusUnitPowerUp.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/BonusUnitPowerUp.cpp:1.1 Sun Dec 1
12:51:46 2002
+++ netpanzer/src/NetPanzer/Classes/BonusUnitPowerUp.cpp Mon Sep 1
16:24:20 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "BonusUnitPowerUp.hpp"
#include <stdlib.h>
@@ -80,7 +79,7 @@
spawn_loc,
player_id );
- if ( new_unit != NULL )
+ if ( new_unit != 0 )
{
UnitRemoteCreate create_mesg;
@@ -117,7 +116,7 @@
{
if ( powerup_state.life_cycle_state == _power_up_lifecycle_state_active )
{
- if( isPowerUpHit( &unit_id ) == _TRUE )
+ if( isPowerUpHit( &unit_id ) == true )
{
spawnBonusUnits( unit_id );
}
Index: netpanzer/src/NetPanzer/Classes/BonusUnitPowerUp.hpp
diff -u netpanzer/src/NetPanzer/Classes/BonusUnitPowerUp.hpp:1.1
netpanzer/src/NetPanzer/Classes/BonusUnitPowerUp.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/BonusUnitPowerUp.hpp:1.1 Sun Dec 1
12:51:46 2002
+++ netpanzer/src/NetPanzer/Classes/BonusUnitPowerUp.hpp Mon Sep 1
16:24:20 2003
@@ -35,6 +35,8 @@
void spawnBonusUnits( UnitID &unit_id );
public:
+ virtual ~BonusUnitPowerUp()
+ { }
BonusUnitPowerUp(PointXYi map_loc, int type);
Index: netpanzer/src/NetPanzer/Classes/DDHardSurface.cpp
diff -u netpanzer/src/NetPanzer/Classes/DDHardSurface.cpp:1.2
netpanzer/src/NetPanzer/Classes/DDHardSurface.cpp:1.3
--- netpanzer/src/NetPanzer/Classes/DDHardSurface.cpp:1.2 Sun Aug 31
20:03:03 2003
+++ netpanzer/src/NetPanzer/Classes/DDHardSurface.cpp Mon Sep 1 16:24:20 2003
@@ -15,7 +15,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+#include "UIDraw.hpp"
#include "DDHardSurface.hpp"
#include "DirectDrawGlobals.hpp"
@@ -36,33 +36,33 @@
stride = nStride;
center = iXY( xPix >> 1, yPix >> 1);
frameCount = nNumFrames;
- doesExist = FALSE;
+ doesExist = false;
}
void DDHardSurface::lock( void )
{
- //assert( lock_status == _FALSE );
+ //assert( lock_status == false );
Screen->lockDoubleBuffer( (unsigned char **) &frame0 );
mem = frame0;
- doesExist = _TRUE;
- lock_status = _TRUE;
+ doesExist = true;
+ lock_status = true;
}
void DDHardSurface::unlock( void )
{
- //assert( lock_status == _TRUE );
+ //assert( lock_status == true );
Screen->unlockDoubleBuffer();
- doesExist = _FALSE;
- lock_status = _FALSE;
+ doesExist = false;
+ lock_status = false;
}
void DDHardSurface::copyToVideoFlip( void )
- {
- assert( lock_status == _FALSE );
+{
+ assert( lock_status == false );
Screen->copyDoubleBufferandFlip();
- }
+}
Index: netpanzer/src/NetPanzer/Classes/DDHardSurface.hpp
diff -u netpanzer/src/NetPanzer/Classes/DDHardSurface.hpp:1.1
netpanzer/src/NetPanzer/Classes/DDHardSurface.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/DDHardSurface.hpp:1.1 Sun Dec 1
12:51:46 2002
+++ netpanzer/src/NetPanzer/Classes/DDHardSurface.hpp Mon Sep 1 16:24:20 2003
@@ -19,12 +19,11 @@
#define _DDHARDSURFACE_HPP
#include "Surface.hpp"
-#include "aliasdef.h"
class DDHardSurface : public Surface
{
protected:
- boolean lock_status;
+ bool lock_status;
public:
Index: netpanzer/src/NetPanzer/Classes/EnemyRadarPowerUp.cpp
diff -u netpanzer/src/NetPanzer/Classes/EnemyRadarPowerUp.cpp:1.1
netpanzer/src/NetPanzer/Classes/EnemyRadarPowerUp.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/EnemyRadarPowerUp.cpp:1.1 Sun Dec 1
12:51:46 2002
+++ netpanzer/src/NetPanzer/Classes/EnemyRadarPowerUp.cpp Mon Sep 1
16:24:20 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "EnemyRadarPowerUp.hpp"
#include <stdlib.h>
@@ -86,7 +85,7 @@
{
if ( powerup_state.life_cycle_state == _power_up_lifecycle_state_active )
{
- if( isPowerUpHit( &unit_id ) == _TRUE )
+ if( isPowerUpHit( &unit_id ) == true )
{
setRadar( unit_id );
}
Index: netpanzer/src/NetPanzer/Classes/EnemyRadarPowerUp.hpp
diff -u netpanzer/src/NetPanzer/Classes/EnemyRadarPowerUp.hpp:1.1
netpanzer/src/NetPanzer/Classes/EnemyRadarPowerUp.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/EnemyRadarPowerUp.hpp:1.1 Sun Dec 1
12:51:46 2002
+++ netpanzer/src/NetPanzer/Classes/EnemyRadarPowerUp.hpp Mon Sep 1
16:24:20 2003
@@ -35,6 +35,8 @@
public:
EnemyRadarPowerUp(PointXYi map_loc, int type);
+ virtual ~EnemyRadarPowerUp()
+ { }
virtual void updateState( void );
Index: netpanzer/src/NetPanzer/Classes/InternalLink.hpp
diff -u netpanzer/src/NetPanzer/Classes/InternalLink.hpp:1.1
netpanzer/src/NetPanzer/Classes/InternalLink.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/InternalLink.hpp:1.1 Sun Dec 1
12:51:46 2002
+++ netpanzer/src/NetPanzer/Classes/InternalLink.hpp Mon Sep 1 16:24:20 2003
@@ -19,7 +19,7 @@
#define _INTERNALLINK_HPP
#include "PObject.hpp"
-#include "Stdlib.h"
+#include <stdlib.h>
class InternalLink : public PObject
{
@@ -27,10 +27,10 @@
inline void addToList( InternalLink **start, InternalLink **end )
{
- next_ptr = NULL;
- prev_ptr = NULL;
+ next_ptr = 0;
+ prev_ptr = 0;
- if(*start == NULL)
+ if(*start == 0)
{
*start = this;
*end = this;
@@ -49,20 +49,20 @@
{
if ( (this == *start) && (this == *end) )
{
- *start = NULL;
- *end = NULL;
+ *start = 0;
+ *end = 0;
}
else
if(this == *start)
{
*start = next_ptr;
- next_ptr->prev_ptr = NULL;
+ next_ptr->prev_ptr = 0;
}
else
if(this == *end)
{
*end = prev_ptr;
- prev_ptr->next_ptr = NULL;
+ prev_ptr->next_ptr = 0;
}
else
{
Index: netpanzer/src/NetPanzer/Classes/KeyBinder.cpp
diff -u netpanzer/src/NetPanzer/Classes/KeyBinder.cpp:1.1
netpanzer/src/NetPanzer/Classes/KeyBinder.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/KeyBinder.cpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/NetPanzer/Classes/KeyBinder.cpp Mon Sep 1 16:24:20 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "KeyBinder.hpp"
#include <string.h>
@@ -23,7 +22,7 @@
KeyBinder KEY_BINDER;
-boolean KeyBinder::locked_key_table[256];
+bool KeyBinder::locked_key_table[256];
KeyBinder::KeyBinder( unsigned long key_list_size )
{
@@ -57,7 +56,7 @@
} // ** if
} // ** for
- return( NULL );
+ return( 0 );
}
KeyBinderElement * KeyBinder::findActionName( char *action_name )
@@ -69,35 +68,36 @@
for( key_list_index = 0; key_list_index < key_list_size; key_list_index++ )
{
- if( stricmp( key_list[ key_list_index ].action_name, action_name) == 0 )
+ if( strcasecmp( key_list[ key_list_index ].action_name, action_name) == 0 )
{
return( &key_list[ key_list_index ] );
} // ** if
} // ** for
- return( NULL );
+ return( 0 );
}
void KeyBinder::staticInitialize( void )
{
- memset( locked_key_table, 0, sizeof( boolean ) );
+ memset( locked_key_table, 0, sizeof( bool ) );
}
void KeyBinder::lockKey( unsigned char key_scan_code )
{
- assert( key_scan_code < 256 );
- locked_key_table[ key_scan_code ] = _TRUE;
+ // this is always true, isn't it?
+ // assert( key_scan_code < 256 );
+ locked_key_table[ key_scan_code ] = true;
}
void KeyBinder::unlockKey( unsigned char key_scan_code )
{
- assert( key_scan_code < 256 );
- locked_key_table[ key_scan_code ] = _FALSE;
+ //assert( key_scan_code < 256 );
+ locked_key_table[ key_scan_code ] = false;
}
void KeyBinder::bindAction( unsigned short action_enum, char *action_name,
unsigned char key_scan_code )
{
- if ( isBound( key_scan_code ) == _TRUE )
+ if ( isBound( key_scan_code ) == true )
return;
key_list[ action_enum ].action_enum = action_enum;
@@ -115,7 +115,7 @@
KeyBinderElement *key_info;
key_info = findActionName( action_name );
- if( key_info != NULL )
+ if( key_info != 0 )
{
return( key_info->key_scan_code );
}
@@ -123,17 +123,17 @@
return( 0 );
}
-boolean KeyBinder::isBound( unsigned char key_scan_code )
+bool KeyBinder::isBound( unsigned char key_scan_code )
{
KeyBinderElement *key_info;
key_info = findKeyScanCode( key_scan_code );
- if( key_info != NULL )
+ if( key_info != 0 )
{
- return( _TRUE );
+ return( true );
}
- return( _FALSE );
+ return( false );
}
unsigned short KeyBinder::getKeyAction( unsigned char key_scan_code )
@@ -141,7 +141,7 @@
KeyBinderElement *key_info;
key_info = findKeyScanCode( key_scan_code );
- if( key_info != NULL )
+ if( key_info != 0 )
{
return( key_info->action_enum );
}
@@ -149,16 +149,16 @@
return(0);
}
-boolean KeyBinder::getKeyAction( unsigned char key_scan_code, char
*action_name )
+bool KeyBinder::getKeyAction( unsigned char key_scan_code, char *action_name )
{
KeyBinderElement *key_info;
key_info = findKeyScanCode( key_scan_code );
- if( key_info != NULL )
+ if( key_info != 0 )
{
strcpy( action_name, key_info->action_name );
- return( _TRUE );
+ return( true );
}
- return( _FALSE );
+ return( false );
}
Index: netpanzer/src/NetPanzer/Classes/KeyBinder.hpp
diff -u netpanzer/src/NetPanzer/Classes/KeyBinder.hpp:1.1
netpanzer/src/NetPanzer/Classes/KeyBinder.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/KeyBinder.hpp:1.1 Sun Dec 1 12:51:46 2002
+++ netpanzer/src/NetPanzer/Classes/KeyBinder.hpp Mon Sep 1 16:24:20 2003
@@ -33,7 +33,7 @@
class KeyBinder
{
protected:
- static boolean locked_key_table[256];
+ static bool locked_key_table[256];
ArrayGrowableTemplate< KeyBinderElement > key_list;
@@ -56,10 +56,10 @@
unsigned char getActionKey( unsigned short action_enum );
unsigned char getActionKey( char *action_name );
- boolean isBound( unsigned char key_scan_code );
+ bool isBound( unsigned char key_scan_code );
unsigned short getKeyAction( unsigned char key_scan_code );
- boolean getKeyAction( unsigned char key_scan_code, char *action_name );
+ bool getKeyAction( unsigned char key_scan_code, char *action_name );
};
Index: netpanzer/src/NetPanzer/Classes/Network/ClientConnectDaemon.cpp
diff -u netpanzer/src/NetPanzer/Classes/Network/ClientConnectDaemon.cpp:1.1
netpanzer/src/NetPanzer/Classes/Network/ClientConnectDaemon.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/Network/ClientConnectDaemon.cpp:1.1 Sun Dec
1 12:51:46 2002
+++ netpanzer/src/NetPanzer/Classes/Network/ClientConnectDaemon.cpp Mon Sep
1 16:24:20 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "ClientConnectDaemon.hpp"
#include <stdio.h>
@@ -231,7 +230,7 @@
void ClientConnectDaemon::connectFsm( NetMessage *message )
{
- boolean end_cycle = _FALSE;
+ bool end_cycle = false;
do
{
@@ -242,7 +241,7 @@
case _connect_state_wait_for_connect_start :
{
- if ( message != NULL )
+ if ( message != 0 )
{
if ( message->message_id == _net_message_id_client_start_connect )
{
@@ -251,12 +250,12 @@
}
else
{
- end_cycle = _TRUE;
+ end_cycle = true;
}
- } // ** if ( message != NULL )
+ } // ** if ( message != 0 )
else
{
- end_cycle = _TRUE;
+ end_cycle = true;
}
} break;
@@ -269,12 +268,12 @@
connection_state = _connect_state_wait_for_connect_result;
- end_cycle = _TRUE;
+ end_cycle = true;
} break;
case _connect_state_wait_for_connect_result :
{
- if ( message != NULL )
+ if ( message != 0 )
{
if ( message->message_id == _net_message_id_client_connect_result )
{
@@ -323,7 +322,7 @@
}
- } // ** if ( message != NULL )
+ } // ** if ( message != 0 )
else
{
if ( time_out_timer.count() )
@@ -343,12 +342,12 @@
}
- end_cycle = _TRUE;
+ end_cycle = true;
} break;
case _connect_state_wait_for_server_game_setup :
{
- if ( message != NULL )
+ if ( message != 0 )
{
if ( message->message_id ==
_net_message_id_connect_server_game_setup )
{
@@ -391,7 +390,7 @@
}
}
- end_cycle = _TRUE;
+ end_cycle = true;
}
break;
@@ -400,7 +399,7 @@
char str_buf[128];
int percent_complete;
- if ( GameManager::clientGameSetup( &percent_complete ) == _FALSE )
+ if ( GameManager::clientGameSetup( &percent_complete ) == false )
{
ConnectMesgClientGameSetupAck client_game_setup_ack;
@@ -419,14 +418,14 @@
CLIENT->sendMessage( &client_game_setup_ping,
sizeof(ConnectMesgClientGameSetupPing), 0 );
}
- end_cycle = _TRUE;
+ end_cycle = true;
}
break;
case _connect_state_connect_failure :
{
- if ( failure_display_timer.count() == _TRUE )
+ if ( failure_display_timer.count() == true )
{
lobbyView.toggleMainMenu();
connection_state = _connect_state_idle;
@@ -435,7 +434,7 @@
} // ** switch
- } while( end_cycle == _FALSE );
+ } while( end_cycle == false );
}
@@ -447,5 +446,5 @@
void ClientConnectDaemon::connectProcess( void )
{
- connectFsm( NULL );
+ connectFsm( 0 );
}
Index: netpanzer/src/NetPanzer/Classes/Network/ClientMessageRouter.cpp
diff -u netpanzer/src/NetPanzer/Classes/Network/ClientMessageRouter.cpp:1.1
netpanzer/src/NetPanzer/Classes/Network/ClientMessageRouter.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/Network/ClientMessageRouter.cpp:1.1 Sun Dec
1 12:51:46 2002
+++ netpanzer/src/NetPanzer/Classes/Network/ClientMessageRouter.cpp Mon Sep
1 16:24:20 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "ClientMessageRouter.hpp"
#include "Client.hpp"
@@ -61,7 +60,7 @@
//GameManager::requestNetworkPing();
}
- while( CLIENT->getMessage( temp_message ) == _TRUE )
+ while( CLIENT->getMessage( temp_message ) == true )
{
if ( temp_message->message_class == _net_message_class_multi )
{
Index: netpanzer/src/NetPanzer/Classes/Network/ClientServerNetMessage.hpp
diff -u netpanzer/src/NetPanzer/Classes/Network/ClientServerNetMessage.hpp:1.1
netpanzer/src/NetPanzer/Classes/Network/ClientServerNetMessage.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/Network/ClientServerNetMessage.hpp:1.1
Sun Dec 1 12:51:46 2002
+++ netpanzer/src/NetPanzer/Classes/Network/ClientServerNetMessage.hpp Mon Sep
1 16:24:20 2003
@@ -20,6 +20,7 @@
#include "NetPacket.hpp"
#include "PlayerID.hpp"
+#include "codewiz.hpp"
enum { _net_message_id_transport_client_accept,
_net_message_id_client_connect_ack,
@@ -32,46 +33,45 @@
_net_message_id_client_ping_ack
};
+#ifdef MSVC
#pragma pack(1)
+#endif
class TransportClientAccept : public NetMessage
- {
- public:
- DWORD client_transport_id;
+{
+public:
+ DWORD client_transport_id;
- TransportClientAccept()
- {
- message_class = _net_message_class_client_server;
- message_id = _net_message_id_transport_client_accept;
- }
-
- };
+ TransportClientAccept()
+ {
+ message_class = _net_message_class_client_server;
+ message_id = _net_message_id_transport_client_accept;
+ }
+} __attribute__((packed));
class ClientMesgConnectAck : public NetMessage
- {
- public:
- DWORD client_transport_id;
+{
+public:
+ DWORD client_transport_id;
- ClientMesgConnectAck()
- {
- message_class = _net_message_class_client_server;
- message_id = _net_message_id_client_connect_ack;
- }
-
- };
+ ClientMesgConnectAck()
+ {
+ message_class = _net_message_class_client_server;
+ message_id = _net_message_id_client_connect_ack;
+ }
+} __attribute__((packed));
class ClientMesgServerId : public NetMessage
- {
- public:
- DPID server_DPID;
+{
+public:
+ DPID server_DPID;
- ClientMesgServerId()
- {
- message_class = _net_message_class_client_server;
- message_id = _net_message_id_client_server_id;
- }
-
- };
+ ClientMesgServerId()
+ {
+ message_class = _net_message_class_client_server;
+ message_id = _net_message_id_client_server_id;
+ }
+} __attribute__((packed));
class ClientMesgKeepAlive : public NetMessage
{
@@ -83,12 +83,12 @@
message_id = _net_message_id_client_keep_alive;
}
- };
+ } __attribute__((packed));
class ClientMesgSetKeepAlive : public NetMessage
{
public :
- boolean keep_alive_state;
+ bool keep_alive_state;
ClientMesgSetKeepAlive()
{
@@ -96,7 +96,7 @@
message_id = _net_message_id_client_set_keepalive_state;
}
- };
+ } __attribute__((packed));
class ServerMesgClientDisconnect : public NetMessage
@@ -109,7 +109,7 @@
message_class = _net_message_class_client_server;
message_id = _net_message_id_server_client_disconnect;
}
- };
+ } __attribute__((packed));
class ServerMesgKeepAlive: public NetMessage
@@ -123,7 +123,7 @@
message_id = _net_message_id_server_keep_alive;
}
- };
+ } __attribute__((packed));
class ServerMesgPingRequest: public NetMessage
{
@@ -136,7 +136,7 @@
message_id = _net_message_id_server_ping_request;
}
- };
+ } __attribute__((packed));
class ClientMesgPingAck: public NetMessage
{
@@ -148,8 +148,10 @@
message_id = _net_message_id_client_ping_ack;
}
- };
+ } __attribute__((packed));
+#ifdef MSVC
#pragma pack()
+#endif
#endif // ** _CLIENT_SERVER_NETMESSAGE_HPP
Index: netpanzer/src/NetPanzer/Classes/Network/ConnectNetMessage.hpp
diff -u netpanzer/src/NetPanzer/Classes/Network/ConnectNetMessage.hpp:1.1
netpanzer/src/NetPanzer/Classes/Network/ConnectNetMessage.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/Network/ConnectNetMessage.hpp:1.1 Sun Dec
1 12:51:46 2002
+++ netpanzer/src/NetPanzer/Classes/Network/ConnectNetMessage.hpp Mon Sep
1 16:24:20 2003
@@ -18,6 +18,7 @@
#ifndef _CONNECTNETMESSAGE_HPP
#define _CONNECTNETMESSAGE_HPP
+#include <time.h>
#include "NetPacket.hpp"
#include "PlayerState.hpp"
@@ -39,7 +40,9 @@
_net_message_id_connect_netPanzer_server_disconnect
};
+#ifdef MSVC
#pragma pack(1)
+#endif
class ClientConnectJoinRequest : public NetMessage
{
@@ -54,7 +57,7 @@
message_id = _net_message_id_connect_join_game_request;
}
- };
+ } __attribute__((packed));
enum { _join_request_result_success,
_join_request_result_invalid_protocol,
@@ -74,7 +77,7 @@
message_id = _net_message_id_connect_join_game_request_ack;
}
- };
+ } __attribute__((packed));
class ClientConnectStartConnect : public NetMessage
{
@@ -86,7 +89,7 @@
message_id = _net_message_id_client_start_connect;
}
- };
+ } __attribute__((packed));
class ClientConnectRequest : public NetMessage
{
@@ -98,7 +101,7 @@
message_id = _net_message_id_client_connect_request;
}
- };
+ } __attribute__((packed));
enum { _connect_result_success,
@@ -117,7 +120,7 @@
message_id = _net_message_id_client_connect_result;
}
- };
+ } __attribute__((packed));
class ConnectProcessUpdate : public NetMessage
@@ -131,7 +134,7 @@
message_id = _net_message_id_client_connect_process_update;
}
- };
+ } __attribute__((packed));
enum { _connect_state_message_load_game_data,
_connect_state_message_sync_player_info,
@@ -153,7 +156,7 @@
message_id = _net_message_id_client_connect_process_state_mesg;
}
- };
+ } __attribute__((packed));
class ConnectClientSettings : public NetMessage
{
@@ -175,7 +178,7 @@
ConnectClientSettings::player_flag = player_flag;
}
- };
+ } __attribute__((packed));
class ConnectMesgServerGameSettings : public NetMessage
{
@@ -186,8 +189,8 @@
int cloud_coverage;
float wind_speed;
int game_type;
- boolean map_cycle_state;
- boolean powerup_state;
+ bool map_cycle_state;
+ bool powerup_state;
int frag_limit;
int time_limit;
time_t elapsed_time;
@@ -198,7 +201,7 @@
message_id = _net_message_id_connect_server_game_setup;
}
- };
+ } __attribute__((packed));
class ConnectMesgClientGameSetupAck : public NetMessage
{
@@ -209,7 +212,7 @@
message_class = _net_message_class_connect;
message_id = _net_message_id_connect_client_game_setup_ack;
}
- };
+ } __attribute__((packed));
class ConnectMesgClientGameSetupPing : public NetMessage
{
@@ -220,7 +223,7 @@
message_class = _net_message_class_connect;
message_id = _net_message_id_connect_client_game_setup_ping;
}
- };
+ } __attribute__((packed));
class ConnectMesgNetPanzerClientDisconnect : public NetMessage
{
@@ -233,7 +236,7 @@
message_id = _net_message_id_connect_netPanzer_client_disconnect;
}
- };
+ } __attribute__((packed));
class ConnectMesgNetPanzerServerDisconnect : public NetMessage
{
@@ -245,9 +248,10 @@
message_id = _net_message_id_connect_netPanzer_server_disconnect;
}
- };
-
+ } __attribute__((packed));
+#ifdef MSVC
#pragma pack()
+#endif
#endif // ** _CONNECTNETMESSAGE_HPP
Index: netpanzer/src/NetPanzer/Classes/Network/GameControlNetMessage.hpp
diff -u netpanzer/src/NetPanzer/Classes/Network/GameControlNetMessage.hpp:1.1
netpanzer/src/NetPanzer/Classes/Network/GameControlNetMessage.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/Network/GameControlNetMessage.hpp:1.1
Sun Dec 1 12:51:46 2002
+++ netpanzer/src/NetPanzer/Classes/Network/GameControlNetMessage.hpp Mon Sep
1 16:24:20 2003
@@ -18,7 +18,7 @@
#ifndef _GAME_CONTROL_NET_MESSAGE_HPP
#define _GAME_CONTROL_NET_MESSAGE_HPP
-#include <String.h>
+#include <string.h>
#include "NetPacket.hpp"
@@ -27,7 +27,9 @@
};
+#ifdef MSVC
#pragma pack(1)
+#endif
class GameControlCycleMap : public NetMessage
{
@@ -45,7 +47,7 @@
message_id = _net_message_id_game_control_cycle_map;
}
- };
+ } __attribute__((packed));
class GameControlCycleRespawnAck : public NetMessage
{
@@ -57,8 +59,10 @@
message_id = _net_message_id_game_control_cycle_respawn_ack;
}
- };
+ } __attribute__((packed));
+#ifdef MSVC
#pragma pack()
+#endif
#endif // ** _GAME_CONTROL_NET_MESSAGE_HPP
Index: netpanzer/src/NetPanzer/Classes/Network/NetMessageEncoder.cpp
diff -u netpanzer/src/NetPanzer/Classes/Network/NetMessageEncoder.cpp:1.1
netpanzer/src/NetPanzer/Classes/Network/NetMessageEncoder.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/Network/NetMessageEncoder.cpp:1.1 Sun Dec
1 12:51:46 2002
+++ netpanzer/src/NetPanzer/Classes/Network/NetMessageEncoder.cpp Mon Sep
1 16:24:20 2003
@@ -15,35 +15,31 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "NetMessageEncoder.hpp"
- #include "string.h"
+#include "string.h"
- #include "NetworkState.hpp"
- #include "Server.hpp"
- #include "Client.hpp"
+#include "NetworkState.hpp"
+#include "Server.hpp"
+#include "Client.hpp"
NetMessageEncoder PUBLIC_MESSAGE_ENCODER;
-
-
-
- #define _SUB_PACKET_LIMIT 255
- typedef unsigned char SubPacketType;
+#define _SUB_PACKET_LIMIT 255
+typedef unsigned char SubPacketType;
- void NetMessageEncoder::initalize( void )
- {
- resetEncoder();
- }
+void NetMessageEncoder::initalize( void )
+{
+ resetEncoder();
+}
- void NetMessageEncoder::resetEncoder( void )
- {
+void NetMessageEncoder::resetEncoder( void )
+{
encode_message.message_class = _net_message_class_multi ;
encode_message.message_count = 0;
memset( encode_message.data, 0, _MULTI_PACKET_LIMIT );
encode_message_index = 0;
- }
+}
void NetMessageEncoder::encodeMessage( NetMessage *message, unsigned short
size )
{
@@ -64,8 +60,10 @@
resetEncoder( );
} // ** if
-
- (SubPacketType) *(encode_message.data + encode_message_index) =
(SubPacketType) size;
+
+ SubPacketType* packettypeptr
+ = (SubPacketType*) ((char*) encode_message.data +
encode_message_index);
+ *packettypeptr = (SubPacketType) size;
encode_message_index += sizeof(SubPacketType);
@@ -78,7 +76,7 @@
encode_message.message_count++;
}
- boolean NetMessageEncoder::encodeMessage( NetMessage *message, unsigned short
size, MultiMessage **encoded_message )
+ bool NetMessageEncoder::encodeMessage( NetMessage *message, unsigned short
size, MultiMessage **encoded_message )
{
if( ( (encode_message_index + size + sizeof(SubPacketType)) >
_MULTI_PACKET_LIMIT )
)
@@ -86,11 +84,13 @@
encode_message.message_size = (unsigned short) encode_message_index;
*encoded_message = (MultiMessage *) &encode_message;
- return( _TRUE );
+ return( true );
} // ** if
- (SubPacketType) *(encode_message.data + encode_message_index) =
(SubPacketType) size;
+ SubPacketType* packettypeptr =
+ (SubPacketType*) (encode_message.data + encode_message_index);
+ *packettypeptr = (SubPacketType) size;
encode_message_index += sizeof(SubPacketType);
@@ -102,8 +102,8 @@
encode_message_index += size;
encode_message.message_count++;
- *encoded_message = NULL;
- return( _FALSE );
+ *encoded_message = 0;
+ return( false );
}
void NetMessageEncoder::getEncodeMessage( MultiMessage **message )
@@ -116,7 +116,7 @@
} // ** if
else
{
- *message = NULL;
+ *message = 0;
}
}
@@ -129,12 +129,12 @@
decode_current_count = 0;
}
- boolean NetMessageEncoder::decodeMessage( NetMessage **message )
+ bool NetMessageEncoder::decodeMessage( NetMessage **message )
{
SubPacketType message_size;
if ( decode_current_count == decode_message.message_count )
- return( _FALSE );
+ return( false );
message_size = (SubPacketType) *(decode_message.data +
decode_message_index);
decode_message_index += sizeof( SubPacketType );
@@ -143,7 +143,7 @@
decode_message_index += message_size;
decode_current_count++;
- return( _TRUE );
+ return( true );
}
void NetMessageEncoder::sendEncodedMessage( void )
Index: netpanzer/src/NetPanzer/Classes/Network/NetMessageEncoder.hpp
diff -u netpanzer/src/NetPanzer/Classes/Network/NetMessageEncoder.hpp:1.1
netpanzer/src/NetPanzer/Classes/Network/NetMessageEncoder.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/Network/NetMessageEncoder.hpp:1.1 Sun Dec
1 12:51:46 2002
+++ netpanzer/src/NetPanzer/Classes/Network/NetMessageEncoder.hpp Mon Sep
1 16:24:20 2003
@@ -35,14 +35,14 @@
void resetEncoder( void );
void encodeMessage( NetMessage *message, unsigned short size );
- boolean NetMessageEncoder::encodeMessage( NetMessage *message,
+ bool NetMessageEncoder::encodeMessage( NetMessage *message,
unsigned short size,
MultiMessage **encoded_message );
void getEncodeMessage( MultiMessage **message );
void setDecodeMessage( MultiMessage *message );
- boolean decodeMessage( NetMessage **message );
+ bool decodeMessage( NetMessage **message );
void sendEncodedMessage( void );
};
Index: netpanzer/src/NetPanzer/Classes/Network/NetMessageLog.cpp
diff -u netpanzer/src/NetPanzer/Classes/Network/NetMessageLog.cpp:1.1
netpanzer/src/NetPanzer/Classes/Network/NetMessageLog.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/Network/NetMessageLog.cpp:1.1 Sun Dec
1 12:51:46 2002
+++ netpanzer/src/NetPanzer/Classes/Network/NetMessageLog.cpp Mon Sep 1
16:24:20 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "NetMessageLog.hpp"
#include "Server.hpp"
Index: netpanzer/src/NetPanzer/Classes/Network/NetMessageLog.hpp
diff -u netpanzer/src/NetPanzer/Classes/Network/NetMessageLog.hpp:1.1
netpanzer/src/NetPanzer/Classes/Network/NetMessageLog.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/Network/NetMessageLog.hpp:1.1 Sun Dec
1 12:51:46 2002
+++ netpanzer/src/NetPanzer/Classes/Network/NetMessageLog.hpp Mon Sep 1
16:24:20 2003
@@ -18,10 +18,6 @@
#ifndef _NETMESSAGELOG_HPP
#define _NETMESSAGELOG_HPP
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
#include "NetPacket.hpp"
char * NetMessageClassToString( NetMessage &message );
Index: netpanzer/src/NetPanzer/Classes/Network/NetPacket.hpp
diff -u netpanzer/src/NetPanzer/Classes/Network/NetPacket.hpp:1.1
netpanzer/src/NetPanzer/Classes/Network/NetPacket.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/Network/NetPacket.hpp:1.1 Sun Dec 1
12:51:46 2002
+++ netpanzer/src/NetPanzer/Classes/Network/NetPacket.hpp Mon Sep 1
16:24:20 2003
@@ -24,60 +24,60 @@
#define _MAX_NET_PACKET_SIZE 512
+#ifdef MSVC
#pragma pack(1)
-
+#endif
class NetPacket : public PObject
- {
- public:
- DPID toID;
- DPID fromID;
- unsigned short packet_size;
-
- unsigned char data[ _MAX_NET_PACKET_SIZE ];
- };
-
-typedef
- struct
- {
- unsigned short size;
- unsigned char sequence;
- unsigned char message_class;
- unsigned char message_id;
+{
+public:
+ DPID toID;
+ DPID fromID;
+ unsigned short packet_size;
+
+ unsigned char data[ _MAX_NET_PACKET_SIZE ];
+} __attribute__((packed));
+
+struct NetMessageStruct
+{
+ unsigned short size;
+ unsigned char sequence;
+ unsigned char message_class;
+ unsigned char message_id;
- unsigned char data[ _MAX_NET_PACKET_SIZE - 5 ];
- } NetMessageStruct;
+ unsigned char data[ _MAX_NET_PACKET_SIZE - 5 ];
+} __attribute__((packed));
class NetMessage
- {
- public:
- unsigned short size;
- unsigned char sequence;
- unsigned char message_class;
- unsigned char message_id;
-
- unsigned short realSize( void )
- { return( sizeof( NetMessage ) ); }
- };
-
+{
+public:
+ unsigned short size;
+ unsigned char sequence;
+ unsigned char message_class;
+ unsigned char message_id;
+
+ unsigned short realSize( void )
+ { return( sizeof( NetMessage ) ); }
+} __attribute__((packed));
#define _MULTI_PACKET_LIMIT (_MAX_NET_PACKET_SIZE - 9)
-
class MultiMessage : public NetMessage
- {
- public:
- unsigned char message_count;
- unsigned short message_size;
+{
+public:
+ unsigned char message_count;
+ unsigned short message_size;
- unsigned char data[ _MULTI_PACKET_LIMIT ];
+ unsigned char data[ _MULTI_PACKET_LIMIT ];
- unsigned short realSize( void )
- {
- return( sizeof( MultiMessage ) - _MULTI_PACKET_LIMIT + message_size );
- }
-
- };
+ unsigned short realSize( void )
+ {
+ return( sizeof( MultiMessage ) - _MULTI_PACKET_LIMIT +
message_size );
+ }
+} __attribute__((packed));
+#ifdef MSVC
#pragma pack()
+#endif
+
+#endif
-#endif _NETPACKET_HPP
Index: netpanzer/src/NetPanzer/Classes/Network/NetPacketQueues.cpp
diff -u netpanzer/src/NetPanzer/Classes/Network/NetPacketQueues.cpp:1.1
netpanzer/src/NetPanzer/Classes/Network/NetPacketQueues.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/Network/NetPacketQueues.cpp:1.1 Sun Dec
1 12:51:46 2002
+++ netpanzer/src/NetPanzer/Classes/Network/NetPacketQueues.cpp Mon Sep 1
16:24:20 2003
@@ -15,9 +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 "stdafx.hpp"
#include "NetPacketQueues.hpp"
-#include "CodeWiz.hpp"
+#include "codewiz.hpp"
#include "ConsoleInterface.hpp"
@@ -44,8 +43,8 @@
packet_window_time = (float) _DEFAULT_WINDOW_TIME;
packet_window_estimate = (float) _DEFAULT_WINDOW_TIME;
packet_window_time_weight = (float) _WINDOW_ESTIMATE_WEIGHT;
- packet_window_wait_flag = _FALSE;
- window_estimate_init = _FALSE;
+ packet_window_wait_flag = false;
+ window_estimate_init = false;
lost_packets = 0;
out_of_order_packets = 0;
}
@@ -60,10 +59,10 @@
packet_window_time = packet_recv_stamp - next_packet_recv_stamp;
next_packet_recv_stamp = packet_recv_stamp;
- if( window_estimate_init == _FALSE )
+ if( window_estimate_init == false )
{
packet_window_time = (float) _DEFAULT_WINDOW_TIME;
- window_estimate_init = _TRUE;
+ window_estimate_init = true;
}
packet_window_estimate = (packet_window_time_weight)*( packet_window_time ) +
@@ -80,7 +79,7 @@
insert_index = packet_sequence_num % size;
- if( (array[ insert_index ].in_use == _TRUE) && (array[ insert_index
].out_of_order == _FALSE) )
+ if( (array[ insert_index ].in_use == true) && (array[ insert_index
].out_of_order == false) )
{
if( array[ insert_index ].sequence != packet_sequence_num )
{
@@ -91,8 +90,8 @@
unsigned long dequeue_index;
dequeue_index = ((unsigned long ) dequeue_sequence_num) % size;
- array[ dequeue_index ].in_use = _FALSE;
- array[ dequeue_index ].out_of_order = _FALSE;
+ array[ dequeue_index ].in_use = false;
+ array[ dequeue_index ].out_of_order = false;
dequeue_sequence_num++;
} // ** while
@@ -102,8 +101,8 @@
net_packet_size = (sizeof( NetPacket ) - _MAX_NET_PACKET_SIZE) +
net_packet->packet_size;
memmove( (void *) &(array[ insert_index ].packet), (void *) net_packet,
net_packet_size );
- array[ insert_index ].in_use = _TRUE;
- array[ insert_index ].out_of_order = _FALSE;
+ array[ insert_index ].in_use = true;
+ array[ insert_index ].out_of_order = false;
array[ insert_index ].sequence = packet_sequence_num;
if( packet_sequence_num > current_sequence_num)
@@ -118,8 +117,8 @@
{
sequence_index = sequence_counter % size;
- array[ sequence_index ].in_use = _TRUE;
- array[ sequence_index ].out_of_order = _TRUE;
+ array[ sequence_index ].in_use = true;
+ array[ sequence_index ].out_of_order = true;
sequence_counter++;
}
@@ -150,13 +149,13 @@
net_packet_size = (sizeof( NetPacket ) - _MAX_NET_PACKET_SIZE) + array[
dequeue_index ].packet.packet_size;
memmove( (void *) net_packet, (void *) &(array[ dequeue_index ].packet),
net_packet_size );
- array[ dequeue_index ].in_use = _FALSE;
- array[ dequeue_index ].out_of_order = _FALSE;
+ array[ dequeue_index ].in_use = false;
+ array[ dequeue_index ].out_of_order = false;
dequeue_sequence_num++;
}
-boolean ReorderQueue::isReady( void )
+bool ReorderQueue::isReady( void )
{
unsigned long dequeue_index;
@@ -164,63 +163,63 @@
{
dequeue_index = ((unsigned long ) dequeue_sequence_num) % size;
- if( array[ dequeue_index ].out_of_order == _FALSE )
+ if( array[ dequeue_index ].out_of_order == false )
{
- packet_window_wait_flag = _FALSE;
- return( _TRUE );
+ packet_window_wait_flag = false;
+ return( true );
}
if( packet_window_timer.count() )
{
- array[ dequeue_index ].in_use = _FALSE;
- array[ dequeue_index ].out_of_order = _FALSE;
+ array[ dequeue_index ].in_use = false;
+ array[ dequeue_index ].out_of_order = false;
dequeue_sequence_num++;
- packet_window_wait_flag = _FALSE;
+ packet_window_wait_flag = false;
lost_packets++;
}
- return( _FALSE );
+ return( false );
}
else
{
dequeue_index = ((unsigned long ) dequeue_sequence_num) % size;
- if( array[ dequeue_index ].in_use == _FALSE)
- { return(_FALSE);}
+ if( array[ dequeue_index ].in_use == false)
+ { return(false);}
- if( array[ dequeue_index ].out_of_order == _TRUE )
+ if( array[ dequeue_index ].out_of_order == true )
{
#ifdef _USE_PACKET_WINDOW
- packet_window_wait_flag = _TRUE;
+ packet_window_wait_flag = true;
packet_window_timer.changePeriod( packet_window_estimate );
- return( _FALSE );
+ return( false );
#else
- array[ dequeue_index ].in_use = _FALSE;
- array[ dequeue_index ].out_of_order = _FALSE;
+ array[ dequeue_index ].in_use = false;
+ array[ dequeue_index ].out_of_order = false;
dequeue_sequence_num++;
- packet_window_wait_flag = _FALSE;
+ packet_window_wait_flag = false;
lost_packets++;
- return( _FALSE );
+ return( false );
#endif
}
}
- return( _TRUE );
+ return( true );
}
void ReorderQueue::getStats( float *packet_window_time, float
*packet_window_estimate,
int *lost_packets, int *out_of_order_packets )
{
- if( packet_window_time != NULL )
+ if( packet_window_time != 0 )
{ *packet_window_time = ReorderQueue::packet_window_time; }
- if( packet_window_estimate != NULL )
+ if( packet_window_estimate != 0 )
{ *packet_window_estimate = ReorderQueue::packet_window_estimate; }
- if( lost_packets != NULL )
+ if( lost_packets != 0 )
{ *lost_packets = ReorderQueue::lost_packets; }
- if( out_of_order_packets != NULL )
+ if( out_of_order_packets != 0 )
{ *out_of_order_packets = ReorderQueue::out_of_order_packets; }
}
Index: netpanzer/src/NetPanzer/Classes/Network/NetPacketQueues.hpp
diff -u netpanzer/src/NetPanzer/Classes/Network/NetPacketQueues.hpp:1.1
netpanzer/src/NetPanzer/Classes/Network/NetPacketQueues.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/Network/NetPacketQueues.hpp:1.1 Sun Dec
1 12:51:46 2002
+++ netpanzer/src/NetPanzer/Classes/Network/NetPacketQueues.hpp Mon Sep 1
16:24:20 2003
@@ -18,6 +18,7 @@
#ifndef _NETPACKETQUEUES_HPP
#define _NETPACKETQUEUES_HPP
+#include <string.h>
#include "NetPacket.hpp"
#include "QueueTemplate.hpp"
#include "ArrayTemplate.hpp"
@@ -60,14 +61,14 @@
public:
NetPacket packet;
- boolean in_use;
- boolean out_of_order;
+ bool in_use;
+ bool out_of_order;
unsigned char sequence;
NetPacketBlock( )
{
- in_use = _FALSE;
- out_of_order = _FALSE;
+ in_use = false;
+ out_of_order = false;
}
unsigned short getPacketSize()
@@ -93,13 +94,13 @@
// ** variables for exponential averaging of packet window
TIMESTAMP packet_recv_stamp;
TIMESTAMP next_packet_recv_stamp;
- boolean window_estimate_init;
+ bool window_estimate_init;
float packet_window_time;
float packet_window_estimate;
float packet_window_time_weight;
// ** variables for tracking packet window
- boolean packet_window_wait_flag;
+ bool packet_window_wait_flag;
Timer packet_window_timer;
// ** variable for statictics
@@ -118,7 +119,7 @@
void dequeue( NetPacket *net_packet );
- boolean isReady( void );
+ bool isReady( void );
void getStats( float *packet_window_time, float *packet_window_estimate,
int *lost_packets, int *out_of_order_packets );
Index: netpanzer/src/NetPanzer/Classes/Network/NetworkClient.cpp
diff -u netpanzer/src/NetPanzer/Classes/Network/NetworkClient.cpp:1.1
netpanzer/src/NetPanzer/Classes/Network/NetworkClient.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/Network/NetworkClient.cpp:1.1 Sun Dec
1 12:51:46 2002
+++ netpanzer/src/NetPanzer/Classes/Network/NetworkClient.cpp Mon Sep 1
16:24:20 2003
@@ -15,8 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
-
#include "NetworkGlobals.hpp"
#include "NetworkClient.hpp"
@@ -30,7 +28,7 @@
#include "PlayerInterface.hpp"
#include "ClientConnectDaemon.hpp"
-#include "Codewiz.hpp"
+#include "codewiz.hpp"
#include "ConsoleInterface.hpp"
NetworkClient::NetworkClient( void )
@@ -39,7 +37,7 @@
connection_status = _connection_status_no_connection;
connection_type = _connection_loop_back;
- keep_alive_state = _FALSE;
+ keep_alive_state = false;
keep_alive_emit_timer.changePeriod( _CLIENT_KEEP_ALIVE_SEND_INTERVAL ) ;
keep_alive_timer.changePeriod( _SERVER_KEEP_ALIVE_THRESHOLD );
@@ -115,24 +113,24 @@
void NetworkClient::activateKeepAlive( void )
{
- keep_alive_state = _TRUE;
+ keep_alive_state = true;
}
void NetworkClient::deactivateKeepAlive( void )
{
- keep_alive_state = _FALSE;
+ keep_alive_state = false;
}
void NetworkClient::updateKeepAliveState( void )
{
- if ( keep_alive_state == _FALSE )
+ if ( keep_alive_state == false )
return;
if( keep_alive_timer.count() )
{
LOG( ("Server Keep Alive Timed Out") );
ClientConnectDaemon::serverConnectionBroken();
- keep_alive_state = _FALSE;
+ keep_alive_state = false;
connection_status = _connection_status_no_connection;
closeSession();
}
@@ -162,5 +160,5 @@
int NetworkClient::openSession( int connection_type, int session_flags )
{
non_guarantee_queue.reset();
- return( _TRUE );
+ return( true );
}
Index: netpanzer/src/NetPanzer/Classes/Network/NetworkClient.hpp
diff -u netpanzer/src/NetPanzer/Classes/Network/NetworkClient.hpp:1.1
netpanzer/src/NetPanzer/Classes/Network/NetworkClient.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/Network/NetworkClient.hpp:1.1 Sun Dec
1 12:51:46 2002
+++ netpanzer/src/NetPanzer/Classes/Network/NetworkClient.hpp Mon Sep 1
16:24:20 2003
@@ -18,8 +18,7 @@
#ifndef _NETWORK_CLIENT_HPP
#define _NETWORK_CLIENT_HPP
-
-
+#include "codewiz.hpp"
#include "NetworkInterface.hpp"
#include "NetworkReturnCodes.hpp"
@@ -69,7 +68,7 @@
Timer ping_timer;
- boolean keep_alive_state;
+ bool keep_alive_state;
Timer keep_alive_emit_timer;
Timer keep_alive_timer;
void updateKeepAliveState( void );
@@ -88,29 +87,29 @@
public:
- NetworkClient( void );
- ~NetworkClient( void );
+ NetworkClient ();
+ virtual ~NetworkClient ();
void activateKeepAlive( void );
void deactivateKeepAlive( void );
virtual int openSession( int connection_type, int session_flags );
- virtual int startEnumeration( ConnectionAddress address ) { assert(0);
return( _FALSE ); }
- virtual int startEnumeration( void ) { assert(0); return( _FALSE ); }
- virtual int stopEnumeration( void ) { assert(0); return( _FALSE ); }
- virtual int getSessionList( SessionList &list ) { assert(0); return( _FALSE
); }
-
- virtual int joinSession( void ) { assert(0); return( _FALSE ); }
- virtual int joinSession( int session_index ) { assert(0); return( _FALSE );
}
- virtual int joinSession( const char session_name ) { assert(0); return(
_FALSE ); }
- virtual int setJoinSession( const char *session_name ) { assert(0); return(
_FALSE ); }
+ virtual int startEnumeration( ConnectionAddress address ) { assert(0);
return( false ); }
+ virtual int startEnumeration( void ) { assert(0); return( false ); }
+ virtual int stopEnumeration( void ) { assert(0); return( false ); }
+ virtual int getSessionList( SessionList &list ) { assert(0); return( false
); }
+
+ virtual int joinSession( void ) { assert(0); return( false ); }
+ virtual int joinSession( int session_index ) { assert(0); return( false ); }
+ virtual int joinSession( const char session_name ) { assert(0); return(
false ); }
+ virtual int setJoinSession( const char *session_name ) { assert(0); return(
false ); }
- virtual int closeSession( void ) { assert(0); return( _FALSE ); }
+ virtual int closeSession( void ) { assert(0); return( false ); }
- virtual int sendMessage( NetMessage *message, unsigned long size, int flags
) { assert(0); return( _FALSE ); }
+ virtual int sendMessage( NetMessage *message, unsigned long size, int flags
) { assert(0); return( false ); }
- virtual int getMessage( NetMessage *message ) { assert(0); return( _FALSE
); }
+ virtual int getMessage( NetMessage *message ) { assert(0); return( false );
}
};
Index: netpanzer/src/NetPanzer/Classes/Network/NetworkInterface.cpp
diff -u netpanzer/src/NetPanzer/Classes/Network/NetworkInterface.cpp:1.1
netpanzer/src/NetPanzer/Classes/Network/NetworkInterface.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/Network/NetworkInterface.cpp:1.1 Sun Dec
1 12:51:50 2002
+++ netpanzer/src/NetPanzer/Classes/Network/NetworkInterface.cpp Mon Sep
1 16:24:20 2003
@@ -15,9 +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 "stdafx.hpp"
-
#include "NetworkInterface.hpp"
+#include "codewiz.hpp"
NetPacket TEMP_PACKET;
Index: netpanzer/src/NetPanzer/Classes/Network/NetworkServer.cpp
diff -u netpanzer/src/NetPanzer/Classes/Network/NetworkServer.cpp:1.1
netpanzer/src/NetPanzer/Classes/Network/NetworkServer.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/Network/NetworkServer.cpp:1.1 Sun Dec
1 12:51:50 2002
+++ netpanzer/src/NetPanzer/Classes/Network/NetworkServer.cpp Mon Sep 1
16:24:20 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "NetworkServer.hpp"
#include "ClientServerNetMessage.hpp"
@@ -23,7 +22,7 @@
#include "NetMessageLog.hpp"
-#include "Codewiz.hpp"
+#include "codewiz.hpp"
#include "ConsoleInterface.hpp"
//***************************************************************
@@ -35,33 +34,33 @@
addRear( client_data );
}
-boolean ServerClientList::removeClient( PlayerID client_id )
+bool ServerClientList::removeClient( PlayerID client_id )
{
ServerClientListData *client_data_ptr;
- if ( front == NULL )
- return( _FALSE );
+ if ( front == 0 )
+ return( false );
client_data_ptr = front;
if ( client_data_ptr->client_id == client_id )
{
deleteFront();
- return( _TRUE );
+ return( true );
}
- while( client_data_ptr->next != NULL )
+ while( client_data_ptr->next != 0 )
{
if ( client_data_ptr->next->client_id == client_id )
{
deleteAfter( client_data_ptr );
- return( _TRUE );
+ return( true );
}
client_data_ptr = client_data_ptr->next;
}
- return( _FALSE );
+ return( false );
}
ServerClientListData * ServerClientList::getClientData( PlayerID client_id )
@@ -70,7 +69,7 @@
client_data_ptr = front;
- while( client_data_ptr != NULL )
+ while( client_data_ptr != 0 )
{
if ( client_data_ptr->client_id == client_id )
{
@@ -80,27 +79,27 @@
client_data_ptr = client_data_ptr->next;
}
- return( NULL );
+ return( 0 );
}
-boolean ServerClientList::getFullClientID( PlayerID *client_id )
+bool ServerClientList::getFullClientID( PlayerID *client_id )
{
ServerClientListData *client_data_ptr;
client_data_ptr = front;
- while( client_data_ptr != NULL )
+ while( client_data_ptr != 0 )
{
if ( client_data_ptr->client_id.getDPID() == client_id->getDPID() )
{
(*client_id) = client_data_ptr->client_id;
- return( _TRUE );
+ return( true );
}
client_data_ptr = client_data_ptr->next;
}
- return( _FALSE );
+ return( false );
}
@@ -113,7 +112,7 @@
{
keep_alive_emit_timer.changePeriod( _SERVER_KEEP_ALIVE_SEND_INTERVAL );
resetClientList();
- dontSendUDPHackFlag = _FALSE;
+ dontSendUDPHackFlag = false;
}
NetworkServer::~NetworkServer()
@@ -126,15 +125,15 @@
client_list.deallocate();
}
-boolean NetworkServer::addClientToSendList( PlayerID &client_player_id )
+bool NetworkServer::addClientToSendList( PlayerID &client_player_id )
{
- ServerClientListData *client_data = NULL;
+ ServerClientListData *client_data = 0;
client_data = new ServerClientListData;
- if( client_data == NULL )
+ if( client_data == 0 )
{
- return( _FALSE );
+ return( false );
}
client_data->client_id = client_player_id;
@@ -142,74 +141,74 @@
client_list.addClient( client_data );
- return( _TRUE );
+ return( true );
}
-boolean NetworkServer::removeClientFromSendList( PlayerID &client_player_id )
+bool NetworkServer::removeClientFromSendList( PlayerID &client_player_id )
{
return( client_list.removeClient( client_player_id ) );
}
-boolean NetworkServer::activateKeepAlive( PlayerID &client_player_id )
+bool NetworkServer::activateKeepAlive( PlayerID &client_player_id )
{
- ServerClientListData *client_data = NULL;
+ ServerClientListData *client_data = 0;
client_data = client_list.getClientData( client_player_id );
- if( client_data == NULL )
+ if( client_data == 0 )
{
LOG( ("NetworkServer::activateKeepAlive -- Could Not Find Client To
Activate Keep Alive" ) );
- return( _FALSE );
+ return( false );
}
- client_data->keep_alive_state = _TRUE;
+ client_data->keep_alive_state = true;
client_data->keep_alive_timer.reset();
ClientMesgSetKeepAlive set_keep_alive_mesg;
- set_keep_alive_mesg.keep_alive_state = _TRUE;
+ set_keep_alive_mesg.keep_alive_state = true;
sendMessage( &set_keep_alive_mesg, sizeof(ClientMesgSetKeepAlive),
client_data->client_id, 0 );
- return( _TRUE );
+ return( true );
}
-boolean NetworkServer::deactivateKeepAlive( PlayerID &client_player_id )
+bool NetworkServer::deactivateKeepAlive( PlayerID &client_player_id )
{
- ServerClientListData *client_data = NULL;
+ ServerClientListData *client_data = 0;
client_data = client_list.getClientData( client_player_id );
- if( client_data == NULL )
+ if( client_data == 0 )
{
- return( _FALSE );
+ return( false );
}
- client_data->keep_alive_state = _FALSE;
+ client_data->keep_alive_state = false;
client_data->keep_alive_timer.reset();
ClientMesgSetKeepAlive set_keep_alive_mesg;
- set_keep_alive_mesg.keep_alive_state = _FALSE;
+ set_keep_alive_mesg.keep_alive_state = false;
sendMessage( &set_keep_alive_mesg, sizeof(ClientMesgSetKeepAlive),
client_data->client_id, 0 );
- return( _TRUE );
+ return( true );
}
void NetworkServer::netMessageClientKeepAlive( NetMessage *message )
{
- ServerClientListData *client_data = NULL;
- ServerMesgKeepAlive *client_keepalive = NULL;
+ ServerClientListData *client_data = 0;
+ ServerMesgKeepAlive *client_keepalive = 0;
client_keepalive = (ServerMesgKeepAlive *) message;
client_data = client_list.getClientData( client_keepalive->client_id );
- if( client_data == NULL )
+ if( client_data == 0 )
{
LOG( ("Invalid ClientID for KeepAlive") );
return;
}
- if ( client_data->keep_alive_state == _TRUE )
+ if ( client_data->keep_alive_state == true )
{
client_data->keep_alive_timer.reset();
}
@@ -267,22 +266,22 @@
void NetworkServer::updateKeepAliveState( void )
{
- boolean send_server_keep_alive_mesg = _FALSE;
- ServerClientListData *iterator = NULL;
- ServerClientListData *client_data_ptr = NULL;
+ bool send_server_keep_alive_mesg = false;
+ ServerClientListData *iterator = 0;
+ ServerClientListData *client_data_ptr = 0;
if ( keep_alive_emit_timer.count() )
{
- send_server_keep_alive_mesg = _TRUE;
+ send_server_keep_alive_mesg = true;
}
client_list.resetIterator( &iterator );
client_data_ptr = client_list.incIteratorPtr( &iterator );
- while( client_data_ptr != NULL )
+ while( client_data_ptr != 0 )
{
- if ( client_data_ptr->keep_alive_state == _TRUE )
+ if ( client_data_ptr->keep_alive_state == true )
{
if( client_data_ptr->keep_alive_timer.count() )
{
@@ -290,7 +289,7 @@
ServerConnectDaemon::startClientDropProcess(
client_data_ptr->client_id );
}
- if( send_server_keep_alive_mesg == _TRUE )
+ if( send_server_keep_alive_mesg == true )
{
ClientMesgKeepAlive server_keepalive;
Index: netpanzer/src/NetPanzer/Classes/Network/NetworkServer.hpp
diff -u netpanzer/src/NetPanzer/Classes/Network/NetworkServer.hpp:1.1
netpanzer/src/NetPanzer/Classes/Network/NetworkServer.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/Network/NetworkServer.hpp:1.1 Sun Dec
1 12:51:50 2002
+++ netpanzer/src/NetPanzer/Classes/Network/NetworkServer.hpp Mon Sep 1
16:24:20 2003
@@ -30,7 +30,7 @@
{
public:
PlayerID client_id;
- boolean keep_alive_state;
+ bool keep_alive_state;
Timer keep_alive_timer;
unsigned char no_guarantee_sequence_counter;
@@ -39,8 +39,8 @@
ServerClientListData()
{
no_guarantee_sequence_counter = 0;
- keep_alive_state = _FALSE;
- next = NULL;
+ keep_alive_state = false;
+ next = 0;
}
};
@@ -54,9 +54,9 @@
void addClient( ServerClientListData *client_data );
- boolean removeClient( PlayerID client_id );
+ bool removeClient( PlayerID client_id );
- boolean getFullClientID( PlayerID *client_id );
+ bool getFullClientID( PlayerID *client_id );
inline void resetIterator( ServerClientListData **iterator )
{
@@ -67,14 +67,14 @@
{
ServerClientListData *client_data;
- if( (*iterator) != NULL )
+ if( (*iterator) != 0 )
{
client_data = (*iterator);
(*iterator) = (*iterator)->next;
return( client_data );
}
else
- { return( NULL ); }
+ { return( 0 ); }
}
};
@@ -100,29 +100,29 @@
void processNetMessage( NetMessage *message );
- boolean dontSendUDPHackFlag;
+ bool dontSendUDPHackFlag;
public:
NetworkServer( void );
- ~NetworkServer();
+ virtual ~NetworkServer();
- boolean addClientToSendList( PlayerID &client_player_id );
- boolean removeClientFromSendList( PlayerID &client_player_id );
+ bool addClientToSendList( PlayerID &client_player_id );
+ bool removeClientFromSendList( PlayerID &client_player_id );
- boolean activateKeepAlive( PlayerID &client_player_id );
- boolean deactivateKeepAlive( PlayerID &client_player_id );
+ bool activateKeepAlive( PlayerID &client_player_id );
+ bool deactivateKeepAlive( PlayerID &client_player_id );
void lostPacketHack()
- { dontSendUDPHackFlag = _TRUE; }
+ { dontSendUDPHackFlag = true; }
- virtual int openSession( int connection_type, int session_flags ) { return(
_TRUE ); }
- virtual int hostSession( void ) { return( _TRUE ); }
- virtual int closeSession( void ) { return( _TRUE ); }
+ virtual int openSession( int connection_type, int session_flags ) { return(
true ); }
+ virtual int hostSession( void ) { return( true ); }
+ virtual int closeSession( void ) { return( true ); }
- virtual int sendMessage( NetMessage *message, unsigned long size, int flags
) { return( _TRUE ); }
- virtual int sendMessage( NetMessage *message, unsigned long size, PlayerID
&player_id, int flags ) { return( _TRUE ); }
+ virtual int sendMessage( NetMessage *message, unsigned long size, int flags
) { return( true ); }
+ virtual int sendMessage( NetMessage *message, unsigned long size, const
PlayerID &player_id, int flags ) { return( true ); }
- virtual int getMessage( NetMessage *message ) { return( _TRUE ); }
+ virtual int getMessage( NetMessage *message ) { return( true ); }
virtual void dropClient( PlayerID client_id );
virtual void shutdownClientTransport( PlayerID &client_id ) { }
Index: netpanzer/src/NetPanzer/Classes/Network/NetworkState.cpp
diff -u netpanzer/src/NetPanzer/Classes/Network/NetworkState.cpp:1.1
netpanzer/src/NetPanzer/Classes/Network/NetworkState.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/Network/NetworkState.cpp:1.1 Sun Dec
1 12:51:50 2002
+++ netpanzer/src/NetPanzer/Classes/Network/NetworkState.cpp Mon Sep 1
16:24:20 2003
@@ -15,7 +15,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+#include <stdio.h>
#include "NetworkState.hpp"
unsigned short NetworkState::status;
@@ -70,7 +70,7 @@
packets_received = 0;
packets_sent_per_sec = 0;
- packets_sent_time = 0.0000001;
+ packets_sent_time = 0.0000001;
packets_sent_interval = now();
packets_received_per_sec = 0;
Index: netpanzer/src/NetPanzer/Classes/Network/ObjectiveNetMessage.hpp
diff -u netpanzer/src/NetPanzer/Classes/Network/ObjectiveNetMessage.hpp:1.1
netpanzer/src/NetPanzer/Classes/Network/ObjectiveNetMessage.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/Network/ObjectiveNetMessage.hpp:1.1 Sun Dec
1 12:51:50 2002
+++ netpanzer/src/NetPanzer/Classes/Network/ObjectiveNetMessage.hpp Mon Sep
1 16:24:20 2003
@@ -24,8 +24,10 @@
enum { _net_message_id_occupation_status_update,
_net_message_id_objective_sync };
-
+
+#ifdef MSVC
#pragma pack(1)
+#endif
class ObjectiveOccupationUpdate : public NetMessage
{
@@ -37,7 +39,7 @@
message_class = _net_message_class_objective;
message_id = _net_message_id_occupation_status_update;
}
- };
+ } __attribute__((packed));
class ObjectiveSyncMesg : public NetMessage
{
@@ -49,8 +51,10 @@
message_class = _net_message_class_objective;
message_id = _net_message_id_objective_sync;
}
- };
+ } __attribute__((packed));
+#ifdef MSVC
#pragma pack()
+#endif
#endif // ** _OBJECTIVE_NET_MESSAGE_HPP
Index: netpanzer/src/NetPanzer/Classes/Network/PlayerNetMessage.hpp
diff -u netpanzer/src/NetPanzer/Classes/Network/PlayerNetMessage.hpp:1.1
netpanzer/src/NetPanzer/Classes/Network/PlayerNetMessage.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/Network/PlayerNetMessage.hpp:1.1 Sun Dec
1 12:51:50 2002
+++ netpanzer/src/NetPanzer/Classes/Network/PlayerNetMessage.hpp Mon Sep
1 16:24:20 2003
@@ -28,7 +28,9 @@
_net_message_id_player_alliance_update,
};
+#ifdef MSVC
#pragma pack(1)
+#endif
class PlayerConnectID : public NetMessage
{
@@ -41,7 +43,7 @@
message_id = _net_message_id_player_connect_id;
}
- };
+ } __attribute__((packed));
class PlayerStateSync : public NetMessage
@@ -55,7 +57,7 @@
message_id = _net_message_id_player_sync_state;
}
- };
+ } __attribute__((packed));
class PlayerScoreUpdate : public NetMessage
{
@@ -69,7 +71,7 @@
message_class = _net_message_class_player;
message_id = _net_message_id_player_score_update;
}
- };
+ } __attribute__((packed));
enum { _player_make_alliance,
@@ -88,7 +90,7 @@
message_class = _net_message_class_player;
message_id = _net_message_id_player_alliance_request;
}
- };
+ } __attribute__((packed));
class PlayerAllianceUpdate : public NetMessage
@@ -110,8 +112,10 @@
allie_with_player_index = with_player_index;
alliance_update_type = update_type;
}
- };
+ } __attribute__((packed));
+#ifdef MSVC
#pragma pack()
+#endif
#endif // ** _PLAYERNETMESSAGE_HPP
Index: netpanzer/src/NetPanzer/Classes/Network/ServerConnectDaemon.cpp
diff -u netpanzer/src/NetPanzer/Classes/Network/ServerConnectDaemon.cpp:1.1
netpanzer/src/NetPanzer/Classes/Network/ServerConnectDaemon.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/Network/ServerConnectDaemon.cpp:1.1 Sun Dec
1 12:51:50 2002
+++ netpanzer/src/NetPanzer/Classes/Network/ServerConnectDaemon.cpp Mon Sep
1 16:24:20 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "ServerConnectDaemon.hpp"
#include "NetworkGlobals.hpp"
@@ -33,7 +32,7 @@
#include "ConnectNetMessage.hpp"
#include "SystemNetMessage.hpp"
-#include "CodeWiz.hpp"
+#include "codewiz.hpp"
#include "ConsoleInterface.hpp"
enum { _connect_state_idle,
@@ -47,7 +46,7 @@
unsigned char ServerConnectDaemon::connection_state =
_connect_state_idle;
-boolean ServerConnectDaemon::connection_lock_state = _FALSE;
+bool ServerConnectDaemon::connection_lock_state = false;
PlayerID ServerConnectDaemon::connect_player_id;
PlayerState *ServerConnectDaemon::connect_player_state;
ServerConnectQueue ServerConnectDaemon::connect_queue;
@@ -100,21 +99,21 @@
}
}
-boolean ServerConnectDaemon::inConnectQueue( PlayerID &new_player_id )
+bool ServerConnectDaemon::inConnectQueue( PlayerID &new_player_id )
{
ConnectQueueElement connect_request;
unsigned long iterator;
- boolean completed;
+ bool completed;
connect_queue.resetIterator( &iterator );
connect_request = connect_queue.incIterator( &iterator, &completed );
- while( completed == _FALSE )
+ while( completed == false )
{
if ( connect_request.new_player_id.getDPID() == new_player_id.getDPID()
)
- { return( _TRUE ); }
+ { return( true ); }
connect_request = connect_queue.incIterator( &iterator, &completed );
}
@@ -122,9 +121,9 @@
if ( (connection_state != _connect_state_idle) &&
(connect_player_id.getDPID() == new_player_id.getDPID() )
)
- return( _TRUE );
+ return( true );
- return( _FALSE );
+ return( false );
}
@@ -134,14 +133,14 @@
ConnectProcessUpdate process_update;
unsigned long iterator;
- boolean completed;
+ bool completed;
unsigned long queue_position = 1;
connect_queue.resetIterator( &iterator );
connect_request = connect_queue.incIterator( &iterator, &completed );
- while( completed == _FALSE )
+ while( completed == false )
{
process_update.queue_position = queue_position;
@@ -175,7 +174,7 @@
new_player_id = PlayerID(0, join_request_mesg->client_transport_id );
- if( (strstr( join_request_mesg->code_word, _NETPANZER_CODEWORD) != NULL) &&
+ if( (strstr( join_request_mesg->code_word, _NETPANZER_CODEWORD) != 0) &&
(join_request_mesg->protocol_version == _NETPANZER_PROTOCOL_VERSION)
)
{
@@ -199,7 +198,7 @@
connect_request.new_player_id = new_player_id;
connect_request.connect_status = _connect_status_waiting;
- if ( connect_queue.isFull() == _TRUE )
+ if ( connect_queue.isFull() == true )
{ join_request_ack.result_code = _join_request_result_server_busy; }
else
{ connect_queue.enqueue( connect_request ); }
@@ -237,7 +236,7 @@
void ServerConnectDaemon::sendConnectionAlert( PlayerID &player_id, int
alert_enum )
{
SystemConnectAlert connect_alert;
- PlayerState *player_state = NULL;
+ PlayerState *player_state = 0;
player_state = PlayerInterface::getPlayerState( player_id );
@@ -277,9 +276,9 @@
}
-boolean ServerConnectDaemon::connectStateIdle( void )
+bool ServerConnectDaemon::connectStateIdle( void )
{
- if ( connect_queue.isReady() && (connection_lock_state == _FALSE) )
+ if ( connect_queue.isReady() && (connection_lock_state == false) )
{
ConnectQueueElement connect_request;
@@ -298,7 +297,7 @@
if( send_ret_val != _network_ok )
{
resetConnectFsm();
- return( _TRUE );
+ return( true );
}
time_out_timer.changePeriod( _SERVER_CONNECT_TIME_OUT_TIME );
@@ -308,53 +307,53 @@
updateQueuedClients();
}
- return( _TRUE );
+ return( true );
}
-boolean ServerConnectDaemon::connectStateWaitForConnectRequest( NetMessage
*message )
+bool ServerConnectDaemon::connectStateWaitForConnectRequest( NetMessage
*message )
{
- if ( message != NULL )
+ if ( message != 0 )
{
if ( message->message_id == _net_message_id_client_connect_request )
{
connection_state = _connect_state_attempt_player_alloc;
- return( _FALSE );
+ return( false );
}
else
{
if ( time_out_timer.count() )
{
resetConnectFsm();
- return( _TRUE );
+ return( true );
}
- return( _TRUE );
+ return( true );
}
- } // ** if ( message != NULL )
+ } // ** if ( message != 0 )
else
{
if ( time_out_timer.count() )
{
resetConnectFsm();
- return( _TRUE );
+ return( true );
}
- return( _TRUE );
+ return( true );
}
- return( _TRUE );
+ return( true );
}
-boolean ServerConnectDaemon::connectStateAttemptPlayerAlloc( void )
+bool ServerConnectDaemon::connectStateAttemptPlayerAlloc( void )
{
ClientConnectResult connect_result;
connect_player_state = PlayerInterface::allocateNewPlayer();
int send_ret_val;
- if ( connect_player_state == NULL )
+ if ( connect_player_state == 0 )
{
connect_result.result_code = _connect_result_server_full;
@@ -363,7 +362,7 @@
connect_player_id, 0 );
resetConnectFsm();
- return( _TRUE );
+ return( true );
}
else
{
@@ -377,22 +376,22 @@
{
connect_player_state->setStatus( _player_state_free );
resetConnectFsm();
- return( _TRUE );
+ return( true );
}
time_out_timer.reset();
connection_state = _connect_state_wait_for_client_settings;
- return( _TRUE );
+ return( true );
}
}
-boolean ServerConnectDaemon::connectStateWaitForClientSettings( NetMessage
*message )
+bool ServerConnectDaemon::connectStateWaitForClientSettings( NetMessage
*message )
{
int send_ret_val;
- if ( message != NULL )
+ if ( message != 0 )
{
if ( message->message_id == _net_message_id_connect_client_settings )
{
@@ -419,12 +418,12 @@
{
connect_player_state->setStatus( _player_state_free );
resetConnectFsm();
- return( _TRUE );
+ return( true );
}
time_out_timer.reset();
connection_state = _connect_state_wait_for_client_game_setup_ack;
- return( _TRUE );
+ return( true );
}
else
{
@@ -432,32 +431,32 @@
{
connect_player_state->setStatus( _player_state_free );
resetConnectFsm();
- return( _TRUE );
+ return( true );
}
- return( _TRUE);
+ return( true);
}
- } // ** if ( message != NULL )
+ } // ** if ( message != 0 )
else
{
if ( time_out_timer.count() )
{
connect_player_state->setStatus( _player_state_free );
resetConnectFsm();
- return( _TRUE );
+ return( true );
}
- return( _TRUE );
+ return( true );
}
- return( _TRUE );
+ return( true );
}
-boolean ServerConnectDaemon::connectStateWaitForClientGameSetupAck( NetMessage
*message )
+bool ServerConnectDaemon::connectStateWaitForClientGameSetupAck( NetMessage
*message )
{
int send_ret_val;
- if ( message != NULL )
+ if ( message != 0 )
{
if ( message->message_id == _net_message_id_connect_client_game_setup_ack )
{
@@ -475,7 +474,7 @@
{
connect_player_state->setStatus( _player_state_free );
resetConnectFsm();
- return( _TRUE );
+ return( true );
}
PlayerInterface::startPlayerStateSync( connect_player_id );
@@ -488,7 +487,7 @@
{
connect_player_state->setStatus( _player_state_free );
resetConnectFsm();
- return( _TRUE );
+ return( true );
}
connection_state = _connect_state_player_state_sync;
@@ -499,7 +498,7 @@
if ( message->message_id ==
_net_message_id_connect_client_game_setup_ping )
{
time_out_timer.reset();
- return( _TRUE );
+ return( true );
}
else
{
@@ -507,10 +506,10 @@
{
connect_player_state->setStatus( _player_state_free );
resetConnectFsm();
- return( _TRUE );
+ return( true );
}
- return( _TRUE );
+ return( true );
}
}
@@ -520,28 +519,28 @@
{
connect_player_state->setStatus( _player_state_free );
resetConnectFsm();
- return( _TRUE );
+ return( true );
}
- return( _TRUE );
+ return( true );
}
- return( _TRUE );
+ return( true );
}
-boolean ServerConnectDaemon::connectStatePlayerStateSync( void )
+bool ServerConnectDaemon::connectStatePlayerStateSync( void )
{
ConnectProcessStateMessage state_mesg;
int send_ret_val;
int percent_complete;
- if ( PlayerInterface::syncPlayerState( &send_ret_val, &percent_complete ) ==
_TRUE )
+ if ( PlayerInterface::syncPlayerState( &send_ret_val, &percent_complete ) ==
true )
{
if( send_ret_val != _network_ok )
{
connect_player_state->setStatus( _player_state_free );
resetConnectFsm();
- return( _TRUE );
+ return( true );
}
state_mesg.message_enum =
_connect_state_message_sync_player_info_percent;
@@ -552,7 +551,7 @@
{
connect_player_state->setStatus( _player_state_free );
resetConnectFsm();
- return( _TRUE );
+ return( true );
}
UnitInterface::startRemoteUnitSync( connect_player_id );
@@ -564,7 +563,7 @@
{
connect_player_state->setStatus( _player_state_free );
resetConnectFsm();
- return( _TRUE );
+ return( true );
}
SERVER->addClientToSendList( connect_player_id );
@@ -580,7 +579,7 @@
connection_state = _connect_state_unit_sync;
- return( _TRUE );
+ return( true );
}
else
if ( percent_complete > 0 )
@@ -593,25 +592,25 @@
{
connect_player_state->setStatus( _player_state_free );
resetConnectFsm();
- return( _TRUE );
+ return( true );
}
}
- return( _TRUE );
+ return( true );
}
-boolean ServerConnectDaemon::connectStateUnitSync( void )
+bool ServerConnectDaemon::connectStateUnitSync( void )
{
ConnectProcessStateMessage state_mesg;
int send_ret_val;
int percent_complete;
- if ( UnitInterface::syncRemoteUnits( &send_ret_val, &percent_complete ) ==
_FALSE )
+ if ( UnitInterface::syncRemoteUnits( &send_ret_val, &percent_complete ) ==
false )
{
if( send_ret_val != _network_ok )
{
resetConnectFsm();
- return( _TRUE );
+ return( true );
}
state_mesg.message_enum = _connect_state_message_sync_units_percent;
@@ -621,7 +620,7 @@
if( send_ret_val != _network_ok )
{
resetConnectFsm();
- return( _TRUE );
+ return( true );
}
UnitSyncIntegrityCheck unit_integrity_check_mesg;
@@ -630,7 +629,7 @@
if( send_ret_val != _network_ok )
{
resetConnectFsm();
- return( _TRUE );
+ return( true );
}
@@ -657,14 +656,14 @@
if( send_ret_val != _network_ok )
{
resetConnectFsm();
- return( _TRUE );
+ return( true );
}
sendConnectionAlert( connect_player_id, _connect_alert_mesg_connect );
connection_state = _connect_state_idle;
- return( _TRUE );
+ return( true );
}
else
if ( percent_complete > 0 )
@@ -676,17 +675,17 @@
if( send_ret_val != _network_ok )
{
resetConnectFsm();
- return( _TRUE );
+ return( true );
}
}
- return( _TRUE );
+ return( true );
}
void ServerConnectDaemon::connectFsm( NetMessage *message )
{
- boolean end_cycle = _FALSE;
+ bool end_cycle = false;
do
{
@@ -695,66 +694,66 @@
case _connect_state_idle :
{
if ( connectStateIdle() )
- { end_cycle = _TRUE; }
+ { end_cycle = true; }
else
- { end_cycle = _FALSE; }
+ { end_cycle = false; }
} break;
case _connect_state_wait_for_connect_request :
{
if ( connectStateWaitForConnectRequest( message ) )
- { end_cycle = _TRUE; }
+ { end_cycle = true; }
else
- { end_cycle = _FALSE; }
+ { end_cycle = false; }
} break;
case _connect_state_attempt_player_alloc :
{
if ( connectStateAttemptPlayerAlloc( ) )
- { end_cycle = _TRUE; }
+ { end_cycle = true; }
else
- { end_cycle = _FALSE; }
+ { end_cycle = false; }
} break;
case _connect_state_wait_for_client_settings :
{
if ( connectStateWaitForClientSettings( message ) )
- { end_cycle = _TRUE; }
+ { end_cycle = true; }
else
- { end_cycle = _FALSE; }
+ { end_cycle = false; }
} break;
case _connect_state_wait_for_client_game_setup_ack :
{
if ( connectStateWaitForClientGameSetupAck( message ) )
- { end_cycle = _TRUE; }
+ { end_cycle = true; }
else
- { end_cycle = _FALSE; }
+ { end_cycle = false; }
}
break;
case _connect_state_player_state_sync :
{
if ( connectStatePlayerStateSync( ) )
- { end_cycle = _TRUE; }
+ { end_cycle = true; }
else
- { end_cycle = _FALSE; }
+ { end_cycle = false; }
} break;
case _connect_state_unit_sync :
{
if ( connectStateUnitSync( ) )
- { end_cycle = _TRUE; }
+ { end_cycle = true; }
else
- { end_cycle = _FALSE; }
+ { end_cycle = false; }
} break;
} // ** switch
- } while( end_cycle == _FALSE );
+ } while( end_cycle == false );
} // ** connectFsm( NetMessage *message )
@@ -767,29 +766,29 @@
void ServerConnectDaemon::connectProcess( void )
{
- connectFsm( NULL );
+ connectFsm( 0 );
}
-boolean ServerConnectDaemon::disconnectClient( PlayerID player_id )
+bool ServerConnectDaemon::disconnectClient( PlayerID player_id )
{
SERVER->shutdownClientTransport( player_id );
- if ( SERVER->removeClientFromSendList( player_id ) == _TRUE )
+ if ( SERVER->removeClientFromSendList( player_id ) == true )
{
ObjectiveInterface::disownPlayerObjectives( player_id );
UnitInterface::destroyPlayerUnits( player_id );
PlayerInterface::disconnectPlayerCleanup( player_id );
- return( _TRUE );
+ return( true );
}
- return( _FALSE );
+ return( false );
}
void ServerConnectDaemon::startDisconnectionProcess( PlayerID player_id )
{
- if ( disconnectClient( player_id ) == _TRUE )
+ if ( disconnectClient( player_id ) == true )
{
sendConnectionAlert( player_id, _connect_alert_mesg_disconnect );
}
@@ -797,7 +796,7 @@
void ServerConnectDaemon::startClientDropProcess( PlayerID player_id )
{
- if ( disconnectClient( player_id ) == _TRUE )
+ if ( disconnectClient( player_id ) == true )
{
sendConnectionAlert( player_id, _connect_alert_mesg_client_drop );
}
@@ -805,23 +804,23 @@
void ServerConnectDaemon::lockConnectProcess( void )
{
- connection_lock_state = _TRUE;
+ connection_lock_state = true;
}
void ServerConnectDaemon::unlockConnectProcess( void )
{
- connection_lock_state = _FALSE;
+ connection_lock_state = false;
}
-boolean ServerConnectDaemon::getConnectLockStatus( void )
+bool ServerConnectDaemon::getConnectLockStatus( void )
{
return( connection_lock_state );
}
-boolean ServerConnectDaemon::isConnecting( void )
+bool ServerConnectDaemon::isConnecting( void )
{
if( connection_state == _connect_state_idle )
- { return ( _FALSE ); }
+ { return ( false ); }
- return( _TRUE );
+ return( true );
}
Index: netpanzer/src/NetPanzer/Classes/Network/ServerConnectDaemon.hpp
diff -u netpanzer/src/NetPanzer/Classes/Network/ServerConnectDaemon.hpp:1.1
netpanzer/src/NetPanzer/Classes/Network/ServerConnectDaemon.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/Network/ServerConnectDaemon.hpp:1.1 Sun Dec
1 12:51:50 2002
+++ netpanzer/src/NetPanzer/Classes/Network/ServerConnectDaemon.hpp Mon Sep
1 16:24:20 2003
@@ -44,17 +44,17 @@
*iterator = front;
}
- ConnectQueueElement incIterator( unsigned long *iterator, boolean
*completed )
+ ConnectQueueElement incIterator( unsigned long *iterator, bool *completed )
{
if ( *iterator == rear )
{
- *completed = _TRUE;
+ *completed = true;
return( array[ *iterator ] );
};
*iterator = ( *iterator + 1 ) % size;
- *completed = _FALSE;
+ *completed = false;
return( array[ *iterator ] );
}
@@ -64,7 +64,7 @@
{
protected:
static unsigned char connection_state;
- static boolean connection_lock_state;
+ static bool connection_lock_state;
static PlayerID connect_player_id;
static PlayerState *connect_player_state;
static Timer time_out_timer;
@@ -72,11 +72,11 @@
static ServerConnectQueue connect_queue;
- static boolean inConnectQueue( PlayerID &new_player_id );
+ static bool inConnectQueue( PlayerID &new_player_id );
static void connectFsm( NetMessage *message );
static void connectProcess( NetMessage *message );
- static boolean disconnectClient( PlayerID player_id );
+ static bool disconnectClient( PlayerID player_id );
static void updateQueuedClients( void );
@@ -88,13 +88,13 @@
static void resetConnectFsm( void );
// ** FSM States
- static boolean connectStateIdle( void );
- static boolean connectStateWaitForConnectRequest( NetMessage *message );
- static boolean connectStateAttemptPlayerAlloc( void );
- static boolean connectStateWaitForClientSettings( NetMessage *message );
- static boolean connectStateWaitForClientGameSetupAck( NetMessage *message );
- static boolean connectStatePlayerStateSync( void );
- static boolean connectStateUnitSync( void );
+ static bool connectStateIdle( void );
+ static bool connectStateWaitForConnectRequest( NetMessage *message );
+ static bool connectStateAttemptPlayerAlloc( void );
+ static bool connectStateWaitForClientSettings( NetMessage *message );
+ static bool connectStateWaitForClientGameSetupAck( NetMessage *message );
+ static bool connectStatePlayerStateSync( void );
+ static bool connectStateUnitSync( void );
public:
@@ -115,9 +115,9 @@
static void lockConnectProcess( void );
static void unlockConnectProcess( void );
- static boolean getConnectLockStatus( void );
+ static bool getConnectLockStatus( void );
- static boolean isConnecting( void );
+ static bool isConnecting( void );
};
#endif // ** _SERVERCONNECTDAEMON_HPP
Index: netpanzer/src/NetPanzer/Classes/Network/ServerMessageRouter.cpp
diff -u netpanzer/src/NetPanzer/Classes/Network/ServerMessageRouter.cpp:1.1
netpanzer/src/NetPanzer/Classes/Network/ServerMessageRouter.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/Network/ServerMessageRouter.cpp:1.1 Sun Dec
1 12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/Network/ServerMessageRouter.cpp Mon Sep
1 16:24:20 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "ServerMessageRouter.hpp"
#include "Server.hpp"
@@ -75,7 +74,7 @@
{
ServerConnectDaemon::connectProcess();
- while( SERVER->getMessage( temp_message ) == _TRUE )
+ while( SERVER->getMessage( temp_message ) == true )
{
if ( temp_message->message_class == _net_message_class_multi )
{
Index: netpanzer/src/NetPanzer/Classes/Network/SystemNetMessage.hpp
diff -u netpanzer/src/NetPanzer/Classes/Network/SystemNetMessage.hpp:1.1
netpanzer/src/NetPanzer/Classes/Network/SystemNetMessage.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/Network/SystemNetMessage.hpp:1.1 Sun Dec
1 12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/Network/SystemNetMessage.hpp Mon Sep
1 16:24:20 2003
@@ -24,7 +24,9 @@
#include "PlayerState.hpp"
#include "NetPacket.hpp"
+#ifdef MSVC
#pragma pack(1)
+#endif
enum { _net_message_id_system_set_view,
_net_message_id_system_reset_game_logic,
@@ -48,7 +50,7 @@
message_id = _net_message_id_system_set_view;
}
- };
+ } __attribute__((packed));
class SystemResetGameLogic : public NetMessage
@@ -61,7 +63,7 @@
message_id = _net_message_id_system_reset_game_logic;
}
- };
+ } __attribute__((packed));
enum { _chat_mesg_scope_player_set,
_chat_mesg_scope_alliance,
@@ -89,7 +91,7 @@
{
message_class = _net_message_class_system;
message_id = _net_message_id_system_chat_mesg_req;
- memset( player_set, 0, sizeof( unsigned char) 32 );
+ memset( player_set, 0, sizeof( unsigned char) * 32 );
message_scope = _chat_mesg_scope_all;
}
@@ -126,7 +128,7 @@
player_set[ index ] = player_set[index] & mask;
}
- };
+ } __attribute__((packed));
class SystemChatMesg: public NetMessage
@@ -142,7 +144,7 @@
message_id = _net_message_id_system_chat_mesg;
}
- };
+ } __attribute__((packed));
@@ -171,7 +173,7 @@
strcpy( view_name, name );
}
- };
+ } __attribute__((packed));
class SystemPingRequest : public NetMessage
@@ -185,7 +187,7 @@
message_id = _net_message_id_system_ping_request;
}
- };
+ } __attribute__((packed));
class SystemPingAcknowledge : public NetMessage
{
@@ -197,7 +199,7 @@
message_id = _net_message_id_system_ping_ack;
}
- };
+ } __attribute__((packed));
enum { _connect_alert_mesg_connect,
@@ -223,8 +225,10 @@
alert_enum = alert_type;
}
- };
+ } __attribute__((packed));
+#ifdef MSVC
#pragma pack()
+#endif
#endif // ** _SYSTEMNETMESSAGE_HPP
Index: netpanzer/src/NetPanzer/Classes/Network/TerminalNetMesg.hpp
diff -u netpanzer/src/NetPanzer/Classes/Network/TerminalNetMesg.hpp:1.1
netpanzer/src/NetPanzer/Classes/Network/TerminalNetMesg.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/Network/TerminalNetMesg.hpp:1.1 Sun Dec
1 12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/Network/TerminalNetMesg.hpp Mon Sep 1
16:24:20 2003
@@ -27,7 +27,9 @@
_net_message_id_term_unit_gen
};
+#ifdef MSVC
#pragma pack(1)
+#endif
class TerminalUnitCmdRequest : public NetMessage
{
@@ -40,7 +42,7 @@
message_id = _net_message_id_term_unit_cmd;
}
- };
+ } __attribute__((packed));
class TerminalOutpostUnitGenRequest : public NetMessage
{
@@ -53,8 +55,10 @@
message_id = _net_message_id_term_unit_gen;
}
- };
+ } __attribute__((packed));
+#ifdef MSVC
#pragma pack()
+#endif
#endif
Index: netpanzer/src/NetPanzer/Classes/Network/UnitNetMessage.cpp
diff -u netpanzer/src/NetPanzer/Classes/Network/UnitNetMessage.cpp:1.1
netpanzer/src/NetPanzer/Classes/Network/UnitNetMessage.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/Network/UnitNetMessage.cpp:1.1 Sun Dec
1 12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/Network/UnitNetMessage.cpp Mon Sep 1
16:24:20 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "UnitNetMessage.hpp"
unsigned short UnitOpcodeMessage::realSize( void )
Index: netpanzer/src/NetPanzer/Classes/Network/UnitNetMessage.hpp
diff -u netpanzer/src/NetPanzer/Classes/Network/UnitNetMessage.hpp:1.1
netpanzer/src/NetPanzer/Classes/Network/UnitNetMessage.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/Network/UnitNetMessage.hpp:1.1 Sun Dec
1 12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/Network/UnitNetMessage.hpp Mon Sep 1
16:24:20 2003
@@ -31,7 +31,9 @@
_net_message_id_unit_sync_integrity_check
};
+#ifdef MSVC
#pragma pack(1)
+#endif
class UnitOpcodeMessage : public NetMessage
{
@@ -49,7 +51,7 @@
unsigned short realSize( void );
- };
+ } __attribute__((packed));
class UnitIniSyncMessage : public NetMessage
@@ -71,7 +73,7 @@
return( sizeof( UnitIniSyncMessage ) );
}
- };
+ } __attribute__((packed));
// ** NOTE: A big, mother fucking HACK
@@ -86,7 +88,7 @@
message_id = _net_message_id_destroy_unit;
}
- };
+ } __attribute__((packed));
class UnitRemoteCreate : public NetMessage
@@ -102,7 +104,7 @@
message_id = _net_message_id_create_unit;
}
- };
+ } __attribute__((packed));
class UnitSyncIntegrityCheck : public NetMessage
{
@@ -114,8 +116,10 @@
message_id = _net_message_id_unit_sync_integrity_check;
}
- };
+ } __attribute__((packed));
+#ifdef MSVC
#pragma pack()
+#endif
#endif
Index: netpanzer/src/NetPanzer/Classes/Objective.cpp
diff -u netpanzer/src/NetPanzer/Classes/Objective.cpp:1.1
netpanzer/src/NetPanzer/Classes/Objective.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/Objective.cpp:1.1 Sun Dec 1 12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/Objective.cpp Mon Sep 1 16:24:20 2003
@@ -15,14 +15,13 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "Objective.hpp"
#include "PlayerInterface.hpp"
#include "ConsoleInterface.hpp"
Objective::Objective( short ID, PointXYi location, BoundBox area )
{
- objective_state.selection_state = _FALSE;
+ objective_state.selection_state = false;
objective_state.ID = ID;
objective_state.location = location;
objective_state.capture_area = area;
Index: netpanzer/src/NetPanzer/Classes/Objective.hpp
diff -u netpanzer/src/NetPanzer/Classes/Objective.hpp:1.1
netpanzer/src/NetPanzer/Classes/Objective.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/Objective.hpp:1.1 Sun Dec 1 12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/Objective.hpp Mon Sep 1 16:24:20 2003
@@ -35,7 +35,7 @@
{
public:
short ID;
- boolean selection_state;
+ bool selection_state;
Recti selection_box;
unsigned char outpost_type;
char name[64];
@@ -46,7 +46,7 @@
unsigned char occupation_status;
PlayerID occupying_player;
- inline boolean isBounded( PointXYi &test )
+ inline bool isBounded( PointXYi &test )
{
return( capture_area.bounds( location, test ) );
}
@@ -58,7 +58,7 @@
{
public:
unsigned short unit_generation_type;
- boolean unit_generation_on_off;
+ bool unit_generation_on_off;
float unit_generation_time;
float unit_generation_time_remaining;
};
Index: netpanzer/src/NetPanzer/Classes/ObjectiveMessageTypes.hpp
diff -u netpanzer/src/NetPanzer/Classes/ObjectiveMessageTypes.hpp:1.1
netpanzer/src/NetPanzer/Classes/ObjectiveMessageTypes.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/ObjectiveMessageTypes.hpp:1.1 Sun Dec
1 12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/ObjectiveMessageTypes.hpp Mon Sep 1
16:24:20 2003
@@ -20,7 +20,9 @@
#include "PlayerState.hpp"
+#ifdef MSVC
#pragma pack(1)
+#endif
class ObjectiveMessage : public PObject
{
@@ -28,7 +30,7 @@
unsigned char message_type;
unsigned short objective_id;
- };
+ } __attribute__((packed));
enum { _objective_mesg_update_occupation,
_objective_mesg_change_unit_generation,
@@ -50,15 +52,15 @@
message_type = _objective_mesg_update_occupation;
}
- };
+ } __attribute__((packed));
class ChangeUnitGeneration : public ObjectiveMessage
{
public:
unsigned char unit_type;
- boolean unit_gen_on;
+ bool unit_gen_on;
- void set( unsigned short id, unsigned char unit_type, boolean
unit_generation_on )
+ void set( unsigned short id, unsigned char unit_type, bool
unit_generation_on )
{
objective_id = id;
ChangeUnitGeneration::unit_type = unit_type;
@@ -66,7 +68,7 @@
message_type = _objective_mesg_change_unit_generation;
}
- };
+ } __attribute__((packed));
class DisownPlayerObjective : public ObjectiveMessage
{
@@ -80,7 +82,7 @@
message_type = _objective_mesg_disown_player_objective;
}
- };
+ } __attribute__((packed));
class SyncObjective : public ObjectiveMessage
{
@@ -101,8 +103,10 @@
message_type = _objective_mesg_sync_objective;
}
- };
+ } __attribute__((packed));
+#ifdef MSVC
#pragma pack()
+#endif
#endif // ** _OBJECTIVE_MESSSAGE_TYPES_HPP
Index: netpanzer/src/NetPanzer/Classes/Outpost.cpp
diff -u netpanzer/src/NetPanzer/Classes/Outpost.cpp:1.1
netpanzer/src/NetPanzer/Classes/Outpost.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/Outpost.cpp:1.1 Sun Dec 1 12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/Outpost.cpp Mon Sep 1 16:24:20 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "Outpost.hpp"
#include "UnitInterface.hpp"
@@ -30,7 +29,7 @@
#include "ObjectiveNetMessage.hpp"
#include "UnitMessageTypes.hpp"
-#include "Codewiz.hpp"
+#include "codewiz.hpp"
Outpost::Outpost( short ID, PointXYi location, BoundBox area )
: Objective( ID, location, area )
@@ -48,7 +47,7 @@
unit_collection_loc = PointXYi( 13, 13 );
unit_generation_loc = PointXYi( 1, 3 );
occupation_pad_offset = PointXYi( 224, 48 );
- unit_generation_on_flag = _FALSE;
+ unit_generation_on_flag = false;
select_box.setAttrib( location, 3 );
select_box.setBoxAttributes( area, 252 );
@@ -65,7 +64,7 @@
player_index = unit_id.getPlayer();
player_state_ptr = PlayerInterface::getPlayerState( player_index );
- if ( player_state_ptr != NULL )
+ if ( player_state_ptr != 0 )
{ player_status = player_state_ptr->getStatus(); }
else
{ player_status = _player_state_free; }
@@ -129,7 +128,7 @@
occupation_pad_loc
);
- if ( unit_ptr != NULL )
+ if ( unit_ptr != 0 )
{
PointXYi unit_loc;
unit_loc = unit_ptr->unit_state.location;
@@ -138,7 +137,7 @@
attemptOccupationChange( unit_ptr->unit_id );
}
- } // ** if unit_ptr != NULL
+ } // ** if unit_ptr != 0
} // ** if occupation_status_timer.count()
@@ -153,8 +152,8 @@
if ( (unit_generation_type != _unit_type_null) &&
(objective_state.occupation_status == _occupation_status_occupied) )
{
- if( (unit_generation_timer.count() == _TRUE) &&
- (unit_generation_on_flag == _TRUE)
+ if( (unit_generation_timer.count() == true) &&
+ (unit_generation_on_flag == true)
)
{
UnitBase *unit;
@@ -165,7 +164,7 @@
gen_loc,
objective_state.occupying_player );
- if ( unit != NULL )
+ if ( unit != 0 )
{
UnitRemoteCreate create_mesg;
@@ -193,7 +192,7 @@
} // ** if ( objective_state.occupation_status ==
_occupation_status_unoccupied )
else
{
- if( (unit_generation_timer.count() == _TRUE) )
+ if( (unit_generation_timer.count() == true) )
{
unit_generation_timer.reset();
}
@@ -254,7 +253,7 @@
profile = UnitProfileInterface::getUnitProfile( unit_generation_type );
unit_generation_timer.changePeriod( (float) profile->regen_time );
- unit_generation_on_flag = _FALSE;
+ unit_generation_on_flag = false;
} // ** if
@@ -277,7 +276,7 @@
else
{ status.unit_generation_time = 0; }
- if ( unit_generation_on_flag == _TRUE )
+ if ( unit_generation_on_flag == true )
{ status.unit_generation_time_remaining =
unit_generation_timer.getTimeLeft(); }
else
{ status.unit_generation_time_remaining = 0; }
@@ -302,7 +301,7 @@
void Outpost::offloadGraphics( SpriteSorter &sorter )
{
- if( objective_state.selection_state == _TRUE )
+ if( objective_state.selection_state == true )
{
sorter.addSprite( &select_box );
}
Index: netpanzer/src/NetPanzer/Classes/PlacementMatrix.cpp
diff -u netpanzer/src/NetPanzer/Classes/PlacementMatrix.cpp:1.1
netpanzer/src/NetPanzer/Classes/PlacementMatrix.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/PlacementMatrix.cpp:1.1 Sun Dec 1
12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/PlacementMatrix.cpp Mon Sep 1 16:24:20 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "PlacementMatrix.hpp"
#include "MapInterface.hpp"
#include "UnitBlackBoard.hpp"
@@ -30,7 +29,7 @@
placement_state = _placement_state_base_case;
}
-boolean PlacementMatrix::verifyLocation( PointXYi &loc )
+bool PlacementMatrix::verifyLocation( PointXYi &loc )
{
long x_offset, y_offset;
long free_count = 0;
@@ -38,10 +37,10 @@
unsigned long direction_index;
if ( ( MapInterface::getMovementValue( loc ) >= 0xFF) ||
- ( UnitBlackBoard::unitOccupiesLoc( loc ) == _TRUE )
+ ( UnitBlackBoard::unitOccupiesLoc( loc ) == true )
)
{
- return(_FALSE);
+ return(false);
}
@@ -64,7 +63,7 @@
succ.y = loc.y + (y_offset);
if ( ( MapInterface::getMovementValue( succ ) < 0xFF) &&
- ( UnitBlackBoard::unitOccupiesLoc( succ ) == _FALSE )
+ ( UnitBlackBoard::unitOccupiesLoc( succ ) == false )
)
{
free_count++;
@@ -73,15 +72,15 @@
}
if ( free_count > 0 )
- return( _TRUE );
+ return( true );
- return ( _FALSE );
+ return ( false );
}
-boolean PlacementMatrix::getNextEmptyLoc( PointXYi *loc )
+bool PlacementMatrix::getNextEmptyLoc( PointXYi *loc )
{
- boolean end_cycle = _FALSE;
+ bool end_cycle = false;
do
{
@@ -95,10 +94,10 @@
current_loc = ini_loc + current_offset;
run_length += 4;
- if ( verifyLocation( ini_loc ) == _TRUE )
+ if ( verifyLocation( ini_loc ) == true )
{
*loc = ini_loc;
- return( _TRUE );
+ return( true );
}
} break;
@@ -111,14 +110,14 @@
placement_state = _placement_state_right_run;
}
else
- if ( verifyLocation( current_loc ) == _TRUE )
+ if ( verifyLocation( current_loc ) == true )
{
*loc = current_loc;
run_counter += 2;
current_loc.x += 2;
- return( _TRUE );
+ return( true );
}
else
{
@@ -135,14 +134,14 @@
placement_state = _placement_state_bottom_run;
}
else
- if ( verifyLocation( current_loc ) == _TRUE )
+ if ( verifyLocation( current_loc ) == true )
{
*loc = current_loc;
run_counter += 2;
current_loc.y += 2;
- return( _TRUE );
+ return( true );
}
else
{
@@ -159,14 +158,14 @@
placement_state = _placement_state_left_run;
}
else
- if ( verifyLocation( current_loc ) == _TRUE )
+ if ( verifyLocation( current_loc ) == true )
{
*loc = current_loc;
run_counter += 2;
current_loc.x -= 2;
- return( _TRUE );
+ return( true );
}
else
{
@@ -189,17 +188,17 @@
placement_state = _placement_state_top_run;
}
else
- { return( _FALSE ); }
+ { return( false ); }
}
else
- if ( verifyLocation( current_loc ) == _TRUE )
+ if ( verifyLocation( current_loc ) == true )
{
*loc = current_loc;
run_counter += 2;
current_loc.y -= 2;
- return( _TRUE );
+ return( true );
}
else
{
@@ -210,9 +209,9 @@
} // ** switch
- } while( end_cycle == _FALSE );
+ } while( end_cycle == false );
- return( _FALSE );
+ return( false );
}
/*
@@ -224,7 +223,7 @@
direction = 0;
}
-boolean PlacementMatrix::getNextEmptyLoc( PointXYi *loc )
+bool PlacementMatrix::getNextEmptyLoc( PointXYi *loc )
{
long x_offset, y_offset;
PointXYi succ;
@@ -299,7 +298,7 @@
} // ** switch
if ( ( MapInterface::getMovementValue( succ ) < 0xFF) &&
- ( UnitBlackBoard::unitOccupiesLoc( succ ) == _FALSE ) &&
+ ( UnitBlackBoard::unitOccupiesLoc( succ ) == false ) &&
( (MapInterface::getMovementValue( succ_right ) < 0xFF)
|| (MapInterface::getMovementValue( succ ) < 0xFF)
)
@@ -312,7 +311,7 @@
level++;
direction = 0;
}
- return( _TRUE );
+ return( true );
}
direction++;
@@ -324,6 +323,6 @@
} // ** while
- return( _FALSE );
+ return( false );
}
*/
Index: netpanzer/src/NetPanzer/Classes/PlacementMatrix.hpp
diff -u netpanzer/src/NetPanzer/Classes/PlacementMatrix.hpp:1.1
netpanzer/src/NetPanzer/Classes/PlacementMatrix.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/PlacementMatrix.hpp:1.1 Sun Dec 1
12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/PlacementMatrix.hpp Mon Sep 1 16:24:20 2003
@@ -38,7 +38,7 @@
PointXYi current_loc;
PointXYi ini_loc;
- boolean verifyLocation( PointXYi &loc );
+ bool verifyLocation( PointXYi &loc );
protected:
//long level;
@@ -48,7 +48,7 @@
public:
void reset( PointXYi ini_map_loc );
- boolean getNextEmptyLoc( PointXYi *loc );
+ bool getNextEmptyLoc( PointXYi *loc );
};
Index: netpanzer/src/NetPanzer/Classes/PlayerID.cpp
diff -u netpanzer/src/NetPanzer/Classes/PlayerID.cpp:1.1
netpanzer/src/NetPanzer/Classes/PlayerID.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/PlayerID.cpp:1.1 Sun Dec 1 12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/PlayerID.cpp Mon Sep 1 16:24:20 2003
@@ -15,5 +15,4 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "PlayerID.hpp"
Index: netpanzer/src/NetPanzer/Classes/PlayerID.hpp
diff -u netpanzer/src/NetPanzer/Classes/PlayerID.hpp:1.1
netpanzer/src/NetPanzer/Classes/PlayerID.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/PlayerID.hpp:1.1 Sun Dec 1 12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/PlayerID.hpp Mon Sep 1 16:24:20 2003
@@ -18,7 +18,6 @@
#ifndef _PLAYERID_HPP
#define _PLAYERID_HPP
-#include "aliasdef.h"
#include <string.h>
#include "PObject.hpp"
#include "DirectPlay.h"
@@ -52,27 +51,27 @@
inline void setIndex( unsigned short index )
{ index_id = index; }
- inline unsigned short getIndex()
+ inline unsigned short getIndex() const
{ return( index_id ); }
inline void setDPID( DPID dpID )
{ direct_play_id = dpID; }
- inline DPID getDPID( )
+ inline DPID getDPID( ) const
{ return( direct_play_id ); }
- inline void operator=( PlayerID &rhs )
+ inline void operator=( const PlayerID &rhs )
{
index_id = rhs.getIndex();
direct_play_id = rhs.getDPID();
}
- inline boolean operator==( PlayerID &rhs )
+ inline bool operator==( PlayerID &rhs )
{
if ( (index_id == rhs.getIndex()) && (direct_play_id = rhs.getDPID()) )
- { return( _TRUE ); }
+ { return( true ); }
- return( _FALSE );
+ return( false );
}
};
Index: netpanzer/src/NetPanzer/Classes/PlayerState.cpp
diff -u netpanzer/src/NetPanzer/Classes/PlayerState.cpp:1.1
netpanzer/src/NetPanzer/Classes/PlayerState.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/PlayerState.cpp:1.1 Sun Dec 1 12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/PlayerState.cpp Mon Sep 1 16:24:20 2003
@@ -15,5 +15,4 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "PlayerState.hpp"
Index: netpanzer/src/NetPanzer/Classes/PlayerState.hpp
diff -u netpanzer/src/NetPanzer/Classes/PlayerState.hpp:1.1
netpanzer/src/NetPanzer/Classes/PlayerState.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/PlayerState.hpp:1.1 Sun Dec 1 12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/PlayerState.hpp Mon Sep 1 16:24:20 2003
@@ -18,7 +18,6 @@
#ifndef _PLAYERSTATE_HPP
#define _PLAYERSTATE_HPP
-#include "aliasdef.h"
#include <string.h>
#include "PObject.hpp"
#include "PlayerID.hpp"
@@ -46,7 +45,7 @@
short loss_points;
short total;
short objectives_held;
- boolean stats_locked;
+ bool stats_locked;
public:
PlayerUnitConfig unit_config;
@@ -69,7 +68,7 @@
loss_points = 0;
total = 0;
objectives_held = 0;
- stats_locked = _FALSE;
+ stats_locked = false;
}
inline char * getName( void )
@@ -78,10 +77,10 @@
}
inline void lockStats( void )
- { stats_locked = _TRUE; }
+ { stats_locked = true; }
inline void unlockStats( void )
- { stats_locked = _FALSE; }
+ { stats_locked = false; }
inline short getKills( void )
{ return( kills ); }
@@ -91,39 +90,39 @@
inline void incKills( unsigned short unit_type )
{
- if ( stats_locked == _TRUE ) return;
+ if ( stats_locked == true ) return;
kills++;
kill_points += 2 * unit_config.getUnitPointValue( (unsigned char)
unit_type ) ;
}
inline void decKills( unsigned short unit_type )
{
- if ( stats_locked == _TRUE ) return;
+ if ( stats_locked == true ) return;
kills--;
}
inline void incLosses( unsigned short unit_type )
{
- if ( stats_locked == _TRUE ) return;
+ if ( stats_locked == true ) return;
losses++;
loss_points += unit_config.getUnitPointValue( (unsigned char) unit_type );
}
inline void decLosses( unsigned short unit_type )
{
- if ( stats_locked == _TRUE ) return;
+ if ( stats_locked == true ) return;
losses--;
}
inline void incObjectivesHeld( void )
{
- if ( stats_locked == _TRUE ) return;
+ if ( stats_locked == true ) return;
objectives_held++;
}
inline void decObjectivesHeld( void )
{
- if ( stats_locked == _TRUE ) return;
+ if ( stats_locked == true ) return;
objectives_held++;
}
@@ -134,7 +133,7 @@
inline void setObjectivesHeld( short objectives )
{
- if ( stats_locked == _TRUE ) return;
+ if ( stats_locked == true ) return;
objectives_held = objectives;
}
Index: netpanzer/src/NetPanzer/Classes/PlayerUnitConfig.cpp
diff -u netpanzer/src/NetPanzer/Classes/PlayerUnitConfig.cpp:1.1
netpanzer/src/NetPanzer/Classes/PlayerUnitConfig.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/PlayerUnitConfig.cpp:1.1 Sun Dec 1
12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/PlayerUnitConfig.cpp Mon Sep 1
16:24:20 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "PlayerUnitConfig.hpp"
#include "GameConfig.hpp"
Index: netpanzer/src/NetPanzer/Classes/PlayerUnitConfig.hpp
diff -u netpanzer/src/NetPanzer/Classes/PlayerUnitConfig.hpp:1.1
netpanzer/src/NetPanzer/Classes/PlayerUnitConfig.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/PlayerUnitConfig.hpp:1.1 Sun Dec 1
12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/PlayerUnitConfig.hpp Mon Sep 1
16:24:20 2003
@@ -48,7 +48,7 @@
void initialize( unsigned char max_allowed_units );
- inline unsigned char getSpawnUnitCount( unsigned char unit_type )
+ inline unsigned char getSpawnUnitCount( unsigned char unit_type ) const
{
return( unit_spawn_list[ unit_type ] );
}
@@ -77,14 +77,14 @@
PlayerUnitConfig::max_allowed_units = max_allowed_units;
}
- inline unsigned char getMaxAllowedUnits( void )
+ inline unsigned char getMaxAllowedUnits( void ) const
{
return( max_allowed_units );
}
unsigned char unitTotal( void );
- inline char getUnitColor( void )
+ inline char getUnitColor( void ) const
{
return( unit_color );
}
Index: netpanzer/src/NetPanzer/Classes/PowerUp.cpp
diff -u netpanzer/src/NetPanzer/Classes/PowerUp.cpp:1.1
netpanzer/src/NetPanzer/Classes/PowerUp.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/PowerUp.cpp:1.1 Sun Dec 1 12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/PowerUp.cpp Mon Sep 1 16:24:20 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "PowerUp.hpp"
#include "UnitBlackBoard.hpp"
@@ -47,15 +46,15 @@
powerup_state.life_cycle_state = _power_up_lifecycle_state_active;
}
-boolean PowerUp::isPowerUpHit( UnitID *unit_id )
+bool PowerUp::isPowerUpHit( UnitID *unit_id )
{
- if( UnitBlackBoard::unitOccupiesLoc( powerup_state.map_loc ) == _TRUE )
+ if( UnitBlackBoard::unitOccupiesLoc( powerup_state.map_loc ) == true )
{
- if( UnitInterface::quearyUnitAtMapLoc( powerup_state.map_loc, unit_id ) ==
_TRUE )
+ if( UnitInterface::quearyUnitAtMapLoc( powerup_state.map_loc, unit_id ) ==
true )
{
- return( _TRUE );
+ return( true );
}
}
- return( _FALSE );
+ return( false );
}
Index: netpanzer/src/NetPanzer/Classes/PowerUp.hpp
diff -u netpanzer/src/NetPanzer/Classes/PowerUp.hpp:1.1
netpanzer/src/NetPanzer/Classes/PowerUp.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/PowerUp.hpp:1.1 Sun Dec 1 12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/PowerUp.hpp Mon Sep 1 16:24:20 2003
@@ -18,8 +18,6 @@
#ifndef _POWERUP_HPP
#define _POWERUP_HPP
-
-
#include "Point.hpp"
#include "UnitID.hpp"
#include "SpriteSorter.hpp"
@@ -42,7 +40,7 @@
class PowerUp
{
protected:
- boolean isPowerUpHit( UnitID *unit_id );
+ bool isPowerUpHit( UnitID *unit_id );
public:
PowerUpState powerup_state;
Index: netpanzer/src/NetPanzer/Classes/Projectile.cpp
diff -u netpanzer/src/NetPanzer/Classes/Projectile.cpp:1.1
netpanzer/src/NetPanzer/Classes/Projectile.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/Projectile.cpp:1.1 Sun Dec 1 12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/Projectile.cpp Mon Sep 1 16:24:20 2003
@@ -15,6 +15,4 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
-#include "Projectile.hpp"
#include "Projectile.hpp"
Index: netpanzer/src/NetPanzer/Classes/SelectionBoxSprite.cpp
diff -u netpanzer/src/NetPanzer/Classes/SelectionBoxSprite.cpp:1.1
netpanzer/src/NetPanzer/Classes/SelectionBoxSprite.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/SelectionBoxSprite.cpp:1.1 Sun Dec 1
12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/SelectionBoxSprite.cpp Mon Sep 1
16:24:20 2003
@@ -15,21 +15,20 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "SelectionBoxSprite.hpp"
#include "GameConfig.hpp"
Surface UNIT_FLAGS_SURFACE;
-boolean SelectionBoxSprite::isVisible( Recti &world_win )
+bool SelectionBoxSprite::isVisible( Recti &world_win )
{
if (
- (world_win.contains( world_pos + selection_area.min ) && (visible ==
_TRUE ) ) ||
- (world_win.contains( world_pos + selection_area.max ) && (visible ==
_TRUE ) )
+ (world_win.contains( world_pos + selection_area.min ) && (visible ==
true ) ) ||
+ (world_win.contains( world_pos + selection_area.max ) && (visible ==
true ) )
)
- return( _TRUE );
+ return( true );
- return( _FALSE );
+ return( false );
}
@@ -37,7 +36,7 @@
{
PointXYi min_abs, max_abs;
- if ( box_state == _FALSE )
+ if ( box_state == false )
return;
min_abs = (world_pos + selection_area.min) - world_win.min;
@@ -67,9 +66,9 @@
UnitSelectionBox::UnitSelectionBox( )
{
- allied_visiblity_state = _FALSE;
- allie_state = _FALSE;
- flag_visibility_state = _FALSE;
+ allied_visiblity_state = false;
+ allie_state = false;
+ flag_visibility_state = false;
unit_flag.setTo( UNIT_FLAGS_SURFACE );
}
@@ -81,7 +80,7 @@
min_abs = (world_pos + selection_area.min) - world_win.min;
max_abs = (world_pos + selection_area.max) - world_win.min;
- if ( box_state == _TRUE )
+ if ( box_state == true )
{
// Modified the vehicle selection box and moved the hitpoints outside,
@@ -102,10 +101,10 @@
} else { assert(false); }
- } // ** box_state == _TRUE
+ } // ** box_state == true
// Draw the unit hitpoints.
- if ( GameConfig::getDrawUnitDamage() || (box_state == _TRUE) )
+ if ( GameConfig::getDrawUnitDamage() || (box_state == true) )
{
// Draw a color coded hit bar.
BYTE hitBarColor;
@@ -141,7 +140,7 @@
//surface->drawHLine(min_abs.x, max_abs.y-3, max_abs.x+1,
box_color);
}
- if ( GameConfig::getDisplayUnitFlags() == _TRUE )
+ if ( GameConfig::getDisplayUnitFlags() == true )
{
//unit_flag.blt( *surface, iXY( min_abs.x, min_abs.y -
unit_flag.getPix().y ) );
//surface->bltString5x5(min_abs.x + 2, min_abs.y - 6, "Panther1",
Color::white);
@@ -149,7 +148,7 @@
}
/*
- if ( (flag_visibility_state == _TRUE) && (allie_state == _TRUE) )
+ if ( (flag_visibility_state == true) && (allie_state == true) )
{
allie_flag.blt ( *surface, iXY( max_abs.x - allie_flag.getPix().x ,
min_abs.y - allie_flag.getPix().y ) );
}
Index: netpanzer/src/NetPanzer/Classes/SelectionBoxSprite.hpp
diff -u netpanzer/src/NetPanzer/Classes/SelectionBoxSprite.hpp:1.1
netpanzer/src/NetPanzer/Classes/SelectionBoxSprite.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/SelectionBoxSprite.hpp:1.1 Sun Dec 1
12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/SelectionBoxSprite.hpp Mon Sep 1
16:24:20 2003
@@ -28,7 +28,7 @@
protected:
BoundBox selection_area;
unsigned char box_color;
- boolean box_state;
+ bool box_state;
public:
@@ -38,12 +38,12 @@
SelectionBoxSprite::box_color = box_color;
}
- inline void setBoxState( boolean on_off )
+ inline void setBoxState( bool on_off )
{
box_state = on_off;
}
- virtual boolean isVisible( Recti &world_win );
+ virtual bool isVisible( Recti &world_win );
virtual void blit( Surface *surface, Recti &world_win );
@@ -56,15 +56,18 @@
float max_hit_points;
unsigned char hit_bar_color;
- boolean allied_visiblity_state;
- boolean allie_state;
- boolean flag_visibility_state;
+ bool allied_visiblity_state;
+ bool allie_state;
+ bool flag_visibility_state;
public:
Surface unit_flag;
Surface allie_flag;
UnitSelectionBox( );
+
+ virtual ~UnitSelectionBox()
+ { }
inline void setHitBarAttributes( int max_points, unsigned char bar_color )
{
@@ -84,17 +87,17 @@
unit_flag.setFrame( flag_enum );
}
- inline void setFlagIcon( boolean flag_state )
+ inline void setFlagIcon( bool flag_state )
{
flag_visibility_state = flag_state;
}
- inline void setAllieIcon( boolean allie_state )
+ inline void setAllieIcon( bool allie_state )
{
allied_visiblity_state = allie_state;
}
- inline void setAllieState( boolean is_allied )
+ inline void setAllieState( bool is_allied )
{
allie_state = is_allied;
}
Index: netpanzer/src/NetPanzer/Classes/SelectionList.cpp
diff -u netpanzer/src/NetPanzer/Classes/SelectionList.cpp:1.1
netpanzer/src/NetPanzer/Classes/SelectionList.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/SelectionList.cpp:1.1 Sun Dec 1
12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/SelectionList.cpp Mon Sep 1 16:24:20 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "SelectionList.hpp"
#include "UnitInterface.hpp"
#include "PlayerInterface.hpp"
@@ -26,7 +25,7 @@
point = (PointXYi *) key;
- if ( comp->bounds( *point ) == _TRUE )
+ if ( comp->bounds( *point ) == true )
return( 0 );
return( -1 );
@@ -38,7 +37,7 @@
bound = (Recti *) key;
- if ( bound->contains( comp->location ) == _TRUE )
+ if ( bound->contains( comp->location ) == true )
return( 0 );
return( 1 );
@@ -52,7 +51,7 @@
}
-boolean SelectionList::selectUnit( PointXYi point )
+bool SelectionList::selectUnit( PointXYi point )
{
PlayerID player_id;
@@ -66,20 +65,20 @@
(void *) &point,
player_id,
_search_player,
- _FALSE
+ false
);
select();
if ( unit_list.containsItems() > 0 )
{
resetUnitCycling();
- return ( _TRUE );
+ return ( true );
}
- return( _FALSE );
+ return( false );
}
-boolean SelectionList::addUnit( PointXYi point )
+bool SelectionList::addUnit( PointXYi point )
{
PlayerID player_id;
@@ -92,21 +91,21 @@
(void *) &point,
player_id,
_search_player,
- _FALSE
+ false
);
select();
if ( unit_list.containsItems() > 0 )
{
resetUnitCycling();
- return ( _TRUE );
+ return ( true );
}
- return( _FALSE );
+ return( false );
}
-boolean SelectionList::selectTarget( PointXYi point )
+bool SelectionList::selectTarget( PointXYi point )
{
PlayerID player_id;
@@ -120,23 +119,23 @@
(void *) &point,
player_id,
_search_exclude_player,
- _FALSE
+ false
);
if ( unit_list.containsItems() > 0 )
{
resetUnitCycling();
- return ( _TRUE );
+ return ( true );
}
- return( _FALSE );
+ return( false );
}
-boolean SelectionList::selectBounded( Recti bounds )
+bool SelectionList::selectBounded( Recti bounds )
{
PlayerID player_id;
- boolean found_units;
+ bool found_units;
player_id = PlayerInterface::getLocalPlayerID( );
@@ -146,10 +145,10 @@
(void *) &bounds,
player_id,
_search_player,
- _TRUE
+ true
);
- if ( found_units == _FALSE )
- return( _FALSE );
+ if ( found_units == false )
+ return( false );
deselect();
unit_list.removeAll();
@@ -159,17 +158,17 @@
(void *) &bounds,
player_id,
_search_player,
- _FALSE
+ false
);
select();
if ( unit_list.containsItems() > 0 )
{
resetUnitCycling();
- return ( _TRUE );
+ return ( true );
}
- return( _FALSE );
+ return( false );
}
@@ -184,9 +183,9 @@
for( id_list_index = 0; id_list_index < id_list_size; id_list_index++ )
{
unit = UnitInterface::getUnit( unit_list[ id_list_index ] );
- if ( unit != NULL )
+ if ( unit != 0 )
{
- unit->unit_state.select = _TRUE;
+ unit->unit_state.select = true;
}
}
@@ -204,9 +203,9 @@
for( id_list_index = 0; id_list_index < id_list_size; id_list_index++ )
{
unit = UnitInterface::getUnit( unit_list[ id_list_index ] );
- if ( unit != NULL )
+ if ( unit != 0 )
{
- unit->unit_state.select = _FALSE;
+ unit->unit_state.select = false;
}
}
}
@@ -226,14 +225,14 @@
{
unit = UnitInterface::getUnit( unit_list[ unit_cycle_index ] );
- if ( unit != NULL )
+ if ( unit != 0 )
{
- unit->unit_state.select = _TRUE;
+ unit->unit_state.select = true;
}
unit_cycle_index = (unit_cycle_index + 1) % unit_list.contains;
- } while( (unit == NULL) && (unit_cycle_index != start_index) );
+ } while( (unit == 0) && (unit_cycle_index != start_index) );
}
@@ -266,7 +265,7 @@
if ( unit_list.containsItems() > 0 )
{
unit = UnitInterface::getUnit( unit_list[ 0 ] );
- if( unit != NULL )
+ if( unit != 0 )
{ return( unit->unit_state.unit_type ); }
else
{ return(0); }
@@ -289,7 +288,7 @@
for( id_list_index = 0; id_list_index < id_list_size; id_list_index++ )
{
unit = UnitInterface::getUnit( unit_list[ id_list_index ] );
- if ( unit != NULL )
+ if ( unit != 0 )
{ return; }
}
Index: netpanzer/src/NetPanzer/Classes/SelectionList.hpp
diff -u netpanzer/src/NetPanzer/Classes/SelectionList.hpp:1.1
netpanzer/src/NetPanzer/Classes/SelectionList.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/SelectionList.hpp:1.1 Sun Dec 1
12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/SelectionList.hpp Mon Sep 1 16:24:20 2003
@@ -37,20 +37,20 @@
void initialize( unsigned long size, unsigned long growIncrement,
unsigned long growLimit );
- boolean selectUnit( PointXYi point );
+ bool selectUnit( PointXYi point );
- boolean addUnit( PointXYi point );
+ bool addUnit( PointXYi point );
- boolean selectTarget( PointXYi point );
+ bool selectTarget( PointXYi point );
- boolean selectBounded( Recti bounds );
+ bool selectBounded( Recti bounds );
- inline boolean isSelected( void )
+ inline bool isSelected( void )
{
if ( unit_list.containsItems() > 0 )
- return( _TRUE );
+ return( true );
- return( _FALSE );
+ return( false );
}
void select( void );
Index: netpanzer/src/NetPanzer/Classes/SpawnList.cpp
diff -u netpanzer/src/NetPanzer/Classes/SpawnList.cpp:1.1
netpanzer/src/NetPanzer/Classes/SpawnList.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/SpawnList.cpp:1.1 Sun Dec 1 12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/SpawnList.cpp Mon Sep 1 16:24:20 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "SpawnList.hpp"
@@ -36,18 +35,18 @@
char comment[64];
infile = fopen( file_path, "rt" );
- assert( infile != NULL );
+ assert( infile != 0 );
deallocate();
- fscanf( infile, "%s %d", comment, &spawn_count );
+ fscanf( infile, "%s %lu", comment, &spawn_count );
initialize( spawn_count );
long x, y;
SpawnPoint *spawn;
for ( spawn_index = 0; spawn_index < spawn_count; spawn_index++ )
{
- fscanf( infile, "%s %d %d", comment, &x, &y );
+ fscanf( infile, "%s %lu %lu", comment, &x, &y );
spawn = &array[ spawn_index ];
spawn->map_loc.x = x;
spawn->map_loc.y = y;
Index: netpanzer/src/NetPanzer/Classes/Sprite.cpp
diff -u netpanzer/src/NetPanzer/Classes/Sprite.cpp:1.1
netpanzer/src/NetPanzer/Classes/Sprite.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/Sprite.cpp:1.1 Sun Dec 1 12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/Sprite.cpp Mon Sep 1 16:24:20 2003
@@ -15,15 +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
*/
-#include "stdafx.hpp"
#include "Sprite.hpp"
#include "Palette.hpp"
Sprite::Sprite( )
{
height = 0;
- visible = _TRUE;
- next = NULL;
+ visible = true;
+ next = 0;
}
@@ -40,7 +39,7 @@
setData( data, xPix, yPix, numFrames );
}
-boolean SpriteSurface::isVisible( Recti &world_win )
+bool SpriteSurface::isVisible( Recti &world_win )
{
long min_x;
long min_y;
@@ -71,9 +70,9 @@
temp_pix.y = temp_pix.y/2;
if ( world_win.clip( Recti( world_pos - temp_pix, world_pos + temp_pix) ) )
- return( _FALSE );
+ return( false );
- return( _TRUE );
+ return( true );
*/
}
@@ -89,7 +88,7 @@
SpritePacked::SpritePacked()
: Sprite()
{
- colorTable = NULL;
+ colorTable = 0;
drawMode = SOLID;
}
@@ -97,11 +96,11 @@
: Sprite()
{
setTo( source );
- colorTable = NULL;
+ colorTable = 0;
drawMode = SOLID;
}
-boolean SpritePacked::isVisible( Recti &world_win )
+bool SpritePacked::isVisible( Recti &world_win )
{
long min_x;
long min_y;
@@ -132,9 +131,9 @@
temp_pix.y = temp_pix.y/2;
if ( world_win.clip( Recti( world_pos - temp_pix, world_pos + temp_pix) ) )
- return( _FALSE );
+ return( false );
- return( _TRUE );
+ return( true );
*/
}
Index: netpanzer/src/NetPanzer/Classes/Sprite.hpp
diff -u netpanzer/src/NetPanzer/Classes/Sprite.hpp:1.1
netpanzer/src/NetPanzer/Classes/Sprite.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/Sprite.hpp:1.1 Sun Dec 1 12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/Sprite.hpp Mon Sep 1 16:24:20 2003
@@ -18,7 +18,6 @@
#ifndef _SPRITE_HPP
#define _SPRITE_HPP
-
#include "PObject.hpp"
#include "Surface.hpp"
#include "PackedSurface.hpp"
@@ -33,19 +32,19 @@
PointXYi attach_offset;
unsigned char height;
- boolean visible;
+ bool visible;
public:
Sprite( );
- inline void setWorldPos( PointXYi &worldPos )
+ inline void setWorldPos(const PointXYi &worldPos )
{
world_pos = worldPos;
}
- virtual boolean isVisible( Recti &world_win ) { return( _FALSE ); }
+ virtual bool isVisible(const Recti &world_win ) { return( false ); }
inline void setWorldPos( int x, int y )
{
@@ -53,7 +52,8 @@
world_pos.y = y;
}
- inline void setAttrib( PointXYi &worldPos, PointXYi &attach, unsigned char
height )
+ inline void setAttrib(const PointXYi &worldPos, const PointXYi &attach,
+ unsigned char height )
{
world_pos = worldPos;
attach_offset = attach;
@@ -61,7 +61,7 @@
Sprite::height = height;
}
- inline void setAttrib( PointXYi &worldPos, unsigned char height )
+ inline void setAttrib(const PointXYi &worldPos, unsigned char height )
{
world_pos = worldPos;
assert( height < _MAX_HEIGHT_LEVELS );
@@ -81,18 +81,18 @@
return( height );
}
- inline void setVisiblity( boolean visible )
+ inline void setVisiblity( bool visible )
{
Sprite::visible = visible;
}
- inline void attachSprite( Sprite *sprite, PointXYi &attach )
+ inline void attachSprite( Sprite *sprite, const PointXYi &attach )
{
Sprite *iterator;
iterator = this;
- while(iterator->next != NULL)
+ while(iterator->next != 0)
iterator = iterator->next;
sprite->setAttrib( world_pos, attach, height );
@@ -100,15 +100,15 @@
iterator->next = sprite;
}
- virtual void blit( Surface *surface, Recti &world_win ) { }
+ virtual void blit( Surface *surface, const Recti &world_win ) { }
- inline void blitAll( Surface *surface, Recti &world_win )
+ inline void blitAll( Surface *surface, const Recti &world_win )
{
Sprite *iterator;
iterator = this;
- while(iterator != NULL)
+ while(iterator != 0)
{
iterator->blit( surface, world_win );
iterator = iterator->next;
@@ -157,7 +157,7 @@
Sprite::height = height;
}
- inline void setAttrib( PointXYi &worldPos, unsigned char height )
+ inline void setAttrib( const PointXYi &worldPos, unsigned char height )
{
world_pos = worldPos;
assert( height < _MAX_HEIGHT_LEVELS );
@@ -166,14 +166,14 @@
attach_offset.y = 0;
}
- virtual boolean isVisible( Recti &world_win );
+ virtual bool isVisible( Recti &world_win );
virtual void blit( Surface *surface, Recti &world_win );
};
class SpritePacked : public PackedSurface, public Sprite
- {
+{
private:
enum DRAW_MODE
{
@@ -190,6 +190,9 @@
SpritePacked( PackedSurface &source );
+ virtual ~SpritePacked()
+ { }
+
inline void setDrawModeBlend(ColorTable *colorTable)
{
SpritePacked::colorTable = colorTable;
@@ -205,7 +208,8 @@
setOffsetCenter();
}
- inline void setAttrib( PointXYi &worldPos, PointXYi &attach, unsigned char
height, int frame )
+ inline void setAttrib( const PointXYi &worldPos, const PointXYi &attach,
+ unsigned char height, int
frame )
{
world_pos = worldPos;
attach_offset = attach;
@@ -215,7 +219,8 @@
}
- inline void setAttrib( PointXYi &worldPos, PointXYi &attach, unsigned char
height )
+ inline void setAttrib( const PointXYi &worldPos, const PointXYi &attach,
+ unsigned char height )
{
world_pos = worldPos;
attach_offset = attach;
@@ -223,7 +228,7 @@
Sprite::height = height;
}
- inline void setAttrib( PointXYi &worldPos, unsigned char height )
+ inline void setAttrib( const PointXYi &worldPos, unsigned char height )
{
world_pos = worldPos;
assert( height < _MAX_HEIGHT_LEVELS );
@@ -232,7 +237,7 @@
attach_offset.y = 0;
}
- virtual boolean isVisible( Recti &world_win );
+ virtual bool isVisible( Recti &world_win );
virtual void blit( Surface *surface, Recti &world_win );
Index: netpanzer/src/NetPanzer/Classes/SpriteSorter.cpp
diff -u netpanzer/src/NetPanzer/Classes/SpriteSorter.cpp:1.1
netpanzer/src/NetPanzer/Classes/SpriteSorter.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/SpriteSorter.cpp:1.1 Sun Dec 1
12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/SpriteSorter.cpp Mon Sep 1 16:24:20 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "SpriteSorter.hpp"
SpriteSorter SPRITE_SORTER;
Index: netpanzer/src/NetPanzer/Classes/SpriteSorter.hpp
diff -u netpanzer/src/NetPanzer/Classes/SpriteSorter.hpp:1.1
netpanzer/src/NetPanzer/Classes/SpriteSorter.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/SpriteSorter.hpp:1.1 Sun Dec 1
12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/SpriteSorter.hpp Mon Sep 1 16:24:20 2003
@@ -57,7 +57,7 @@
void addSprite( Sprite *sprite );
- inline boolean cullSprite( Sprite &sprite )
+ inline bool cullSprite( Sprite &sprite )
{ return( !(sprite.isVisible( world_window )) ); }
void forceAddSprite( Sprite *sprite );
Index: netpanzer/src/NetPanzer/Classes/TileEngine.cpp
diff -u netpanzer/src/NetPanzer/Classes/TileEngine.cpp:1.1
netpanzer/src/NetPanzer/Classes/TileEngine.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/TileEngine.cpp:1.1 Sun Dec 1 12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/TileEngine.cpp Mon Sep 1 16:24:20 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "TileEngine.hpp"
#include "DirectDrawGlobals.hpp"
#include "blitters.h"
@@ -26,7 +25,7 @@
unsigned long x_left_length, x_left_offset, x_right_length, x_right_offset;
unsigned long y_top_length, y_top_offset, y_bottom_length, y_bottom_offset;
- boolean x_right_end_flag, y_bottom_end_flag;
+ bool x_right_end_flag, y_bottom_end_flag;
unsigned short map_x, map_y;
unsigned long world_x, world_y;
@@ -55,9 +54,10 @@
tile_size = tile_set.getTileXsize();
-
- main_camera->getViewStart( DBUFFER_VIEW_WIDTH, DBUFFER_VIEW_HEIGHT,
- &world_x, &world_y);
+
+ // XXX
+ // main_camera->getViewStart( DBUFFER_VIEW_WIDTH, DBUFFER_VIEW_HEIGHT,
+ // &world_x, &world_y);
pointXYtoMapXY( world_x, world_y, &map_x, &map_y );
@@ -80,27 +80,32 @@
x_left_offset = (world_x % tile_size);
x_left_length = (tile_size - x_left_offset);
- complete_columns = (DBUFFER_VIEW_WIDTH - x_left_length) / tile_size;
+ // XXX
+ // complete_columns = (DBUFFER_VIEW_WIDTH - x_left_length) / tile_size;
x_right_offset = 0;
- x_right_length = (DBUFFER_VIEW_WIDTH - x_left_length) % tile_size;
+ // XXX
+ //x_right_length = (DBUFFER_VIEW_WIDTH - x_left_length) % tile_size;
if ( x_right_length > 0 )
- x_right_end_flag = _TRUE;
+ x_right_end_flag = true;
y_top_offset = (world_y % tile_size);
y_top_length = (tile_size - y_top_offset);
- complete_rows = (DBUFFER_VIEW_HEIGHT - y_top_length) / tile_size;
+ // XXX
+ // complete_rows = (DBUFFER_VIEW_HEIGHT - y_top_length) / tile_size;
y_bottom_offset = 0;
- y_bottom_length = (DBUFFER_VIEW_HEIGHT - y_top_length) % tile_size;
+ // XXX
+ // y_bottom_length = (DBUFFER_VIEW_HEIGHT - y_top_length) % tile_size;
if ( y_bottom_length > 0 )
- y_bottom_end_flag = _TRUE;
+ y_bottom_end_flag = true;
world_row = map_buffer + (map_y * map_width) + map_x;
- next_tile_row_offset = DBUFFER_WIDTH * (tile_size - 1) + X_CLIP_OFS;
+ // XXX
+ //next_tile_row_offset = DBUFFER_WIDTH * (tile_size - 1) + X_CLIP_OFS;
next_map_row_offset = map_width - complete_columns - 1;
@@ -111,7 +116,8 @@
tile_offset = tile_set.getTile( tile_type );
tile_offset = tile_offset + (y_top_offset * tile_size ) + x_left_offset;
- buffer_offset = double_buffer + OFFSET_TO_VIEW;
+ // XXX
+ //buffer_offset = double_buffer + OFFSET_TO_VIEW;
blit_partial_xy( tile_offset, buffer_offset, y_top_length, x_left_length );
@@ -139,7 +145,7 @@
}
- if( x_right_end_flag == _TRUE )
+ if( x_right_end_flag == true )
{
if (y_top_length > 0 && x_right_length > 0)
@@ -147,13 +153,15 @@
blit_partial_xy(tile_offset, buffer_offset, y_top_length,
x_right_length);
}
- buffer_offset += ( DBUFFER_WIDTH * (y_top_length-1)) + X_CLIP_OFS +
x_right_length;
+ // XXX
+ //buffer_offset += ( DBUFFER_WIDTH * (y_top_length-1)) + X_CLIP_OFS +
x_right_length;
world_row = world_row + next_map_row_offset;
}
else
{
- buffer_offset += (DBUFFER_WIDTH * (y_top_length-1)) + X_CLIP_OFS;
+ // XXX
+ //buffer_offset += (DBUFFER_WIDTH * (y_top_length-1)) + X_CLIP_OFS;
world_row = world_row + next_map_row_offset;
}
@@ -193,7 +201,7 @@
}
- if( x_right_end_flag == _TRUE )
+ if( x_right_end_flag == true )
{
if (tile_size > 0 && x_right_length > 0)
{
@@ -216,7 +224,7 @@
// NOW THE LAST ROW IF NEEDED
- if( y_bottom_end_flag == _TRUE )
+ if( y_bottom_end_flag == true )
{
tile_type = *(world_row);
@@ -256,20 +264,22 @@
}
- if( x_right_end_flag == _TRUE )
+ if( x_right_end_flag == true )
{
if (y_bottom_length > 0 && x_right_length > 0)
{
blit_partial_xy( tile_offset, buffer_offset,
y_bottom_length, x_right_length );
}
- buffer_offset += (DBUFFER_WIDTH * (y_bottom_length-1)) + X_CLIP_OFS +
x_right_length;
+ // XXX
+ // buffer_offset += (DBUFFER_WIDTH * (y_bottom_length-1)) + X_CLIP_OFS +
x_right_length;
world_row = world_row + next_map_row_offset;
}
else
{
- buffer_offset += (DBUFFER_WIDTH * (y_bottom_length-1)) + X_CLIP_OFS;
+ // XXX
+ // buffer_offset += (DBUFFER_WIDTH * (y_bottom_length-1)) + X_CLIP_OFS;
world_row = world_row + next_map_row_offset;
}
Index: netpanzer/src/NetPanzer/Classes/TileSet.cpp
diff -u netpanzer/src/NetPanzer/Classes/TileSet.cpp:1.1
netpanzer/src/NetPanzer/Classes/TileSet.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/TileSet.cpp:1.1 Sun Dec 1 12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/TileSet.cpp Mon Sep 1 16:24:20 2003
@@ -15,19 +15,18 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "TileSet.hpp"
-#include <io.h>
+//#include <io.h>
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
-#include "gdatstct.hpp"
+#include "Gdatstct.hpp"
TileSet::TileSet( )
{
- tile_info = NULL;
- tile_data = NULL;
- tile_set_loaded = _FALSE;
+ tile_info = 0;
+ tile_data = 0;
+ tile_set_loaded = false;
tile_count = 0;
}
@@ -43,23 +42,23 @@
infile = fopen( file_path, "rb" );
- assert( infile != NULL );
+ assert( infile != 0 );
- if ( tile_set_loaded == _TRUE )
+ if ( tile_set_loaded == true )
{
- if ( tile_data != NULL )
+ if ( tile_data != 0 )
{
delete( tile_data );
- tile_data = NULL;
+ tile_data = 0;
}
- if ( tile_info != NULL )
+ if ( tile_info != 0 )
{
delete( tile_info );
- tile_info = NULL;
+ tile_info = 0;
}
- tile_set_loaded = _FALSE;
+ tile_set_loaded = false;
}
@@ -67,7 +66,7 @@
tile_count = tile_set_info.tile_count;
- tile_set_loaded = _TRUE;
+ tile_set_loaded = true;
computeTileConsts();
@@ -78,17 +77,17 @@
{
FILE *infile;
unsigned long tile_buffer_size;
- tile_dbase_header_type header;
+ //tile_dbase_header_type header;
/*
infile = fopen( file_path, "rb" );
- assert( infile != NULL );
+ assert( infile != 0 );
- if ( tile_set_loaded == _TRUE )
+ if ( tile_set_loaded == true )
{
delete( tile_data );
- tile_set_loaded = _FALSE;
+ tile_set_loaded = false;
}
fread( &header, sizeof( tile_dbase_header_type ), 1, infile );
@@ -100,11 +99,11 @@
tile_buffer_size = header.tile_size * header.tile_count;
tile_data = new unsigned char [ tile_buffer_size ];
- assert( tile_data != NULL );
+ assert( tile_data != 0 );
fread( tile_data, tile_buffer_size, 1, infile );
- tile_set_loaded = _TRUE;
+ tile_set_loaded = true;
computeTileConsts();
@@ -114,23 +113,23 @@
infile = fopen( file_path, "rb" );
- assert( infile != NULL );
+ assert( infile != 0 );
- if ( tile_set_loaded == _TRUE )
+ if ( tile_set_loaded == true )
{
- if ( tile_data != NULL )
+ if ( tile_data != 0 )
{
delete( tile_data );
- tile_data = NULL;
+ tile_data = 0;
}
- if ( tile_info != NULL )
+ if ( tile_info != 0 )
{
delete( tile_info );
- tile_info = NULL;
+ tile_info = 0;
}
- tile_set_loaded = _FALSE;
+ tile_set_loaded = false;
}
fread( &tile_set_info, sizeof(TILE_DBASE_HEADER), 1, infile );
@@ -138,16 +137,16 @@
tile_buffer_size = (tile_set_info.x_pix * tile_set_info.y_pix) *
tile_set_info.tile_count;
tile_info = new TILE_HEADER [ tile_set_info.tile_count ];
- assert( tile_info != NULL );
+ assert( tile_info != 0 );
tile_data = new unsigned char [ tile_buffer_size ];
- assert( tile_data != NULL );
+ assert( tile_data != 0 );
fread( tile_info, tile_set_info.tile_count, sizeof(TILE_HEADER), infile );
fread( tile_data, tile_buffer_size, 1, infile );
- tile_set_loaded = _TRUE;
+ tile_set_loaded = true;
computeTileConsts();
@@ -156,32 +155,33 @@
void TileSet::loadTileSet( const char *file_path, WadMapTable &mapping_table )
{
- FILE *infile;
+ //FILE *infile;
unsigned long tile_buffer_size;
unsigned long tile_size;
int fhandle;
//infile = fopen( file_path, "rb" );
- fhandle = open( file_path, _O_BINARY );
+ // XXX changed _O_BINARY to 0...
+ fhandle = open( file_path, 0 );
- assert( infile != NULL );
+ //assert( infile != 0 );
- if ( tile_set_loaded == _TRUE )
+ if ( tile_set_loaded == true )
{
- if ( tile_data != NULL )
+ if ( tile_data != 0 )
{
delete( tile_data );
- tile_data = NULL;
+ tile_data = 0;
}
- if ( tile_info != NULL )
+ if ( tile_info != 0 )
{
delete( tile_info );
- tile_info = NULL;
+ tile_info = 0;
}
- tile_set_loaded = _FALSE;
+ tile_set_loaded = false;
}
// ** Read Header Info **
@@ -190,7 +190,7 @@
// ** Read in Tile Info **
tile_info = new TILE_HEADER [ mapping_table.used_tile_count ];
- assert( tile_info != NULL );
+ assert( tile_info != 0 );
unsigned short tile_count = 0;
unsigned long tile_index = 0;
@@ -203,7 +203,7 @@
for ( tile_index = 0; tile_index < tile_count; tile_index++ )
{
- if ( mapping_table[ tile_index ].is_used == _TRUE )
+ if ( mapping_table[ tile_index ].is_used == true )
{
read( fhandle, (tile_info + mapped_index), sizeof ( TILE_HEADER ) );
//fread( (tile_info + mapped_index), sizeof ( TILE_HEADER ), 1,
infile );
@@ -221,7 +221,7 @@
tile_size = (tile_set_info.x_pix * tile_set_info.y_pix);
tile_data = new unsigned char [ tile_buffer_size ];
- assert( tile_data != NULL );
+ assert( tile_data != 0 );
mapped_index = 0;
tile_index = 0;
@@ -232,7 +232,7 @@
unused_tile_count = 0;
//** find the next used tile
- while( (tile_index < tile_count) && (mapping_table[ tile_index
].is_used == _FALSE) )
+ while( (tile_index < tile_count) && (mapping_table[ tile_index
].is_used == false) )
{
unused_tile_count++;
tile_index++;
@@ -246,7 +246,7 @@
//fseek( infile, tile_size * unused_tile_count, SEEK_CUR );
}
- while( (tile_index < tile_count) && (mapping_table[ tile_index
].is_used == _TRUE) )
+ while( (tile_index < tile_count) && (mapping_table[ tile_index
].is_used == true) )
{
used_tile_count++;
tile_index++;
@@ -266,7 +266,7 @@
close(fhandle );
//fclose( infile );
- tile_set_loaded = _TRUE;
+ tile_set_loaded = true;
TileSet::tile_count = mapping_table.used_tile_count;
computeTileConsts();
@@ -276,29 +276,30 @@
void TileSet::loadTileSetInfo( const char *file_path, WadMapTable
&mapping_table )
{
- FILE *infile;
+ //FILE *infile;
int fhandle;
//infile = fopen( file_path, "rb" );
- fhandle = open( file_path, _O_BINARY );
+ // XXX changed _O_BINARY to 0
+ fhandle = open( file_path, 0);
- assert( infile != NULL );
+ //assert( infile != 0 );
- if ( tile_set_loaded == _TRUE )
+ if ( tile_set_loaded == true )
{
- if ( tile_data != NULL )
+ if ( tile_data != 0 )
{
delete( tile_data );
- tile_data = NULL;
+ tile_data = 0;
}
- if ( tile_info != NULL )
+ if ( tile_info != 0 )
{
delete( tile_info );
- tile_info = NULL;
+ tile_info = 0;
}
- tile_set_loaded = _FALSE;
+ tile_set_loaded = false;
}
// ** Read Header Info **
@@ -307,7 +308,7 @@
// ** Read in Tile Info **
tile_info = new TILE_HEADER [ mapping_table.used_tile_count ];
- assert( tile_info != NULL );
+ assert( tile_info != 0 );
unsigned short tile_count = 0;
unsigned long tile_index = 0;
@@ -317,7 +318,7 @@
for ( tile_index = 0; tile_index < tile_count; tile_index++ )
{
- if ( mapping_table[ tile_index ].is_used == _TRUE )
+ if ( mapping_table[ tile_index ].is_used == true )
{
read( fhandle, (tile_info + mapped_index), sizeof ( TILE_HEADER ) );
//fread( (tile_info + mapped_index), sizeof ( TILE_HEADER ), 1,
infile );
@@ -332,7 +333,7 @@
close(fhandle );
//fclose( infile );
- tile_set_loaded = _TRUE;
+ tile_set_loaded = true;
TileSet::tile_count = mapping_table.used_tile_count;
computeTileConsts();
@@ -340,29 +341,30 @@
-boolean TileSet::startPartitionTileSetLoad( const char *file_path, WadMapTable
&mapping_table, unsigned long partitions )
+bool TileSet::startPartitionTileSetLoad( const char *file_path, WadMapTable
&mapping_table, unsigned long partitions )
{
unsigned long tile_buffer_size;
unsigned long tile_size;
//int fhandle;
- partition_load_fhandle = open( file_path, _O_BINARY );
+ // XXX changed _O_BINARY to 0
+ partition_load_fhandle = open( file_path, 0 );
- if ( tile_set_loaded == _TRUE )
+ if ( tile_set_loaded == true )
{
- if ( tile_data != NULL )
+ if ( tile_data != 0 )
{
delete( tile_data );
- tile_data = NULL;
+ tile_data = 0;
}
- if ( tile_info != NULL )
+ if ( tile_info != 0 )
{
delete( tile_info );
- tile_info = NULL;
+ tile_info = 0;
}
- tile_set_loaded = _FALSE;
+ tile_set_loaded = false;
}
// ** Read Header Info **
@@ -371,7 +373,7 @@
// ** Read in Tile Info **
tile_info = new TILE_HEADER [ mapping_table.used_tile_count ];
- assert( tile_info != NULL );
+ assert( tile_info != 0 );
unsigned short tile_count = 0;
unsigned long tile_index = 0;
@@ -381,7 +383,7 @@
for ( tile_index = 0; tile_index < tile_count; tile_index++ )
{
- if ( mapping_table[ tile_index ].is_used == _TRUE )
+ if ( mapping_table[ tile_index ].is_used == true )
{
read( partition_load_fhandle, (tile_info + mapped_index), sizeof (
TILE_HEADER ) );
//fread( (tile_info + mapped_index), sizeof ( TILE_HEADER ), 1,
infile );
@@ -399,7 +401,7 @@
TileSet::tile_size = tile_size = (tile_set_info.x_pix * tile_set_info.y_pix);
tile_data = new unsigned char [ tile_buffer_size ];
- assert( tile_data != NULL );
+ assert( tile_data != 0 );
partition_load_tile_index = 0;
partition_load_mapped_index = 0;
@@ -409,18 +411,18 @@
partition_load_partition_count = tile_count;
int percent;
partitionTileSetLoad( mapping_table, &percent );
- return( _FALSE );
+ return( false );
}
else
{
partition_load_partition_count = tile_count / partitions;
- return( _TRUE );
+ return( true );
}
}
-boolean TileSet::partitionTileSetLoad( WadMapTable &mapping_table, int
*percent_complete )
+bool TileSet::partitionTileSetLoad( WadMapTable &mapping_table, int
*percent_complete )
{
unsigned long tile_count = getTileCount();
unsigned long partition_index = 0;
@@ -429,7 +431,7 @@
while( (partition_load_tile_index < tile_count) && (partition_index <
partition_load_partition_count) )
{
- if ( mapping_table[ partition_load_tile_index ].is_used == _TRUE )
+ if ( mapping_table[ partition_load_tile_index ].is_used == true )
{
read( partition_load_fhandle, (tile_data +
(partition_load_mapped_index*tile_size)), tile_size );
partition_load_mapped_index++;
@@ -446,13 +448,13 @@
if ( partition_load_tile_index == tile_count )
{
close( partition_load_fhandle );
- tile_set_loaded = _TRUE;
+ tile_set_loaded = true;
TileSet::tile_count = mapping_table.used_tile_count;
computeTileConsts();
*percent_complete = 100;
- return( _FALSE );
+ return( false );
}
else
{
@@ -461,6 +463,6 @@
*percent_complete = (int) percent;
partition_index = 0;
- return( _TRUE );
+ return( true );
}
}
Index: netpanzer/src/NetPanzer/Classes/TileSet.hpp
diff -u netpanzer/src/NetPanzer/Classes/TileSet.hpp:1.1
netpanzer/src/NetPanzer/Classes/TileSet.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/TileSet.hpp:1.1 Sun Dec 1 12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/TileSet.hpp Mon Sep 1 16:24:20 2003
@@ -18,7 +18,6 @@
#ifndef _TILESET_HPP
#define _TILESET_HPP
-#include "Aliasdef.h"
#include "PObject.hpp"
#include "TileSetStruct.hpp"
#include "WadMapTable.hpp"
@@ -26,7 +25,7 @@
class TileSet : virtual PObject
{
protected:
- boolean tile_set_loaded;
+ bool tile_set_loaded;
TILE_DBASE_HEADER tile_set_info;
TILE_HEADER *tile_info;
unsigned char *tile_data;
@@ -50,8 +49,8 @@
void loadTileSet( const char *file_path, WadMapTable &mapping_table );
- boolean startPartitionTileSetLoad( const char *file_path, WadMapTable
&mapping_table, unsigned long partitions );
- boolean partitionTileSetLoad( WadMapTable &mapping_table, int
*percent_complete );
+ bool startPartitionTileSetLoad( const char *file_path, WadMapTable
&mapping_table, unsigned long partitions );
+ bool partitionTileSetLoad( WadMapTable &mapping_table, int
*percent_complete );
void loadTileSet( const char *file_path );
Index: netpanzer/src/NetPanzer/Classes/Unit.cpp
diff -u netpanzer/src/NetPanzer/Classes/Unit.cpp:1.1
netpanzer/src/NetPanzer/Classes/Unit.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/Unit.cpp:1.1 Sun Dec 1 12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/Unit.cpp Mon Sep 1 16:24:20 2003
@@ -15,5 +15,4 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "Unit.hpp"
Index: netpanzer/src/NetPanzer/Classes/UnitBase.hpp
diff -u netpanzer/src/NetPanzer/Classes/UnitBase.hpp:1.1
netpanzer/src/NetPanzer/Classes/UnitBase.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/UnitBase.hpp:1.1 Sun Dec 1 12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/UnitBase.hpp Mon Sep 1 16:24:20 2003
@@ -30,7 +30,7 @@
public:
UnitID unit_id;
UnitState unit_state;
- boolean in_sync_flag;
+ bool in_sync_flag;
UnitBase() { }
virtual ~UnitBase() { }
Index: netpanzer/src/NetPanzer/Classes/UnitBlackBoard.cpp
diff -u netpanzer/src/NetPanzer/Classes/UnitBlackBoard.cpp:1.1
netpanzer/src/NetPanzer/Classes/UnitBlackBoard.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/UnitBlackBoard.cpp:1.1 Sun Dec 1
12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/UnitBlackBoard.cpp Mon Sep 1 16:24:20 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "UnitBlackBoard.hpp"
#include "MapInterface.hpp"
@@ -47,7 +46,7 @@
for( i = 0; i < y_limit; i++ )
for ( k = 0; k < x_limit; k++ )
{
- if ( unit_loc_map.getBit( k, i ) == _TRUE )
+ if ( unit_loc_map.getBit( k, i ) == true )
MapInterface::markLocHack( PointXYi( k, i ) );
}
Index: netpanzer/src/NetPanzer/Classes/UnitBlackBoard.hpp
diff -u netpanzer/src/NetPanzer/Classes/UnitBlackBoard.hpp:1.1
netpanzer/src/NetPanzer/Classes/UnitBlackBoard.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/UnitBlackBoard.hpp:1.1 Sun Dec 1
12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/UnitBlackBoard.hpp Mon Sep 1 16:24:20 2003
@@ -44,7 +44,7 @@
static void updateUnitLocs( void );
- static inline boolean unitOccupiesLoc( PointXYi &unit_map_loc )
+ static inline bool unitOccupiesLoc( PointXYi &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.1
netpanzer/src/NetPanzer/Classes/UnitBucketArray.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/UnitBucketArray.cpp:1.1 Sun Dec 1
12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/UnitBucketArray.cpp Mon Sep 1 16:24:20 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "UnitBucketArray.hpp"
UnitBucketArray::UnitBucketArray( )
@@ -157,7 +156,7 @@
traversal_ptr = array[ bucket_index ].getFront();
- while( traversal_ptr != NULL )
+ while( traversal_ptr != 0 )
{
if( traversal_ptr->index == unique_index )
return( (long) bucket_index );
@@ -182,7 +181,7 @@
traversal_ptr = array[ bucket_index ].getFront();
- while( traversal_ptr != NULL )
+ while( traversal_ptr != 0 )
{
if( traversal_ptr->index == unique_index )
return( traversal_ptr->unit );
@@ -191,7 +190,7 @@
}
}
- return( NULL );
+ return( 0 );
}
@@ -205,7 +204,7 @@
traversal_ptr = array[ bucket_index ].getFront();
- while( traversal_ptr != NULL )
+ while( traversal_ptr != 0 )
{
if( traversal_ptr->index == unique_index )
return( traversal_ptr->unit );
@@ -213,7 +212,7 @@
traversal_ptr = traversal_ptr->next;
}
- return( NULL );
+ return( 0 );
}
UnitBase * UnitBucketArray::getUnitAtWorldLoc( UnitID unit_id, PointXYi
world_loc )
@@ -232,7 +231,7 @@
traversal_ptr = array[ bucket_index ].getFront();
- while( traversal_ptr != NULL )
+ while( traversal_ptr != 0 )
{
if( traversal_ptr->index == unique_index )
return( traversal_ptr->unit );
@@ -240,7 +239,7 @@
traversal_ptr = traversal_ptr->next;
}
- return( NULL );
+ return( 0 );
}
UnitBase * UnitBucketArray::getUnitAtMapLoc( UnitID unit_id, PointXYi map_loc )
@@ -259,7 +258,7 @@
traversal_ptr = array[ bucket_index ].getFront();
- while( traversal_ptr != NULL )
+ while( traversal_ptr != 0 )
{
if( traversal_ptr->index == unique_index )
return( traversal_ptr->unit );
@@ -267,12 +266,12 @@
traversal_ptr = traversal_ptr->next;
}
- return( NULL );
+ return( 0 );
}
-boolean UnitBucketArray::moveUnit( UnitID unit_id, unsigned long
from_bucket_index, unsigned long to_bucket_index )
+bool UnitBucketArray::moveUnit( UnitID unit_id, unsigned long
from_bucket_index, unsigned long to_bucket_index )
{
- boolean found = _FALSE;
+ bool found = false;
UnitBucketPointer *traversal_ptr;
UnitBucketPointer *move_ptr;
unsigned long unique_index;
@@ -281,7 +280,7 @@
traversal_ptr = array[ from_bucket_index ].getFront();
- while( (traversal_ptr != NULL) && (found == _FALSE) )
+ while( (traversal_ptr != 0) && (found == false) )
{
if( traversal_ptr->index == unique_index )
{
@@ -289,7 +288,7 @@
traversal_ptr = traversal_ptr->next;
array[ from_bucket_index ].removeObject( move_ptr );
array[ to_bucket_index ].addFront( move_ptr );
- found = _TRUE;
+ found = true;
}
else
{
@@ -297,7 +296,7 @@
}
}
- if ( found == _FALSE )
+ if ( found == false )
{
from_bucket_index = getUnitBucketIndex( unit_id );
if( from_bucket_index != -1 )
@@ -305,13 +304,13 @@
return( moveUnit( unit_id, from_bucket_index, to_bucket_index ) );
}
else
- return( _FALSE );
+ return( false );
}
- return( _TRUE );
+ return( true );
}
-boolean UnitBucketArray::deleteUnitBucketPointer( UnitID unit_id, PointXYi
world_loc )
+bool UnitBucketArray::deleteUnitBucketPointer( UnitID unit_id, PointXYi
world_loc )
{
long bucket_index;
unsigned long unique_index;
@@ -324,16 +323,16 @@
traversal_ptr = array[ bucket_index ].getFront();
- while( traversal_ptr != NULL )
+ while( traversal_ptr != 0 )
{
if( traversal_ptr->index == unique_index )
{
array[ bucket_index ].deleteObject( traversal_ptr );
- return( _TRUE );
+ return( true );
}
traversal_ptr = traversal_ptr->next;
}
- return( _FALSE );
+ return( false );
}
Index: netpanzer/src/NetPanzer/Classes/UnitBucketArray.hpp
diff -u netpanzer/src/NetPanzer/Classes/UnitBucketArray.hpp:1.1
netpanzer/src/NetPanzer/Classes/UnitBucketArray.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/UnitBucketArray.hpp:1.1 Sun Dec 1
12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/UnitBucketArray.hpp Mon Sep 1 16:24:20 2003
@@ -33,16 +33,16 @@
UnitBucketPointer()
{
- unit = NULL;
- next = NULL;
- prev = NULL;
+ unit = 0;
+ next = 0;
+ prev = 0;
}
UnitBucketPointer( UnitBase *unit )
{
UnitBucketPointer::unit = unit;
- next = NULL;
- prev = NULL;
+ next = 0;
+ prev = 0;
}
UnitBucketPointer( UnitBase *unit, unsigned long index, unsigned long
player_index )
@@ -50,8 +50,8 @@
UnitBucketPointer::unit = unit;
UnitBucketPointer::index = index;
UnitBucketPointer::player_index = player_index;
- next = NULL;
- prev = NULL;
+ next = 0;
+ prev = 0;
}
UnitBucketPointer *next;
@@ -155,9 +155,9 @@
UnitBase * getUnitAtWorldLoc( UnitID unit_id, PointXYi world_loc );
UnitBase * getUnitAtMapLoc( UnitID unit_id, PointXYi map_loc );
- boolean moveUnit( UnitID unit_id, unsigned long from_bucket_index, unsigned
long to_bucket_index );
+ bool moveUnit( UnitID unit_id, unsigned long from_bucket_index, unsigned
long to_bucket_index );
- boolean deleteUnitBucketPointer( UnitID unit_id, PointXYi world_loc );
+ bool deleteUnitBucketPointer( UnitID unit_id, PointXYi world_loc );
};
Index: netpanzer/src/NetPanzer/Classes/UnitID.hpp
diff -u netpanzer/src/NetPanzer/Classes/UnitID.hpp:1.1
netpanzer/src/NetPanzer/Classes/UnitID.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/UnitID.hpp:1.1 Sun Dec 1 12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/UnitID.hpp Mon Sep 1 16:24:20 2003
@@ -27,58 +27,58 @@
unsigned short index;
unsigned short unique;
- inline void set( uchar 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( uchar player, unsigned short index )
+ inline void set( unsigned char player, unsigned short index )
{
UnitID::player = player;
UnitID::index = index;
}
- inline uchar getPlayer( void )
+ inline unsigned char getPlayer() const
{
return( player );
}
- inline unsigned short getIndex( void )
+ inline unsigned short getIndex() const
{
return( index );
}
- inline boolean operator==( UnitID Uid )
+ inline bool operator==( const UnitID& Uid ) const
{
if ( (player == Uid.player) && (index == Uid.index)
&& (unique == Uid.unique)
)
- return( _TRUE );
+ return( true );
- return( _FALSE );
+ return( false );
}
- inline boolean operator!=( UnitID Uid )
+ inline bool operator!=( const UnitID& Uid ) const
{
if ( (player != Uid.player) || (index != Uid.index)
|| (unique != Uid.unique)
)
- return( _TRUE );
+ return( true );
- return( _FALSE );
+ return( false );
}
- inline boolean playerEqual( UnitID Uid )
+ inline bool playerEqual( const UnitID& Uid ) const
{
if ( (player == Uid.player) )
- return( _TRUE );
+ return( true );
- return( _FALSE );
+ return( false );
}
- inline void operator=( UnitID Uid )
+ inline void operator=( const UnitID& Uid )
{
player = Uid.player;
index = Uid.index;
Index: netpanzer/src/NetPanzer/Classes/UnitList.cpp
diff -u netpanzer/src/NetPanzer/Classes/UnitList.cpp:1.1
netpanzer/src/NetPanzer/Classes/UnitList.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/UnitList.cpp:1.1 Sun Dec 1 12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/UnitList.cpp Mon Sep 1 16:24:20 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "UnitList.hpp"
UnitList::UnitList( unsigned long size )
@@ -31,32 +30,32 @@
contains = 0;
}
-boolean UnitList::addFirstFree( UnitBase *unit, unsigned long *new_index )
+bool UnitList::addFirstFree( UnitBase *unit, unsigned long *new_index )
{
- boolean found = _FALSE;
+ //bool found = false;
UnitPointer *unit_pointer;
UnitPointer *traversal_ptr;
if( contains == size )
{
- return( _FALSE );
+ return( false );
}
unit_pointer = new UnitPointer( unit );
- if ( front == NULL )
+ if ( front == 0 )
{
unit_pointer->index = 0;
*new_index = 0;
UnitPointerList::addFront( unit_pointer );
contains++;
- return( _TRUE );
+ return( true );
}
else
{
traversal_ptr = front;
- while( traversal_ptr->next != NULL )
+ while( traversal_ptr->next != 0 )
{
if( (traversal_ptr->next->index) > (traversal_ptr->index + 1) )
{
@@ -64,7 +63,7 @@
unit_pointer->index = *new_index;
UnitPointerList::insertAfter( traversal_ptr, unit_pointer );
contains++;
- return( _TRUE );
+ return( true );
}
traversal_ptr = traversal_ptr->next;
@@ -74,10 +73,10 @@
unit_pointer->index = *new_index;
UnitPointerList::insertAfter( traversal_ptr, unit_pointer );
contains++;
- return( _TRUE );
+ return( true );
} // ** else
- return( _FALSE );
+ return( false );
}
void UnitList::removeAll( void )
@@ -85,12 +84,12 @@
UnitPointer *traversal_ptr;
traversal_ptr = front;
- while( traversal_ptr != NULL )
+ while( traversal_ptr != 0 )
{
if ( contains > 0 )
contains--;
- traversal_ptr->unit = NULL;
+ traversal_ptr->unit = 0;
traversal_ptr = traversal_ptr->next;
} // ** while
@@ -104,7 +103,7 @@
if ( index == front->index )
{
- if( front->unit != NULL )
+ if( front->unit != 0 )
{ delete( front->unit ); }
UnitPointerList::deleteFront();
@@ -118,11 +117,11 @@
{
traversal_ptr = front;
- while( traversal_ptr->next != NULL )
+ while( traversal_ptr->next != 0 )
{
if( traversal_ptr->next->index == index )
{
- if( traversal_ptr->next->unit != NULL )
+ if( traversal_ptr->next->unit != 0 )
{ delete( traversal_ptr->next->unit ); }
UnitPointerList::deleteAfter( traversal_ptr );
@@ -163,9 +162,9 @@
traversal_ptr = front;
- while( traversal_ptr != NULL )
+ while( traversal_ptr != 0 )
{
- if( traversal_ptr->unit != NULL )
+ if( traversal_ptr->unit != 0 )
{ delete( traversal_ptr->unit ); }
traversal_ptr = traversal_ptr->next;
Index: netpanzer/src/NetPanzer/Classes/UnitList.hpp
diff -u netpanzer/src/NetPanzer/Classes/UnitList.hpp:1.1
netpanzer/src/NetPanzer/Classes/UnitList.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/UnitList.hpp:1.1 Sun Dec 1 12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/UnitList.hpp Mon Sep 1 16:24:20 2003
@@ -18,8 +18,6 @@
#ifndef _UNITLIST_HPP
#define _UNITLIST_HPP
-
-
#include "PArray.hpp"
#include "UnitBase.hpp"
#include "UnitID.hpp"
@@ -31,12 +29,12 @@
UnitBase *unit;
unsigned long index;
- UnitPointer() { unit = NULL; next = NULL; }
+ UnitPointer() { unit = 0; next = 0; }
UnitPointer( UnitBase *unit )
{
UnitPointer::unit = unit;
- next = NULL;
+ next = 0;
}
UnitPointer *next;
@@ -70,7 +68,7 @@
traversal_ptr = front;
- while( (traversal_ptr != NULL) )
+ while( (traversal_ptr != 0) )
{
if ( traversal_ptr->index == index )
return( traversal_ptr );
@@ -78,7 +76,7 @@
traversal_ptr = traversal_ptr->next;
}
- return( NULL );
+ return( 0 );
}
@@ -102,7 +100,7 @@
unit_pointer->index = index;
- if( front == NULL )
+ if( front == 0 )
{
UnitPointerList::addFront( unit_pointer );
contains++;
@@ -120,11 +118,11 @@
{
traversal_ptr = front;
- while( traversal_ptr != NULL )
+ while( traversal_ptr != 0 )
{
if( index >= traversal_ptr->index )
{
- if( (traversal_ptr->next != NULL) )
+ if( (traversal_ptr->next != 0) )
{
if ( (index <= traversal_ptr->next->index ) )
{
@@ -150,7 +148,7 @@
return;
}
- inline boolean isValid( unsigned long index )
+ inline bool isValid( unsigned long index )
{
UnitPointer *traversal_ptr;
@@ -158,18 +156,18 @@
traversal_ptr = front;
- while( (traversal_ptr != NULL) )
+ while( (traversal_ptr != 0) )
{
if ( traversal_ptr->index == index )
- return( _TRUE );
+ return( true );
traversal_ptr = traversal_ptr->next;
}
- return( _FALSE );
+ return( false );
}
- inline boolean isValid( UnitID &unitID )
+ inline bool isValid( const UnitID &unitID ) const
{
unsigned long index = unitID.getIndex();
UnitPointer *traversal_ptr;
@@ -177,18 +175,18 @@
traversal_ptr = front;
- while( (traversal_ptr != NULL) )
+ while( (traversal_ptr != 0) )
{
if ( traversal_ptr->index == index )
- return( _TRUE );
+ return( true );
traversal_ptr = traversal_ptr->next;
}
- return( _FALSE );
+ return( false );
}
- inline void add( UnitBase *unit, UnitID &unitID )
+ inline void add( UnitBase *unit, const UnitID &unitID )
{
unsigned long index;
index = unitID.getIndex();
@@ -205,14 +203,14 @@
inline UnitBase * incIterator( UnitPointer **iterator )
{
UnitBase *unit;
- if( (*iterator) != NULL )
+ if( (*iterator) != 0 )
{
unit = (*iterator)->unit;
*iterator = (*iterator)->next;
return( unit );
}
else
- { return( NULL ); }
+ { return( 0 ); }
}
@@ -220,14 +218,14 @@
{
UnitPointer *unit_pointer;
- if( (*iterator) != NULL )
+ if( (*iterator) != 0 )
{
unit_pointer = (*iterator);
(*iterator) = (*iterator)->next;
return( unit_pointer );
}
else
- { return( NULL ); }
+ { return( 0 ); }
}
inline void resetIterator( UnitPointer **iterator )
@@ -240,34 +238,34 @@
(*iterator) = 0;
}
- inline UnitBase * incIteratorAsync( unsigned long *iterator, boolean
*completed )
+ inline UnitBase * incIteratorAsync( unsigned long *iterator, bool *completed
)
{
UnitPointer *traversal_ptr;
traversal_ptr = front;
- while( (traversal_ptr != NULL) )
+ while( (traversal_ptr != 0) )
{
if ( traversal_ptr->index >= (*iterator) )
{
- if ( traversal_ptr->next != NULL )
+ if ( traversal_ptr->next != 0 )
{ (*iterator) = traversal_ptr->next->index; }
else
{ (*iterator)++; }
- (*completed) = _FALSE;
+ (*completed) = false;
return( traversal_ptr->unit );
}
traversal_ptr = traversal_ptr->next;
}
- (*completed) = _TRUE;
- return( NULL );
+ (*completed) = true;
+ return( 0 );
}
- boolean addFirstFree( UnitBase *unit, unsigned long *new_index );
+ bool addFirstFree( UnitBase *unit, unsigned long *new_index );
inline UnitBase * remove( unsigned long index )
{
@@ -277,7 +275,7 @@
traversal_ptr = front;
- while( traversal_ptr != NULL )
+ while( traversal_ptr != 0 )
{
if ( traversal_ptr->index == index )
{
@@ -285,17 +283,17 @@
contains--;
unit = traversal_ptr->unit;
- traversal_ptr->unit = NULL;
+ traversal_ptr->unit = 0;
return( unit );
}
traversal_ptr = traversal_ptr->next;
} // ** while
- return( NULL );
+ return( 0 );
}
- inline UnitBase * remove( UnitID &unitID )
+ inline UnitBase * remove( const UnitID &unitID )
{
unsigned long index;
index = unitID.getIndex();
@@ -305,10 +303,10 @@
void removeAll( void );
- inline unsigned long getSize( void )
+ inline unsigned long getSize( void ) const
{ return( size ); }
- inline unsigned long containsItems( void )
+ inline unsigned long containsItems( void ) const
{ return( contains ); }
void dispose( unsigned long index );
Index: netpanzer/src/NetPanzer/Classes/UnitMessage.cpp
diff -u netpanzer/src/NetPanzer/Classes/UnitMessage.cpp:1.1
netpanzer/src/NetPanzer/Classes/UnitMessage.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/UnitMessage.cpp:1.1 Sun Dec 1 12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/UnitMessage.cpp Mon Sep 1 16:24:20 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "UnitMessage.hpp"
UnitMessage::UnitMessage( UnitID unit_id, unsigned char flags )
Index: netpanzer/src/NetPanzer/Classes/UnitMessage.hpp
diff -u netpanzer/src/NetPanzer/Classes/UnitMessage.hpp:1.1
netpanzer/src/NetPanzer/Classes/UnitMessage.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/UnitMessage.hpp:1.1 Sun Dec 1 12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/UnitMessage.hpp Mon Sep 1 16:24:20 2003
@@ -18,8 +18,6 @@
#ifndef _UNITMESSAGE_HPP
#define _UNITMESSAGE_HPP
-#include "aliasdef.h"
-
#include "PObject.hpp"
#include "UnitID.hpp"
@@ -58,12 +56,12 @@
message_flags = flags;
}
- inline boolean isFlagged( unsigned char flags )
+ inline bool isFlagged( unsigned char flags )
{
if ( (flags & message_flags) == flags )
- return( _TRUE );
+ return( true );
- return( _FALSE );
+ return( false );
}
};
Index: netpanzer/src/NetPanzer/Classes/UnitMessageTypes.hpp
diff -u netpanzer/src/NetPanzer/Classes/UnitMessageTypes.hpp:1.1
netpanzer/src/NetPanzer/Classes/UnitMessageTypes.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/UnitMessageTypes.hpp:1.1 Sun Dec 1
12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/UnitMessageTypes.hpp Mon Sep 1
16:24:20 2003
@@ -123,11 +123,11 @@
{
public:
unsigned char request_type;
- boolean allie_flag_visiblity;
- boolean flag_visiblity;
- boolean allied_state;
+ bool allie_flag_visiblity;
+ bool flag_visiblity;
+ bool allied_state;
- void set( unsigned char request, boolean state_value )
+ void set( unsigned char request, bool state_value )
{
message_id = _umesg_update_select_box_info;
request_type = request;
Index: netpanzer/src/NetPanzer/Classes/UnitOpcodeEncoder.cpp
diff -u netpanzer/src/NetPanzer/Classes/UnitOpcodeEncoder.cpp:1.1
netpanzer/src/NetPanzer/Classes/UnitOpcodeEncoder.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/UnitOpcodeEncoder.cpp:1.1 Sun Dec 1
12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/UnitOpcodeEncoder.cpp Mon Sep 1
16:24:20 2003
@@ -15,13 +15,12 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "UnitOpcodeEncoder.hpp"
#include "Server.hpp"
#include "NetworkState.hpp"
-#include "Codewiz.hpp"
+#include "codewiz.hpp"
#include "ConsoleInterface.hpp"
void UnitOpcodeEncoder::initialize( int send_method )
@@ -75,12 +74,12 @@
current_decode_opcode = 0;
}
-boolean UnitOpcodeEncoder::decodeMessage( UnitOpcodeStruct *opcode )
+bool UnitOpcodeEncoder::decodeMessage( UnitOpcodeStruct *opcode )
{
unsigned char *current_code_ptr;
if ( current_decode_opcode == decode_message.opcode_count )
- return ( _FALSE );
+ return ( false );
current_code_ptr = ( (unsigned char *) &decode_message.data)
+ sizeof(UnitOpcodeStruct)*current_decode_opcode;
@@ -90,7 +89,7 @@
current_decode_opcode++;
NetworkState::incOpcodesReceived();
- return( _TRUE );
+ return( true );
}
void UnitOpcodeEncoder::sendOpcodeMessage( void )
Index: netpanzer/src/NetPanzer/Classes/UnitOpcodeEncoder.hpp
diff -u netpanzer/src/NetPanzer/Classes/UnitOpcodeEncoder.hpp:1.1
netpanzer/src/NetPanzer/Classes/UnitOpcodeEncoder.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/UnitOpcodeEncoder.hpp:1.1 Sun Dec 1
12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/UnitOpcodeEncoder.hpp Mon Sep 1
16:24:20 2003
@@ -40,7 +40,7 @@
void encodeOpcode( UnitOpcode *opcode );
void setDecodeMessage( UnitOpcodeMessage *message );
- boolean decodeMessage( UnitOpcodeStruct *opcode );
+ bool decodeMessage( UnitOpcodeStruct *opcode );
void sendOpcodeMessage( void );
};
Index: netpanzer/src/NetPanzer/Classes/UnitOpcodes.hpp
diff -u netpanzer/src/NetPanzer/Classes/UnitOpcodes.hpp:1.1
netpanzer/src/NetPanzer/Classes/UnitOpcodes.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/UnitOpcodes.hpp:1.1 Sun Dec 1 12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/UnitOpcodes.hpp Mon Sep 1 16:24:20 2003
@@ -23,10 +23,11 @@
enum { _unit_opcode_flag_sync = 0x01 };
+#ifdef MSVC
#pragma pack(1)
+#endif
-typedef
- struct
+struct UnitOpcodeStruct
{
unsigned char opcode;
unsigned char player_index;
@@ -34,7 +35,7 @@
unsigned char flags;
unsigned char op_data[7];
- } UnitOpcodeStruct;
+ } __attribute__((packed));
typedef QueueTemplate< UnitOpcodeStruct > UnitOpcodeQueue;
@@ -46,7 +47,7 @@
unsigned char player_index;
unsigned short unit_index;
unsigned char flags;
- };
+ } __attribute__((packed));
#define _UNIT_OPCODE_MOVE 1
@@ -64,7 +65,7 @@
opcode = _UNIT_OPCODE_MOVE;
}
- };
+ } __attribute__((packed));
#define _UNIT_OPCODE_TURRET_TRACK_POINT 2
@@ -73,7 +74,7 @@
public:
unsigned short x;
unsigned short y;
- boolean activate;
+ bool activate;
unsigned char pad[2];
TurretTrackPointOpcode( )
@@ -82,7 +83,7 @@
opcode = _UNIT_OPCODE_TURRET_TRACK_POINT;
}
- };
+ } __attribute__((packed));
#define _UNIT_OPCODE_TURRET_TRACK_TARGET 3
@@ -91,7 +92,7 @@
public:
unsigned char target_player_index;
unsigned short target_unit_index;
- boolean activate;
+ bool activate;
unsigned char pad[3];
@@ -101,7 +102,7 @@
opcode = _UNIT_OPCODE_TURRET_TRACK_TARGET;
}
- };
+ } __attribute__((packed));
#define _UNIT_OPCODE_FIRE_WEAPON 4
@@ -117,7 +118,7 @@
flags = 0;
opcode = _UNIT_OPCODE_FIRE_WEAPON;
}
- };
+ } __attribute__((packed));
#define _UNIT_OPCODE_SYNC_UNIT 5
@@ -132,8 +133,8 @@
opcode = _UNIT_OPCODE_SYNC_UNIT;
}
- };
-
+ } __attribute__((packed));
+
#define _UNIT_OPCODE_UPDATE_STATE 6
class UpdateStateUnitOpcode : public UnitOpcode
@@ -148,7 +149,7 @@
opcode = _UNIT_OPCODE_UPDATE_STATE;
}
- };
+ } __attribute__((packed));
#define _UNIT_OPCODE_DESTRUCT 7
@@ -163,9 +164,10 @@
opcode = _UNIT_OPCODE_DESTRUCT;
}
- };
-
+ } __attribute__((packed));
+#ifdef MSVC
#pragma pack()
+#endif
#endif
Index: netpanzer/src/NetPanzer/Classes/UnitPowerUp.cpp
diff -u netpanzer/src/NetPanzer/Classes/UnitPowerUp.cpp:1.1
netpanzer/src/NetPanzer/Classes/UnitPowerUp.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/UnitPowerUp.cpp:1.1 Sun Dec 1 12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/UnitPowerUp.cpp Mon Sep 1 16:24:20 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "UnitPowerUp.hpp"
#include <stdlib.h>
@@ -255,7 +254,7 @@
{
if ( powerup_state.life_cycle_state == _power_up_lifecycle_state_active )
{
- if( isPowerUpHit( &unit_id ) == _TRUE )
+ if( isPowerUpHit( &unit_id ) == true )
{
selectPowerUp( unit_id );
}
Index: netpanzer/src/NetPanzer/Classes/UnitPowerUp.hpp
diff -u netpanzer/src/NetPanzer/Classes/UnitPowerUp.hpp:1.1
netpanzer/src/NetPanzer/Classes/UnitPowerUp.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/UnitPowerUp.hpp:1.1 Sun Dec 1 12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/UnitPowerUp.hpp Mon Sep 1 16:24:20 2003
@@ -48,6 +48,8 @@
public:
UnitPowerUp(PointXYi map_loc, int type);
+ virtual ~UnitPowerUp()
+ { }
virtual void updateState( void );
Index: netpanzer/src/NetPanzer/Classes/UnitState.cpp
diff -u netpanzer/src/NetPanzer/Classes/UnitState.cpp:1.1
netpanzer/src/NetPanzer/Classes/UnitState.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/UnitState.cpp:1.1 Sun Dec 1 12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/UnitState.cpp Mon Sep 1 16:24:20 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "UnitState.hpp"
UnitState::UnitState()
@@ -27,7 +26,7 @@
bbox.setBounds( PointXYi( -25, -15 ), PointXYi( 25, 35 ) );
- select = _FALSE;
+ select = false;
orientation = 0;
speed_rate = 20;
speed_factor = 2;
Index: netpanzer/src/NetPanzer/Classes/UnitState.hpp
diff -u netpanzer/src/NetPanzer/Classes/UnitState.hpp:1.1
netpanzer/src/NetPanzer/Classes/UnitState.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/UnitState.hpp:1.1 Sun Dec 1 12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/UnitState.hpp Mon Sep 1 16:24:20 2003
@@ -18,7 +18,6 @@
#ifndef _UNITSTATE_HPP
#define _UNITSTATE_HPP
-#include "aliasdef.h"
#include "PObject.hpp"
#include "BoundBox.hpp"
#include "Point.hpp"
@@ -38,7 +37,7 @@
unsigned char unit_type;
- boolean select;
+ bool select;
PointXYi location;
BoundBox bbox;
@@ -64,7 +63,7 @@
UnitState( );
- inline boolean bounds( PointXYi &loc )
+ inline bool bounds( PointXYi &loc )
{
return( bbox.bounds( location, loc ) );
}
Index: netpanzer/src/NetPanzer/Classes/Units/Abrams.cpp
diff -u netpanzer/src/NetPanzer/Classes/Units/Abrams.cpp:1.1
netpanzer/src/NetPanzer/Classes/Units/Abrams.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/Units/Abrams.cpp:1.1 Sun Dec 1
12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/Units/Abrams.cpp Mon Sep 1 16:24:20 2003
@@ -15,10 +15,9 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "Abrams.hpp"
#include "UnitProfileInterface.hpp"
-#include "gdatstct.hpp"
+#include "Gdatstct.hpp"
#include "Color.hpp"
#include "ProjectileInterface.hpp"
#include "NetworkState.hpp"
@@ -49,7 +48,7 @@
{
setUnitProperties();
- if ( color == _FALSE)
+ if ( color == false)
{
body_anim.setData( gAbramsBody );
turret_anim.setData( gAbramsTurret );
@@ -70,7 +69,7 @@
turret_anim_shadow.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer);
select_info_box.setBoxAttributes( BoundBox( -30, -30, 30, 30), Color::blue );
- select_info_box.setBoxState( _FALSE );
+ select_info_box.setBoxState( false );
select_info_box.setFlag( flag );
body_anim_shadow.attachSprite( &body_anim, PointXYi(0,0) );
Index: netpanzer/src/NetPanzer/Classes/Units/Archer.cpp
diff -u netpanzer/src/NetPanzer/Classes/Units/Archer.cpp:1.1
netpanzer/src/NetPanzer/Classes/Units/Archer.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/Units/Archer.cpp:1.1 Sun Dec 1
12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/Units/Archer.cpp Mon Sep 1 16:24:20 2003
@@ -15,10 +15,9 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "Archer.hpp"
#include "UnitProfileInterface.hpp"
-#include "gdatstct.hpp"
+#include "Gdatstct.hpp"
#include "Color.hpp"
#include "ProjectileInterface.hpp"
#include "NetworkState.hpp"
@@ -48,7 +47,7 @@
{
setUnitProperties();
- if ( color == _FALSE )
+ if ( color == false )
{
body_anim.setData( gArcherBody );
turret_anim.setData( gArcherTurret );
@@ -68,7 +67,7 @@
turret_anim_shadow.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer );
select_info_box.setBoxAttributes( BoundBox( -20, -20, 20, 20), Color::blue );
- select_info_box.setBoxState( _FALSE );
+ select_info_box.setBoxState( false );
select_info_box.setFlag( flag );
body_anim_shadow.attachSprite( &body_anim, PointXYi(0,0) );
Index: netpanzer/src/NetPanzer/Classes/Units/Hammerhead.cpp
diff -u netpanzer/src/NetPanzer/Classes/Units/Hammerhead.cpp:1.1
netpanzer/src/NetPanzer/Classes/Units/Hammerhead.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/Units/Hammerhead.cpp:1.1 Sun Dec 1
12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/Units/Hammerhead.cpp Mon Sep 1
16:24:20 2003
@@ -15,10 +15,9 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "Hammerhead.hpp"
#include "UnitProfileInterface.hpp"
-#include "gdatstct.hpp"
+#include "Gdatstct.hpp"
#include "Color.hpp"
#include "ProjectileInterface.hpp"
#include "NetworkState.hpp"
@@ -48,7 +47,7 @@
{
setUnitProperties();
- if ( color == _FALSE )
+ if ( color == false )
{
body_anim.setData( gHammerheadBody );
turret_anim.setData( gHammerheadTurret );
@@ -68,7 +67,7 @@
turret_anim_shadow.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer );
select_info_box.setBoxAttributes( BoundBox( -20, -20, 20, 20), Color::blue );
- select_info_box.setBoxState( _FALSE );
+ select_info_box.setBoxState( false );
select_info_box.setFlag( flag );
body_anim_shadow.attachSprite( &body_anim, PointXYi(0,0) );
Index: netpanzer/src/NetPanzer/Classes/Units/Humvee.cpp
diff -u netpanzer/src/NetPanzer/Classes/Units/Humvee.cpp:1.1
netpanzer/src/NetPanzer/Classes/Units/Humvee.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/Units/Humvee.cpp:1.1 Sun Dec 1
12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/Units/Humvee.cpp Mon Sep 1 16:24:20 2003
@@ -15,10 +15,9 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "Humvee.hpp"
#include "UnitProfileInterface.hpp"
-#include "gdatstct.hpp"
+#include "Gdatstct.hpp"
#include "Color.hpp"
#include "ProjectileInterface.hpp"
#include "NetworkState.hpp"
@@ -54,7 +53,7 @@
{
body_anim_shadow.setWorldPos( unit_state.location);
- if ( sorter.cullSprite( body_anim_shadow ) == _FALSE )
+ if ( sorter.cullSprite( body_anim_shadow ) == false )
{
body_anim.setWorldPos( unit_state.location );
body_anim.setFrame( unit_state.body_angle.angle_int );
@@ -77,7 +76,7 @@
{
setUnitProperties();
- if ( color == _FALSE)
+ if ( color == false)
{
body_anim.setData( gSpahPanzerBody );
turret_anim.setData( gSpahPanzerTurret );
@@ -98,7 +97,7 @@
turret_anim_shadow.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer);
select_info_box.setBoxAttributes( BoundBox( -20, -20, 20, 20), Color::blue );
- select_info_box.setBoxState( _FALSE );
+ select_info_box.setBoxState( false );
select_info_box.setFlag( flag );
body_anim_shadow.attachSprite( &body_anim, PointXYi(0,0) );
Index: netpanzer/src/NetPanzer/Classes/Units/Leopard.cpp
diff -u netpanzer/src/NetPanzer/Classes/Units/Leopard.cpp:1.1
netpanzer/src/NetPanzer/Classes/Units/Leopard.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/Units/Leopard.cpp:1.1 Sun Dec 1
12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/Units/Leopard.cpp Mon Sep 1 16:24:20 2003
@@ -15,10 +15,9 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "Leopard.hpp"
#include "UnitProfileInterface.hpp"
-#include "gdatstct.hpp"
+#include "Gdatstct.hpp"
#include "Color.hpp"
#include "ProjectileInterface.hpp"
#include "NetworkState.hpp"
@@ -49,7 +48,7 @@
{
setUnitProperties();
- if ( color == _FALSE)
+ if ( color == false)
{
body_anim.setData( gLeopardBody );
turret_anim.setData( gLeopardTurret );
@@ -70,7 +69,7 @@
turret_anim_shadow.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer );
select_info_box.setBoxAttributes( BoundBox( -25, -25, 25, 25), Color::blue );
- select_info_box.setBoxState( _FALSE );
+ select_info_box.setBoxState( false );
select_info_box.setFlag( flag );
body_anim_shadow.attachSprite( &body_anim, PointXYi(0,0) );
Index: netpanzer/src/NetPanzer/Classes/Units/Lynx.cpp
diff -u netpanzer/src/NetPanzer/Classes/Units/Lynx.cpp:1.1
netpanzer/src/NetPanzer/Classes/Units/Lynx.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/Units/Lynx.cpp:1.1 Sun Dec 1 12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/Units/Lynx.cpp Mon Sep 1 16:24:20 2003
@@ -15,10 +15,9 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "Lynx.hpp"
#include "UnitProfileInterface.hpp"
-#include "gdatstct.hpp"
+#include "Gdatstct.hpp"
#include "Color.hpp"
#include "ProjectileInterface.hpp"
#include "NetworkState.hpp"
@@ -49,7 +48,7 @@
{
setUnitProperties();
- if ( color == _FALSE)
+ if ( color == false)
{
body_anim.setData( gLynxBody );
turret_anim.setData( gLynxTurret );
@@ -70,7 +69,7 @@
turret_anim_shadow.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer );
select_info_box.setBoxAttributes( BoundBox( -30, -30, 30, 30), Color::blue );
- select_info_box.setBoxState( _FALSE );
+ select_info_box.setBoxState( false );
select_info_box.setFlag( flag );
body_anim_shadow.attachSprite( &body_anim, PointXYi(0,0) );
Index: netpanzer/src/NetPanzer/Classes/Units/M109.cpp
diff -u netpanzer/src/NetPanzer/Classes/Units/M109.cpp:1.1
netpanzer/src/NetPanzer/Classes/Units/M109.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/Units/M109.cpp:1.1 Sun Dec 1 12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/Units/M109.cpp Mon Sep 1 16:24:20 2003
@@ -15,10 +15,9 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "M109.hpp"
#include "UnitProfileInterface.hpp"
-#include "gdatstct.hpp"
+#include "Gdatstct.hpp"
#include "Color.hpp"
#include "ProjectileInterface.hpp"
#include "NetworkState.hpp"
@@ -49,7 +48,7 @@
{
setUnitProperties();
- if ( color == _FALSE)
+ if ( color == false)
{
body_anim.setData( gM109Body );
turret_anim.setData( gM109Turret );
@@ -69,7 +68,7 @@
turret_anim_shadow.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer);
select_info_box.setBoxAttributes( BoundBox( -30, -30, 30, 30), Color::blue );
- select_info_box.setBoxState( _FALSE );
+ select_info_box.setBoxState( false );
select_info_box.setFlag( flag );
body_anim_shadow.attachSprite( &body_anim, PointXYi(0,0) );
Index: netpanzer/src/NetPanzer/Classes/Units/Scorpion.cpp
diff -u netpanzer/src/NetPanzer/Classes/Units/Scorpion.cpp:1.1
netpanzer/src/NetPanzer/Classes/Units/Scorpion.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/Units/Scorpion.cpp:1.1 Sun Dec 1
12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/Units/Scorpion.cpp Mon Sep 1 16:24:20 2003
@@ -15,10 +15,9 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "Scorpion.hpp"
#include "UnitProfileInterface.hpp"
-#include "gdatstct.hpp"
+#include "Gdatstct.hpp"
#include "Color.hpp"
#include "ProjectileInterface.hpp"
#include "NetworkState.hpp"
@@ -49,7 +48,7 @@
{
setUnitProperties();
- if ( color == _FALSE)
+ if ( color == false)
{
body_anim.setData( gScorpionBody );
turret_anim.setData( gScorpionTurret );
@@ -69,7 +68,7 @@
turret_anim_shadow.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer );
select_info_box.setBoxAttributes( BoundBox( -30, -30, 30, 30), Color::blue );
- select_info_box.setBoxState( _FALSE );
+ select_info_box.setBoxState( false );
select_info_box.setFlag( flag );
body_anim_shadow.attachSprite( &body_anim, PointXYi(0,0) );
Index: netpanzer/src/NetPanzer/Classes/Units/SpahPanzer.cpp
diff -u netpanzer/src/NetPanzer/Classes/Units/SpahPanzer.cpp:1.1
netpanzer/src/NetPanzer/Classes/Units/SpahPanzer.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/Units/SpahPanzer.cpp:1.1 Sun Dec 1
12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/Units/SpahPanzer.cpp Mon Sep 1
16:24:20 2003
@@ -15,10 +15,9 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "SpahPanzer.hpp"
#include "UnitProfileInterface.hpp"
-#include "gdatstct.hpp"
+#include "Gdatstct.hpp"
#include "Color.hpp"
#include "ProjectileInterface.hpp"
#include "NetworkState.hpp"
@@ -49,7 +48,7 @@
{
setUnitProperties();
- if ( color == _FALSE)
+ if ( color == false)
{
body_anim.setData( gBearBody );
turret_anim.setData( gBearTurret );
@@ -70,7 +69,7 @@
turret_anim_shadow.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer );
select_info_box.setBoxAttributes( BoundBox( -30, -30, 30, 30), Color::blue );
- select_info_box.setBoxState( _FALSE );
+ select_info_box.setBoxState( false );
select_info_box.setFlag( flag );
body_anim_shadow.attachSprite( &body_anim, PointXYi(0,0) );
Index: netpanzer/src/NetPanzer/Classes/Units/UnitGlobals.cpp
diff -u netpanzer/src/NetPanzer/Classes/Units/UnitGlobals.cpp:1.1
netpanzer/src/NetPanzer/Classes/Units/UnitGlobals.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/Units/UnitGlobals.cpp:1.1 Sun Dec 1
12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/Units/UnitGlobals.cpp Mon Sep 1
16:24:20 2003
@@ -15,8 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
-
#include "UnitGlobals.hpp"
#include "Palette.hpp"
#include "Surface.hpp"
Index: netpanzer/src/NetPanzer/Classes/Units/Valentine.cpp
diff -u netpanzer/src/NetPanzer/Classes/Units/Valentine.cpp:1.1
netpanzer/src/NetPanzer/Classes/Units/Valentine.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/Units/Valentine.cpp:1.1 Sun Dec 1
12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/Units/Valentine.cpp Mon Sep 1 16:24:20 2003
@@ -15,10 +15,9 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "Valentine.hpp"
#include "UnitProfileInterface.hpp"
-#include "gdatstct.hpp"
+#include "Gdatstct.hpp"
#include "Color.hpp"
#include "ProjectileInterface.hpp"
#include "NetworkState.hpp"
@@ -49,7 +48,7 @@
{
setUnitProperties();
- if ( color == _FALSE)
+ if ( color == false)
{
body_anim.setData( gValentineBody );
turret_anim.setData( gValentineTurret );
@@ -71,7 +70,7 @@
turret_anim_shadow.setAttrib( PointXYi(0,0), PointXYi(0,0), unitLayer );
select_info_box.setBoxAttributes( BoundBox( -20, -20, 20, 20), Color::blue );
- select_info_box.setBoxState( _FALSE );
+ select_info_box.setBoxState( false );
select_info_box.setFlag( flag );
body_anim_shadow.attachSprite( &body_anim, PointXYi(0,0) );
Index: netpanzer/src/NetPanzer/Classes/Units/Vehicle.cpp
diff -u netpanzer/src/NetPanzer/Classes/Units/Vehicle.cpp:1.1
netpanzer/src/NetPanzer/Classes/Units/Vehicle.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/Units/Vehicle.cpp:1.1 Sun Dec 1
12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/Units/Vehicle.cpp Mon Sep 1 16:24:20 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "Vehicle.hpp"
#include <string.h>
@@ -31,7 +30,7 @@
#include "DDHardSurface.hpp"
#include "GameConfig.hpp"
-#include "CodeWiz.hpp"
+#include "codewiz.hpp"
#include "ConsoleInterface.hpp"
#include "ParticleInterface.hpp"
@@ -54,17 +53,17 @@
unit_state_timer.changeRate( 10 );
setAiFsmDefendHold();
reload_counter = 0;
- critical_ai_section = _FALSE;
- ai_fsm_transition_complete = _FALSE;
- pending_AI_comm = _FALSE;
+ critical_ai_section = false;
+ ai_fsm_transition_complete = false;
+ pending_AI_comm = false;
unit_state.lifecycle_state = _UNIT_LIFECYCLE_ACTIVE;
external_ai_event = _external_event_null;
- memset( fsm_active_list, 0, sizeof( boolean ) * 7 );
+ memset( fsm_active_list, 0, sizeof( bool ) * 7 );
opcode_queue.initialize( 25 );
move_opcode_queue.initialize( 25 );
- in_sync_flag = _TRUE;
+ in_sync_flag = true;
body_anim_shadow.setDrawModeBlend(&Palette::colorTableDarkenALot);
turret_anim_shadow.setDrawModeBlend(&Palette::colorTableDarkenALot);
@@ -224,7 +223,7 @@
fsmBodyRotate_goal_angle = goal_angle;
}
-boolean Vehicle::fsmBodyRotate( void )
+bool Vehicle::fsmBodyRotate( void )
{
if( unit_state.body_angle.angle_int != fsmBodyRotate_goal_angle )
{
@@ -239,10 +238,10 @@
}
else
{
- return( _TRUE ); // goal direction achieved
+ return( true ); // goal direction achieved
}
- return( _FALSE );
+ return( false );
}
void Vehicle::setFsmTurretRotate( long goal_angle, unsigned short rotation )
@@ -251,7 +250,7 @@
fsmTurretRotate_goal_angle = goal_angle;
}
-boolean Vehicle::fsmTurretRotate( void )
+bool Vehicle::fsmTurretRotate( void )
{
if( unit_state.turret_angle.angle_int != fsmTurretRotate_goal_angle )
{
@@ -266,10 +265,10 @@
}
else
{
- return( _TRUE ); // goal direction achieved
+ return( true ); // goal direction achieved
}
- return( _FALSE );
+ return( false );
}
@@ -284,19 +283,19 @@
interpolation_speed = unit_state.speed_rate * unit_state.speed_factor;
if ( NetworkState::status == _network_state_client )
{ interpolation_speed += 2; }
- fsmMove_first_stamp = _TRUE;
+ fsmMove_first_stamp = true;
*/
}
-boolean Vehicle::fsmMove( void )
+bool Vehicle::fsmMove( void )
{
/*
long move_offset;
- if( fsmMove_first_stamp == _TRUE )
+ if( fsmMove_first_stamp == true )
{
start_move_stamp = now();
- fsmMove_first_stamp = _FALSE;
+ fsmMove_first_stamp = false;
}
end_move_stamp = now();
@@ -331,12 +330,12 @@
if( fsmMove_moves_counter >= fsmMove_moves_per_square)
{
- //fsmMove_first_stamp = _TRUE;
+ //fsmMove_first_stamp = true;
fsm_timer.changeRate( 10 );
- return( _TRUE );
+ return( true );
}
- return( _FALSE );
+ return( false );
}
void Vehicle::setFsmMoveMapSquare( unsigned long square )
@@ -356,8 +355,8 @@
else
fsmMoveMapSquare_movement_type = _rotate_stop_move;
- fsm_active_list[ _control_move_map_square ] = _TRUE;
- critical_ai_section = _TRUE;
+ fsm_active_list[ _control_move_map_square ] = true;
+ critical_ai_section = true;
if ( NetworkState::status == _network_state_server )
{
@@ -370,7 +369,7 @@
locationOffset( square, loc_offset );
move_opcode.loc_x_offset = (signed char) loc_offset.x;
move_opcode.loc_y_offset = (signed char) loc_offset.y;
- if ( move_opcode_sent == _TRUE )
+ if ( move_opcode_sent == true )
sendOpcodeNG( &move_opcode );
}
@@ -380,13 +379,13 @@
-boolean Vehicle::fsmMoveMapSquare( void )
+bool Vehicle::fsmMoveMapSquare( void )
{
- if ( move_opcode_sent == _FALSE && NetworkState::status ==
_network_state_server )
+ if ( move_opcode_sent == false && NetworkState::status ==
_network_state_server )
if ( opcode_move_timer.count() )
{
sendOpcodeNG( &move_opcode );
- move_opcode_sent = _TRUE;
+ move_opcode_sent = true;
}
switch( fsmMoveMapSquare_movement_type )
@@ -396,17 +395,17 @@
if ( fsmBodyRotate() )
if ( fsmMove() )
{
- fsm_active_list[ _control_move_map_square ] = _FALSE;
- critical_ai_section = _FALSE;
+ fsm_active_list[ _control_move_map_square ] = false;
+ critical_ai_section = false;
- if ( move_opcode_sent == _FALSE && NetworkState::status ==
_network_state_server )
+ if ( move_opcode_sent == false && NetworkState::status ==
_network_state_server )
{
sendOpcodeNG( &move_opcode );
- move_opcode_sent = _TRUE;
+ move_opcode_sent = true;
}
- return( _TRUE );
+ return( true );
}
} break;
@@ -415,22 +414,22 @@
fsmBodyRotate();
if ( fsmMove() )
{
- fsm_active_list[ _control_move_map_square ] = _FALSE;
- critical_ai_section = _FALSE;
+ fsm_active_list[ _control_move_map_square ] = false;
+ critical_ai_section = false;
- if ( move_opcode_sent == _FALSE && NetworkState::status ==
_network_state_server )
+ if ( move_opcode_sent == false && NetworkState::status ==
_network_state_server )
{
sendOpcodeNG( &move_opcode );
- move_opcode_sent = _TRUE;
+ move_opcode_sent = true;
}
- return( _TRUE );
+ return( true );
}
} break;
} // ** switch
- return( _FALSE );
+ return( false );
}
@@ -442,9 +441,9 @@
direction_vector = fsmTurretTrackPoint_target - unit_state.location;
fsmTurretTrackPoint_target_angle.set( direction_vector );
- fsmTurretTrackPoint_on_target = _FALSE;
+ fsmTurretTrackPoint_on_target = false;
- fsm_active_list[ _control_turret_track_point ] = _TRUE;
+ fsm_active_list[ _control_turret_track_point ] = true;
if ( NetworkState::status == _network_state_server )
{
@@ -454,7 +453,7 @@
track_point_opcode.player_index = unit_id.getPlayer();
track_point_opcode.x = (unsigned short) target.x;
track_point_opcode.y = (unsigned short) target.y;
- track_point_opcode.activate = _TRUE;
+ track_point_opcode.activate = true;
sendOpcode( &track_point_opcode );
}
@@ -462,9 +461,9 @@
void Vehicle::clearFsmTurretTrackPoint( void )
{
- fsm_active_list[ _control_turret_track_point ] = _FALSE;
+ fsm_active_list[ _control_turret_track_point ] = false;
- fsmTurretTrackPoint_on_target = _FALSE;
+ fsmTurretTrackPoint_on_target = false;
if ( NetworkState::status == _network_state_server )
{
@@ -472,7 +471,7 @@
track_point_opcode.opcode = _UNIT_OPCODE_TURRET_TRACK_POINT;
track_point_opcode.unit_index = unit_id.getIndex();
track_point_opcode.player_index = unit_id.getPlayer();
- track_point_opcode.activate = _FALSE;
+ track_point_opcode.activate = false;
sendOpcode( &track_point_opcode );
}
@@ -480,7 +479,7 @@
void Vehicle::syncFsmTurretTrackPoint( void )
{
- if ( fsm_active_list[ _control_turret_track_point ] == _TRUE )
+ if ( fsm_active_list[ _control_turret_track_point ] == true )
{
TurretTrackPointOpcode track_point_opcode;
track_point_opcode.flags = _unit_opcode_flag_sync;
@@ -489,7 +488,7 @@
track_point_opcode.player_index = unit_id.getPlayer();
track_point_opcode.x = (unsigned short) fsmTurretTrackPoint_target.x;
track_point_opcode.y = (unsigned short) fsmTurretTrackPoint_target.y;
- track_point_opcode.activate = _TRUE;
+ track_point_opcode.activate = true;
sendOpcode( &track_point_opcode );
}
@@ -509,17 +508,17 @@
rotation = shortestRotation( unit_state.turret_angle, goal_angle, &delta );
setFsmTurretRotate( goal_angle, rotation );
- if ( fsmTurretRotate() == _TRUE )
- fsmTurretTrackPoint_on_target = _TRUE;
+ if ( fsmTurretRotate() == true )
+ fsmTurretTrackPoint_on_target = true;
else
- fsmTurretTrackPoint_on_target = _FALSE;
+ fsmTurretTrackPoint_on_target = false;
}
void Vehicle::setFsmTurretTrackTarget( UnitID &target_id )
{
fsmTurretTrackTarget_target_id = target_id;
- fsm_active_list[ _control_turret_track_target ] = _TRUE;
+ fsm_active_list[ _control_turret_track_target ] = true;
if ( NetworkState::status == _network_state_server )
{
@@ -529,7 +528,7 @@
track_target_opcode.player_index = unit_id.getPlayer();
track_target_opcode.target_player_index = target_id.getPlayer();
track_target_opcode.target_unit_index = target_id.getIndex();
- track_target_opcode.activate = _TRUE;
+ track_target_opcode.activate = true;
sendOpcode( &track_target_opcode );
}
@@ -537,7 +536,7 @@
void Vehicle::clearFsmTurretTrackTarget( void )
{
- fsm_active_list[ _control_turret_track_target ] = _FALSE;
+ fsm_active_list[ _control_turret_track_target ] = false;
if ( NetworkState::status == _network_state_server )
{
@@ -545,7 +544,7 @@
track_target_opcode.opcode = _UNIT_OPCODE_TURRET_TRACK_TARGET;
track_target_opcode.unit_index = unit_id.getIndex();
track_target_opcode.player_index = unit_id.getPlayer();
- track_target_opcode.activate = _FALSE;
+ track_target_opcode.activate = false;
sendOpcode( &track_target_opcode );
}
@@ -553,7 +552,7 @@
void Vehicle::syncFsmTurretTrackTarget( void )
{
- if ( fsm_active_list[ _control_turret_track_target ] == _TRUE )
+ if ( fsm_active_list[ _control_turret_track_target ] == true )
{
TurretTrackTargetOpcode track_target_opcode;
track_target_opcode.opcode = _UNIT_OPCODE_TURRET_TRACK_TARGET;
@@ -562,7 +561,7 @@
track_target_opcode.player_index = unit_id.getPlayer();
track_target_opcode.target_player_index =
fsmTurretTrackTarget_target_id.getPlayer();
track_target_opcode.target_unit_index =
fsmTurretTrackTarget_target_id.getIndex();
- track_target_opcode.activate = _TRUE;
+ track_target_opcode.activate = true;
sendOpcode( &track_target_opcode );
}
@@ -579,7 +578,7 @@
target_unit_ptr = getUnit( fsmTurretTrackTarget_target_id );
- if ( target_unit_ptr != NULL )
+ if ( target_unit_ptr != 0 )
{
direction_vector = target_unit_ptr->unit_state.location -
unit_state.location;
Angle float_angle( direction_vector );
@@ -589,13 +588,13 @@
setFsmTurretRotate( goal_angle, rotation );
}
- if ( fsmTurretRotate() == _TRUE )
+ if ( fsmTurretRotate() == true )
{
- fsmTurretTrackTarget_on_target = _TRUE;
+ fsmTurretTrackTarget_on_target = true;
}
else
{
- fsmTurretTrackTarget_on_target = _FALSE;
+ fsmTurretTrackTarget_on_target = false;
}
}
@@ -603,19 +602,19 @@
void Vehicle::setFsmGunneryLocation( PointXYi &target )
{
- if ( fsm_active_list[ _control_gunnery_target ] == _TRUE )
+ if ( fsm_active_list[ _control_gunnery_target ] == true )
{
clearFsmGunneryTarget();
}
fsmGunneryLocation_target = target;
setFsmTurretTrackPoint( target );
- fsm_active_list[ _control_gunnery_location ] = _TRUE;
+ fsm_active_list[ _control_gunnery_location ] = true;
}
void Vehicle::clearFsmGunneryLocation( void )
{
- fsm_active_list[ _control_gunnery_location ] = _FALSE;
+ fsm_active_list[ _control_gunnery_location ] = false;
clearFsmTurretTrackPoint();
}
@@ -626,7 +625,7 @@
range_vector = fsmGunneryLocation_target - unit_state.location;
if ( (range_vector.mag2() < unit_state.weapon_range) &&
- (fsmTurretTrackPoint_on_target == _TRUE) &&
+ (fsmTurretTrackPoint_on_target == true) &&
(reload_counter >= unit_state.reload_time)
)
{
@@ -638,24 +637,24 @@
void Vehicle::setFsmGunneryTarget( UnitID &target_id )
{
- if ( fsm_active_list[ _control_gunnery_location ] == _TRUE )
+ if ( fsm_active_list[ _control_gunnery_location ] == true )
{
clearFsmGunneryLocation();
}
- if ( fsm_active_list[ _control_turret_track_point ] == _TRUE )
+ if ( fsm_active_list[ _control_turret_track_point ] == true )
{
clearFsmTurretTrackPoint();
}
fsmGunneryTarget_target_id = target_id;
setFsmTurretTrackTarget( target_id );
- fsm_active_list[ _control_gunnery_target ] = _TRUE;
+ fsm_active_list[ _control_gunnery_target ] = true;
}
void Vehicle::clearFsmGunneryTarget( void )
{
- fsm_active_list[ _control_gunnery_target ] = _FALSE;
+ fsm_active_list[ _control_gunnery_target ] = false;
clearFsmTurretTrackTarget();
}
@@ -666,7 +665,7 @@
PointXYi range_vector;
target_unit_ptr = getUnit( fsmGunneryTarget_target_id );
- if ( target_unit_ptr == NULL )
+ if ( target_unit_ptr == 0 )
{
clearFsmGunneryTarget();
}
@@ -683,7 +682,7 @@
range_vector = target_unit_state->location - unit_state.location;
if ( (range_vector.mag2() < unit_state.weapon_range) &&
- (fsmTurretTrackTarget_on_target == _TRUE) &&
+ (fsmTurretTrackTarget_on_target == true) &&
(reload_counter == unit_state.reload_time )
)
{
@@ -699,27 +698,27 @@
void Vehicle::aiFsmIdle( void )
{
- if ( pending_AI_comm == _TRUE )
+ if ( pending_AI_comm == true )
{
- ai_fsm_transition_complete = _TRUE;
+ ai_fsm_transition_complete = true;
}
}
-boolean Vehicle::ruleMoveToLoc_GoalReached( void )
+bool Vehicle::ruleMoveToLoc_GoalReached( void )
{
PointXYi map_loc;
MapInterface::pointXYtoMapXY( unit_state.location, &map_loc );
if ( map_loc == aiFsmMoveToLoc_goal )
- return( _TRUE );
+ return( true );
- return( _FALSE );
+ return( false );
}
void Vehicle::aiFsmMoveToLoc( void )
{
- boolean end_cycle = _FALSE;
+ bool end_cycle = false;
do
{
@@ -745,26 +744,26 @@
external_ai_event = _external_event_null;
ai_command_state = _ai_command_idle;
- end_cycle = _TRUE;
+ end_cycle = true;
}
else
- if ( pending_AI_comm == _TRUE )
+ if ( pending_AI_comm == true )
{
// External Event: A new AI command is pending
// Action: Allow command transition to occur
- ai_fsm_transition_complete = _TRUE;
+ ai_fsm_transition_complete = true;
aiFsmMoveToLoc_OnExitCleanUp();
- end_cycle = _TRUE;
+ end_cycle = true;
}
else
- if ( path_generated == _TRUE )
+ if ( path_generated == true )
{
- // Rule QueryPath: is TRUE move to next state
+ // Rule QueryPath: is true move to next state
//LOG( ("Path Successfully Generated") );
aiFsmMoveToLoc_state = _aiFsmMoveToLoc_check_goal;
}
else
- end_cycle = _TRUE;
+ end_cycle = true;
} break;
@@ -774,9 +773,9 @@
{
// GoalReached: Has the goal been reached ?
- if ( ruleMoveToLoc_GoalReached() == _TRUE )
+ if ( ruleMoveToLoc_GoalReached() == true )
{
- // Rule GoalReached : is TRUE
+ // Rule GoalReached : is true
// Action : Exit fsm
aiFsmMoveToLoc_prev_loc = unit_state.location;
MapInterface::pointXYtoMapXY( aiFsmMoveToLoc_prev_loc,
&aiFsmMoveToLoc_prev_loc );
@@ -785,13 +784,13 @@
aiFsmMoveToLoc_OnExitCleanUp();
setAiFsmDefendHold();
- end_cycle = _TRUE;
+ end_cycle = true;
}
else
{
- if ( aiFsmMoveToLoc_path_not_finished == _FALSE )
+ if ( aiFsmMoveToLoc_path_not_finished == false )
{
- // Rule: GoalReached is FALSE AND Unit is at the end of path
+ // Rule: GoalReached is false AND Unit is at the end of path
// Action : Request path generation to goal
PointXYi start;
PathRequest path_request;
@@ -800,12 +799,12 @@
MapInterface::pointXYtoMapXY( unit_state.location, &start );
path_request.set( unit_id, start, aiFsmMoveToLoc_goal, 0, &path,
_path_request_full );
PathScheduler::requestPath( path_request );
- aiFsmMoveToLoc_path_not_finished = _TRUE;
+ aiFsmMoveToLoc_path_not_finished = true;
aiFsmMoveToLoc_state = _aiFsmMoveToLoc_path_generate;
}
else
{
- // Rule GoalReached: is FALSE
+ // Rule GoalReached: is false
// Action: Get next move;
aiFsmMoveToLoc_state = _aiFsmMoveToLoc_next_move;
}
@@ -824,13 +823,13 @@
if ( !aiFsmMoveToLoc_path_not_finished )
{
- // Rule: CurrentPathComplete is TRUE
+ // Rule: CurrentPathComplete is true
// Action : check if unit is at the goal
aiFsmMoveToLoc_state = _aiFsmMoveToLoc_check_goal;
}
else
{
- // Rule: CurrentPathComplete is FALSE
+ // Rule: CurrentPathComplete is false
// Action: Check if next location is empty
aiFsmMoveToLoc_prev_loc = unit_state.location;
MapInterface::pointXYtoMapXY( aiFsmMoveToLoc_prev_loc,
&aiFsmMoveToLoc_prev_loc );
@@ -855,26 +854,26 @@
unmarkUnitLoc( aiFsmMoveToLoc_prev_loc );
external_ai_event = _external_event_null;
ai_command_state = _ai_command_idle;
- end_cycle = _TRUE;
+ end_cycle = true;
}
else
- if ( pending_AI_comm == _TRUE )
+ if ( pending_AI_comm == true )
{
// External Event: A new AI command is pending
// Action: Allow command transition to occur
- ai_fsm_transition_complete = _TRUE;
+ ai_fsm_transition_complete = true;
aiFsmMoveToLoc_OnExitCleanUp();
- end_cycle = _TRUE;
+ end_cycle = true;
}
else // NextSquareOccupied: does the next square contain a abstruction
- if ( unitOccupiesLoc( aiFsmMoveToLoc_next_loc ) == _TRUE )
+ if ( unitOccupiesLoc( aiFsmMoveToLoc_next_loc ) == true )
{
- // Rule: NextSquareOccupied is TRUE
+ // Rule: NextSquareOccupied is true
// Action: Check Wait Timer
if ( aiFsmMoveToLoc_wait_timer.count() )
{
- // Rule: NextSquareOccupied is TRUE AND WaitTimer is finished
+ // Rule: NextSquareOccupied is true AND WaitTimer is finished
// Action: Preform path update
if ( aiFsmMoveToLoc_next_loc == aiFsmMoveToLoc_goal )
@@ -897,11 +896,11 @@
aiFsmMoveToLoc_state = _aiFsmMoveToLoc_path_generate;
}
- end_cycle = _TRUE;
+ end_cycle = true;
}
else
{
- // Rule: NextSquareOccupied is FALSE
+ // Rule: NextSquareOccupied is false
// Action: Begin move to next square
markUnitLoc( aiFsmMoveToLoc_next_loc );
setFsmMoveMapSquare( aiFsmMoveToLoc_next_square );
@@ -916,17 +915,17 @@
case _aiFsmMoveToLoc_move_wait :
{
// MoveFinished : has the low level fsm finshed
- if ( fsm_active_list[ _control_move_map_square ] == _FALSE )
+ if ( fsm_active_list[ _control_move_map_square ] == false )
{
- // Rule: MoveFinished is TRUE
+ // Rule: MoveFinished is true
// Action: Check for a pending transition
unmarkUnitLoc( aiFsmMoveToLoc_prev_loc );
aiFsmMoveToLoc_state = _aiFsmMoveToLoc_check_fsm_transition;
- end_cycle = _TRUE;
+ end_cycle = true;
}
else
{
- end_cycle = _TRUE;
+ end_cycle = true;
} // ** else
} break;
@@ -943,16 +942,16 @@
unmarkUnitLoc( aiFsmMoveToLoc_next_loc );
external_ai_event = _external_event_null;
ai_command_state = _ai_command_idle;
- end_cycle = _TRUE;
+ end_cycle = true;
}
else
- if ( pending_AI_comm == _TRUE )
+ if ( pending_AI_comm == true )
{
// External Event: A new AI command is pending
// Action: Allow command transition to occur
- ai_fsm_transition_complete = _TRUE;
+ ai_fsm_transition_complete = true;
aiFsmMoveToLoc_OnExitCleanUp();
- end_cycle = _TRUE;
+ end_cycle = true;
}
else
{
@@ -964,7 +963,7 @@
} // ** switch
- } while ( end_cycle == _FALSE );
+ } while ( end_cycle == false );
}
@@ -976,16 +975,16 @@
void Vehicle::aiFsmAttackUnit( void )
{
- boolean end_cycle = _FALSE;
+ bool end_cycle = false;
UnitBase *target_unit_ptr;
- UnitState *target_unit_state;
+ UnitState *target_unit_state = 0;
PointXYi range_vector;
target_unit_ptr = getUnit( aiFsmAttackUnit_target_ID );
- if ( target_unit_ptr == NULL )
+ if ( target_unit_ptr == 0 )
{
- aiFsmAttackUnit_target_destroyed = _TRUE;
+ aiFsmAttackUnit_target_destroyed = true;
}
else
{
@@ -993,7 +992,7 @@
if ( target_unit_state->lifecycle_state == _UNIT_LIFECYCLE_DESTROYED )
{
- aiFsmAttackUnit_target_destroyed = _TRUE;
+ aiFsmAttackUnit_target_destroyed = true;
if ( aiFsmAttackUnit_state != _aiFsmAttackUnit_move_wait )
{
@@ -1028,25 +1027,25 @@
external_ai_event = _external_event_null;
ai_command_state = _ai_command_idle;
- end_cycle = _TRUE;
+ end_cycle = true;
}
else
- if ( pending_AI_comm == _TRUE )
+ if ( pending_AI_comm == true )
{
// External Event: A new AI command is pending
// Action: Allow command transition to occur
- ai_fsm_transition_complete = _TRUE;
+ ai_fsm_transition_complete = true;
aiFsmAttackUnit_OnExitCleanUp();
- end_cycle = _TRUE;
+ end_cycle = true;
}
else
- if ( path_generated == _TRUE )
+ if ( path_generated == true )
{
- // Rule QueryPath: is TRUE move to next state
+ // Rule QueryPath: is true move to next state
aiFsmAttackUnit_state = _aiFsmAttackUnit_range_check;
}
else
- end_cycle = _TRUE;
+ end_cycle = true;
} break;
// *************************************************************
@@ -1065,11 +1064,11 @@
MapInterface::pointXYtoMapXY( aiFsmAttackUnit_prev_loc,
&aiFsmAttackUnit_prev_loc );
markUnitLoc( aiFsmAttackUnit_prev_loc );
aiFsmAttackUnit_state = _aiFsmAttackUnit_idle;
- end_cycle = _TRUE;
+ end_cycle = true;
}
else
{
- if ( aiFsmAttackUnit_path_not_finished == _FALSE )
+ if ( aiFsmAttackUnit_path_not_finished == false )
{
PointXYi start;
MapInterface::pointXYtoMapXY( unit_state.location, &start );
@@ -1078,7 +1077,7 @@
path_request.set( unit_id, start,
aiFsmAttackUnit_target_goal_loc, 0, &path, _path_request_full );
PathScheduler::requestPath( path_request );
- aiFsmAttackUnit_path_not_finished = _TRUE;
+ aiFsmAttackUnit_path_not_finished = true;
aiFsmAttackUnit_state = _aiFsmAttackUnit_path_generate;
}
else
@@ -1103,23 +1102,23 @@
unmarkUnitLoc( aiFsmAttackUnit_prev_loc );
external_ai_event = _external_event_null;
ai_command_state = _ai_command_idle;
- end_cycle = _TRUE;
+ end_cycle = true;
}
else
- if ( pending_AI_comm == _TRUE )
+ if ( pending_AI_comm == true )
{
// External Event: A new AI command is pending
// Action: Allow command transition to occur
- ai_fsm_transition_complete = _TRUE;
+ ai_fsm_transition_complete = true;
aiFsmAttackUnit_OnExitCleanUp();
- end_cycle = _TRUE;
+ end_cycle = true;
}
else
if ( range_vector.mag2() < unit_state.weapon_range )
{
// Rule: RangeVector < WeaponRange, unit is in range
// Action: Remain in position
- end_cycle = _TRUE;
+ end_cycle = true;
}
else
{
@@ -1140,13 +1139,13 @@
if ( !aiFsmAttackUnit_path_not_finished )
{
- // Rule: CurrentPathComplete is TRUE
+ // Rule: CurrentPathComplete is true
// Action : check if unit is at the goal
aiFsmAttackUnit_state = _aiFsmAttackUnit_range_check;
}
else
{
- // Rule: CurrentPathComplete is FALSE
+ // Rule: CurrentPathComplete is false
// Action: Check if next location is empty
aiFsmAttackUnit_prev_loc = unit_state.location;
MapInterface::pointXYtoMapXY( aiFsmAttackUnit_prev_loc,
&aiFsmAttackUnit_prev_loc );
@@ -1169,19 +1168,19 @@
unmarkUnitLoc( aiFsmAttackUnit_prev_loc );
external_ai_event = _external_event_null;
ai_command_state = _ai_command_idle;
- end_cycle = _TRUE;
+ end_cycle = true;
}
else
- if ( pending_AI_comm == _TRUE )
+ if ( pending_AI_comm == true )
{
// External Event: A new AI command is pending
// Action: Allow command transition to occur
- ai_fsm_transition_complete = _TRUE;
+ ai_fsm_transition_complete = true;
aiFsmAttackUnit_OnExitCleanUp();
- end_cycle = _TRUE;
+ end_cycle = true;
}
else
- if ( unitOccupiesLoc( aiFsmAttackUnit_next_loc ) == _TRUE )
+ if ( unitOccupiesLoc( aiFsmAttackUnit_next_loc ) == true )
{
if ( aiFsmAttackUnit_wait_timer.count() )
{
@@ -1207,7 +1206,7 @@
aiFsmAttackUnit_state = _aiFsmAttackUnit_path_generate;
}
- end_cycle = _TRUE;
+ end_cycle = true;
}
else
{
@@ -1222,15 +1221,15 @@
case _aiFsmAttackUnit_move_wait :
{
- if ( fsm_active_list[ _control_move_map_square ] == _FALSE )
+ if ( fsm_active_list[ _control_move_map_square ] == false )
{
unmarkUnitLoc( aiFsmAttackUnit_prev_loc );
aiFsmAttackUnit_state = _aiFsmAttackUnit_check_fsm_transition;
- end_cycle = _TRUE;
+ end_cycle = true;
}
else
{
- end_cycle = _TRUE;
+ end_cycle = true;
} // ** else
} break;
@@ -1247,21 +1246,21 @@
unmarkUnitLoc( aiFsmAttackUnit_next_loc );
external_ai_event = _external_event_null;
ai_command_state = _ai_command_idle;
- end_cycle = _TRUE;
+ end_cycle = true;
}
else
- if ( pending_AI_comm == _TRUE )
+ if ( pending_AI_comm == true )
{
- ai_fsm_transition_complete = _TRUE;
+ ai_fsm_transition_complete = true;
aiFsmAttackUnit_OnExitCleanUp();
- end_cycle = _TRUE;
+ end_cycle = true;
}
else
- if ( aiFsmAttackUnit_target_destroyed == _TRUE )
+ if ( aiFsmAttackUnit_target_destroyed == true )
{
setAiFsmDefendHold();
aiFsmAttackUnit_OnExitCleanUp();
- end_cycle = _TRUE;
+ end_cycle = true;
}
else
{
@@ -1289,7 +1288,7 @@
PathScheduler::requestPath( path_request );
aiFsmAttackUnit_state = _aiFsmAttackUnit_path_generate;
- end_cycle = _TRUE;
+ end_cycle = true;
}
else
{
@@ -1300,7 +1299,7 @@
} // ** switch
- } while ( end_cycle == _FALSE );
+ } while ( end_cycle == false );
}
@@ -1319,7 +1318,7 @@
void Vehicle::aiFsmDefendHold( void )
{
- boolean end_cycle = _FALSE;
+ bool end_cycle = false;
UnitBase *target_unit_ptr;
UnitState *target_unit_state;
@@ -1338,15 +1337,15 @@
// Action : Exit fsm gracefully
external_ai_event = _external_event_null;
ai_command_state = _ai_command_idle;
- end_cycle = _TRUE;
+ end_cycle = true;
}
else
- if ( pending_AI_comm == _TRUE )
+ if ( pending_AI_comm == true )
{
// External Event: A new AI command is pending
// Action: Allow command transition to occur
- ai_fsm_transition_complete = _TRUE;
- end_cycle = _TRUE;
+ ai_fsm_transition_complete = true;
+ end_cycle = true;
}
else
if ( aiFsmDefendHold_search_timer.count() )
@@ -1360,17 +1359,17 @@
aiFsmDefendHold_target_ID = target_unit_ptr->unit_id;
setFsmGunneryTarget( aiFsmDefendHold_target_ID );
aiFsmDefendHold_state = _aiFsmDefendHold_attack_enemy;
- end_cycle = _TRUE;
+ end_cycle = true;
}
else
- { end_cycle = _TRUE; }
+ { end_cycle = true; }
} // ** quearyClosestEnemyUnit
else
- { end_cycle = _TRUE; }
+ { end_cycle = true; }
} // ** aiFsmDefendHold_search_timer.count()
else
- { end_cycle = _TRUE; }
+ { end_cycle = true; }
} break;
case _aiFsmDefendHold_attack_enemy :
@@ -1382,25 +1381,25 @@
clearFsmGunneryTarget();
external_ai_event = _external_event_null;
ai_command_state = _ai_command_idle;
- end_cycle = _TRUE;
+ end_cycle = true;
}
else
- if ( pending_AI_comm == _TRUE )
+ if ( pending_AI_comm == true )
{
// External Event: A new AI command is pending
// Action: Allow command transition to occur
clearFsmGunneryTarget();
- ai_fsm_transition_complete = _TRUE;
- end_cycle = _TRUE;
+ ai_fsm_transition_complete = true;
+ end_cycle = true;
}
else
{
target_unit_ptr = getUnit( aiFsmDefendHold_target_ID );
- if ( target_unit_ptr == NULL )
+ if ( target_unit_ptr == 0 )
{
clearFsmGunneryTarget();
aiFsmDefendHold_state = _aiFsmDefendHold_search_for_enemy;
- end_cycle = _TRUE;
+ end_cycle = true;
}
else
{
@@ -1409,7 +1408,7 @@
{
clearFsmGunneryTarget();
aiFsmDefendHold_state = _aiFsmDefendHold_search_for_enemy;
- end_cycle = _TRUE;
+ end_cycle = true;
} // ** if
else
{
@@ -1418,17 +1417,17 @@
{
clearFsmGunneryTarget();
aiFsmDefendHold_state = _aiFsmDefendHold_search_for_enemy;
- end_cycle = _TRUE;
+ end_cycle = true;
}
} // else
} // ** else
} // ** else
- end_cycle = _TRUE;
+ end_cycle = true;
} break;
} // ** switch
- } while ( end_cycle == _FALSE );
+ } while ( end_cycle == false );
}
@@ -1438,7 +1437,7 @@
void Vehicle::aiFsmManualMove( void )
{
- boolean end_cycle = _FALSE;
+ bool end_cycle = false;
signed char offset_x, offset_y;
unsigned long next_square;
@@ -1457,13 +1456,13 @@
if ( MapInterface::getMovementValue( aiFsmManualMove_next_loc ) == 0xFF
)
{
setAiFsmDefendHold();
- end_cycle = _TRUE;
+ end_cycle = true;
}
else
- if( unitOccupiesLoc( aiFsmManualMove_next_loc ) == _TRUE )
+ if( unitOccupiesLoc( aiFsmManualMove_next_loc ) == true )
{
setAiFsmDefendHold();
- end_cycle = _TRUE;
+ end_cycle = true;
}
else
{
@@ -1478,15 +1477,15 @@
case _aiFsmManualMove_move_wait :
{
- if ( fsm_active_list[ _control_move_map_square ] == _FALSE )
+ if ( fsm_active_list[ _control_move_map_square ] == false )
{
unmarkUnitLoc( aiFsmManualMove_prev_loc );
aiFsmManualMove_state = _aiFsmManualMove_check_fsm_transition;
- end_cycle = _TRUE;
+ end_cycle = true;
}
else
{
- end_cycle = _TRUE;
+ end_cycle = true;
} // ** else
}
break;
@@ -1502,13 +1501,13 @@
unmarkUnitLoc( aiFsmManualMove_next_loc );
external_ai_event = _external_event_null;
ai_command_state = _ai_command_idle;
- end_cycle = _TRUE;
+ end_cycle = true;
}
else
- if ( pending_AI_comm == _TRUE )
+ if ( pending_AI_comm == true )
{
- ai_fsm_transition_complete = _TRUE;
- end_cycle = _TRUE;
+ ai_fsm_transition_complete = true;
+ end_cycle = true;
}
else
{
@@ -1518,7 +1517,7 @@
break;
} // ** switch
- } while ( end_cycle == _FALSE );
+ } while ( end_cycle == false );
}
@@ -1556,19 +1555,19 @@
{
if ( fsm_timer.count() )
{
- if ( fsm_active_list[ _control_move_map_square ] == _TRUE )
+ if ( fsm_active_list[ _control_move_map_square ] == true )
fsmMoveMapSquare();
- if ( fsm_active_list[ _control_turret_track_point ] == _TRUE )
+ if ( fsm_active_list[ _control_turret_track_point ] == true )
fsmTurretTrackPoint();
- if ( fsm_active_list[ _control_turret_track_target ] == _TRUE )
+ if ( fsm_active_list[ _control_turret_track_target ] == true )
fsmTurretTrackTarget();
- if ( fsm_active_list[ _control_gunnery_location ] == _TRUE )
+ if ( fsm_active_list[ _control_gunnery_location ] == true )
fsmGunneryLocation();
- if ( fsm_active_list[ _control_gunnery_target ] == _TRUE )
+ if ( fsm_active_list[ _control_gunnery_target ] == true )
fsmGunneryTarget();
}
}
@@ -1603,11 +1602,11 @@
void Vehicle::checkPendingAICommStatus( void )
{
- if ( (pending_AI_comm == _TRUE) &&
- (ai_fsm_transition_complete == _TRUE) )
+ if ( (pending_AI_comm == true) &&
+ (ai_fsm_transition_complete == true) )
{
- pending_AI_comm = _FALSE;
- ai_fsm_transition_complete = _FALSE;
+ pending_AI_comm = false;
+ ai_fsm_transition_complete = false;
if ( unit_state.lifecycle_state == _UNIT_LIFECYCLE_ACTIVE )
{
@@ -1640,7 +1639,7 @@
{
PointXYi start;
- if ( fsm_active_list[ _control_gunnery_location ] == _TRUE )
+ if ( fsm_active_list[ _control_gunnery_location ] == true )
{
clearFsmGunneryLocation();
}
@@ -1648,11 +1647,11 @@
aiFsmMoveToLoc_goal = message->goal_loc;
ai_command_state = _ai_command_move_to_loc;
aiFsmMoveToLoc_state = _aiFsmMoveToLoc_path_generate;
- aiFsmMoveToLoc_path_not_finished = _TRUE;
+ aiFsmMoveToLoc_path_not_finished = true;
opcode_move_timer.changePeriod( 0.10f );
- move_opcode_sent = _FALSE;
- //move_opcode_sent = _TRUE;
+ move_opcode_sent = false;
+ //move_opcode_sent = true;
MapInterface::pointXYtoMapXY( unit_state.location, &start );
@@ -1678,7 +1677,7 @@
aiFsmAttackUnit_target_ID = message->target_id;
target_unit_ptr = getUnit( aiFsmAttackUnit_target_ID );
- if ( target_unit_ptr == NULL )
+ if ( target_unit_ptr == 0 )
return;
target_unit_state = &(target_unit_ptr->unit_state);
@@ -1686,8 +1685,8 @@
ai_command_state = _ai_command_attack_unit;
aiFsmAttackUnit_state = _aiFsmAttackUnit_path_generate;
- aiFsmAttackUnit_path_not_finished = _TRUE;
- aiFsmAttackUnit_target_destroyed = _FALSE;
+ aiFsmAttackUnit_path_not_finished = true;
+ aiFsmAttackUnit_target_destroyed = false;
MapInterface::pointXYtoMapXY( unit_state.location, &start );
MapInterface::pointXYtoMapXY( target_unit_state->location,
&aiFsmAttackUnit_target_goal_loc );
@@ -1697,8 +1696,8 @@
PathScheduler::requestPath( path_request );
opcode_move_timer.changePeriod( 0.10f );
- move_opcode_sent = _FALSE;
- //move_opcode_sent = _TRUE;
+ move_opcode_sent = false;
+ //move_opcode_sent = true;
setFsmGunneryTarget( aiFsmAttackUnit_target_ID );
}
@@ -1739,7 +1738,7 @@
else
{
memmove( &pending_AI_comm_mesg, command_mesg, sizeof( UMesgAICommand) );
- pending_AI_comm = _TRUE;
+ pending_AI_comm = true;
}
}
@@ -1752,7 +1751,7 @@
weapon_hit = (UMesgWeaponHit *) message;
- if ( unit_state.bounds( weapon_hit->hit_location ) == _TRUE )
+ if ( unit_state.bounds( weapon_hit->hit_location ) == true )
{
unit_state.hit_points -= weapon_hit->damage_factor;
@@ -1854,8 +1853,8 @@
{
MoveOpcode *move_opcode;
- if ( ( (in_sync_flag == _FALSE) && !(opcode->flags & _unit_opcode_flag_sync)
) ||
- ( (in_sync_flag == _TRUE) && (opcode->flags & _unit_opcode_flag_sync) )
+ if ( ( (in_sync_flag == false) && !(opcode->flags & _unit_opcode_flag_sync)
) ||
+ ( (in_sync_flag == true) && (opcode->flags & _unit_opcode_flag_sync) )
)
return;
@@ -1882,14 +1881,14 @@
{
TurretTrackPointOpcode *track_point_opcode;
- if ( ( (in_sync_flag == _FALSE) && !(opcode->flags & _unit_opcode_flag_sync)
) ||
- ( (in_sync_flag == _TRUE) && (opcode->flags & _unit_opcode_flag_sync) )
+ if ( ( (in_sync_flag == false) && !(opcode->flags & _unit_opcode_flag_sync)
) ||
+ ( (in_sync_flag == true) && (opcode->flags & _unit_opcode_flag_sync) )
)
return;
track_point_opcode = (TurretTrackPointOpcode *) opcode;
- if ( track_point_opcode->activate == _TRUE )
+ if ( track_point_opcode->activate == true )
{
PointXYi target;
target.x = track_point_opcode->x;
@@ -1898,7 +1897,7 @@
}
else
{
- fsm_active_list[ _control_turret_track_point ] = _FALSE;
+ fsm_active_list[ _control_turret_track_point ] = false;
}
}
@@ -1907,14 +1906,14 @@
{
TurretTrackTargetOpcode *track_target_opcode;
- if ( ( (in_sync_flag == _FALSE) && !(opcode->flags & _unit_opcode_flag_sync)
) ||
- ( (in_sync_flag == _TRUE) && (opcode->flags & _unit_opcode_flag_sync) )
+ if ( ( (in_sync_flag == false) && !(opcode->flags & _unit_opcode_flag_sync)
) ||
+ ( (in_sync_flag == true) && (opcode->flags & _unit_opcode_flag_sync) )
)
return;
track_target_opcode = (TurretTrackTargetOpcode *) opcode;
- if ( track_target_opcode->activate == _TRUE )
+ if ( track_target_opcode->activate == true )
{
UnitID target_id;
@@ -1926,7 +1925,7 @@
}
else
{
- fsm_active_list[ _control_turret_track_target ] = _FALSE;
+ fsm_active_list[ _control_turret_track_target ] = false;
}
}
@@ -1935,8 +1934,8 @@
{
PointXYi target_loc;
- if ( ( (in_sync_flag == _FALSE) && !(opcode->flags & _unit_opcode_flag_sync)
) ||
- ( (in_sync_flag == _TRUE) && (opcode->flags & _unit_opcode_flag_sync) )
+ if ( ( (in_sync_flag == false) && !(opcode->flags & _unit_opcode_flag_sync)
) ||
+ ( (in_sync_flag == true) && (opcode->flags & _unit_opcode_flag_sync) )
)
return;
@@ -1952,7 +1951,7 @@
void Vehicle::unitOpcodeSync( UnitOpcodeStruct *opcode )
{
- in_sync_flag = _TRUE;
+ in_sync_flag = true;
}
void Vehicle::unitOpcodeUpdateState( UnitOpcodeStruct *opcode )
@@ -1990,9 +1989,9 @@
{
UnitOpcodeStruct opcode;
- if ( move_opcode_queue.isReady() == _TRUE )
+ if ( move_opcode_queue.isReady() == true )
{
- if( fsm_active_list[ _control_move_map_square ] == _FALSE )
+ if( fsm_active_list[ _control_move_map_square ] == false )
{
if ( move_opcode_queue.itemCount() >= 3 )
{
@@ -2067,11 +2066,11 @@
if ( opcode->opcode == _UNIT_OPCODE_MOVE )
{
- if ( move_opcode_queue.enqueue( *opcode ) == _FALSE )
+ if ( move_opcode_queue.enqueue( *opcode ) == false )
{ LOG( ("ERROR : Move Opcode Queue Overwrite, Unit %d, %d",
unit_id.getPlayer(), unit_id.getIndex() ) ); }
}
else
- if ( opcode_queue.enqueue( *opcode ) == _FALSE )
+ if ( opcode_queue.enqueue( *opcode ) == false )
{ LOG( ("ERROR : Opcode Queue Overwrite, Unit %d, %d",
unit_id.getPlayer(), unit_id.getIndex() ) ); }
}
@@ -2123,7 +2122,7 @@
{
body_anim_shadow.setWorldPos( unit_state.location);
- if ( sorter.cullSprite( body_anim_shadow ) == _FALSE )
+ if ( sorter.cullSprite( body_anim_shadow ) == false )
{
// Body
body_anim.setWorldPos( unit_state.location );
Index: netpanzer/src/NetPanzer/Classes/Units/Vehicle.hpp
diff -u netpanzer/src/NetPanzer/Classes/Units/Vehicle.hpp:1.1
netpanzer/src/NetPanzer/Classes/Units/Vehicle.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/Units/Vehicle.hpp:1.1 Sun Dec 1
12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/Units/Vehicle.hpp Mon Sep 1 16:24:20 2003
@@ -90,12 +90,12 @@
Timer unit_state_timer;
Timer fsm_timer;
- boolean fsm_active_list[ 7 ];
+ bool fsm_active_list[ 7 ];
PathList path;
- boolean path_generated;
- boolean critical_ai_section;
- boolean ai_fsm_transition_complete;
+ bool path_generated;
+ bool critical_ai_section;
+ bool ai_fsm_transition_complete;
unsigned short reload_counter;
unsigned short death_counter;
@@ -114,41 +114,41 @@
unsigned short fsmBodyRotate_rotation;
long fsmBodyRotate_goal_angle;
void setFsmBodyRotate( long goal_angle, unsigned short rotation );
- boolean fsmBodyRotate( void );
+ bool fsmBodyRotate( void );
unsigned short fsmTurretRotate_rotation;
long fsmTurretRotate_goal_angle;
void setFsmTurretRotate( long goal_angle, unsigned short rotation );
- boolean fsmTurretRotate( void );
+ bool fsmTurretRotate( void );
float interpolation_speed;
TIMESTAMP start_move_stamp;
TIMESTAMP end_move_stamp;
- boolean fsmMove_first_stamp;
+ bool fsmMove_first_stamp;
signed char fsmMove_offset_x;
signed char fsmMove_offset_y;
unsigned char fsmMove_moves_counter;
unsigned char fsmMove_moves_per_square;
void setFsmMove( unsigned short orientation );
- boolean fsmMove( void );
+ bool fsmMove( void );
MoveOpcode move_opcode;
Timer opcode_move_timer;
- boolean move_opcode_sent;
+ bool move_opcode_sent;
unsigned char fsmMoveMapSquare_movement_type;
void setFsmMoveMapSquare( unsigned long square );
- boolean fsmMoveMapSquare( void );
+ bool fsmMoveMapSquare( void );
PointXYi fsmTurretTrackPoint_target;
Angle fsmTurretTrackPoint_target_angle;
- boolean fsmTurretTrackPoint_on_target;
+ bool fsmTurretTrackPoint_on_target;
void setFsmTurretTrackPoint( PointXYi &target );
void clearFsmTurretTrackPoint( void );
void syncFsmTurretTrackPoint( void );
void fsmTurretTrackPoint( void );
UnitID fsmTurretTrackTarget_target_id;
- boolean fsmTurretTrackTarget_on_target;
+ bool fsmTurretTrackTarget_on_target;
void setFsmTurretTrackTarget( UnitID &target_id );
void clearFsmTurretTrackTarget( void );
void syncFsmTurretTrackTarget( void );
@@ -178,8 +178,8 @@
PointXYi aiFsmMoveToLoc_next_loc;
PointXYi aiFsmMoveToLoc_prev_loc;
Timer aiFsmMoveToLoc_wait_timer;
- boolean aiFsmMoveToLoc_path_not_finished;
- boolean ruleMoveToLoc_GoalReached( void );
+ bool aiFsmMoveToLoc_path_not_finished;
+ bool ruleMoveToLoc_GoalReached( void );
void aiFsmMoveToLoc_OnExitCleanUp( void );
void aiFsmMoveToLoc( void );
@@ -190,8 +190,8 @@
PointXYi aiFsmAttackUnit_next_loc;
PointXYi aiFsmAttackUnit_prev_loc;
Timer aiFsmAttackUnit_wait_timer;
- boolean aiFsmAttackUnit_path_not_finished;
- boolean aiFsmAttackUnit_target_destroyed;
+ bool aiFsmAttackUnit_path_not_finished;
+ bool aiFsmAttackUnit_target_destroyed;
void aiFsmAttackUnit_OnExitCleanUp( void );
void aiFsmAttackUnit( void );
@@ -227,7 +227,7 @@
// ** Message Handlers
UMesgAICommand pending_AI_comm_mesg;
- boolean pending_AI_comm;
+ bool pending_AI_comm;
void checkPendingAICommStatus( void );
void setCommandMoveToLoc( UMesgAICommand *message );
Index: netpanzer/src/NetPanzer/Classes/ViewCamera.cpp
diff -u netpanzer/src/NetPanzer/Classes/ViewCamera.cpp:1.1
netpanzer/src/NetPanzer/Classes/ViewCamera.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/ViewCamera.cpp:1.1 Sun Dec 1 12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/ViewCamera.cpp Mon Sep 1 16:24:20 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "ViewCamera.hpp"
ViewCamera::ViewCamera()
Index: netpanzer/src/NetPanzer/Classes/ViewCamera.hpp
diff -u netpanzer/src/NetPanzer/Classes/ViewCamera.hpp:1.1
netpanzer/src/NetPanzer/Classes/ViewCamera.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/ViewCamera.hpp:1.1 Sun Dec 1 12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/ViewCamera.hpp Mon Sep 1 16:24:20 2003
@@ -35,13 +35,13 @@
void scrollMinusY( long scroll_increment );
void scrollPlusY( long scroll_increment );
- inline void setCamera( PointXYi &new_loc )
+ inline void setCamera( const PointXYi &new_loc )
{
loc.x = new_loc.x - (new_loc.x % 4);
loc.y = new_loc.y - (new_loc.y % 4);
}
- inline void setCameraSize( PointXYi &size )
+ inline void setCameraSize( const PointXYi &size )
{
view_size = size;
}
@@ -59,9 +59,9 @@
view_win->max.y = view_start_y + view_size.y;
}
- inline long getCameraDistance( PointXYi &world_loc )
+ inline long getCameraDistance( const PointXYi &world_loc )
{
- return( (loc - world_loc).mag2() );
+ return( (long) (loc - world_loc).mag2() );
}
};
Index: netpanzer/src/NetPanzer/Classes/WadMapTable.hpp
diff -u netpanzer/src/NetPanzer/Classes/WadMapTable.hpp:1.1
netpanzer/src/NetPanzer/Classes/WadMapTable.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/WadMapTable.hpp:1.1 Sun Dec 1 12:51:51 2002
+++ netpanzer/src/NetPanzer/Classes/WadMapTable.hpp Mon Sep 1 16:24:20 2003
@@ -18,14 +18,13 @@
#ifndef _WADMAPTABLE_HPP
#define _WADMAPTABLE_HPP
-#include "Aliasdef.h"
#include "ArrayTemplate.hpp"
#include "string.h"
class WadTileMapInfo
{
public:
- boolean is_used;
+ bool is_used;
unsigned short remap_index;
};
Index: netpanzer/src/NetPanzer/Classes/Weapons/BulletWeapon.cpp
diff -u netpanzer/src/NetPanzer/Classes/Weapons/BulletWeapon.cpp:1.1
netpanzer/src/NetPanzer/Classes/Weapons/BulletWeapon.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/Weapons/BulletWeapon.cpp:1.1 Sun Dec
1 12:51:56 2002
+++ netpanzer/src/NetPanzer/Classes/Weapons/BulletWeapon.cpp Mon Sep 1
16:24:20 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "BulletWeapon.hpp"
#include "UnitMessageTypes.hpp"
#include "UnitInterface.hpp"
@@ -23,7 +22,7 @@
#include "StaticsInterface.hpp"
#include "WorldViewInterface.hpp"
#include "DDHardSurface.hpp"
-#include "dsound.hpp"
+#include "DSound.hpp"
#include "ParticleInterface.hpp"
#include "WeaponGlobals.hpp"
@@ -42,7 +41,7 @@
void BulletWeapon::fsmFlight()
{
- boolean end_cycle = _FALSE;
+ bool end_cycle = false;
float dt = TimerInterface::getTimeSlice();
@@ -52,19 +51,19 @@
{
case _fsmFlight_idle :
{
- end_cycle = _TRUE;
+ end_cycle = true;
} break;
case _fsmFlight_in_flight :
{
- if (path.increment(&location, velocity) ==
_TRUE )
+ if (path.increment(&location, velocity) == true
)
{
fsmFlight_state = _fsmFlight_on_target;
- end_cycle = _TRUE;
+ end_cycle = true;
}
else
{
- end_cycle = _TRUE;
+ end_cycle = true;
}
} break;
@@ -94,12 +93,12 @@
// ** Particle Shit
iXY loc = iXY( location.x, location.y );
ParticleInterface::addDirtKick(loc);
- end_cycle = _TRUE;
+ end_cycle = true;
} break;
}
- } while ( end_cycle == _FALSE );
+ } while ( end_cycle == false );
}
void BulletWeapon::updateStatus( void )
Index: netpanzer/src/NetPanzer/Classes/Weapons/MissleWeapon.cpp
diff -u netpanzer/src/NetPanzer/Classes/Weapons/MissleWeapon.cpp:1.1
netpanzer/src/NetPanzer/Classes/Weapons/MissleWeapon.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/Weapons/MissleWeapon.cpp:1.1 Sun Dec
1 12:51:56 2002
+++ netpanzer/src/NetPanzer/Classes/Weapons/MissleWeapon.cpp Mon Sep 1
16:24:20 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "MissleWeapon.hpp"
#include "UnitMessageTypes.hpp"
#include "UnitInterface.hpp"
@@ -23,7 +22,7 @@
#include "StaticsInterface.hpp"
#include "WorldViewInterface.hpp"
#include "DDHardSurface.hpp"
-#include "dsound.hpp"
+#include "DSound.hpp"
#include "ParticleInterface.hpp"
#include "WeaponGlobals.hpp"
#include "Math.hpp"
@@ -38,7 +37,7 @@
{
velocity = thrustForce * 2;
acceleration = 0.0f;
- launched = _FALSE;
+ launched = false;
curWait = 0.0f;
totalWait = 0.0f;
@@ -72,7 +71,7 @@
void MissleWeapon::fsmFlight()
{
- boolean end_cycle = _FALSE;
+ bool end_cycle = false;
float dt = TimerInterface::getTimeSlice();
@@ -82,7 +81,7 @@
{
case _fsmFlight_idle :
{
- end_cycle = _TRUE;
+ end_cycle = true;
} break;
case _fsmFlight_in_flight :
@@ -97,19 +96,19 @@
}
- if (path.increment(&location, velocity) ==
_TRUE )
+ if (path.increment(&location, velocity) == true
)
{
fsmFlight_state = _fsmFlight_on_target;
- end_cycle = _TRUE;
+ end_cycle = true;
}
else
{
- end_cycle = _TRUE;
+ end_cycle = true;
}
if (!launched)
{
- launched = _TRUE;
+ launched = true;
}
// ** Particle Shit
@@ -141,12 +140,12 @@
// ** Particle Shit
ParticleInterface::addMiss(location,
Weapon::owner_type_id);
- end_cycle = _TRUE;
+ end_cycle = true;
} break;
}
- } while ( end_cycle == _FALSE );
+ } while ( end_cycle == false );
}
void MissleWeapon::updateStatus( void )
Index: netpanzer/src/NetPanzer/Classes/Weapons/ShellWeapon.cpp
diff -u netpanzer/src/NetPanzer/Classes/Weapons/ShellWeapon.cpp:1.1
netpanzer/src/NetPanzer/Classes/Weapons/ShellWeapon.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/Weapons/ShellWeapon.cpp:1.1 Sun Dec 1
12:51:56 2002
+++ netpanzer/src/NetPanzer/Classes/Weapons/ShellWeapon.cpp Mon Sep 1
16:24:20 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "ShellWeapon.hpp"
#include "UnitMessageTypes.hpp"
#include "UnitInterface.hpp"
@@ -23,7 +22,7 @@
#include "StaticsInterface.hpp"
#include "WorldViewInterface.hpp"
#include "DDHardSurface.hpp"
-#include "dsound.hpp"
+#include "DSound.hpp"
#include "Particle2D.hpp"
#include "WeaponGlobals.hpp"
#include "ParticleInterface.hpp"
@@ -64,7 +63,7 @@
void ShellWeapon::fsmFlight()
{
- boolean end_cycle = _FALSE;
+ bool end_cycle = false;
float dt = TimerInterface::getTimeSlice();
@@ -74,19 +73,19 @@
{
case _fsmFlight_idle :
{
- end_cycle = _TRUE;
+ end_cycle = true;
} break;
case _fsmFlight_in_flight :
{
- if (path.increment(&location, velocity) ==
_TRUE )
+ if (path.increment(&location, velocity) == true
)
{
fsmFlight_state = _fsmFlight_on_target;
- end_cycle = _TRUE;
+ end_cycle = true;
}
else
{
- end_cycle = _TRUE;
+ end_cycle = true;
}
} break;
@@ -116,12 +115,12 @@
// ** Particle Shit
iXY loc = iXY( location.x, location.y );
ParticleInterface::addMiss(loc,
Weapon::owner_type_id);
- end_cycle = _TRUE;
+ end_cycle = true;
} break;
}
- } while ( end_cycle == _FALSE );
+ } while ( end_cycle == false );
}
void ShellWeapon::updateStatus( void )
Index: netpanzer/src/NetPanzer/Classes/Weapons/Weapon.cpp
diff -u netpanzer/src/NetPanzer/Classes/Weapons/Weapon.cpp:1.1
netpanzer/src/NetPanzer/Classes/Weapons/Weapon.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/Weapons/Weapon.cpp:1.1 Sun Dec 1
12:51:56 2002
+++ netpanzer/src/NetPanzer/Classes/Weapons/Weapon.cpp Mon Sep 1 16:24:20 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "Weapon.hpp"
#include "UnitMessageTypes.hpp"
@@ -28,7 +27,7 @@
#include "WorldViewInterface.hpp"
#include "DDHardSurface.hpp"
-#include "dsound.hpp"
+#include "DSound.hpp"
#include "ParticleInterface.hpp"
#include "WeaponGlobals.hpp"
#include "Math.hpp"
@@ -159,7 +158,7 @@
void Weapon::fsmFlight( void )
{
- boolean end_cycle = _FALSE;
+ bool end_cycle = false;
do
{
@@ -167,19 +166,19 @@
{
case _fsmFlight_idle :
{
- end_cycle = _TRUE;
+ end_cycle = true;
} break;
case _fsmFlight_in_flight :
{
- if ( path.increment( &location, 4 ) == _TRUE )
+ if ( path.increment( &location, 4 ) == true )
{
fsmFlight_state = _fsmFlight_on_target;
- end_cycle = _TRUE;
+ end_cycle = true;
}
else
{
- end_cycle = _TRUE;
+ end_cycle = true;
}
} break;
@@ -206,13 +205,13 @@
// ** Particle Shit
iXY loc = iXY( location.x, location.y );
ParticleInterface::addMiss(loc, Weapon::owner_type_id);
- end_cycle = _TRUE;
+ end_cycle = true;
} break;
} // ** switch
- } while ( end_cycle == _FALSE );
+ } while ( end_cycle == false );
}
@@ -228,7 +227,7 @@
WorldViewInterface::getViewWindow(&world_win );
- if ( shell.isVisible( world_win ) == _TRUE )
+ if ( shell.isVisible( world_win ) == true )
{
//FRAME_BUFFER.lock();
shell.blit( &FRAME_BUFFER, world_win );
Index: netpanzer/src/NetPanzer/Classes/Weapons/Weapon.hpp
diff -u netpanzer/src/NetPanzer/Classes/Weapons/Weapon.hpp:1.1
netpanzer/src/NetPanzer/Classes/Weapons/Weapon.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/Weapons/Weapon.hpp:1.1 Sun Dec 1
12:51:56 2002
+++ netpanzer/src/NetPanzer/Classes/Weapons/Weapon.hpp Mon Sep 1 16:24:20 2003
@@ -20,7 +20,7 @@
#include "Projectile.hpp"
#include "BresenhamLine.hpp"
-#include "UnitId.hpp"
+#include "UnitID.hpp"
#include "Timer.hpp"
#include "Sprite.hpp"
#include "fXY.hpp"
@@ -62,6 +62,9 @@
public:
Weapon(UnitID &owner, unsigned short owner_type_id, unsigned short
damage, PointXYi &start, PointXYi &end);
+
+ virtual ~Weapon()
+ { }
virtual void updateStatus( void );
Index: netpanzer/src/NetPanzer/Classes/Weapons/WeaponGlobals.cpp
diff -u netpanzer/src/NetPanzer/Classes/Weapons/WeaponGlobals.cpp:1.1
netpanzer/src/NetPanzer/Classes/Weapons/WeaponGlobals.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/Weapons/WeaponGlobals.cpp:1.1 Sun Dec
1 12:51:56 2002
+++ netpanzer/src/NetPanzer/Classes/Weapons/WeaponGlobals.cpp Mon Sep 1
16:24:20 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "WeaponGlobals.hpp"
Index: netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp
diff -u netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp:1.1
netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp:1.1 Sun Dec
1 12:51:56 2002
+++ netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp Mon Sep 1
16:24:20 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "WorldInputCmdProcessor.hpp"
#include "MouseInterface.hpp"
@@ -45,7 +44,7 @@
#include "NetworkState.hpp"
-#include "Codewiz.hpp"
+#include "codewiz.hpp"
#include "ConsoleInterface.hpp"
#include "netPanzerGlobals.h"
@@ -73,7 +72,7 @@
_keyboard_input_mode_allie_mesg,
};
-boolean WorldInputCmdProcessor::unit_flag_visibility_state = _FALSE;
+bool WorldInputCmdProcessor::unit_flag_visibility_state = false;
short WorldInputCmdProcessor::selected_objective_id = 0;
WorldInputCmdProcessor::WorldInputCmdProcessor()
@@ -86,12 +85,12 @@
keyboard_input_mode = _keyboard_input_mode_command;
- selection_box_active = _FALSE;
- previous_manual_control_state = _FALSE;
- manual_control_state = _FALSE;
- manual_fire_state = _FALSE;
+ selection_box_active = false;
+ previous_manual_control_state = false;
+ manual_control_state = false;
+ manual_fire_state = false;
- left_button_hold_action_complete = _FALSE;
+ left_button_hold_action_complete = false;
}
void WorldInputCmdProcessor::initializeSelectionLists( void )
@@ -130,7 +129,7 @@
working_list.cycleNextUnit();
}
-void WorldInputCmdProcessor::updateScrollStatus( PointXYi &mouse_pos )
+void WorldInputCmdProcessor::updateScrollStatus(const PointXYi &mouse_pos )
{
PointXYi screen_size;
double time_slice;
@@ -174,7 +173,7 @@
PointXYi map_loc;
unsigned char unit_loc_status;
- if( (manual_control_state == _TRUE) || (manual_fire_state == _TRUE) )
+ if( (manual_control_state == true) || (manual_fire_state == true) )
{ return ( _cursor_enemy_unit ); }
MapInterface::pointXYtoMapXY( loc, &map_loc );
@@ -250,10 +249,10 @@
void WorldInputCmdProcessor::toggleUnitFlagVisibility( void )
{
- if ( GameConfig::getDisplayUnitFlags() == _TRUE )
- { GameConfig::setDisplayUnitFlags( _FALSE ); }
+ if ( GameConfig::getDisplayUnitFlags() == true )
+ { GameConfig::setDisplayUnitFlags( false ); }
else
- { GameConfig::setDisplayUnitFlags( _TRUE ); }
+ { GameConfig::setDisplayUnitFlags( true ); }
}
@@ -263,207 +262,207 @@
KeyboardInterface::getKeyState( _SCAN_RCRTL )
)
{
- manual_fire_state = _TRUE;
+ manual_fire_state = true;
}
else
{
- manual_fire_state = _FALSE;
+ manual_fire_state = false;
}
}
void WorldInputCmdProcessor::evaluateKeyCommands( void )
{
- //if ( (KeyboardInterface::getKeyPressed( _SCAN_U ) == _TRUE) )
+ //if ( (KeyboardInterface::getKeyPressed( _SCAN_U ) == true) )
// { cycleNextUnitAndChangeFocus(); }
- if ( (KeyboardInterface::getKeyPressed( _SCAN_O ) == _TRUE) )
+ if ( (KeyboardInterface::getKeyPressed( _SCAN_O ) == true) )
{ toggleDisplayOutpostNames(); }
- if ( (KeyboardInterface::getKeyPressed( _SCAN_F ) == _TRUE) )
+ if ( (KeyboardInterface::getKeyPressed( _SCAN_F ) == true) )
{ toggleUnitFlagVisibility(); }
- if ( (KeyboardInterface::getKeyPressed( _SCAN_ENTER ) == _TRUE) )
+ if ( (KeyboardInterface::getKeyPressed( _SCAN_ENTER ) == true) )
{ setKeyboardInputModeChatMesg(); }
if ( ( KeyboardInterface::getKeyState( _SCAN_LCRTL ) ||
KeyboardInterface::getKeyState( _SCAN_RCRTL ) )
- && (KeyboardInterface::getKeyPressed( _SCAN_A ) == _TRUE) )
+ && (KeyboardInterface::getKeyPressed( _SCAN_A ) == true) )
{ setKeyboardInputModeAllieChatMesg(); }
}
void WorldInputCmdProcessor::evaluateGroupingKeys( void )
{
- boolean shift_status = _FALSE;
- boolean alt_status = _FALSE;
+ bool shift_status = false;
+ bool alt_status = false;
- if( (KeyboardInterface::getKeyState( _SCAN_LFT_SHIFT ) == _TRUE) ||
- (KeyboardInterface::getKeyState( _SCAN_RGT_SHIFT ) == _TRUE)
+ if( (KeyboardInterface::getKeyState( _SCAN_LFT_SHIFT ) == true) ||
+ (KeyboardInterface::getKeyState( _SCAN_RGT_SHIFT ) == true)
)
{
- shift_status = _TRUE;
+ shift_status = true;
}
- if( (KeyboardInterface::getKeyState( _SCAN_ALT ) == _TRUE) )
+ if( (KeyboardInterface::getKeyState( _SCAN_ALT ) == true) )
{
- alt_status = _TRUE;
+ alt_status = true;
}
//*********************************************************
- if ( (KeyboardInterface::getKeyState( _SCAN_1 ) == _TRUE) &&
- (KeyboardInterface::getPrevKeyState( _SCAN_1) == _FALSE) )
+ if ( (KeyboardInterface::getKeyState( _SCAN_1 ) == true) &&
+ (KeyboardInterface::getPrevKeyState( _SCAN_1) == false) )
{
- if ( shift_status == _TRUE )
+ if ( shift_status == true )
{
setSelectionList(1);
ConsoleInterface::postMessage( "Group 1 Created" );
}
else
- if ( alt_status == _TRUE )
+ if ( alt_status == true )
{ switchSelectionList(1); }
else
{ cycleSelectedUnits(1); }
} // ** if
//*********************************************************
- if ( (KeyboardInterface::getKeyState( _SCAN_2 ) == _TRUE) &&
- (KeyboardInterface::getPrevKeyState( _SCAN_2) == _FALSE) )
+ if ( (KeyboardInterface::getKeyState( _SCAN_2 ) == true) &&
+ (KeyboardInterface::getPrevKeyState( _SCAN_2) == false) )
{
- if ( shift_status == _TRUE )
+ if ( shift_status == true )
{
setSelectionList(2);
ConsoleInterface::postMessage( "Group 2 Created" );
}
else
- if ( alt_status == _TRUE )
+ if ( alt_status == true )
{ switchSelectionList(2); }
else
{ cycleSelectedUnits(2); }
} // ** if
//*********************************************************
- if ( (KeyboardInterface::getKeyState( _SCAN_3 ) == _TRUE) &&
- (KeyboardInterface::getPrevKeyState( _SCAN_3) == _FALSE) )
+ if ( (KeyboardInterface::getKeyState( _SCAN_3 ) == true) &&
+ (KeyboardInterface::getPrevKeyState( _SCAN_3) == false) )
{
- if ( shift_status == _TRUE )
+ if ( shift_status == true )
{
setSelectionList(3);
ConsoleInterface::postMessage( "Group 3 Created" );
}
else
- if ( alt_status == _TRUE )
+ if ( alt_status == true )
{ switchSelectionList(3); }
else
{ cycleSelectedUnits(3); }
} // ** if
//*********************************************************
- if ( (KeyboardInterface::getKeyState( _SCAN_4 ) == _TRUE) &&
- (KeyboardInterface::getPrevKeyState( _SCAN_4) == _FALSE) )
+ if ( (KeyboardInterface::getKeyState( _SCAN_4 ) == true) &&
+ (KeyboardInterface::getPrevKeyState( _SCAN_4) == false) )
{
- if ( shift_status == _TRUE )
+ if ( shift_status == true )
{
setSelectionList(4);
ConsoleInterface::postMessage( "Group 4 Created" );
}
else
- if ( alt_status == _TRUE )
+ if ( alt_status == true )
{ switchSelectionList(4); }
else
{ cycleSelectedUnits(4); }
} // ** if
//*********************************************************
- if ( (KeyboardInterface::getKeyState( _SCAN_5 ) == _TRUE) &&
- (KeyboardInterface::getPrevKeyState( _SCAN_5) == _FALSE) )
+ if ( (KeyboardInterface::getKeyState( _SCAN_5 ) == true) &&
+ (KeyboardInterface::getPrevKeyState( _SCAN_5) == false) )
{
- if ( shift_status == _TRUE )
+ if ( shift_status == true )
{
setSelectionList(5);
ConsoleInterface::postMessage( "Group 5 Created" );
}
else
- if ( alt_status == _TRUE )
+ if ( alt_status == true )
{ switchSelectionList(5); }
else
{ cycleSelectedUnits(5); }
} // ** if
//*********************************************************
- if ( (KeyboardInterface::getKeyState( _SCAN_6 ) == _TRUE) &&
- (KeyboardInterface::getPrevKeyState( _SCAN_6) == _FALSE) )
+ if ( (KeyboardInterface::getKeyState( _SCAN_6 ) == true) &&
+ (KeyboardInterface::getPrevKeyState( _SCAN_6) == false) )
{
- if ( shift_status == _TRUE )
+ if ( shift_status == true )
{
setSelectionList(6);
ConsoleInterface::postMessage( "Group 6 Created" );
}
else
- if ( alt_status == _TRUE )
+ if ( alt_status == true )
{ switchSelectionList(6); }
else
{ cycleSelectedUnits(6); }
} // ** if
//*********************************************************
- if ( (KeyboardInterface::getKeyState( _SCAN_7 ) == _TRUE) &&
- (KeyboardInterface::getPrevKeyState( _SCAN_7) == _FALSE) )
+ if ( (KeyboardInterface::getKeyState( _SCAN_7 ) == true) &&
+ (KeyboardInterface::getPrevKeyState( _SCAN_7) == false) )
{
- if ( shift_status == _TRUE )
+ if ( shift_status == true )
{
setSelectionList(7);
ConsoleInterface::postMessage( "Group 7 Created" );
}
else
- if ( alt_status == _TRUE )
+ if ( alt_status == true )
{ switchSelectionList(7); }
else
{ cycleSelectedUnits(7); }
} // ** if
//*********************************************************
- if ( (KeyboardInterface::getKeyState( _SCAN_8 ) == _TRUE) &&
- (KeyboardInterface::getPrevKeyState( _SCAN_8) == _FALSE) )
+ if ( (KeyboardInterface::getKeyState( _SCAN_8 ) == true) &&
+ (KeyboardInterface::getPrevKeyState( _SCAN_8) == false) )
{
- if ( shift_status == _TRUE )
+ if ( shift_status == true )
{
setSelectionList(8);
ConsoleInterface::postMessage( "Group 8 Created" );
}
else
- if ( alt_status == _TRUE )
+ if ( alt_status == true )
{ switchSelectionList(8); }
else
{ cycleSelectedUnits(8); }
} // ** if
//*********************************************************
- if ( (KeyboardInterface::getKeyState( _SCAN_9 ) == _TRUE) &&
- (KeyboardInterface::getPrevKeyState( _SCAN_9) == _FALSE) )
+ if ( (KeyboardInterface::getKeyState( _SCAN_9 ) == true) &&
+ (KeyboardInterface::getPrevKeyState( _SCAN_9) == false) )
{
- if ( shift_status == _TRUE )
+ if ( shift_status == true )
{
setSelectionList(9);
ConsoleInterface::postMessage( "Group 9 Created" );
}
else
- if ( alt_status == _TRUE )
+ if ( alt_status == true )
{ switchSelectionList(9); }
else
{ cycleSelectedUnits(9); }
} // ** if
//*********************************************************
- if ( (KeyboardInterface::getKeyState( _SCAN_0 ) == _TRUE) &&
- (KeyboardInterface::getPrevKeyState( _SCAN_0) == _FALSE) )
+ if ( (KeyboardInterface::getKeyState( _SCAN_0 ) == true) &&
+ (KeyboardInterface::getPrevKeyState( _SCAN_0) == false) )
{
- if ( shift_status == _TRUE )
+ if ( shift_status == true )
{
setSelectionList(0);
ConsoleInterface::postMessage( "Group 0 Created" );
}
else
- if ( alt_status == _TRUE )
+ if ( alt_status == true )
{ switchSelectionList(0); }
else
{ cycleSelectedUnits(0); }
@@ -484,7 +483,7 @@
void WorldInputCmdProcessor::setKeyboardInputModeChatMesg( void )
{
- ConsoleInterface::setInputStringStatus( _TRUE );
+ ConsoleInterface::setInputStringStatus( true );
ConsoleInterface::resetInputString( "Message All: " );
ChatInterface::setMessageScopeAll();
KeyboardInterface::flushCharBuffer();
@@ -495,17 +494,17 @@
void WorldInputCmdProcessor::keyboardInputModeChatMesg( void )
{
char chat_string[256];
- if ( getConsoleInputString( chat_string ) == _TRUE )
+ if ( getConsoleInputString( chat_string ) == true )
{
keyboard_input_mode = _keyboard_input_mode_command;
- ConsoleInterface::setInputStringStatus( _FALSE );
+ ConsoleInterface::setInputStringStatus( false );
ChatInterface::sendCurrentMessage( chat_string );
}
}
void WorldInputCmdProcessor::setKeyboardInputModeAllieChatMesg( void )
{
- ConsoleInterface::setInputStringStatus( _TRUE );
+ ConsoleInterface::setInputStringStatus( true );
ConsoleInterface::resetInputString( "Message Allies : " );
ChatInterface::setMessageScopeAllies();
KeyboardInterface::flushCharBuffer();
@@ -516,10 +515,10 @@
void WorldInputCmdProcessor::keyboardInputModeAllieChatMesg( void )
{
char chat_string[256];
- if ( getConsoleInputString( chat_string ) == _TRUE )
+ if ( getConsoleInputString( chat_string ) == true )
{
keyboard_input_mode = _keyboard_input_mode_command;
- ConsoleInterface::setInputStringStatus( _FALSE );
+ ConsoleInterface::setInputStringStatus( false );
ChatInterface::sendCurrentMessage( chat_string );
}
}
@@ -543,9 +542,9 @@
}
}
-boolean WorldInputCmdProcessor::selectBoundBoxUnits( void )
+bool WorldInputCmdProcessor::selectBoundBoxUnits( void )
{
- boolean select_success;
+ bool select_success;
long x,y;
if ( box_press.x > box_release.x )
@@ -564,12 +563,12 @@
select_success = working_list.selectBounded( Recti( box_press, box_release )
);
- if ( select_success == _FALSE )
+ if ( select_success == false )
{
PointXYi box_size;
box_size = box_release - box_press;
if ( (box_size.x > 40) || (box_size.y > 40) )
- select_success = _TRUE;
+ select_success = true;
return( select_success );
}
@@ -595,20 +594,20 @@
//updateScrollStatus( mouse_pos );
- if ( (MouseInterface::buttonHeld( _LEFT_BUTTON_MASK ) == _TRUE)
- && (manual_control_state == _FALSE) && (manual_fire_state == _FALSE)
+ if ( (MouseInterface::buttonHeld( _LEFT_BUTTON_MASK ) == true)
+ && (manual_control_state == false) && (manual_fire_state == false)
)
{
- if ( selection_box_active == _FALSE )
+ if ( selection_box_active == false )
{
- selection_box_active = _TRUE;
+ selection_box_active = true;
}
}
else
{
- if ( selection_box_active == _TRUE )
+ if ( selection_box_active == true )
{
- selection_box_active = _FALSE;
+ selection_box_active = false;
box_release = world_pos;
left_button_hold_action_complete = selectBoundBoxUnits();
}
@@ -627,7 +626,7 @@
evalRightMButtonEvents( event );
}
- left_button_hold_action_complete = _FALSE;
+ left_button_hold_action_complete = false;
}
@@ -636,7 +635,7 @@
PointXYi world_pos;
unsigned char click_status;
- if ( (manual_control_state == _TRUE) ||
+ if ( (manual_control_state == true) ||
KeyboardInterface::getKeyState( _SCAN_LCRTL ) ||
KeyboardInterface::getKeyState( _SCAN_RCRTL )
)
@@ -654,7 +653,7 @@
{
if ( event.event == _event_mbutton_down )
{
- if ( selection_box_active == _FALSE )
+ if ( selection_box_active == false )
{
WorldViewInterface::clientXYtoWorldXY( world_win, event.down_pos,
&world_pos );
box_press = world_pos;
@@ -663,7 +662,7 @@
} // ** _event_mbutton_down
- if ( (event.event == _event_mbutton_click) &&
(left_button_hold_action_complete == _FALSE) )
+ if ( (event.event == _event_mbutton_click) &&
(left_button_hold_action_complete == false) )
{
WorldViewInterface::clientXYtoWorldXY( world_win, event.down_pos,
&world_pos );
click_status = getCursorStatus( world_pos );
@@ -672,8 +671,8 @@
{
case _cursor_player_unit :
{
- if( (KeyboardInterface::getKeyState( _SCAN_LFT_SHIFT ) == _TRUE) ||
- (KeyboardInterface::getKeyState( _SCAN_RGT_SHIFT ) == _TRUE)
+ if( (KeyboardInterface::getKeyState( _SCAN_LFT_SHIFT ) == true) ||
+ (KeyboardInterface::getKeyState( _SCAN_RGT_SHIFT ) == true)
)
{ working_list.addUnit( world_pos ); }
else
@@ -699,19 +698,19 @@
case _cursor_make_allie :
{
- sendAllianceRequest( world_pos, _TRUE );
+ sendAllianceRequest( world_pos, true );
} break;
case _cursor_break_allie :
{
- sendAllianceRequest( world_pos, _FALSE );
+ sendAllianceRequest( world_pos, false );
} break;
} // ** switch
} // ** if _event_mbutton_click
- } // ** else manual_control_state == _FALSE;
+ } // ** else manual_control_state == false;
} // ** evalLeftMButtonEvents
@@ -794,9 +793,9 @@
for( id_list_index = 0; id_list_index < id_list_size; id_list_index++ )
{
unit_ptr = UnitInterface::getUnit( working_list.unit_list[ id_list_index ]
);
- if ( unit_ptr != NULL )
+ if ( unit_ptr != 0 )
{
- if ( unit_ptr->unit_state.select == _TRUE )
+ if ( unit_ptr->unit_state.select == true )
{
matrix.getNextEmptyLoc( &map_pos );
comm_mesg.comm_request.setHeader( unit_ptr->unit_id,
_umesg_flag_unique );
@@ -810,11 +809,11 @@
//CLIENT->sendMessage( &comm_mesg, sizeof(TerminalUnitCmdRequest), 0
);
} // ** if
- } // ** if unit_ptr->isValid() == _TRUE
+ } // ** if unit_ptr->isValid() == true
} // ** for
PUBLIC_MESSAGE_ENCODER.getEncodeMessage( &encode_message );
- if ( encode_message != NULL )
+ if ( encode_message != 0 )
{
CLIENT->sendMessage( encode_message, encode_message->realSize(), 0 );
} // ** if
@@ -835,7 +834,7 @@
unsigned long id_list_size;
UnitBase *unit_ptr;
- if ( working_list.isSelected() == _TRUE )
+ if ( working_list.isSelected() == true )
{
target_list.selectTarget( world_pos );
@@ -851,9 +850,9 @@
for( id_list_index = 0; id_list_index < id_list_size; id_list_index++ )
{
unit_ptr = UnitInterface::getUnit( working_list.unit_list[ id_list_index
] );
- if ( unit_ptr != NULL )
+ if ( unit_ptr != 0 )
{
- if ( unit_ptr->unit_state.select == _TRUE )
+ if ( unit_ptr->unit_state.select == true )
{
comm_mesg.comm_request.setHeader( unit_ptr->unit_id,
_umesg_flag_unique );
comm_mesg.comm_request.setTargetUnit( target_ptr->unit_id );
@@ -870,7 +869,7 @@
} // ** for
PUBLIC_MESSAGE_ENCODER.getEncodeMessage( &encode_message );
- if ( encode_message != NULL )
+ if ( encode_message != 0 )
{
CLIENT->sendMessage( encode_message, encode_message->realSize(), 0 );
} // ** if
@@ -881,7 +880,7 @@
}
void WorldInputCmdProcessor::sendManualMoveCommand( unsigned char orientation,
- boolean start_stop )
+ bool start_stop )
{
TerminalUnitCmdRequest comm_mesg;
unsigned long id_list_index;
@@ -897,12 +896,12 @@
for( id_list_index = 0; id_list_index < id_list_size; id_list_index++ )
{
unit_ptr = UnitInterface::getUnit( working_list.unit_list[
id_list_index ] );
- if ( unit_ptr != NULL )
+ if ( unit_ptr != 0 )
{
- if ( unit_ptr->unit_state.select == _TRUE )
+ if ( unit_ptr->unit_state.select == true )
{
comm_mesg.comm_request.setHeader( unit_ptr->unit_id,
_umesg_flag_unique );
- if ( start_stop == _TRUE )
+ if ( start_stop == true )
{
comm_mesg.comm_request.setStartManualMove( orientation );
}
@@ -915,7 +914,7 @@
PUBLIC_MESSAGE_ENCODER.encodeMessage( &comm_mesg,
sizeof(TerminalUnitCmdRequest) );
} // ** if
- } // ** if unit_ptr != NULL
+ } // ** if unit_ptr != 0
} // ** for
@@ -944,9 +943,9 @@
{
unit_ptr = UnitInterface::getUnit( working_list.unit_list[
id_list_index ] );
- if ( unit_ptr != NULL )
+ if ( unit_ptr != 0 )
{
- if ( unit_ptr->unit_state.select == _TRUE )
+ if ( unit_ptr->unit_state.select == true )
{
comm_mesg.comm_request.setHeader( unit_ptr->unit_id,
_umesg_flag_unique );
comm_mesg.comm_request.setManualFire( world_pos );
@@ -963,7 +962,7 @@
} // ** for
PUBLIC_MESSAGE_ENCODER.getEncodeMessage( &encode_message );
- if ( encode_message != NULL )
+ if ( encode_message != 0 )
{
CLIENT->sendMessage( encode_message, encode_message->realSize(), 0 );
} // ** if
@@ -973,13 +972,13 @@
}
-void WorldInputCmdProcessor::sendAllianceRequest( PointXYi &world_pos, boolean
make_break )
+void WorldInputCmdProcessor::sendAllianceRequest( PointXYi &world_pos, bool
make_break )
{
UnitBase *target_ptr;
target_list.selectTarget( world_pos );
- if ( target_list.isSelected() == _TRUE )
+ if ( target_list.isSelected() == true )
{
target_ptr = UnitInterface::getUnit( target_list.unit_list[0] );
@@ -1017,7 +1016,7 @@
working_list.validateList();
}
-boolean WorldInputCmdProcessor::getConsoleInputString( char *input_string )
+bool WorldInputCmdProcessor::getConsoleInputString( char *input_string )
{
char key_char;
while (KeyboardInterface::getChar(&key_char))
@@ -1034,7 +1033,7 @@
if (enter_key_hit_count == 2)
{
ConsoleInterface::getInputString( input_string );
- return( _TRUE );
+ return( true );
}
}
}
@@ -1045,7 +1044,7 @@
}
}
- return( _FALSE );
+ return( false );
}
@@ -1061,7 +1060,7 @@
WorldViewInterface::getViewWindow( &world_win );
WorldViewInterface::clientXYtoWorldXY( world_win, mouse_pos, &world_pos );
- selection_box_active = _FALSE;
+ selection_box_active = false;
box_press = world_pos;
box_release = world_pos;
}
@@ -1071,7 +1070,7 @@
PointXYi client_pos;
PointXYi mouse_pos;
- if ( selection_box_active == TRUE )
+ if ( selection_box_active == true )
{
MouseInterface::getMousePosition( (long *) &mouse_pos.x, (long *)
&mouse_pos.y );
@@ -1113,30 +1112,30 @@
WorldViewInterface::getViewWindow( &world_win );
WorldViewInterface::clientXYtoWorldXY( world_win, mouse_pos, &world_pos );
- if ( selection_box_active == _TRUE )
+ if ( selection_box_active == true )
{
- selection_box_active = _FALSE;
+ selection_box_active = false;
box_release = world_pos;
left_button_hold_action_complete = selectBoundBoxUnits();
}
else
{
- selection_box_active = _FALSE;
+ selection_box_active = false;
box_press = world_pos;
box_release = world_pos;
}
}
-boolean WorldInputCmdProcessor::isUnitSelected( void )
+bool WorldInputCmdProcessor::isUnitSelected( void )
{
if( working_list.unit_list.containsItems() > 0 )
- { return( _TRUE ); }
+ { return( true ); }
else
- { return( _FALSE ); }
+ { return( false ); }
}
-boolean WorldInputCmdProcessor::selectUnits( Recti bound_box )
+bool WorldInputCmdProcessor::selectUnits( Recti bound_box )
{
long x,y;
@@ -1157,27 +1156,27 @@
return( working_list.selectBounded( bound_box ) );
}
-boolean WorldInputCmdProcessor::isValidMoveLocation( PointXYi location )
+bool WorldInputCmdProcessor::isValidMoveLocation( PointXYi location )
{
int click_status;
click_status = getCursorStatus( location );
if ( click_status != _cursor_move )
- { return( _FALSE ); }
+ { return( false ); }
- return( _TRUE );
+ return( true );
}
-boolean WorldInputCmdProcessor::sendMoveCommandExternal( PointXYi location )
+bool WorldInputCmdProcessor::sendMoveCommandExternal( PointXYi location )
{
int click_status;
click_status = getCursorStatus( location );
if ( click_status != _cursor_move )
- { return( _FALSE ); }
+ { return( false ); }
sendMoveCommand( location );
- return( _TRUE );
+ return( true );
}
void WorldInputCmdProcessor::deselectUnitsExternal( void )
@@ -1208,14 +1207,14 @@
switchSelectionList( group );
}
-boolean WorldInputCmdProcessor::isObjectiveSelected( void )
+bool WorldInputCmdProcessor::isObjectiveSelected( void )
{
- if (Desktop::getVisible("VehicleSelectionView") == _TRUE )
+ if (Desktop::getVisible("VehicleSelectionView") == true )
{
- return( _TRUE );
+ return( true );
}
- return( _FALSE );
+ return( false );
}
char * WorldInputCmdProcessor::getSelectedObjectiveName( void )
Index: netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.hpp
diff -u netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.hpp:1.1
netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.hpp:1.1 Sun Dec
1 12:51:56 2002
+++ netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.hpp Mon Sep 1
16:24:20 2003
@@ -27,16 +27,16 @@
protected:
Recti world_win;
- boolean left_button_hold_action_complete;
+ bool left_button_hold_action_complete;
- boolean selection_box_active;
+ bool selection_box_active;
PointXYi box_press, box_release;
- boolean selectBoundBoxUnits( void );
+ bool selectBoundBoxUnits( void );
- boolean local_key_table[256];
- boolean manual_control_state;
- boolean previous_manual_control_state;
- boolean manual_fire_state;
+ bool local_key_table[256];
+ bool manual_control_state;
+ bool previous_manual_control_state;
+ bool manual_fire_state;
SelectionList selection_group_lists[10];
SelectionList working_list;
@@ -51,7 +51,7 @@
unsigned long unit_cycle_search_iterator;
void cycleNextUnitAndChangeFocus( void );
- static boolean unit_flag_visibility_state;
+ static bool unit_flag_visibility_state;
void toggleUnitFlagVisibility( void );
unsigned char getCursorStatus( PointXYi &loc );
@@ -60,11 +60,11 @@
void getManualControlStatus( void );
void sendManualMoveCommand( unsigned char orientation,
- boolean start_stop );
+ bool start_stop );
void sendManualFireCommand( PointXYi &world_pos );
void sendMoveCommand( PointXYi &world_pos );
void sendAttackCommand( PointXYi &world_pos );
- void sendAllianceRequest( PointXYi &world_pos, boolean make_break );
+ void sendAllianceRequest( PointXYi &world_pos, bool make_break );
void evalLeftMButtonEvents( MouseEvent &event );
void evalRightMButtonEvents( MouseEvent &event );
@@ -86,7 +86,7 @@
void evaluateKeyboardEvents( void );
- boolean getConsoleInputString( char *input_string );
+ bool getConsoleInputString( char *input_string );
static short selected_objective_id;
@@ -98,17 +98,17 @@
void inFocus( void );
- void updateScrollStatus( PointXYi &mouse_pos );
+ void updateScrollStatus( const PointXYi &mouse_pos );
void updateControls( void );
void closeSelectionBox( void );
// ** methods for external input control
- boolean isUnitSelected( void );
- boolean selectUnits( Recti bound_box );
- boolean isValidMoveLocation( PointXYi location );
- boolean sendMoveCommandExternal( PointXYi location );
+ bool isUnitSelected( void );
+ bool selectUnits( Recti bound_box );
+ bool isValidMoveLocation( PointXYi location );
+ bool sendMoveCommandExternal( PointXYi location );
void deselectUnitsExternal( void );
void startChatMessageAll( void );
@@ -117,7 +117,7 @@
void createGroup( unsigned long group );
void activateGroup( unsigned long group );
- static boolean isObjectiveSelected( void );
+ static bool isObjectiveSelected( void );
static char * getSelectedObjectiveName( void );
static PointXYi getSelectedObjectiveWorldPos( void );
};
Index: netpanzer/src/NetPanzer/Classes/WorldMap.cpp
diff -u netpanzer/src/NetPanzer/Classes/WorldMap.cpp:1.1
netpanzer/src/NetPanzer/Classes/WorldMap.cpp:1.2
--- netpanzer/src/NetPanzer/Classes/WorldMap.cpp:1.1 Sun Dec 1 12:51:56 2002
+++ netpanzer/src/NetPanzer/Classes/WorldMap.cpp Mon Sep 1 16:24:20 2003
@@ -15,18 +15,17 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "WorldMap.hpp"
#include "MapData.hpp"
-#include <Stdlib.h>
+#include <stdlib.h>
#include <stdio.h>
#include <string.h>
WorldMap::WorldMap()
{
- map_buffer = NULL;
+ map_buffer = 0;
}
void WorldMap::reMap( WadMapTable &mapping_table )
@@ -49,18 +48,18 @@
void WorldMap::loadMapFile( const char *file_path )
{
FILE *infile;
- map_file_header_type map_header;
+ //map_file_header_type map_header;
unsigned long map_size;
/*
infile = fopen( file_path, "rb" );
- assert( infile != NULL );
+ assert( infile != 0 );
- if ( map_loaded == _TRUE )
+ if ( map_loaded == true )
{
delete( map_buffer );
- map_buffer = NULL;
- map_loaded = _FALSE;
+ map_buffer = 0;
+ map_loaded = false;
}
fread( &map_header, sizeof( map_file_header_type ), 1, infile );
@@ -72,25 +71,25 @@
strcpy( (char *) map_info.name, map_header.map_name );
map_buffer = new MapElementType [ map_header.map_data_size ];
- assert( map_buffer != NULL );
+ assert( map_buffer != 0 );
fread( map_buffer, map_header.map_data_size, 1, infile );
fclose( infile );
- map_loaded = _TRUE;
+ map_loaded = true;
*/
//*****************************************************************
infile = fopen( file_path, "rb" );
- assert( infile != NULL );
+ assert( infile != 0 );
- if ( map_loaded == _TRUE )
+ if ( map_loaded == true )
{
delete( map_buffer );
- map_buffer = NULL;
- map_loaded = _FALSE;
+ map_buffer = 0;
+ map_loaded = false;
}
fread( &map_info, sizeof( MAP_HEADER ), 1, infile );
@@ -98,12 +97,12 @@
map_size = (map_info.x_size * map_info.y_size);
map_buffer = new MapElementType [ map_size ];
- assert( map_buffer != NULL );
+ assert( map_buffer != 0 );
fread( map_buffer, map_size, sizeof(MapElementType), infile );
fclose( infile );
- map_loaded = _TRUE;
+ map_loaded = true;
}
Index: netpanzer/src/NetPanzer/Classes/WorldMap.hpp
diff -u netpanzer/src/NetPanzer/Classes/WorldMap.hpp:1.1
netpanzer/src/NetPanzer/Classes/WorldMap.hpp:1.2
--- netpanzer/src/NetPanzer/Classes/WorldMap.hpp:1.1 Sun Dec 1 12:51:56 2002
+++ netpanzer/src/NetPanzer/Classes/WorldMap.hpp Mon Sep 1 16:24:20 2003
@@ -18,7 +18,6 @@
#ifndef _WORLDMAP_HPP
#define _WORLDMAP_HPP
-#include "Aliasdef.h"
#include "PObject.hpp"
#include "MapFileStruct.hpp"
#include "WadMapTable.hpp"
@@ -28,7 +27,7 @@
class WorldMap : virtual PObject
{
protected:
- boolean map_loaded;
+ bool map_loaded;
MAP_HEADER map_info;
MapElementType *map_buffer;
@@ -40,7 +39,7 @@
void reMap( WadMapTable &mapping_table );
- inline boolean isMapLoaded( void )
+ inline bool isMapLoaded( void )
{ return( map_loaded ); }
inline unsigned char * getName( void )
Index: netpanzer/src/NetPanzer/Core/loadPics.cpp
diff -u netpanzer/src/NetPanzer/Core/loadPics.cpp:1.1
netpanzer/src/NetPanzer/Core/loadPics.cpp:1.2
--- netpanzer/src/NetPanzer/Core/loadPics.cpp:1.1 Sun Dec 1 12:51:56 2002
+++ netpanzer/src/NetPanzer/Core/loadPics.cpp Mon Sep 1 16:24:20 2003
@@ -19,8 +19,6 @@
// Includes.
////////////////////////////////////////////////////////////////////////////
-#include "stdafx.hpp"
-
#include "Surface.hpp"
#include "loadPics.hpp"
Index: netpanzer/src/NetPanzer/Core/netPanzerGlobals.cpp
diff -u netpanzer/src/NetPanzer/Core/netPanzerGlobals.cpp:1.1
netpanzer/src/NetPanzer/Core/netPanzerGlobals.cpp:1.2
--- netpanzer/src/NetPanzer/Core/netPanzerGlobals.cpp:1.1 Sun Dec 1
12:51:56 2002
+++ netpanzer/src/NetPanzer/Core/netPanzerGlobals.cpp Mon Sep 1 16:24:20 2003
@@ -15,10 +15,9 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "netPanzerGlobals.h"
-#include <windows.h>
+//#include <windows.h>
unsigned short MOUSE_X;
unsigned short MOUSE_Y;
@@ -27,8 +26,8 @@
unsigned short MAKE_MID_MOUSE_BUTTON;
unsigned char MOUSE_BUTTON_MASK;
-char PANZER_THREAD_ACTIVE = TRUE;
-char PANZER_THREAD_FINISHED = FALSE;
+char PANZER_THREAD_ACTIVE = true;
+char PANZER_THREAD_FINISHED = false;
unsigned long PANZER_THREAD_HANDLE;
char FUCK_THREAD;
Index: netpanzer/src/NetPanzer/Core/netPanzerMain.cpp
diff -u netpanzer/src/NetPanzer/Core/netPanzerMain.cpp:1.1
netpanzer/src/NetPanzer/Core/netPanzerMain.cpp:1.2
--- netpanzer/src/NetPanzer/Core/netPanzerMain.cpp:1.1 Sun Dec 1 12:51:56 2002
+++ netpanzer/src/NetPanzer/Core/netPanzerMain.cpp Mon Sep 1 16:24:20 2003
@@ -15,26 +15,25 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "netPanzerMain.h"
-#include <windows.h>
+//#include <windows.h>
#include "gapp.hpp"
#include "netPanzerGlobals.h"
#include "GameManager.hpp"
-BOOL netPanzerInitialize( const char *command_line )
+bool netPanzerInitialize( const char *command_line )
{
return( GameManager::initialize( command_line ) );
}
-VOID netPanzerShutdown( void )
+void netPanzerShutdown()
{
GameManager::shutdown();
}
-void mainGameLoop( void )
+void mainGameLoop()
{
}
Index: netpanzer/src/NetPanzer/Core/netPanzerMain.h
diff -u netpanzer/src/NetPanzer/Core/netPanzerMain.h:1.1
netpanzer/src/NetPanzer/Core/netPanzerMain.h:1.2
--- netpanzer/src/NetPanzer/Core/netPanzerMain.h:1.1 Sun Dec 1 12:51:56 2002
+++ netpanzer/src/NetPanzer/Core/netPanzerMain.h Mon Sep 1 16:24:20 2003
@@ -18,12 +18,12 @@
#ifndef _NETPANZERMAIN_HPP
#define _NETPANZERMAIN_HPP
-#include <windows.h>
+//#include <windows.h>
-BOOL netPanzerInitialize( const char *command_line );
+bool netPanzerInitialize( const char *command_line );
-VOID netPanzerShutdown( void );
+void netPanzerShutdown();
-void mainGameLoop( void );
+void mainGameLoop();
#endif
Index: netpanzer/src/NetPanzer/Core/netPanzerThread.cpp
diff -u netpanzer/src/NetPanzer/Core/netPanzerThread.cpp:1.1
netpanzer/src/NetPanzer/Core/netPanzerThread.cpp:1.2
--- netpanzer/src/NetPanzer/Core/netPanzerThread.cpp:1.1 Sun Dec 1
12:51:56 2002
+++ netpanzer/src/NetPanzer/Core/netPanzerThread.cpp Mon Sep 1 16:24:20 2003
@@ -15,19 +15,18 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "netPanzerThread.h"
#include "netPanzerGlobals.h"
#include "netPanzerMain.h"
-#include <process.h>
+//#include <process.h>
#include "GameManager.hpp"
-VOID PanzerThread(PVOID pvoid)
+void PanzerThread(void* ptr)
{
- while( PANZER_THREAD_ACTIVE == TRUE )
+ while( PANZER_THREAD_ACTIVE == true )
{
if ( FUCK_THREAD == 1 )
{
@@ -36,7 +35,8 @@
GameManager::mainLoop();
} // ** while
- PANZER_THREAD_FINISHED = TRUE;
+ PANZER_THREAD_FINISHED = true;
- _endthread();
+ // XXX
+ //_endthread();
}
Index: netpanzer/src/NetPanzer/Core/netPanzerThread.h
diff -u netpanzer/src/NetPanzer/Core/netPanzerThread.h:1.1
netpanzer/src/NetPanzer/Core/netPanzerThread.h:1.2
--- netpanzer/src/NetPanzer/Core/netPanzerThread.h:1.1 Sun Dec 1 12:51:56 2002
+++ netpanzer/src/NetPanzer/Core/netPanzerThread.h Mon Sep 1 16:24:20 2003
@@ -18,8 +18,8 @@
#ifndef _NETPANZERTHREAD_HPP
#define _NETPANZERTHREAD_HPP
-#include <windows.h>
+//#include <windows.h>
-VOID PanzerThread(PVOID pvoid);
+void PanzerThread(void* ptr);
#endif // ** _NETPANZERTHREAD_HPP
Index: netpanzer/src/NetPanzer/Core/netPanzerWinMain.cpp
diff -u netpanzer/src/NetPanzer/Core/netPanzerWinMain.cpp:1.2
netpanzer/src/NetPanzer/Core/netPanzerWinMain.cpp:1.3
--- netpanzer/src/NetPanzer/Core/netPanzerWinMain.cpp:1.2 Sun Aug 31
20:03:03 2003
+++ netpanzer/src/NetPanzer/Core/netPanzerWinMain.cpp Mon Sep 1 16:24:20 2003
@@ -15,8 +15,11 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
-#include <process.h>
+// XXX need new unix code here
+#ifndef UNIX
+#include <config.h>
+#include <stdlib.h>
+#include <windows.h>
#include "netPanzerWinMain.h"
#include "netPanzerWinProc.h"
#include "gapp.hpp"
@@ -26,7 +29,8 @@
#include "resource.h"
#include "GameManager.hpp"
-int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR
lpCmdLine, int nCmdShow)
+int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
+ LPSTR lpCmdLine, int nCmdShow)
{
//first declare a message structure to hold Windows messages
//and a structure to contain the data pertinent to this application--
@@ -35,26 +39,28 @@
//clear out the GlobalApp data--
memset((void *) &gapp, 0, sizeof(gapp));
+#ifdef USE_SDL
SDL_Init(SDL_INIT_EVERYTHING);
+#endif
//Initialize the Windows portion of PanzerKrieg (create a window,
//fill in the contents of our GlobalApp structure, etc.)
- if( WinInit( hInstance, nCmdShow) == FALSE) return FALSE;
+ if( WinInit( hInstance, nCmdShow) == false) return false;
- if( netPanzerInitialize( lpCmdLine ) == FALSE)
- return FALSE;
+ if( netPanzerInitialize( lpCmdLine ) == false)
+ return false;
//the game loop--
- //PANZER_THREAD_HANDLE = _beginthread(PanzerThread, 0, NULL);
+ //PANZER_THREAD_HANDLE = _beginthread(PanzerThread, 0, 0);
//just cause they do it in the book, for now only--
- ShowCursor( FALSE );
+ ShowCursor( false );
while( 1 )
{
- if( PeekMessage( &message, NULL, 0, 0, PM_NOREMOVE ) )
+ if( PeekMessage( &message, 0, 0, 0, PM_NOREMOVE ) )
{
- if(GetMessage( &message, NULL, 0, 0))
+ if(GetMessage( &message, 0, 0, 0))
{
TranslateMessage(&message);
DispatchMessage(&message);
@@ -66,9 +72,9 @@
} // ** if PeekMessage
else
{
- if ( FUCK_THREAD == TRUE )
+ if ( FUCK_THREAD == true )
{
- FUCK_THREAD = FALSE;
+ FUCK_THREAD = false;
}
GameManager::mainLoop();
@@ -83,7 +89,7 @@
//this function creates and registers a windows class for our
//application. then it creates our window using that class--
-static BOOL WinInit( HANDLE hInstance, int nCmdShow)
+static bool WinInit( HANDLE hInstance, int nCmdShow)
{
RECT client_win_rect;
WNDCLASS wc;
@@ -96,19 +102,19 @@
wc.cbWndExtra = 0;
wc.hInstance = (HINSTANCE) hInstance;
wc.hIcon = LoadIcon( (HINSTANCE) hInstance,
MAKEINTATOM(IDI_ICON1));
- wc.hCursor = LoadCursor( NULL, IDC_ARROW);
+ wc.hCursor = LoadCursor( 0, IDC_ARROW);
wc.hbrBackground = (HBRUSH) GetStockObject( BLACK_BRUSH);
- wc.lpszMenuName = NULL;
+ wc.lpszMenuName = 0;
wc.lpszClassName = "netPanzerClass";
- if( !RegisterClass( &wc )) return FALSE;
+ if( !RegisterClass( &wc )) return false;
client_win_rect.left = 0;
client_win_rect.right = 640;
client_win_rect.top = 0;
client_win_rect.bottom = 480;
- AdjustWindowRect( &client_win_rect, WS_SYSMENU | WS_BORDER | WS_CAPTION |
WS_VISIBLE | WS_MINIMIZEBOX, FALSE );
+ AdjustWindowRect( &client_win_rect, WS_SYSMENU | WS_BORDER | WS_CAPTION |
WS_VISIBLE | WS_MINIMIZEBOX, false );
gapp.hwndApp = CreateWindowEx(
WS_EX_APPWINDOW,
@@ -119,13 +125,14 @@
0,
client_win_rect.right, //GetSystemMetrics(SM_CXSCREEN),
client_win_rect.bottom, //GetSystemMetrics(SM_CYSCREEN),
- NULL,
- NULL,
+ 0,
+ 0,
(HINSTANCE) hInstance,
- NULL );
+ 0 );
- if( gapp.hwndApp == NULL) return FALSE;
+ if( gapp.hwndApp == 0) return false;
else
- return TRUE;
-
+ return true;
}
+#endif
+
Index: netpanzer/src/NetPanzer/Core/netPanzerWinMain.h
diff -u netpanzer/src/NetPanzer/Core/netPanzerWinMain.h:1.2
netpanzer/src/NetPanzer/Core/netPanzerWinMain.h:1.3
--- netpanzer/src/NetPanzer/Core/netPanzerWinMain.h:1.2 Sun Aug 31 20:03:03 2003
+++ netpanzer/src/NetPanzer/Core/netPanzerWinMain.h Mon Sep 1 16:24:20 2003
@@ -17,11 +17,5 @@
*/
#define WIN32_EXTRA_LEAN
-#include <windows.h>
-#include <windowsx.h>
-#include <mmsystem.h>
-#include <stdio.h>
-#include "UIDraw.hpp"
-
//FUNCTIONS/////////////////////////////////////////////////////
-static BOOL WinInit( HANDLE hInstance, int nCmdShow);
+static bool WinInit( HANDLE hInstance, int nCmdShow);
Index: netpanzer/src/NetPanzer/Core/netPanzerWinProc.cpp
diff -u netpanzer/src/NetPanzer/Core/netPanzerWinProc.cpp:1.2
netpanzer/src/NetPanzer/Core/netPanzerWinProc.cpp:1.3
--- netpanzer/src/NetPanzer/Core/netPanzerWinProc.cpp:1.2 Sun Aug 31
20:03:03 2003
+++ netpanzer/src/NetPanzer/Core/netPanzerWinProc.cpp Mon Sep 1 16:24:20 2003
@@ -15,7 +15,10 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+// XXX need new unix code here
+#ifndef UNIX
+#include <windows.h>
+
#include "netPanzerWinProc.h"
#include "netPanzerGlobals.h"
#include "netPanzerMain.h"
@@ -27,19 +30,19 @@
#include "DirectPlay.h"
#include "winsockglobals.h"
#include "WinSockClientList.h"
-#include "WinSockServer.h"
-#include "WinSockClient.h"
+#include "WinsockServer.h"
+#include "WinsockClient.h"
#include "Server.hpp"
#include "UIDraw.hpp"
#include "PlayerInterface.hpp"
#include "GameManager.hpp"
#include "cMouse.hpp"
-#include "CodeWiz.hpp"
+#include "codewiz.hpp"
extern GlobalApp gapp;
-BOOL gShiftState;
+bool gShiftState;
char MapUnshiftedToShifted ( char char_code );
@@ -85,10 +88,10 @@
case WM_ACTIVATEAPP :
{
- BOOL fActive;
- fActive = (BOOL) wParam;
+ bool fActive;
+ fActive = (bool) wParam;
- if ( fActive == TRUE )
+ if ( fActive == true )
{
LOG( ("WM_ACTIVATEAPP : GDI FALSE") );
Screen->restoreAll();
@@ -96,7 +99,7 @@
//DDraw.palette.activateCurrentPalette();
}
- if ( fActive == FALSE )
+ if ( fActive == false )
{
LOG( ("WM_ACTIVATEAPP : GDI TRUE") );
Screen->setGDIStatus( TRUE );
@@ -111,14 +114,14 @@
case WM_ACTIVATE :
{
WORD fActive;
- BOOL fMinimized;
+ bool fMinimized;
fActive = LOWORD(wParam);
- fMinimized = (BOOL) HIWORD(wParam);
+ fMinimized = (bool) HIWORD(wParam);
if ( (fActive == WA_ACTIVE) || (fActive == WA_CLICKACTIVE) )
{
LOG( ("WM_ACTIVATE") );
- //DDraw.setGDIStatus( FALSE );
+ //DDraw.setGDIStatus( false );
Win32HideHardwareMouse();
//DDraw.palette.activateCurrentPalette();
}
@@ -126,7 +129,7 @@
if( fActive == WA_INACTIVE )
{
LOG( ("WM_ACTIVATE") );
- //DDraw.setGDIStatus( TRUE );
+ //DDraw.setGDIStatus( true );
Win32ShowHardwareMouse();
//DDraw.palette.activateSystemPalette();
}
@@ -289,8 +292,8 @@
case WM_DESTROY:
{
- PANZER_THREAD_ACTIVE = FALSE;
- //while( PANZER_THREAD_FINISHED == FALSE );
+ PANZER_THREAD_ACTIVE = false;
+ //while( PANZER_THREAD_FINISHED == false );
//TerminateThread( (HANDLE) PANZER_THREAD_HANDLE, 0 );
netPanzerShutdown();
PostQuitMessage(0);
@@ -335,3 +338,5 @@
return( 0 );
};
+#endif
+
Index: netpanzer/src/NetPanzer/Core/netPanzerWinProc.h
diff -u netpanzer/src/NetPanzer/Core/netPanzerWinProc.h:1.1
netpanzer/src/NetPanzer/Core/netPanzerWinProc.h:1.2
--- netpanzer/src/NetPanzer/Core/netPanzerWinProc.h:1.1 Sun Dec 1 12:51:56 2002
+++ netpanzer/src/NetPanzer/Core/netPanzerWinProc.h Mon Sep 1 16:24:20 2003
@@ -18,8 +18,6 @@
#ifndef _NETPANZERWINPROC_HPP
#define _NETPANZERWINPROC_HPP
-#include <windows.h>
-
LRESULT CALLBACK PanzerProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM
lParam);
#endif // ** _NETPANZERWINPROC_HPP
Index: netpanzer/src/NetPanzer/Interfaces/ChatInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/ChatInterface.cpp:1.1
netpanzer/src/NetPanzer/Interfaces/ChatInterface.cpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/ChatInterface.cpp:1.1 Sun Dec 1
12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/ChatInterface.cpp Mon Sep 1
16:24:20 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "ChatInterface.hpp"
#include "PlayerInterface.hpp"
@@ -26,12 +25,12 @@
#include "ConsoleInterface.hpp"
SystemChatMesgRequest ChatInterface::current_chat_mesg;
-void (* ChatInterface::addChatString)( const char *message_text ) = NULL;
+void (* ChatInterface::addChatString)( const char *message_text ) = 0;
void ChatInterface::chatMessageRequest( NetMessage *message )
{
- boolean post_on_server;
+ bool post_on_server;
SystemChatMesg chat_mesg;
SystemChatMesgRequest *chat_request;
@@ -44,7 +43,7 @@
if( chat_request->message_scope == _chat_mesg_scope_all )
{
SERVER->sendMessage( &chat_mesg, sizeof(SystemChatMesg), 0 );
- post_on_server = _TRUE;
+ post_on_server = true;
}
else
if( chat_request->message_scope == _chat_mesg_scope_alliance )
@@ -62,19 +61,19 @@
if ( (PlayerInterface::getPlayerStatus( i ) == _player_state_active) )
{
- if( PlayerInterface::isAllied( chat_request->source_player_index, i )
== _TRUE )
+ if( PlayerInterface::isAllied( chat_request->source_player_index, i )
== true )
{
if ( (local_player_index != i) )
{ SERVER->sendMessage( &chat_mesg, sizeof(SystemChatMesg),
player_id, 0 ); }
else
- { post_on_server = _TRUE; }
+ { post_on_server = true; }
}
}
}
if( chat_request->source_player_index ==
PlayerInterface::getLocalPlayerIndex() )
{
- post_on_server = _TRUE;
+ post_on_server = true;
}
else
{
@@ -90,14 +89,14 @@
return;
}
- if ( post_on_server == _TRUE )
+ if ( post_on_server == true )
{
PlayerState *player_state;
player_state = PlayerInterface::getPlayerState(
chat_mesg.source_player_index );
- if( (addChatString != NULL) )
+ if( (addChatString != 0) )
{
char mesg_str[256];
sprintf( mesg_str, " ---- %s ----", player_state->getName() );
@@ -147,7 +146,7 @@
player_state = PlayerInterface::getPlayerState(
chat_mesg->source_player_index );
- if ( (addChatString != NULL) )
+ if ( (addChatString != 0) )
{
char mesg_str[144];
sprintf( mesg_str, " ---- %s ----", player_state->getName() );
Index: netpanzer/src/NetPanzer/Interfaces/Client.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/Client.cpp:1.1
netpanzer/src/NetPanzer/Interfaces/Client.cpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/Client.cpp:1.1 Sun Dec 1 12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/Client.cpp Mon Sep 1 16:24:20 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "Client.hpp"
NetworkClient *CLIENT;
Index: netpanzer/src/NetPanzer/Interfaces/Client.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/Client.hpp:1.1
netpanzer/src/NetPanzer/Interfaces/Client.hpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/Client.hpp:1.1 Sun Dec 1 12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/Client.hpp Mon Sep 1 16:24:20 2003
@@ -18,8 +18,7 @@
#ifndef _CLIENT_HPP
#define _CLIENT_HPP
-#include "NetworkClientWinSock.hpp"
-#include "NetworkClientDPlay.hpp"
+#include "NetworkClient.hpp"
extern NetworkClient *CLIENT;
Index: netpanzer/src/NetPanzer/Interfaces/ConsoleInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/ConsoleInterface.cpp:1.1
netpanzer/src/NetPanzer/Interfaces/ConsoleInterface.cpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/ConsoleInterface.cpp:1.1 Sun Dec 1
12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/ConsoleInterface.cpp Mon Sep 1
16:24:20 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "ConsoleInterface.hpp"
#include "KeyScanCodeDefs.h"
#include "GameConfig.hpp"
@@ -24,8 +23,8 @@
FILE * ConsoleInterface::con_file;
-boolean ConsoleInterface::log_file_active;
-boolean ConsoleInterface::stdout_pipe;
+bool ConsoleInterface::log_file_active;
+bool ConsoleInterface::stdout_pipe;
long ConsoleInterface::console_size;
ConsoleLineArray ConsoleInterface::line_list;
@@ -39,7 +38,7 @@
long ConsoleInterface::line_index;
-boolean ConsoleInterface::input_string_active;
+bool ConsoleInterface::input_string_active;
int ConsoleInterface::maxCharCount;
char ConsoleInterface::inputString[256];
@@ -65,7 +64,7 @@
line_offset.x = 0;
line_offset.y = (8 + vertical_spacing);
- input_string_active = _FALSE;
+ input_string_active = false;
long line_loop;
@@ -76,8 +75,8 @@
line_list[ line_loop ].life_timer.changePeriod( 8 );
}
- log_file_active = _FALSE;
- stdout_pipe = _FALSE;
+ log_file_active = false;
+ stdout_pipe = false;
}
void ConsoleInterface::setToSurfaceSize( PointXYi pix )
@@ -94,16 +93,16 @@
void ConsoleInterface::openLogFile( void )
{
con_file = fopen( "console.log", "wt" );
- log_file_active = _TRUE;
+ log_file_active = true;
}
void ConsoleInterface::closeLogFile( void )
{
fclose( con_file );
- log_file_active = _FALSE;
+ log_file_active = false;
}
-void ConsoleInterface::setStdoutPipe( boolean on_off )
+void ConsoleInterface::setStdoutPipe( bool on_off )
{
stdout_pipe = on_off;
}
@@ -126,7 +125,7 @@
va_end( vap );
va_start( vap, format );
- if ( stdout_pipe == TRUE )
+ if ( stdout_pipe == true )
{
strcpy( format_str, format );
strcat( format_str, "\n" );
@@ -134,7 +133,7 @@
}
va_end( vap );
- if( log_file_active == _TRUE )
+ if( log_file_active == true )
{
fprintf( con_file, temp_str );
fprintf( con_file, "\n");
@@ -159,7 +158,7 @@
line_list[ line_index ].string[ max_char_per_line ] = 0;
line_list[ line_index ].color = color;
- line_list[ line_index ].visible = _TRUE;
+ line_list[ line_index ].visible = true;
line_list[ line_index ].life_timer.reset();
temp_str_ptr = temp_str_ptr + max_char_per_line;
@@ -175,7 +174,7 @@
strcpy( line_list[ line_index ].string, temp_str_ptr );
line_list[ line_index ].color = color;
- line_list[ line_index ].visible = _TRUE;
+ line_list[ line_index ].visible = true;
line_list[ line_index ].life_timer.reset();
}
@@ -192,7 +191,7 @@
va_end( vap );
va_start( vap, format );
- if ( stdout_pipe == TRUE )
+ if ( stdout_pipe == true )
{
strcpy( format_str, format );
strcat( format_str, "\n" );
@@ -200,7 +199,7 @@
}
va_end( vap );
- if( log_file_active == _TRUE )
+ if( log_file_active == true )
{
fprintf( con_file, temp_str );
fprintf( con_file, "\n");
@@ -224,7 +223,7 @@
line_list[ line_index ].string[ max_char_per_line ] = 0;
line_list[ line_index ].color = GameConfig::getConsoleTextColor();
- line_list[ line_index ].visible = _TRUE;
+ line_list[ line_index ].visible = true;
line_list[ line_index ].life_timer.reset();
temp_str_ptr = temp_str_ptr + max_char_per_line;
@@ -240,7 +239,7 @@
strcpy( line_list[ line_index ].string, temp_str_ptr );
line_list[ line_index ].color = GameConfig::getConsoleTextColor();
- line_list[ line_index ].visible = _TRUE;
+ line_list[ line_index ].visible = true;
line_list[ line_index ].life_timer.reset();
}
@@ -271,7 +270,7 @@
} while( index != line_index );
- if( input_string_active == _TRUE )
+ if( input_string_active == true )
{
current_line.y = bounds.min.y + (line_offset.y * visible_count ) +
(line_offset.y * 2);
current_line.x = bounds.min.x + line_offset.x;
@@ -296,7 +295,7 @@
} while( index != line_index );
- if( input_string_active == _TRUE )
+ if( input_string_active == true )
{
PointXYi input_offset;
unsigned long max_char_space;
@@ -326,7 +325,7 @@
}
}
-void ConsoleInterface::setInputStringStatus( boolean on_off )
+void ConsoleInterface::setInputStringStatus( bool on_off )
{
input_string_active = on_off;
}
Index: netpanzer/src/NetPanzer/Interfaces/ConsoleInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/ConsoleInterface.hpp:1.1
netpanzer/src/NetPanzer/Interfaces/ConsoleInterface.hpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/ConsoleInterface.hpp:1.1 Sun Dec 1
12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/ConsoleInterface.hpp Mon Sep 1
16:24:20 2003
@@ -29,7 +29,7 @@
class ConsoleLine
{
public:
- boolean visible;
+ bool visible;
PIX color;
char string[256];
Timer life_timer;
@@ -43,8 +43,8 @@
{
protected:
static FILE *con_file;
- static boolean log_file_active;
- static boolean stdout_pipe;
+ static bool log_file_active;
+ static bool stdout_pipe;
static long console_size;
static ConsoleLineArray line_list;
@@ -58,7 +58,7 @@
static long line_index;
- static boolean input_string_active;
+ static bool input_string_active;
static int maxCharCount;
static char inputString[256];
@@ -73,7 +73,7 @@
static void openLogFile( void );
static void closeLogFile( void );
- static void setStdoutPipe( boolean on_off );
+ static void setStdoutPipe( bool on_off );
static void update( Surface &surface );
static void update_overlap( Surface &surface );
@@ -85,7 +85,7 @@
static void printf( const char *format, ... );
/* Input String Methods */
- static void setInputStringStatus( boolean on_off );
+ static void setInputStringStatus( bool on_off );
static void resetInputString( char *prompt );
static void addChar(int newChar);
static void addExtendedChar(int newExtendedChar);
Index: netpanzer/src/NetPanzer/Interfaces/GameConfig.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/GameConfig.cpp:1.1
netpanzer/src/NetPanzer/Interfaces/GameConfig.cpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/GameConfig.cpp:1.1 Sun Dec 1
12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/GameConfig.cpp Mon Sep 1 16:24:20 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "GameConfig.hpp"
//#include "lua.h"
@@ -38,11 +37,11 @@
int GameConfig::TimeLimit = 50; //in minutes
int GameConfig::FragLimit = 1000; //in frags;
- boolean GameConfig::map_cycling_on_off = _TRUE;
- boolean GameConfig::powerups_on_off = _FALSE;
+ bool GameConfig::map_cycling_on_off = true;
+ bool GameConfig::powerups_on_off = false;
float GameConfig::objective_occupation_percentage = 100.0;
- boolean GameConfig::allow_allies_on_off = _TRUE;
+ bool GameConfig::allow_allies_on_off = true;
int GameConfig::cloud_coverage;
float GameConfig::wind_speed;
unsigned int GameConfig::respawn_type =
_game_config_respawn_type_round_robin;
@@ -52,10 +51,10 @@
// ** Visuals Configuration **
unsigned int GameConfig::screen_resolution_enum =
_game_config_standard_res_640x480;
- boolean GameConfig::display_shadows_flag = _TRUE;
- boolean GameConfig::display_unit_flags = _FALSE;
+ bool GameConfig::display_shadows_flag = true;
+ bool GameConfig::display_unit_flags = false;
- boolean GameConfig::radar_display_clouds_flag = _FALSE;
+ bool GameConfig::radar_display_clouds_flag = false;
int GameConfig::radar_player_unit_color = _color_aqua;
int GameConfig::radar_allied_unit_color = _color_orange;
@@ -67,8 +66,8 @@
int GameConfig::mini_map_unit_size = _mini_map_unit_size_small;
int GameConfig::unit_selection_box_draw_mode =
_unit_selection_box_draw_mode_rect_edges;
- boolean GameConfig::draw_unit_damage = _FALSE;
- boolean GameConfig::draw_unit_reload = _TRUE;
+ bool GameConfig::draw_unit_damage = false;
+ bool GameConfig::draw_unit_reload = true;
int GameConfig::mini_map_objective_draw_mode =
_mini_map_objective_draw_mode_outline_rect;
int GameConfig::unitInfoDrawLayer = 0;
@@ -82,16 +81,16 @@
int GameConfig::mini_map_resize_rate = 400; // in pixels/s
// ** Input Configuration **
- boolean GameConfig::input_joystick_state = _FALSE;
+ bool GameConfig::input_joystick_state = false;
// ** Sound Configuration **
- boolean GameConfig::sound_on_off_flag = _TRUE;
+ bool GameConfig::sound_on_off_flag = true;
int GameConfig::sound_volume = 50;
PlayerUnitConfig GameConfig::unit_spawn_config;
int GameConfig::attackNotificationTime = 5;
- boolean GameConfig::blendSmoke = _TRUE;
+ bool GameConfig::blendSmoke = true;
void GameConfig::initialize( void )
@@ -100,7 +99,7 @@
GameMode = _gamemode_multiplayer; //Skirmish or Multiplayer
GameType = _gametype_objective; //Objectives, FragLimit, TimeLimit
HostOrJoin = _game_session_join; // 1=host, 2=join
- VehicleGeneration = _TRUE;
+ VehicleGeneration = true;
NumberPlayers = 8; //max = 25;
NumberUnits = 500; //max = 50;
NumberInitialUnits = 5;
@@ -114,17 +113,19 @@
FragLimit = 1000; //current limit = 1000;
objective_occupation_percentage = 100.0f;
- allow_allies_on_off = _TRUE;
+ allow_allies_on_off = true;
+ /* XXX fix warnings...
cloud_coverage;
wind_speed;
+ */
respawn_type = _game_config_respawn_type_round_robin;
// ** Visuals Configuration **
screen_resolution_enum = _game_config_standard_res_640x480;
- display_shadows_flag = _TRUE;
+ display_shadows_flag = true;
- radar_display_clouds_flag = _FALSE;
+ radar_display_clouds_flag = false;
radar_player_unit_color = _color_aqua;
radar_allied_unit_color = _color_orange;
@@ -142,10 +143,10 @@
mini_map_resize_rate = 400; // in pixels/s
// ** Input Configuration **
- input_joystick_state = _FALSE;
+ input_joystick_state = false;
// ** Sound Configuration **
- sound_on_off_flag = _TRUE;
+ sound_on_off_flag = true;
sound_volume = 50;
}
Index: netpanzer/src/NetPanzer/Interfaces/GameConfig.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/GameConfig.hpp:1.1
netpanzer/src/NetPanzer/Interfaces/GameConfig.hpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/GameConfig.hpp:1.1 Sun Dec 1
12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/GameConfig.hpp Mon Sep 1 16:24:20 2003
@@ -110,11 +110,12 @@
#define _GAME_CONFIG_MINI_MAP_SCROLL_LIMIT_UPPER 1000
#define _GAME_CONFIG_MINI_MAP_SCROLL_LIMIT_LOWER 100
-#define _GAME_CONFIG_CONSOLE_TEXT_DELAY_LIMIT_UPPER 30.0
-#define _GAME_CONFIG_CONSOLE_TEXT_DELAY_LIMIT_LOWER 1.0
+// XXX: CHanged the CONFIG_CONSOLE values from doubles to ints (removed .0)
+#define _GAME_CONFIG_CONSOLE_TEXT_DELAY_LIMIT_UPPER 30
+#define _GAME_CONFIG_CONSOLE_TEXT_DELAY_LIMIT_LOWER 1
-#define _GAME_CONFIG_CONSOLE_TEXT_USEAGE_LIMIT_UPPER 25.0
-#define _GAME_CONFIG_CONSOLE_TEXT_USEAGE_LIMIT_LOWER 5.0
+#define _GAME_CONFIG_CONSOLE_TEXT_USEAGE_LIMIT_UPPER 25
+#define _GAME_CONFIG_CONSOLE_TEXT_USEAGE_LIMIT_LOWER 5
#define _GAME_CONFIG_SCREEN_GAMMA_LIMIT_UPPER 100
#define _GAME_CONFIG_SCREEN_GAMMA_LIMIT_LOWER 0
@@ -150,25 +151,25 @@
static int TimeLimit; //current limit = 120
static int FragLimit; //current limit = 1000;
- static boolean map_cycling_on_off;
- static boolean powerups_on_off;
+ static bool map_cycling_on_off;
+ static bool powerups_on_off;
static float objective_occupation_percentage;
- static boolean allow_allies_on_off;
+ static bool allow_allies_on_off;
static int cloud_coverage;
static unsigned int respawn_type;
static float wind_speed;
static int attackNotificationTime;
- static boolean blendSmoke;
+ static bool blendSmoke;
static char game_map_name[256];
// ** Visuals Configuration **
static unsigned int screen_resolution_enum;
- static boolean display_shadows_flag;
- static boolean display_unit_flags;
+ static bool display_shadows_flag;
+ static bool display_unit_flags;
- static boolean radar_display_clouds_flag;
+ static bool radar_display_clouds_flag;
static int radar_player_unit_color;
static int radar_allied_unit_color;
static int radar_player_outpost_color;
@@ -180,8 +181,8 @@
static int mini_map_unit_size;
static int unit_selection_box_draw_mode;
- static boolean draw_unit_damage;
- static boolean draw_unit_reload;
+ static bool draw_unit_damage;
+ static bool draw_unit_reload;
static int mini_map_objective_draw_mode;
static int unitInfoDrawLayer;
@@ -197,10 +198,10 @@
// ** Input Configuration **
- static boolean input_joystick_state;
+ static bool input_joystick_state;
// ** Sound Configuration **
- static boolean sound_on_off_flag;
+ static bool sound_on_off_flag;
static int sound_volume;
protected:
@@ -492,55 +493,55 @@
}
}
- static inline void setMapCycleState( boolean on_off )
+ static inline void setMapCycleState( bool on_off )
{
map_cycling_on_off = on_off;
}
- static inline boolean getMapCycleState( void )
+ static inline bool getMapCycleState( void )
{
return( map_cycling_on_off );
}
static inline char * getMapCycleString( void )
{
- if ( map_cycling_on_off == _TRUE )
+ if ( map_cycling_on_off == true )
{ return( "Yes" ); }
else
{ return( "No" ); }
}
- static inline void setPowerUpState( boolean on_off )
+ static inline void setPowerUpState( bool on_off )
{
powerups_on_off= on_off;
}
- static inline boolean getPowerUpState( void )
+ static inline bool getPowerUpState( void )
{
return( powerups_on_off );
}
static inline char * getPowerUpString( void )
{
- if ( powerups_on_off == _TRUE )
+ if ( powerups_on_off == true )
{ return( "Yes" ); }
else
{ return( "No" ); }
}
- static inline void setAllieState( boolean on_off )
+ static inline void setAllieState( bool on_off )
{
allow_allies_on_off = on_off;
}
- static inline boolean getAllieState( void )
+ static inline bool getAllieState( void )
{
return( allow_allies_on_off );
}
static inline char * getAllieStateString( void )
{
- if ( allow_allies_on_off == _TRUE )
+ if ( allow_allies_on_off == true )
{ return( "Yes" ); }
else
{ return( "No" ); }
@@ -637,7 +638,7 @@
if ( rate > _GAME_CONFIG_MINI_MAP_SCROLL_LIMIT_UPPER )
{ mini_map_resize_rate = _GAME_CONFIG_MINI_MAP_SCROLL_LIMIT_UPPER;
}
else
- { mini_map_resize_rate = rate; }
+ { mini_map_resize_rate = (int) rate; }
}
static inline int getMiniMapResizeRateBoundsUpper( void )
@@ -818,15 +819,15 @@
//***********************************************************
- static inline void setDisplayCloudsOnRadarFlag( boolean on_off )
+ static inline void setDisplayCloudsOnRadarFlag( bool on_off )
{ radar_display_clouds_flag = on_off; }
- static inline boolean getDisplayCloudsOnRadarFlag( void )
+ static inline bool getDisplayCloudsOnRadarFlag( void )
{ return( radar_display_clouds_flag ); }
static inline char * getDisplayCloudsOnRadarFlagString( void )
{
- if ( radar_display_clouds_flag == _TRUE )
+ if ( radar_display_clouds_flag == true )
{ return( "On" ); }
else
{ return( "Off" ); }
@@ -834,15 +835,15 @@
//***********************************************************
- static inline void setDisplayShadowsFlag( boolean on_off )
+ static inline void setDisplayShadowsFlag( bool on_off )
{ display_shadows_flag = on_off; }
- static inline boolean getDisplayShadowsFlag( void )
+ static inline bool getDisplayShadowsFlag( void )
{ return( display_shadows_flag ); }
static inline char * getDisplayShadowsFlagString( void )
{
- if ( display_shadows_flag == _TRUE )
+ if ( display_shadows_flag == true )
{ return( "On" ); }
else
{ return( "Off" ); }
@@ -850,26 +851,26 @@
//***********************************************************
- static inline void setDisplayUnitFlags( boolean on_off )
+ static inline void setDisplayUnitFlags( bool on_off )
{ display_unit_flags = on_off; }
static inline void toggleDisplayUnitFlags( void )
{ display_unit_flags = !display_unit_flags; }
- static inline boolean getDisplayUnitFlags( void )
+ static inline bool getDisplayUnitFlags( void )
{ return( display_unit_flags ); }
// ** Input Configuration Methods **
- static inline void setJoystickState( boolean on_off )
+ static inline void setJoystickState( bool on_off )
{ input_joystick_state = on_off; }
- static inline boolean getJoystickState( void )
+ static inline bool getJoystickState( void )
{ return( input_joystick_state ); }
static inline char * getJoystickStateString( void )
{
- if ( input_joystick_state == _TRUE )
+ if ( input_joystick_state == true )
{ return( "On" ); }
else
{ return( "Off" ); }
@@ -878,15 +879,15 @@
// ** Sound Configuration Methods **
- static inline void setSoundState( boolean on_off )
+ static inline void setSoundState( bool on_off )
{ sound_on_off_flag = on_off; }
- static inline boolean getSoundState( void )
+ static inline bool getSoundState( void )
{ return( sound_on_off_flag ); }
static inline char * getSoundStateString( void )
{
- if ( sound_on_off_flag == _TRUE )
+ if ( sound_on_off_flag == true )
{ return( "On" ); }
else
{ return( "Off" ); }
@@ -1000,17 +1001,17 @@
//***********************************************************
static inline void setBlendSmokeTrue()
- { blendSmoke = _TRUE; }
+ { blendSmoke = true; }
static inline void setBlendSmokeFalse()
- { blendSmoke = _FALSE; }
+ { blendSmoke = false; }
- static inline boolean getBlendSmoke()
+ static inline bool getBlendSmoke()
{ return( blendSmoke ); }
static inline const char *getBlendSmokeString()
{
- if (blendSmoke == _TRUE)
+ if (blendSmoke == true)
{
return "On";
}
@@ -1098,7 +1099,7 @@
static inline void toggleDrawUnitDamage( void )
{ draw_unit_damage = !draw_unit_damage; }
- static inline boolean getDrawUnitDamage( void )
+ static inline bool getDrawUnitDamage( void )
{ return( draw_unit_damage ); }
//***********************************************************
@@ -1109,7 +1110,7 @@
static inline void toggleDrawUnitReload( void )
{ draw_unit_reload = !draw_unit_reload; }
- static inline boolean getDrawUnitReload( void )
+ static inline bool getDrawUnitReload( void )
{ return( draw_unit_reload ); }
//***********************************************************
@@ -1159,7 +1160,7 @@
static inline void toggleUnitInfoDrawLayer()
{ unitInfoDrawLayer = (( unitInfoDrawLayer == 7 ) ? 0 : 7); }
- static inline getUnitInfoDrawLayer()
+ static inline int getUnitInfoDrawLayer()
{ return( unitInfoDrawLayer ); }
static inline const char *getUnitInfoDrawLayerString()
Index: netpanzer/src/NetPanzer/Interfaces/GameControlRulesDaemon.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/GameControlRulesDaemon.cpp:1.1
netpanzer/src/NetPanzer/Interfaces/GameControlRulesDaemon.cpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/GameControlRulesDaemon.cpp:1.1 Sun Dec
1 12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/GameControlRulesDaemon.cpp Mon Sep
1 16:24:20 2003
@@ -15,8 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
-
#include "GameControlRulesDaemon.hpp"
#include "GameManager.hpp"
@@ -58,12 +56,12 @@
Timer GameControlRulesDaemon::map_cycle_fsm_server_map_load_timer;
int GameControlRulesDaemon::map_cycle_fsm_client_state =
_map_cycle_client_idle;
-boolean GameControlRulesDaemon::map_cycle_fsm_client_respawn_ack_flag = _FALSE;
+bool GameControlRulesDaemon::map_cycle_fsm_client_respawn_ack_flag = false;
char GameControlRulesDaemon::map_cycle_fsm_client_map_name[256];
void GameControlRulesDaemon::mapCycleFsmClient( void )
{
- boolean end_cycle = _FALSE;
+ bool end_cycle = false;
do
{
@@ -71,7 +69,7 @@
{
case _map_cycle_client_idle :
{
- end_cycle = _TRUE;
+ end_cycle = true;
} break;
case _map_cycle_client_start_map_load :
@@ -97,7 +95,7 @@
map_cycle_fsm_client_state = _map_cycle_client_load_map;
}
- end_cycle = _TRUE;
+ end_cycle = true;
} break;
case _map_cycle_client_load_map :
@@ -105,7 +103,7 @@
int percent_complete;
char str_buf[128];
- if ( GameManager::gameMapLoad( &percent_complete ) == _FALSE )
+ if ( GameManager::gameMapLoad( &percent_complete ) == false )
{
map_cycle_fsm_client_state = _map_cycle_client_wait_for_respawn_ack;
@@ -120,30 +118,30 @@
progressView.update( str_buf );
}
- end_cycle = _TRUE;
+ end_cycle = true;
} break;
case _map_cycle_client_wait_for_respawn_ack :
{
- if( map_cycle_fsm_client_respawn_ack_flag == _TRUE )
+ if( map_cycle_fsm_client_respawn_ack_flag == true )
{
progressView.toggleGameView();
- map_cycle_fsm_client_respawn_ack_flag = _FALSE;
+ map_cycle_fsm_client_respawn_ack_flag = false;
map_cycle_fsm_client_state = _map_cycle_client_idle;
}
- end_cycle = _TRUE;
+ end_cycle = true;
} break;
} // ** switch
- } while ( end_cycle == _FALSE );
+ } while ( end_cycle == false );
}
void GameControlRulesDaemon::mapCycleFsmServer( void )
{
- boolean end_cycle = _FALSE;
+ bool end_cycle = false;
do
{
@@ -152,7 +150,7 @@
case _map_cycle_server_state_idle :
{
- end_cycle = _TRUE;
+ end_cycle = true;
} break;
case _map_cycle_server_state_display_endgame_views:
@@ -167,7 +165,7 @@
{
Desktop::setVisibilityAllWindows(false);
Desktop::setVisibility("GameView", true);
- Desktop::setVisibility("WinnerMesgView", TRUE );
+ Desktop::setVisibility("WinnerMesgView", true );
}
SERVER->sendMessage( &view_control, sizeof( SystemViewControl ), 0 );
@@ -176,13 +174,13 @@
map_cycle_fsm_server_endgame_timer.reset();
map_cycle_fsm_server_state = _map_cycle_server_state_cycle_next_map;
- end_cycle = _TRUE;
+ end_cycle = true;
} break;
case _map_cycle_server_state_cycle_next_map :
{
if ( map_cycle_fsm_server_endgame_timer.count() &&
- (ServerConnectDaemon::isConnecting() == _FALSE)
+ (ServerConnectDaemon::isConnecting() == false)
)
{
char map_name[256];
@@ -235,7 +233,7 @@
}
- end_cycle = _TRUE;
+ end_cycle = true;
} break;
case _map_cycle_server_state_load_map :
@@ -243,7 +241,7 @@
int percent_complete;
char str_buf[128];
- if ( GameManager::gameMapLoad( &percent_complete ) == _FALSE )
+ if ( GameManager::gameMapLoad( &percent_complete ) == false )
{
map_cycle_fsm_server_state = _map_cycle_server_state_respawn_players;
}
@@ -251,7 +249,7 @@
sprintf( str_buf, "Loading Game Map ... (%d%%)", percent_complete);
progressView.update( str_buf );
- end_cycle = _TRUE;
+ end_cycle = true;
} break;
case _map_cycle_server_state_wait_for_client_map_load :
@@ -261,7 +259,7 @@
map_cycle_fsm_server_state = _map_cycle_server_state_respawn_players;
}
- end_cycle = _TRUE;
+ end_cycle = true;
} break;
case _map_cycle_server_state_respawn_players :
@@ -287,11 +285,11 @@
map_cycle_fsm_server_state = _map_cycle_server_state_idle;
ServerConnectDaemon::unlockConnectProcess();
- end_cycle = _TRUE;
+ end_cycle = true;
} break;
} // ** switch
- } while ( end_cycle == _FALSE );
+ } while ( end_cycle == false );
}
@@ -299,7 +297,7 @@
{
PlayerInterface::lockPlayerStats();
- if( GameConfig::getMapCycleState() == _TRUE )
+ if( GameConfig::getMapCycleState() == true )
{
map_cycle_fsm_server_state =
_map_cycle_server_state_display_endgame_views;
GameManager::game_state = _game_state_completed;
@@ -312,7 +310,7 @@
Desktop::setVisibilityAllWindows(false);
Desktop::setVisibility("GameView", true);
- Desktop::setVisibility("WinnerMesgView", TRUE );
+ Desktop::setVisibility("WinnerMesgView", true );
SERVER->sendMessage( &view_control, sizeof( SystemViewControl ), 0 );
@@ -324,7 +322,7 @@
{
PlayerInterface::lockPlayerStats();
- if( GameConfig::getMapCycleState() == _TRUE )
+ if( GameConfig::getMapCycleState() == true )
{
map_cycle_fsm_server_state =
_map_cycle_server_state_display_endgame_views;
GameManager::game_state = _game_state_completed;
@@ -337,7 +335,7 @@
Desktop::setVisibilityAllWindows(false);
Desktop::setVisibility("GameView", true);
- Desktop::setVisibility("WinnerMesgView", TRUE );
+ Desktop::setVisibility("WinnerMesgView", true );
SERVER->sendMessage( &view_control, sizeof( SystemViewControl ), 0 );
@@ -350,7 +348,7 @@
{
PlayerInterface::lockPlayerStats();
- if( GameConfig::getMapCycleState() == _TRUE )
+ if( GameConfig::getMapCycleState() == true )
{
map_cycle_fsm_server_state =
_map_cycle_server_state_display_endgame_views;
GameManager::game_state = _game_state_completed;
@@ -363,7 +361,7 @@
Desktop::setVisibilityAllWindows(false);
Desktop::setVisibility("GameView", true);
- Desktop::setVisibility("WinnerMesgView", TRUE );
+ Desktop::setVisibility("WinnerMesgView", true );
SERVER->sendMessage( &view_control, sizeof( SystemViewControl ), 0 );
@@ -373,7 +371,7 @@
void GameControlRulesDaemon::forceMapCycle( void )
{
- if( GameConfig::getMapCycleState() == _TRUE )
+ if( GameConfig::getMapCycleState() == true )
{
map_cycle_fsm_server_state =
_map_cycle_server_state_display_endgame_views;
GameManager::game_state = _game_state_completed;
@@ -404,7 +402,7 @@
case _gametype_fraglimit :
{
- if ( PlayerInterface::testRuleScoreLimit( GameConfig::GetFragLimit(),
&player_state ) == _TRUE )
+ if ( PlayerInterface::testRuleScoreLimit( GameConfig::GetFragLimit(),
&player_state ) == true )
{
onFraglimitGameCompleted();
}
@@ -412,7 +410,7 @@
case _gametype_objective :
{
- if ( PlayerInterface::testRuleObjectiveRatio(
GameConfig::getObjectiveOccuapationPercentageDecimal(), &player_state ) ==
_TRUE )
+ if ( PlayerInterface::testRuleObjectiveRatio(
GameConfig::getObjectiveOccuapationPercentageDecimal(), &player_state ) == true
)
{
onObjectiveGameCompleted( );
}
@@ -421,8 +419,8 @@
} // ** switch
// ** Check for Player Respawns **
- boolean respawn_rule_complete = _FALSE;
- while( respawn_rule_complete == _FALSE )
+ bool respawn_rule_complete = false;
+ while( respawn_rule_complete == false )
{
if ( PlayerInterface::testRulePlayerRespawn( &respawn_rule_complete,
&player_state ) )
{
@@ -446,7 +444,7 @@
void GameControlRulesDaemon::netMessageCycleRespawnAck( NetMessage *message )
{
- map_cycle_fsm_client_respawn_ack_flag = _TRUE;
+ map_cycle_fsm_client_respawn_ack_flag = true;
}
void GameControlRulesDaemon::processNetMessage( NetMessage *message )
Index: netpanzer/src/NetPanzer/Interfaces/GameControlRulesDaemon.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/GameControlRulesDaemon.hpp:1.1
netpanzer/src/NetPanzer/Interfaces/GameControlRulesDaemon.hpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/GameControlRulesDaemon.hpp:1.1 Sun Dec
1 12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/GameControlRulesDaemon.hpp Mon Sep
1 16:24:20 2003
@@ -32,7 +32,7 @@
static int map_cycle_fsm_client_state;
static char map_cycle_fsm_client_map_name[256];
- static boolean map_cycle_fsm_client_respawn_ack_flag;
+ static bool map_cycle_fsm_client_respawn_ack_flag;
static void mapCycleFsmClient( void );
static void onTimelimitGameCompleted( void );
Index: netpanzer/src/NetPanzer/Interfaces/GameManager.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.2
netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.3
--- netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.2 Sun Aug 31
20:03:03 2003
+++ netpanzer/src/NetPanzer/Interfaces/GameManager.cpp Mon Sep 1 16:24:20 2003
@@ -15,12 +15,16 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
-
+// XXX we need new code here...
+#ifndef UNIX
#include "GameManager.hpp"
+#include <stdio.h>
#include <fcntl.h>
+#ifdef WIN32
#include <io.h>
+#include <conio.h>
+#endif
#include <windows.h>
// ** netPanzer Core Includes
@@ -37,6 +41,13 @@
#include "WinSockServer.h"
#include "WinSockClient.h"
+#ifdef WIN32
+#include "NetworkServerWinSock.hpp"
+#include "NetworkClientWinSock.hpp"
+#include "NetworkServerDPlay.hpp"
+#include "NetworkClientDPlay.hpp"
+#endif
+
// ** PObject netPanzer Network Includes
#include "Server.hpp"
#include "Client.hpp"
@@ -137,8 +148,8 @@
#include "ParticleInterface.hpp"
#include "Physics.hpp"
#include "TimerInterface.hpp"
-#include "JoystickInterface.hpp"
-#include "LoadSaveData.hpp"
+// XXX joystick disabled
+//#include "JoystickInterface.hpp"
#include "FontSystem2D.hpp"
#include "Math.hpp"
@@ -152,8 +163,8 @@
time_t GameManager::game_start_time = 0;
time_t GameManager::game_elapsed_time_offset = 0;
-boolean GameManager::display_frame_rate_flag = _FALSE;
-boolean GameManager::display_network_info_flag;
+bool GameManager::display_frame_rate_flag = false;
+bool GameManager::display_network_info_flag;
int GameManager::execution_mode;
@@ -166,29 +177,31 @@
static Surface hostLoadSurface;
// ******************************************************************
-boolean GameManager::initializeDirectXSubSystem( void )
+bool GameManager::initializeDirectXSubSystem( void )
{
//_chdir( "c:\\netPanzer\\WorkSpace\\netPanzerBuildTree\\netPanzer\\Debug" );
if( execution_mode == _execution_mode_loop_back_server)
{
LOG( ( "Initializing Direct Draw" ) );
- if( ( Screen->initialize() ) == _FALSE )
+ if( ( Screen->initialize() ) == false )
{
- MessageBox(gapp.hwndApp, "Screen->Initialize Failed", "Fatal Error",
MB_OK);
- return ( _FALSE );
+ MessageBox(gapp.hwndApp, "DDraw.Initialize Failed", "Fatal Error",
MB_OK);
+ return ( false );
}
LOG( ( "Initializing Direct Input\n" ) );
- if ( DirectInput::initialize() == _FALSE )
- return ( _FALSE );
+ if ( DirectInput::initialize() == false )
+ return ( false );
}
+ printf ("DXInit\n");
- return( _TRUE );
+ return( true );
}
// ******************************************************************
void GameManager::shutdownDirectXSubSystem( void )
{
+ printf ("DXShutdown\n");
//winsock hack
//ShutDownConnection();
//ShutdownWinSockClient();
@@ -199,7 +212,7 @@
}
// ******************************************************************
-boolean GameManager::initializeVideoSubSystem( void )
+bool GameManager::initializeVideoSubSystem( void )
{
LOG( ( "Setting Default Video Sub-system" ) );
@@ -215,24 +228,24 @@
//current_mode_flags = VIDEO_MODE_TRIPLE_BUFFER;
#endif
- if ( setVideoMode( current_video_mode_res ) == _FALSE)
+ if ( setVideoMode( current_video_mode_res ) == false)
{
- return( _FALSE );
+ return( false );
}
loadPalette( "wads\\netp.act" );
- return ( _TRUE );
+ return ( true );
}
// ******************************************************************
-boolean GameManager::initializeSoundSubSystem( void )
+bool GameManager::initializeSoundSubSystem( void )
{
- if ( dsound.Initialize( gapp.hwndApp) == _FALSE )
+ if ( dsound.Initialize( gapp.hwndApp) == false )
{ LOG( ( "Failure to initialize DirectSound Sub-system" ) ); }
- return( _TRUE );
+ return( true );
}
// ******************************************************************
@@ -243,16 +256,17 @@
}
// ******************************************************************
-boolean GameManager::initializeWin32SubSystem( void )
+bool GameManager::initializeWin32SubSystem( void )
{
LOG( ( "Initializing Windows Timer" ) );
- if ( WINTIMER.Initialize() == _FALSE )
- return( _FALSE );
+ if ( WINTIMER.Initialize() == false )
+ return( false );
TIMESTAMP::calibrate();
+ printf ("Timer Initok\n");
- return( _TRUE );
+ return( true );
}
// ******************************************************************
@@ -264,7 +278,7 @@
// ******************************************************************
-boolean GameManager::initializeWindowSubSystem( void )
+bool GameManager::initializeWindowSubSystem( void )
{
LOG(("Initializing Game Viewing System"));
@@ -318,38 +332,42 @@
Desktop::add(new FlagSelectionView());
Desktop::add(new HostOptionsView());
Desktop::add(new PlayerNameView());
- Desktop::add(new ResignView());
+ Desktop::add(new ResignView());
Desktop::add(new AreYouSureResignView());
Desktop::add(new AreYouSureExitView());
- //winsock hack
- Desktop::add(new IPAddressView());
+ //winsock hack
+ Desktop::add(new IPAddressView());
+
+ Desktop::setVisibilityAllWindows(false);
+ Desktop::setVisibility("MainView", true);
- Desktop::setVisibilityAllWindows(false);
- Desktop::setVisibility("MainView", true);
+ printf ("ShowDesktop\n");
- return ( _TRUE );
+ return ( true );
}
// ******************************************************************
-boolean GameManager::setVideoMode( PointXYi mode_res )
+bool GameManager::setVideoMode( PointXYi mode_res )
{
- if ( Screen->isDisplayModeAvailable( mode_res.x, mode_res.y, 8 ) == _TRUE
)
+ if ( DDraw.isDisplayModeAvailable( mode_res.x, mode_res.y, 8 ) == true
)
{
previous_video_mode_res = current_video_mode_res;
current_video_mode_res = mode_res;
- if (!Screen->setVideoMode(current_video_mode_res.x,
current_video_mode_res.y, 8, current_mode_flags)) return FALSE;
+ if (!DDraw.setVideoMode(current_video_mode_res.x,
current_video_mode_res.y, 8, current_mode_flags)) return false;
WorldViewInterface::setCameraSize( current_video_mode_res.x,
current_video_mode_res.y );
FRAME_BUFFER.create(current_video_mode_res.x, current_video_mode_res.y,
current_video_mode_res.x, 1 );
screen.createNoAlloc(current_video_mode_res);
gameView.setSize( current_video_mode_res );
-
- return( _TRUE );
+
+ printf ("SetVideoOk\n");
+ return( true );
}
+ printf ("SetVideoFailed\n");
- return( _FALSE );
+ return( false );
}
// ******************************************************************
@@ -384,7 +402,7 @@
new_mode = GameConfig::getGameScreenResolutionSize();
- if ( setVideoMode(new_mode) == _TRUE )
+ if ( setVideoMode(new_mode) == true )
{
previous_video_mode_res = current_video_mode_res;
current_video_mode_res = new_mode;
@@ -416,7 +434,7 @@
new_mode = GameConfig::getGameScreenResolutionSize();
- if ( setVideoMode(new_mode) == _TRUE )
+ if ( setVideoMode(new_mode) == true )
{
previous_video_mode_res = current_video_mode_res;
current_video_mode_res = new_mode;
@@ -478,14 +496,14 @@
// ******************************************************************
-boolean GameManager::initializeInputDevices( void )
+bool GameManager::initializeInputDevices( void )
{
LOG( ("Initializing Direct Keyboard Input") );
if( execution_mode == _execution_mode_loop_back_server)
{
- if ( DirectInput::initializeDirectKeyboard() == _FALSE )
- return ( _FALSE );
+ if ( DirectInput::initializeDirectKeyboard() == false )
+ return ( false );
}
//JoystickInterface::init();
@@ -494,14 +512,15 @@
setupKeyboardBindings();
MouseInterface::initialize();
- MouseInterface::hideHardwareCursor();
+ //MouseInterface::hideHardwareCursor();
mouse.setPointer(&mouseArrow);
+ printf ("InitInputOK!\n");
- return ( _TRUE );
+ return ( true );
}
// ******************************************************************
-boolean GameManager::initializeGameObjects( void )
+bool GameManager::initializeGameObjects( void )
{
GameConfig::initialize();
MapsManager::initialize();
@@ -513,40 +532,41 @@
ConsoleInterface::initialize( 25 );
PowerUpInterface::initialize();
- return( _TRUE );
+ printf ("InitGameObjectOk!\n");
+ return( true );
}
// ******************************************************************
-boolean GameManager::shutdownGameObjects( void )
+bool GameManager::shutdownGameObjects( void )
{
- return( _TRUE );
+ return( true );
}
// ******************************************************************
-boolean GameManager::initializeDedicatedConsole( void )
+bool GameManager::initializeDedicatedConsole( void )
{
ShowWindow( gapp.hwndApp, SW_HIDE );
if( AllocConsole() == 0 )
- { return( _FALSE ); }
+ { return( false ); }
freopen( "CONOUT$", "a+t", stdout );
freopen( "CONIN$", "a+t", stdin );
- ConsoleInterface::setStdoutPipe( _TRUE );
- return( _TRUE );
+ ConsoleInterface::setStdoutPipe( true );
+ return( true );
}
// ******************************************************************
-boolean GameManager::shutdownDedicatedConsole( void )
+bool GameManager::shutdownDedicatedConsole( void )
{
FreeConsole();
- return( _TRUE );
+ return( true );
}
// ******************************************************************
-boolean GameManager::initializeNetworkSubSystem( void )
+bool GameManager::initializeNetworkSubSystem( void )
{
SERVER = new NetworkServerWinSock();
CLIENT = new NetworkClientWinSock();
@@ -563,7 +583,7 @@
NetworkState::resetNetworkStats();
SetPacketFunction( EnqueueIncomingPacket );
- return( _TRUE );
+ return( true );
}
// ******************************************************************
@@ -580,7 +600,7 @@
}
// ******************************************************************
-boolean GameManager::initializeGameLogic( void )
+bool GameManager::initializeGameLogic( void )
{
PlayerInterface::initialize( GameConfig::GetNumberPlayers(),
GameConfig::GetNumberInitialUnits() );
@@ -588,19 +608,19 @@
UnitInterface::initialize( GameConfig::GetUnitsPerPlayer() );
PathScheduler::initialize();
PowerUpInterface::resetLogic();
- return ( _TRUE );
+ return ( true );
}
// ******************************************************************
-boolean GameManager::reinitializeGameLogic( void )
+bool GameManager::reinitializeGameLogic( void )
{
shutdownGameLogic();
initializeGameLogic();
- return( _TRUE );
+ return( true );
}
// ******************************************************************
-boolean GameManager::resetGameLogic( void )
+bool GameManager::resetGameLogic( void )
{
PlayerInterface::reset();
UnitInterface::reset();
@@ -609,7 +629,7 @@
PowerUpInterface::resetLogic();
ProjectileInterface::resetLogic();
startGameTimer();
- return( _TRUE );
+ return( true );
}
// ******************************************************************
@@ -768,17 +788,17 @@
KeyboardInterface::getKeyState( _SCAN_RGT_ALT ))
{
- if (KeyboardInterface::getKeyPressed( _SCAN_NUM_PLUS )
== _TRUE)
+ if (KeyboardInterface::getKeyPressed( _SCAN_NUM_PLUS )
== true)
{
- if (Desktop::getView("MainView")->getVisible()
== _FALSE)
+ if (Desktop::getView("MainView")->getVisible()
== false)
{
increaseDisplayResolution();
}
}
- if (KeyboardInterface::getKeyPressed( _SCAN_NUM_MINUS )
== _TRUE)
+ if (KeyboardInterface::getKeyPressed( _SCAN_NUM_MINUS )
== true)
{
- if (Desktop::getView("MainView")->getVisible()
== _FALSE)
+ if (Desktop::getView("MainView")->getVisible()
== false)
{
decreaseDisplayResolution();
}
@@ -797,7 +817,7 @@
{
View *v =
Desktop::getView("OptionsView");
- if (v != NULL)
+ if (v != 0)
{
((OptionsTemplateView
*)v)->initButtons();
((OptionsTemplateView
*)v)->setAlwaysOnBottom(false);
@@ -807,7 +827,7 @@
}
v = Desktop::getView("SoundView");
- if (v != NULL)
+ if (v != 0)
{
((SoundView *)v)->initButtons();
((OptionsTemplateView
*)v)->setAlwaysOnBottom(false);
@@ -817,7 +837,7 @@
}
v = Desktop::getView("ControlsView");
- if (v != NULL)
+ if (v != 0)
{
((ControlsView
*)v)->initButtons();
((OptionsTemplateView
*)v)->setAlwaysOnBottom(false);
@@ -827,7 +847,7 @@
}
v = Desktop::getView("VisualsView");
- if (v != NULL)
+ if (v != 0)
{
((VisualsView
*)v)->initButtons();
((OptionsTemplateView
*)v)->setAlwaysOnBottom(false);
@@ -837,7 +857,7 @@
}
v = Desktop::getView("InterfaceView");
- if (v != NULL)
+ if (v != 0)
{
((InterfaceView
*)v)->initButtons();
((OptionsTemplateView
*)v)->setAlwaysOnBottom(false);
@@ -851,35 +871,35 @@
} else
{
View *v =
Desktop::getView("OptionsView");
- if (v != NULL)
+ if (v != 0)
{
((OptionsTemplateView
*)v)->setAlwaysOnBottom(true);
((OptionsTemplateView
*)v)->setVisible(false);
}
v = Desktop::getView("InterfaceView");
- if (v != NULL)
+ if (v != 0)
{
((OptionsTemplateView
*)v)->setAlwaysOnBottom(true);
((OptionsTemplateView
*)v)->setVisible(false);
}
v = Desktop::getView("VisualsView");
- if (v != NULL)
+ if (v != 0)
{
((OptionsTemplateView
*)v)->setAlwaysOnBottom(true);
((OptionsTemplateView
*)v)->setVisible(false);
}
v = Desktop::getView("SoundView");
- if (v != NULL)
+ if (v != 0)
{
((OptionsTemplateView
*)v)->setAlwaysOnBottom(true);
((OptionsTemplateView
*)v)->setVisible(false);
}
v = Desktop::getView("ControlsView");
- if (v != NULL)
+ if (v != 0)
{
((OptionsTemplateView
*)v)->setAlwaysOnBottom(true);
((OptionsTemplateView
*)v)->setVisible(false);
@@ -892,29 +912,29 @@
// ******************************************************************
-boolean GameManager::loadGameData( void )
+bool GameManager::loadGameData( void )
{
UnitProfileInterface::loadUnitProfiles();
LoadUnitSurfaces();
UNIT_FLAGS_SURFACE.loadAllBMPInDirectory( "pics\\flags\\netp\\" );
GameConfig::loadConfigScript();
- return( _TRUE );
+ return( true );
}
// ******************************************************************
-boolean GameManager::dedicatedLoadGameData( void )
+bool GameManager::dedicatedLoadGameData( void )
{
UnitProfileInterface::loadUnitProfiles();
LoadUnitSurfaces();
UNIT_FLAGS_SURFACE.loadAllBMPInDirectory( "pics\\flags\\netp\\" );
GameConfig::loadConfigScript();
- return( _TRUE );
+ return( true );
}
// ******************************************************************
-boolean GameManager::startGameMapLoad( char *map_file_path, unsigned long
partitions, int *result_code )
+bool GameManager::startGameMapLoad( char *map_file_path, unsigned long
partitions, int *result_code )
{
int check_return_code;
check_return_code = MapsManager::checkMapValidity( map_file_path );
@@ -922,13 +942,13 @@
if( check_return_code == _mapfile_not_found )
{
*result_code = _mapload_result_no_map_file;
- return( _FALSE );
+ return( false );
}
else
if( check_return_code == _wadfile_not_found )
{
*result_code = _mapload_result_no_wad_file;
- return( _FALSE );
+ return( false );
}
else
{ *result_code = _mapload_result_success; }
@@ -936,26 +956,26 @@
strcpy( map_path, ".\\maps\\" );
strcat( map_path, map_file_path );
- if ( MapInterface::startMapLoad( map_path, _TRUE, partitions ) == _FALSE )
+ if ( MapInterface::startMapLoad( map_path, true, partitions ) == false )
{
finishGameMapLoad();
- return( _FALSE );
+ return( false );
}
- return( _TRUE );
+ return( true );
}
// ******************************************************************
-boolean GameManager::gameMapLoad( int *percent_complete )
+bool GameManager::gameMapLoad( int *percent_complete )
{
- if( MapInterface::loadMap( percent_complete ) == _FALSE )
+ if( MapInterface::loadMap( percent_complete ) == false )
{
finishGameMapLoad();
- return( _FALSE );
+ return( false );
}
- return( _TRUE );
+ return( true );
}
// ******************************************************************
@@ -982,7 +1002,7 @@
strcpy( map_path, ".\\maps\\" );
strcat( map_path, map_name );
- MapInterface::startMapLoad( map_path, _FALSE, 0 );
+ MapInterface::startMapLoad( map_path, false, 0 );
strcat( map_path, ".opt" );
ObjectiveInterface::loadObjectiveList( map_path );
@@ -995,7 +1015,7 @@
}
// ******************************************************************
-boolean GameManager::initialize( const char *command_line )
+bool GameManager::initialize( const char *command_line )
{
char work_str[256];
char *token;
@@ -1003,7 +1023,7 @@
token = strtok( work_str, " " );
- if ( token != NULL )
+ if ( token != 0 )
{
if ( strcmpi( token, "-dedicated" ) == 0 )
{
@@ -1020,10 +1040,10 @@
}
// ******************************************************************
-boolean GameManager::bootStrap( void )
+bool GameManager::bootStrap( void )
{
unsigned long i = 0;
- boolean success = _TRUE;
+ bool success = true;
while( success && (i < _MAX_INITIALIZE_PROCS ) )
{
@@ -1075,20 +1095,20 @@
i++;
}
- if ( success == _FALSE )
+ if ( success == false )
{
shutdown( i );
- return ( _FALSE );
+ return ( false );
}
- return( _TRUE );
+ return( true );
}
// ******************************************************************
-boolean GameManager::dedicatedBootStrap( void )
+bool GameManager::dedicatedBootStrap( void )
{
unsigned long i = 0;
- boolean success = _TRUE;
+ bool success = true;
while( success && (i < _MAX_DEDICATED_INITIALIZE_PROCS) )
{
@@ -1131,15 +1151,15 @@
i++;
}
- if ( success == _FALSE )
+ if ( success == false )
{
dedicatedShutdown( i );
- return ( _FALSE );
+ return ( false );
}
launchDedicatedServer();
- return( _TRUE );
+ return( true );
}
@@ -1217,7 +1237,7 @@
// ******************************************************************
-void GameManager::spawnPlayer( PlayerID &player )
+void GameManager::spawnPlayer( const PlayerID &player )
{
PointXYi spawn_point;
@@ -1279,7 +1299,7 @@
Desktop::setVisibilityAllWindows(false);
Desktop::setVisibility("GameView", true);
- Desktop::setVisibility( "WinnerMesgView", TRUE );
+ Desktop::setVisibility( "WinnerMesgView", true );
SERVER->sendMessage( &view_control, sizeof( SystemViewControl ), 0 );
@@ -1294,7 +1314,7 @@
Desktop::setVisibilityAllWindows(false);
Desktop::setVisibility("GameView", true);
- Desktop::setVisibility( "WinnerMesgView", TRUE );
+ Desktop::setVisibility( "WinnerMesgView", true );
SERVER->sendMessage( &view_control, sizeof( SystemViewControl ), 0 );
@@ -1318,7 +1338,7 @@
case _gametype_fraglimit :
{
- if ( PlayerInterface::testRuleScoreLimit(
GameConfig::GetFragLimit(), &player_state ) == _TRUE )
+ if ( PlayerInterface::testRuleScoreLimit(
GameConfig::GetFragLimit(), &player_state ) == true )
{
fraglimitGameCompleted( player_state );
}
@@ -1326,7 +1346,7 @@
case _gametype_objective :
{
- if ( PlayerInterface::testRuleObjectiveRatio(
GameConfig::getObjectiveOccuapationPercentageDecimal(), &player_state ) ==
_TRUE )
+ if ( PlayerInterface::testRuleObjectiveRatio(
GameConfig::getObjectiveOccuapationPercentageDecimal(), &player_state ) == true
)
{
objectiveGameCompleted( player_state );
}
@@ -1335,8 +1355,8 @@
} // ** switch
// ** Check for Player Respawns **
- boolean respawn_rule_complete = _FALSE;
- while( respawn_rule_complete == _FALSE )
+ bool respawn_rule_complete = false;
+ while( respawn_rule_complete == false )
{
if ( PlayerInterface::testRulePlayerRespawn( &respawn_rule_complete,
&player_state ) )
{
@@ -1354,10 +1374,10 @@
// ******************************************************************
-boolean GameManager::initializeConnectionType( void )
+bool GameManager::initializeConnectionType( void )
{
//bug#15
- boolean ServProvReturn;
+ bool ServProvReturn;
int connection_type;
@@ -1406,12 +1426,12 @@
if ( view_control->action_flags & _view_control_flag_visible_on )
{
- Desktop::setVisibility( view_control->view_name, TRUE );
+ Desktop::setVisibility( view_control->view_name, true );
}
if ( view_control->action_flags & _view_control_flag_visible_off )
{
- Desktop::setVisibility( view_control->view_name, FALSE );
+ Desktop::setVisibility( view_control->view_name, false );
}
@@ -1420,8 +1440,8 @@
// ******************************************************************
void GameManager::netMessageConnectAlert( NetMessage *message )
{
- SystemConnectAlert *connect_alert = NULL;
- PlayerState *player_state = NULL;
+ SystemConnectAlert *connect_alert = 0;
+ PlayerState *player_state = 0;
connect_alert = (SystemConnectAlert *) message;
@@ -1508,7 +1528,7 @@
// ******************************************************************
-boolean GameManager::startClientGameSetup( NetMessage *message, int
*result_code )
+bool GameManager::startClientGameSetup( NetMessage *message, int *result_code )
{
ConnectMesgServerGameSettings *game_setup;
@@ -1528,20 +1548,20 @@
game_elapsed_time_offset = game_setup->elapsed_time;
startGameMapLoad( game_setup->map_name, 20, result_code );
- return( _TRUE );
+ return( true );
}
// ******************************************************************
-boolean GameManager::clientGameSetup( int *percent_complete )
+bool GameManager::clientGameSetup( int *percent_complete )
{
- if( gameMapLoad( percent_complete ) == _FALSE )
+ if( gameMapLoad( percent_complete ) == false )
{
reinitializeGameLogic();
- return( _FALSE );
+ return( false );
}
- return( _TRUE );
+ return( true );
}
@@ -1656,7 +1676,7 @@
{
PlayerID player;
PlayerState *player_state;
- boolean minimize;
+ bool minimize;
Timer wait;
progressView.open();
@@ -1670,7 +1690,7 @@
initializeConnectionType();
HostSession( gapp.hwndApp );
- if (minimize == _FALSE)
+ if (minimize == false)
{
Screen->setGDIStatus(false);
}
@@ -1685,7 +1705,7 @@
//InitStreamServer(gapp.hwndApp);
progressView.scrollAndUpdateDirect( "Launching Server ..." );
- if ( SERVER->hostSession() == _FALSE )
+ if ( SERVER->hostSession() == false )
{
progressView.scrollAndUpdateDirect( "SERVER LAUNCH FAILED" );
wait.changePeriod( 4 );
@@ -1726,7 +1746,7 @@
ObjectiveInterface::resetLogic();
- while( gameMapLoad( &percent_complete ) == _TRUE )
+ while( gameMapLoad( &percent_complete ) == true )
{
sprintf( strbuf, "Loading Game Data ... (%d%%)", percent_complete);
progressView.updateDirect( strbuf );
@@ -1783,7 +1803,7 @@
//InitStreamClient(gapp.hwndApp);
Timer wait;
- if ( CLIENT->joinSession() == _FALSE )
+ if ( CLIENT->joinSession() == false )
{
lobbyView.scrollAndUpdate( "FAILED TO JOIN NETPANZER SESSION" );
wait.changePeriod( 4 );
@@ -1912,7 +1932,7 @@
printf( "PowerUps <NO> (Y/N) : " );
gets( input_str );
if ( stricmp( "y", input_str ) == 0 )
- { GameConfig::setPowerUpState( _TRUE ); }
+ { GameConfig::setPowerUpState( true ); }
printf( "Server Name <Dedicated Server> :" );
gets( input_str );
@@ -2049,11 +2069,14 @@
{
KeyboardInterface::sampleKeyboard();
+ // XXX Joystick code disabled
+#if 0
if (JoystickInterface::exists())
{
JoystickInterface::poll();
gInputOffset = JoystickInterface::getOffset();
}
+#endif
processSystemKeys();
@@ -2083,13 +2106,13 @@
char strBuf[256];
- if (display_frame_rate_flag == _TRUE)
+ if (display_frame_rate_flag == true)
{
sprintf(strBuf, "%3.1f : %3.1f" , TimerInterface::getFPS(),
TimerInterface::getFPSAvg());
screen.bltString5x5(iXY(2, 2), strBuf, Color::white);
}
- if (display_network_info_flag == _TRUE)
+ if (display_network_info_flag == true)
{
sprintf(strBuf, "|| %.4f : %.4f || %.4f : %.4f ||" ,
NetworkState::packets_sent_per_sec, NetworkState::bytes_sent_per_sec,
NetworkState::packets_received_per_sec, NetworkState::bytes_received_per_sec );
@@ -2230,3 +2253,5 @@
return( (current_time - game_start_time) + game_elapsed_time_offset );
}
+#endif
+
Index: netpanzer/src/NetPanzer/Interfaces/GameManager.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/GameManager.hpp:1.1
netpanzer/src/NetPanzer/Interfaces/GameManager.hpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/GameManager.hpp:1.1 Sun Dec 1
12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/GameManager.hpp Mon Sep 1 16:24:20 2003
@@ -18,7 +18,7 @@
#ifndef _GAMEMANAGER_HPP
#define _GAMEMANAGER_HPP
-#include "Aliasdef.h"
+#include <time.h>
#include "PlayerState.hpp"
#include "NetPacket.hpp"
#include "Point.hpp"
@@ -55,8 +55,8 @@
static time_t game_start_time;
static time_t game_elapsed_time_offset;
- static boolean display_frame_rate_flag;
- static boolean display_network_info_flag;
+ static bool display_frame_rate_flag;
+ static bool display_network_info_flag;
static int execution_mode;
@@ -67,34 +67,34 @@
protected:
static unsigned char game_state;
- static boolean initializeDirectXSubSystem( void );
+ static bool initializeDirectXSubSystem( void );
static void shutdownDirectXSubSystem( void );
- static boolean initializeWin32SubSystem( void );
+ static bool initializeWin32SubSystem( void );
static void shutdownWin32SubSystem( void );
- static boolean initializeNetworkSubSystem( void );
+ static bool initializeNetworkSubSystem( void );
static void shutdownNetworkSubSystem( void );
- static boolean initializeInputDevices( void );
+ static bool initializeInputDevices( void );
- static boolean initializeVideoSubSystem( void );
+ static bool initializeVideoSubSystem( void );
- static boolean initializeSoundSubSystem( void );
+ static bool initializeSoundSubSystem( void );
static void shutdownSoundSubSystem( void );
- static boolean initializeWindowSubSystem( void );
+ static bool initializeWindowSubSystem( void );
// initialize all static objects / interfaces;
- static boolean initializeGameObjects( void );
- static boolean shutdownGameObjects( void );
+ static bool initializeGameObjects( void );
+ static bool shutdownGameObjects( void );
- static boolean initializeDedicatedConsole( void );
- static boolean shutdownDedicatedConsole( void );
+ static bool initializeDedicatedConsole( void );
+ static bool shutdownDedicatedConsole( void );
// boots up netPanzer; initializes all subsystems, game objects etc.
- static boolean bootStrap( void );
- static boolean dedicatedBootStrap( void );
+ static bool bootStrap( void );
+ static bool dedicatedBootStrap( void );
static void shutdown( unsigned long failure_index );
static void dedicatedShutdown( unsigned long failure_index );
@@ -114,18 +114,18 @@
static void setupKeyboardBindings( void );
- static boolean startGameMapLoad( char *map_file_path, unsigned long
partitions, int *result_code );
- static boolean gameMapLoad( int *percent_complete );
+ static bool startGameMapLoad( char *map_file_path, unsigned long
partitions, int *result_code );
+ static bool gameMapLoad( int *percent_complete );
static void finishGameMapLoad( void );
static void dedicatedLoadGameMap( char *map_file_path );
- static boolean loadGameData( void );
- static boolean dedicatedLoadGameData( void );
+ static bool loadGameData( void );
+ static bool dedicatedLoadGameData( void );
- static boolean initializeGameLogic( void );
- static boolean reinitializeGameLogic( void );
- static boolean resetGameLogic( void );
+ static bool initializeGameLogic( void );
+ static bool reinitializeGameLogic( void );
+ static bool resetGameLogic( void );
static void shutdownGameLogic( void );
static void shutdownParticleSystems( void );
@@ -149,8 +149,8 @@
static void netMessageResetGameLogic( NetMessage *message );
static void getServerGameSetup( NetMessage *message );
- static boolean startClientGameSetup( NetMessage *message, int *result_code
);
- static boolean clientGameSetup( int *percent_complete );
+ static bool startClientGameSetup( NetMessage *message, int *result_code );
+ static bool clientGameSetup( int *percent_complete );
// ** Game Launching Methods
static void hostMultiPlayerGame( void );
@@ -162,7 +162,7 @@
public:
- static boolean initialize( const char *command_line );
+ static bool initialize( const char *command_line );
static void shutdown( void );
@@ -176,15 +176,15 @@
static void setNetPanzerGameOptions( void );
- static boolean initializeConnectionType( void );
+ static bool initializeConnectionType( void );
- static void spawnPlayer( PlayerID &player );
+ static void spawnPlayer( const PlayerID &player );
static void requestNetworkPing( void );
static void processSystemMessage( NetMessage *message );
- static boolean setVideoMode( PointXYi mode_res );
+ static bool setVideoMode( PointXYi mode_res );
static void restorePreviousVideoMode( void );
static void increaseDisplayResolution( void );
Index: netpanzer/src/NetPanzer/Interfaces/KeyboardInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/KeyboardInterface.cpp:1.1
netpanzer/src/NetPanzer/Interfaces/KeyboardInterface.cpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/KeyboardInterface.cpp:1.1 Sun Dec
1 12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/KeyboardInterface.cpp Mon Sep 1
16:24:20 2003
@@ -15,7 +15,10 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
+// XXX we need new unix code here
+#ifndef UNIX
+
+#include <windows.h>
#include "KeyboardInterface.hpp"
#include "DirectInput.hpp"
@@ -33,3 +36,6 @@
DirectInput::getKeyboardState(key_table);
}
+
+#endif
+
Index: netpanzer/src/NetPanzer/Interfaces/KeyboardInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/KeyboardInterface.hpp:1.1
netpanzer/src/NetPanzer/Interfaces/KeyboardInterface.hpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/KeyboardInterface.hpp:1.1 Sun Dec
1 12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/KeyboardInterface.hpp Mon Sep 1
16:24:20 2003
@@ -18,7 +18,6 @@
#ifndef _KEYBOARDINTERFACE_HPP
#define _KEYBOARDINTERFACE_HPP
-#include "aliasdef.h"
#include <string.h>
#define _CHAR_BUFFER_SIZE 256
@@ -44,32 +43,32 @@
static void sampleKeyboard( void );
- static boolean getKeyPressed(unsigned char scanCode)
+ static bool getKeyPressed(unsigned char scanCode)
{
if (
- KeyboardInterface::getKeyState(scanCode) == _TRUE &&
- KeyboardInterface::getPrevKeyState(scanCode) == _FALSE)
+ KeyboardInterface::getKeyState(scanCode) == true &&
+ KeyboardInterface::getPrevKeyState(scanCode) == false)
{
- return _TRUE;
+ return true;
}
- return _FALSE;
+ return false;
}
- static inline boolean getKeyState( unsigned char scan_code )
+ static inline bool getKeyState( unsigned char scan_code )
{
if ( key_table[ scan_code ] & 0x80 )
- return( _TRUE );
+ return( true );
- return( _FALSE );
+ return( false );
}
- static inline boolean getPrevKeyState( unsigned char scan_code )
+ static inline bool getPrevKeyState( unsigned char scan_code )
{
if ( previous_key_state[ scan_code ] & 0x80 )
- return( _TRUE );
+ return( true );
- return( _FALSE );
+ return( false );
}
static inline void flushCharBuffer( void )
@@ -78,15 +77,15 @@
char_buffer_rear = 0;
}
- static inline boolean getChar( char *c )
+ static inline bool getChar( char *c )
{
if ( char_buffer_front == char_buffer_rear )
- return( _FALSE );
+ return( false );
char_buffer_front = ( char_buffer_front + 1 ) & _CHAR_BUFFER_MOD;
*c = char_buffer[ char_buffer_front ];
- return( _TRUE );
+ return( true );
}
static inline void putChar( char c )
Index: netpanzer/src/NetPanzer/Interfaces/MapInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/MapInterface.cpp:1.1
netpanzer/src/NetPanzer/Interfaces/MapInterface.cpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/MapInterface.cpp:1.1 Sun Dec 1
12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/MapInterface.cpp Mon Sep 1 16:24:20 2003
@@ -15,13 +15,12 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "MapInterface.hpp"
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
-#include "mapdata.hpp"
+#include "MapData.hpp"
WorldMap MapInterface::main_map;
SpawnList MapInterface::spawn_list;
@@ -29,7 +28,7 @@
Surface MapInterface::mini_map_surface;
char MapInterface::map_path[256];
-boolean MapInterface::startMapLoad( const char *file_path, boolean load_tiles,
unsigned long partitions )
+bool MapInterface::startMapLoad( const char *file_path, bool load_tiles,
unsigned long partitions )
{
char path[256];
char tile_set_path[256];
@@ -47,12 +46,12 @@
generateMappingTable();
main_map.reMap( wad_mapping_table );
- if ( load_tiles == _TRUE )
+ if ( load_tiles == true )
{
- if ( tile_set.startPartitionTileSetLoad( tile_set_path, wad_mapping_table,
partitions ) == _FALSE )
+ if ( tile_set.startPartitionTileSetLoad( tile_set_path, wad_mapping_table,
partitions ) == false )
{
finishMapLoad();
- return( _FALSE );
+ return( false );
}
}
@@ -60,21 +59,21 @@
{
tile_set.loadTileSetInfo( tile_set_path, wad_mapping_table );
finishMapLoad();
- return( _FALSE );
+ return( false );
}
- return( _TRUE );
+ return( true );
}
-boolean MapInterface::loadMap( int *percent_complete )
+bool MapInterface::loadMap( int *percent_complete )
{
- if( tile_set.partitionTileSetLoad( wad_mapping_table, percent_complete ) ==
_FALSE )
+ if( tile_set.partitionTileSetLoad( wad_mapping_table, percent_complete ) ==
false )
{
finishMapLoad();
- return( _FALSE );
+ return( false );
}
else
- { return( _TRUE ); }
+ { return( true ); }
}
@@ -93,7 +92,7 @@
}
/*
-void MapInterface::LoadMap( const char *file_path, boolean load_tiles )
+void MapInterface::LoadMap( const char *file_path, bool load_tiles )
{
char path[80];
@@ -105,7 +104,7 @@
generateMappingTable();
main_map.reMap( wad_mapping_table );
- if ( load_tiles == _TRUE )
+ if ( load_tiles == true )
{
tile_set.loadTileSet( ".\\wads\\wad.tls", wad_mapping_table );
}
@@ -146,7 +145,7 @@
{
tile_index = map_buffer[ map_index ];
- wad_mapping_table[ tile_index ].is_used = _TRUE;
+ wad_mapping_table[ tile_index ].is_used = true;
} // ** for
// ** Remap the used tiles **
@@ -154,7 +153,7 @@
for ( tile_index = 0; tile_index < tile_count; tile_index++ )
{
- if ( wad_mapping_table[ tile_index ].is_used == _TRUE )
+ if ( wad_mapping_table[ tile_index ].is_used == true )
{
wad_mapping_table[ tile_index ].remap_index = mapping_index;
mapping_index++;
Index: netpanzer/src/NetPanzer/Interfaces/MapInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/MapInterface.hpp:1.1
netpanzer/src/NetPanzer/Interfaces/MapInterface.hpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/MapInterface.hpp:1.1 Sun Dec 1
12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/MapInterface.hpp Mon Sep 1 16:24:20 2003
@@ -18,7 +18,6 @@
#ifndef _MAPINTERFACE_HPP
#define _MAPINTERFACE_HPP
-#include "aliasdef.h"
#include "PObject.hpp"
#include "TileInterface.hpp"
#include "WorldMap.hpp"
@@ -138,7 +137,7 @@
main_map.mapXYtoOffset( map_loc.x, map_loc.y, offset );
}
- static inline void markLocHack( PointXYi &loc )
+ static inline void markLocHack( const PointXYi &loc )
{
unsigned short *map_buffer;
unsigned long offset;
@@ -147,7 +146,7 @@
map_buffer[ offset ] = 27;
}
- static inline void unmarkLocHack( PointXYi &loc )
+ static inline void unmarkLocHack( const PointXYi &loc )
{
unsigned short *map_buffer;
unsigned long offset;
@@ -178,10 +177,10 @@
protected:
static void finishMapLoad( void );
public:
- static boolean startMapLoad( const char *file_path, boolean load_tiles,
unsigned long partitions );
- static boolean loadMap( int *percent_complete );
+ static bool startMapLoad( const char *file_path, bool load_tiles, unsigned
long partitions );
+ static bool loadMap( int *percent_complete );
- static inline boolean isMapLoaded( void )
+ static inline bool isMapLoaded( void )
{ return( main_map.isMapLoaded() ); }
static inline Surface * getMiniMapSurface( void )
Index: netpanzer/src/NetPanzer/Interfaces/MapsManager.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/MapsManager.cpp:1.1
netpanzer/src/NetPanzer/Interfaces/MapsManager.cpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/MapsManager.cpp:1.1 Sun Dec 1
12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/MapsManager.cpp Mon Sep 1 16:24:20 2003
@@ -15,9 +15,9 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
-
+#ifdef WIN32
#include <io.h>
+#endif
#include <string.h>
#include "MapsManager.hpp"
#include "MapFileStruct.hpp"
@@ -49,6 +49,8 @@
void MapsManager::scanMaps( const char *map_directory )
{
+ // XXX need a substitute for _findfirst
+#ifdef WIN32
char search_path[ _MAX_FNAME ];
char temp_path[ _MAX_FNAME ];
@@ -77,7 +79,7 @@
_findclose( hFile );
}
-
+#endif
}
@@ -115,7 +117,7 @@
for( int i = 0; i < list_size; i++ )
{
master_maps_list.getFilename( i, cycle_map_name );
- if( strcmpi( cycle_map_name, map_name ) == 0 )
+ if( strcasecmp( cycle_map_name, map_name ) == 0 )
{
map_cycle_index = i;
return;
@@ -125,7 +127,7 @@
int MapsManager::checkMapValidity( char *map_name )
{
- boolean found = _FALSE;
+ bool found = false;
int list_size;
char cycle_map_name[256];
@@ -134,13 +136,13 @@
for( int i = 0; i < list_size; i++ )
{
master_maps_list.getFilename( i, cycle_map_name );
- if( strcmpi( cycle_map_name, map_name ) == 0 )
+ if( strcasecmp( cycle_map_name, map_name ) == 0 )
{
- found = _TRUE;
+ found = true;
}
}
- if( found == _FALSE )
+ if( found == false )
{ return( _mapfile_not_found ); }
FILE *fp;
@@ -162,7 +164,7 @@
fp = fopen( temp_path, "rb" );
- if( fp == NULL )
+ if( fp == 0 )
{
return( _wadfile_not_found );
}
Index: netpanzer/src/NetPanzer/Interfaces/MiniMapInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/MiniMapInterface.cpp:1.1
netpanzer/src/NetPanzer/Interfaces/MiniMapInterface.cpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/MiniMapInterface.cpp:1.1 Sun Dec 1
12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/MiniMapInterface.cpp Mon Sep 1
16:24:20 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "MiniMapInterface.hpp"
#include "WorldInputCmdProcessor.hpp"
@@ -29,7 +28,7 @@
fXY MiniMapInterface::scale_factor;
PointXYi MiniMapInterface::mini_map_size;
-boolean MiniMapInterface::pathing_debug_mode = _FALSE;
+bool MiniMapInterface::pathing_debug_mode = false;
PIX MiniMapInterface::player_unit_color;
PIX MiniMapInterface::allie_unit_color;
@@ -39,10 +38,10 @@
PIX MiniMapInterface::enemy_objective_color;
TimerFrameBase MiniMapInterface::radar_blink_timer;
-boolean MiniMapInterface::radar_blink_flag;
+bool MiniMapInterface::radar_blink_flag;
TimerFrameBase MiniMapInterface::show_enemy_radar_timer;
-boolean MiniMapInterface::show_enemy_radar_flag;
+bool MiniMapInterface::show_enemy_radar_flag;
Recti MiniMapInterface::getWorldWindow( void )
{
@@ -100,7 +99,7 @@
{
if ( threat_level == _threat_level_under_attack )
{
- if ( radar_blink_flag == _TRUE )
+ if ( radar_blink_flag == true )
{
drawLargeUnitDot( map_surface, map_loc, Color::yellow );
}
@@ -132,7 +131,7 @@
} else { assert(false); }
}
else
- if( ( unit_dispostion == _unit_enemy ) && (show_enemy_radar_flag ==
_TRUE) )
+ if( ( unit_dispostion == _unit_enemy ) && (show_enemy_radar_flag ==
true) )
{
if (GameConfig::getMiniMapUnitSize() == _mini_map_unit_size_small)
@@ -158,7 +157,7 @@
ObjectiveInterface::startObjectivePositionEnumeration();
- while( ObjectiveInterface::objectivePositionEnumeration( &world_rect,
&objective_disposition, NULL ) )
+ while( ObjectiveInterface::objectivePositionEnumeration( &world_rect,
&objective_disposition, 0 ) )
{
switch( objective_disposition )
{
@@ -204,7 +203,7 @@
void MiniMapInterface::annotateMiniMap( Surface &map_surface )
{
- if ( pathing_debug_mode == _TRUE )
+ if ( pathing_debug_mode == true )
{
BitArray *bit_array;
unsigned long map_x_size = MapInterface::getMapXsize();
@@ -227,11 +226,11 @@
if ( radar_blink_timer.count() )
{ radar_blink_flag = !radar_blink_flag; }
- if( show_enemy_radar_flag == _TRUE )
+ if( show_enemy_radar_flag == true )
{
if( show_enemy_radar_timer.count() )
{
- show_enemy_radar_flag = _FALSE;
+ show_enemy_radar_flag = false;
}
}
@@ -241,12 +240,12 @@
}
-boolean MiniMapInterface::isUnitSelected( void )
+bool MiniMapInterface::isUnitSelected( void )
{
return( COMMAND_PROCESSOR.isUnitSelected() );
}
-boolean MiniMapInterface::selectUnits( Recti bound_box )
+bool MiniMapInterface::selectUnits( Recti 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 +260,7 @@
COMMAND_PROCESSOR.deselectUnitsExternal();
}
-boolean MiniMapInterface::isValidUnitMove( PointXYi location )
+bool MiniMapInterface::isValidUnitMove( PointXYi location )
{
location.x = location.x * scale_factor.x;
location.y = location.y * scale_factor.y;
@@ -269,7 +268,7 @@
return( COMMAND_PROCESSOR.isValidMoveLocation( location ) );
}
-boolean MiniMapInterface::moveUnits( PointXYi location )
+bool MiniMapInterface::moveUnits( PointXYi location )
{
location.x = location.x * scale_factor.x;
location.y = location.y * scale_factor.y;
@@ -277,7 +276,7 @@
return( COMMAND_PROCESSOR.sendMoveCommandExternal( location ) );
}
-void MiniMapInterface::setPathingDebugMode( boolean on_off )
+void MiniMapInterface::setPathingDebugMode( bool on_off )
{
pathing_debug_mode = on_off;
}
@@ -286,7 +285,7 @@
{
show_enemy_radar_timer.changePeriod( time );
show_enemy_radar_timer.reset();
- show_enemy_radar_flag = _TRUE;
+ show_enemy_radar_flag = true;
}
void MiniMapInterface::setProperties( PIX player_unit_color,
@@ -303,10 +302,10 @@
MiniMapInterface::allie_objective_color = allie_objective_color;
MiniMapInterface::enemy_objective_color = enemy_objective_color;
- radar_blink_flag = _FALSE;
+ radar_blink_flag = false;
radar_blink_timer.changeRate( 10 );
- show_enemy_radar_flag = _FALSE;
+ show_enemy_radar_flag = false;
}
void MiniMapInterface::drawLargeUnitDot( const Surface &dest, const PointXYi
&location, unsigned char color )
Index: netpanzer/src/NetPanzer/Interfaces/MiniMapInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/MiniMapInterface.hpp:1.1
netpanzer/src/NetPanzer/Interfaces/MiniMapInterface.hpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/MiniMapInterface.hpp:1.1 Sun Dec 1
12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/MiniMapInterface.hpp Mon Sep 1
16:24:20 2003
@@ -28,13 +28,13 @@
protected:
static fXY scale_factor;
static PointXYi mini_map_size;
- static boolean pathing_debug_mode;
+ static bool pathing_debug_mode;
static TimerFrameBase radar_blink_timer;
- static boolean radar_blink_flag;
+ static bool radar_blink_flag;
static TimerFrameBase show_enemy_radar_timer;
- static boolean show_enemy_radar_flag;
+ static bool show_enemy_radar_flag;
static PIX player_unit_color;
static PIX allie_unit_color;
@@ -64,14 +64,14 @@
static void annotateMiniMap( Surface &map_surface );
- static boolean isUnitSelected( void );
+ static bool isUnitSelected( void );
static void deselectUnits( void );
- static boolean selectUnits( Recti bound_box );
- static boolean isValidUnitMove( PointXYi location );
- static boolean moveUnits( PointXYi location );
+ static bool selectUnits( Recti bound_box );
+ static bool isValidUnitMove( PointXYi location );
+ static bool moveUnits( PointXYi location );
- static void setPathingDebugMode( boolean on_off );
+ static void setPathingDebugMode( bool on_off );
static void setShowEnemyRadar( float time );
Index: netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp:1.1
netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp:1.1 Sun Dec 1
12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp Mon Sep 1
16:24:20 2003
@@ -15,7 +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 "stdafx.hpp"
+// XXX need new unix code here
+#ifndef UNIX
#include "MouseInterface.hpp"
#include <windows.h>
@@ -36,29 +37,29 @@
unsigned char MouseInterface::cursor_x_size;
unsigned char MouseInterface::cursor_y_size;
- Surface MouseInterface::mouse_cursor( _FALSE );
+ Surface MouseInterface::mouse_cursor( false );
PointXYi MouseInterface::mouse_pos;
float MouseInterface::button_hold_threshold = (const float) .10;
- boolean MouseInterface::left_button_down = _FALSE;
- boolean MouseInterface::left_button_up = _FALSE;
- boolean MouseInterface::left_button_dbclick_active = _FALSE;
+ 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;
TIMESTAMP MouseInterface::left_button_hold_time;
- boolean MouseInterface::right_button_down = _FALSE;
- boolean MouseInterface::right_button_up = _FALSE;
- boolean MouseInterface::right_button_dbclick_active = _FALSE;
+ 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;
TIMESTAMP MouseInterface::right_button_hold_time;
- boolean MouseInterface::middle_button_down = _FALSE;
- boolean MouseInterface::middle_button_up = _FALSE;
- boolean MouseInterface::middle_button_dbclick_active = _FALSE;
+ 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;
TIMESTAMP MouseInterface::middle_button_hold_time;
@@ -85,31 +86,31 @@
mouse_pos.y = y;
}
- boolean MouseInterface::buttonHeld( unsigned char mask)
+ bool MouseInterface::buttonHeld( unsigned char mask)
{
if ( (mask & _LEFT_BUTTON_MASK) && left_button_down )
{
if( (now() - left_button_hold_time) > button_hold_threshold )
- return( _TRUE );
+ return( true );
}
else
if ( (mask & _RIGHT_BUTTON_MASK) && right_button_down )
{
if( (now() - right_button_hold_time) > button_hold_threshold )
- return( _TRUE );
+ return( true );
}
else
if ( (mask & _MIDDLE_BUTTON_MASK) && middle_button_down )
{
if( (now() - middle_button_hold_time) > button_hold_threshold )
- return( _TRUE );
+ return( true );
}
- return( _FALSE );
+ return( false );
}
void MouseInterface::resetButtonHoldStatus( void )
@@ -123,9 +124,9 @@
{
MouseEvent event;
- //assert( left_button_down == _FALSE );
- left_button_down = _TRUE;
- left_button_up = _FALSE;
+ //assert( left_button_down == false );
+ left_button_down = true;
+ left_button_up = false;
button_mask = button_mask | 0x01;
left_button_down_pos = mouse_pos;
left_button_hold_time = now();
@@ -141,9 +142,9 @@
{
MouseEvent event;
- //assert( left_button_up == _FALSE );
- left_button_down = _FALSE;
- left_button_up = _TRUE;
+ //assert( left_button_up == false );
+ left_button_down = false;
+ left_button_up = true;
button_mask = button_mask & (~0x01);
left_button_up_pos = mouse_pos;
@@ -152,10 +153,10 @@
event.up_pos = left_button_up_pos;
- if ( left_button_dbclick_active == _TRUE )
+ if ( left_button_dbclick_active == true )
{
event.event = _event_mbutton_dbclick;
- left_button_dbclick_active = _FALSE;
+ left_button_dbclick_active = false;
}
else
event.event = _event_mbutton_click;
@@ -170,9 +171,9 @@
void MouseInterface::setLeftButtonDoubleDown( void )
{
- left_button_down = _TRUE;
- left_button_dbclick_active = _TRUE;
- left_button_up = _FALSE;
+ left_button_down = true;
+ left_button_dbclick_active = true;
+ left_button_up = false;
button_mask = button_mask | 0x01;
left_button_down_pos = mouse_pos;
left_button_hold_time = now();
@@ -183,9 +184,9 @@
{
MouseEvent event;
- //assert( right_button_down == _FALSE );
- right_button_down = _TRUE;
- right_button_up = _FALSE;
+ //assert( right_button_down == false );
+ right_button_down = true;
+ right_button_up = false;
button_mask = button_mask | 0x04;
right_button_down_pos = mouse_pos;
right_button_hold_time = now();
@@ -201,9 +202,9 @@
{
MouseEvent event;
- //assert( right_button_up == _FALSE );
- right_button_down = _FALSE;
- right_button_up = _TRUE;
+ //assert( right_button_up == false );
+ right_button_down = false;
+ right_button_up = true;
button_mask = button_mask & (~0x04);
right_button_up_pos = mouse_pos;
@@ -211,10 +212,10 @@
event.up_pos = right_button_up_pos;
- if ( right_button_dbclick_active == _TRUE )
+ if ( right_button_dbclick_active == true )
{
event.event = _event_mbutton_dbclick;
- right_button_dbclick_active = _FALSE;
+ right_button_dbclick_active = false;
}
else
event.event = _event_mbutton_click;
@@ -229,9 +230,9 @@
void MouseInterface::setRightButtonDoubleDown( void )
{
- right_button_down = _TRUE;
- right_button_dbclick_active = _TRUE;
- right_button_up = _FALSE;
+ right_button_down = true;
+ right_button_dbclick_active = true;
+ right_button_up = false;
button_mask = button_mask | 0x04;
right_button_down_pos = mouse_pos;
right_button_hold_time = now();
@@ -242,9 +243,9 @@
{
MouseEvent event;
- //assert( middle_button_down == _FALSE );
- middle_button_down = _TRUE;
- middle_button_up = _FALSE;
+ //assert( middle_button_down == false );
+ middle_button_down = true;
+ middle_button_up = false;
button_mask = button_mask | 0x02;
middle_button_down_pos = mouse_pos;
middle_button_hold_time = now();
@@ -260,9 +261,9 @@
{
MouseEvent event;
- //assert( middle_button_up == _FALSE );
- middle_button_down = _FALSE;
- middle_button_up = _TRUE;
+ //assert( middle_button_up == false );
+ middle_button_down = false;
+ middle_button_up = true;
button_mask = button_mask & (~0x02);
middle_button_up_pos = mouse_pos;
@@ -271,10 +272,10 @@
- if ( middle_button_dbclick_active == _TRUE )
+ if ( middle_button_dbclick_active == true )
{
event.event = _event_mbutton_dbclick;
- middle_button_dbclick_active = _FALSE;
+ middle_button_dbclick_active = false;
}
else
event.event = _event_mbutton_click;
@@ -289,9 +290,9 @@
void MouseInterface::setMiddleButtonDoubleDown( void )
{
- middle_button_down = _TRUE;
- middle_button_dbclick_active = _TRUE;
- middle_button_up = _FALSE;
+ middle_button_down = true;
+ middle_button_dbclick_active = true;
+ middle_button_up = false;
button_mask = button_mask | 0x02;
middle_button_down_pos = mouse_pos;
middle_button_hold_time = now();
@@ -421,3 +422,4 @@
//mouse_cursor.bltTrans( FRAME_BUFFER, mouse_pos.x, mouse_pos.y );
//FRAME_BUFFER.unlock();
}
+#endif
Index: netpanzer/src/NetPanzer/Interfaces/MouseInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/MouseInterface.hpp:1.1
netpanzer/src/NetPanzer/Interfaces/MouseInterface.hpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/MouseInterface.hpp:1.1 Sun Dec 1
12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/MouseInterface.hpp Mon Sep 1
16:24:20 2003
@@ -18,7 +18,6 @@
#ifndef _MOUSEINTERFACE_HPP
#define _MOUSEINTERFACE_HPP
-#include "aliasdef.h"
#include "PObject.hpp"
#include "Point.hpp"
#include "QueueTemplate.hpp"
@@ -70,23 +69,23 @@
static float button_hold_threshold;
- static boolean left_button_down;
- static boolean left_button_up;
- static boolean left_button_dbclick_active;
+ 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 TIMESTAMP left_button_hold_time;
- static boolean right_button_down;
- static boolean right_button_up;
- static boolean right_button_dbclick_active;
+ 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 TIMESTAMP right_button_hold_time;
- static boolean middle_button_down;
- static boolean middle_button_up;
- static boolean middle_button_dbclick_active;
+ 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 TIMESTAMP middle_button_hold_time;
@@ -111,7 +110,7 @@
return( button_mask );
}
- static boolean buttonHeld( unsigned char mask);
+ static bool buttonHeld( unsigned char mask);
static void resetButtonHoldStatus( void );
static void setLeftButtonDown( void );
Index: netpanzer/src/NetPanzer/Interfaces/ObjectiveInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/ObjectiveInterface.cpp:1.1
netpanzer/src/NetPanzer/Interfaces/ObjectiveInterface.cpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/ObjectiveInterface.cpp:1.1 Sun Dec
1 12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/ObjectiveInterface.cpp Mon Sep 1
16:24:20 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "ObjectiveInterface.hpp"
#include <stdio.h>
@@ -45,7 +44,7 @@
for( list_index = 0; list_index < list_size; list_index++ )
{
- if ( objective_list[ list_index ] != NULL )
+ if ( objective_list[ list_index ] != 0 )
{
delete( objective_list[ list_index ] );
}
@@ -67,7 +66,7 @@
char comment[64];
infile = fopen( file_path, "rt" );
- assert( infile != NULL );
+ assert( infile != 0 );
cleanUpObjectiveList();
@@ -113,7 +112,7 @@
objective_state = &objective_list[ list_index ]->objective_state;
- if ( objective_state->selection_box.contains( loc ) == _TRUE )
+ if ( objective_state->selection_box.contains( loc ) == true )
{
if ( objective_state->occupation_status == _occupation_status_occupied )
{
@@ -197,7 +196,7 @@
}
-boolean ObjectiveInterface::
+bool ObjectiveInterface::
testRuleObjectiveOccupationRatio( unsigned short player_index, float
precentage )
{
unsigned long list_size;
@@ -241,9 +240,9 @@
if ( occupied >= occupation_ratio )
- return ( _TRUE );
+ return ( true );
- return( _FALSE );
+ return( false );
}
void ObjectiveInterface::disownPlayerObjectives( PlayerID &player )
@@ -298,7 +297,7 @@
objective_position_enum_player_id = PlayerInterface::getLocalPlayerID();
}
-boolean ObjectiveInterface::objectivePositionEnumeration( Recti
*objective_rect, unsigned char *objective_disposition, int *objective_id )
+bool ObjectiveInterface::objectivePositionEnumeration( Recti *objective_rect,
unsigned char *objective_disposition, int *objective_id )
{
ObjectiveState *objective_state;
@@ -307,7 +306,7 @@
objective_state = &(objective_list[ objective_position_enum_index
]->objective_state);
(*objective_rect) = objective_state->area.getAbsRect(
objective_state->location );
- if( objective_id != NULL )
+ if( objective_id != 0 )
{ (*objective_id) = objective_position_enum_index; }
if ( objective_state->occupation_status == _occupation_status_occupied )
@@ -326,10 +325,10 @@
{ (*objective_disposition) = _objective_disposition_unoccupied;
}
objective_position_enum_index++;
- return( _TRUE );
+ return( true );
} // ** if
- return( _FALSE );
+ return( false );
}
void ObjectiveInterface::syncObjectives( PlayerID connect_player )
@@ -356,7 +355,7 @@
}
message_encoder.getEncodeMessage( &encode_message );
- if ( encode_message != NULL )
+ if ( encode_message != 0 )
{
SERVER->sendMessage( encode_message, encode_message->realSize(),
connect_player, 0 );
} // ** if
@@ -365,7 +364,7 @@
void ObjectiveInterface::updatePlayerObjectiveCounts( void )
{
unsigned long player_index, player_count;
- PlayerState *player_state = NULL;
+ PlayerState *player_state = 0;
player_count = PlayerInterface::getMaxPlayers();
Index: netpanzer/src/NetPanzer/Interfaces/ObjectiveInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/ObjectiveInterface.hpp:1.1
netpanzer/src/NetPanzer/Interfaces/ObjectiveInterface.hpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/ObjectiveInterface.hpp:1.1 Sun Dec
1 12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/ObjectiveInterface.hpp Mon Sep 1
16:24:20 2003
@@ -63,7 +63,7 @@
static void offloadGraphics( SpriteSorter &sorter );
- static boolean testRuleObjectiveOccupationRatio( unsigned short
player_index, float precentage );
+ static bool testRuleObjectiveOccupationRatio( unsigned short player_index,
float precentage );
static void disownPlayerObjectives( PlayerID &player );
@@ -87,7 +87,7 @@
public:
static void startObjectivePositionEnumeration( void );
- static boolean objectivePositionEnumeration( Recti *objective_rect,
unsigned char *objective_disposition, int *objective_id );
+ static bool objectivePositionEnumeration( Recti *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.1
netpanzer/src/NetPanzer/Interfaces/PathScheduler.cpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/PathScheduler.cpp:1.1 Sun Dec 1
12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/PathScheduler.cpp Mon Sep 1
16:24:20 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "PathScheduler.hpp"
@@ -37,7 +36,7 @@
for( unsigned long i = 0; i < PathCache::cache_size; i++ )
{
cache_list[ i ].path.initialize();
- cache_list[ i ].valid = _FALSE;
+ cache_list[ i ].valid = false;
}
start_proximity_threshold = 625; // 25 * 25
@@ -45,7 +44,7 @@
add_path_length_threshold = 100;
}
-boolean PathCache::search( PathRequest &path_request )
+bool PathCache::search( PathRequest &path_request )
{
for ( unsigned long list_index = 0; list_index < cache_size; list_index++ )
@@ -56,21 +55,21 @@
cache_entry = &(cache_list[ list_index ]);
- if ( cache_entry->valid == _TRUE )
+ if ( cache_entry->valid == true )
{
- start_mag = (cache_entry->start - path_request.start).mag2();
- goal_mag = (cache_entry->goal - path_request.goal).mag2();
+ start_mag = (long) ((cache_entry->start - path_request.start).mag2());
+ goal_mag = (long) (cache_entry->goal - path_request.goal).mag2();
if ( (start_mag <= start_proximity_threshold) && (goal_mag <=
goal_proximity_threshold) )
{
*(path_request.path) = cache_entry->path;
- return ( _TRUE );
+ return ( true );
}
- } // ** if ( cache_entry->valid == _TRUE )
+ } // ** if ( cache_entry->valid == true )
} // ** for
- return( _FALSE );
+ return( false );
}
void PathCache::add( PathRequest &path_request )
@@ -85,7 +84,7 @@
cache_list[ entry_replace_index ].set( path_request.start,
path_request.goal,
*(path_request.path) );
- cache_list[ entry_replace_index ].valid = _TRUE;
+ cache_list[ entry_replace_index ].valid = true;
entry_replace_index++;
}
@@ -116,7 +115,7 @@
if( path_request.request_type == _path_request_full )
{
- if ( path_cache.search( path_request ) == _TRUE )
+ if ( path_cache.search( path_request ) == true )
{
path_generation_status = _path_generator_status_busy;
pathing_fsm = _pathing_fsm_cache_path;
@@ -162,7 +161,7 @@
void PathGenerator::pathingFsmFullPath( void )
{
- boolean end_cycle = _FALSE;
+ bool end_cycle = false;
do
{
@@ -178,7 +177,7 @@
{
int path_result_code;
- if ( astar.generatePath( &path_request, _path_merge_front, _FALSE,
&path_result_code ) )
+ if ( astar.generatePath( &path_request, _path_merge_front, false,
&path_result_code ) )
{
if ( path_result_code == _path_result_success )
{ path_cache.add( path_request ); }
@@ -190,24 +189,24 @@
}
else
{
- end_cycle = _TRUE;
+ end_cycle = true;
}
} break;
case _pathing_fsm_state_complete :
{
- end_cycle = _TRUE;
+ end_cycle = true;
} break;
}
- } while( end_cycle == _FALSE );
+ } while( end_cycle == false );
}
void PathGenerator::pathingFsmUpdatePath( void )
{
- boolean end_cycle = _FALSE;
+ bool end_cycle = false;
do
{
@@ -241,7 +240,7 @@
{
int path_result_code;
- if ( astar.generatePath( &path_request, _path_merge_front, _FALSE,
&path_result_code ) )
+ if ( astar.generatePath( &path_request, _path_merge_front, false,
&path_result_code ) )
{
path_generation_status = _path_generator_status_waiting;
pathing_fsm_state = _pathing_fsm_state_complete;
@@ -250,24 +249,24 @@
}
else
{
- end_cycle = _TRUE;
+ end_cycle = true;
}
} break;
case _pathing_fsm_state_complete :
{
- end_cycle = _TRUE;
+ end_cycle = true;
} break;
}
- } while( end_cycle == _FALSE );
+ } while( end_cycle == false );
}
void PathGenerator::pathingFsmCachePath( void )
{
- boolean end_cycle = _FALSE;
+ bool end_cycle = false;
do
{
@@ -295,7 +294,7 @@
{
int path_result_code;
- if ( astar.generatePath( &path_request, _path_merge_front, _FALSE,
&path_result_code ) )
+ if ( astar.generatePath( &path_request, _path_merge_front, false,
&path_result_code ) )
{
pathing_fsm_state = _pathing_fsm_state_initialize_part_b;
@@ -303,7 +302,7 @@
}
else
{
- end_cycle = _TRUE;
+ end_cycle = true;
}
} break;
@@ -327,7 +326,7 @@
{
int path_result_code;
- if ( astar.generatePath( &path_request, _path_merge_rear, _FALSE,
&path_result_code ) )
+ if ( astar.generatePath( &path_request, _path_merge_rear, false,
&path_result_code ) )
{
path_request.goal = working_goal;
path_request.start = working_start;
@@ -338,17 +337,17 @@
}
else
{
- end_cycle = _TRUE;
+ end_cycle = true;
}
} break;
case _pathing_fsm_state_complete :
{
- end_cycle = _TRUE;
+ end_cycle = true;
} break;
}
- } while( end_cycle == _FALSE );
+ } while( end_cycle == false );
}
@@ -405,7 +404,7 @@
void PathScheduler::initialize( void )
{
- if( MapInterface::isMapLoaded() == _TRUE )
+ if( MapInterface::isMapLoaded() == true )
{
unsigned long resources;
unsigned long path_list_size;
@@ -486,23 +485,23 @@
}
}
-boolean PathScheduler::queryPath( UnitID &unit_id )
+bool PathScheduler::queryPath( UnitID &unit_id )
{
unsigned long i;
for ( i = 0; i < short_pather_count; i++ )
{
if ( short_pather[ i ].generationComplete( unit_id ) )
- { return (_TRUE ); }
+ { return (true ); }
}
for ( i = 0; i < long_pather_count; i++ )
{
if ( long_pather[ i ].generationComplete( unit_id ) )
- { return (_TRUE ); }
+ { return (true ); }
}
- return ( _FALSE );
+ return ( false );
}
void PathScheduler::killRequest( UnitID &unit_id )
@@ -567,12 +566,12 @@
}
-void PathScheduler::setShortPatherDebug( boolean on_off )
+void PathScheduler::setShortPatherDebug( bool on_off )
{
short_pather[0].astar.setDebugMode( on_off );
}
-void PathScheduler::setLongPatherDebug( boolean on_off )
+void PathScheduler::setLongPatherDebug( bool on_off )
{
long_pather[0].astar.setDebugMode( on_off );
}
Index: netpanzer/src/NetPanzer/Interfaces/PathScheduler.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/PathScheduler.hpp:1.1
netpanzer/src/NetPanzer/Interfaces/PathScheduler.hpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/PathScheduler.hpp:1.1 Sun Dec 1
12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/PathScheduler.hpp Mon Sep 1
16:24:20 2003
@@ -18,7 +18,6 @@
#ifndef _PATHSCHEDULER_HPP
#define _PATHSCHEDULER_HPP
-#include "aliasdef.h"
#include "PObject.hpp"
#include "Point.hpp"
#include "Astar.hpp"
@@ -34,7 +33,7 @@
PointXYi start;
PointXYi goal;
PathList path;
- boolean valid;
+ bool valid;
inline void set( PointXYi start, PointXYi goal, PathList &path )
{
@@ -69,7 +68,7 @@
void initialize( unsigned long cache_size );
- boolean search( PathRequest &path_request );
+ bool search( PathRequest &path_request );
void add( PathRequest &path_request );
@@ -107,7 +106,7 @@
unsigned short pathing_fsm;
unsigned short pathing_fsm_state;
- boolean path_generation_status;
+ bool path_generation_status;
PathRequest path_request;
@@ -134,16 +133,19 @@
inline unsigned short generationStatus( void )
{ return( path_generation_status ); }
- inline boolean generationComplete( UnitID &unit_id )
+ inline bool generationComplete( UnitID &unit_id )
{
+ // XXX comparison is always false?!?
+#if 0
if ( path_generation_status == _path_generator_status_waiting )
if ( path_request.unit_id == unit_id )
{
path_generation_status = _path_generator_status_free;
- return( _TRUE );
+ return( true );
}
+#endif
- return( _FALSE );
+ return( false );
}
void run( );
@@ -189,15 +191,15 @@
static void requestPath( PathRequest &path_request );
- static boolean queryPath( UnitID &unit_id );
+ static bool queryPath( UnitID &unit_id );
static void killRequest( UnitID &unit_id );
static void run( void );
// ** Debug Stuff **
- static void setShortPatherDebug( boolean on_off );
- static void setLongPatherDebug( boolean on_off );
+ static void setShortPatherDebug( bool on_off );
+ static void setLongPatherDebug( bool on_off );
static void sampleShortPather();
static void sampleLongPather();
Index: netpanzer/src/NetPanzer/Interfaces/PlayerInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/PlayerInterface.cpp:1.1
netpanzer/src/NetPanzer/Interfaces/PlayerInterface.cpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/PlayerInterface.cpp:1.1 Sun Dec 1
12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/PlayerInterface.cpp Mon Sep 1
16:24:20 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "PlayerInterface.hpp"
#include "UnitInterface.hpp"
@@ -33,7 +32,7 @@
PlayerState *PlayerInterface::player_lists;
unsigned short PlayerInterface::max_players = 0;
-boolean * PlayerInterface::alliance_matrix;
+bool * PlayerInterface::alliance_matrix;
unsigned short PlayerInterface::local_player_index = 0xFFFF;
NetMessageEncoder PlayerInterface::message_encoder;
@@ -52,7 +51,7 @@
max_players = maxPlayers;
player_lists = new PlayerState [ max_players ];
- assert( player_lists != NULL );
+ assert( player_lists != 0 );
for ( player_index = 0; player_index < max_players; player_index++ )
{
@@ -69,8 +68,8 @@
local_player_state.setID( PlayerID( 0xFFFF, 0xFFFFFFFF ) );
local_player_state.setStatus( _player_state_allocated );
- alliance_matrix = new boolean [max_players * max_players];
- assert( alliance_matrix != NULL );
+ alliance_matrix = new bool [max_players * max_players];
+ assert( alliance_matrix != 0 );
resetAllianceMatrix();
}
@@ -95,7 +94,7 @@
player_lists[ on_player_index ].incLosses( unit_type );
}
-void PlayerInterface::setKill( PlayerID &by_player, PlayerID &on_player,
unsigned short unit_type )
+void PlayerInterface::setKill( const PlayerID &by_player, const PlayerID
&on_player, unsigned short unit_type )
{
assert( (by_player.getIndex() < max_players) && (on_player.getIndex() <
max_players) );
@@ -103,7 +102,7 @@
player_lists[ on_player.getIndex() ].incLosses( unit_type );
}
-void PlayerInterface::setKill( UnitID &by_player, UnitID &on_player, unsigned
short unit_type )
+void PlayerInterface::setKill( const UnitID &by_player, const UnitID
&on_player, unsigned short unit_type )
{
unsigned short by_player_index;
unsigned short on_player_index;
@@ -118,12 +117,12 @@
}
-void PlayerInterface::setAlliance( PlayerID by_player, PlayerID with_player )
+void PlayerInterface::setAlliance( const PlayerID& by_player, const PlayerID&
with_player )
{
assert( (by_player.getIndex() < max_players) && (with_player.getIndex() <
max_players) );
- *(alliance_matrix + (with_player.getIndex() * max_players) +
by_player.getIndex() ) = _TRUE;
- //*(alliance_matrix + (by_player.getIndex() * max_players) +
with_player.getIndex() ) = _TRUE;
+ *(alliance_matrix + (with_player.getIndex() * max_players) +
by_player.getIndex() ) = true;
+ //*(alliance_matrix + (by_player.getIndex() * max_players) +
with_player.getIndex() ) = true;
}
@@ -131,20 +130,20 @@
{
assert( (by_player < max_players) && (with_player < max_players) );
- *(alliance_matrix + (with_player * max_players) + by_player ) = _TRUE;
- //*(alliance_matrix + (by_player * max_players) + with_player ) = _TRUE;
+ *(alliance_matrix + (with_player * max_players) + by_player ) = true;
+ //*(alliance_matrix + (by_player * max_players) + with_player ) = true;
}
void PlayerInterface::clearAlliance( unsigned short by_player, unsigned short
with_player )
{
assert( (by_player < max_players) && (with_player < max_players) );
- *(alliance_matrix + (with_player * max_players) + by_player ) = _FALSE;
+ *(alliance_matrix + (with_player * max_players) + by_player ) = false;
}
-boolean PlayerInterface::isAllied( PlayerID player, PlayerID with_player )
+bool PlayerInterface::isAllied( const PlayerID& player, const PlayerID&
with_player )
{
- boolean val;
+ bool val;
assert( (player.getIndex() < max_players) && (with_player.getIndex() <
max_players) );
@@ -154,9 +153,9 @@
}
-boolean PlayerInterface::isAllied( unsigned short player, unsigned short
with_player )
+bool PlayerInterface::isAllied( unsigned short player, unsigned short
with_player )
{
- boolean val;
+ bool val;
assert( (player < max_players) && (with_player < max_players) );
@@ -208,7 +207,7 @@
for ( i = 0; i < matrix_size; i++ )
{
- alliance_matrix[ i ] = _FALSE;
+ alliance_matrix[ i ] = false;
}
}
@@ -251,10 +250,10 @@
} // ** for
- return( NULL );
+ return( 0 );
}
-void PlayerInterface::spawnPlayer( unsigned short player_index, PointXYi
&location )
+void PlayerInterface::spawnPlayer( unsigned short player_index, const PointXYi
&location )
{
assert( player_index < max_players );
@@ -263,7 +262,7 @@
);
}
-void PlayerInterface::spawnPlayer( PlayerID &player, PointXYi &location )
+void PlayerInterface::spawnPlayer( const PlayerID &player, const PointXYi
&location )
{
unsigned short player_index;
@@ -282,7 +281,7 @@
}
-boolean PlayerInterface::testRuleScoreLimit( long score_limit, PlayerState **
player_state )
+bool PlayerInterface::testRuleScoreLimit( long score_limit, PlayerState **
player_state )
{
unsigned long player_index;
@@ -291,45 +290,45 @@
if ( player_lists[ player_index ].getTotal() >= score_limit )
{
*player_state = &player_lists[ player_index ];
- return( _TRUE );
+ return( true );
} // ** if
} // ** for
- return( _FALSE );
+ return( false );
}
-boolean PlayerInterface::testRuleObjectiveRatio( float precentage, PlayerState
** player_state )
+bool PlayerInterface::testRuleObjectiveRatio( float precentage, PlayerState **
player_state )
{
unsigned long player_index;
for ( player_index = 0; player_index < max_players; player_index++ )
{
- if ( ObjectiveInterface::testRuleObjectiveOccupationRatio( player_index,
precentage ) == _TRUE )
+ if ( ObjectiveInterface::testRuleObjectiveOccupationRatio( player_index,
precentage ) == true )
{
*player_state = &player_lists[ player_index ];
- return( _TRUE );
+ return( true );
} // ** if
} // ** for
- return( _FALSE );
+ return( false );
}
-boolean PlayerInterface::testRulePlayerRespawn( boolean *completed,
PlayerState **player_state )
+bool PlayerInterface::testRulePlayerRespawn( bool *completed, PlayerState
**player_state )
{
PlayerID player;
if ( respawn_rule_player_index == max_players )
{
respawn_rule_player_index = 0;
- *completed = _TRUE;
- return( _FALSE );
+ *completed = true;
+ return( false );
}
else
{
- *completed = _FALSE;
+ *completed = false;
}
player = player_lists[ respawn_rule_player_index ].getPlayerID();
@@ -338,14 +337,14 @@
{
*player_state = &player_lists[ respawn_rule_player_index ];
respawn_rule_player_index++;
- return( _TRUE );
+ return( true );
}
respawn_rule_player_index++;
- return( _FALSE );
+ return( false );
}
-void PlayerInterface::startPlayerStateSync( PlayerID &connect_player )
+void PlayerInterface::startPlayerStateSync( const PlayerID &connect_player )
{
player_sync_index = 0;
player_sync_connect_player_index = connect_player.getIndex();
@@ -354,7 +353,7 @@
message_encoder.resetEncoder();
}
-boolean PlayerInterface::syncPlayerState( int *send_return_code, int
*percent_complete )
+bool PlayerInterface::syncPlayerState( int *send_return_code, int
*percent_complete )
{
PlayerStateSync sync_mesg;
unsigned short player_count = 0;
@@ -389,7 +388,7 @@
if ( send_ret_val != _network_ok )
{
*send_return_code = send_ret_val;
- return( _TRUE );
+ return( true );
}
} // ** if
@@ -401,14 +400,14 @@
} // ** while
message_encoder.getEncodeMessage( &encode_message );
- if ( encode_message != NULL )
+ if ( encode_message != 0 )
{
send_ret_val = SERVER->sendMessage( encode_message,
encode_message->realSize(), player_sync_connect_id, 0 );
if ( send_ret_val != _network_ok )
{
*send_return_code = send_ret_val;
- return( _TRUE );
+ return( true );
}
} // ** if
@@ -416,7 +415,7 @@
if( (player_sync_index == max_players) )
{
*percent_complete = 100;
- return( _TRUE );
+ return( true );
} // ** if
float percent;
@@ -424,7 +423,7 @@
*percent_complete = (int) percent;
} // ** if
- return( _FALSE );
+ return( false );
}
@@ -602,13 +601,13 @@
for ( player_index = 0; player_index < max_players; player_index++ )
{
- if ( isAllied( disconnect_player_index, player_index ) == _TRUE )
+ if ( isAllied( disconnect_player_index, player_index ) == true )
{
allie_update.set( disconnect_player_index, player_index,
_player_break_alliance );
SERVER->sendMessage( &allie_update, sizeof( PlayerAllianceUpdate ), 0 );
}
- if ( isAllied( player_index, disconnect_player_index ) == _TRUE )
+ if ( isAllied( player_index, disconnect_player_index ) == true )
{
allie_update.set( player_index, disconnect_player_index,
_player_break_alliance );
SERVER->sendMessage( &allie_update, sizeof( PlayerAllianceUpdate ), 0 );
Index: netpanzer/src/NetPanzer/Interfaces/PlayerInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/PlayerInterface.hpp:1.1
netpanzer/src/NetPanzer/Interfaces/PlayerInterface.hpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/PlayerInterface.hpp:1.1 Sun Dec 1
12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/PlayerInterface.hpp Mon Sep 1
16:24:21 2003
@@ -18,8 +18,6 @@
#ifndef _PLAYERINTERFACE_HPP
#define _PLAYERINTERFACE_HPP
-#include "aliasdef.h"
-
#include "PObject.hpp"
#include "PlayerState.hpp"
#include "UnitInterface.hpp"
@@ -33,7 +31,7 @@
protected:
static PlayerState *player_lists;
static unsigned short max_players;
- static boolean *alliance_matrix;
+ static bool *alliance_matrix;
static void setKill( unsigned short by_player_index, unsigned short
on_player_index, unsigned short unit_type);
@@ -49,19 +47,19 @@
static void cleanUp( void );
- static void setKill( PlayerID &by_player, PlayerID &on_player, unsigned
short unit_type );
+ static void setKill( const PlayerID &by_player, const PlayerID &on_player,
unsigned short unit_type );
- static void setKill( UnitID &by_player, UnitID &on_player, unsigned short
unit_type );
+ static void setKill( const UnitID &by_player, const UnitID &on_player,
unsigned short unit_type );
- static void setAlliance( PlayerID by_player, PlayerID with_player );
+ static void setAlliance( const PlayerID& by_player, const PlayerID&
with_player );
static void setAlliance( unsigned short by_player, unsigned short
with_player );
static void clearAlliance( unsigned short by_player, unsigned short
with_player );
- static boolean isAllied( PlayerID player, PlayerID with_player );
+ static bool isAllied( const PlayerID& player, const PlayerID& with_player );
- static boolean isAllied( unsigned short player, unsigned short with_player
);
+ static bool isAllied( unsigned short player, unsigned short with_player );
static void lockPlayerStats( void );
static void unlockPlayerStats( void );
@@ -71,7 +69,7 @@
return( max_players );
}
- static inline PlayerState * getPlayerState( PlayerID player )
+ static inline PlayerState * getPlayerState( const PlayerID& player )
{
assert( player.getIndex() < max_players );
return( &player_lists[ player.getIndex() ] );
@@ -110,7 +108,7 @@
return( player_lists[ player_index ].getPlayerID() );
}
- static inline unsigned short getPlayerStatus( PlayerID player )
+ static inline unsigned short getPlayerStatus( const PlayerID& player )
{
assert( player.getIndex() < max_players );
return( player_lists[ player.getIndex() ].getStatus() );
@@ -130,17 +128,17 @@
static PlayerState * allocateNewPlayer( void );
- static void spawnPlayer( unsigned short player_index, PointXYi &location );
- static void spawnPlayer( PlayerID &player, PointXYi &location );
+ static void spawnPlayer( unsigned short player_index, const PointXYi
&location );
+ static void spawnPlayer( const PlayerID &player, const PointXYi &location );
- static boolean testRuleScoreLimit( long score_limit, PlayerState **
player_state );
+ static bool testRuleScoreLimit( long score_limit, PlayerState **
player_state );
- static boolean testRuleObjectiveRatio( float precentage, PlayerState **
player_state );
+ static bool testRuleObjectiveRatio( float precentage, PlayerState **
player_state );
protected:
static unsigned short respawn_rule_player_index;
public:
- static boolean testRulePlayerRespawn( boolean *completed, PlayerState
**player_state );
+ static bool testRulePlayerRespawn( bool *completed, PlayerState
**player_state );
protected:
static NetMessageEncoder message_encoder;
@@ -156,8 +154,8 @@
static void netMessageAllianceUpdate( NetMessage *message );
public:
- static void startPlayerStateSync( PlayerID &connect_player );
- static boolean syncPlayerState( int *send_return_code, int
*percent_complete );
+ static void startPlayerStateSync( const PlayerID &connect_player );
+ static bool syncPlayerState( int *send_return_code, int *percent_complete );
static void processNetMessage( NetMessage *message );
Index: netpanzer/src/NetPanzer/Interfaces/PowerUpInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/PowerUpInterface.cpp:1.1
netpanzer/src/NetPanzer/Interfaces/PowerUpInterface.cpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/PowerUpInterface.cpp:1.1 Sun Dec 1
12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/PowerUpInterface.cpp Mon Sep 1
16:24:21 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "PowerUpInterface.hpp"
#include <stdlib.h>
@@ -87,11 +86,11 @@
PowerUp * PowerUpList::get( int ID )
{
- PowerUp *powerup_ptr = NULL;
+ PowerUp *powerup_ptr = 0;
powerup_ptr = front;
- while( powerup_ptr != NULL )
+ while( powerup_ptr != 0 )
{
if ( powerup_ptr->powerup_state.ID == ID )
{
@@ -101,15 +100,15 @@
powerup_ptr = powerup_ptr->next;
}
- return( NULL );
+ return( 0 );
}
PowerUp * PowerUpList::remove( int ID )
{
PowerUp *powerup_ptr;
- if ( front == NULL )
- return( NULL );
+ if ( front == 0 )
+ return( 0 );
powerup_ptr = front;
@@ -119,7 +118,7 @@
return( removeFront() );
}
- while( powerup_ptr->next != NULL )
+ while( powerup_ptr->next != 0 )
{
if ( powerup_ptr->next->powerup_state.ID == ID )
{
@@ -130,7 +129,7 @@
powerup_ptr = powerup_ptr->next;
}
- return( NULL );
+ return( 0 );
}
void PowerUpList::reset( void )
@@ -248,7 +247,7 @@
ENEMY_RADAR_POWERUP_ANIM.setTo( BONUS_POWERUP_ANIM );
ENEMY_RADAR_POWERUP_ANIM_SHADOW.setTo( BONUS_POWERUP_ANIM_SHADOW );
- srand( (unsigned)time( NULL ) );
+ srand( (unsigned)time( 0 ) );
/*
mathlib_open();
lua_return = lua_dofile( "PowerUps\\UnitPowerUp.lua" );
@@ -263,7 +262,7 @@
{
unsigned long map_size_x, map_size_y;
- if( GameConfig::getPowerUpState() == _FALSE )
+ if( GameConfig::getPowerUpState() == false )
{ return; }
powerup_list.reset();
@@ -285,9 +284,9 @@
void PowerUpInterface::updateState( void )
{
- PowerUp *powerup_ptr = NULL;
+ PowerUp *powerup_ptr = 0;
- if( GameConfig::getPowerUpState() == _FALSE )
+ if( GameConfig::getPowerUpState() == false )
{ return; }
@@ -301,7 +300,7 @@
powerup_list.resetIterator( &powerup_ptr );
- while( powerup_ptr != NULL )
+ while( powerup_ptr != 0 )
{
if( powerup_ptr->powerup_state.life_cycle_state ==
_power_up_lifecycle_state_inactive )
{
@@ -314,7 +313,7 @@
delete_ptr = powerup_list.remove( delete_id );
- if ( delete_ptr != NULL )
+ if ( delete_ptr != 0 )
{ delete( delete_ptr ); }
}
else
@@ -331,12 +330,12 @@
{
PowerUp *powerup_ptr;
- if( GameConfig::getPowerUpState() == _FALSE )
+ if( GameConfig::getPowerUpState() == false )
{ return; }
powerup_list.resetIterator( &powerup_ptr );
- while( powerup_ptr != NULL )
+ while( powerup_ptr != 0 )
{
powerup_ptr->offloadGraphics( sorter );
@@ -381,7 +380,7 @@
power_up = powerup_list.get( hit_mesg->ID );
- if (power_up != NULL)
+ if (power_up != 0)
{
power_up->onHit( hit_mesg );
}
@@ -413,7 +412,7 @@
powerup_list.resetIterator( &powerup_ptr );
- while( powerup_ptr != NULL )
+ while( powerup_ptr != 0 )
{
create_mesg.set( powerup_ptr->powerup_state.map_loc,
powerup_ptr->powerup_state.ID,
Index: netpanzer/src/NetPanzer/Interfaces/PowerUpInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/PowerUpInterface.hpp:1.1
netpanzer/src/NetPanzer/Interfaces/PowerUpInterface.hpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/PowerUpInterface.hpp:1.1 Sun Dec 1
12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/PowerUpInterface.hpp Mon Sep 1
16:24:21 2003
@@ -54,14 +54,14 @@
{
PowerUp *power_up;
- if( (*iterator) != NULL )
+ if( (*iterator) != 0 )
{
power_up = (*iterator);
(*iterator) = (*iterator)->next;
return( power_up );
}
else
- { return( NULL ); }
+ { return( 0 ); }
}
void reset( void );
Index: netpanzer/src/NetPanzer/Interfaces/ProjectileInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/ProjectileInterface.cpp:1.1
netpanzer/src/NetPanzer/Interfaces/ProjectileInterface.cpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/ProjectileInterface.cpp:1.1 Sun Dec
1 12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/ProjectileInterface.cpp Mon Sep 1
16:24:21 2003
@@ -15,10 +15,9 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "ProjectileInterface.hpp"
-#include "dsound.hpp"
+#include "DSound.hpp"
#include "ParticleInterface.hpp"
#include "MissleWeapon.hpp"
@@ -28,8 +27,8 @@
#include "Math.hpp"
-InternalLink * ProjectileInterface::projectile_list_start = NULL;
-InternalLink * ProjectileInterface::projectile_list_end = NULL;
+InternalLink * ProjectileInterface::projectile_list_start = 0;
+InternalLink * ProjectileInterface::projectile_list_end = 0;
void ProjectileInterface::removeAll( void )
{
@@ -37,7 +36,7 @@
traversal_ptr = projectile_list_start;
- while( traversal_ptr != NULL )
+ while( traversal_ptr != 0 )
{
InternalLink *destroy_ptr;
@@ -47,10 +46,10 @@
destroy_ptr->removeFromList( (InternalLink **) &projectile_list_start,
(InternalLink **) &projectile_list_end );
- if (destroy_ptr != NULL)
+ if (destroy_ptr != 0)
{
delete( (Projectile *) (destroy_ptr) );
- destroy_ptr = NULL;
+ destroy_ptr = 0;
}
} // ** while
@@ -61,8 +60,8 @@
{
removeAll();
- projectile_list_start = NULL;
- projectile_list_end = NULL;
+ projectile_list_start = 0;
+ projectile_list_end = 0;
}
@@ -80,7 +79,7 @@
// We should make sure and customize all these.
temp->addToList( &projectile_list_start, &projectile_list_end );
- assert(FALSE);
+ assert(false);
}
else if (projectile_type == 1)
{
@@ -185,7 +184,7 @@
//ParticleInterface::addMissleLaunchPuff(startPos, direction,
owner_type_id);
}
- //assert( temp != NULL );
+ //assert( temp != 0 );
//temp->addToList( &projectile_list_start, &projectile_list_end );
@@ -204,7 +203,7 @@
traversal_ptr = projectile_list_start;
- while( traversal_ptr != NULL )
+ while( traversal_ptr != 0 )
{
projectile_ptr = (Projectile *) traversal_ptr;
@@ -215,10 +214,10 @@
traversal_ptr = traversal_ptr->next_ptr;
destroy_ptr->removeFromList( (InternalLink **) &projectile_list_start,
(InternalLink **) &projectile_list_end );
- if (destroy_ptr != NULL)
+ if (destroy_ptr != 0)
{
delete( (Projectile *) (destroy_ptr) );
- destroy_ptr = NULL;
+ destroy_ptr = 0;
}
} // ** if
@@ -240,7 +239,7 @@
traversal_ptr = projectile_list_start;
- while( traversal_ptr != NULL )
+ while( traversal_ptr != 0 )
{
projectile_ptr = (Projectile *) traversal_ptr;
Index: netpanzer/src/NetPanzer/Interfaces/ProjectileInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/ProjectileInterface.hpp:1.1
netpanzer/src/NetPanzer/Interfaces/ProjectileInterface.hpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/ProjectileInterface.hpp:1.1 Sun Dec
1 12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/ProjectileInterface.hpp Mon Sep 1
16:24:21 2003
@@ -45,4 +45,4 @@
};
-#endif _PROJECTILEINTERFACE_HPP
+#endif
Index: netpanzer/src/NetPanzer/Interfaces/Server.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/Server.cpp:1.1
netpanzer/src/NetPanzer/Interfaces/Server.cpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/Server.cpp:1.1 Sun Dec 1 12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/Server.cpp Mon Sep 1 16:24:21 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "Server.hpp"
NetworkServer *SERVER;
Index: netpanzer/src/NetPanzer/Interfaces/Server.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/Server.hpp:1.1
netpanzer/src/NetPanzer/Interfaces/Server.hpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/Server.hpp:1.1 Sun Dec 1 12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/Server.hpp Mon Sep 1 16:24:21 2003
@@ -18,8 +18,7 @@
#ifndef _SERVER_HPP
#define _SERVER_HPP
-#include "NetworkServerWinSock.hpp"
-#include "NetworkServerDPlay.hpp"
+#include "NetworkServer.hpp"
extern NetworkServer *SERVER;
Index: netpanzer/src/NetPanzer/Interfaces/StaticsInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/StaticsInterface.cpp:1.1
netpanzer/src/NetPanzer/Interfaces/StaticsInterface.cpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/StaticsInterface.cpp:1.1 Sun Dec 1
12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/StaticsInterface.cpp Mon Sep 1
16:24:21 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "StaticsInterface.hpp"
PArrayGrowable StaticsInterface::static_sprite_list;
@@ -36,7 +35,7 @@
unsigned long static_count = 0;
input_file = fopen ( file_path, "rt" );
- assert( input_file != NULL );
+ assert( input_file != 0 );
while ( !feof( input_file ) )
{
Index: netpanzer/src/NetPanzer/Interfaces/Stats.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/Stats.cpp:1.1
netpanzer/src/NetPanzer/Interfaces/Stats.cpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/Stats.cpp:1.1 Sun Dec 1 12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/Stats.cpp Mon Sep 1 16:24:21 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "Stats.hpp"
#include "ObjectiveInterface.hpp"
@@ -41,7 +40,7 @@
int strcmp_result;
- strcmp_result = stricmp( player_state1->getName(), player_state2->getName()
);
+ strcmp_result = strcasecmp( player_state1->getName(),
player_state2->getName() );
if ( strcmp_result != 0 )
return( strcmp_result );
@@ -130,7 +129,7 @@
//player states via Vlad's code in the GetPlayerStat function below,
//and I want that number to be separate from NumActivePlayers for
//clarity.
- winner_player_state = NULL;
+ winner_player_state = 0;
Count = 0;
NumActivePlayers = 0;
@@ -250,25 +249,25 @@
player = (PlayerState *) PlayerArray[Count];
player_id = player->getPlayerID();
- if( flag != NULL )
+ if( flag != 0 )
{ *flag = player->getFlag(); }
- if( kills != NULL )
+ if( kills != 0 )
{ *kills = player->getKills(); }
- if ( losses != NULL )
+ if ( losses != 0 )
{ *losses = player->getLosses(); }
- if ( total != NULL )
+ if ( total != 0 )
{ *total = player->getTotal(); }
- if ( objectives != NULL )
+ if ( objectives != 0 )
{ *objectives = player->getObjectivesHeld(); }
- if ( name != NULL )
+ if ( name != 0 )
{ *name = player->getName(); }
- if ( stats_display_type != NULL )
+ if ( stats_display_type != 0 )
{
if ( (sort_order_enum == _stats_sort_order_player_name) ||
(sort_order_enum == _stats_sort_order_game_type)
@@ -297,7 +296,7 @@
else
{ *stats_display_type = _stats_display_type_default; }
}
- } // ** if ( stats_display_type != NULL )
+ } // ** if ( stats_display_type != 0 )
//have to increment count so that next time through
//i'll get the next player.
Index: netpanzer/src/NetPanzer/Interfaces/TileInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/TileInterface.cpp:1.1
netpanzer/src/NetPanzer/Interfaces/TileInterface.cpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/TileInterface.cpp:1.1 Sun Dec 1
12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/TileInterface.cpp Mon Sep 1
16:24:21 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "TileInterface.hpp"
#include "MapInterface.hpp"
@@ -50,8 +49,8 @@
int tileX = worldX / tile_set.getTileXsize();
int tileY = worldY / tile_set.getTileYsize();
- int subPixX = worldX % tile_set.getTileXsize();
- int subPixY = worldY % tile_set.getTileYsize();
+ //int subPixX = worldX % tile_set.getTileXsize();
+ //int subPixY = worldY % tile_set.getTileYsize();
int tileValue = MapInterface::MapValue(tileX, tileY);
Index: netpanzer/src/NetPanzer/Interfaces/TileInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/TileInterface.hpp:1.1
netpanzer/src/NetPanzer/Interfaces/TileInterface.hpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/TileInterface.hpp:1.1 Sun Dec 1
12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/TileInterface.hpp Mon Sep 1
16:24:21 2003
@@ -18,7 +18,6 @@
#ifndef _TILEINTERFACE_HPP
#define _TILEINTERFACE_HPP
-#include "aliasdef.h"
#include "PObject.hpp"
#include "TileSet.hpp"
#include "Palette.hpp"
Index: netpanzer/src/NetPanzer/Interfaces/UnitInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/UnitInterface.cpp:1.1
netpanzer/src/NetPanzer/Interfaces/UnitInterface.cpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/UnitInterface.cpp:1.1 Sun Dec 1
12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/UnitInterface.cpp Mon Sep 1
16:24:21 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "UnitInterface.hpp"
#include "PlayerInterface.hpp"
#include "MapInterface.hpp"
@@ -42,7 +41,7 @@
#include "UnitMessageTypes.hpp"
#include "PlayerNetMessage.hpp"
-#include "Dsound.hpp"
+#include "DSound.hpp"
#include "ParticleInterface.hpp"
@@ -69,7 +68,7 @@
unsigned long UnitInterface::unit_cycle_iterator;
unsigned long UnitInterface::sync_units_iterator;
-boolean UnitInterface::sync_units_complete_flag;
+bool UnitInterface::sync_units_complete_flag;
unsigned short UnitInterface::sync_units_list_index;
unsigned long UnitInterface::sync_units_total_units;
unsigned long UnitInterface::sync_units_in_sync_count;
@@ -113,7 +112,7 @@
unit_lists[i].cleanUp();
}
- delete [ max_players ] unit_lists;
+ delete[] unit_lists;
}
void UnitInterface::reset( void )
@@ -151,7 +150,7 @@
{
unit = getUnit( message->unit_id );
- if ( unit != NULL )
+ if ( unit != 0 )
{
unit->processMessage( message );
}
@@ -167,7 +166,7 @@
unit_lists[ list_index ].resetIterator( &iterator );
unit = unit_lists[ list_index ].incIterator( &iterator );
- while( unit != NULL )
+ while( unit != 0 )
{
unit->processMessage( message );
@@ -198,7 +197,7 @@
unit_lists[ list_index ].resetIterator( &iterator );
unit = unit_lists[ list_index ].incIterator( &iterator );
- while( unit != NULL )
+ while( unit != 0 )
{
if ( unit->unit_state.lifecycle_state == _UNIT_LIFECYCLE_INACTIVE )
{
@@ -267,7 +266,7 @@
traversal_ptr = bucket_list->getFront();
- while( traversal_ptr != NULL )
+ while( traversal_ptr != 0 )
{
traversal_ptr->unit->offloadGraphics( sorter );
traversal_ptr = traversal_ptr->next;
@@ -279,17 +278,17 @@
// ******************************************************************
-boolean UnitInterface::isUniqueIndex( unsigned short new_index )
+bool UnitInterface::isUniqueIndex( unsigned short new_index )
{
unsigned long list_index;
for( list_index = 0; list_index < max_players; list_index++)
{
- if ( unit_lists[list_index].isValid( new_index ) == _TRUE )
- return( _FALSE );
+ if ( unit_lists[list_index].isValid( new_index ) == true )
+ return( false );
}
- return( _TRUE );
+ return( true );
}
// ******************************************************************
@@ -301,7 +300,7 @@
do
{
new_index = unique_generator++;
- } while( isUniqueIndex( new_index ) == _FALSE );
+ } while( isUniqueIndex( new_index ) == false );
return( new_index );
}
@@ -310,21 +309,21 @@
UnitBase * UnitInterface::newUnit( unsigned short unit_type,
- PointXYi &location,
+ const PointXYi &location,
unsigned short player_index )
{
- UnitBase *unit;
+ UnitBase *unit = 0;
PlayerState *player_state;
- boolean color_flag;
+ bool color_flag;
unsigned char unit_flag;
if ( player_index == PlayerInterface::getLocalPlayerIndex() )
{
- color_flag = _TRUE;
+ color_flag = true;
}
else
{
- color_flag = _FALSE;
+ color_flag = false;
}
player_state = PlayerInterface::getPlayerState( player_index );
@@ -390,7 +389,7 @@
// ******************************************************************
-void UnitInterface::addNewUnit( UnitBase *unit, PlayerID &player )
+void UnitInterface::addNewUnit( UnitBase *unit, const PlayerID &player )
{
unsigned short new_index;
unsigned short player_index;
@@ -410,11 +409,11 @@
// ******************************************************************
void UnitInterface::deleteUnit( UnitID unit_id )
{
- UnitBase *unit = NULL;
+ UnitBase *unit = 0;
unit = getUnit( unit_id );
- if( unit == NULL )
+ if( unit == 0 )
return;
deleteUnit( unit );
@@ -443,7 +442,7 @@
traversal_ptr = bucket_list->getFront();
- while( traversal_ptr != NULL )
+ while( traversal_ptr != 0 )
{
unsigned long unit_bucket_index;
@@ -461,8 +460,8 @@
// ******************************************************************
UnitBase * UnitInterface::createUnit( unsigned short unit_type,
- PointXYi &location,
- PlayerID &player
+ const PointXYi &location,
+ const PlayerID &player
)
{
UnitBase *unit;
@@ -471,7 +470,7 @@
player_index = player.getIndex();
if ( unit_lists[ player_index ].containsItems() == unit_lists[ player_index
].getSize() )
- return( NULL );
+ return( 0 );
unit = newUnit( unit_type, location, player_index );
@@ -482,7 +481,8 @@
// ******************************************************************
-void UnitInterface::spawnPlayerUnits( PointXYi &location, PlayerID &player,
PlayerUnitConfig &unit_config )
+void UnitInterface::spawnPlayerUnits( const PointXYi &location,
+ const PlayerID &player, const PlayerUnitConfig &unit_config )
{
PointXYi next_loc;
UnitBase *unit;
@@ -530,7 +530,7 @@
unit_placement_matrix.getNextEmptyLoc( &next_loc );
unit = createUnit( unit_type_index, next_loc, player );
- assert(unit != NULL);
+ assert(unit != 0);
create_mesg.new_unit_id = unit->unit_id;
create_mesg.location = next_loc;
create_mesg.unit_type = unit->unit_state.unit_type;
@@ -548,12 +548,12 @@
// ******************************************************************
-boolean UnitInterface::
+bool UnitInterface::
quearyUnitsKeySearch( UnitIDList *working_list,
int (* key_func )( void *key, UnitState *comp
),
void *key, PlayerID player_id,
unsigned char search_flags,
- boolean find_first )
+ bool find_first )
{
UnitPointer *unit_ptr;
UnitPointer *iterator;
@@ -572,12 +572,12 @@
unit_lists[ list_index ].resetIterator( &iterator );
unit_ptr = unit_lists[ list_index ].incIteratorPtr( &iterator );
- while( unit_ptr != NULL )
+ while( unit_ptr != 0 )
{
if ( key_func( key, &(unit_ptr->unit->unit_state) ) == 0 )
{
- if ( find_first == _TRUE )
- return( _TRUE );
+ if ( find_first == true )
+ return( true );
working_list->add( unit_ptr->unit->unit_id, work_index );
work_index++;
@@ -590,15 +590,15 @@
} // ** for
- if( (find_first == _FALSE) && (work_index > 0) )
- return( _TRUE );
+ if( (find_first == false) && (work_index > 0) )
+ return( true );
- return( _FALSE );
+ return( false );
} // ** quearyUnitsKeySearch
// ******************************************************************
-boolean UnitInterface::quearyClosestUnit( UnitBase **closest_unit_ptr,
+bool UnitInterface::quearyClosestUnit( UnitBase **closest_unit_ptr,
PointXYi &loc,
PlayerID &player_id,
unsigned char search_flags )
@@ -606,7 +606,7 @@
UnitPointer *unit_ptr;
UnitPointer *iterator;
unsigned long list_index;
- UnitPointer *closest_unit = NULL;
+ UnitPointer *closest_unit = 0;
long closest_magnitude;
for( list_index = 0; list_index < max_players; list_index++)
@@ -622,12 +622,12 @@
unit_lists[ list_index ].resetIterator( &iterator );
unit_ptr = unit_lists[ list_index ].incIteratorPtr( &iterator );
- while( unit_ptr != NULL )
+ while( unit_ptr != 0 )
{
PointXYi delta;
long temp_mag;
- if ( closest_unit == NULL )
+ if ( closest_unit == 0 )
{
closest_unit = unit_ptr;
delta = loc - unit_ptr->unit->unit_state.location;
@@ -652,19 +652,19 @@
} // ** for
- if( closest_unit != NULL )
+ if( closest_unit != 0 )
{
*closest_unit_ptr = closest_unit->unit;
- return( _TRUE );
+ return( true );
}
- *closest_unit_ptr = NULL;
- return( _FALSE );
+ *closest_unit_ptr = 0;
+ return( false );
}
-boolean UnitInterface::quearyClosestUnit( UnitBase **closest_unit_ptr, Recti
&bounding_rect, PointXYi &loc )
+bool UnitInterface::quearyClosestUnit( UnitBase **closest_unit_ptr, Recti
&bounding_rect, PointXYi &loc )
{
- UnitBase *closest_unit = NULL;
+ UnitBase *closest_unit = 0;
long closest_magnitude;
Recti bucket_rect;
UnitBucketList *bucket_list;
@@ -680,12 +680,12 @@
traversal_ptr = bucket_list->getFront();
- while( traversal_ptr != NULL )
+ while( traversal_ptr != 0 )
{
PointXYi delta;
long temp_mag;
- if ( closest_unit == NULL )
+ if ( closest_unit == 0 )
{
closest_unit = traversal_ptr->unit;
delta = loc - traversal_ptr->unit->unit_state.location;
@@ -708,18 +708,18 @@
} // ** for
} // ** for
- if( closest_unit != NULL )
+ if( closest_unit != 0 )
{
*closest_unit_ptr = closest_unit;
- return( _TRUE );
+ return( true );
}
- *closest_unit_ptr = NULL;
- return( _FALSE );
+ *closest_unit_ptr = 0;
+ return( false );
}
// ******************************************************************
-boolean UnitInterface::quearyClosestEnemyUnit( UnitBase **closest_unit_ptr,
+bool UnitInterface::quearyClosestEnemyUnit( UnitBase **closest_unit_ptr,
PointXYi &loc,
unsigned short player_index
)
@@ -727,24 +727,24 @@
UnitPointer *unit_ptr;
UnitPointer *iterator;
unsigned long list_index;
- UnitPointer *closest_unit = NULL;
+ UnitPointer *closest_unit = 0;
long closest_magnitude;
for( list_index = 0; list_index < max_players; list_index++)
{
if ( ( player_index != list_index ) &&
- ( PlayerInterface::isAllied( player_index, list_index ) == _FALSE )
+ ( PlayerInterface::isAllied( player_index, list_index ) == false )
)
{
unit_lists[ list_index ].resetIterator( &iterator );
unit_ptr = unit_lists[ list_index ].incIteratorPtr( &iterator );
- while( unit_ptr != NULL )
+ while( unit_ptr != 0 )
{
PointXYi delta;
long temp_mag;
- if ( closest_unit == NULL )
+ if ( closest_unit == 0 )
{
closest_unit = unit_ptr;
delta = loc - unit_ptr->unit->unit_state.location;
@@ -769,14 +769,14 @@
} // ** for
- if( closest_unit != NULL )
+ if( closest_unit != 0 )
{
*closest_unit_ptr = closest_unit->unit;
- return( _TRUE );
+ return( true );
}
- *closest_unit_ptr = NULL;
- return( _FALSE );
+ *closest_unit_ptr = 0;
+ return( false );
}
// ******************************************************************
@@ -799,7 +799,7 @@
unit_lists[ list_index ].resetIterator( &iterator );
unit_ptr = unit_lists[ list_index ].incIterator( &iterator );
- while( unit_ptr != NULL )
+ while( unit_ptr != 0 )
{
unit_state = &unit_ptr->unit_state;
if ( unit_state->bounds( loc ) )
@@ -823,7 +823,7 @@
// ******************************************************************
-boolean UnitInterface::quearyUnitAtMapLoc( PointXYi map_loc, UnitID
*queary_unit_id )
+bool UnitInterface::quearyUnitAtMapLoc( PointXYi map_loc, UnitID
*queary_unit_id )
{
UnitBase *unit_ptr;
UnitState *unit_state;
@@ -837,14 +837,14 @@
unit_lists[ list_index ].resetIterator( &iterator );
unit_ptr = unit_lists[ list_index ].incIterator( &iterator );
- while( unit_ptr != NULL )
+ while( unit_ptr != 0 )
{
unit_state = &unit_ptr->unit_state;
MapInterface::pointXYtoMapXY( unit_state->location, &unit_map_loc );
if( map_loc == unit_map_loc )
{
*queary_unit_id = unit_ptr->unit_id;
- return( _TRUE );
+ return( true );
}
unit_ptr = unit_lists[ list_index ].incIterator( &iterator );
@@ -852,7 +852,7 @@
} // ** for
- return( _FALSE );
+ return( false );
}
// ******************************************************************
@@ -868,19 +868,19 @@
// ******************************************************************
-boolean UnitInterface::unitPositionEnumeration( PointXYi *position, unsigned
char *unit_disposition, unsigned char *threat_level )
+bool UnitInterface::unitPositionEnumeration( PointXYi *position, unsigned char
*unit_disposition, unsigned char *threat_level )
{
UnitBase *unit_ptr;
unit_ptr = unit_lists[ unit_position_enum_list_index ].incIterator(
&unit_position_enum_iterator );
- if ( unit_ptr == NULL )
+ if ( unit_ptr == 0 )
{
// ** NOTE: enumerates all units **
unit_position_enum_list_index++;
if ( unit_position_enum_list_index == max_players)
- { return( _FALSE ); }
+ { return( false ); }
unit_lists[ unit_position_enum_list_index ].resetIterator(
&unit_position_enum_iterator );
}
@@ -896,10 +896,10 @@
*position = unit_ptr->unit_state.location;
*threat_level = unit_ptr->unit_state.threat_level;
- return( _TRUE );
+ return( true );
}
- return ( _TRUE );
+ return ( true );
}
// ******************************************************************
@@ -914,14 +914,14 @@
PointXYi UnitInterface::unitPositionCycle( unsigned long *iterator )
{
UnitBase *unit_ptr;
- boolean completed;
+ bool completed;
if ( unit_lists[ unit_cycle_player_index ].containsItems() == 0 )
return( PointXYi( 0, 0 ) );
unit_ptr = unit_lists[ unit_cycle_player_index ].incIteratorAsync( iterator,
&completed );
- if ( unit_ptr == NULL )
+ if ( unit_ptr == 0 )
{
unit_lists[ unit_cycle_player_index ].resetIteratorAsync( iterator );
unit_ptr = unit_lists[ unit_cycle_player_index ].incIteratorAsync(
iterator, &completed );
@@ -982,13 +982,13 @@
player_index );
unit->unit_id = sync_message->unit_id;
- unit->in_sync_flag = _FALSE;
+ unit->in_sync_flag = false;
unit_lists[ player_index ].add( (UnitBase *) unit, sync_message->unit_id );
unit_bucket_array.addUnit( unit );
unit->unit_state = sync_message->unit_state;
- unit->unit_state.select = _FALSE;
+ unit->unit_state.select = false;
}
// ******************************************************************
@@ -1007,7 +1007,7 @@
{
unit = getUnit( opcode.player_index, opcode.unit_index );
- if ( unit != NULL )
+ if ( unit != 0 )
{
unit->evalCommandOpcode( &opcode );
}
@@ -1029,7 +1029,7 @@
// Particle Shit Hack
unit = getUnit( unit_id );
- if ( unit != NULL )
+ if ( unit != 0 )
{
ParticleInterface::addHit(unit->unit_state);
@@ -1115,7 +1115,7 @@
sync_units_packet_timer.changeRate( 10 );
}
-boolean UnitInterface::syncRemoteUnits( int *send_return_code, int
*percent_complete )
+bool UnitInterface::syncRemoteUnits( int *send_return_code, int
*percent_complete )
{
UnitIniSyncMessage sync_message;
UnitBase *unit;
@@ -1126,18 +1126,18 @@
*send_return_code = _network_ok;
if ( !sync_units_packet_timer.count() )
- return( _TRUE );
+ return( true );
unit = unit_lists[ sync_units_list_index ].incIteratorAsync(
&sync_units_iterator, &sync_units_complete_flag );
- if ( sync_units_complete_flag == _TRUE )
+ if ( sync_units_complete_flag == true )
{
sync_units_list_index++;
if ( sync_units_list_index >= max_players)
{
*percent_complete = 100;
- return( _FALSE );
+ return( false );
}
unit_lists[ sync_units_list_index ].resetIteratorAsync(
&sync_units_iterator );
@@ -1158,7 +1158,7 @@
if ( send_ret_val != _network_ok )
{
*send_return_code = send_ret_val;
- return( _FALSE );
+ return( false );
}
unit->syncUnit();
@@ -1173,10 +1173,10 @@
sync_units_in_sync_partial_count = 0;
}
- return( _TRUE );
+ return( true );
}
- return ( _TRUE );
+ return ( true );
}
void UnitInterface::destroyPlayerUnits( PlayerID &player_id )
@@ -1194,7 +1194,7 @@
unit_lists[ player_index ].resetIterator( &iterator );
unit_ptr = unit_lists[ player_index ].incIterator( &iterator );
- while( unit_ptr != NULL )
+ while( unit_ptr != 0 )
{
unit_ptr->processMessage( &self_destruct );
unit_ptr = unit_lists[ player_index ].incIterator( &iterator );
Index: netpanzer/src/NetPanzer/Interfaces/UnitInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/UnitInterface.hpp:1.1
netpanzer/src/NetPanzer/Interfaces/UnitInterface.hpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/UnitInterface.hpp:1.1 Sun Dec 1
12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/UnitInterface.hpp Mon Sep 1
16:24:21 2003
@@ -18,8 +18,6 @@
#ifndef _UNITINTERFACE_HPP
#define _UNITINTERFACE_HPP
-#include "aliasdef.h"
-
#include "PObject.hpp"
#include "UnitList.hpp"
#include "UnitBucketArray.hpp"
@@ -49,15 +47,15 @@
static PlacementMatrix unit_placement_matrix;
static unsigned short unique_generator;
- static boolean isUniqueIndex( unsigned short new_index );
+ static bool isUniqueIndex( unsigned short new_index );
static unsigned short uniqueIndex( void );
static UnitBase * newUnit( unsigned short unit_type,
- PointXYi &location,
+ const PointXYi &location,
unsigned short player_index );
- static void addNewUnit( UnitBase *unit, PlayerID &player );
+ static void addNewUnit( UnitBase *unit, const PlayerID &player );
static void deleteUnit( UnitID unit_id );
static void deleteUnit( UnitBase *unit );
@@ -76,7 +74,7 @@
return ( &unit_lists[ player ] );
}
- static inline UnitList * getUnitList( UnitID &unit_id )
+ static inline UnitList * getUnitList( const UnitID &unit_id )
{
assert( (unit_id.getPlayer() < max_players) );
return ( &unit_lists[ unit_id.getPlayer() ] );
@@ -90,23 +88,23 @@
static unsigned long getTotalUnitCount( void );
- static inline UnitPointer * getUnitPointer( UnitID &unit_id )
+ static inline UnitPointer * getUnitPointer( const UnitID &unit_id )
{
assert( (unit_id.getPlayer() < max_players) );
return( unit_lists[ unit_id.getPlayer() ][ unit_id.getIndex() ] );
}
- static inline UnitBase * getUnit( UnitID &unit_id )
+ static inline UnitBase * getUnit( const UnitID &unit_id )
{
UnitPointer *unit_pointer;
assert ( (unit_id.getPlayer() < max_players) );
unit_pointer = unit_lists[ unit_id.getPlayer() ][ unit_id.getIndex() ];
- if ( unit_pointer != NULL )
+ if ( unit_pointer != 0 )
{ return( unit_pointer->unit ); }
- return( NULL );
+ return( 0 );
}
static inline UnitBase * getUnit( unsigned char player_index,
@@ -117,13 +115,13 @@
unit_pointer = unit_lists[ player_index ][ unit_index ];
- if ( unit_pointer != NULL )
+ if ( unit_pointer != 0 )
{ return( unit_pointer->unit ); }
- return( NULL );
+ return( 0 );
}
- static inline boolean isValid( UnitID &unit_id )
+ static inline bool isValid( const UnitID &unit_id )
{
assert( unit_id.getPlayer() < max_players );
return( unit_lists[ unit_id.getPlayer() ].isValid( unit_id ) );
@@ -135,30 +133,34 @@
static void offloadGraphics( SpriteSorter &sorter );
- static UnitBase * createUnit( unsigned short unit_type, PointXYi &location,
PlayerID &player );
-
- static void spawnPlayerUnits( PointXYi &location, PlayerID &player,
PlayerUnitConfig &unit_config );
+ static UnitBase * createUnit( unsigned short unit_type,
+ const PointXYi
&location,
+ const PlayerID
&player );
+
+ static void spawnPlayerUnits( const PointXYi &location,
+ const PlayerID
&player,
+ const
PlayerUnitConfig &unit_config );
- static boolean quearyUnitsKeySearch( UnitIDList *working_list,
+ static bool quearyUnitsKeySearch( UnitIDList *working_list,
int (* key_func )( void *key,
UnitState *comp ),
void *key, PlayerID player_id,
unsigned char search_flags,
- boolean find_first );
+ bool find_first );
- static boolean quearyClosestUnit( UnitBase **closest_unit_ptr,
+ static bool quearyClosestUnit( UnitBase **closest_unit_ptr,
PointXYi &loc,
PlayerID &player_id,
unsigned char search_flags );
- static boolean quearyClosestUnit( UnitBase **closest_unit_ptr,
+ static bool quearyClosestUnit( UnitBase **closest_unit_ptr,
Recti &bounding_rect,
PointXYi &loc );
- static boolean quearyClosestEnemyUnit( UnitBase **closest_unit_ptr,
+ static bool quearyClosestEnemyUnit( UnitBase **closest_unit_ptr,
PointXYi &loc,
unsigned short player_index );
- static boolean quearyUnitAtMapLoc( PointXYi map_loc, UnitID *queary_unit_id
);
+ static bool quearyUnitAtMapLoc( PointXYi map_loc, UnitID *queary_unit_id );
static unsigned char quearyUnitLocationStatus( PointXYi loc );
@@ -173,7 +175,7 @@
public:
// Unit positions, almost exclusivly for mini map
static void startUnitPositionEnumeration( void );
- static boolean unitPositionEnumeration( PointXYi *position, unsigned char
*unit_disposition, unsigned char *threat_level );
+ static bool unitPositionEnumeration( PointXYi *position, unsigned char
*unit_disposition, unsigned char *threat_level );
static void resetUnitCycleIterator( unsigned long *iterator );
static PointXYi unitPositionCycle( unsigned long *iterator );
@@ -209,7 +211,7 @@
protected:
static unsigned long sync_units_iterator;
- static boolean sync_units_complete_flag;
+ static bool sync_units_complete_flag;
static unsigned short sync_units_list_index;
static Timer sync_units_packet_timer;
static PlayerID sync_units_remote_player;
@@ -219,7 +221,7 @@
public:
static void startRemoteUnitSync( PlayerID &remote_player );
- static boolean syncRemoteUnits( int *send_return_code, int
*percent_complete );
+ static bool syncRemoteUnits( int *send_return_code, int
*percent_complete );
public:
static void processNetMessage( NetMessage *net_message );
Index: netpanzer/src/NetPanzer/Interfaces/UnitProfileInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/UnitProfileInterface.cpp:1.1
netpanzer/src/NetPanzer/Interfaces/UnitProfileInterface.cpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/UnitProfileInterface.cpp:1.1 Sun Dec
1 12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/UnitProfileInterface.cpp Mon Sep 1
16:24:21 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "UnitProfileInterface.hpp"
#include <stdlib.h>
@@ -73,7 +72,7 @@
for(comindex=0; ( (comindex < max_key_list ) && notfound); comindex++ )
{
- notfound = strnicmp( str, &key_list[ comindex * _MAX_KEY_LENGTH ], strlen(
&key_list[ comindex * _MAX_KEY_LENGTH ]) );
+ notfound = strncasecmp( str, &key_list[ comindex * _MAX_KEY_LENGTH ],
strlen( &key_list[ comindex * _MAX_KEY_LENGTH ]) );
}
comindex = comindex-1;
@@ -142,12 +141,12 @@
*string = (str+index);
if(str[index] == 0)
- *string = NULL;
+ *string = 0;
if ( token_index == 0 )
- return (_FALSE);
+ return (false);
- return (_TRUE);
+ return (true);
}
@@ -165,7 +164,7 @@
params->param_count++;
- while ( string != NULL )
+ while ( string != 0 )
{
if( extract_token( params->params[ params->param_count ], &string ) )
params->param_count++;
@@ -182,12 +181,12 @@
char temp_str[80];
parameter_list param_list;
int temp_int;
- short not_done = _TRUE;
+ short not_done = true;
- FILE *file_ptr = NULL;
+ FILE *file_ptr = 0;
file_ptr = fopen ( file_path, "rt" );
- assert( file_ptr != NULL );
+ assert( file_ptr != 0 );
while( not_done )
{
@@ -296,7 +295,7 @@
}break;
case _end :
- { not_done = _FALSE; } break;
+ { not_done = false; } break;
} // ** switch
Index: netpanzer/src/NetPanzer/Interfaces/WorldViewInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/WorldViewInterface.cpp:1.1
netpanzer/src/NetPanzer/Interfaces/WorldViewInterface.cpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/WorldViewInterface.cpp:1.1 Sun Dec
1 12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/WorldViewInterface.cpp Mon Sep 1
16:24:21 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "WorldViewInterface.hpp"
ViewCamera WorldViewInterface::camera_list[10];
Index: netpanzer/src/NetPanzer/Interfaces/WorldViewInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/WorldViewInterface.hpp:1.1
netpanzer/src/NetPanzer/Interfaces/WorldViewInterface.hpp:1.2
--- netpanzer/src/NetPanzer/Interfaces/WorldViewInterface.hpp:1.1 Sun Dec
1 12:51:56 2002
+++ netpanzer/src/NetPanzer/Interfaces/WorldViewInterface.hpp Mon Sep 1
16:24:21 2003
@@ -44,7 +44,7 @@
static inline void scroll_down( long scroll_increment )
{ main_camera->scrollPlusY(scroll_increment); }
- static inline void setCameraPosition( PointXYi &world_loc )
+ static inline void setCameraPosition( const PointXYi &world_loc )
{
main_camera->setCamera( world_loc );
}
Index: netpanzer/src/NetPanzer/Port/Gdatstct.cpp
diff -u netpanzer/src/NetPanzer/Port/Gdatstct.cpp:1.1
netpanzer/src/NetPanzer/Port/Gdatstct.cpp:1.2
--- netpanzer/src/NetPanzer/Port/Gdatstct.cpp:1.1 Sun Dec 1 12:51:56 2002
+++ netpanzer/src/NetPanzer/Port/Gdatstct.cpp Mon Sep 1 16:24:21 2003
@@ -15,14 +15,12 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
-#include "gdatstct.hpp"
+#include "Gdatstct.hpp"
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
-#include "aliasdef.h"
-#include "globals.h"
+#include "Globals.h"
@@ -31,7 +29,7 @@
//*****************************************************************************
sprite_dbase::sprite_dbase( void )
{
- dbase_loaded = _FALSE;
+ dbase_loaded = false;
}
//*****************************************************************************
@@ -41,7 +39,7 @@
short sprite_count;
sprite_data *sprite;
- if ( dbase_loaded == _TRUE )
+ if ( dbase_loaded == true )
{
sprite_count = header.sprite_count;
@@ -51,11 +49,11 @@
free( sprite->data );
}
- dbase_loaded = _FALSE;
- return( _TRUE );
+ dbase_loaded = false;
+ return( true );
}
- return( _FALSE );
+ return( false );
}
//*****************************************************************************
@@ -70,7 +68,7 @@
infile = fopen( dbase_path, "rb" );
- assert( infile != NULL );
+ assert( infile != 0 );
fread( &header, sizeof (sprite_dbase_header_type ), 1, infile );
@@ -81,14 +79,14 @@
sprite = &sprite_list[ sprite_loop];
fread( sprite, sizeof ( sprite_data ), 1, infile );
- sprite->data = (uchar * ) malloc( sprite->data_size );
+ sprite->data = (unsigned char * ) malloc( sprite->data_size );
fread( sprite->data, sprite->data_size, 1, infile );
}
fclose( infile );
- dbase_loaded = _TRUE;
- return( _TRUE );
+ dbase_loaded = true;
+ return( true );
}
@@ -99,11 +97,11 @@
if ( (index >= 0) && (index < header.sprite_count) )
{
record = &sprite_list[ index ];
- return( _TRUE );
+ return( true );
}
- record = NULL;
- return ( _FALSE );
+ record = 0;
+ return ( false );
}
short sprite_dbase::get_sprite_index( short index, Surface &surface )
@@ -114,10 +112,10 @@
iXY( sprite_list[ index ].x_size, sprite_list[ index
].y_size ),
sprite_list[ index ].x_size,
1 );
- return( _TRUE );
+ return( true );
}
- return ( _FALSE );
+ return ( false );
}
short sprite_dbase::get_sprite_id( short id_num, sprite_data *record )
@@ -132,12 +130,12 @@
if ( id_num == sprite_list[ sprite_loop ].pyro_id )
{
record = &sprite_list[ sprite_loop ];
- return( _TRUE );
+ return( true );
}
}
- record = NULL;
- return ( _FALSE );
+ record = 0;
+ return ( false );
}
//*****************************************************************************
@@ -158,11 +156,11 @@
sprite_list[ sprite_loop ].x_size,
1 );
- return( _TRUE );
+ return( true );
}
}
- return ( _FALSE );
+ return ( false );
}
//*****************************************************************************
@@ -179,18 +177,18 @@
if ( !strcmp( name, sprite_list[sprite_loop].name) )
{
record = &sprite_list[ sprite_loop ];
- return( _TRUE );
+ return( true );
}
}
- record = NULL;
- return ( _FALSE );
+ record = 0;
+ return ( false );
}
//*****************************************************************************
animation_dbase::animation_dbase(void)
{
- dbase_loaded = _FALSE;
+ dbase_loaded = false;
}
//*****************************************************************************
@@ -201,7 +199,7 @@
short animation_count;
animation_data *anim;
- if ( dbase_loaded == _TRUE )
+ if ( dbase_loaded == true )
{
animation_count = header.animation_count;
@@ -211,11 +209,11 @@
free( anim->data );
}
- dbase_loaded = _FALSE;
- return( _TRUE );
+ dbase_loaded = false;
+ return( true );
}
- return (_FALSE );
+ return (false );
}
//*****************************************************************************
@@ -231,7 +229,7 @@
infile = fopen( dbase_path, "rb" );
- assert( infile != NULL );
+ assert( infile != 0 );
fread( &header, sizeof (anim_dbase_header_type ), 1, infile );
@@ -242,14 +240,14 @@
anim = &animation_list[ animation_loop];
fread( anim, sizeof ( animation_data ), 1, infile );
- anim->data = (uchar * ) malloc( anim->data_size );
+ anim->data = (unsigned char * ) malloc( anim->data_size );
fread( anim->data, anim->data_size, 1, infile );
}
fclose( infile );
- dbase_loaded = _TRUE;
- return( _TRUE );
+ dbase_loaded = true;
+ return( true );
}
@@ -260,11 +258,11 @@
if ( (index >= 0) && (index < header.animation_count) )
{
record = &animation_list[ index ];
- return( _TRUE );
+ return( true );
}
- record = NULL;
- return ( _FALSE );
+ record = 0;
+ return ( false );
}
short animation_dbase::get_anim_id( short id_num, animation_data *record )
@@ -279,12 +277,12 @@
if ( id_num == animation_list[ anim_loop ].pyro_id )
{
record = &animation_list[ anim_loop ];
- return( _TRUE );
+ return( true );
}
}
- record = NULL;
- return ( _FALSE );
+ record = 0;
+ return ( false );
}
//*****************************************************************************
@@ -298,15 +296,15 @@
for ( anim_loop = 0; anim_loop < anim_count; anim_loop++ )
{
- if ( !stricmp( name, animation_list[anim_loop].name) )
+ if ( !strcasecmp( name, animation_list[anim_loop].name) )
{
record = &animation_list[ anim_loop ];
- return( _TRUE );
+ return( true );
}
}
- record = NULL;
- return ( _FALSE );
+ record = 0;
+ return ( false );
}
@@ -321,18 +319,18 @@
for ( anim_loop = 0; anim_loop < anim_count; anim_loop++ )
{
- if ( !stricmp( name, animation_list[anim_loop].name) )
+ if ( !strcasecmp( name, animation_list[anim_loop].name) )
{
sprite.setData( (void *) (animation_list[anim_loop].data),
animation_list[anim_loop].x_size,
animation_list[anim_loop].y_size,
animation_list[anim_loop].frames * animation_list[anim_loop].direct_count );
- return ( _TRUE );
+ return ( true );
}
}
- return ( _FALSE );
+ return ( false );
}
@@ -345,18 +343,18 @@
for ( anim_loop = 0; anim_loop < anim_count; anim_loop++ )
{
- if ( !stricmp( name, animation_list[anim_loop].name) )
+ if ( !strcasecmp( name, animation_list[anim_loop].name) )
{
surface.setTo( (void *) (animation_list[anim_loop].data),
iXY( animation_list[anim_loop].x_size,
animation_list[anim_loop].y_size ),
animation_list[anim_loop].x_size,
animation_list[anim_loop].frames *
animation_list[anim_loop].direct_count );
- return ( _TRUE );
+ return ( true );
}
}
- return ( _FALSE );
+ return ( false );
}
@@ -365,7 +363,7 @@
tile_dbase::tile_dbase( void )
{
- dbase_loaded = _FALSE;
+ dbase_loaded = false;
}
//*****************************************************************************
@@ -377,36 +375,36 @@
infile = fopen( dbase_path, "rb" );
- if ( infile == NULL )
+ if ( infile == 0 )
{
//debug_mesg( _disp_log, "ERROR: Could Not Open tile set : %s", dbase_path
);
- return( _FALSE );
+ return( false );
}
fread( &header, sizeof( tile_dbase_header_type ), 1, infile );
tile_buffer_size = header.tile_size * header.tile_count;
- tile_data = (uchar *) malloc( sizeof(uchar) * tile_buffer_size );
+ tile_data = (unsigned char *) malloc( sizeof(unsigned char) *
tile_buffer_size );
fread( tile_data, tile_buffer_size, 1, infile );
TILE_DATA = tile_data;
- dbase_loaded = _TRUE;
+ dbase_loaded = true;
- return( _TRUE );
+ return( true );
}
//*****************************************************************************
short tile_dbase::unload_dbase( void )
{
- if ( dbase_loaded == _TRUE )
+ if ( dbase_loaded == true )
{
free( tile_data );
- return( _TRUE );
+ return( true );
}
- return( _FALSE );
+ return( false );
}
Index: netpanzer/src/NetPanzer/Port/Gdatstct.hpp
diff -u netpanzer/src/NetPanzer/Port/Gdatstct.hpp:1.1
netpanzer/src/NetPanzer/Port/Gdatstct.hpp:1.2
--- netpanzer/src/NetPanzer/Port/Gdatstct.hpp:1.1 Sun Dec 1 12:51:56 2002
+++ netpanzer/src/NetPanzer/Port/Gdatstct.hpp Mon Sep 1 16:24:21 2003
@@ -18,7 +18,6 @@
#ifndef _GDATSTCT_HPP
#define _GDATSTCT_HPP
-#include "aliasdef.h"
#include "Sprite.hpp"
typedef
@@ -36,7 +35,7 @@
long data_size; // size of sprite data in bytes
// ususally x_size * y_size
- uchar *data;
+ unsigned char *data;
}sprite_data;
@@ -55,7 +54,7 @@
// bit 1 = transparent
// bit 2 = shadowed
- uchar anim_type; // type of animations
+ unsigned char anim_type; // type of animations
// bit 0 = standard multiframe animation;
// bit 1 = directional animations
// bit 2 = part of multi section animation
@@ -70,9 +69,9 @@
long data_size; // size of anim data in bytes
- uchar *directions[76];
+ unsigned char *directions[76];
- uchar *data;
+ unsigned char *data;
} animation_data;
@@ -81,11 +80,11 @@
typedef
struct
{
- uchar t_attrib; // tile attributes
+ unsigned char t_attrib; // tile attributes
// bits 0-3 height value of terrain
// bits 4-7 reserved
- uchar move_val; //movement value for tile
+ unsigned char move_val; //movement value for tile
} tile_info_type;
//****************************************************************************************
@@ -99,7 +98,7 @@
short tile_y_size; // y_size of tile in pixels
short tile_size; // tile size in bytes
short tile_count; // tile_count;
- uchar palette[768]; // pallette for tileset;
+ unsigned char palette[768]; // pallette for tileset;
} tile_dbase_header_type;
@@ -169,7 +168,7 @@
public:
short dbase_loaded;
tile_dbase_header_type header;
- uchar *tile_data;
+ unsigned char *tile_data;
tile_dbase( void );
short load_dbase( char *dbase_path );
Index: netpanzer/src/NetPanzer/Port/Globals.h
diff -u netpanzer/src/NetPanzer/Port/Globals.h:1.1
netpanzer/src/NetPanzer/Port/Globals.h:1.2
--- netpanzer/src/NetPanzer/Port/Globals.h:1.1 Sun Dec 1 12:51:56 2002
+++ netpanzer/src/NetPanzer/Port/Globals.h Mon Sep 1 16:24:21 2003
@@ -18,8 +18,6 @@
#ifndef _GLOBALS_H
#define _GLOBALS_H
-#include "aliasdef.h"
-
extern short DISPLAY_PAGE_STATE;
//short CURRENT_BANK;
Index: netpanzer/src/NetPanzer/Port/Wrldsprt.cpp
diff -u netpanzer/src/NetPanzer/Port/Wrldsprt.cpp:1.1
netpanzer/src/NetPanzer/Port/Wrldsprt.cpp:1.2
--- netpanzer/src/NetPanzer/Port/Wrldsprt.cpp:1.1 Sun Dec 1 12:51:56 2002
+++ netpanzer/src/NetPanzer/Port/Wrldsprt.cpp Mon Sep 1 16:24:21 2003
@@ -15,9 +15,9 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "globals.h"
+#include "Globals.h"
#include "DirectDrawGlobals.hpp"
-#include "wrldsprt.hpp"
+#include "Wrldsprt.hpp"
#include "blitters.h"
#include "WorldViewInterface.hpp"
@@ -40,7 +40,7 @@
//*************************************************************************************
-void world_sprite_base::set_select( byte select_on_off )
+void world_sprite_base::set_select( unsigned char select_on_off )
{
select_flag = select_on_off;
}
@@ -50,7 +50,7 @@
world_sprite::world_sprite( void )
: world_sprite_base()
{
- sprite = NULL;
+ sprite = 0;
}
@@ -61,7 +61,7 @@
PointXYi loc( x_loc + bbox_x1 + attach_x, y_loc + bbox_y1 + attach_y );
//return( WorldViewInterface::inView( 640, 480, loc ) );
- return( _TRUE );
+ return( true );
}
//**************************************************************************************
@@ -76,7 +76,7 @@
bbox_y2 = (sprite->y_size / 2);
height = 0;
- visible = _TRUE;
+ visible = true;
select_x_cut = 0;
select_y_cut = 0;
@@ -85,7 +85,7 @@
//**************************************************************************************
- void world_sprite::set_data( void *data, short attach_offset_x, short
attach_offset_y, byte height_val )
+ void world_sprite::set_data( void *data, short attach_offset_x, short
attach_offset_y, unsigned char height_val )
{
sprite = (sprite_data *) data;
@@ -98,7 +98,7 @@
attach_y = attach_offset_y;
height = height_val;
- visible = _TRUE;
+ visible = true;
select_x_cut = 0;
select_y_cut = 0;
@@ -115,7 +115,7 @@
void world_sprite::blit( void )
{
- long frame_offset;
+ long frame_offset = 0;
unsigned char *double_buffer;
long x, y;
char x_size, y_size;
@@ -154,7 +154,7 @@
world_animation::world_animation( void )
: world_sprite_base()
{
- anim = NULL;
+ anim = 0;
}
@@ -165,12 +165,12 @@
PointXYi loc( x_loc + bbox_x1 + attach_x, y_loc + bbox_y1 + attach_y );
//return( WorldViewInterface::inView( 640, 480, loc ) );
- return( _TRUE );
+ return( true );
}
//**************************************************************************************
-void world_animation::set_anim_props( byte cycle_on_off, byte
auto_frame_on_off, byte delay_tics, short rate )
+void world_animation::set_anim_props( unsigned char cycle_on_off, unsigned
char auto_frame_on_off, unsigned char delay_tics, short rate )
{
cycle = cycle_on_off;
auto_frame_update = auto_frame_on_off;
@@ -192,7 +192,7 @@
direct = 0;
height = 0;
- visible = _TRUE;
+ visible = true;
select_x_cut = 0;
select_y_cut = 0;
@@ -201,7 +201,7 @@
//**************************************************************************************
- void world_animation::set_data( void *data, short attach_offset_x, short
attach_offset_y, byte height_val )
+ void world_animation::set_data( void *data, short attach_offset_x, short
attach_offset_y, unsigned char height_val )
{
anim = (animation_data *) data;
@@ -216,7 +216,7 @@
attach_y = attach_offset_y;
height = height_val;
- visible = _TRUE;
+ visible = true;
select_x_cut = 0;
select_y_cut = 0;
@@ -278,8 +278,8 @@
void world_animation::blit( void )
{
- uchar *frame_data;
- long frame_offset;
+ unsigned char *frame_data;
+ long frame_offset = 0;
char x_size, y_size;
long x, y;
unsigned long view_start_x, view_start_y;
@@ -323,9 +323,9 @@
short world_animation::completed( void )
{
if ( frame_counter == (anim->frames-1) )
- return ( _TRUE );
+ return ( true );
- return( _FALSE );
+ return( false );
}
@@ -341,7 +341,7 @@
list_counts[ list_loop ] = 0;
for ( i = 0; i < _MAX_SPRITE_LIST; i++ )
- sprite_list[ list_loop ][ i ] = NULL;
+ sprite_list[ list_loop ][ i ] = 0;
}
Index: netpanzer/src/NetPanzer/Port/Wrldsprt.hpp
diff -u netpanzer/src/NetPanzer/Port/Wrldsprt.hpp:1.1
netpanzer/src/NetPanzer/Port/Wrldsprt.hpp:1.2
--- netpanzer/src/NetPanzer/Port/Wrldsprt.hpp:1.1 Sun Dec 1 12:51:56 2002
+++ netpanzer/src/NetPanzer/Port/Wrldsprt.hpp Mon Sep 1 16:24:21 2003
@@ -19,8 +19,8 @@
#define _WRLDSPRT_HPP
#include <stdlib.h>
-#include "aliasdef.h"
-#include "gdatstct.hpp"
+#include "codewiz.hpp"
+#include "Gdatstct.hpp"
#include "Timer.hpp"
class world_sprite_base
@@ -34,23 +34,24 @@
char select_x_cut;
char select_y_cut;
- byte select_flag;
+ unsigned char select_flag;
short attach_x;
short attach_y;
- byte height;
- byte visible;
+ unsigned char height;
+ unsigned char visible;
long x_loc, y_loc;
- world_sprite_base( void ) { select_flag = _FALSE; }
+ world_sprite_base( void ) { select_flag = false; }
void set_attach_offset( short offset_x, short offset_y );
void set_select_bbox( char x_cut, char y_cut );
- void set_select( byte select_on_off );
+ void set_select( unsigned char select_on_off );
virtual short is_visible( void ) = 0;
virtual void set_data( void *data ) = 0;
- virtual void set_data( void *data, short attach_offset_x, short
attach_offset_y, byte height_val ) = 0;
+ virtual void set_data( void *data, short attach_offset_x, short
+ attach_offset_y, unsigned char height_val ) = 0;
virtual void update( long x, long y ) = 0;
virtual void blit( void ) = 0;
@@ -64,7 +65,7 @@
world_sprite( void );
virtual short is_visible( void );
virtual void set_data( void *data );
- virtual void set_data( void *data, short attach_offset_x, short
attach_offset_y, byte height_val );
+ virtual void set_data( void *data, short attach_offset_x, short
attach_offset_y, unsigned char height_val );
virtual void update( long x, long y );
virtual void blit( void );
};
@@ -77,19 +78,19 @@
public:
animation_data *anim;
- byte cycle;
- byte auto_frame_update;
- byte delay;
+ unsigned char cycle;
+ unsigned char auto_frame_update;
+ unsigned char delay;
short direct;
Timer frame_timer;
short frame_counter;
world_animation( void );
- void set_anim_props( byte cycle_on_off, byte auto_frame_on_off, byte
delay_tics, short rate);
+ void set_anim_props( unsigned char cycle_on_off, unsigned char
auto_frame_on_off, unsigned char delay_tics, short rate);
virtual short is_visible( void );
virtual short completed( void );
virtual void set_data( void *data );
- virtual void set_data( void *data, short attach_offset_x, short
attach_offset_y, byte height_val );
+ virtual void set_data( void *data, short attach_offset_x, short
attach_offset_y, unsigned char height_val );
virtual void update( long x, long y );
virtual void update( long x, long y, short direction );
virtual void blit( void );
Index: netpanzer/src/NetPanzer/Port/blitters.cpp
diff -u netpanzer/src/NetPanzer/Port/blitters.cpp:1.1
netpanzer/src/NetPanzer/Port/blitters.cpp:1.2
--- netpanzer/src/NetPanzer/Port/blitters.cpp:1.1 Sun Dec 1 12:51:56 2002
+++ netpanzer/src/NetPanzer/Port/blitters.cpp Mon Sep 1 16:24:21 2003
@@ -15,14 +15,9 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "blitters.h"
#include "DirectDrawGlobals.hpp"
-#if _MSC_VER > 1000
- #pragma optimize( "", off )
-#endif
-
void blit_partial_xy( unsigned char *tile_ptr,unsigned char *buffer_ptr,short
y_size,short x_size)
{
assert(isValidPtr(tile_ptr));
@@ -30,6 +25,8 @@
assert(y_size > 0);
assert(x_size > 0);
+ // XXX disabled msvc assembler
+#ifdef MSVC
__asm
{
mov esi,tile_ptr;
@@ -58,6 +55,7 @@
} // end asm block
+#endif
}
@@ -95,6 +93,8 @@
void blit_partial_y( unsigned char *tile_ptr, unsigned char *buffer_ptr, short
y_size)
{
+ // XXX disabled msvc assembler
+#ifdef MSVC
__asm
{
mov esi,tile_ptr;
@@ -158,12 +158,16 @@
jnz copy_loop2
}
+#endif
}
void general_blitter( unsigned char x_size, unsigned char y_size, unsigned
long frame_offset,
unsigned char *buffer_ptr, unsigned char *dbuffer_ptr )
{
+
+ // XXX disabled msvc assembler
+#ifdef MSVC
__asm
{
mov ebx,0
@@ -205,6 +209,7 @@
dec bh
jnz row_loop_gb
}
+#endif
}
@@ -212,6 +217,8 @@
void blit_selector_square( unsigned char x_size, unsigned char y_size,
unsigned long frame_offset, unsigned char
*dbuffer_ptr )
{
+ // XXX disabled msvc assembler
+#ifdef MSVC
__asm
{
mov ebx,0
@@ -266,9 +273,7 @@
}
+#endif
}
-#if _MSC_VER > 1000
- #pragma optimize( "", on )
-#endif
Index: netpanzer/src/NetPanzer/Port/pzrportglobals.cpp
diff -u netpanzer/src/NetPanzer/Port/pzrportglobals.cpp:1.1
netpanzer/src/NetPanzer/Port/pzrportglobals.cpp:1.2
--- netpanzer/src/NetPanzer/Port/pzrportglobals.cpp:1.1 Sun Dec 1 12:51:56 2002
+++ netpanzer/src/NetPanzer/Port/pzrportglobals.cpp Mon Sep 1 16:24:21 2003
@@ -15,8 +15,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
-#include "globals.h"
+#include "Globals.h"
short DISPLAY_PAGE_STATE;
@@ -33,7 +32,7 @@
long SCREEN_X_BOUND = 480,SCREEN_Y_BOUND = 480;
-int GAME_STATE_PAUSED = _FALSE;
+int GAME_STATE_PAUSED = false;
int NETWORK_STATE;
Index: netpanzer/src/NetPanzer/Views/Game/AreYouSureExitView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/AreYouSureExitView.cpp:1.1
netpanzer/src/NetPanzer/Views/Game/AreYouSureExitView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/Game/AreYouSureExitView.cpp:1.1 Sun Dec
1 12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/Game/AreYouSureExitView.cpp Mon Sep 1
16:24:21 2003
@@ -17,7 +17,6 @@
*/
-#include "stdafx.hpp"
#include "AreYouSureExitView.hpp"
#include "Desktop.hpp"
#include "GameManager.hpp"
Index: netpanzer/src/NetPanzer/Views/Game/AreYouSureResignView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/AreYouSureResignView.cpp:1.1
netpanzer/src/NetPanzer/Views/Game/AreYouSureResignView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/Game/AreYouSureResignView.cpp:1.1 Sun Dec
1 12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/Game/AreYouSureResignView.cpp Mon Sep 1
16:24:21 2003
@@ -17,7 +17,6 @@
*/
-#include "stdafx.hpp"
#include "AreYouSureResignView.hpp"
#include "Desktop.hpp"
#include "DirectDrawGlobals.hpp"
@@ -63,7 +62,7 @@
View *v = Desktop::getView("OptionsView");
- if (v != NULL)
+ if (v != 0)
{
((OptionsTemplateView *)v)->initButtons();
((OptionsTemplateView *)v)->setAlwaysOnBottom(true);
@@ -73,7 +72,7 @@
}
v = Desktop::getView("SoundView");
- if (v != NULL)
+ if (v != 0)
{
((SoundView *)v)->initButtons();
((OptionsTemplateView *)v)->setAlwaysOnBottom(true);
@@ -83,7 +82,7 @@
}
v = Desktop::getView("ControlsView");
- if (v != NULL)
+ if (v != 0)
{
((ControlsView *)v)->initButtons();
((OptionsTemplateView *)v)->setAlwaysOnBottom(true);
@@ -93,7 +92,7 @@
}
v = Desktop::getView("VisualsView");
- if (v != NULL)
+ if (v != 0)
{
((VisualsView *)v)->initButtons();
((OptionsTemplateView *)v)->setAlwaysOnBottom(true);
@@ -103,7 +102,7 @@
}
v = Desktop::getView("InterfaceView");
- if (v != NULL)
+ if (v != 0)
{
((InterfaceView *)v)->initButtons();
((OptionsTemplateView *)v)->setAlwaysOnBottom(true);
Index: netpanzer/src/NetPanzer/Views/Game/ChatView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/ChatView.cpp:1.1
netpanzer/src/NetPanzer/Views/Game/ChatView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/Game/ChatView.cpp:1.1 Sun Dec 1 12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/Game/ChatView.cpp Mon Sep 1 16:24:21 2003
@@ -17,7 +17,6 @@
*/
-#include "stdafx.hpp"
#include "ChatView.hpp"
#include "Desktop.hpp"
#include "KeyboardInterface.hpp"
@@ -36,10 +35,12 @@
// Button functions.
/////////////////////////////////////////////////////////////////////////////
+#if 0
static void closeView()
{
Desktop::setVisibility("ChatView", false);
}
+#endif
static void sendMessageAllPlayers()
{
@@ -82,7 +83,7 @@
int x = 0;
int y = 0;
- int buttonXSize = 60;
+ //int buttonXSize = 60;
x = 0;
y = getClientRect().getSize().y - 12;
@@ -99,7 +100,7 @@
// Define the scrollBar fot this view.
scrollBar = new ScrollBar(VERTICAL, 0, 1, 0, 100);
- if (scrollBar == NULL)
+ if (scrollBar == 0)
{
FUBAR("ERROR: Unable to allocate the scrollBar.");
}
Index: netpanzer/src/NetPanzer/Views/Game/ChatView.hpp
diff -u netpanzer/src/NetPanzer/Views/Game/ChatView.hpp:1.1
netpanzer/src/NetPanzer/Views/Game/ChatView.hpp:1.2
--- netpanzer/src/NetPanzer/Views/Game/ChatView.hpp:1.1 Sun Dec 1 12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/Game/ChatView.hpp Mon Sep 1 16:24:21 2003
@@ -19,16 +19,10 @@
#ifndef __ChatView_hpp__
#define __ChatView_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
#include "View.hpp"
#include "Surface.hpp"
#include "GameTemplateView.hpp"
-#include "Scrollbar.hpp"
+#include "ScrollBar.hpp"
//---------------------------------------------------------------------------
Index: netpanzer/src/NetPanzer/Views/Game/CodeStatsView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/CodeStatsView.cpp:1.1
netpanzer/src/NetPanzer/Views/Game/CodeStatsView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/Game/CodeStatsView.cpp:1.1 Sun Dec 1
12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/Game/CodeStatsView.cpp Mon Sep 1
16:24:21 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "CodeStatsView.hpp"
#include "GameViewGlobals.hpp"
#include "SpriteSorter.hpp"
@@ -72,19 +71,19 @@
static void buttonDebug( void )
{
- static boolean previous_flag = _FALSE;
+ static bool previous_flag = false;
- if ( previous_flag == _FALSE )
+ if ( previous_flag == false )
{
- PathScheduler::setLongPatherDebug( _TRUE );
- MiniMapInterface::setPathingDebugMode( _TRUE );
- previous_flag = _TRUE;
+ PathScheduler::setLongPatherDebug( true );
+ MiniMapInterface::setPathingDebugMode( true );
+ previous_flag = true;
}
else
{
- PathScheduler::setLongPatherDebug( _FALSE );
- MiniMapInterface::setPathingDebugMode( _FALSE );
- previous_flag = _FALSE;
+ PathScheduler::setLongPatherDebug( false );
+ MiniMapInterface::setPathingDebugMode( false );
+ previous_flag = false;
}
}
@@ -111,10 +110,10 @@
setTitle("CodeStatsView");
setSubTitle(" - F4");
- setAllowResize(_FALSE);
- setAllowMove(_TRUE);
- setDisplayStatusBar(_TRUE);
- setVisible(_FALSE);
+ setAllowResize(false);
+ setAllowMove(true);
+ setDisplayStatusBar(true);
+ setVisible(false);
moveTo(iXY(0, 0));
Index: netpanzer/src/NetPanzer/Views/Game/ControlPaletteView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/ControlPaletteView.cpp:1.1
netpanzer/src/NetPanzer/Views/Game/ControlPaletteView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/Game/ControlPaletteView.cpp:1.1 Sun Dec
1 12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/Game/ControlPaletteView.cpp Mon Sep 1
16:24:21 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "ControlPaletteView.hpp"
#include "cMouse.hpp"
#include "MiniMapInterface.hpp"
@@ -51,13 +50,13 @@
int xOffset = 15;
// Add the option buttons.
- addButtonCenterText(iXY(x, y), 15, "0", "", NULL);
+ addButtonCenterText(iXY(x, y), 15, "0", "", 0);
x += xOffset;
- addButtonCenterText(iXY(x, y), 15, "1", "", NULL);
+ addButtonCenterText(iXY(x, y), 15, "1", "", 0);
x += xOffset;
- addButtonCenterText(iXY(x, y), 15, "2", "", NULL);
+ addButtonCenterText(iXY(x, y), 15, "2", "", 0);
x += xOffset;
- addButtonCenterText(iXY(x, y), 15, "3", "", NULL);
+ addButtonCenterText(iXY(x, y), 15, "3", "", 0);
init();
ControlView::initWorldMapSurface();
Index: netpanzer/src/NetPanzer/Views/Game/ControlPaletteView.hpp
diff -u netpanzer/src/NetPanzer/Views/Game/ControlPaletteView.hpp:1.1
netpanzer/src/NetPanzer/Views/Game/ControlPaletteView.hpp:1.2
--- netpanzer/src/NetPanzer/Views/Game/ControlPaletteView.hpp:1.1 Sun Dec
1 12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/Game/ControlPaletteView.hpp Mon Sep 1
16:24:21 2003
@@ -56,7 +56,7 @@
v = Desktop::getView("0ControlView");
- if (v != NULL)
+ if (v != 0)
{
v->moveTo(getDocPos(0));
} else
@@ -66,7 +66,7 @@
v = Desktop::getView("1ControlView");
- if (v != NULL)
+ if (v != 0)
{
v->moveTo(getDocPos(1));
} else
@@ -76,7 +76,7 @@
v = Desktop::getView("2ControlView");
- if (v != NULL)
+ if (v != 0)
{
v->moveTo(getDocPos(2));
} else
Index: netpanzer/src/NetPanzer/Views/Game/ControlView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/ControlView.cpp:1.1
netpanzer/src/NetPanzer/Views/Game/ControlView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/Game/ControlView.cpp:1.1 Sun Dec 1
12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/Game/ControlView.cpp Mon Sep 1 16:24:21 2003
@@ -16,7 +16,6 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "ControlView.hpp"
#include "cMouse.hpp"
#include "MiniMapInterface.hpp"
@@ -78,9 +77,9 @@
x += xOffset;
addButtonCenterText(iXY(x, y), 15, "+", "", increaseZoom);
x += xOffset;
- addButtonCenterText(iXY(x, y), 15, "2", "", NULL);
+ addButtonCenterText(iXY(x, y), 15, "2", "", 0);
x += xOffset;
- addButtonCenterText(iXY(x, y), 15, "3", "", NULL);
+ addButtonCenterText(iXY(x, y), 15, "3", "", 0);
} // end ControlView constructor
@@ -131,7 +130,7 @@
iXY drawPos(-world_win.min.x, -world_win.min.y);
- if (miniMap != NULL)
+ if (miniMap != 0)
{
iXY mcArea = ControlView::getMapClientArea();
Index: netpanzer/src/NetPanzer/Views/Game/ControlView.hpp
diff -u netpanzer/src/NetPanzer/Views/Game/ControlView.hpp:1.1
netpanzer/src/NetPanzer/Views/Game/ControlView.hpp:1.2
--- netpanzer/src/NetPanzer/Views/Game/ControlView.hpp:1.1 Sun Dec 1
12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/Game/ControlView.hpp Mon Sep 1 16:24:21 2003
@@ -18,17 +18,10 @@
#ifndef __ControlView_hpp__
#define __ControlView_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
#include "View.hpp"
#include "Surface.hpp"
#include "MiniMapInterface.hpp"
-
class ControlView : public View
{
friend class ControlPaletteView;
@@ -54,7 +47,7 @@
{
Surface *miniMap = MiniMapInterface::getMiniMap();
- assert(miniMap != NULL);
+ assert(miniMap != 0);
worldMapSurface.copy(*miniMap);
worldMapSurface.scale(getMapClientArea());
@@ -105,7 +98,7 @@
//void drawMouseBox(const Surface &dest);
//void setViewWindow(const iXY &pos);
//void updateObjectPosition(const Surface &dest);
- //void updateScreenPosition(const Surface &dest);
+ void updateScreenPosition(const Surface &dest);
//virtual void mouseEnter(const iXY &pos);
//virtual void mouseExit(const iXY &pos);
Index: netpanzer/src/NetPanzer/Views/Game/GameInfoView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/GameInfoView.cpp:1.1
netpanzer/src/NetPanzer/Views/Game/GameInfoView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/Game/GameInfoView.cpp:1.1 Sun Dec 1
12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/Game/GameInfoView.cpp Mon Sep 1 16:24:21 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "GameInfoView.hpp"
#include "GameViewGlobals.hpp"
#include "Desktop.hpp"
Index: netpanzer/src/NetPanzer/Views/Game/GameTemplateView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/GameTemplateView.cpp:1.1
netpanzer/src/NetPanzer/Views/Game/GameTemplateView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/Game/GameTemplateView.cpp:1.1 Sun Dec 1
12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/Game/GameTemplateView.cpp Mon Sep 1
16:24:21 2003
@@ -17,7 +17,6 @@
*/
-#include "stdafx.hpp"
#include "GameTemplateView.hpp"
#include "Desktop.hpp"
#include "GameViewGlobals.hpp"
Index: netpanzer/src/NetPanzer/Views/Game/GameToolbarView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/GameToolbarView.cpp:1.1
netpanzer/src/NetPanzer/Views/Game/GameToolbarView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/Game/GameToolbarView.cpp:1.1 Sun Dec 1
12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/Game/GameToolbarView.cpp Mon Sep 1
16:24:21 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "GameToolbarView.hpp"
#include "GameViewGlobals.hpp"
#include "Desktop.hpp"
@@ -63,10 +62,13 @@
GameConfig::toggleDrawUnitDamage();
}
+// XXX not used
+#if 0
static void bToggleDrawUnitReload()
{
GameConfig::toggleDrawUnitReload();
}
+#endif
static void bSetGroup1()
{
Index: netpanzer/src/NetPanzer/Views/Game/GameView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/GameView.cpp:1.1
netpanzer/src/NetPanzer/Views/Game/GameView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/Game/GameView.cpp:1.1 Sun Dec 1 12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/Game/GameView.cpp Mon Sep 1 16:24:21 2003
@@ -20,7 +20,6 @@
// Includes.
/////////////////////////////////////////////////////////////////////////////
-#include "stdafx.hpp"
#include "GameView.hpp"
#include "Desktop.hpp"
#include "TileEngine.hpp"
Index: netpanzer/src/NetPanzer/Views/Game/GameView.hpp
diff -u netpanzer/src/NetPanzer/Views/Game/GameView.hpp:1.1
netpanzer/src/NetPanzer/Views/Game/GameView.hpp:1.2
--- netpanzer/src/NetPanzer/Views/Game/GameView.hpp:1.1 Sun Dec 1 12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/Game/GameView.hpp Mon Sep 1 16:24:21 2003
@@ -20,15 +20,7 @@
#ifndef __GameView_hpp__
#define __GameView_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
-#include "stdafx.hpp"
#include "View.hpp"
-
//---------------------------------------------------------------------------
class GameView : public View
Index: netpanzer/src/NetPanzer/Views/Game/HelpScrollView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/HelpScrollView.cpp:1.1
netpanzer/src/NetPanzer/Views/Game/HelpScrollView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/Game/HelpScrollView.cpp:1.1 Sun Dec 1
12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/Game/HelpScrollView.cpp Mon Sep 1
16:24:21 2003
@@ -17,7 +17,6 @@
*/
-#include "stdafx.hpp"
#include "HelpScrollView.hpp"
#include "gapp.hpp"
#include "DSound.hpp"
@@ -119,7 +118,7 @@
// Define the scrollBar fot this view.
//scrollBar = new ScrollBar(VERTICAL, 0, 1, 0, text.getCount());
- //if (scrollBar == NULL)
+ //if (scrollBar == 0)
//{
// FUBAR("ERROR: Unable to allocate the scrollBar.");
//}
@@ -179,7 +178,7 @@
{
PIX color = Color::white;
- //if (scrollBar != NULL)
+ //if (scrollBar != 0)
//{
// int minView = scrollBar->getValue();
// int maxView = minView + scrollBar->getViewableAmount();
Index: netpanzer/src/NetPanzer/Views/Game/LobbyView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/LobbyView.cpp:1.2
netpanzer/src/NetPanzer/Views/Game/LobbyView.cpp:1.3
--- netpanzer/src/NetPanzer/Views/Game/LobbyView.cpp:1.2 Sun Aug 31
20:03:03 2003
+++ netpanzer/src/NetPanzer/Views/Game/LobbyView.cpp Mon Sep 1 16:24:21 2003
@@ -17,7 +17,6 @@
*/
-#include "stdafx.hpp"
#include "LobbyView.hpp"
#include "Desktop.hpp"
#include "UIDraw.hpp"
Index: netpanzer/src/NetPanzer/Views/Game/MiniMapOptionsView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/MiniMapOptionsView.cpp:1.1
netpanzer/src/NetPanzer/Views/Game/MiniMapOptionsView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/Game/MiniMapOptionsView.cpp:1.1 Sun Dec
1 12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/Game/MiniMapOptionsView.cpp Mon Sep 1
16:24:21 2003
@@ -17,7 +17,6 @@
*/
-#include "stdafx.hpp"
#include "MiniMapOptionsView.hpp"
#include "GameViewGlobals.hpp"
#include "GameConfig.hpp"
Index: netpanzer/src/NetPanzer/Views/Game/MiniMapView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/MiniMapView.cpp:1.1
netpanzer/src/NetPanzer/Views/Game/MiniMapView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/Game/MiniMapView.cpp:1.1 Sun Dec 1
12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/Game/MiniMapView.cpp Mon Sep 1 16:24:21 2003
@@ -17,7 +17,6 @@
*/
-#include "stdafx.hpp"
#include "MiniMapView.hpp"
#include "cMouse.hpp"
#include "MiniMapInterface.hpp"
@@ -72,8 +71,8 @@
mapDrawType = MAP_SOLID;
- int xOffset = size.x;
- int yOffset = 0;
+ //int xOffset = size.x;
+ //int yOffset = 0;
MiniMapInterface::setMapScale(getViewRect().getSize());
@@ -568,8 +567,8 @@
//
// }
- //static boolean isUnitSelected( void );
- //static boolean selectUnits( Recti bound_box );
+ //static bool isUnitSelected( void );
+ //static bool selectUnits( Recti bound_box );
//static void moveUnits( PointXYi location );
} // end MiniMapView::mouseMove
Index: netpanzer/src/NetPanzer/Views/Game/MiniMapView.hpp
diff -u netpanzer/src/NetPanzer/Views/Game/MiniMapView.hpp:1.1
netpanzer/src/NetPanzer/Views/Game/MiniMapView.hpp:1.2
--- netpanzer/src/NetPanzer/Views/Game/MiniMapView.hpp:1.1 Sun Dec 1
12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/Game/MiniMapView.hpp Mon Sep 1 16:24:21 2003
@@ -82,6 +82,10 @@
static int decreaseSize;
static int increaseSize;
+private:
+ // XXX added this...
+ void addButtons();
+
}; // end MiniMapView
extern MiniMapView miniMapView;
Index: netpanzer/src/NetPanzer/Views/Game/MiniRankView.hpp
diff -u netpanzer/src/NetPanzer/Views/Game/MiniRankView.hpp:1.1
netpanzer/src/NetPanzer/Views/Game/MiniRankView.hpp:1.2
--- netpanzer/src/NetPanzer/Views/Game/MiniRankView.hpp:1.1 Sun Dec 1
12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/Game/MiniRankView.hpp Mon Sep 1 16:24:21 2003
@@ -18,13 +18,6 @@
#ifndef __MiniRankView_hpp__
#define __MiniRankView_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
-#include "stdafx.hpp"
#include "iXY.hpp"
#include "iRect.hpp"
#include "Surface.hpp"
@@ -58,7 +51,7 @@
for (int i = 0; i < MIN(playerCount, 4); i++)
{
- Stats::GetPlayerStats(playerFlagName, &playerKills,
&playerLosses, &playerTotalPoints, NULL, &playerName, NULL);
+ Stats::GetPlayerStats(playerFlagName, &playerKills,
&playerLosses, &playerTotalPoints, 0, &playerName, 0);
sprintf(strBuf, "%-10s%10i", playerName, playerTotalPoints);
Index: netpanzer/src/NetPanzer/Views/Game/ProgressView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/ProgressView.cpp:1.2
netpanzer/src/NetPanzer/Views/Game/ProgressView.cpp:1.3
--- netpanzer/src/NetPanzer/Views/Game/ProgressView.cpp:1.2 Sun Aug 31
20:03:03 2003
+++ netpanzer/src/NetPanzer/Views/Game/ProgressView.cpp Mon Sep 1 16:24:21 2003
@@ -15,9 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-
-#include "stdafx.hpp"
#include "ProgressView.hpp"
#include "Desktop.hpp"
#include "UIDraw.hpp"
Index: netpanzer/src/NetPanzer/Views/Game/RankView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/RankView.cpp:1.1
netpanzer/src/NetPanzer/Views/Game/RankView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/Game/RankView.cpp:1.1 Sun Dec 1 12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/Game/RankView.cpp Mon Sep 1 16:24:21 2003
@@ -15,9 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-
-#include "stdafx.hpp"
#include "RankView.hpp"
#include "Stats.hpp"
#include "GameViewGlobals.hpp"
@@ -62,7 +59,7 @@
// Define the scrollBar fot this view.
scrollBar = new ScrollBar(VERTICAL, 0, 1, 0, 100);
- if (scrollBar == NULL)
+ if (scrollBar == 0)
{
FUBAR("ERROR: Unable to allocate the scrollBar.");
}
@@ -155,7 +152,7 @@
// Add player flag name.
sprintf(statBuf, "%-20s%10i%7i%6i%10i", playerName, playerKills,
playerLosses, playerTotalPoints, playerObjectives );
- if (statBuf != NULL)
+ if (statBuf != 0)
{
PIX color;
Index: netpanzer/src/NetPanzer/Views/Game/RankView.hpp
diff -u netpanzer/src/NetPanzer/Views/Game/RankView.hpp:1.1
netpanzer/src/NetPanzer/Views/Game/RankView.hpp:1.2
--- netpanzer/src/NetPanzer/Views/Game/RankView.hpp:1.1 Sun Dec 1 12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/Game/RankView.hpp Mon Sep 1 16:24:21 2003
@@ -20,16 +20,10 @@
#ifndef __RankView_hpp__
#define __RankView_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
#include "View.hpp"
#include "Surface.hpp"
#include "GameTemplateView.hpp"
-#include "Scrollbar.hpp"
+#include "ScrollBar.hpp"
//---------------------------------------------------------------------------
Index: netpanzer/src/NetPanzer/Views/Game/ResignView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/ResignView.cpp:1.1
netpanzer/src/NetPanzer/Views/Game/ResignView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/Game/ResignView.cpp:1.1 Sun Dec 1
12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/Game/ResignView.cpp Mon Sep 1 16:24:21 2003
@@ -15,9 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-
-#include "stdafx.hpp"
#include "ResignView.hpp"
#include "Desktop.hpp"
#include "AreYouSureResignView.hpp"
@@ -69,7 +66,7 @@
resize(SCREEN_PIX);
iXY buttonSize(150, 15);
- int BUTTON_COUNT = 2;
+ //int BUTTON_COUNT = 2;
int x = (getClientRect().getSize().x - buttonSize.x) / 2;
int y;
int yOffset = buttonSize.y * 2;
Index: netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.cpp:1.1
netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.cpp:1.1 Sun Dec
1 12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.cpp Mon Sep 1
16:24:21 2003
@@ -15,9 +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 "stdafx.hpp"
#include "VehicleSelectionView.hpp"
-#include "unitTypes.hpp"
+#include "UnitTypes.hpp"
#include "GameViewGlobals.hpp"
#include "Desktop.hpp"
#include "cMouse.hpp"
@@ -41,7 +40,7 @@
Button VehicleSelectionView::buttonPower;
Button VehicleSelectionView::buttonOk;
-boolean changeMade = false;
+bool changeMade = false;
iRect VehicleSelectionView::miniProductionRect(0, 0, 0, 0);
Surface VehicleSelectionView::unitImages;
Index: netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.hpp
diff -u netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.hpp:1.1
netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.hpp:1.2
--- netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.hpp:1.1 Sun Dec
1 12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.hpp Mon Sep 1
16:24:21 2003
@@ -18,13 +18,6 @@
#ifndef __VehicleSelectionView_hpp__
#define __VehicleSelectionView_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
-#include "stdafx.hpp"
#include "Surface.hpp"
#include "View.hpp"
#include "GameTemplateView.hpp"
Index: netpanzer/src/NetPanzer/Views/Game/WinnerMesgView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/WinnerMesgView.cpp:1.1
netpanzer/src/NetPanzer/Views/Game/WinnerMesgView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/Game/WinnerMesgView.cpp:1.1 Sun Dec 1
12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/Game/WinnerMesgView.cpp Mon Sep 1
16:24:21 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "WinnerMesgView.hpp"
#include "GameViewGlobals.hpp"
#include "Desktop.hpp"
@@ -70,7 +69,7 @@
Desktop::setVisibilityAllWindows(false);
View *v = Desktop::getView("OptionsView");
- if (v != NULL)
+ if (v != 0)
{
v->removeAllButtons();
((OptionsTemplateView *)v)->initButtons();
@@ -81,7 +80,7 @@
}
v = Desktop::getView("SoundView");
- if (v != NULL)
+ if (v != 0)
{
v->removeAllButtons();
((OptionsTemplateView *)v)->initButtons();
@@ -93,7 +92,7 @@
}
v = Desktop::getView("ControlsView");
- if (v != NULL)
+ if (v != 0)
{
v->removeAllButtons();
((OptionsTemplateView *)v)->initButtons();
@@ -105,7 +104,7 @@
}
v = Desktop::getView("VisualsView");
- if (v != NULL)
+ if (v != 0)
{
v->removeAllButtons();
((OptionsTemplateView *)v)->initButtons();
@@ -117,7 +116,7 @@
}
v = Desktop::getView("InterfaceView");
- if (v != NULL)
+ if (v != 0)
{
v->removeAllButtons();
((OptionsTemplateView *)v)->initButtons();
Index: netpanzer/src/NetPanzer/Views/Game/_MiniMapView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/_MiniMapView.cpp:1.1
netpanzer/src/NetPanzer/Views/Game/_MiniMapView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/Game/_MiniMapView.cpp:1.1 Sun Dec 1
12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/Game/_MiniMapView.cpp Mon Sep 1 16:24:21 2003
@@ -17,7 +17,6 @@
*/
-#include "stdafx.hpp"
#include "MiniMapView.hpp"
#include "cMouse.hpp"
#include "MiniMapInterface.hpp"
@@ -26,6 +25,9 @@
#include "GameConfig.hpp"
#include "Desktop.hpp"
+// XXX is this an old version of the MinimapView?
+
+#if 0
MiniMapView miniMapView;
@@ -138,8 +140,8 @@
mapDrawType = MAP_SOLID;
- int xOffset = size.x;
- int yOffset = 0;
+ //int xOffset = size.x;
+ //int yOffset = 0;
iRect clientRect(getClientRect());
iRect miniMapRect(clientRect.min.x, clientRect.min.y, clientRect.max.x,
clientRect.max.y - DEFAULT_STATUS_BAR_HEIGHT);
@@ -149,7 +151,7 @@
// Get the original version of the minimap.
Surface *miniMap = MiniMapInterface::getMiniMap();
- if (miniMap == NULL)
+ if (miniMap == 0)
{
FUBAR("ERROR: Unable to find minimap surface.");
}
@@ -176,7 +178,7 @@
float dt = TimerInterface::getTimeSlice();
Surface *miniMap = MiniMapInterface::getMiniMap();
- if (miniMap == NULL)
+ if (miniMap == 0)
{
FUBAR("ERROR: Unable to find minimap surface.");
}
@@ -223,6 +225,8 @@
{
clientArea.bltScale(*miniMap, r);
}
+ // doesn't work...
+#if 0
else if (mapDrawType == MAP_2575)
{
clientArea.bltBlendScale(*miniMap, r,
Palette::colorTable2575);
@@ -231,6 +235,7 @@
{
clientArea.bltBlendScale(*miniMap, r,
Palette::colorTable5050);
}
+#endif
//else if (mapDrawType == MAP_BLEND_GREEN)
//{
//clientArea.bltLookup(iRect(iXY(0, 0), getSize()),
Palette::green256.getColorArray());
@@ -257,6 +262,8 @@
{
miniMapSurface.blt(clientArea, 0, 0);
}
+ // XXX not all defined...
+#if 0
else if (mapDrawType == MAP_2575)
{
clientArea.blendIn(miniMapSurface, iXY(0, 0),
Palette::colorTable2575);
@@ -265,6 +272,7 @@
{
clientArea.blendIn(miniMapSurface, iXY(0, 0),
Palette::colorTable5050);
}
+#endif
//else if (mapDrawType == MAP_BLEND_GREEN)
//{
//clientArea.bltLookup(iRect(iXY(0, 0), getSize()),
Palette::green256.getColorArray());
@@ -511,3 +519,5 @@
scaleGroupWait = 0.0f;
}
} // end MiniMapView::rMouseDrag
+
+#endif
Index: netpanzer/src/NetPanzer/Views/Game/oldCodeStatsView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/oldCodeStatsView.cpp:1.1
netpanzer/src/NetPanzer/Views/Game/oldCodeStatsView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/Game/oldCodeStatsView.cpp:1.1 Sun Dec 1
12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/Game/oldCodeStatsView.cpp Mon Sep 1
16:24:21 2003
@@ -15,6 +15,10 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
+// old version?!?
+
+#if 0
#include "CodeStatsView.hpp"
#include "cViewManager.hpp"
@@ -53,19 +57,19 @@
static void buttonDebug( void )
{
- static boolean previous_flag = _FALSE;
+ static bool previous_flag = false;
- if ( previous_flag == _FALSE )
+ if ( previous_flag == false )
{
- PathScheduler::setLongPatherDebug( _TRUE );
- MiniMapInterface::setPathingDebugMode( _TRUE );
- previous_flag = _TRUE;
+ PathScheduler::setLongPatherDebug( true );
+ MiniMapInterface::setPathingDebugMode( true );
+ previous_flag = true;
}
else
{
- PathScheduler::setLongPatherDebug( _FALSE );
- MiniMapInterface::setPathingDebugMode( _FALSE );
- previous_flag = _FALSE;
+ PathScheduler::setLongPatherDebug( false );
+ MiniMapInterface::setPathingDebugMode( false );
+ previous_flag = false;
}
}
@@ -84,10 +88,10 @@
CodeStatsView::CodeStatsView() : cView()
{
setTitle("CodeStatsView");
- setAllowResize(FALSE);
- setAllowMove(TRUE);
- setDisplayStatusBar(TRUE);
- setVisible(FALSE);
+ setAllowResize(false);
+ setAllowMove(true);
+ setDisplayStatusBar(true);
+ setVisible(false);
moveTo(iXY(0, 0));
resizeClientArea(iXY(200, 400));
@@ -290,3 +294,5 @@
str_loc.y += 12;
}
+
+#endif
Index: netpanzer/src/NetPanzer/Views/GameViewGlobals.cpp
diff -u netpanzer/src/NetPanzer/Views/GameViewGlobals.cpp:1.1
netpanzer/src/NetPanzer/Views/GameViewGlobals.cpp:1.2
--- netpanzer/src/NetPanzer/Views/GameViewGlobals.cpp:1.1 Sun Dec 1
12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/GameViewGlobals.cpp Mon Sep 1 16:24:21 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "GameViewGlobals.hpp"
iXY exitPos(6, 454);
Index: netpanzer/src/NetPanzer/Views/GameViewGlobals.hpp
diff -u netpanzer/src/NetPanzer/Views/GameViewGlobals.hpp:1.1
netpanzer/src/NetPanzer/Views/GameViewGlobals.hpp:1.2
--- netpanzer/src/NetPanzer/Views/GameViewGlobals.hpp:1.1 Sun Dec 1
12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/GameViewGlobals.hpp Mon Sep 1 16:24:21 2003
@@ -18,17 +18,10 @@
#ifndef __GameViewGlobals_hpp__
#define __GameViewGlobals_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
#include "Surface.hpp"
#include "iRect.hpp"
#include "iXY.hpp"
-
// Globals meter colors.
#define windowTextColor (Color::white)
#define windowTextColorShadow (Color::black)
@@ -42,7 +35,6 @@
#define optionsMeterWidth (148)
#define optionsMeterStartX (448)
#define optionsColorMeterStartX (342)
-
// Button placement locations.
extern iXY exitPos;
Index: netpanzer/src/NetPanzer/Views/MainMenu/HelpView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/HelpView.cpp:1.1
netpanzer/src/NetPanzer/Views/MainMenu/HelpView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/MainMenu/HelpView.cpp:1.1 Sun Dec 1
12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/MainMenu/HelpView.cpp Mon Sep 1 16:24:21 2003
@@ -17,7 +17,6 @@
*/
-#include "stdafx.hpp"
#include "HelpView.hpp"
#include "Desktop.hpp"
#include "GameView.hpp"
@@ -53,7 +52,7 @@
//View *v = Desktop::getView("HelpScrollView");
// Set the position correctly for the scrolling help.
- //if (v != NULL)
+ //if (v != 0)
//{
// v->moveTo(iXY(30, 30));
//} else
Index: netpanzer/src/NetPanzer/Views/MainMenu/MainMenuView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/MainMenuView.cpp:1.1
netpanzer/src/NetPanzer/Views/MainMenu/MainMenuView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/MainMenu/MainMenuView.cpp:1.1 Sun Dec 1
12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/MainMenu/MainMenuView.cpp Mon Sep 1
16:24:21 2003
@@ -17,7 +17,6 @@
*/
-#include "stdafx.hpp"
#include "MainMenuView.hpp"
#include "Desktop.hpp"
#include "DDHardSurface.hpp"
Index: netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp:1.1
netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp:1.1 Sun Dec
1 12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp Mon Sep 1
16:24:21 2003
@@ -17,14 +17,13 @@
*/
-#include "stdafx.hpp"
#include "MenuTemplateView.hpp"
#include "Desktop.hpp"
#include "GameConfig.hpp"
#include "GameManager.hpp"
-#include "dsound.hpp"
+#include "DSound.hpp"
#include "cMouse.hpp"
-#include "viewGlobals.hpp"
+#include "ViewGlobals.hpp"
#include "DirectDrawGlobals.hpp"
#include "DDHardSurface.hpp"
#include "FontSystem2D.hpp"
@@ -52,11 +51,14 @@
Desktop::setVisibility("MainView", true);
}
+// never used
+#if 0
static void bSkirmish()
{
Desktop::setVisibilityAllWindows(false);
Desktop::setVisibility("SkirmishView", true);
}
+#endif
static void bMulti()
{
@@ -110,6 +112,8 @@
Desktop::setVisibility("HelpView", true);
}
+// XXX never used
+#if 0
static void bOrdering()
{
if (Desktop::getVisible("GameView"))
@@ -126,6 +130,7 @@
Desktop::setVisibility("OrderingView", true);
}
+#endif
static void bExit()
{
Index: netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.hpp:1.1
netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.hpp:1.2
--- netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.hpp:1.1 Sun Dec
1 12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.hpp Mon Sep 1
16:24:21 2003
@@ -19,19 +19,12 @@
#ifndef __MenuTemplateView_hpp__
#define __MenuTemplateView_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
#include "SpecialButtonView.hpp"
#include "Surface.hpp"
#include "PackedSurface.hpp"
#include "iRect.hpp"
#include "iXY.hpp"
#include "String.hpp"
-
//--------------------------------------------------------------------------
class MenuTemplateView : public SpecialButtonView
Index:
netpanzer/src/NetPanzer/Views/MainMenu/Multi/DirectPlayErrorExceptionView.cpp
diff -u
netpanzer/src/NetPanzer/Views/MainMenu/Multi/DirectPlayErrorExceptionView.cpp:1.1
netpanzer/src/NetPanzer/Views/MainMenu/Multi/DirectPlayErrorExceptionView.cpp:1.2
---
netpanzer/src/NetPanzer/Views/MainMenu/Multi/DirectPlayErrorExceptionView.cpp:1.1
Sun Dec 1 12:52:00 2002
+++
netpanzer/src/NetPanzer/Views/MainMenu/Multi/DirectPlayErrorExceptionView.cpp
Mon Sep 1 16:24:21 2003
@@ -16,8 +16,6 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-#include "stdafx.hpp"
#include "DirectPlayErrorExceptionView.hpp"
#include "Desktop.hpp"
#include "GameManager.hpp"
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/FlagSelectionView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/FlagSelectionView.cpp:1.1
netpanzer/src/NetPanzer/Views/MainMenu/Multi/FlagSelectionView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/FlagSelectionView.cpp:1.1
Sun Dec 1 12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/FlagSelectionView.cpp Mon Sep
1 16:24:21 2003
@@ -17,7 +17,6 @@
*/
-#include "stdafx.hpp"
#include "FlagSelectionView.hpp"
#include "gapp.hpp"
#include "DSound.hpp"
@@ -51,7 +50,7 @@
// Define the scrollBar fot this view.
//scrollBar = new ScrollBar(HORIZONTAL, 0, 1, 0, flags.getFrameCount());
- //if (scrollBar == NULL)
+ //if (scrollBar == 0)
//{
// FUBAR("ERROR: Unable to allocate scrollBar.");
//}
@@ -83,7 +82,7 @@
playerFlag.setFrame(i);
//playerFlag.drawButtonBorder(Color::white, Color::gray64);
- addButtonSurfaceSingle(iXY(x, y), playerFlag, "", NULL);
+ addButtonSurfaceSingle(iXY(x, y), playerFlag, "", 0);
x += xOffset;
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetConnectionTypeView.cpp
diff -u
netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetConnectionTypeView.cpp:1.1
netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetConnectionTypeView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetConnectionTypeView.cpp:1.1
Sun Dec 1 12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetConnectionTypeView.cpp
Mon Sep 1 16:24:21 2003
@@ -17,7 +17,6 @@
*/
-#include "stdafx.hpp"
#include "GetConnectionTypeView.hpp"
#include "Desktop.hpp"
#include "GameConfig.hpp"
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionHostView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionHostView.cpp:1.1
netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionHostView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionHostView.cpp:1.1
Sun Dec 1 12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionHostView.cpp Mon Sep
1 16:24:21 2003
@@ -17,7 +17,6 @@
*/
-#include "stdafx.hpp"
#include "GetSessionHostView.hpp"
#include "Desktop.hpp"
#include "DirectPlay.h"
@@ -208,8 +207,9 @@
void GetSessionHostView::updateHostList()
{
int num_games;
- char game_name[80];
- HRESULT hr;
+ //char game_name[80];
+ // XXX
+ // HRESULT hr;
SessionList session_list;
// winsock hack
@@ -235,7 +235,7 @@
num_games = GetNumGames();
*/
- if( CLIENT->getSessionList( session_list ) == _FALSE )
+ if( CLIENT->getSessionList( session_list ) == false )
{
Desktop::setVisibilityAllWindows(false);
Desktop::setVisibility("GetSessionView", true);
@@ -275,9 +275,9 @@
// See if the host name still exists, if so, remap the index to
selectedItem.
selectedItem = -1;
- for (num = 0; num < num_games; num++)
+ for (int num = 0; num < num_games; num++)
{
- if (stricmp(hosts[num].getName(), curHostName) == 0)
+ if (strcasecmp(hosts[num].getName(), curHostName) == 0)
{
selectedItem = num;
}
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionView.cpp:1.1
netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionView.cpp:1.1 Sun Dec
1 12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionView.cpp Mon Sep
1 16:24:21 2003
@@ -17,7 +17,6 @@
*/
-#include "stdafx.hpp"
#include "GetSessionView.hpp"
#include "GetSessionHostView.hpp"
#include "Desktop.hpp"
@@ -32,7 +31,7 @@
//winsock hack
#include "IPAddressView.h"
-#include "WinSockClient.h"
+#include "WinsockClient.h"
#include "Server.hpp"
#include "Client.hpp"
@@ -53,8 +52,8 @@
void bNext()
{
//Bug#15
- //boolean DPlayReturnValue;
- //boolean ConnectTypeReturnValue;
+ //bool DPlayReturnValue;
+ //bool ConnectTypeReturnValue;
//HRESULT hr;
//int return_value;
@@ -89,7 +88,7 @@
{
CLIENT->openSession( _connection_network, 0 );
- if ( CLIENT->startEnumeration( ) == _FALSE )
+ if ( CLIENT->startEnumeration( ) == false )
{
Desktop::setVisibilityAllWindows(false);
Desktop::setVisibility("GetSessionView", true);
@@ -104,7 +103,7 @@
}
/* winsock hack
- boolean minimize;
+ bool minimize;
//initialize dplay, fix Bug#15--
//if the DPlayReturnValue is 0 dplay ain't working.
@@ -121,7 +120,7 @@
//bug#15+
hr = EnumerateGames( gapp.hwndApp );
- if (minimize == _FALSE)
+ if (minimize == false)
{
DDraw.setGDIStatus(false);
}
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp
diff -u
netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp:1.1
netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp:1.1
Sun Dec 1 12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp
Mon Sep 1 16:24:21 2003
@@ -15,9 +15,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-
-#include "stdafx.hpp"
+#include <ctype.h>
#include "HostJoinTemplateView.hpp"
#include "Desktop.hpp"
#include "HostJoinTemplateView.hpp"
@@ -119,8 +117,12 @@
if (strlen(PlayerNameView::playerName.getString()) <= 0) { return; }
strcpy( temp_str, PlayerNameView::playerName.getString() );
- strlwr( temp_str );
- if (strstr( temp_str, "server" ) != NULL ) { return; }
+
+ // make string lowercase
+ for(char* p = temp_str; *p != 0; p++) {
+ *p = tolower(*p);
+ }
+ if (strstr( temp_str, "server" ) != 0 ) { return; }
// Check a few things which should be ok.
if (strlen(HostJoinTemplateView::gameTypeBuf) == 0) { return; }
@@ -329,7 +331,7 @@
// bltString(playerFlag, 2, 3, strBuf, Color::white);
//
// // Create a button off the created surface.
- // addButtonSurface(iXY(x, 38), playerFlag, strBuf, NULL);
+ // addButtonSurface(iXY(x, 38), playerFlag, strBuf, 0);
// x += xOffset;
//}
@@ -357,19 +359,19 @@
y = pos.y;
- addButtonTILBordered(iXY(x, y),
"pics\\vehicleSelectionMenu\\humvee.til", "", NULL);
+ addButtonTILBordered(iXY(x, y),
"pics\\vehicleSelectionMenu\\humvee.til", "", 0);
x += buttonSize.x + 1;
- addButtonTILBordered(iXY(x, y),
"pics\\vehicleSelectionMenu\\light.til", "", NULL);
+ addButtonTILBordered(iXY(x, y),
"pics\\vehicleSelectionMenu\\light.til", "", 0);
x += buttonSize.x + 1;
- addButtonTILBordered(iXY(x, y),
"pics\\vehicleSelectionMenu\\medium.til", "", NULL);
+ addButtonTILBordered(iXY(x, y),
"pics\\vehicleSelectionMenu\\medium.til", "", 0);
x += buttonSize.x + 1;
- addButtonTILBordered(iXY(x, y),
"pics\\vehicleSelectionMenu\\heavy.til", "", NULL);
+ addButtonTILBordered(iXY(x, y),
"pics\\vehicleSelectionMenu\\heavy.til", "", 0);
x += buttonSize.x + 1;
- addButtonTILBordered(iXY(x, y),
"pics\\vehicleSelectionMenu\\missle.til", "", NULL);
+ addButtonTILBordered(iXY(x, y),
"pics\\vehicleSelectionMenu\\missle.til", "", 0);
x += buttonSize.x + 1;
// Draw the arrows to change the numbers.
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostOptionsView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostOptionsView.cpp:1.1
netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostOptionsView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostOptionsView.cpp:1.1
Sun Dec 1 12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostOptionsView.cpp Mon Sep
1 16:24:21 2003
@@ -15,15 +15,12 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-
-#include "stdafx.hpp"
#include "HostOptionsView.hpp"
#include "GameConfig.hpp"
#include "HostView.hpp"
#include "ParticleSystemGlobals.hpp"
#include "MapSelectionView.hpp"
-#include "GameViewGLobals.hpp"
+#include "GameViewGlobals.hpp"
int HostOptionsView::cloudCoverageCount = 1;
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostView.cpp:1.1
netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostView.cpp:1.1 Sun Dec
1 12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostView.cpp Mon Sep 1
16:24:21 2003
@@ -15,9 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-
-#include "stdafx.hpp"
#include "HostView.hpp"
#include "GameConfig.hpp"
#include "DSound.hpp"
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/IPAddressView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/IPAddressView.cpp:1.1
netpanzer/src/NetPanzer/Views/MainMenu/Multi/IPAddressView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/IPAddressView.cpp:1.1 Sun Dec
1 12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/IPAddressView.cpp Mon Sep
1 16:24:21 2003
@@ -16,12 +16,11 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "IPAddressView.h"
#include "Desktop.hpp"
#include "GameViewGlobals.hpp"
#include "gapp.hpp"
-#include "winsockclient.h"
+#include "WinsockClient.h"
#include "winsockglobals.h"
#include "Client.hpp"
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/ImageSelectorView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/ImageSelectorView.cpp:1.1
netpanzer/src/NetPanzer/Views/MainMenu/Multi/ImageSelectorView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/ImageSelectorView.cpp:1.1
Sun Dec 1 12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/ImageSelectorView.cpp Mon Sep
1 16:24:21 2003
@@ -16,6 +16,9 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+// old code?!?
+#if 0
+
#include "ImageSelectorView.hpp"
#include "cViewManager.hpp"
@@ -166,3 +169,4 @@
selectedImage = findImageContaining(pos);
} // end lMouseDown
+#endif
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/ImageSelectorView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/ImageSelectorView.hpp:1.1
netpanzer/src/NetPanzer/Views/MainMenu/Multi/ImageSelectorView.hpp:1.2
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/ImageSelectorView.hpp:1.1
Sun Dec 1 12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/ImageSelectorView.hpp Mon Sep
1 16:24:21 2003
@@ -21,6 +21,9 @@
#define __ImageSelectorView_hpp__
+// old code?!?
+#if 0
+
#include "cView.hpp"
#include "Surface.hpp"
#include "iXY.hpp"
@@ -57,5 +60,6 @@
virtual void loadImages() {}
}; // end ImageSelectorView
+#endif
#endif // end __ImageSelectorView_hpp__
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/JoinView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/JoinView.cpp:1.1
netpanzer/src/NetPanzer/Views/MainMenu/Multi/JoinView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/JoinView.cpp:1.1 Sun Dec
1 12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/JoinView.cpp Mon Sep 1
16:24:21 2003
@@ -15,9 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-
-#include "stdafx.hpp"
#include "JoinView.hpp"
#include "Desktop.hpp"
#include "GameConfig.hpp"
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.cpp:1.1
netpanzer/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.cpp:1.1
Sun Dec 1 12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.cpp Mon Sep
1 16:24:21 2003
@@ -15,9 +15,9 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-
-#include "stdafx.hpp"
+#ifdef WIN32
+#include <io.h>
+#endif
#include "MapSelectionView.hpp"
#include "gapp.hpp"
#include "DSound.hpp"
@@ -137,6 +137,8 @@
//---------------------------------------------------------------------------
int MapSelectionView::loadMaps()
{
+ // XXX find an alternative to _findfirst
+#ifdef WIN32
char strBuf[256];
char pathWild[256];
@@ -180,9 +182,9 @@
{for (int i = 0; i < fileList.getCount(); i++)
{
FILE *fp = fopen(fileList[i].name, "rb");
- if (fp == NULL)
+ if (fp == 0)
{
- assert(fp != NULL);
+ assert(fp != 0);
continue;
}
@@ -199,7 +201,7 @@
FUBAR("Map description is too long.");
}
*/
- _splitpath(fileList[i].name, NULL, NULL, mapList[i].name, NULL);
+ _splitpath(fileList[i].name, 0, 0, mapList[i].name, 0);
sprintf(mapList[i].description, "%s",
netPanzerMapHeader.description);
mapList[i].cells.x = netPanzerMapHeader.x_size;
@@ -227,7 +229,7 @@
int objectiveCount = 0;
sprintf(strBuf, "%s%s.opt", mapsPath, mapList[i].name);
fp = fopen(strBuf, "rb");
- if (fp == NULL || (!fscanf(fp, "ObjectiveCount: %d",
&objectiveCount)))
+ if (fp == 0 || (!fscanf(fp, "ObjectiveCount: %d",
&objectiveCount)))
{
GameConfig::setGameMapName("");
return 1;
@@ -249,6 +251,7 @@
GameConfig::setGameMapName(MapSelectionView::mapList[curMap].name);
curMap = 0;
+#endif
// Success
return -1;
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/MultiMapSelectorView.cpp
diff -u
netpanzer/src/NetPanzer/Views/MainMenu/Multi/MultiMapSelectorView.cpp:1.1
netpanzer/src/NetPanzer/Views/MainMenu/Multi/MultiMapSelectorView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/MultiMapSelectorView.cpp:1.1
Sun Dec 1 12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/MultiMapSelectorView.cpp
Mon Sep 1 16:24:21 2003
@@ -16,6 +16,10 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+// XXX old code?
+
+#if 0
+
#include "MultiMapSelectorView.hpp"
#include "cViewManager.hpp"
@@ -77,9 +81,9 @@
for (int i = 0; i < fileList.getCount(); i++)
{
FILE *fp = fopen(fileList[i].name, "rb");
- if (fp == NULL)
+ if (fp == 0)
{
- assert(fp != NULL);
+ assert(fp != 0);
continue;
}
@@ -135,3 +139,5 @@
flagNoImagesLoaded = true;
}
}
+
+#endif
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/MultiMapSelectorView.hpp
diff -u
netpanzer/src/NetPanzer/Views/MainMenu/Multi/MultiMapSelectorView.hpp:1.1
netpanzer/src/NetPanzer/Views/MainMenu/Multi/MultiMapSelectorView.hpp:1.2
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/MultiMapSelectorView.hpp:1.1
Sun Dec 1 12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/MultiMapSelectorView.hpp
Mon Sep 1 16:24:21 2003
@@ -16,6 +16,10 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+// XXX old code?
+
+#if 0
+
#ifndef __MultiMapSelectorView_hpp__
#define __MultiMapSelectorView_hpp__
@@ -59,3 +63,5 @@
}; // end MultiMapSelectorView
#endif // end __MultiMapSelectorView_hpp__
+
+#endif
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/MultiVehicleSelectorView.cpp
diff -u
netpanzer/src/NetPanzer/Views/MainMenu/Multi/MultiVehicleSelectorView.cpp:1.1
netpanzer/src/NetPanzer/Views/MainMenu/Multi/MultiVehicleSelectorView.cpp:1.2
---
netpanzer/src/NetPanzer/Views/MainMenu/Multi/MultiVehicleSelectorView.cpp:1.1
Sun Dec 1 12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/MultiVehicleSelectorView.cpp
Mon Sep 1 16:24:21 2003
@@ -16,6 +16,8 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+// XXX old code?
+#if 0
#include "MultiVehicleSelectorView.hpp"
#include "cViewManager.hpp"
@@ -42,3 +44,5 @@
}
} // end MultiVehicleSelectorView::loadImages
+
+#endif
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/MultiVehicleSelectorView.hpp
diff -u
netpanzer/src/NetPanzer/Views/MainMenu/Multi/MultiVehicleSelectorView.hpp:1.1
netpanzer/src/NetPanzer/Views/MainMenu/Multi/MultiVehicleSelectorView.hpp:1.2
---
netpanzer/src/NetPanzer/Views/MainMenu/Multi/MultiVehicleSelectorView.hpp:1.1
Sun Dec 1 12:52:00 2002
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/MultiVehicleSelectorView.hpp
Mon Sep 1 16:24:21 2003
@@ -16,6 +16,9 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+// XXX old code?
+
+#if 0
#ifndef __MultiVehicleSelectorView_hpp__
#define __MultiVehicleSelectorView_hpp__
@@ -43,3 +46,5 @@
}; // end MultiVehicleSelectorView
#endif // end __MultiVehicleSelectorView_hpp__
+
+#endif
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/PlayerNameView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/PlayerNameView.cpp:1.1
netpanzer/src/NetPanzer/Views/MainMenu/Multi/PlayerNameView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/PlayerNameView.cpp:1.1 Sun Dec
1 12:52:08 2002
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/PlayerNameView.cpp Mon Sep
1 16:24:21 2003
@@ -15,11 +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 "stdafx.hpp"
#include "PlayerNameView.hpp"
-#include "GameViewGLobals.hpp"
+#include "GameViewGlobals.hpp"
#include "GameConfig.hpp"
cInputFieldString PlayerNameView::playerName;
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitColorView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitColorView.cpp:1.1
netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitColorView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitColorView.cpp:1.1 Sun Dec
1 12:52:08 2002
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitColorView.cpp Mon Sep
1 16:24:21 2003
@@ -15,9 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-
-#include "stdafx.hpp"
#include "UnitColorView.hpp"
#include "gapp.hpp"
#include "DSound.hpp"
@@ -60,7 +57,7 @@
for (int num = 0; num < 256; num++)
{
int c = Palette::color[num].getBrightnessInt();
- int nearestColor = Palette::findNearestColor(RGBColor(c *
grayPercent, c * grayPercent, c * grayPercent));
+ int nearestColor = (int) Palette::findNearestColor(RGBColor(c *
grayPercent, c * grayPercent, c * grayPercent));
gray256.setColor(num, nearestColor);
}
gray256.setColor(255, 0);
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitSelectionView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitSelectionView.cpp:1.1
netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitSelectionView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitSelectionView.cpp:1.1
Sun Dec 1 12:52:08 2002
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitSelectionView.cpp Mon Sep
1 16:24:21 2003
@@ -15,9 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-
-#include "stdafx.hpp"
#include "UnitSelectionView.hpp"
#include "gapp.hpp"
#include "DSound.hpp"
Index: netpanzer/src/NetPanzer/Views/MainMenu/Options/ControlsView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Options/ControlsView.cpp:1.1
netpanzer/src/NetPanzer/Views/MainMenu/Options/ControlsView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/MainMenu/Options/ControlsView.cpp:1.1 Sun Dec
1 12:52:08 2002
+++ netpanzer/src/NetPanzer/Views/MainMenu/Options/ControlsView.cpp Mon Sep
1 16:24:21 2003
@@ -17,7 +17,6 @@
*/
-#include "stdafx.hpp"
#include "ControlsView.hpp"
#include "Desktop.hpp"
#include "DDHardSurface.hpp"
@@ -27,8 +26,10 @@
#include "GameViewGlobals.hpp"
-static char screenSurfacePathTIL[] = "pics\\backgrounds\\menus\\optionmb.til";
+//static char screenSurfacePathTIL[] =
"pics\\backgrounds\\menus\\optionmb.til";
+// never used
+#if 0
static void bSetupJoystick()
{
JoystickInterface::setupJoystick();
@@ -48,6 +49,7 @@
{
GameConfig::setJoystickState(false);
}
+#endif
// ControlsView
@@ -66,13 +68,14 @@
{
OptionsTemplateView::initButtons();
+ /*
int xTextStart = bodyTextRect.min.x;
int x = xTextStart;
int y = bodyTextRect.min.y;
int yOffset = 15;
int buttonXSize = 90;
- int arrowButtonWidth = 16;
+ int arrowButtonWidth = 16;*/
// Settings
//----------------------------------------------------------------------
Index: netpanzer/src/NetPanzer/Views/MainMenu/Options/InterfaceView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Options/InterfaceView.cpp:1.1
netpanzer/src/NetPanzer/Views/MainMenu/Options/InterfaceView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/MainMenu/Options/InterfaceView.cpp:1.1
Sun Dec 1 12:52:08 2002
+++ netpanzer/src/NetPanzer/Views/MainMenu/Options/InterfaceView.cpp Mon Sep
1 16:24:21 2003
@@ -17,7 +17,6 @@
*/
-#include "stdafx.hpp"
#include "InterfaceView.hpp"
#include "GameConfig.hpp"
#include "GameViewGlobals.hpp"
@@ -46,7 +45,7 @@
static int getScrollRate()
{
- return GameConfig::getScrollRate();
+ return (int) GameConfig::getScrollRate();
}
static int getMiniMapResizeRate()
Index: netpanzer/src/NetPanzer/Views/MainMenu/Options/SoundView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Options/SoundView.cpp:1.1
netpanzer/src/NetPanzer/Views/MainMenu/Options/SoundView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/MainMenu/Options/SoundView.cpp:1.1 Sun Dec
1 12:52:08 2002
+++ netpanzer/src/NetPanzer/Views/MainMenu/Options/SoundView.cpp Mon Sep
1 16:24:21 2003
@@ -17,7 +17,6 @@
*/
-#include "stdafx.hpp"
#include "SoundView.hpp"
#include "GameConfig.hpp"
#include "GameViewGlobals.hpp"
@@ -70,12 +69,14 @@
{
OptionsTemplateView::initButtons();
+#if 0
int xTextStart = bodyTextRect.min.x;
int x = xTextStart;
int y = bodyTextRect.min.y;
int yOffset = 15;
int buttonXSize = 90;
int arrowButtonWidth = 16;
+#endif
// Settings
//----------------------------------------------------------------------
@@ -103,17 +104,17 @@
//x = xTextStart;
//addLabel(iXY(x, y), "Unit Acknowledgement", Color::white);
//x = optionsMeterStartX;
- //addButtonCenterText(iXY(x - 1, y), arrowButtonWidth, "<", "", NULL);
+ //addButtonCenterText(iXY(x - 1, y), arrowButtonWidth, "<", "", 0);
//x += optionsMeterWidth + arrowButtonWidth;
- //addButtonCenterText(iXY(x + 1, y), arrowButtonWidth, ">", "", NULL);
+ //addButtonCenterText(iXY(x + 1, y), arrowButtonWidth, ">", "", 0);
//y += yOffset;
//
//x = xTextStart;
//addLabel(iXY(x, y), "Ambient Sounds", Color::white);
//x = optionsMeterStartX;
- //addButtonCenterText(iXY(x - 1, y), arrowButtonWidth, "<", "", NULL);
+ //addButtonCenterText(iXY(x - 1, y), arrowButtonWidth, "<", "", 0);
//x += optionsMeterWidth + arrowButtonWidth;
- //addButtonCenterText(iXY(x + 1, y), arrowButtonWidth, ">", "", NULL);
+ //addButtonCenterText(iXY(x + 1, y), arrowButtonWidth, ">", "", 0);
//y += yOffset;
}
Index: netpanzer/src/NetPanzer/Views/MainMenu/Options/VisualsView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Options/VisualsView.cpp:1.1
netpanzer/src/NetPanzer/Views/MainMenu/Options/VisualsView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/MainMenu/Options/VisualsView.cpp:1.1 Sun Dec
1 12:52:08 2002
+++ netpanzer/src/NetPanzer/Views/MainMenu/Options/VisualsView.cpp Mon Sep
1 16:24:21 2003
@@ -17,7 +17,6 @@
*/
-#include "stdafx.hpp"
#include "VisualsView.hpp"
#include "ParticleSystemGlobals.hpp"
#include "GameConfig.hpp"
@@ -43,7 +42,7 @@
static int getBrightness()
{
- return GameConfig::getScreenBrightness();
+ return (int) GameConfig::getScreenBrightness();
}
static void bIncreaseResolution()
Index: netpanzer/src/NetPanzer/Views/MainMenu/OptionsTemplateView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/OptionsTemplateView.cpp:1.1
netpanzer/src/NetPanzer/Views/MainMenu/OptionsTemplateView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/MainMenu/OptionsTemplateView.cpp:1.1 Sun Dec
1 12:52:08 2002
+++ netpanzer/src/NetPanzer/Views/MainMenu/OptionsTemplateView.cpp Mon Sep
1 16:24:21 2003
@@ -17,7 +17,6 @@
*/
-#include "stdafx.hpp"
#include "OptionsTemplateView.hpp"
#include "Desktop.hpp"
#include "DDHardSurface.hpp"
Index: netpanzer/src/NetPanzer/Views/MainMenu/OrderingView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/OrderingView.cpp:1.1
netpanzer/src/NetPanzer/Views/MainMenu/OrderingView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/MainMenu/OrderingView.cpp:1.1 Sun Dec 1
12:52:08 2002
+++ netpanzer/src/NetPanzer/Views/MainMenu/OrderingView.cpp Mon Sep 1
16:24:21 2003
@@ -17,7 +17,6 @@
*/
-#include "stdafx.hpp"
#include "OrderingView.hpp"
#include "Desktop.hpp"
#include "DDHardSurface.hpp"
@@ -25,7 +24,7 @@
#include "GameViewGlobals.hpp"
-static char screenSurfacePathTIL[] = "pics\\backgrounds\\menus\\ordermb.til";
+// static char screenSurfacePathTIL[] =
"pics\\backgrounds\\menus\\ordermb.til";
// OrderingView
Index: netpanzer/src/NetPanzer/Views/MainMenu/RMouseHackView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/RMouseHackView.cpp:1.1
netpanzer/src/NetPanzer/Views/MainMenu/RMouseHackView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/MainMenu/RMouseHackView.cpp:1.1 Sun Dec
1 12:52:08 2002
+++ netpanzer/src/NetPanzer/Views/MainMenu/RMouseHackView.cpp Mon Sep 1
16:24:21 2003
@@ -17,7 +17,6 @@
*/
-#include "stdafx.hpp"
#include "RMouseHackView.hpp"
#include "Desktop.hpp"
Index: netpanzer/src/NetPanzer/Views/MainMenu/SkirmishView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/SkirmishView.cpp:1.1
netpanzer/src/NetPanzer/Views/MainMenu/SkirmishView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/MainMenu/SkirmishView.cpp:1.1 Sun Dec 1
12:52:08 2002
+++ netpanzer/src/NetPanzer/Views/MainMenu/SkirmishView.cpp Mon Sep 1
16:24:21 2003
@@ -17,7 +17,6 @@
*/
-#include "stdafx.hpp"
#include "SkirmishView.hpp"
#include "Desktop.hpp"
#include "DDHardSurface.hpp"
Index: netpanzer/src/NetPanzer/Views/MainMenu/SkirmishView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/SkirmishView.hpp:1.1
netpanzer/src/NetPanzer/Views/MainMenu/SkirmishView.hpp:1.2
--- netpanzer/src/NetPanzer/Views/MainMenu/SkirmishView.hpp:1.1 Sun Dec 1
12:52:08 2002
+++ netpanzer/src/NetPanzer/Views/MainMenu/SkirmishView.hpp Mon Sep 1
16:24:21 2003
@@ -19,16 +19,9 @@
#ifndef __SkirmishView_hpp__
#define __SkirmishView_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
#include "View.hpp"
#include "Surface.hpp"
#include "MenuTemplateView.hpp"
-
//--------------------------------------------------------------------------
class SkirmishView : public MenuTemplateView
Index: netpanzer/src/NetPanzer/Views/MainMenu/SpecialButtonView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/SpecialButtonView.cpp:1.1
netpanzer/src/NetPanzer/Views/MainMenu/SpecialButtonView.cpp:1.2
--- netpanzer/src/NetPanzer/Views/MainMenu/SpecialButtonView.cpp:1.1 Sun Dec
1 12:52:08 2002
+++ netpanzer/src/NetPanzer/Views/MainMenu/SpecialButtonView.cpp Mon Sep
1 16:24:21 2003
@@ -17,7 +17,6 @@
*/
-#include "stdafx.hpp"
#include "SpecialButtonView.hpp"
#include "Surface.hpp"
#include "PackedSurface.hpp"
Index: netpanzer/src/PyroUtil/ImgRobot/ArrayTemplate.hpp
diff -u netpanzer/src/PyroUtil/ImgRobot/ArrayTemplate.hpp:1.1
netpanzer/src/PyroUtil/ImgRobot/ArrayTemplate.hpp:1.2
--- netpanzer/src/PyroUtil/ImgRobot/ArrayTemplate.hpp:1.1 Sun Dec 1
12:52:08 2002
+++ netpanzer/src/PyroUtil/ImgRobot/ArrayTemplate.hpp Mon Sep 1 16:24:21 2003
@@ -35,7 +35,7 @@
ArrayTemplate()
{
size = 0;
- array = NULL;
+ array = 0;
}
ArrayTemplate( unsigned long size );
@@ -62,10 +62,10 @@
inline void deallocate( void )
{
- if ( array != NULL )
+ if ( array != 0 )
{
delete [size] array;
- array = NULL;
+ array = 0;
}
size = 0;
@@ -80,13 +80,13 @@
{
ArrayTemplate< TYPE >::size = size;
array = new TYPE [ size ];
- assert( array != NULL );
+ assert( array != 0 );
}
template< class TYPE >
ArrayTemplate< TYPE >::~ArrayTemplate( void )
{
- if ( array != NULL )
+ if ( array != 0 )
delete [size] array;
}
@@ -95,14 +95,14 @@
{
ArrayTemplate< TYPE >::size = size;
- if ( array != NULL )
+ if ( array != 0 )
{
delete [size] array ;
- array = NULL;
+ array = 0;
}
array = new TYPE [ size ];
- assert( array != NULL );
+ assert( array != 0 );
}
Index: netpanzer/src/PyroUtil/ImgRobot/ColorPakDialog.cpp
diff -u netpanzer/src/PyroUtil/ImgRobot/ColorPakDialog.cpp:1.1
netpanzer/src/PyroUtil/ImgRobot/ColorPakDialog.cpp:1.2
--- netpanzer/src/PyroUtil/ImgRobot/ColorPakDialog.cpp:1.1 Sun Dec 1
12:52:08 2002
+++ netpanzer/src/PyroUtil/ImgRobot/ColorPakDialog.cpp Mon Sep 1 16:24:21 2003
@@ -16,7 +16,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.h"
+
#include "ImageRobot.h"
#include "ColorPakDialog.h"
#include "Palette.hpp"
@@ -32,7 +32,7 @@
// CColorPakDialog dialog
-CColorPakDialog::CColorPakDialog(CWnd* pParent /*=NULL*/)
+CColorPakDialog::CColorPakDialog(CWnd* pParent /*=0*/)
: CDialog(CColorPakDialog::IDD, pParent)
{
//{{AFX_DATA_INIT(CColorPakDialog)
@@ -97,11 +97,11 @@
m_Gradient.Invalidate();
}
-BOOL CColorPakDialog::OnInitDialog()
+bool CColorPakDialog::OnInitDialog()
{
CDialog::OnInitDialog();
- if (!m_Gradient.init()) return FALSE;
+ if (!m_Gradient.init()) return false;
///////////
//HBITMAP CreateDIBSection( HDC hdc, // handle to device context
@@ -113,8 +113,8 @@
//);
////////////
- return TRUE; // return TRUE unless you set the focus to a control
- // EXCEPTION: OCX Property Pages should return FALSE
+ return true; // return true unless you set the focus to a control
+ // EXCEPTION: OCX Property Pages should return false
}
void CColorPakDialog::OnApplyColorPak()
@@ -155,10 +155,10 @@
{
}
-BOOL COwnerDraw::init() {
+bool COwnerDraw::init() {
- HDC hdc = CreateCompatibleDC(NULL);
- if (hdc == NULL) return FALSE;
+ HDC hdc = CreateCompatibleDC(0);
+ if (hdc == 0) return false;
CRect rect;
GetWindowRect(&rect);
@@ -187,22 +187,22 @@
pbmi.pal[i].rgbReserved = 0;
}
- void *dibSectionPtr = NULL;
+ void *dibSectionPtr = 0;
surface.free();
dibSection = CreateDIBSection( hdc,
(BITMAPINFO *)&pbmi,
DIB_RGB_COLORS,
&dibSectionPtr,
- NULL,
+ 0,
0);
DeleteDC(hdc);
- if (dibSection == NULL) return FALSE;
+ if (dibSection == 0) return false;
surface.setTo(dibSectionPtr, iXY(x, y), x, 1);
transSurface.copy(surface);
- return TRUE;
+ return true;
}
void COwnerDraw::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct) {
Index: netpanzer/src/PyroUtil/ImgRobot/ImageRobot.cpp
diff -u netpanzer/src/PyroUtil/ImgRobot/ImageRobot.cpp:1.1
netpanzer/src/PyroUtil/ImgRobot/ImageRobot.cpp:1.2
--- netpanzer/src/PyroUtil/ImgRobot/ImageRobot.cpp:1.1 Sun Dec 1 12:52:08 2002
+++ netpanzer/src/PyroUtil/ImgRobot/ImageRobot.cpp Mon Sep 1 16:24:21 2003
@@ -16,7 +16,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.h"
+
#include "ImageRobot.h"
#include "ImageRobotDlg.h"
@@ -56,7 +56,7 @@
/////////////////////////////////////////////////////////////////////////////
// CImageRobotApp initialization
-BOOL CImageRobotApp::InitInstance()
+bool CImageRobotApp::InitInstance()
{
InitializeGlobals();
@@ -89,7 +89,7 @@
CleanupGlobals();
- // Since the dialog has been closed, return FALSE so that we exit the
+ // Since the dialog has been closed, return false so that we exit the
// application, rather than start the application's message pump.
- return FALSE;
+ return false;
}
Index: netpanzer/src/PyroUtil/ImgRobot/ImageRobotDlg.cpp
diff -u netpanzer/src/PyroUtil/ImgRobot/ImageRobotDlg.cpp:1.1
netpanzer/src/PyroUtil/ImgRobot/ImageRobotDlg.cpp:1.2
--- netpanzer/src/PyroUtil/ImgRobot/ImageRobotDlg.cpp:1.1 Sun Dec 1
12:52:08 2002
+++ netpanzer/src/PyroUtil/ImgRobot/ImageRobotDlg.cpp Mon Sep 1 16:24:21 2003
@@ -16,7 +16,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.h"
+
#include "ImageRobot.h"
#include "ImageRobotDlg.h"
@@ -79,13 +79,13 @@
/////////////////////////////////////////////////////////////////////////////
// CImageRobotDlg dialog
-CImageRobotDlg::CImageRobotDlg(CWnd* pParent /*=NULL*/)
+CImageRobotDlg::CImageRobotDlg(CWnd* pParent /*=0*/)
: CDialog(CImageRobotDlg::IDD, pParent)
{
- m_FileDialog = new CFileDialog( TRUE , NULL, "",
+ m_FileDialog = new CFileDialog( true , 0, "",
OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT |
OFN_NOCHANGEDIR | OFN_ALLOWMULTISELECT,
- NULL, this );
+ 0, this );
m_FileDialog->m_ofn.lpstrFile = gFileDialogFileList;
@@ -130,7 +130,7 @@
/////////////////////////////////////////////////////////////////////////////
// CImageRobotDlg message handlers
-BOOL CImageRobotDlg::OnInitDialog()
+bool CImageRobotDlg::OnInitDialog()
{
CDialog::OnInitDialog();
@@ -140,8 +140,8 @@
ASSERT((IDM_ABOUTBOX & 0xFFF0) == IDM_ABOUTBOX);
ASSERT(IDM_ABOUTBOX < 0xF000);
- CMenu* pSysMenu = GetSystemMenu(FALSE);
- if (pSysMenu != NULL)
+ CMenu* pSysMenu = GetSystemMenu(false);
+ if (pSysMenu != 0)
{
CString strAboutMenu;
strAboutMenu.LoadString(IDS_ABOUTBOX);
@@ -154,15 +154,15 @@
// Set the icon for this dialog. The framework does this automatically
// when the application's main window is not a dialog
- SetIcon(m_hIcon, TRUE); // Set big icon
- SetIcon(m_hIcon, FALSE); // Set small icon
+ SetIcon(m_hIcon, true); // Set big icon
+ SetIcon(m_hIcon, false); // Set small icon
// TODO: Add extra initialization here
// Load the game palette.
//Palette::init("netp.act");
- return TRUE; // return TRUE unless you set the focus to a control
+ return true; // return true unless you set the focus to a control
}
void CImageRobotDlg::OnSysCommand(UINT nID, LPARAM lParam)
@@ -214,7 +214,7 @@
return (HCURSOR) m_hIcon;
}
-BOOL CImageRobotDlg::ValidateOutputDirectory( void )
+bool CImageRobotDlg::ValidateOutputDirectory( void )
{
CString output_path;
char buffer[_MAX_PATH];
@@ -236,14 +236,14 @@
if ( mesg_result == IDYES )
{
_mkdir( output_path );
- return( TRUE );
+ return( true );
}
- return( FALSE );
+ return( false );
}
_chdir( buffer );
- return( TRUE );
+ return( true );
}
void CImageRobotDlg::SetListBoxFileCounts( void )
@@ -276,18 +276,18 @@
gSourceFileList.resetList();
iterator = m_FileDialog->GetStartPosition( );
- if (iterator == NULL) return;
+ if (iterator == 0) return;
do
{
string = m_FileDialog->GetNextPathName( iterator );
- _splitpath( string, NULL, NULL, fname, ext);
+ _splitpath( string, 0, 0, fname, ext);
strcat( fname, ext );
m_SourceListBox.AddString( fname );
- } while( iterator != NULL );
+ } while( iterator != 0 );
iterator = m_FileDialog->GetStartPosition( );
@@ -354,7 +354,7 @@
int file_count;
int file_index;
- if ( ValidateOutputDirectory() == FALSE )
+ if ( ValidateOutputDirectory() == false )
return;
FILE *fp;
@@ -391,7 +391,7 @@
fclose( fp );
- _spawnl( _P_NOWAIT, "piclab\\pl", "piclab\\pl", "piclab.prg", NULL );
+ _spawnl( _P_NOWAIT, "piclab\\pl", "piclab\\pl", "piclab.prg", 0 );
}
@@ -422,7 +422,7 @@
m_SourceListBox.GetText( file_index, source_file );
source_path = source_path + source_file;
- _splitpath( source_file, NULL, NULL, fname, ext);
+ _splitpath( source_file, 0, 0, fname, ext);
char buffer[256];
sprintf( buffer , "%s%04d%s", nameStub, file_index, ext );
@@ -477,7 +477,7 @@
{
CString output_path;
- if ( ValidateOutputDirectory() == FALSE )
+ if ( ValidateOutputDirectory() == false )
return;
m_OutputDirEdit.GetWindowText( output_path );
@@ -523,7 +523,7 @@
//void _splitpath( const char *path, char *drive, char
*dir, char *fname, char *ext );
//char extension[256];
- //_splitpath(outputPath, NULL, NULL, NULL, extension)
+ //_splitpath(outputPath, 0, 0, 0, extension)
//m_OutputListBox.AddString(outputFile);
PackedSurface tempPack;
@@ -570,7 +570,7 @@
{
CString output_path;
- if (ValidateOutputDirectory() == FALSE)
+ if (ValidateOutputDirectory() == false)
{
return;
}
@@ -600,7 +600,7 @@
{
CString output_path;
- if (ValidateOutputDirectory() == FALSE)
+ if (ValidateOutputDirectory() == false)
{
return;
}
Index: netpanzer/src/PyroUtil/ImgRobot/ImageRobotGlobals.cpp
diff -u netpanzer/src/PyroUtil/ImgRobot/ImageRobotGlobals.cpp:1.1
netpanzer/src/PyroUtil/ImgRobot/ImageRobotGlobals.cpp:1.2
--- netpanzer/src/PyroUtil/ImgRobot/ImageRobotGlobals.cpp:1.1 Sun Dec 1
12:52:08 2002
+++ netpanzer/src/PyroUtil/ImgRobot/ImageRobotGlobals.cpp Mon Sep 1
16:24:21 2003
@@ -20,7 +20,7 @@
#include "ImageRobotGlobals.hpp"
#include <assert.h>
-ColorTable *colorTable = NULL;
+ColorTable *colorTable = 0;
ColorTable gray256;
ColorTable red256;
ColorTable blue256;
@@ -39,7 +39,7 @@
gSourceFileList.initialize( 300 );
gFileDialogFileList = (char *) malloc( 200 * 256 * sizeof( char ) );
- assert( gFileDialogFileList != NULL );
+ assert( gFileDialogFileList != 0 );
gFileDialogFileListSize = 200 * 256 * sizeof( char );
memset( gFileDialogFileList, 0, gFileDialogFileListSize );
}
Index: netpanzer/src/PyroUtil/ImgRobot/ImageUtils.cpp
diff -u netpanzer/src/PyroUtil/ImgRobot/ImageUtils.cpp:1.1
netpanzer/src/PyroUtil/ImgRobot/ImageUtils.cpp:1.2
--- netpanzer/src/PyroUtil/ImgRobot/ImageUtils.cpp:1.1 Sun Dec 1 12:52:08 2002
+++ netpanzer/src/PyroUtil/ImgRobot/ImageUtils.cpp Mon Sep 1 16:24:21 2003
@@ -28,12 +28,12 @@
char fname[_MAX_FNAME];
char ext[_MAX_EXT];
- _splitpath( source_path, NULL, NULL, fname, ext );
+ _splitpath( source_path, 0, 0, fname, ext );
if ( !stricmp( ext, "tga") )
{ return( _pic_lab_crop_invalid_source ); }
- _splitpath( output_path, NULL, NULL, fname, ext );
+ _splitpath( output_path, 0, 0, fname, ext );
if ( !stricmp( ext, "tga") )
{ return( _pic_lab_crop_invalid_output ); }
@@ -69,7 +69,7 @@
char fname[_MAX_FNAME];
char ext[_MAX_EXT];
- _splitpath( file_path, NULL, NULL, fname, ext );
+ _splitpath( file_path, 0, 0, fname, ext );
// Check for valid file extension.
if ((stricmp(ext, ".pcx") == 0))
@@ -112,7 +112,7 @@
return( _pak_files_ok );
/*
- _splitpath( source_list.getString( 0 ), NULL, NULL, fname, ext );
+ _splitpath( source_list.getString( 0 ), 0, 0, fname, ext );
token = strtok( fname, "0123456789" );
strcpy( output_file, token );
Index: netpanzer/src/PyroUtil/ImgRobot/PObject.cpp
diff -u netpanzer/src/PyroUtil/ImgRobot/PObject.cpp:1.1
netpanzer/src/PyroUtil/ImgRobot/PObject.cpp:1.2
--- netpanzer/src/PyroUtil/ImgRobot/PObject.cpp:1.1 Sun Dec 1 12:52:08 2002
+++ netpanzer/src/PyroUtil/ImgRobot/PObject.cpp Mon Sep 1 16:24:21 2003
@@ -15,16 +15,16 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.h"
+
#include "PObject.hpp"
boolean PObject::is_equal( PObject *object )
{
if ( this == object )
- return ( _TRUE );
+ return ( true );
- return( _FALSE );
+ return( false );
}
PObject::PObject( void )
Index: netpanzer/src/PyroUtil/ImgRobot/PackFileDialog.cpp
diff -u netpanzer/src/PyroUtil/ImgRobot/PackFileDialog.cpp:1.1
netpanzer/src/PyroUtil/ImgRobot/PackFileDialog.cpp:1.2
--- netpanzer/src/PyroUtil/ImgRobot/PackFileDialog.cpp:1.1 Sun Dec 1
12:52:08 2002
+++ netpanzer/src/PyroUtil/ImgRobot/PackFileDialog.cpp Mon Sep 1 16:24:21 2003
@@ -16,7 +16,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.h"
+
#include "ImageRobot.h"
#include "PackFileDialog.h"
@@ -30,7 +30,7 @@
// PackFileDialog dialog
-PackFileDialog::PackFileDialog(CWnd* pParent /*=NULL*/)
+PackFileDialog::PackFileDialog(CWnd* pParent /*=0*/)
: CDialog(PackFileDialog::IDD, pParent)
{
//{{AFX_DATA_INIT(PackFileDialog)
Index: netpanzer/src/PyroUtil/ImgRobot/RenameInfoDialog.cpp
diff -u netpanzer/src/PyroUtil/ImgRobot/RenameInfoDialog.cpp:1.1
netpanzer/src/PyroUtil/ImgRobot/RenameInfoDialog.cpp:1.2
--- netpanzer/src/PyroUtil/ImgRobot/RenameInfoDialog.cpp:1.1 Sun Dec 1
12:52:08 2002
+++ netpanzer/src/PyroUtil/ImgRobot/RenameInfoDialog.cpp Mon Sep 1
16:24:21 2003
@@ -16,7 +16,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.h"
+
#include "ImageRobot.h"
#include "RenameInfoDialog.h"
@@ -30,7 +30,7 @@
// RenameInfoDialog dialog
-RenameInfoDialog::RenameInfoDialog(CWnd* pParent /*=NULL*/)
+RenameInfoDialog::RenameInfoDialog(CWnd* pParent /*=0*/)
: CDialog(RenameInfoDialog::IDD, pParent)
{
//{{AFX_DATA_INIT(RenameInfoDialog)
Index: netpanzer/src/PyroUtil/ImgRobot/StdAfx.cpp
diff -u netpanzer/src/PyroUtil/ImgRobot/StdAfx.cpp:1.1
netpanzer/src/PyroUtil/ImgRobot/StdAfx.cpp:1.2
--- netpanzer/src/PyroUtil/ImgRobot/StdAfx.cpp:1.1 Sun Dec 1 12:52:08 2002
+++ netpanzer/src/PyroUtil/ImgRobot/StdAfx.cpp Mon Sep 1 16:24:21 2003
@@ -16,4 +16,4 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.h"
+
Index: netpanzer/src/PyroUtil/ImgRobot/cropinfodialog.cpp
diff -u netpanzer/src/PyroUtil/ImgRobot/cropinfodialog.cpp:1.1
netpanzer/src/PyroUtil/ImgRobot/cropinfodialog.cpp:1.2
--- netpanzer/src/PyroUtil/ImgRobot/cropinfodialog.cpp:1.1 Sun Dec 1
12:52:09 2002
+++ netpanzer/src/PyroUtil/ImgRobot/cropinfodialog.cpp Mon Sep 1 16:24:21 2003
@@ -16,7 +16,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.h"
+
#include "ImageRobot.h"
#include "CropInfoDialog.h"
@@ -30,7 +30,7 @@
// CropInfoDialog dialog
-CropInfoDialog::CropInfoDialog(CWnd* pParent /*=NULL*/)
+CropInfoDialog::CropInfoDialog(CWnd* pParent /*=0*/)
: CDialog(CropInfoDialog::IDD, pParent)
{
//{{AFX_DATA_INIT(CropInfoDialog)
Index: netpanzer/src/PyroUtil/PaletteFix/PaletteFix.cpp
diff -u netpanzer/src/PyroUtil/PaletteFix/PaletteFix.cpp:1.1
netpanzer/src/PyroUtil/PaletteFix/PaletteFix.cpp:1.2
--- netpanzer/src/PyroUtil/PaletteFix/PaletteFix.cpp:1.1 Sun Dec 1
12:52:09 2002
+++ netpanzer/src/PyroUtil/PaletteFix/PaletteFix.cpp Mon Sep 1 16:24:21 2003
@@ -93,7 +93,7 @@
systemPalette.palNumEntries = 256;
systemPaletteHandle = CreatePalette( (CONST LOGPALETTE *) &systemPalette );
- if ( systemPaletteHandle == NULL )
+ if ( systemPaletteHandle == 0 )
{
MessageBox(hWndApp, "Create System Palette Failed", "Error", MB_OK);
}
@@ -107,7 +107,7 @@
UINT error;
HPALETTE palHandle;
- if (systemPaletteHandle == NULL)
+ if (systemPaletteHandle == 0)
{ return; }
hdc = GetDC(hWndApp);
@@ -118,9 +118,9 @@
MessageBox(hWndApp, "SetSystemPaletteUse Failed", "Error",
MB_OK);
}
- palHandle = SelectPalette(hdc, systemPaletteHandle, FALSE);
+ palHandle = SelectPalette(hdc, systemPaletteHandle, false);
- if (palHandle == NULL)
+ if (palHandle == 0)
{
MessageBox(hWndApp, "SelectPalette Failed", "Error", MB_OK);
}
@@ -145,9 +145,9 @@
} // end activateSystemPalette
-BOOL MyTaskBarAddIcon(HWND hwnd, UINT uID, HICON hicon, LPSTR lpszTip)
+bool MyTaskBarAddIcon(HWND hwnd, UINT uID, HICON hicon, LPSTR lpszTip)
{
- BOOL res;
+ bool res;
NOTIFYICONDATA tnid;
tnid.cbSize = sizeof(NOTIFYICONDATA);
@@ -173,7 +173,7 @@
//this function creates and registers a windows class for our
//application. then it creates our window using that class--
-static BOOL WinInit( HANDLE hInstance, int nCmdShow)
+static bool WinInit( HANDLE hInstance, int nCmdShow)
{
WNDCLASS wc;
@@ -185,12 +185,12 @@
wc.cbWndExtra = 0;
wc.hInstance = (HINSTANCE) hInstance;
wc.hIcon = LoadIcon( (HINSTANCE) hInstance,
MAKEINTATOM(IDI_APPLICATION));
- wc.hCursor = LoadCursor( NULL, IDC_ARROW);
+ wc.hCursor = LoadCursor( 0, IDC_ARROW);
wc.hbrBackground= (HBRUSH) GetStockObject(BLACK_BRUSH);
- wc.lpszMenuName = NULL;
+ wc.lpszMenuName = 0;
wc.lpszClassName= "PaletteFixClass";
- if( !RegisterClass( &wc )) return FALSE;
+ if( !RegisterClass( &wc )) return false;
hWndApp = CreateWindowEx(
WS_EX_TOOLWINDOW,
@@ -201,10 +201,10 @@
0,
256, //GetSystemMetrics(SM_CXSCREEN),
256, //GetSystemMetrics(SM_CYSCREEN),
- NULL,
- NULL,
+ 0,
+ 0,
(HINSTANCE) hInstance,
- NULL );
+ 0 );
saveSystemPalette();
@@ -212,7 +212,7 @@
MyTaskBarAddIcon( hWndApp, IDI_ICON1, hTaskIcon, "Fixes The Palette" );
- return TRUE;
+ return true;
}
@@ -223,10 +223,10 @@
MSG message;
- if( WinInit( hInstance, nCmdShow) == FALSE) return FALSE;
+ if( WinInit( hInstance, nCmdShow) == false) return false;
- while(GetMessage( &message, NULL, 0, 0))
+ while(GetMessage( &message, 0, 0, 0))
{
TranslateMessage(&message);
Index: netpanzer/src/Setup/source/netPanzerSetup.cpp
diff -u netpanzer/src/Setup/source/netPanzerSetup.cpp:1.1
netpanzer/src/Setup/source/netPanzerSetup.cpp:1.2
--- netpanzer/src/Setup/source/netPanzerSetup.cpp:1.1 Sun Dec 1 12:52:09 2002
+++ netpanzer/src/Setup/source/netPanzerSetup.cpp Mon Sep 1 16:24:21 2003
@@ -25,7 +25,7 @@
#include <process.h>
#define LoadStrFromRes(uID,lpBuffer) \
-LoadString (GetModuleHandle(NULL),\
+LoadString (GetModuleHandle(0),\
(uID),\
(lpBuffer),\
sizeof((lpBuffer)));
@@ -39,7 +39,7 @@
static char SetupDirectory[MAX_PATH]; // where the user ran setup from
-BOOL FAR PASCAL warnDlgProc(HWND hDlg,DWORD dwMessage,DWORD wParam,DWORD
lParam);
+bool FAR PASCAL warnDlgProc(HWND hDlg,DWORD dwMessage,DWORD wParam,DWORD
lParam);
enum { _launch_netp_install_ok,
@@ -53,7 +53,7 @@
int ver_result;
int mb_result;
int exec_result;
- BOOL version_check_success;
+ bool version_check_success;
DWORD direct_x_version;
DWORD direct_x_revision;
@@ -62,7 +62,7 @@
char strBuf[512];
char ishield_path[MAX_PATH];
- version_check_success = FALSE;
+ version_check_success = false;
ver_result = DirectXSetupGetVersion( &direct_x_version, &direct_x_revision );
@@ -90,15 +90,15 @@
}
else
- { version_check_success = TRUE; }
+ { version_check_success = true; }
- if( version_check_success == FALSE )
+ if( version_check_success == false )
return( _launch_netp_install_directx_wrong_ver );
strcpy( ishield_path, SetupDirectory );
strcat( ishield_path, "\\netPDist\\setup.exe" );
- exec_result = execl( ishield_path, ishield_path, NULL );
+ exec_result = execl( ishield_path, ishield_path, 0 );
if( exec_result == -1 )
{
@@ -160,7 +160,7 @@
}
-BOOL FAR PASCAL warnDlgProc(HWND hDlg,DWORD dwMessage,DWORD wParam,DWORD
lParam)
+bool FAR PASCAL warnDlgProc(HWND hDlg,DWORD dwMessage,DWORD wParam,DWORD
lParam)
{
switch(dwMessage)
{
@@ -191,7 +191,7 @@
return 0;
}
-BOOL FAR PASCAL mainDlgProc(HWND hDlg,DWORD dwMessage,DWORD wParam,DWORD
lParam)
+bool FAR PASCAL mainDlgProc(HWND hDlg,DWORD dwMessage,DWORD wParam,DWORD
lParam)
{
switch(dwMessage)
{
@@ -250,7 +250,7 @@
}
*x = 0;
- DialogBox( hInstance, MAKEINTRESOURCE( IDD_MAIN_DIALOG ) , NULL,
(DLGPROC) mainDlgProc );
+ DialogBox( hInstance, MAKEINTRESOURCE( IDD_MAIN_DIALOG ) , 0,
(DLGPROC) mainDlgProc );
return 0;
} /* WinMain */
Index: netpanzer/src/UILib/SDL/SDLDraw.cpp
diff -u netpanzer/src/UILib/SDL/SDLDraw.cpp:1.1
netpanzer/src/UILib/SDL/SDLDraw.cpp:1.2
--- netpanzer/src/UILib/SDL/SDLDraw.cpp:1.1 Sun Aug 31 20:03:03 2003
+++ netpanzer/src/UILib/SDL/SDLDraw.cpp Mon Sep 1 16:24:22 2003
@@ -15,12 +15,9 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-#include "Stdafx.hpp"
-
#include "SDLDraw.hpp"
-BOOL SDLDraw::initialize()
+bool SDLDraw::initialize()
{
return true;
}
@@ -29,7 +26,7 @@
{
}
-BOOL SDLDraw::setVideoMode(DWORD width, DWORD height, DWORD bpp, BYTE
mode_flags)
+bool SDLDraw::setVideoMode(DWORD width, DWORD height, DWORD bpp, BYTE
mode_flags)
{
FrontBuffer = SDL_SetVideoMode(width, height, bpp, SDL_FULLSCREEN /*|
SDL_DOUBLEBUF | SDL_HWSURFACE*/);
if(FrontBuffer==NULL)
@@ -37,7 +34,7 @@
return TRUE;
}
-BOOL SDLDraw::isDisplayModeAvailable(int width, int height, int bpp)
+bool SDLDraw::isDisplayModeAvailable(int width, int height, int bpp)
{
if(SDL_VideoModeOK(width, height, bpp, 0 /*SDL_FULLSCREEN |
SDL_DOUBLEBUF | SDL_HWSURFACE*/))
return TRUE;
@@ -45,7 +42,7 @@
return FALSE;
}
-BOOL SDLDraw::lockDoubleBuffer(BYTE **DoubleBuffer)
+bool SDLDraw::lockDoubleBuffer(BYTE **DoubleBuffer)
{
if(SDL_LockSurface(FrontBuffer)<0)
return FALSE;
@@ -55,18 +52,18 @@
return TRUE;
}
-BOOL SDLDraw::unlockDoubleBuffer()
+bool SDLDraw::unlockDoubleBuffer()
{
SDL_LockSurface(FrontBuffer);
return TRUE;
}
-BOOL SDLDraw::createFrameBuffer(DWORD width, DWORD height, DWORD bpp)
+bool SDLDraw::createFrameBuffer(DWORD width, DWORD height, DWORD bpp)
{
return TRUE;
}
-void SDLDraw::setGDIStatus(BOOL enable)
+void SDLDraw::setGDIStatus(bool enable)
{
}
@@ -74,7 +71,7 @@
{
}
-BOOL SDLDraw::copyDoubleBufferandFlip()
+bool SDLDraw::copyDoubleBufferandFlip()
{
if(SDL_Flip(FrontBuffer)==0)
return TRUE;
Index: netpanzer/src/UILib/SDL/SDLDraw.hpp
diff -u netpanzer/src/UILib/SDL/SDLDraw.hpp:1.1
netpanzer/src/UILib/SDL/SDLDraw.hpp:1.2
--- netpanzer/src/UILib/SDL/SDLDraw.hpp:1.1 Sun Aug 31 20:03:03 2003
+++ netpanzer/src/UILib/SDL/SDLDraw.hpp Mon Sep 1 16:24:22 2003
@@ -19,7 +19,6 @@
#ifndef __SDLDraw_hpp__
#define __SDLDraw_hpp__
-#include "Stdafx.hpp"
#include "RGBColor.hpp"
#include "UIDraw.hpp"
@@ -32,16 +31,16 @@
SDL_Surface *FrontBuffer;
public:
- BOOL initialize();
+ bool initialize();
void shutdown();
- BOOL setVideoMode(DWORD width, DWORD height, DWORD bpp, BYTE mode_flags);
- BOOL isDisplayModeAvailable(int width, int height, int bpp);
- BOOL lockDoubleBuffer(BYTE **DoubleBuffer);
- BOOL unlockDoubleBuffer();
- BOOL createFrameBuffer(DWORD width, DWORD height, DWORD bpp);
- void setGDIStatus(BOOL enable);
+ bool setVideoMode(DWORD width, DWORD height, DWORD bpp, BYTE mode_flags);
+ bool isDisplayModeAvailable(int width, int height, int bpp);
+ bool lockDoubleBuffer(BYTE **DoubleBuffer);
+ bool unlockDoubleBuffer();
+ bool createFrameBuffer(DWORD width, DWORD height, DWORD bpp);
+ void setGDIStatus(bool enable);
void restoreAll();
- BOOL copyDoubleBufferandFlip();
+ bool copyDoubleBufferandFlip();
void setPalette(RGBColor *color);
}; // end DirectDraw
Index: netpanzer/src/UILib/UIDraw.cpp
diff -u netpanzer/src/UILib/UIDraw.cpp:1.1 netpanzer/src/UILib/UIDraw.cpp:1.2
--- netpanzer/src/UILib/UIDraw.cpp:1.1 Sun Aug 31 20:03:03 2003
+++ netpanzer/src/UILib/UIDraw.cpp Mon Sep 1 16:24:22 2003
@@ -15,12 +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
*/
-
-#include "stdafx.hpp"
#include "DirectDraw.hpp"
+#include "DirectDrawGlobals.hpp"
+
#include "UIDraw.hpp"
-#include "SDLDraw.hpp"
+//#include "SDL/SDLDraw.hpp"
//UIDraw *Screen = new SDLDraw();
-UIDraw *Screen = new DirectDraw();
+//UIDraw *Screen = new DirectDraw();
+// XXX temporary hack because not everything was converted to use Screen
+UIDraw* Screen = &DDraw;
Index: netpanzer/src/UILib/UIDraw.hpp
diff -u netpanzer/src/UILib/UIDraw.hpp:1.1 netpanzer/src/UILib/UIDraw.hpp:1.2
--- netpanzer/src/UILib/UIDraw.hpp:1.1 Sun Aug 31 20:03:03 2003
+++ netpanzer/src/UILib/UIDraw.hpp Mon Sep 1 16:24:22 2003
@@ -19,7 +19,6 @@
#ifndef __UIDraw_hpp__
#define __UIDraw_hpp__
-#include "Stdafx.hpp"
#include "RGBColor.hpp"
// DirectDraw class declarations
@@ -27,16 +26,16 @@
class UIDraw
{
public:
- virtual BOOL initialize() = 0;
+ virtual bool initialize() = 0;
virtual void shutdown() = 0;
- virtual BOOL setVideoMode(DWORD width, DWORD height, DWORD bpp, BYTE
mode_flags) = 0;
- virtual BOOL isDisplayModeAvailable(int width, int height, int bpp) = 0;
- virtual BOOL lockDoubleBuffer(BYTE **DoubleBuffer) = 0;
- virtual BOOL unlockDoubleBuffer() = 0;
- virtual BOOL createFrameBuffer(DWORD width, DWORD height, DWORD bpp) = 0;
- virtual void setGDIStatus(BOOL enable) = 0;
+ virtual bool setVideoMode(DWORD width, DWORD height, DWORD bpp, BYTE
mode_flags) = 0;
+ virtual bool isDisplayModeAvailable(int width, int height, int bpp) = 0;
+ virtual bool lockDoubleBuffer(BYTE **DoubleBuffer) = 0;
+ virtual bool unlockDoubleBuffer() = 0;
+ virtual bool createFrameBuffer(DWORD width, DWORD height, DWORD bpp) = 0;
+ virtual void setGDIStatus(bool enable) = 0;
virtual void restoreAll()=0;
- virtual BOOL copyDoubleBufferandFlip()=0;
+ virtual bool copyDoubleBufferandFlip()=0;
virtual void setPalette(RGBColor *color)=0;
}; // end DirectDraw
Index: netpanzer/src/Win32/Win32Console.cpp
diff -u netpanzer/src/Win32/Win32Console.cpp:1.1
netpanzer/src/Win32/Win32Console.cpp:1.2
--- netpanzer/src/Win32/Win32Console.cpp:1.1 Sun Dec 1 12:52:09 2002
+++ netpanzer/src/Win32/Win32Console.cpp Mon Sep 1 16:24:22 2003
@@ -15,11 +15,12 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
-
#include <stdarg.h>
#include <stdio.h>
#include <string.h>
+#include <windows.h>
+#include "Win32Console.hpp"
+
void Win32ConsolePrint( const char *string )
{
@@ -33,6 +34,6 @@
string,
strlen( string ),
&bytes_written,
- NULL
+ 0
);
}
Index: netpanzer/src/Win32/Win32Console.hpp
diff -u netpanzer/src/Win32/Win32Console.hpp:1.1
netpanzer/src/Win32/Win32Console.hpp:1.2
--- netpanzer/src/Win32/Win32Console.hpp:1.1 Sun Dec 1 12:52:09 2002
+++ netpanzer/src/Win32/Win32Console.hpp Mon Sep 1 16:24:22 2003
@@ -18,10 +18,6 @@
#ifndef _WIN32CONSOLE_HPP
#define _WIN32CONSOLE_HPP
-#include <windows.h>
-
void Win32ConsolePrint( const char *string );
-
-
#endif // ** _WIN32CONSOLE_HPP
Index: netpanzer/src/Win32/Win32Mouse.cpp
diff -u netpanzer/src/Win32/Win32Mouse.cpp:1.1
netpanzer/src/Win32/Win32Mouse.cpp:1.2
--- netpanzer/src/Win32/Win32Mouse.cpp:1.1 Sun Dec 1 12:52:09 2002
+++ netpanzer/src/Win32/Win32Mouse.cpp Mon Sep 1 16:24:22 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "Win32Mouse.hpp"
#include "gapp.hpp"
@@ -45,10 +44,10 @@
void Win32HideHardwareMouse( void )
{
- while( ShowCursor( FALSE ) > 0 );
+ while( ShowCursor( false ) > 0 );
}
void Win32ShowHardwareMouse( void )
{
- while( ShowCursor( TRUE ) <= 0 );
+ while( ShowCursor( true ) <= 0 );
}
Index: netpanzer/src/Win32/WinTimer.cpp
diff -u netpanzer/src/Win32/WinTimer.cpp:1.1
netpanzer/src/Win32/WinTimer.cpp:1.2
--- netpanzer/src/Win32/WinTimer.cpp:1.1 Sun Dec 1 12:52:09 2002
+++ netpanzer/src/Win32/WinTimer.cpp Mon Sep 1 16:24:22 2003
@@ -15,9 +15,10 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "WinTimer.hpp"
+#include "codewiz.hpp"
+
unsigned long WinTimer::MMTimerDelay;
unsigned long WinTimer::MMTimerResolution;
@@ -40,10 +41,10 @@
#pragma optimize( "", off )
#endif
-BOOL WinTimer::DetectRDTSC( void )
+bool WinTimer::DetectRDTSC( void )
{
-
- volatile BOOL retval = TRUE;
+#ifdef MSVC
+ volatile bool retval = true;
volatile DWORD RegEDX;
__try {
@@ -61,7 +62,7 @@
if (retval == 0)
{
- return FALSE; // processor does not support CPUID
+ return false; // processor does not support CPUID
}
if (RegEDX & 0x10 ) // bit 4 is set for RDTSC technology
@@ -71,18 +72,22 @@
_emit 31h
}
}
- __except(EXCEPTION_EXECUTE_HANDLER) { retval = FALSE; }
+ __except(EXCEPTION_EXECUTE_HANDLER) { retval = false; }
return retval;
}
else
{
- return FALSE; // processor supports CPUID but does not
support RDTSC technology
+ return false; // processor supports CPUID but does not
support RDTSC technology
}
return retval;
-
+#else
+ // XXX
+ printf ("No RTDSC for gcc...(What is this anyway?)\n");
+ return false;
+#endif
}
#if _MSC_VER > 1000
@@ -90,26 +95,26 @@
#endif
-BOOL WinTimer::SetupHighResTimer( void )
+bool WinTimer::SetupHighResTimer( void )
{
- BOOL result;
+ bool result;
LARGE_INTEGER frequency;
result = QueryPerformanceFrequency( &frequency );
- if ( result == FALSE )
- return ( FALSE );
+ if ( result == false )
+ return ( false );
TimerFrequency = ( double ) frequency.QuadPart;
TimerResolution = 1;
TimerType = _hires_timer;
- return ( TRUE );
+ return ( true );
}
-BOOL WinTimer::SetupMMTimer( void )
+bool WinTimer::SetupMMTimer( void )
{
MMRESULT result;
TIMECAPS TimeCap;
@@ -118,7 +123,7 @@
assert( result == TIMERR_NOERROR );
if ( result != TIMERR_NOERROR )
- return ( FALSE );
+ return ( false );
MMTimerResolution = MIN( MAX (DWORD(TimeCap.wPeriodMin),
DWORD(MMTimerTargerRes) ), DWORD(TimeCap.wPeriodMax));
TimerResolution = MMTimerResolution;
@@ -129,41 +134,41 @@
MMTimerID = timeSetEvent( MMTimerDelay, MMTimerResolution, MMClock, 0,
TIME_PERIODIC ); // single timer event
- assert( MMTimerID != NULL );
- if ( MMTimerID == NULL )
- return ( FALSE );
+ assert( MMTimerID != 0 );
+ if ( MMTimerID == 0 )
+ return ( false );
TimerFrequency = _MMTIMER_FREQUENCY / MMTimerDelay;
- return( TRUE );
+ return( true );
}
-BOOL WinTimer::SetupRDTSC( void )
+bool WinTimer::SetupRDTSC( void )
{
//TimerFrequency = ( double ) 1000000.0;
TimerFrequency = ( double ) 2500.0;
TimerResolution = 1;
TimerType = _TSC_timer;
- return( TRUE );
+ return( true );
}
-BOOL WinTimer::Initialize( void )
+bool WinTimer::Initialize( void )
{
MMTimerTargerRes = 2;
MMTimerTargetDelay = 10;
- if ( DetectRDTSC() == TRUE )
+ if ( DetectRDTSC() == true )
{
return( SetupRDTSC() );
}
else
- if ( SetupHighResTimer( ) == FALSE )
+ if ( SetupHighResTimer( ) == false )
{ return ( SetupMMTimer() ); }
- return ( TRUE );
+ return ( true );
}
void WinTimer::ShutDown( void )
@@ -176,6 +181,7 @@
}
+#ifdef MSVC
__declspec( naked ) long double WinTimer::RDTSC()
{ _asm {
_emit 0fh
@@ -188,3 +194,4 @@
ret
}
}
+#endif
Index: netpanzer/src/Win32/WinTimer.hpp
diff -u netpanzer/src/Win32/WinTimer.hpp:1.1
netpanzer/src/Win32/WinTimer.hpp:1.2
--- netpanzer/src/Win32/WinTimer.hpp:1.1 Sun Dec 1 12:52:09 2002
+++ netpanzer/src/Win32/WinTimer.hpp Mon Sep 1 16:24:22 2003
@@ -46,36 +46,40 @@
protected:
- BOOL DetectRDTSC( void );
- BOOL SetupRDTSC( void );
- BOOL SetupHighResTimer( void );
- BOOL SetupMMTimer( void );
+ bool DetectRDTSC( void );
+ bool SetupRDTSC( void );
+ bool SetupHighResTimer( void );
+ bool SetupMMTimer( void );
public:
- BOOL Initialize( void );
+ bool Initialize( void );
void ShutDown( void );
inline static double GetClock( void )
- {
- LARGE_INTEGER counter;
-
- if ( TimerType == _TSC_timer )
- {
- return( RDTSC() );
- }
- else
- if ( TimerType == _hires_timer )
+ {
+ LARGE_INTEGER counter;
+
+#ifdef MSVC
+ if ( TimerType == _TSC_timer )
+ {
+ return( RDTSC() );
+ }
+ else
+#endif
+ if ( TimerType == _hires_timer )
{
- QueryPerformanceCounter( &counter );
- return ( ( double ) counter.QuadPart );
+ QueryPerformanceCounter( &counter );
+ return ( ( double ) counter.QuadPart );
}
- else
- return ( MasterClock );
- }
+ else
+ return ( MasterClock );
+ }
+#ifdef MSVC
//static inline __declspec( naked ) long double RDTSC()
static long double RDTSC();
+#endif
};
Index: netpanzer/src/Win32/Winsock/WinSockClientList.cpp
diff -u netpanzer/src/Win32/Winsock/WinSockClientList.cpp:1.1
netpanzer/src/Win32/Winsock/WinSockClientList.cpp:1.2
--- netpanzer/src/Win32/Winsock/WinSockClientList.cpp:1.1 Sun Dec 1
12:52:09 2002
+++ netpanzer/src/Win32/Winsock/WinSockClientList.cpp Mon Sep 1 16:24:22 2003
@@ -22,7 +22,7 @@
//GLOBALS///////////////////////////////////
-static LPCLIENTLIST lpHead = NULL;
+static LPCLIENTLIST lpHead = 0;
static void FreeClient(LPCLIENTLIST lpClient);
DWORD WSClientID = 1;
@@ -32,8 +32,8 @@
LPSOCKADDR lpnewSockAddr,
int iAddrLen)
{
- LPCLIENTLIST lpClient = NULL;
- LPCLIENTLIST lpThis = NULL;
+ LPCLIENTLIST lpClient = 0;
+ LPCLIENTLIST lpThis = 0;
int iReturn;
@@ -41,19 +41,19 @@
//client structure--
lpThis = (LPCLIENTLIST)malloc(sizeof(CLIENTLIST));
- if(lpThis == NULL) return NULL;
+ if(lpThis == 0) return 0;
//allocate memory for a sockaddr
lpThis -> lpstreamSockAddr = (LPSOCKADDR)malloc(iAddrLen);
- if(lpThis -> lpstreamSockAddr == NULL)
+ if(lpThis -> lpstreamSockAddr == 0)
{
free(lpThis);
- return(NULL);
+ return(0);
}
//if the list is empty--
- if(lpHead == NULL)
+ if(lpHead == 0)
{
//put this one at the head
lpHead = lpThis;
@@ -78,13 +78,13 @@
memcpy(lpThis -> lpstreamSockAddr, lpnewSockAddr, iAddrLen);
//set the parsing variables--
- lpThis -> bHeaderIncomplete = FALSE;
- lpThis -> bMessageIncomplete = FALSE;
+ lpThis -> bHeaderIncomplete = false;
+ lpThis -> bMessageIncomplete = false;
lpThis -> TempOffset = 0;
lpThis -> winsockID = WSClientID;
- lpThis -> lpNext = NULL;
- lpThis -> bUDPEnabled = FALSE;
+ lpThis -> lpNext = 0;
+ lpThis -> bUDPEnabled = false;
//TODO: catch case when value wraps around (only
@@ -113,21 +113,21 @@
//check to see if i've already got this address,
//if so don't need to go any further--
- if(lpClient->bUDPEnabled == TRUE) return -1;
+ if(lpClient->bUDPEnabled == true) return -1;
//create memory for our address--
//allocate memory for a sockaddr
lpClient -> lpdgramSockAddr = (LPSOCKADDR)malloc(ilength);
- if(lpClient -> lpdgramSockAddr == NULL)
+ if(lpClient -> lpdgramSockAddr == 0)
{
closesocket(lpClient -> clientdgramSocket);
- lpClient->bUDPEnabled = FALSE;
+ lpClient->bUDPEnabled = false;
return 0;
}
//copy our udp address into the client list's udp address--
memcpy(lpClient -> lpdgramSockAddr, lpUDPAddr, ilength);
- lpClient->bUDPEnabled = TRUE;
+ lpClient->bUDPEnabled = true;
return 1;
@@ -147,14 +147,14 @@
//the correct socket for use with this id--
lpClient = lpHead;
- while(lpClient != NULL)
+ while(lpClient != 0)
{
if(lpClient -> winsockID == wsID) return(lpClient);
lpClient = lpClient -> lpNext;
}
- return NULL; //if null gets returned, vlad needs
+ return 0; //if null gets returned, vlad needs
//to receive a WS_PLAYER_NOT_FOUND
}
@@ -174,14 +174,14 @@
//the correct socket for use with this id--
lpClient = lpHead;
- while(lpClient != NULL)
+ while(lpClient != 0)
{
if(lpClient -> clientstreamSocket == socket) return(lpClient);
lpClient = lpClient -> lpNext;
}
- return NULL;
+ return 0;
}
//END GetClientFromSocket//////////////
@@ -194,7 +194,7 @@
void DelClient(LPCLIENTLIST lpThis)
{
LPCLIENTLIST lpClient;
- BOOL bReturn = FALSE;
+ bool bReturn = false;
//search for the correct client (lpThis)--
if(lpThis == lpHead)
@@ -258,7 +258,7 @@
lpClient = lpNext;
}
- lpHead = NULL;
+ lpHead = 0;
}
//END GetNextClient////////////////////
///////////////////////////////////////
@@ -277,10 +277,10 @@
void DelClientByWinsockID(DWORD wsID)
{
- LPCLIENTLIST lpClient = NULL;
+ LPCLIENTLIST lpClient = 0;
lpClient = GetClientFromID(wsID);
- if( lpClient != NULL )
+ if( lpClient != 0 )
{
closesocket(lpClient->clientstreamSocket);
closesocket(lpClient -> clientdgramSocket);
Index: netpanzer/src/Win32/Winsock/WinSockClientList.h
diff -u netpanzer/src/Win32/Winsock/WinSockClientList.h:1.1
netpanzer/src/Win32/Winsock/WinSockClientList.h:1.2
--- netpanzer/src/Win32/Winsock/WinSockClientList.h:1.1 Sun Dec 1 12:52:09 2002
+++ netpanzer/src/Win32/Winsock/WinSockClientList.h Mon Sep 1 16:24:22 2003
@@ -37,9 +37,9 @@
char TempBuffer[512];
- BOOL bHeaderIncomplete;
- BOOL bMessageIncomplete;
- BOOL bUDPEnabled;
+ bool bHeaderIncomplete;
+ bool bMessageIncomplete;
+ bool bUDPEnabled;
short TempOffset;
DWORD winsockID;
@@ -53,7 +53,7 @@
LPCLIENTLIST AddClient(SOCKET newsocket,
LPSOCKADDR lpnewSockAddr,
int iAddrLen);
-BOOL AddClientUDPAddr(DWORD wsID,
+int AddClientUDPAddr(DWORD wsID,
LPSOCKADDR lpUDPSockAddr,
int ilength);
LPCLIENTLIST GetClientFromID(DWORD wsID);
@@ -64,4 +64,4 @@
void DelClientByWinsockID(DWORD wsID);
void DelAllClients(void);
-#endif _WINSOCKCLIENTLIST_H
+#endif // _WINSOCKCLIENTLIST_H
Index: netpanzer/src/Win32/Winsock/WinSockMessage.hpp
diff -u netpanzer/src/Win32/Winsock/WinSockMessage.hpp:1.1
netpanzer/src/Win32/Winsock/WinSockMessage.hpp:1.2
--- netpanzer/src/Win32/Winsock/WinSockMessage.hpp:1.1 Sun Dec 1 12:52:09 2002
+++ netpanzer/src/Win32/Winsock/WinSockMessage.hpp Mon Sep 1 16:24:22 2003
@@ -31,7 +31,9 @@
};
+#ifdef MSVC
#pragma pack(1)
+#endif
class BasicInfoRequest : public NetMessage
{
@@ -44,7 +46,7 @@
message_id = _net_message_id_basic_info_request;
}
-};
+} __attribute__((packed));
class ExtendedInfoRequest : public NetMessage
@@ -58,7 +60,7 @@
message_id = _net_message_id_extended_game_info;
}
-};
+} __attribute__((packed));
class UDPAddressRequest : public NetMessage
@@ -72,7 +74,7 @@
message_id = _net_message_id_udp_request;
}
-};
+} __attribute__((packed));
class ClientUDPAddress : public NetMessage
@@ -86,7 +88,7 @@
message_id = _net_message_id_client_udp_address;
}
-};
+} __attribute__((packed));
class BasicGameInfo : public NetMessage
@@ -106,7 +108,7 @@
message_id = _net_message_id_basic_game_info;
}
-};
+} __attribute__((packed));
class ExtendedGameInfo : public NetMessage
@@ -120,11 +122,10 @@
//TBD
+} __attribute__((packed));
-};
-
-
+#ifdef MSVC
#pragma pack()
+#endif
-
-#endif __WINSOCKMESSAGE_HPP
+#endif // __WINSOCKMESSAGE_HPP
Index: netpanzer/src/Win32/Winsock/WinsockClient.cpp
diff -u netpanzer/src/Win32/Winsock/WinsockClient.cpp:1.1
netpanzer/src/Win32/Winsock/WinsockClient.cpp:1.2
--- netpanzer/src/Win32/Winsock/WinsockClient.cpp:1.1 Sun Dec 1 12:52:09 2002
+++ netpanzer/src/Win32/Winsock/WinsockClient.cpp Mon Sep 1 16:24:22 2003
@@ -49,8 +49,8 @@
SOCKET BroadcastSocket;
-BOOL bHeaderIncomplete;
-BOOL bMessageIncomplete;
+bool bHeaderIncomplete;
+bool bMessageIncomplete;
short TempOffset;
extern short RecvOffset;
@@ -64,9 +64,9 @@
//for asynch host stuff
HANDLE hndlTask;
char bufHostEnt[MAXGETHOSTSTRUCT];
-LPHOSTENT lpHostEnt = NULL;
-BOOL hostFound = FALSE;
-BOOL netPanzerFound = FALSE;
+LPHOSTENT lpHostEnt = 0;
+bool hostFound = false;
+bool netPanzerFound = false;
extern int gSendReady;
@@ -75,7 +75,7 @@
//this function initializes a winsock dgramserver.
//returns false if fails.
-BOOL InitDgramClient(HWND hWnd)
+bool InitDgramClient(HWND hWnd)
{
int iReturn;
@@ -99,7 +99,7 @@
MB_OK);
WSACleanup();
- return FALSE;
+ return false;
}
@@ -120,7 +120,7 @@
closesocket(DatagramSocket);
WSACleanup();
- return FALSE;
+ return false;
}
@@ -148,11 +148,11 @@
closesocket(DatagramSocket);
WSACleanup();
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
////////////////////////////////////////////
@@ -162,7 +162,7 @@
//this function initializes a winsock broadcast socket.
//returns false if fails.
-BOOL InitBroadcastSocket(HWND hWnd)
+bool InitBroadcastSocket(HWND hWnd)
{
SOCKADDR_IN broadcastSockAddr;
@@ -191,7 +191,7 @@
MB_OK);
WSACleanup();
- return FALSE;
+ return false;
}
//set the socket options so that the socket can
@@ -215,7 +215,7 @@
closesocket(BroadcastSocket);
WSACleanup();
- return FALSE;
+ return false;
}
@@ -243,11 +243,11 @@
closesocket(BroadcastSocket);
WSACleanup();
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
////////////////////////////////////////////
@@ -258,11 +258,11 @@
//this function initializes a winsock client and sets up the
//sockets, if it fails it puts up a messagebox indicating why
//and then returns false.
-BOOL InitStreamClient(HWND hWnd)
+bool InitStreamClient(HWND hWnd)
{
SOCKADDR_IN serverSocketAddr;
- if (netPanzerFound == FALSE) return FALSE;
+ if (netPanzerFound == false) return false;
WORD wVersionRequested = MAKEWORD(1,1);
@@ -290,7 +290,7 @@
MB_OK);
WSACleanup();
- return FALSE;
+ return false;
}
@@ -314,7 +314,7 @@
closesocket(StreamSocket);
WSACleanup();
- return FALSE;
+ return false;
}
@@ -333,7 +333,7 @@
if (iReturn == SOCKET_ERROR)
{
closesocket(StreamSocket);
- return FALSE;
+ return false;
}
@@ -362,12 +362,12 @@
closesocket(StreamSocket);
WSACleanup();
- return FALSE;
+ return false;
}
}
- return TRUE;
+ return true;
}
////////////////////////////////////////////
@@ -384,9 +384,9 @@
struct in_addr iaHost;
// make sure host entry pointer is null
- lpHostEnt = NULL;
- hostFound = FALSE;
- netPanzerFound = FALSE;
+ lpHostEnt = 0;
+ hostFound = false;
+ netPanzerFound = false;
//TODO:make this function deal with MULTIHOMED host
@@ -559,7 +559,7 @@
//host found let's assign the pointer to the host entry
//to the info filled in by the async host routine--
lpHostEnt = (LPHOSTENT)bufHostEnt;
- hostFound = TRUE;
+ hostFound = true;
//TODO:get error stuff in here.
QueryServer();
@@ -571,7 +571,7 @@
//END HandleGetHostMsg//////////////////////
-BOOL QueryServer()
+bool QueryServer()
{
//SOCKADDR_IN saServer;
@@ -579,7 +579,7 @@
int iBytesSent, iError;
- if (hostFound == FALSE) return FALSE;
+ if (hostFound == false) return false;
//check to see if the netpanzer server is active on the host--
saServer.sin_family = AF_INET;
@@ -604,18 +604,18 @@
if (iError == WSAEWOULDBLOCK)
{
- return TRUE;
+ return true;
}
else
{
LOG( ("QueryServer : sendTo - Error %d", iError) );
- return FALSE;
+ return false;
}
}
- if (iBytesSent > 0) return TRUE;
- else return FALSE;
+ if (iBytesSent > 0) return true;
+ else return false;
}
////////////////////////////////////////////
@@ -863,7 +863,7 @@
RecvOffset += (Size - 1);
iBytesReceived -= (Size - 1);
- bHeaderIncomplete = FALSE;
+ bHeaderIncomplete = false;
TempOffset = 0;
}
@@ -882,7 +882,7 @@
//it may be received as.
TempOffset += (iBytesReceived - 1);
- bMessageIncomplete = TRUE;
+ bMessageIncomplete = true;
//MissingBytes = Size - (iBytesReceived - 1);
//The ammount of bytes we are missing is
@@ -921,7 +921,7 @@
RecvOffset += MissingBytes;
iBytesReceived -= MissingBytes;
MissingBytes = 0;
- bMessageIncomplete = FALSE;
+ bMessageIncomplete = false;
}
else
@@ -949,7 +949,7 @@
memcpy(TempBuffer, RecvBuffer + RecvOffset, 1);
TempOffset++;
iBytesReceived = 0;
- bHeaderIncomplete = TRUE;
+ bHeaderIncomplete = true;
}
else
if (iBytesReceived >= 2)
@@ -995,7 +995,7 @@
//copy bytes to tempbuffer
memcpy(TempBuffer, RecvBuffer + RecvOffset,
iBytesReceived);
TempOffset += iBytesReceived;
- bMessageIncomplete = TRUE;
+ bMessageIncomplete = true;
MissingBytes = Size - iBytesReceived;
iBytesReceived = 0;
}
@@ -1067,7 +1067,7 @@
strcpy((char*)GAMEINFOCLIENT.PlayerName,
basicGameInfo->PlayerName);
serverTimeout.reset();
- netPanzerFound = TRUE;
+ netPanzerFound = true;
//TODO: add in extended game info
@@ -1126,7 +1126,7 @@
// Have we already deleted this entry?
//
lpReq = GetRequest(socket);
- if (lpReq == NULL)
+ if (lpReq == 0)
return;
//
@@ -1172,7 +1172,7 @@
count = 0;
while (count < 3)
{
- if (udpTimeout.count() == TRUE)
+ if (udpTimeout.count() == true)
{
iBytesSent = sendto(DatagramSocket,
(char *)&clientudpAddr,
@@ -1193,7 +1193,7 @@
//this function is supposed to shutdown winsock. it closes
//the remote sockets, closes the send socket, then closes the
//listen socket.
-BOOL ShutdownWinSockClient()
+bool ShutdownWinSockClient()
{
int iReturn;
@@ -1234,7 +1234,7 @@
}
- return TRUE;
+ return true;
}
////////////////////////////////////////////
@@ -1377,9 +1377,9 @@
while ( gSendReady == 0)
{
- if ( PeekMessage( &message, NULL, 0, 0, PM_NOREMOVE ) )
+ if ( PeekMessage( &message, 0, 0, 0, PM_NOREMOVE ) )
{
- if (GetMessage( &message, NULL, 0, 0))
+ if (GetMessage( &message, 0, 0, 0))
{
//TranslateMessage(&message);
DispatchMessage(&message);
@@ -1484,30 +1484,30 @@
-BOOL GetHostInfo( char *host_name_str, char *map_name, char *game_type, int
*current_players, int *max_players )
+bool GetHostInfo( char *host_name_str, char *map_name, char *game_type, int
*current_players, int *max_players )
{
- if (serverTimeout.count() == TRUE) netPanzerFound = FALSE;
+ if (serverTimeout.count() == true) netPanzerFound = false;
- if ( (lpHostEnt != NULL) && (netPanzerFound == TRUE) )
+ if ( (lpHostEnt != 0) && (netPanzerFound == true) )
{
- if( host_name_str != NULL )
+ if( host_name_str != 0 )
{ strcpy( host_name_str, (char*) GAMEINFOCLIENT.PlayerName ); }
- if( map_name != NULL )
+ if( map_name != 0 )
{ strcpy( map_name, (char*) GAMEINFOCLIENT.MapName ); }
- if( game_type != NULL )
+ if( game_type != 0 )
{ strcpy( game_type, (char*) GAMEINFOCLIENT.GameType ); }
- if( current_players != NULL )
+ if( current_players != 0 )
{ *current_players = GAMEINFOCLIENT.CurrPlayers; }
- if( max_players != NULL )
+ if( max_players != 0 )
{ *max_players = GAMEINFOCLIENT.MaxPlayers; }
- return( _TRUE );
+ return( true );
}
- return( _FALSE );
+ return( false );
}
Index: netpanzer/src/Win32/Winsock/WinsockClient.h
diff -u netpanzer/src/Win32/Winsock/WinsockClient.h:1.1
netpanzer/src/Win32/Winsock/WinsockClient.h:1.2
--- netpanzer/src/Win32/Winsock/WinsockClient.h:1.1 Sun Dec 1 12:52:09 2002
+++ netpanzer/src/Win32/Winsock/WinsockClient.h Mon Sep 1 16:24:22 2003
@@ -21,8 +21,8 @@
#include <windows.h>
-BOOL InitStreamClient(HWND hWnd);
-BOOL InitDgramClient(HWND hWnd);
+bool InitStreamClient(HWND hWnd);
+bool InitDgramClient(HWND hWnd);
int AsyncGetHost(HWND hWnd, LPSTR lpszServer);
@@ -40,13 +40,13 @@
void SendUDPAddress(DWORD wsID);
-BOOL QueryServer();
+bool QueryServer();
-BOOL ShutdownWinSockClient();
+bool ShutdownWinSockClient();
//hack to imitiate enumeration
-BOOL GetHostInfo( char *host_name_str, char *map_name, char *game_type, int
*current_players, int *max_players );
+bool GetHostInfo( char *host_name_str, char *map_name, char *game_type, int
*current_players, int *max_players );
int WSClientToServer(char guarantee, char *bData, DWORD dwDataSize);
Index: netpanzer/src/Win32/Winsock/WinsockServer.cpp
diff -u netpanzer/src/Win32/Winsock/WinsockServer.cpp:1.1
netpanzer/src/Win32/Winsock/WinsockServer.cpp:1.2
--- netpanzer/src/Win32/Winsock/WinsockServer.cpp:1.1 Sun Dec 1 12:52:09 2002
+++ netpanzer/src/Win32/Winsock/WinsockServer.cpp Mon Sep 1 16:24:22 2003
@@ -43,8 +43,8 @@
SOCKET dgramSocket;
SOCKET prevRecvSocket = -999;
-//BOOL bHeaderIncomplete = FALSE;
-//BOOL bMessageIncomplete = FALSE;
+//bool bHeaderIncomplete = false;
+//bool bMessageIncomplete = false;
//short TempOffset = 0;
short RecvOffset = 0;
@@ -60,8 +60,8 @@
typedef
struct
{
- BOOL bHeaderIncomplete;
- BOOL bMessageIncomplete;
+ bool bHeaderIncomplete;
+ bool bMessageIncomplete;
short TempOffset;
short RecvOffset;
SOCKET prevPrevRecvSocket;
@@ -74,7 +74,7 @@
//FUNCTIONS////////////////////////////////////////////////
//initialize winsock--
-BOOL InitWinSock(HWND hWnd)
+bool InitWinSock(HWND hWnd)
{
WSADATA wsaData;
WORD wVersionRequested = MAKEWORD(1,1);
@@ -93,10 +93,10 @@
MB_OK);
WSACleanup();
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
//END InitWinSock//////////////////////
///////////////////////////////////////
@@ -104,7 +104,7 @@
//this function initializes a winsock dgramserver.
//returns false.
-BOOL InitDGramServer(HWND hWnd)
+bool InitDGramServer(HWND hWnd)
{
SOCKADDR_IN dgramSocketAddr;
@@ -131,7 +131,7 @@
MB_OK);
WSACleanup();
- return FALSE;
+ return false;
}
@@ -152,7 +152,7 @@
closesocket(dgramSocket);
WSACleanup();
- return FALSE;
+ return false;
}
@@ -180,11 +180,11 @@
closesocket(dgramSocket);
WSACleanup();
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
////////////////////////////////////////////
@@ -196,7 +196,7 @@
//sockets, which are separate for netPanzer. if
//it fails it puts up a messagebox indicating why and then
//returns false.
-BOOL InitStreamServer(HWND hWnd)
+bool InitStreamServer(HWND hWnd)
{
SOCKADDR_IN listenSocketAddr;
@@ -223,7 +223,7 @@
MB_OK);
WSACleanup();
- return FALSE;
+ return false;
}
@@ -247,7 +247,7 @@
closesocket(listenSocket);
WSACleanup();
- return FALSE;
+ return false;
}
@@ -275,7 +275,7 @@
closesocket(listenSocket);
WSACleanup();
- return FALSE;
+ return false;
}
@@ -284,7 +284,7 @@
// if (iReturn == SOCKET_ERROR)
// {
// closesocket(listenSocket);
- // return FALSE;
+ // return false;
// }
@@ -303,11 +303,11 @@
closesocket(listenSocket);
WSACleanup();
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
////////////////////////////////////////////
@@ -436,7 +436,7 @@
lpClient = AddClient(clientSocket,
(LPSOCKADDR)&clientSocketAddr,
iLength);
- if (lpClient == NULL)
+ if (lpClient == 0)
{
//TODO: should log this--
LOG( ( "OnAcceptServer : Error AddClient(...)", iReturn) );
@@ -487,9 +487,9 @@
//static char TempBuffer[512]; //largest netp message size
//local parsing variables--
- char *TempBuffer = NULL;
+ char *TempBuffer = 0;
- BOOL bReturn;
+ bool bReturn;
int iBytesReceived, Error;
short Size;
@@ -505,10 +505,10 @@
lpClient = GetClientFromSocket(socket);
- //if the client is NULL, can't do much here,
+ //if the client is 0, can't do much here,
//if it works alias the TempBuffer because it
//doesn't change (no reason to dereference a million times)--
- if (lpClient == NULL) return;
+ if (lpClient == 0) return;
else TempBuffer = lpClient -> TempBuffer;
@@ -560,7 +560,7 @@
//my own list--
LOG( ("OnReadStreamServer : Error %d - WSANOTINITIALISED,
WSAEINTR, WSAEOPNOTSUPP, WSAEACCES", Error ) );
- if (lpClient != NULL)
+ if (lpClient != 0)
{
PostMessage(gapp.hwndApp, SM_REMOVECLIENT, (WPARAM) Error,
lpClient->winsockID );
@@ -585,7 +585,7 @@
//my own list--
LOG( ("OnReadStreamServer : Error %d - WSAENOTCONN, WSAENOTSOCK,
WSAESHUTDOWN, WSAEINVAL", Error ) );
- if (lpClient != NULL)
+ if (lpClient != 0)
{
PostMessage(gapp.hwndApp, SM_REMOVECLIENT, (WPARAM) Error,
lpClient->winsockID );
@@ -603,7 +603,7 @@
LOG( ("OnReadStreamServer : Error %d - WSAENETRESET,
WSAECONNABORTED, WSAETIMEDOUT, WSAECONNRESET", Error ) );
//kill any player on this socket--
- if (lpClient != NULL)
+ if (lpClient != 0)
{
PostMessage(gapp.hwndApp, SM_REMOVECLIENT, (WPARAM) Error,
lpClient->winsockID );
@@ -647,7 +647,7 @@
closesocket(lpClient->clientdgramSocket);
PostMessage(gapp.hwndApp, SM_REMOVECLIENT, (WPARAM) 0xFFFF,
lpClient->winsockID );
RecvOffset = 0;
- lpClient->bHeaderIncomplete = FALSE;
+ lpClient->bHeaderIncomplete = false;
lpClient->TempOffset = 0;
return;
}
@@ -667,7 +667,7 @@
RecvOffset += (Size - 1);
iBytesReceived -= (Size - 1);
- lpClient->bHeaderIncomplete = FALSE;
+ lpClient->bHeaderIncomplete = false;
lpClient->TempOffset = 0;
}
@@ -686,7 +686,7 @@
//it may be received as.
lpClient->TempOffset += (iBytesReceived - 1);
- lpClient->bMessageIncomplete = TRUE;
+ lpClient->bMessageIncomplete = true;
//MissingBytes = Size - (iBytesReceived - 1);
//The ammount of bytes we are missing is
@@ -713,7 +713,7 @@
closesocket(lpClient->clientdgramSocket);
PostMessage(gapp.hwndApp, SM_REMOVECLIENT, (WPARAM) 0xFFFF,
lpClient->winsockID );
RecvOffset = 0;
- lpClient->bMessageIncomplete = FALSE;
+ lpClient->bMessageIncomplete = false;
lpClient->TempOffset = 0;
return;
}
@@ -724,7 +724,7 @@
0 );
lpClient->TempOffset = 0;
- lpClient->bMessageIncomplete = FALSE;
+ lpClient->bMessageIncomplete = false;
RecvOffset += MissingBytes;
iBytesReceived -= MissingBytes;
MissingBytes = 0;
@@ -754,7 +754,7 @@
memcpy(TempBuffer, RecvBuffer + RecvOffset, 1);
lpClient->TempOffset++;
iBytesReceived = 0;
- lpClient->bHeaderIncomplete = TRUE;
+ lpClient->bHeaderIncomplete = true;
}
else
if (iBytesReceived >= 2)
@@ -800,7 +800,7 @@
//copy bytes to tempbuffer
memcpy(TempBuffer, RecvBuffer + RecvOffset,
iBytesReceived);
lpClient->TempOffset += iBytesReceived;
- lpClient->bMessageIncomplete = TRUE;
+ lpClient->bMessageIncomplete = true;
MissingBytes = Size - iBytesReceived;
iBytesReceived = 0;
}
@@ -845,7 +845,7 @@
DWORD wsID;
- char *version = NULL;
+ char *version = 0;
iLength = sizeof(SOCKADDR);
memset(RecvDgram, 0, sizeof(RecvDgram));
@@ -882,8 +882,8 @@
version = strstr((char *)infomessage->codeword,
_NETPANZER_CODEWORD);
- //if ((version != NULL) && (infomessage->version ==
_NETPANZER_PROTOCOL_VERSION))
- if ((version != NULL) )
+ //if ((version != 0) && (infomessage->version ==
_NETPANZER_PROTOCOL_VERSION))
+ if ((version != 0) )
{
SetBasicInfo(&basicInfo);
@@ -958,7 +958,7 @@
//
lpClient = GetClientFromSocket(socket);
- if (lpClient == NULL)
+ if (lpClient == 0)
return;
@@ -1010,7 +1010,7 @@
//proper place in the client list
int SetClientUDPAddress(DWORD winsockID, LPSOCKADDR lpclientudpAddr)
{
- BOOL bReturn;
+ bool bReturn;
LPSOCKADDR lpnewUDPAddr;
DWORD wsid;
@@ -1053,7 +1053,7 @@
//TODO make this function return an int so vlad can
//get the correct return
- if (lpClient == NULL) return FALSE;
+ if (lpClient == 0) return false;
//udp hack, guarantee should be == 1
// ** if ((guarantee == 1) || (gUDPDelivery == 0)) **
@@ -1089,7 +1089,7 @@
//this just isn't supposed to happen to a stream
//oriented socket. therefore close this shit down.
- if (lpClient != NULL)
+ if (lpClient != 0)
{
closesocket(lpClient -> clientstreamSocket);
closesocket(lpClient -> clientdgramSocket);
@@ -1117,7 +1117,7 @@
//maybe try twenty times or so. then forget it.
//in the meantime kill the client.
- if (lpClient != NULL)
+ if (lpClient != 0)
{
closesocket(lpClient -> clientstreamSocket);
closesocket(lpClient -> clientdgramSocket);
@@ -1135,7 +1135,7 @@
LOG( ("WSSend : Error - WSAENETUNREACH" ) );
//maybe try twenty times or so. then forget it.
- if (lpClient != NULL)
+ if (lpClient != 0)
{
closesocket(lpClient -> clientstreamSocket);
closesocket(lpClient -> clientdgramSocket);
@@ -1168,7 +1168,7 @@
//my own list--
LOG( ("WSSend : Error %d - WSANOTINITIALISED,
WSAEINTR, WSAEOPNOTSUPP, WSAEACCES", Error ) );
- if (lpClient != NULL)
+ if (lpClient != 0)
{
closesocket(lpClient -> clientstreamSocket);
closesocket(lpClient -> clientdgramSocket);
@@ -1190,7 +1190,7 @@
//my own list--
LOG( ("WSSend : Error %d - WSAENOTCONN, WSAENOTSOCK,
WSAESHUTDOWN, WSAEINVAL", Error ) );
- if (lpClient != NULL)
+ if (lpClient != 0)
{
closesocket(lpClient -> clientstreamSocket);
@@ -1209,7 +1209,7 @@
LOG( ("WSSend : Error %d - WSAENETRESET,
WSAECONNABORTED, WSAETIMEDOUT, WSAECONNRESET", Error ) );
//kill any player on this socket--
- if (lpClient != NULL)
+ if (lpClient != 0)
{
closesocket(lpClient -> clientstreamSocket);
closesocket(lpClient -> clientdgramSocket);
@@ -1222,7 +1222,7 @@
{
LOG( ("WSSend Error: %d", Error ) );
- if (lpClient != NULL)
+ if (lpClient != 0)
{
closesocket(lpClient -> clientstreamSocket);
closesocket(lpClient -> clientdgramSocket);
@@ -1240,9 +1240,9 @@
while ( gSendReady == 0)
{
- if ( PeekMessage( &message, NULL, 0, 0, PM_NOREMOVE ) )
+ if ( PeekMessage( &message, 0, 0, 0, PM_NOREMOVE ) )
{
- if (GetMessage( &message, NULL, 0, 0))
+ if (GetMessage( &message, 0, 0, 0))
{
//TranslateMessage(&message);
DispatchMessage(&message);
@@ -1259,7 +1259,7 @@
}
}while (dwDataSize > 0);
- }//END if(guarantee == TRUE)//////////
+ }//END if(guarantee == true)//////////
else
if(guarantee == 0)
{
@@ -1321,7 +1321,7 @@
//my own list--
LOG( ("WSSend : Error %d - WSANOTINITIALISED,
WSAEINTR, WSAEOPNOTSUPP, WSAEACCES", Error ) );
- if (lpClient != NULL)
+ if (lpClient != 0)
{
closesocket(lpClient -> clientstreamSocket);
closesocket(lpClient -> clientdgramSocket);
@@ -1343,7 +1343,7 @@
//my own list--
LOG( ("WSSend : Error %d - WSAENOTCONN, WSAENOTSOCK,
WSAESHUTDOWN, WSAEINVAL", Error ) );
- if (lpClient != NULL)
+ if (lpClient != 0)
{
closesocket(lpClient -> clientstreamSocket);
@@ -1357,7 +1357,7 @@
{
LOG( ("WSSend Error: %d", Error ) );
- if (lpClient != NULL)
+ if (lpClient != 0)
{
closesocket(lpClient -> clientstreamSocket);
closesocket(lpClient -> clientdgramSocket);
@@ -1390,14 +1390,14 @@
//this function is supposed to shutdown winsock. it closes
//the remote sockets, closes the send socket, then closes the
//listen socket.
-BOOL ShutdownWinSockServer()
+bool ShutdownWinSockServer()
{
LPCLIENTLIST lpClient;
int iReturn;
lpClient = GetFirstClient();
- while (lpClient != NULL)
+ while (lpClient != 0)
{
//close the remote sockets--
iReturn = closesocket(lpClient -> clientstreamSocket);
@@ -1460,7 +1460,7 @@
}
- return TRUE;
+ return true;
}
////////////////////////////////////////////
Index: netpanzer/src/Win32/Winsock/WinsockServer.h
diff -u netpanzer/src/Win32/Winsock/WinsockServer.h:1.1
netpanzer/src/Win32/Winsock/WinsockServer.h:1.2
--- netpanzer/src/Win32/Winsock/WinsockServer.h:1.1 Sun Dec 1 12:52:09 2002
+++ netpanzer/src/Win32/Winsock/WinsockServer.h Mon Sep 1 16:24:22 2003
@@ -24,10 +24,10 @@
//PROTOTYPES////////////////////////////////
-BOOL InitWinSock(HWND hWnd);
+bool InitWinSock(HWND hWnd);
-BOOL InitDGramServer(HWND hWnd);
-BOOL InitStreamServer(HWND hWnd);
+bool InitDGramServer(HWND hWnd);
+bool InitStreamServer(HWND hWnd);
void ServStreamAsyncMsg(HWND hWnd, WPARAM wParam, LPARAM lParam);
void ServDgramAsyncMsg(HWND hWnd, WPARAM wParam, LPARAM lParam);
@@ -38,11 +38,11 @@
void OnCloseServer(SOCKET socket, int iErrorCode);
void SetBasicInfo(BasicGameInfo *basicInfo);
-BOOL SetClientUDPAddress(DWORD winsockID, LPSOCKADDR lpclientudpAddr);
+bool SetClientUDPAddress(DWORD winsockID, LPSOCKADDR lpclientudpAddr);
int WSSend(char guarantee, DWORD wsID, char *bData, DWORD dwDataSize);
-BOOL ShutdownWinSockServer();
+bool ShutdownWinSockServer();
#endif
Index: netpanzer/src/Win32/gapp.cpp
diff -u netpanzer/src/Win32/gapp.cpp:1.1 netpanzer/src/Win32/gapp.cpp:1.2
--- netpanzer/src/Win32/gapp.cpp:1.1 Sun Dec 1 12:52:09 2002
+++ netpanzer/src/Win32/gapp.cpp Mon Sep 1 16:24:22 2003
@@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "stdafx.hpp"
#include "gapp.hpp"
GlobalApp gapp;
- [netPanzer-CVS] netpanzer/src Makefile DirectX/DDraw/DirectDraw...,
Matthias Braun <=