[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[netPanzer-CVS] netpanzer ./ChangeLog ./configure.ac mk/jam/hel...
|
From: |
Matthias Braun |
|
Subject: |
[netPanzer-CVS] netpanzer ./ChangeLog ./configure.ac mk/jam/hel... |
|
Date: |
Sun, 05 Oct 2003 09:50:15 -0400 |
CVSROOT: /cvsroot/netpanzer
Module name: netpanzer
Branch:
Changes by: Matthias Braun <address@hidden> 03/10/05 09:50:14
Modified files:
. : ChangeLog configure.ac
mk/jam : help.jam
src : Jamfile
src/Lib/2D : Color.cpp Color.hpp ColorTable.cpp
ColorTable.hpp PackedSurface.cpp
PackedSurface.hpp Palette.cpp Palette.hpp
RGBColor.cpp RGBColor.hpp Surface.cpp
src/Lib/Particles: FireParticle2D.cpp FireParticle2D.hpp
FireParticleSystem2D.cpp
FireParticleSystem2D.hpp
GroundExplosionParticleSystem2D.cpp
ParticleInterface.cpp ParticleInterface.hpp
SnowParticle2D.hpp
src/Lib/Types : fRect.cpp fRect.hpp fXY.hpp fXYZ.hpp iRect.cpp
iRect.hpp iXY.hpp
src/Lib/View : Choice.cpp Component.hpp Desktop.hpp
ScrollBar.cpp ScrollBar.hpp String.hpp View.hpp
ViewGlobals.cpp ViewGlobals.hpp
src/NetPanzer/Classes: Outpost.cpp SelectionBoxSprite.cpp
TileSet.cpp UnitOpcodeEncoder.cpp
WorldInputCmdProcessor.cpp
src/NetPanzer/Classes/Network: ClientServerNetMessage.hpp
NetPacketQueues.cpp
NetworkClient.cpp
NetworkClient.hpp
NetworkInterface.cpp
ServerConnectDaemon.cpp
src/NetPanzer/Classes/Units: Vehicle.cpp
src/NetPanzer/Classes/Weapons: Weapon.cpp
src/NetPanzer/Interfaces: GameManager.cpp
src/NetPanzer/Views/Game: ChatView.cpp MiniMapView.cpp
RankView.cpp
src/NetPanzer/Views/MainMenu/Multi: MapSelectionView.cpp
UnitSelectionView.cpp
src/UILib/Network: SocketMessage.hpp
Removed files:
src/Lib : codewiz.hpp
src/Lib/Types : LibTypes.hpp
Log message:
-did some more code cleanup. all the Rect and XY classes cleaned up a
bit and
finally removed the codewiz.hpp file.
Patches:
Index: netpanzer/ChangeLog
diff -u netpanzer/ChangeLog:1.7 netpanzer/ChangeLog:1.8
--- netpanzer/ChangeLog:1.7 Sat Oct 4 10:44:35 2003
+++ netpanzer/ChangeLog Sun Oct 5 09:50:08 2003
@@ -1,3 +1,7 @@
+05-Oct-2003 by Matthias Braun
+-did some more code cleanup. all the Rect and XY classes cleaned up a bit and
+ finally removed the codewiz.hpp file.
+
04-Oct-2003 by Matthias Braun
-rewrote the config system and completed config saving and loading
-fixed bug where minimap could be moved outside screen
Index: netpanzer/configure.ac
diff -u netpanzer/configure.ac:1.4 netpanzer/configure.ac:1.5
--- netpanzer/configure.ac:1.4 Wed Sep 24 17:32:02 2003
+++ netpanzer/configure.ac Sun Oct 5 09:50:08 2003
@@ -113,6 +113,12 @@
[],
[AC_MSG_ERROR([Please install physfs >= 0.1.9])])
+AM_OPTIONS_WXCONFIG
+AM_PATH_WXCONFIG(2.4.0, [
+ WX_AVAILABLE=yes
+ AC_SUBST([WX_AVAILABLE])
+ ])
+
CS_INIT_JAMFILE
CS_OUTPUT_INSTALLDIRS
AC_CONFIG_FILES([Jamconfig])
Index: netpanzer/mk/jam/help.jam
diff -u netpanzer/mk/jam/help.jam:1.1 netpanzer/mk/jam/help.jam:1.2
--- netpanzer/mk/jam/help.jam:1.1 Tue Sep 23 21:26:18 2003
+++ netpanzer/mk/jam/help.jam Sun Oct 5 09:50:08 2003
@@ -12,6 +12,7 @@
Depends help : $(target) ;
NotFile $(>) ;
PrintHelp $(target) : $(>) ;
+ Always $(target) ;
}
#----------------------------------------------------------------------------
Index: netpanzer/src/Jamfile
diff -u netpanzer/src/Jamfile:1.2 netpanzer/src/Jamfile:1.3
--- netpanzer/src/Jamfile:1.2 Sat Oct 4 10:44:36 2003
+++ netpanzer/src/Jamfile Sun Oct 5 09:50:08 2003
@@ -48,3 +48,4 @@
ExternalLibs netpanzer : XML SDL SDLNET SDLMIXER SDLIMAGE PHYSFS ;
Help netpanzer : "Build the main netpanzer executable" ;
+SubInclude TOP src Editor ;
Index: netpanzer/src/Lib/2D/Color.cpp
diff -u netpanzer/src/Lib/2D/Color.cpp:1.4 netpanzer/src/Lib/2D/Color.cpp:1.5
--- netpanzer/src/Lib/2D/Color.cpp:1.4 Tue Sep 16 16:16:09 2003
+++ netpanzer/src/Lib/2D/Color.cpp Sun Oct 5 09:50:09 2003
@@ -20,70 +20,70 @@
#include <config.h>
#include "Color.hpp"
-BYTE Color::unitAqua;
-BYTE Color::unitYellow;
-BYTE Color::unitRed;
-BYTE Color::unitBlue;
-BYTE Color::unitDarkBlue;
-BYTE Color::unitLightGreen;
-BYTE Color::unitGreen;
-BYTE Color::unitBlueGray;
-BYTE Color::unitDarkRed;
-BYTE Color::unitBlack;
-BYTE Color::unitDarkGreen;
-BYTE Color::unitWhite;
-BYTE Color::unitLightOrange;
-BYTE Color::unitOrange;
-BYTE Color::unitGray;
-BYTE Color::unitDarkGray;
+uint8_t Color::unitAqua;
+uint8_t Color::unitYellow;
+uint8_t Color::unitRed;
+uint8_t Color::unitBlue;
+uint8_t Color::unitDarkBlue;
+uint8_t Color::unitLightGreen;
+uint8_t Color::unitGreen;
+uint8_t Color::unitBlueGray;
+uint8_t Color::unitDarkRed;
+uint8_t Color::unitBlack;
+uint8_t Color::unitDarkGreen;
+uint8_t Color::unitWhite;
+uint8_t Color::unitLightOrange;
+uint8_t Color::unitOrange;
+uint8_t Color::unitGray;
+uint8_t Color::unitDarkGray;
-BYTE Color::black;
-BYTE Color::blue;
-BYTE Color::brown;
-BYTE Color::cyan;
-BYTE Color::gray;
-BYTE Color::green;
-BYTE Color::magenta;
-BYTE Color::orange;
-BYTE Color::pink;
-BYTE Color::red;
-BYTE Color::white;
-BYTE Color::yellow;
+uint8_t Color::black;
+uint8_t Color::blue;
+uint8_t Color::brown;
+uint8_t Color::cyan;
+uint8_t Color::gray;
+uint8_t Color::green;
+uint8_t Color::magenta;
+uint8_t Color::orange;
+uint8_t Color::pink;
+uint8_t Color::red;
+uint8_t Color::white;
+uint8_t Color::yellow;
-BYTE Color::tan;
-BYTE Color::chartreuse;
-BYTE Color::cobaltGreen;
-BYTE Color::emeraldGreen;
-BYTE Color::forestGreen;
-BYTE Color::darkOliveGreen;
-BYTE Color::terreVerte;
+uint8_t Color::tan;
+uint8_t Color::chartreuse;
+uint8_t Color::cobaltGreen;
+uint8_t Color::emeraldGreen;
+uint8_t Color::forestGreen;
+uint8_t Color::darkOliveGreen;
+uint8_t Color::terreVerte;
-BYTE Color::darkBlue;
-BYTE Color::darkBrown;
-BYTE Color::darkCyan;
-BYTE Color::darkGray;
-BYTE Color::darkGreen;
-BYTE Color::darkMagenta;
-BYTE Color::darkOrange;
-BYTE Color::darkPink;
-BYTE Color::darkRed;
-BYTE Color::darkYellow;
+uint8_t Color::darkBlue;
+uint8_t Color::darkBrown;
+uint8_t Color::darkCyan;
+uint8_t Color::darkGray;
+uint8_t Color::darkGreen;
+uint8_t Color::darkMagenta;
+uint8_t Color::darkOrange;
+uint8_t Color::darkPink;
+uint8_t Color::darkRed;
+uint8_t Color::darkYellow;
-BYTE Color::lightBlue;
-BYTE Color::lightBrown;
-BYTE Color::lightCyan;
-BYTE Color::lightGray;
-BYTE Color::lightGreen;
-BYTE Color::lightMagenta;
-BYTE Color::lightOrange;
-BYTE Color::lightPink;
-BYTE Color::lightRed;
-BYTE Color::lightYellow;
+uint8_t Color::lightBlue;
+uint8_t Color::lightBrown;
+uint8_t Color::lightCyan;
+uint8_t Color::lightGray;
+uint8_t Color::lightGreen;
+uint8_t Color::lightMagenta;
+uint8_t Color::lightOrange;
+uint8_t Color::lightPink;
+uint8_t Color::lightRed;
+uint8_t Color::lightYellow;
-BYTE Color::gray32;
-BYTE Color::gray64;
-BYTE Color::gray96;
-BYTE Color::gray128;
-BYTE Color::gray160;
-BYTE Color::gray192;
-BYTE Color::gray224;
+uint8_t Color::gray32;
+uint8_t Color::gray64;
+uint8_t Color::gray96;
+uint8_t Color::gray128;
+uint8_t Color::gray160;
+uint8_t Color::gray192;
+uint8_t Color::gray224;
Index: netpanzer/src/Lib/2D/Color.hpp
diff -u netpanzer/src/Lib/2D/Color.hpp:1.3 netpanzer/src/Lib/2D/Color.hpp:1.4
--- netpanzer/src/Lib/2D/Color.hpp:1.3 Tue Sep 16 16:16:09 2003
+++ netpanzer/src/Lib/2D/Color.hpp Sun Oct 5 09:50:09 2003
@@ -18,86 +18,85 @@
#ifndef __Color_hpp__
#define __Color_hpp__
-#include "LibTypes.hpp"
+#include <stdint.h>
//---------------------------------------------------------------------------
class Color
{
public:
-
// Color for netPanzer players.
- static BYTE unitAqua;
- static BYTE unitYellow;
- static BYTE unitRed;
- static BYTE unitBlue;
- static BYTE unitDarkBlue;
- static BYTE unitLightGreen;
- static BYTE unitGreen;
- static BYTE unitBlueGray;
- static BYTE unitDarkRed;
- static BYTE unitBlack;
- static BYTE unitDarkGreen;
- static BYTE unitWhite;
- static BYTE unitLightOrange;
- static BYTE unitOrange;
- static BYTE unitGray;
- static BYTE unitDarkGray;
+ static uint8_t unitAqua;
+ static uint8_t unitYellow;
+ static uint8_t unitRed;
+ static uint8_t unitBlue;
+ static uint8_t unitDarkBlue;
+ static uint8_t unitLightGreen;
+ static uint8_t unitGreen;
+ static uint8_t unitBlueGray;
+ static uint8_t unitDarkRed;
+ static uint8_t unitBlack;
+ static uint8_t unitDarkGreen;
+ static uint8_t unitWhite;
+ static uint8_t unitLightOrange;
+ static uint8_t unitOrange;
+ static uint8_t unitGray;
+ static uint8_t unitDarkGray;
// Normal Colors.
- static BYTE black;
- static BYTE blue;
- static BYTE brown;
- static BYTE cyan;
- static BYTE gray;
- static BYTE green;
- static BYTE magenta;
- static BYTE orange;
- static BYTE pink;
- static BYTE red;
- static BYTE white;
- static BYTE yellow;
+ static uint8_t black;
+ static uint8_t blue;
+ static uint8_t brown;
+ static uint8_t cyan;
+ static uint8_t gray;
+ static uint8_t green;
+ static uint8_t magenta;
+ static uint8_t orange;
+ static uint8_t pink;
+ static uint8_t red;
+ static uint8_t white;
+ static uint8_t yellow;
// Color specifically for netPanzer.
- static BYTE tan;
- static BYTE chartreuse;
- static BYTE cobaltGreen;
- static BYTE emeraldGreen;
- static BYTE forestGreen;
- static BYTE darkOliveGreen;
- static BYTE terreVerte;
+ static uint8_t tan;
+ static uint8_t chartreuse;
+ static uint8_t cobaltGreen;
+ static uint8_t emeraldGreen;
+ static uint8_t forestGreen;
+ static uint8_t darkOliveGreen;
+ static uint8_t terreVerte;
// Dark Colors.
- static BYTE darkBlue;
- static BYTE darkBrown;
- static BYTE darkCyan;
- static BYTE darkGray;
- static BYTE darkGreen;
- static BYTE darkMagenta;
- static BYTE darkOrange;
- static BYTE darkPink;
- static BYTE darkRed;
- static BYTE darkYellow;
+ static uint8_t darkBlue;
+ static uint8_t darkBrown;
+ static uint8_t darkCyan;
+ static uint8_t darkGray;
+ static uint8_t darkGreen;
+ static uint8_t darkMagenta;
+ static uint8_t darkOrange;
+ static uint8_t darkPink;
+ static uint8_t darkRed;
+ static uint8_t darkYellow;
// Light Colors.
- static BYTE lightBlue;
- static BYTE lightBrown;
- static BYTE lightCyan;
- static BYTE lightGray;
- static BYTE lightGreen;
- static BYTE lightMagenta;
- static BYTE lightOrange;
- static BYTE lightPink;
- static BYTE lightRed;
- static BYTE lightYellow;
+ static uint8_t lightBlue;
+ static uint8_t lightBrown;
+ static uint8_t lightCyan;
+ static uint8_t lightGray;
+ static uint8_t lightGreen;
+ static uint8_t lightMagenta;
+ static uint8_t lightOrange;
+ static uint8_t lightPink;
+ static uint8_t lightRed;
+ static uint8_t lightYellow;
// Gray scales.
- static BYTE gray32;
- static BYTE gray64;
- static BYTE gray96;
- static BYTE gray128;
- static BYTE gray160;
- static BYTE gray192;
- static BYTE gray224;
+ static uint8_t gray32;
+ static uint8_t gray64;
+ static uint8_t gray96;
+ static uint8_t gray128;
+ static uint8_t gray160;
+ static uint8_t gray192;
+ static uint8_t gray224;
}
; // end Color
Index: netpanzer/src/Lib/2D/ColorTable.cpp
diff -u netpanzer/src/Lib/2D/ColorTable.cpp:1.14
netpanzer/src/Lib/2D/ColorTable.cpp:1.15
--- netpanzer/src/Lib/2D/ColorTable.cpp:1.14 Mon Sep 22 09:53:47 2003
+++ netpanzer/src/Lib/2D/ColorTable.cpp Sun Oct 5 09:50:09 2003
@@ -80,7 +80,7 @@
// setColor
//---------------------------------------------------------------------------
-void ColorTable::setColor(int index, BYTE color)
+void ColorTable::setColor(int index, uint8_t color)
{
assert(index < colorCount);
@@ -187,9 +187,9 @@
curPercent = (float(255 - x) / 255.0f) * percent + 1.0f - percent;
curOffset = (y * 256) + x;
- 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));
+ curColor.red = (uint8_t) (curPercent *
float(Palette::color[y].red));
+ curColor.green = (uint8_t) (curPercent *
float(Palette::color[y].green));
+ curColor.blue = (uint8_t) (curPercent *
float(Palette::color[y].blue));
setColor(curOffset, Palette::findNearestColor(curColor));
}
@@ -242,9 +242,9 @@
curOffset = (int(index) << 8) + indexPic;
- RGBColor curColor((BYTE) (color1 * col.red + color2 *
colPic.red),
- (BYTE) (color1 * col.green + color2 *
colPic.green),
- (BYTE) (color1 * col.blue + color2 *
colPic.blue));
+ RGBColor curColor((uint8_t) (color1 * col.red + color2 *
colPic.red),
+ (uint8_t) (color1 * col.green + color2 *
colPic.green),
+ (uint8_t) (color1 * col.blue + color2 *
colPic.blue));
// Makes the color table use color 0 as transparent.
if (indexPic == 0) {
@@ -282,7 +282,7 @@
// make sure palette in file is the same as current one
for(size_t i=0; i<PALETTE_LENGTH; i++) {
RGBColor checkcolor;
- if(file->read(&checkcolor, sizeof(BYTE), 3) != 3)
+ if(file->read(&checkcolor, sizeof(uint8_t), 3) != 3)
throw Exception("couldn't load colortable '%s': "
"file corrupted(too short)", filename);
Index: netpanzer/src/Lib/2D/ColorTable.hpp
diff -u netpanzer/src/Lib/2D/ColorTable.hpp:1.6
netpanzer/src/Lib/2D/ColorTable.hpp:1.7
--- netpanzer/src/Lib/2D/ColorTable.hpp:1.6 Tue Sep 16 16:16:09 2003
+++ netpanzer/src/Lib/2D/ColorTable.hpp Sun Oct 5 09:50:09 2003
@@ -20,8 +20,7 @@
#include <stdio.h>
#include <assert.h>
-
-#include "codewiz.hpp"
+#include <stdint.h>
//--------------------------------------------------------------------------
class ColorTable
@@ -32,7 +31,7 @@
static char *extension;
int colorCount;
- BYTE *colorArray;
+ uint8_t *colorArray;
static int totalColorArrayCount;
static int totalByteCount;
@@ -42,10 +41,10 @@
~ColorTable();
void init(int colorCount);
- void setColor(int index, BYTE color);
+ void setColor(int index, uint8_t color);
// Give us an array index into the table.
- inline BYTE operator[](int index) const
+ inline uint8_t operator[](int index) const
{
assert(index < colorCount);
return *(colorArray + index);
@@ -55,7 +54,7 @@
{
return colorCount;
}
- inline const BYTE *getColorArray()
+ inline const uint8_t *getColorArray()
{
return colorArray;
}
Index: netpanzer/src/Lib/2D/PackedSurface.cpp
diff -u netpanzer/src/Lib/2D/PackedSurface.cpp:1.15
netpanzer/src/Lib/2D/PackedSurface.cpp:1.16
--- netpanzer/src/Lib/2D/PackedSurface.cpp:1.15 Wed Sep 24 13:43:20 2003
+++ netpanzer/src/Lib/2D/PackedSurface.cpp Sun Oct 5 09:50:09 2003
@@ -154,7 +154,7 @@
int newSize = (curByteOffset + sizeof(SpanHead) +
spanLen*sizeof(PIX) + 3) & ~3;
if (newSize > bytesAlloced) {
bytesAlloced = newSize + 16*1024;
- packedDataChunk = (BYTE *)realloc(packedDataChunk,
bytesAlloced);
+ packedDataChunk = (uint8_t *)realloc(packedDataChunk,
bytesAlloced);
if (packedDataChunk == 0) {
throw Exception("ERROR: Out of memory for
packedDataChunk for PackedSurface.");
}
@@ -178,7 +178,7 @@
// Shrink buffer to the size we really need
- packedDataChunk = (BYTE *) realloc(packedDataChunk, curByteOffset);
+ packedDataChunk = (uint8_t *) realloc(packedDataChunk, curByteOffset);
if (packedDataChunk == 0) throw Exception("Hell froze");
// Restore source surface frame number, so the function
@@ -218,7 +218,7 @@
throw Exception("ERROR: Unable to allocate rowTableOffset for
PackedSurface.");
}
file->read(rowOffsetTable, (pix.y*frameCount + 1)*sizeof(*rowOffsetTable),
1);
- packedDataChunk = (BYTE *)malloc(rowOffsetTable[pix.y*frameCount]);
+ packedDataChunk = (uint8_t *)malloc(rowOffsetTable[pix.y*frameCount]);
if (packedDataChunk == 0) {
delete file;
throw Exception("ERROR: Unable to allocate packedDataChunk for
PackedSurface.");
@@ -276,7 +276,7 @@
iXY srcMin;
if (destX < 0) {
srcMin.x = -destX;
- if (srcMin >= pix.x) return; // off left
+ if (srcMin.x >= pix.x) return; // off left
needClipX = 1;
} else {
srcMin.x = 0;
@@ -300,11 +300,11 @@
const int *table = &rowOffsetTable[int(curFrame)*pix.y];
if (needClipX) {
- const BYTE *rowData = packedDataChunk + table[srcMin.y];
+ const uint8_t *rowData = packedDataChunk + table[srcMin.y];
PIX *destRowPtr = dest.rowPtr(destY + srcMin.y) + destX;
for (int y = srcMin.y ; y < srcMax.y ; ++y) {
- const BYTE *rowEnd = packedDataChunk + table[y+1];
+ const uint8_t *rowEnd = packedDataChunk + table[y+1];
// Search for first span which is not completely off to the left
@@ -364,11 +364,11 @@
destRowPtr += dest.getStride();
}
} else {
- const BYTE *rowData = packedDataChunk + table[srcMin.y];
+ const uint8_t *rowData = packedDataChunk + table[srcMin.y];
PIX *destRowPtr = dest.rowPtr(destY + srcMin.y) + destX;
for (int y = srcMin.y ; y < srcMax.y ; ++y) {
- const BYTE *rowEnd = packedDataChunk + table[y+1];
+ const uint8_t *rowEnd = packedDataChunk + table[y+1];
while (rowData < rowEnd) {
SpanHead *span = (SpanHead *)rowData;
@@ -412,7 +412,7 @@
iXY center;
iXY pix;
int *rowOffsetTable;
- BYTE *packedDataChunk;
+ uint8_t *packedDataChunk;
bool myMem;
} // end Surface::setTo
@@ -500,15 +500,15 @@
srcMax.y = pix.y;
}
- const BYTE *cTable = colorTable.getColorArray();
+ const uint8_t *cTable = colorTable.getColorArray();
const int *table = &rowOffsetTable[int(curFrame)*pix.y];
if (needClipX) {
- const BYTE *rowData = packedDataChunk + table[srcMin.y];
+ const uint8_t *rowData = packedDataChunk + table[srcMin.y];
PIX *destRowPtr = dest.rowPtr(destY + srcMin.y) + destX;
for (int y = srcMin.y ; y < srcMax.y ; ++y) {
- const BYTE *rowEnd = packedDataChunk + table[y+1];
+ const uint8_t *rowEnd = packedDataChunk + table[y+1];
// Search for first span which is not completely off to the left
@@ -569,11 +569,11 @@
destRowPtr += dest.getStride();
}
} else {
- const BYTE *rowData = packedDataChunk + table[srcMin.y];
+ const uint8_t *rowData = packedDataChunk + table[srcMin.y];
PIX *destRowPtr = dest.rowPtr(destY + srcMin.y) + destX;
for (int y = srcMin.y ; y < srcMax.y ; ++y) {
- const BYTE *rowEnd = packedDataChunk + table[y+1];
+ const uint8_t *rowEnd = packedDataChunk + table[y+1];
while (rowData < rowEnd) {
SpanHead *span = (SpanHead *)rowData;
Index: netpanzer/src/Lib/2D/PackedSurface.hpp
diff -u netpanzer/src/Lib/2D/PackedSurface.hpp:1.4
netpanzer/src/Lib/2D/PackedSurface.hpp:1.5
--- netpanzer/src/Lib/2D/PackedSurface.hpp:1.4 Tue Sep 16 16:16:09 2003
+++ netpanzer/src/Lib/2D/PackedSurface.hpp Sun Oct 5 09:50:09 2003
@@ -35,7 +35,7 @@
static int totalDrawCount; // The number of bytes of the surfaces
alive.
- typedef void (*SPAN_FUNC)(const BYTE *src, BYTE *dest, int count);
+ typedef void (*SPAN_FUNC)(const uint8_t *src, uint8_t *dest, int count);
void pack(const Surface &src);
@@ -161,7 +161,7 @@
{
return rowOffsetTable;
}
- inline BYTE *getPackedDataChunk() const
+ inline uint8_t *getPackedDataChunk() const
{
return packedDataChunk;
}
@@ -180,7 +180,7 @@
iXY center;
iXY pix;
int *rowOffsetTable;
- BYTE *packedDataChunk;
+ uint8_t *packedDataChunk;
bool myMem;
static int totalSurfaceCount; // The number of surfaces alive.
Index: netpanzer/src/Lib/2D/Palette.cpp
diff -u netpanzer/src/Lib/2D/Palette.cpp:1.11
netpanzer/src/Lib/2D/Palette.cpp:1.12
--- netpanzer/src/Lib/2D/Palette.cpp:1.11 Tue Sep 23 08:14:04 2003
+++ netpanzer/src/Lib/2D/Palette.cpp Sun Oct 5 09:50:09 2003
@@ -382,7 +382,7 @@
// Purpose: Walks through the palette and finds the nearest mathcing color
// index.
//---------------------------------------------------------------------------
-BYTE Palette::findNearestColor(const RGBColor &rgb, const bool
&ignoreIndexZero)
+uint8_t Palette::findNearestColor(const RGBColor &rgb, const bool
&ignoreIndexZero)
{
float bestDist = 10000000.0f;
int best = 0;
Index: netpanzer/src/Lib/2D/Palette.hpp
diff -u netpanzer/src/Lib/2D/Palette.hpp:1.4
netpanzer/src/Lib/2D/Palette.hpp:1.5
--- netpanzer/src/Lib/2D/Palette.hpp:1.4 Tue Sep 16 16:16:09 2003
+++ netpanzer/src/Lib/2D/Palette.hpp Sun Oct 5 09:50:09 2003
@@ -19,6 +19,7 @@
#define __Palette_hpp__
#include <stdio.h>
+#include <stdint.h>
#include "Color.hpp"
#include "ColorTable.hpp"
@@ -120,7 +121,7 @@
static void setEarth();
static void setFire();
static void loadACT(const char *filename);
- static BYTE findNearestColor(const RGBColor &rgb, const bool
&ignoreIndexZero = false);
+ static uint8_t findNearestColor(const RGBColor &rgb, const bool
&ignoreIndexZero = false);
static void init(const char *filename);
static void initNoColorTables(const char *filename);
static void setColors();
Index: netpanzer/src/Lib/2D/RGBColor.cpp
diff -u netpanzer/src/Lib/2D/RGBColor.cpp:1.4
netpanzer/src/Lib/2D/RGBColor.cpp:1.5
--- netpanzer/src/Lib/2D/RGBColor.cpp:1.4 Tue Sep 16 16:16:09 2003
+++ netpanzer/src/Lib/2D/RGBColor.cpp Sun Oct 5 09:50:09 2003
@@ -20,7 +20,7 @@
#include "RGBColor.hpp"
-RGBColor::RGBColor(BYTE red, BYTE green, BYTE blue)
+RGBColor::RGBColor(uint8_t red, uint8_t green, uint8_t blue)
{
RGBColor::red = red;
RGBColor::green = green;
Index: netpanzer/src/Lib/2D/RGBColor.hpp
diff -u netpanzer/src/Lib/2D/RGBColor.hpp:1.4
netpanzer/src/Lib/2D/RGBColor.hpp:1.5
--- netpanzer/src/Lib/2D/RGBColor.hpp:1.4 Tue Sep 16 16:16:09 2003
+++ netpanzer/src/Lib/2D/RGBColor.hpp Sun Oct 5 09:50:09 2003
@@ -18,20 +18,20 @@
#ifndef __RGBColor_hpp__
#define __RGBColor_hpp__
-#include "codewiz.hpp"
+#include <stdint.h>
//--------------------------------------------------------------------------
class RGBColor
{
public:
- BYTE red; // 0-FF
- BYTE green; // 0-FF
- BYTE blue; // 0-FF
+ uint8_t red; // 0-FF
+ uint8_t green; // 0-FF
+ uint8_t blue; // 0-FF
RGBColor()
{}
- RGBColor(BYTE red, BYTE green, BYTE blue);
+ RGBColor(uint8_t red, uint8_t green, uint8_t blue);
// Returns an int between [0...255]
int getBrightnessInt();
Index: netpanzer/src/Lib/2D/Surface.cpp
diff -u netpanzer/src/Lib/2D/Surface.cpp:1.31
netpanzer/src/Lib/2D/Surface.cpp:1.32
--- netpanzer/src/Lib/2D/Surface.cpp:1.31 Fri Oct 3 10:44:58 2003
+++ netpanzer/src/Lib/2D/Surface.cpp Sun Oct 5 09:50:09 2003
@@ -17,6 +17,7 @@
*/
#include <config.h>
+#include <math.h>
#include <memory>
#include <vector>
#include <string>
@@ -73,31 +74,31 @@
struct PcxHeader
{
- BYTE manufacturer;
- BYTE version;
- BYTE encoding;
- BYTE bits_per_pixel;
- WORD x,y; //upper left of image
- WORD width, height; //size of the image
- WORD horz_res; //horizontal resolution
- WORD vert_res; //vertical resolution
- BYTE ega_palette[48]; //who cares?
- BYTE reserved;
- BYTE num_color_planes;
- WORD bytes_per_line;
- WORD palette_type;
- BYTE padding[58];
+ uint8_t manufacturer;
+ uint8_t version;
+ uint8_t encoding;
+ uint8_t bits_per_pixel;
+ uint16_t x,y; //upper left of image
+ uint16_t width, height; //size of the image
+ uint16_t horz_res; //horizontal resolution
+ uint16_t vert_res; //vertical resolution
+ uint8_t ega_palette[48]; //who cares?
+ uint8_t reserved;
+ uint8_t num_color_planes;
+ uint16_t bytes_per_line;
+ uint16_t palette_type;
+ uint8_t padding[58];
}
__attribute__((packed));
class SurfaceHeader
{
public:
- DWORD pixX;
- DWORD pixY;
- DWORD offsetX;
- DWORD offsetY;
- DWORD frameCount;
+ uint32_t pixX;
+ uint32_t pixY;
+ uint32_t offsetX;
+ uint32_t offsetY;
+ uint32_t frameCount;
float fps;
}
@@ -105,20 +106,20 @@
struct PIC_HEAD
{
- DWORD xPix; // Horizontal pixel count.
- DWORD yPix; // Vertical pixel count.
- DWORD frameCount; // Number of frames.
+ uint32_t xPix; // Horizontal pixel count.
+ uint32_t yPix; // Vertical pixel count.
+ uint32_t frameCount; // Number of frames.
}
__attribute__((packed));
class BitmapFileHeader
{
public:
- WORD bfType;
- DWORD bfSize;
- WORD bfReserved1;
- WORD bfReserved2;
- DWORD bfOffBits;
+ uint16_t bfType;
+ uint32_t bfSize;
+ uint16_t bfReserved1;
+ uint16_t bfReserved2;
+ uint32_t bfOffBits;
}
__attribute__((packed));
@@ -129,27 +130,27 @@
class BitmapInfoHeader
{
public:
- DWORD biSize;
- DWORD biWidth;
- DWORD biHeight;
- WORD biPlanes;
- WORD biBitCount;
- DWORD biCompression;
- DWORD biSizeImage;
- DWORD biXPelsPerMeter;
- DWORD biYPelsPerMeter;
- DWORD biClrUsed;
- DWORD biClrImportant;
+ uint32_t biSize;
+ uint32_t biWidth;
+ uint32_t biHeight;
+ uint16_t biPlanes;
+ uint16_t biBitCount;
+ uint32_t biCompression;
+ uint32_t biSizeImage;
+ uint32_t biXPelsPerMeter;
+ uint32_t biYPelsPerMeter;
+ uint32_t biClrUsed;
+ uint32_t biClrImportant;
}
__attribute__((packed));
class RGBQuad
{
public:
- BYTE rgbBlue;
- BYTE rgbGreen;
- BYTE rgbRed;
- BYTE rgbReserved;
+ uint8_t rgbBlue;
+ uint8_t rgbGreen;
+ uint8_t rgbRed;
+ uint8_t rgbReserved;
}
__attribute__((packed));
@@ -337,7 +338,7 @@
Surface::stride = stride ? stride : pix.x;
- DWORD requestedBytes = DWORD(Surface::stride) * DWORD(pix.y) * sizeof(PIX)
* DWORD(frameCount);
+ uint32_t requestedBytes = uint32_t(Surface::stride) * uint32_t(pix.y) *
sizeof(PIX) * uint32_t(frameCount);
if (requestedBytes > 0) {
frame0 = (PIX *) malloc(requestedBytes);
@@ -692,7 +693,7 @@
// clipping on the bounds of the object. The non-transparent pixels
// are blitted in the specified color.
//---------------------------------------------------------------------------
-void Surface::bltTransColor(const Surface &dest, iXY min, const BYTE &color)
const
+void Surface::bltTransColor(const Surface &dest, iXY min, const uint8_t
&color) const
{
assert(getDoesExist());
assert(dest.getDoesExist());
@@ -1266,8 +1267,8 @@
Surface temp;
temp.create(pix.x, pix.y, pix.x, 1);
- float angleRadians = (offset * 3.6) / (180.0 / PI);
- float angleStep = ((PI * 2) * numWaves) / pix.y;
+ float angleRadians = (offset * 3.6) / (180.0 / M_PI);
+ float angleStep = ((M_PI * 2) * numWaves) / pix.y;
float amplitude = (percent * pix.y / 2) / 100.0;
blt(temp, 0, 0);
@@ -1309,8 +1310,8 @@
Surface temp;
temp.create(pix.x, pix.y, pix.x, 1);
- float angleRadians = (offset*3.6) / (180.0 / PI);
- float angleStep = ((PI * 2) * numWaves) / pix.y;
+ float angleRadians = (offset*3.6) / (180.0 / M_PI);
+ float angleStep = ((M_PI * 2) * numWaves) / pix.y;
float amplitude = (percent * pix.y / 2) / 100.0;
blt(temp, 0, 0);
@@ -1352,7 +1353,7 @@
unsigned index = 0;
- float piTimes2 = float(PI * 2.0);
+ float piTimes2 = float(M_PI * 2.0);
float angleRadians = (piTimes2 * percent) / 100.0;
float maxDist = sqrt(pix.x * pix.x + pix.y * pix.y);
float scale = (piTimes2 * numWaves) / maxDist;
@@ -1404,7 +1405,7 @@
Surface temp(pix.x, pix.y, pix.x, 1);
blt(temp, 0, 0);
- float piTimes2 = float(PI * 2.0);
+ float piTimes2 = float(M_PI * 2.0);
float waveFrequency = (numWaves * piTimes2) / pix.y;
float waveOffset = (offset * numWaves * piTimes2) / 100.0;
float radius = (pix.x * percent) / 100.0;
@@ -1449,7 +1450,7 @@
Surface temp(pix.x, pix.y, pix.x, 1);
blt(temp, 0, 0);
- float piTimes2 = float(PI * 2.0);
+ float piTimes2 = float(M_PI * 2.0);
float waveFrequency = (numWaves * piTimes2) / pix.y;
float waveOffset = (offset * numWaves * piTimes2) / 100.0;
float radius = (pix.x * percent) / 100.0;
@@ -1553,7 +1554,7 @@
if (signed(pixelsPerRow) <= 0) return;
if (signed(numRows) <= 0) return;
- const BYTE *table = colorTable.getColorArray();
+ const uint8_t *table = colorTable.getColorArray();
for (int yCount = 0 ; yCount < numRows ; yCount++) {
bltBlendSpan(dRow, sRow, pixelsPerRow, table);
@@ -1631,7 +1632,7 @@
if (pixelsPerRow <= 0) return;
if (numRows <= 0) return;
- const BYTE *table = colorTable.getColorArray();
+ const uint8_t *table = colorTable.getColorArray();
#if 0
int stepAndDecCount = (xSrcDelta << 16) | 0xffff;
int stepWholePart = xSrcDelta >> 16;
@@ -1982,7 +1983,7 @@
create(fletchTileHeader.xSize, fletchTileHeader.ySize,
fletchTileHeader.xSize, 1);
}
- int numBytes = pix.x * pix.y * sizeof(BYTE);
+ int numBytes = pix.x * pix.y * sizeof(uint8_t);
if (numBytes <= 0) return;
if (mem == 0) {
@@ -2184,9 +2185,9 @@
}
} // end bltBrightness*/
-static BYTE quickHack[65536];
+static uint8_t quickHack[65536];
-static void bltLightDarkSpan(int n, PIX *d, const BYTE *i, const PIX *s)
+static void bltLightDarkSpan(int n, PIX *d, const uint8_t *i, const PIX *s)
{
static int once = 0;
@@ -2296,13 +2297,13 @@
int numRows = pix.y;
- BYTE const *rowI = lightTable[0];
+ uint8_t const *rowI = lightTable[0];
PIX const *rowS = source.mem;
PIX *rowD = mem;
while (numRows > 0) {
//int xCount = pix.x;
- //BYTE const *i = rowI;
+ //uint8_t const *i = rowI;
//PIX const *s = rowS;
//PIX *d = rowD;
@@ -2346,7 +2347,7 @@
assert(dest.getDoesExist());
assert(this != 0);
- static BYTE saturateTable[512];
+ static uint8_t saturateTable[512];
static int once = 0;
if (!once) {
@@ -2654,7 +2655,7 @@
// calls to blitChar for each character of the string. Does not
// handle wrapping.
//---------------------------------------------------------------------------
-void Surface::bltString(const iXY &pos, const char *string, const BYTE &color)
const
+void Surface::bltString(const iXY &pos, const char *string, const uint8_t
&color) const
{
for (int index = 0; string[index] != 0; index++) {
// Don't attempt blank spaces.
@@ -2673,7 +2674,7 @@
// calls to blitChar for each character of the string. Does not
// handle wrapping.
//---------------------------------------------------------------------------
-void Surface::bltString5x5(const iXY &pos, const char *string, const BYTE
&color) const
+void Surface::bltString5x5(const iXY &pos, const char *string, const uint8_t
&color) const
{
for (int index = 0; string[index] != 0; index++) {
bltChar5x5(iXY(pos.x + (index * 5), pos.y), string[index], color);
@@ -2683,7 +2684,7 @@
// bltStringShadowed
//---------------------------------------------------------------------------
-void Surface::bltStringShadowed(const iXY &pos, char const *string, const BYTE
&textColor, const BYTE &shadowColor) const
+void Surface::bltStringShadowed(const iXY &pos, char const *string, const
uint8_t &textColor, const uint8_t &shadowColor) const
{
for (int index = 0; string[index] != 0; index++) {
bltChar8x8(pos.x + (index << 3) + 1, pos.y + 1, string[index],
shadowColor);
@@ -3057,7 +3058,7 @@
void Surface::mapFromPalette(const char* oldPalette)
{
// Load the source palette.
- BYTE bestFitArray[256];
+ uint8_t bestFitArray[256];
RGBColor sourceColor[256];
std::auto_ptr<ReadFile> file (FileSystem::openRead(oldPalette));
Index: netpanzer/src/Lib/Particles/FireParticle2D.cpp
diff -u netpanzer/src/Lib/Particles/FireParticle2D.cpp:1.7
netpanzer/src/Lib/Particles/FireParticle2D.cpp:1.8
--- netpanzer/src/Lib/Particles/FireParticle2D.cpp:1.7 Tue Sep 16 16:16:09 2003
+++ netpanzer/src/Lib/Particles/FireParticle2D.cpp Sun Oct 5 09:50:10 2003
@@ -59,8 +59,8 @@
//int y = pos.y;
//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.
+ //color = uint8_t(totalTime * 44); // This 44 is based on the life of 0.25
secs and 12 colors possible.
+ color = uint8_t(totalTime * 22); // This 22 is based on the life of 0.50
secs and 12 colors possible.
//if (color >= 12) throw Exception("ERROR: Invalid color reached for
fire.");
assert(color < 12);
Index: netpanzer/src/Lib/Particles/FireParticle2D.hpp
diff -u netpanzer/src/Lib/Particles/FireParticle2D.hpp:1.3
netpanzer/src/Lib/Particles/FireParticle2D.hpp:1.4
--- netpanzer/src/Lib/Particles/FireParticle2D.hpp:1.3 Tue Sep 16 16:16:09 2003
+++ netpanzer/src/Lib/Particles/FireParticle2D.hpp Sun Oct 5 09:50:10 2003
@@ -31,7 +31,7 @@
{
public:
float totalTime;
- BYTE color;
+ uint8_t color;
fXYZ pos;
bool isAlive;
Index: netpanzer/src/Lib/Particles/FireParticleSystem2D.cpp
diff -u netpanzer/src/Lib/Particles/FireParticleSystem2D.cpp:1.7
netpanzer/src/Lib/Particles/FireParticleSystem2D.cpp:1.8
--- netpanzer/src/Lib/Particles/FireParticleSystem2D.cpp:1.7 Mon Sep 22
09:53:48 2003
+++ netpanzer/src/Lib/Particles/FireParticleSystem2D.cpp Sun Oct 5
09:50:10 2003
@@ -22,7 +22,7 @@
#include "TimerInterface.hpp"
#include "Palette.hpp"
-BYTE FireParticleSystem2D::fireColor[12];
+uint8_t FireParticleSystem2D::fireColor[12];
// FireParticleSystem2D
//---------------------------------------------------------------------------
Index: netpanzer/src/Lib/Particles/FireParticleSystem2D.hpp
diff -u netpanzer/src/Lib/Particles/FireParticleSystem2D.hpp:1.3
netpanzer/src/Lib/Particles/FireParticleSystem2D.hpp:1.4
--- netpanzer/src/Lib/Particles/FireParticleSystem2D.hpp:1.3 Tue Sep 16
16:16:09 2003
+++ netpanzer/src/Lib/Particles/FireParticleSystem2D.hpp Sun Oct 5
09:50:10 2003
@@ -34,7 +34,7 @@
void init();
static void initColors();
- static BYTE fireColor[12];
+ static uint8_t fireColor[12];
FireParticle2D fireParticles[100];
Index: netpanzer/src/Lib/Particles/GroundExplosionParticleSystem2D.cpp
diff -u netpanzer/src/Lib/Particles/GroundExplosionParticleSystem2D.cpp:1.6
netpanzer/src/Lib/Particles/GroundExplosionParticleSystem2D.cpp:1.7
--- netpanzer/src/Lib/Particles/GroundExplosionParticleSystem2D.cpp:1.6 Mon Sep
22 09:53:48 2003
+++ netpanzer/src/Lib/Particles/GroundExplosionParticleSystem2D.cpp Sun Oct
5 09:50:10 2003
@@ -20,11 +20,9 @@
#include <assert.h>
#include <stdlib.h>
#include "Log.hpp"
-#include "codewiz.hpp"
#include "GroundExplosionParticleSystem2D.hpp"
#include "Physics.hpp"
#include "GroundExplosionParticle2D.hpp"
-
//---------------------------------------------------------------------------
GroundExplosionParticleSystem2D::GroundExplosionParticleSystem2D(fXYZ pos,
iRect bounds, int maxParticleCount, int maxParticleSpeed) :
ParticleSystem2D(pos)
Index: netpanzer/src/Lib/Particles/ParticleInterface.cpp
diff -u netpanzer/src/Lib/Particles/ParticleInterface.cpp:1.11
netpanzer/src/Lib/Particles/ParticleInterface.cpp:1.12
--- netpanzer/src/Lib/Particles/ParticleInterface.cpp:1.11 Mon Sep 22
09:53:48 2003
+++ netpanzer/src/Lib/Particles/ParticleInterface.cpp Sun Oct 5 09:50:10 2003
@@ -620,7 +620,7 @@
}
//--------------------------------------------------------------------------
-void ParticleInterface::addMiss(const iXY &worldPos, BYTE unitType)
+void ParticleInterface::addMiss(const iXY &worldPos, uint8_t unitType)
{
/*
short hit_points;
@@ -717,7 +717,7 @@
}
//--------------------------------------------------------------------------
-void ParticleInterface::addMissleFlightPuff(const iXY &worldPos, const fXY
&direction, float &curWait, float &totalWait, BYTE unitType)
+void ParticleInterface::addMissleFlightPuff(const iXY &worldPos, const fXY
&direction, float &curWait, float &totalWait, uint8_t unitType)
{
iXY thrustOffset(int(-10.0f * direction.x), int(-10.0f * direction.y));
fXYZ loc(worldPos.x + thrustOffset.x, 0, worldPos.y + thrustOffset.y);
@@ -746,7 +746,7 @@
}
//--------------------------------------------------------------------------
-void ParticleInterface::addMissleLaunchPuff(const iXY &worldPos, const fXY
&direction, BYTE unitType)
+void ParticleInterface::addMissleLaunchPuff(const iXY &worldPos, const fXY
&direction, uint8_t unitType)
{
// //addMissleFlashParticle(pos);
//
@@ -780,7 +780,7 @@
}
//--------------------------------------------------------------------------
-void ParticleInterface::addMuzzlePuff(const fXYZ &worldPos, const fXYZ
&direction, int frame, BYTE unitType)
+void ParticleInterface::addMuzzlePuff(const fXYZ &worldPos, const fXYZ
&direction, int frame, uint8_t unitType)
{
// Cull out any muzzle puffs which are far away.
if (Particle2D::getFarAway(worldPos)) {
@@ -853,8 +853,6 @@
void ParticleInterface::initParticleSystems()
{
- randomize();
-
PuffParticle2D::init();
//SparkParticle2D::init();
CloudParticle2D::init();
@@ -899,7 +897,7 @@
if (movePuffWaitGroup >= movePuffWaitTotal) {
iXY size =
unitParticleInfo[unitState.unit_type].minBounds.getSize();
- assert(size > 0);
+ assert(size.x > 0 && size.y > 0);
iXY halfSize = size / 2;
Index: netpanzer/src/Lib/Particles/ParticleInterface.hpp
diff -u netpanzer/src/Lib/Particles/ParticleInterface.hpp:1.4
netpanzer/src/Lib/Particles/ParticleInterface.hpp:1.5
--- netpanzer/src/Lib/Particles/ParticleInterface.hpp:1.4 Tue Sep 16
16:16:09 2003
+++ netpanzer/src/Lib/Particles/ParticleInterface.hpp Sun Oct 5 09:50:10 2003
@@ -18,6 +18,8 @@
#ifndef __ParticleInterface_hpp__
#define __ParticleInterface_hpp__
+#include <stdint.h>
+
#include "iXY.hpp"
#include "iRect.hpp"
#include "PuffParticle2D.hpp"
@@ -126,14 +128,14 @@
static void testSimText(const Surface &dest);
static void addHit(const UnitState &unitState);
- static void addMiss(const iXY &worldPos, BYTE unitType);
+ static void addMiss(const iXY &worldPos, uint8_t unitType);
- static void addMissleLaunchPuff(const iXY &worldPos, const fXY &direction,
BYTE unitType);
- static void addMissleFlightPuff(const iXY &worldPos, const fXY &direction,
float &curWait, float &totalWait, BYTE unitType);
+ static void addMissleLaunchPuff(const iXY &worldPos, const fXY &direction,
uint8_t unitType);
+ static void addMissleFlightPuff(const iXY &worldPos, const fXY &direction,
float &curWait, float &totalWait, uint8_t unitType);
static void addMissleExplosion(const iXY &worldPos);
- //static void addMuzzlePuff(const fXYZ &muzzlePos, const fXYZ &direction,
BYTE unitType);
- static void addMuzzlePuff(const fXYZ &worldPos, const fXYZ &direction, int
frame, BYTE unitType);
+ //static void addMuzzlePuff(const fXYZ &muzzlePos, const fXYZ &direction,
uint8_t unitType);
+ static void addMuzzlePuff(const fXYZ &worldPos, const fXYZ &direction, int
frame, uint8_t unitType);
static void addDirtKick(const iXY &worldPos);
static void addCloudParticle(int count = 1);
Index: netpanzer/src/Lib/Particles/SnowParticle2D.hpp
diff -u netpanzer/src/Lib/Particles/SnowParticle2D.hpp:1.3
netpanzer/src/Lib/Particles/SnowParticle2D.hpp:1.4
--- netpanzer/src/Lib/Particles/SnowParticle2D.hpp:1.3 Tue Sep 16 16:16:09 2003
+++ netpanzer/src/Lib/Particles/SnowParticle2D.hpp Sun Oct 5 09:50:10 2003
@@ -32,9 +32,9 @@
fXYZ pos;
float totalTime;
float color;
- BYTE size;
+ uint8_t size;
float age;
- BYTE lifetime;
+ uint8_t lifetime;
float timeElapsedPeriod;
public:
Index: netpanzer/src/Lib/Types/fRect.cpp
diff -u netpanzer/src/Lib/Types/fRect.cpp:1.5
netpanzer/src/Lib/Types/fRect.cpp:1.6
--- netpanzer/src/Lib/Types/fRect.cpp:1.5 Tue Sep 16 16:16:10 2003
+++ netpanzer/src/Lib/Types/fRect.cpp Sun Oct 5 09:50:10 2003
@@ -18,16 +18,14 @@
#include <config.h>
#include <algorithm>
-#include "codewiz.hpp"
#include "fRect.hpp"
fRect fRect::operator | (const fRect &a)
{
- if (getIsEmpty()) {
+ if (isEmpty())
return a;
- } else if (a.getIsEmpty()) {
+ if (a.isEmpty())
return *this;
- }
return fRect(std::min(min.x, a.min.x), std::min(min.y, a.min.y),
std::max(max.x, a.max.x), std::max(max.y, a.max.y));
Index: netpanzer/src/Lib/Types/fRect.hpp
diff -u netpanzer/src/Lib/Types/fRect.hpp:1.4
netpanzer/src/Lib/Types/fRect.hpp:1.5
--- netpanzer/src/Lib/Types/fRect.hpp:1.4 Tue Sep 16 16:16:10 2003
+++ netpanzer/src/Lib/Types/fRect.hpp Sun Oct 5 09:50:10 2003
@@ -26,9 +26,7 @@
fXY min;
fXY max;
- fRect()
- {}
- fRect(float x1, float y1, float x2, float y2)
+ fRect(float x1=0, float y1=0, float x2=0, float y2=0)
{
min.x = x1;
min.y = y1;
@@ -46,38 +44,18 @@
fRect::max = max;
}
- inline bool getIsEmpty() const
- {
- return min.x > max.x || min.y > max.x;
- }
-
- void setEmpty()
- {
- min.x = min.y = +1;
- max.x = max.y = -1;
- }
-
- inline fXY getSize() const
+ fXY getSize() const
{
return max - min;
}
- inline float getSizeX() const
- {
- return max.x - min.x;
- }
- inline float getSizeY() const
- {
- return max.y - min.y;
- }
-
- inline void translate(fXY offset)
+ void translate(fXY offset)
{
max += offset;
min += offset;
}
- inline float getArea() const
+ float getArea() const
{
fXY s = getSize();
@@ -89,36 +67,37 @@
fRect operator | (const fRect &a);
- inline bool getContains(const fXY &a) const
+ bool getContains(const fXY &a) const
{
return
a.x >= min.x && a.x < max.x &&
a.y >= min.y && a.y < max.y;
}
- inline bool operator ==(const fRect &a) const
+ bool operator ==(const fRect &a) const
{
return min == a.max && min == a.max;
}
- inline bool operator !=(const fRect &a) const
+ bool operator !=(const fRect &a) const
{
return min.x != a.max.x || min.y != a.max.y;
}
- inline void zero()
+ void zero()
{
- min.x = min.y = max.x = max.y = 0.0f;
+ min.zero();
+ max.zero();
}
- inline fRect &operator =(const unsigned a)
+ bool isZero() const
{
- min.x = a;
- min.y = a;
- max.x = a;
- max.y = a;
+ return min.isZero() && max.isZero();
+ }
- return *this;
+ bool isEmpty() const
+ {
+ return min.x > max.x || min.y > max.y;
}
};
Index: netpanzer/src/Lib/Types/fXY.hpp
diff -u netpanzer/src/Lib/Types/fXY.hpp:1.3 netpanzer/src/Lib/Types/fXY.hpp:1.4
--- netpanzer/src/Lib/Types/fXY.hpp:1.3 Tue Sep 16 16:16:10 2003
+++ netpanzer/src/Lib/Types/fXY.hpp Sun Oct 5 09:50:10 2003
@@ -36,153 +36,91 @@
y = a.y;
}
- inline fXY &operator =(const fXY &a)
+ fXY &operator =(const fXY &a)
{
x = a.x;
y = a.y;
return *this;
}
- inline fXY &operator =(float a)
- {
- x = a;
- y = a;
- return *this;
- }
-
- inline fXY &operator +=(const fXY &a)
+ fXY &operator +=(const fXY &a)
{
x += a.x; y += a.y; return *this;
}
- inline fXY &operator -=(const fXY &a)
+ fXY &operator -=(const fXY &a)
{
x -= a.x; y -= a.y; return *this;
}
- inline fXY &operator *=(const fXY &a)
+ fXY &operator *=(const fXY &a)
{
x *= a.x; y *= a.y; return *this;
}
- inline fXY &operator /=(const fXY &a)
- {
- x /= a.x; y /= a.y; return *this;
- }
- inline fXY &operator *=(float a)
+ fXY &operator *=(float a)
{
x *= a; y *= a; return *this;
}
- inline fXY &operator /=(float a)
+ fXY &operator /=(float a)
{
x /= a; y /= a; return *this;
}
- inline bool operator <=(const fXY &a)
- {
- if (x <= a.x && y <= a.y) return true; return false;
- }
- inline bool operator <=(float a)
- {
- if (x <= a && y <= a) return true; return false;
- }
- inline bool operator >=(const fXY &a)
- {
- if (x >= a.x && y >= a.y) return true; return false;
- }
- inline bool operator >=(float a)
- {
- if (x >= a && y >= a) return true; return false;
- }
- inline bool operator <(const fXY &a)
- {
- if (x < a.x && y < a.y) return true; return false;
- }
- inline bool operator <(float a)
- {
- if (x < a && y < a) return true; return false;
- }
- inline bool operator >(const fXY &a)
- {
- if (x > a.x && y > a.y) return true; return false;
- }
- inline bool operator >(float a)
- {
- if (x > a && y > a) return true; return false;
- }
-
- inline fXY operator + (const fXY &a) const
+ fXY operator + (const fXY &a) const
{
return fXY(x + a.x, y + a.y);
}
- inline fXY operator - (const fXY &a) const
+ fXY operator - (const fXY &a) const
{
return fXY(x - a.x, y - a.y);
}
- inline fXY operator * (const fXY &a) const
+ fXY operator * (const fXY &a) const
{
return fXY(x * a.x, y * a.y);
}
- inline fXY operator / (const fXY &a) const
- {
- return fXY(x / a.x, y / a.y);
- }
- inline fXY operator + (float a) const
- {
- return fXY(x + a, y + a);
- }
- inline fXY operator - (float a) const
- {
- return fXY(x - a, y - a);
- }
- inline fXY operator * (float a) const
+ fXY operator * (float a) const
{
return fXY(x * a, y * a);
}
- inline fXY operator / (float a) const
+ fXY operator / (float a) const
{
return fXY(x / a, y / a);
}
- inline bool operator ==(const fXY &a) const
+ bool operator ==(const fXY &a) const
{
return x == a.x && y == a.y;
}
- inline bool operator ==(float a) const
- {
- return x == a && y == a;
- }
-
- inline bool operator !=(const fXY &a) const
+ bool operator !=(const fXY &a) const
{
return x != a.x || y != a.y;
}
- inline bool operator !=(float a) const
- {
- return x != a && y != a;
- }
-
// Negation.
- inline fXY operator -() const
+ fXY operator -() const
{
return fXY(-x, -y);
}
- inline void zero()
+ void zero()
{
x = y = 0.0f;
}
+ bool isZero() const
+ {
+ return x==0 && y==0;
+ }
+
double mag() const;
- inline float mag2() const
+ float mag2() const
{
- return x * x + y * y ;
+ return x * x + y * y ;
}
- inline double getArea() const
+ double getArea() const
{
return x * y;
}
-
};
//---------------------------------------------------------------------------
Index: netpanzer/src/Lib/Types/fXYZ.hpp
diff -u netpanzer/src/Lib/Types/fXYZ.hpp:1.3
netpanzer/src/Lib/Types/fXYZ.hpp:1.4
--- netpanzer/src/Lib/Types/fXYZ.hpp:1.3 Tue Sep 16 16:16:10 2003
+++ netpanzer/src/Lib/Types/fXYZ.hpp Sun Oct 5 09:50:10 2003
@@ -22,9 +22,6 @@
#include "fXY.hpp"
-class Matrix;
-struct XForm;
-
// fXYZ class declarations.
//---------------------------------------------------------------------------
struct fXYZ
@@ -35,14 +32,7 @@
static const fXYZ ZERO;
- fXYZ()
- {
- x = 0.0;
- y = 0.0;
- z = 0.0;
- }
-
- fXYZ(float x, float y, float z)
+ fXYZ(float x=0, float y=0, float z=0)
{
this->x = x;
this->y = y;
@@ -56,7 +46,7 @@
z = a.z;
}
- inline fXYZ &operator =(const fXYZ &a)
+ fXYZ &operator =(const fXYZ &a)
{
x = a.x;
y = a.y;
@@ -64,90 +54,70 @@
return *this;
}
- inline fXYZ &operator =(const float a)
- {
- x = a;
- y = a;
- z = a;
- return *this;
- }
-
- inline bool operator !=(const fXYZ &a)
+ bool operator !=(const fXYZ &a)
{
if (x != a.x || x != a.y || x != a.z) return true;
else return false;
}
- inline bool operator !=(const float a)
- {
- if (x != a || y != a || z != a) return true;
- else return false;
- }
-
- inline fXYZ &operator +=(const fXYZ &a)
+ fXYZ &operator +=(const fXYZ &a)
{
x += a.x; y += a.y; z += a.z; return *this;
}
- inline fXYZ &operator -=(const fXYZ &a)
+ fXYZ &operator -=(const fXYZ &a)
{
x -= a.x; y -= a.y; z -= a.z; return *this;
}
- inline fXYZ &operator *=( float a)
+ fXYZ &operator *=( float a)
{
x *= a; y *= a; z *= a; return *this;
}
- inline fXYZ &operator *=(const fXYZ &a)
+ fXYZ &operator *=(const fXYZ &a)
{
x *= a.x; y *= a.y; z *= a.z; return *this;
}
- inline fXYZ &operator /=( float a)
+ fXYZ &operator /=( float a)
{
x /= a; y /= a; z /= a; return *this;
}
- inline int operator <=(const float &a)
- {
- if (x <= a && y <= a && z <= a) return 1;
- else return 0;
- }
-
- inline fXYZ operator + (const fXYZ &a) const
+ fXYZ operator + (const fXYZ &a) const
{
return fXYZ(x + a.x, y + a.y, z + a.z);
}
- inline fXYZ operator - (const fXYZ &a) const
+ fXYZ operator - (const fXYZ &a) const
{
return fXYZ(x - a.x, y - a.y, z - a.z);
}
- inline fXYZ operator * (float a ) const
+ fXYZ operator * (float a ) const
{
return fXYZ(x * a, y * a, z * a);
}
- inline fXYZ operator / (float a ) const
+ fXYZ operator / (float a ) const
{
return fXYZ(x / a, y / a, z / a);
}
- inline double mag () const
+ double mag () const
{
return sqrt(x * x + y * y + z * z);
}
- inline double mag2 () const
+ double mag2 () const
{
return x * x + y * y + z * z;
}
- inline fXYZ getNormal() const
+ fXYZ getNormal() const
{
double a = 1.0 / sqrt(x * x + y * y + z * z);
return fXYZ(x * a, y * a, z * a);
}
- inline fXYZ &normalize()
+ fXYZ &normalize()
{
return *this /= float(mag());
}
- inline fXY project() const
+ fXY project() const
{
if (z <= 1.0) return fXY(x, y);
@@ -155,30 +125,18 @@
}
// Negation.
- inline fXYZ operator -() const
+ fXYZ operator -() const
{
return fXYZ(-x, -y, -z);
}
- // These are defined in matrix.cpp
- fXYZ operator * (const Matrix &m) const;
- fXYZ &operator *=(const Matrix &m);
- fXYZ operator / (const Matrix &m) const;
- fXYZ &operator /=(const Matrix &m);
- fXYZ operator * (const XForm &t) const;
- fXYZ &operator *=(const XForm &t);
- fXYZ operator / (const XForm &t) const;
- fXYZ &operator /=(const XForm &t);
-
- inline void zero()
+ void zero()
{
x = y = z = 0.0;
}
+}; // end fXYZ
-}
-; // end fXYZ
-
-inline fXYZ cross(const fXYZ &a, const fXYZ &b)
+static inline fXYZ cross(const fXYZ &a, const fXYZ &b)
{
return fXYZ(
a.y * b.z - b.y * a.z,
@@ -186,23 +144,23 @@
a.x * b.y - b.x * a.y);
}
-inline float dot(const fXYZ &a, const fXYZ &b)
+static inline float dot(const fXYZ &a, const fXYZ &b)
{
return a.x * b.x + a.y * b.y + a.z * b.z;
}
-inline double distance (const fXYZ &a, const fXYZ &b)
+static inline double distance (const fXYZ &a, const fXYZ &b)
{
return (a - b).mag();
}
-inline double distance2(const fXYZ &a, const fXYZ &b)
+static inline double distance2(const fXYZ &a, const fXYZ &b)
{
return (a - b).mag2();
}
//---------------------------------------------------------------------------
-inline fXYZ crossProduct(const fXYZ &a, const fXYZ &b)
+static inline fXYZ crossProduct(const fXYZ &a, const fXYZ &b)
{
return fXYZ(
(a.y * b.z) - (a.z * b.y),
Index: netpanzer/src/Lib/Types/iRect.cpp
diff -u netpanzer/src/Lib/Types/iRect.cpp:1.5
netpanzer/src/Lib/Types/iRect.cpp:1.6
--- netpanzer/src/Lib/Types/iRect.cpp:1.5 Tue Sep 16 16:16:10 2003
+++ netpanzer/src/Lib/Types/iRect.cpp Sun Oct 5 09:50:10 2003
@@ -18,19 +18,18 @@
#include <config.h>
#include <algorithm>
-#include "codewiz.hpp"
#include "iRect.hpp"
iRect iRect::operator | (const iRect &a)
{
- if (getIsEmpty()) {
+ if (isEmpty())
return a;
- } else if (a.getIsEmpty()) {
+ if(a.isEmpty())
return *this;
- }
return iRect(
std::min(min.x, a.min.x), std::min(min.y, a.min.y),
std::max(max.x, a.max.x), std::max(max.y, a.max.y)
);
}
+
Index: netpanzer/src/Lib/Types/iRect.hpp
diff -u netpanzer/src/Lib/Types/iRect.hpp:1.3
netpanzer/src/Lib/Types/iRect.hpp:1.4
--- netpanzer/src/Lib/Types/iRect.hpp:1.3 Tue Sep 16 16:16:10 2003
+++ netpanzer/src/Lib/Types/iRect.hpp Sun Oct 5 09:50:10 2003
@@ -48,17 +48,6 @@
iRect::max = max;
}
- inline bool getIsEmpty() const
- {
- return min.x > max.x || min.y > max.x;
- }
-
- void setEmpty()
- {
- min.x = min.y = +1;
- max.x = max.y = -1;
- }
-
inline iXY getSize() const
{
return max - min;
@@ -79,6 +68,11 @@
min += offset;
}
+ bool isEmpty() const
+ {
+ return min.x >= max.x || min.y >= max.y;
+ }
+
inline int getArea() const
{
iXY s = getSize();
@@ -100,23 +94,12 @@
inline bool operator ==(const iRect &a)
{
- return min == a.max && min == a.max;
+ return min == a.min && max == a.max;
}
inline bool operator !=(const iRect &a)
{
- return min.x != a.max.x || min.y != a.max.y;
- }
-
- inline iRect &operator =(const unsigned a)
- {
- min.x = a;
- min.y = a;
- max.x = a;
- max.y = a;
-
- return *this;
-
+ return min != a.min || max != a.max;
}
inline void zero()
@@ -127,13 +110,11 @@
inline bool clip( const iRect &a )
{
if ( (a.min.y >= max.y) || (a.max.y <= min.y) ||
- (a.min.x >= max.x) || (a.max.x <= min.x)
- )
- return( true );
+ (a.min.x >= max.x) || (a.max.x <= min.x) )
+ return true;
- return( false );
+ return false;
}
-
};
#endif // __iRect_hpp__
Index: netpanzer/src/Lib/Types/iXY.hpp
diff -u netpanzer/src/Lib/Types/iXY.hpp:1.3 netpanzer/src/Lib/Types/iXY.hpp:1.4
--- netpanzer/src/Lib/Types/iXY.hpp:1.3 Mon Sep 22 09:53:49 2003
+++ netpanzer/src/Lib/Types/iXY.hpp Sun Oct 5 09:50:10 2003
@@ -35,179 +35,101 @@
y = a.y;
}
- inline iXY &operator =(const iXY &a)
+ iXY &operator =(const iXY &a)
{
x = a.x;
y = a.y;
return *this;
}
- inline iXY &operator =(const int &a)
- {
- x = a;
- y = a;
- return *this;
- }
-
- inline iXY &operator +=(const iXY &a)
+ iXY &operator +=(const iXY &a)
{
x += a.x; y += a.y; return *this;
}
- inline iXY &operator +=(int a)
- {
- x += a; y += a; return *this;
- }
- inline iXY &operator -=(const iXY &a)
+ iXY &operator -=(const iXY &a)
{
x -= a.x; y -= a.y; return *this;
}
- inline iXY &operator -=(int a)
- {
- x -= a; y -= a; return *this;
- }
- inline iXY &operator *=(const iXY &a)
+ iXY &operator *=(const iXY &a)
{
x *= a.x; y *= a.y; return *this;
}
- inline iXY &operator *=(int a)
+ iXY &operator *=(int a)
{
x *= a; y *= a; return *this;
}
- inline iXY &operator /=(const iXY &a)
- {
- x /= a.x; y /= a.y; return *this;
- }
- inline iXY &operator /=(int a)
+ iXY &operator /=(int a)
{
x /= a; y /= a; return *this;
}
- inline bool operator <=(const iXY &a)
- {
- if (x <= a.x && y <= a.y) return true; return false;
- }
- inline bool operator <=(int a)
- {
- if (x <= a && y <= a) return true; return false;
- }
- inline bool operator >=(const iXY &a)
- {
- if (x >= a.x && y >= a.y) return true; return false;
- }
- inline bool operator >=(int a)
- {
- if (x >= a && y >= a) return true; return false;
- }
- inline bool operator <(const iXY &a)
- {
- if (x < a.x && y < a.y) return true; return false;
- }
- inline bool operator <(int a)
- {
- if (x < a && y < a) return true; return false;
- }
- inline bool operator >(const iXY &a)
- {
- if (x > a.x && y > a.y) return true; return false;
- }
- inline bool operator >(int a)
- {
- if (x > a && y > a) return true; return false;
- }
-
- inline iXY operator + (const iXY &a) const
+ iXY operator + (const iXY &a) const
{
return iXY(x + a.x, y + a.y);
}
- inline iXY operator - (const iXY &a) const
+ iXY operator - (const iXY &a) const
{
return iXY(x - a.x, y - a.y);
}
- inline iXY operator * (const iXY &a) const
+ iXY operator * (const iXY &a) const
{
return iXY(x * a.x, y * a.y);
}
- inline iXY operator / (const iXY &a) const
- {
- return iXY(x / a.x, y / a.y);
- }
- inline iXY operator % (const iXY &a) const
- {
- return iXY(x % a.x, y % a.y);
- }
- inline iXY operator + (int a) const
- {
- return iXY(x + a, y + a);
- }
- inline iXY operator - (int a) const
- {
- return iXY(x - a, y - a);
- }
- inline iXY operator * (int a) const
+ iXY operator * (int a) const
{
return iXY(x * a, y * a);
}
- inline iXY operator / (int a) const
+ iXY operator / (int a) const
{
return iXY(x / a, y / a);
}
- inline iXY operator % (int a) const
- {
- return iXY(x % a, y % a);
- }
- inline bool operator ==(const iXY &a) const
+ bool operator ==(const iXY &a) const
{
return x == a.x && y == a.y;
}
- inline bool operator ==(int a) const
- {
- return x == a && y == a;
- }
-
- inline bool operator !=(const iXY &a) const
+ bool operator !=(const iXY &a) const
{
return x != a.x || y != a.y;
}
- inline bool operator !=(int a) const
- {
- return x != a && y != a;
- }
-
// Negation.
- inline iXY operator -() const
+ iXY operator -() const
{
return iXY(-x, -y);
}
- inline void zero()
+ void zero()
{
x = y = 0;
}
+ bool isZero() const
+ {
+ return x==0 && y==0;
+ }
+
double mag() const;
- inline float mag2() const
+ float mag2() const
{
return float(x * x + y * y);
}
- inline int getArea() const
+ int getArea() const
{
return x * y;
}
-
};
//---------------------------------------------------------------------------
-inline double distance(const iXY &a, const iXY &b)
+static inline double distance(const iXY &a, const iXY &b)
{
return (a - b).mag();
}
//---------------------------------------------------------------------------
-inline float distance2(const iXY &a, const iXY &b)
+static inline float distance2(const iXY &a, const iXY &b)
{
return (a - b).mag2();
}
Index: netpanzer/src/Lib/View/Choice.cpp
diff -u netpanzer/src/Lib/View/Choice.cpp:1.8
netpanzer/src/Lib/View/Choice.cpp:1.9
--- netpanzer/src/Lib/View/Choice.cpp:1.8 Fri Oct 3 10:45:00 2003
+++ netpanzer/src/Lib/View/Choice.cpp Sun Oct 5 09:50:10 2003
@@ -108,7 +108,6 @@
// Make sure the choice is still on the screen.
assert (min.y >= 0);
}
- assert(min + size < parentDimensions);
} else if (me.getID() == mMouseEvent::MOUSE_EVENT_DRAGGED &&
(me.getModifiers() & InputEvent::BUTTON1_MASK)) {
isOpen = true;
@@ -124,7 +123,6 @@
r.translate(iXY(0, ChoiceItemHeight));
}
- assert(min + size < parentDimensions);
} else if ( me.getID() == mMouseEvent::MOUSE_EVENT_CLICKED &&
(me.getModifiers() & InputEvent::BUTTON1_MASK)) {
//assert(isOpen);
@@ -146,7 +144,6 @@
callback->stateChanged(this);
// Since an item was selected, find which item was selected.
- assert(min + size < parentDimensions);
} else if ( me.getID() == mMouseEvent::MOUSE_EVENT_RELEASED &&
(me.getModifiers() & InputEvent::BUTTON1_MASK)) {
//assert(!isOpen);
@@ -166,10 +163,7 @@
index = mouseover;
if(callback)
callback->stateChanged(this);
-
- assert(min + size < parentDimensions);
}
-
}
// draw
@@ -219,13 +213,10 @@
s.bltStringShadowedCenter(choiceList[i], Color::white,
Color::black);
}
- assert(r.max < parentDimensions);
r.translate(iXY(0, ChoiceItemHeight));
}
}
-
//isOpen = 0;
-
} // end Choice::draw
// add
Index: netpanzer/src/Lib/View/Component.hpp
diff -u netpanzer/src/Lib/View/Component.hpp:1.6
netpanzer/src/Lib/View/Component.hpp:1.7
--- netpanzer/src/Lib/View/Component.hpp:1.6 Thu Sep 18 13:44:18 2003
+++ netpanzer/src/Lib/View/Component.hpp Sun Oct 5 09:50:11 2003
@@ -18,6 +18,8 @@
#ifndef __Component_hpp__
#define __Component_hpp__
+#include <stdint.h>
+
#include "Color.hpp"
#include "Surface.hpp"
#include "iXY.hpp"
@@ -31,8 +33,8 @@
class Component : public NoCopy
{
protected:
- BYTE background;
- BYTE foreground;
+ uint8_t background;
+ uint8_t foreground;
iXY size;
iXY min;
Surface surface;
@@ -74,7 +76,7 @@
{
return contains(p.x, p.y);
}
- inline BYTE getBackground() const
+ inline uint8_t getBackground() const
{
return background;
}
@@ -84,7 +86,7 @@
r.min = min;
r.max = min + size;
}
- inline BYTE getForeground() const
+ inline uint8_t getForeground() const
{
return foreground;
}
@@ -118,7 +120,7 @@
return visible;
}
- void setBackground(BYTE color)
+ void setBackground(uint8_t color)
{}
void setBounds(const iRect &r)
{
Index: netpanzer/src/Lib/View/Desktop.hpp
diff -u netpanzer/src/Lib/View/Desktop.hpp:1.7
netpanzer/src/Lib/View/Desktop.hpp:1.8
--- netpanzer/src/Lib/View/Desktop.hpp:1.7 Fri Oct 3 10:45:01 2003
+++ netpanzer/src/Lib/View/Desktop.hpp Sun Oct 5 09:50:11 2003
@@ -21,7 +21,6 @@
#define __Desktop_hpp__
#include <vector>
-#include "LibTypes.hpp"
#include "View.hpp"
#include "cTimeStamp.hpp"
Index: netpanzer/src/Lib/View/ScrollBar.cpp
diff -u netpanzer/src/Lib/View/ScrollBar.cpp:1.6
netpanzer/src/Lib/View/ScrollBar.cpp:1.7
--- netpanzer/src/Lib/View/ScrollBar.cpp:1.6 Fri Oct 3 10:45:01 2003
+++ netpanzer/src/Lib/View/ScrollBar.cpp Sun Oct 5 09:50:11 2003
@@ -29,7 +29,7 @@
// ScrollBar
//---------------------------------------------------------------------------
-ScrollBar::ScrollBar(int orientation)
+ScrollBar::ScrollBar(Orientation orientation)
{
reset();
@@ -39,7 +39,7 @@
// ScrollBar
//---------------------------------------------------------------------------
-ScrollBar::ScrollBar(int orientation, int value, int visible, int minimum, int
maximum)
+ScrollBar::ScrollBar(Orientation orientation, int value, int visible, int
minimum, int maximum)
{
reset();
@@ -61,7 +61,7 @@
blockIncrement = DEFAULT_BLOCK_INCREMENT;
minimum = DEFAULT_MINIMUM;
maximum = DEFAULT_MAXIMUM;
- orientation = DEFAULT_ORIENTATION;
+ orientation = VERTICAL;
value = DEFAULT_VALUE;
unitIncrement = DEFAULT_UNIT_INCREMENT;
viewableAmount = 0;
Index: netpanzer/src/Lib/View/ScrollBar.hpp
diff -u netpanzer/src/Lib/View/ScrollBar.hpp:1.3
netpanzer/src/Lib/View/ScrollBar.hpp:1.4
--- netpanzer/src/Lib/View/ScrollBar.hpp:1.3 Tue Sep 16 16:16:11 2003
+++ netpanzer/src/Lib/View/ScrollBar.hpp Sun Oct 5 09:50:11 2003
@@ -25,11 +25,15 @@
//--------------------------------------------------------------------------
class ScrollBar : public Component
{
+public:
+ enum Orientation {
+ HORIZONTAL, VERTICAL
+ };
+
private:
enum { DEFAULT_BLOCK_INCREMENT = 1 };
enum { DEFAULT_MINIMUM = 0 };
enum { DEFAULT_MAXIMUM = 100 };
- enum { DEFAULT_ORIENTATION = VERTICAL };
enum { DEFAULT_VALUE = 0 };
enum { DEFAULT_UNIT_INCREMENT = 1 };
enum { MINOR_AXIS_SIZE = 12 };
@@ -37,7 +41,7 @@
int blockIncrement;
int minimum;
int maximum;
- int orientation;
+ Orientation orientation;
int unitIncrement;
int value;
int viewableAmount; // The total number of viewable items.
@@ -54,8 +58,8 @@
public:
ScrollBar();
- ScrollBar(int orientation);
- ScrollBar(int orientation, int value, int visible, int minimum, int
maximum);
+ ScrollBar(Orientation orientation);
+ ScrollBar(Orientation orientation, int value, int visible, int minimum,
int maximum);
virtual ~ScrollBar()
{}
@@ -97,7 +101,7 @@
{
ScrollBar::minimum = minimum;
}
- void setOrientation(int orientation)
+ void setOrientation(Orientation orientation)
{
ScrollBar::orientation = orientation;
}
@@ -112,8 +116,6 @@
virtual void draw(const Surface &dest);
virtual void actionPerformed(const iXY &pos);
-
-}
-; // end ScrollBar
+}; // end ScrollBar
#endif // end __ScrollBar_hpp__
Index: netpanzer/src/Lib/View/String.hpp
diff -u netpanzer/src/Lib/View/String.hpp:1.4
netpanzer/src/Lib/View/String.hpp:1.5
--- netpanzer/src/Lib/View/String.hpp:1.4 Tue Sep 16 16:16:11 2003
+++ netpanzer/src/Lib/View/String.hpp Sun Oct 5 09:50:11 2003
@@ -22,8 +22,6 @@
#include <assert.h>
#include <iostream>
-#include "codewiz.hpp"
-
using std::ostream;
using std::istream;
Index: netpanzer/src/Lib/View/View.hpp
diff -u netpanzer/src/Lib/View/View.hpp:1.8 netpanzer/src/Lib/View/View.hpp:1.9
--- netpanzer/src/Lib/View/View.hpp:1.8 Fri Oct 3 10:45:02 2003
+++ netpanzer/src/Lib/View/View.hpp Sun Oct 5 09:50:11 2003
@@ -19,6 +19,8 @@
#ifndef __View_hpp__
#define __View_hpp__
+#include <stdint.h>
+
#include "cMouse.hpp"
#include "cGrowList.hpp"
#include "cButton.hpp"
@@ -39,8 +41,8 @@
public:
iXY pos;
char *label;
- BYTE foreColor;
- BYTE backColor;
+ uint8_t foreColor;
+ uint8_t backColor;
bool isShadowed;
}
; // end cLabel
@@ -250,7 +252,7 @@
virtual void rMouseUp();
virtual void rMouseDrag(const iXY &downPos, const iXY &prevPos, const iXY
&newPos);
virtual void rMouseDouble(const iXY &pos);
- //virtual void keyDown(BYTE keyCode);
+ //virtual void keyDown(uint8_t keyCode);
virtual void mouseEnter(const iXY &pos);
virtual void mouseExit(const iXY &pos);
//virtual void keyUp();
Index: netpanzer/src/Lib/View/ViewGlobals.cpp
diff -u netpanzer/src/Lib/View/ViewGlobals.cpp:1.4
netpanzer/src/Lib/View/ViewGlobals.cpp:1.5
--- netpanzer/src/Lib/View/ViewGlobals.cpp:1.4 Tue Sep 16 16:16:11 2003
+++ netpanzer/src/Lib/View/ViewGlobals.cpp Sun Oct 5 09:50:12 2003
@@ -20,15 +20,15 @@
#include "ViewGlobals.hpp"
-BYTE gForeground = 0;
-BYTE gBackground = 0;
+uint8_t gForeground = 0;
+uint8_t gBackground = 0;
-void setForeground(BYTE color)
+void setForeground(uint8_t color)
{
gForeground = color;
}
-void setBackground(BYTE color)
+void setBackground(uint8_t color)
{
gBackground = color;
}
Index: netpanzer/src/Lib/View/ViewGlobals.hpp
diff -u netpanzer/src/Lib/View/ViewGlobals.hpp:1.2
netpanzer/src/Lib/View/ViewGlobals.hpp:1.3
--- netpanzer/src/Lib/View/ViewGlobals.hpp:1.2 Tue Sep 16 16:16:11 2003
+++ netpanzer/src/Lib/View/ViewGlobals.hpp Sun Oct 5 09:50:12 2003
@@ -18,7 +18,7 @@
#ifndef __ViewGlobals_hpp__
#define __ViewGlobals_hpp__
-#include "LibTypes.hpp"
+#include <stdint.h>
#define topLeftBorderColor (Color::white)
#define bottomRightBorderColor (Color::black)
@@ -34,10 +34,10 @@
#define inactiveWindowTitleTextColor (Color::black)
#define inactiveWindowTitleBodyColor (Color::terreVerte)
-extern BYTE gForeground;
-extern BYTE gBackground;
+extern uint8_t gForeground;
+extern uint8_t gBackground;
-void setForeground(BYTE color);
-void setBackground(BYTE color);
+void setForeground(uint8_t color);
+void setBackground(uint8_t color);
#endif // end __ViewGlobals_hpp__
Index: netpanzer/src/NetPanzer/Classes/Network/ClientServerNetMessage.hpp
diff -u netpanzer/src/NetPanzer/Classes/Network/ClientServerNetMessage.hpp:1.4
netpanzer/src/NetPanzer/Classes/Network/ClientServerNetMessage.hpp:1.5
--- netpanzer/src/NetPanzer/Classes/Network/ClientServerNetMessage.hpp:1.4
Tue Sep 16 16:16:11 2003
+++ netpanzer/src/NetPanzer/Classes/Network/ClientServerNetMessage.hpp Sun Oct
5 09:50:12 2003
@@ -18,9 +18,10 @@
#ifndef _CLIENT_SERVER_NETMESSAGE_HPP
#define _CLIENT_SERVER_NETMESSAGE_HPP
+#include <stdint.h>
+
#include "NetPacket.hpp"
#include "PlayerID.hpp"
-#include "codewiz.hpp"
enum { _net_message_id_transport_client_accept,
_net_message_id_client_connect_ack,
@@ -40,7 +41,7 @@
class TransportClientAccept : public NetMessage
{
public:
- DWORD client_transport_id;
+ uint32_t client_transport_id;
TransportClientAccept()
{
@@ -53,7 +54,7 @@
class ClientMesgConnectAck : public NetMessage
{
public:
- DWORD client_transport_id;
+ uint32_t client_transport_id;
ClientMesgConnectAck()
{
Index: netpanzer/src/NetPanzer/Classes/Network/NetPacketQueues.cpp
diff -u netpanzer/src/NetPanzer/Classes/Network/NetPacketQueues.cpp:1.6
netpanzer/src/NetPanzer/Classes/Network/NetPacketQueues.cpp:1.7
--- netpanzer/src/NetPanzer/Classes/Network/NetPacketQueues.cpp:1.6 Tue Sep
16 16:16:11 2003
+++ netpanzer/src/NetPanzer/Classes/Network/NetPacketQueues.cpp Sun Oct 5
09:50:12 2003
@@ -19,7 +19,6 @@
#include "Log.hpp"
#include "NetPacketQueues.hpp"
-#include "codewiz.hpp"
#include "ConsoleInterface.hpp"
#define _DEFAULT_WINDOW_TIME (0.15) // in (seconds) 150ms
Index: netpanzer/src/NetPanzer/Classes/Network/NetworkClient.cpp
diff -u netpanzer/src/NetPanzer/Classes/Network/NetworkClient.cpp:1.8
netpanzer/src/NetPanzer/Classes/Network/NetworkClient.cpp:1.9
--- netpanzer/src/NetPanzer/Classes/Network/NetworkClient.cpp:1.8 Tue Sep
16 16:16:11 2003
+++ netpanzer/src/NetPanzer/Classes/Network/NetworkClient.cpp Sun Oct 5
09:50:12 2003
@@ -30,7 +30,6 @@
#include "PlayerInterface.hpp"
#include "ClientConnectDaemon.hpp"
-#include "codewiz.hpp"
#include "ConsoleInterface.hpp"
NetworkClient::NetworkClient( void )
Index: netpanzer/src/NetPanzer/Classes/Network/NetworkClient.hpp
diff -u netpanzer/src/NetPanzer/Classes/Network/NetworkClient.hpp:1.6
netpanzer/src/NetPanzer/Classes/Network/NetworkClient.hpp:1.7
--- netpanzer/src/NetPanzer/Classes/Network/NetworkClient.hpp:1.6 Tue Sep
16 16:16:11 2003
+++ netpanzer/src/NetPanzer/Classes/Network/NetworkClient.hpp Sun Oct 5
09:50:12 2003
@@ -18,7 +18,6 @@
#ifndef _NETWORK_CLIENT_HPP
#define _NETWORK_CLIENT_HPP
-#include "codewiz.hpp"
#include "NetworkInterface.hpp"
#include "NetworkReturnCodes.hpp"
@@ -72,7 +71,7 @@
Timer keep_alive_timer;
void updateKeepAliveState( void );
- DWORD client_transport_id;
+ uint32_t client_transport_id;
unsigned short connection_type;
unsigned short connection_status;
Index: netpanzer/src/NetPanzer/Classes/Network/NetworkInterface.cpp
diff -u netpanzer/src/NetPanzer/Classes/Network/NetworkInterface.cpp:1.6
netpanzer/src/NetPanzer/Classes/Network/NetworkInterface.cpp:1.7
--- netpanzer/src/NetPanzer/Classes/Network/NetworkInterface.cpp:1.6 Tue Sep
16 16:16:11 2003
+++ netpanzer/src/NetPanzer/Classes/Network/NetworkInterface.cpp Sun Oct
5 09:50:12 2003
@@ -19,7 +19,6 @@
#include "Log.hpp"
#include "NetworkInterface.hpp"
-#include "codewiz.hpp"
NetPacket TEMP_PACKET;
Index: netpanzer/src/NetPanzer/Classes/Network/ServerConnectDaemon.cpp
diff -u netpanzer/src/NetPanzer/Classes/Network/ServerConnectDaemon.cpp:1.6
netpanzer/src/NetPanzer/Classes/Network/ServerConnectDaemon.cpp:1.7
--- netpanzer/src/NetPanzer/Classes/Network/ServerConnectDaemon.cpp:1.6 Tue Sep
16 16:16:11 2003
+++ netpanzer/src/NetPanzer/Classes/Network/ServerConnectDaemon.cpp Sun Oct
5 09:50:12 2003
@@ -33,7 +33,6 @@
#include "ConnectNetMessage.hpp"
#include "SystemNetMessage.hpp"
-#include "codewiz.hpp"
#include "ConsoleInterface.hpp"
enum { _connect_state_idle,
Index: netpanzer/src/NetPanzer/Classes/Outpost.cpp
diff -u netpanzer/src/NetPanzer/Classes/Outpost.cpp:1.6
netpanzer/src/NetPanzer/Classes/Outpost.cpp:1.7
--- netpanzer/src/NetPanzer/Classes/Outpost.cpp:1.6 Mon Sep 22 09:53:50 2003
+++ netpanzer/src/NetPanzer/Classes/Outpost.cpp Sun Oct 5 09:50:12 2003
@@ -30,8 +30,6 @@
#include "ObjectiveNetMessage.hpp"
#include "UnitMessageTypes.hpp"
-#include "codewiz.hpp"
-
Outpost::Outpost( short ID, iXY location, BoundBox area )
: Objective( ID, location, area )
{
Index: netpanzer/src/NetPanzer/Classes/SelectionBoxSprite.cpp
diff -u netpanzer/src/NetPanzer/Classes/SelectionBoxSprite.cpp:1.9
netpanzer/src/NetPanzer/Classes/SelectionBoxSprite.cpp:1.10
--- netpanzer/src/NetPanzer/Classes/SelectionBoxSprite.cpp:1.9 Sat Oct 4
10:44:37 2003
+++ netpanzer/src/NetPanzer/Classes/SelectionBoxSprite.cpp Sun Oct 5
09:50:12 2003
@@ -103,7 +103,7 @@
// Draw the unit hitpoints.
if ( gameconfig->drawunitdamage || (box_state == true) ) {
// Draw a color coded hit bar.
- BYTE hitBarColor;
+ uint8_t hitBarColor;
float hitPointPercent = float(hit_points) / float(max_hit_points);
Index: netpanzer/src/NetPanzer/Classes/TileSet.cpp
diff -u netpanzer/src/NetPanzer/Classes/TileSet.cpp:1.8
netpanzer/src/NetPanzer/Classes/TileSet.cpp:1.9
--- netpanzer/src/NetPanzer/Classes/TileSet.cpp:1.8 Tue Sep 23 21:26:19 2003
+++ netpanzer/src/NetPanzer/Classes/TileSet.cpp Sun Oct 5 09:50:12 2003
@@ -28,6 +28,10 @@
#include "Exception.hpp"
#include "Gdatstct.hpp"
+// XXX hack, remove me
+#include <SDL.h>
+#include "Palette.hpp"
+
TileSet::TileSet( )
{
tile_info = 0;
@@ -353,6 +357,35 @@
computeTileConsts();
*percent_complete = 100;
+
+#if 0
+ // XXX hack for now, this should not be commited to cvs :), so if you
+ // see this remove it :)
+ Palette::init("wads/netp.act");
+ for(unsigned int i=0; i<tile_count; i++) {
+ SDL_Surface* surface = SDL_CreateRGBSurface(SDL_SWSURFACE,
+ getTileXsize(), getTileYsize(), 8, 0, 0, 0, 0);
+
+ memcpy(surface->pixels, getTile(i), getTileXsize() *
getTileYsize());
+
+ SDL_Color colors[256];
+ for(int a=0;a<256;a++) {
+ colors[a].r = Palette::color[a].red;
+ colors[a].g = Palette::color[a].green;
+ colors[a].b = Palette::color[a].blue;
+ }
+ SDL_SetColors(surface, colors, 0, 256);
+
+ std::string filename = "tileset/";
+ char buf[20];
+ sprintf(buf, "%04d", i);
+ filename += buf;
+ filename += ".bmp";
+ SDL_SaveBMP(surface, filename.c_str());
+ SDL_FreeSurface(surface);
+ }
+#endif
+
return false;
} else {
float percent;
Index: netpanzer/src/NetPanzer/Classes/UnitOpcodeEncoder.cpp
diff -u netpanzer/src/NetPanzer/Classes/UnitOpcodeEncoder.cpp:1.4
netpanzer/src/NetPanzer/Classes/UnitOpcodeEncoder.cpp:1.5
--- netpanzer/src/NetPanzer/Classes/UnitOpcodeEncoder.cpp:1.4 Tue Sep 16
16:16:11 2003
+++ netpanzer/src/NetPanzer/Classes/UnitOpcodeEncoder.cpp Sun Oct 5
09:50:12 2003
@@ -21,7 +21,6 @@
#include "Server.hpp"
#include "NetworkState.hpp"
-#include "codewiz.hpp"
#include "ConsoleInterface.hpp"
void UnitOpcodeEncoder::initialize( int send_method )
Index: netpanzer/src/NetPanzer/Classes/Units/Vehicle.cpp
diff -u netpanzer/src/NetPanzer/Classes/Units/Vehicle.cpp:1.11
netpanzer/src/NetPanzer/Classes/Units/Vehicle.cpp:1.12
--- netpanzer/src/NetPanzer/Classes/Units/Vehicle.cpp:1.11 Sat Oct 4
10:44:37 2003
+++ netpanzer/src/NetPanzer/Classes/Units/Vehicle.cpp Sun Oct 5 09:50:13 2003
@@ -29,7 +29,6 @@
// NOTE: Temp unit new sprites put in
#include "GameConfig.hpp"
-#include "codewiz.hpp"
#include "ConsoleInterface.hpp"
#include "ParticleInterface.hpp"
Index: netpanzer/src/NetPanzer/Classes/Weapons/Weapon.cpp
diff -u netpanzer/src/NetPanzer/Classes/Weapons/Weapon.cpp:1.13
netpanzer/src/NetPanzer/Classes/Weapons/Weapon.cpp:1.14
--- netpanzer/src/NetPanzer/Classes/Weapons/Weapon.cpp:1.13 Fri Oct 3
10:45:06 2003
+++ netpanzer/src/NetPanzer/Classes/Weapons/Weapon.cpp Sun Oct 5 09:50:13 2003
@@ -16,6 +16,9 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <config.h>
+
+#include <math.h>
+
#include "Weapon.hpp"
#include "UnitMessageTypes.hpp"
@@ -233,7 +236,7 @@
// Fix the goal angle around to match up with the way our angle
// measurements work. We measure with 0 pointing north, moving around
// clockwise. We also want to measure the angle from 0.0 to 1.0.
- float ourGoalAngle = ((PI / 2) - goalAngleRad) / (PI * 2);
+ float ourGoalAngle = ((M_PI / 2) - goalAngleRad) / (M_PI * 2);
int angle = (int) (ourGoalAngle * 360);
while (angle < 0) {
Index: netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp
diff -u netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp:1.20
netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp:1.21
--- netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp:1.20 Sat Oct
4 10:44:37 2003
+++ netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp Sun Oct 5
09:50:12 2003
@@ -44,7 +44,6 @@
#include "NetworkState.hpp"
-#include "codewiz.hpp"
#include "ConsoleInterface.hpp"
WorldInputCmdProcessor COMMAND_PROCESSOR;
Index: netpanzer/src/NetPanzer/Interfaces/GameManager.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.59
netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.60
--- netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.59 Sat Oct 4
10:50:28 2003
+++ netpanzer/src/NetPanzer/Interfaces/GameManager.cpp Sun Oct 5 09:50:13 2003
@@ -71,7 +71,6 @@
#include "FileSystem.hpp"
// ** GVS Includes
-#include "codewiz.hpp"
#include "cMouse.hpp"
#include "Palette.hpp"
#include "Desktop.hpp"
Index: netpanzer/src/NetPanzer/Views/Game/ChatView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/ChatView.cpp:1.8
netpanzer/src/NetPanzer/Views/Game/ChatView.cpp:1.9
--- netpanzer/src/NetPanzer/Views/Game/ChatView.cpp:1.8 Fri Oct 3 10:45:12 2003
+++ netpanzer/src/NetPanzer/Views/Game/ChatView.cpp Sun Oct 5 09:50:13 2003
@@ -70,7 +70,7 @@
ChatInterface::setNewMessageCallBack( addNewChatStringCallBack );
// Define the scrollBar fot this view.
- scrollBar = new ScrollBar(VERTICAL, 0, 1, 0, 100);
+ scrollBar = new ScrollBar(ScrollBar::VERTICAL, 0, 1, 0, 100);
if (scrollBar == 0) {
throw Exception("ERROR: Unable to allocate the scrollBar.");
}
Index: netpanzer/src/NetPanzer/Views/Game/MiniMapView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/MiniMapView.cpp:1.13
netpanzer/src/NetPanzer/Views/Game/MiniMapView.cpp:1.14
--- netpanzer/src/NetPanzer/Views/Game/MiniMapView.cpp:1.13 Sat Oct 4
10:44:39 2003
+++ netpanzer/src/NetPanzer/Views/Game/MiniMapView.cpp Sun Oct 5 09:50:13 2003
@@ -325,7 +325,7 @@
//resize(destSize);
//deltaSize += deltaAmount;
- if (destSize > maxMapSize) {
+ if (destSize.x > maxMapSize || destSize.y > maxMapSize) {
destSize = maxMapSize;
}
@@ -400,7 +400,7 @@
resize(destSize);
- if (destSize < minMapSize) {
+ if (destSize.x < minMapSize || destSize.y < minMapSize) {
resize(iXY(minMapSize, minMapSize));
}
Index: netpanzer/src/NetPanzer/Views/Game/RankView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/RankView.cpp:1.7
netpanzer/src/NetPanzer/Views/Game/RankView.cpp:1.8
--- netpanzer/src/NetPanzer/Views/Game/RankView.cpp:1.7 Fri Oct 3 10:45:15 2003
+++ netpanzer/src/NetPanzer/Views/Game/RankView.cpp Sun Oct 5 09:50:13 2003
@@ -45,7 +45,7 @@
// hardcoded for now
int CHAR_XPIX = 8;
- //addLabel(iXY nPos, char *nLabel, BYTE color);
+ //addLabel(iXY nPos, char *nLabel, uint8_t color);
unsigned xOffset = 0;
unsigned yOffset = 16;
addLabel(iXY(xOffset, yOffset), "Name", Color::red);
@@ -62,7 +62,7 @@
xOffset += MAX_POINTS_CHARS*CHAR_XPIX;
// Define the scrollBar fot this view.
- scrollBar = new ScrollBar(VERTICAL, 0, 1, 0, 100);
+ scrollBar = new ScrollBar(ScrollBar::VERTICAL, 0, 1, 0, 100);
if (scrollBar == 0) {
throw Exception("ERROR: Unable to allocate the scrollBar.");
}
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.cpp:1.15
netpanzer/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.cpp:1.16
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.cpp:1.15
Sat Oct 4 10:44:40 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.cpp Sun Oct
5 09:50:13 2003
@@ -208,7 +208,7 @@
mapList[i].cells.x = netPanzerMapHeader.x_size;
mapList[i].cells.y = netPanzerMapHeader.y_size;
- int seekAmount = mapList[i].cells.getArea() * sizeof(WORD);
+ int seekAmount = mapList[i].cells.getArea() * sizeof(uint16_t);
file->seek(file->tell()+seekAmount);
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitSelectionView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitSelectionView.cpp:1.6
netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitSelectionView.cpp:1.7
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitSelectionView.cpp:1.6
Tue Sep 16 16:16:13 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitSelectionView.cpp Sun Oct
5 09:50:14 2003
@@ -42,7 +42,7 @@
maxYOffset = 0;
// Define the scrollBar fot this view.
- scrollBar = new ScrollBar(HORIZONTAL, 0, 1, 0, 100);
+ scrollBar = new ScrollBar(ScrollBar::HORIZONTAL, 0, 1, 0, 100);
add(scrollBar);
Index: netpanzer/src/UILib/Network/SocketMessage.hpp
diff -u netpanzer/src/UILib/Network/SocketMessage.hpp:1.3
netpanzer/src/UILib/Network/SocketMessage.hpp:1.4
--- netpanzer/src/UILib/Network/SocketMessage.hpp:1.3 Tue Sep 16 16:16:13 2003
+++ netpanzer/src/UILib/Network/SocketMessage.hpp Sun Oct 5 09:50:14 2003
@@ -20,7 +20,6 @@
#include "NetPacket.hpp"
#include "Client.hpp"
-#include "codewiz.hpp"
enum { _net_message_id_basic_info_request,
_net_message_id_extended_info_request,
@@ -39,7 +38,7 @@
{
public:
char codeword[24];
- DWORD version;
+ uint32_t version;
BasicInfoRequest()
{
message_class = _net_message_class_winsock;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [netPanzer-CVS] netpanzer ./ChangeLog ./configure.ac mk/jam/hel...,
Matthias Braun <=