[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[netPanzer-CVS] netpanzer ./BUGS ./ChangeLog src/Jamfile src/Li...
|
From: |
Matthias Braun |
|
Subject: |
[netPanzer-CVS] netpanzer ./BUGS ./ChangeLog src/Jamfile src/Li... |
|
Date: |
Mon, 13 Oct 2003 10:30:29 -0400 |
CVSROOT: /cvsroot/netpanzer
Module name: netpanzer
Branch:
Changes by: Matthias Braun <address@hidden> 03/10/13 10:30:24
Modified files:
. : BUGS ChangeLog
src : Jamfile
src/Lib : LibView.cpp LibView.hpp NoCopy.hpp cMouse.cpp
cMouse.hpp
src/Lib/2D : DigitText.cpp DigitText.hpp PackedSurface.cpp
PackedSurface.hpp Surface.cpp Surface.hpp
src/Lib/Particles: ParticleInterface.cpp ParticleInterface.hpp
ParticleTweakView.cpp ParticleTweakView.hpp
src/Lib/View : AbstractButton.hpp Button.cpp Button.hpp
CheckBox.cpp CheckBox.hpp Choice.cpp Choice.hpp
Component.hpp Desktop.cpp Desktop.hpp Icon.hpp
ScrollBar.cpp ScrollBar.hpp View.cpp View.hpp
cInputField.cpp cInputField.hpp
src/NetPanzer/Core: main.cpp
src/NetPanzer/Interfaces: GameManager.cpp
src/NetPanzer/Views: GameViewGlobals.cpp GameViewGlobals.hpp
src/NetPanzer/Views/Game: AreYouSureExitView.cpp
AreYouSureExitView.hpp
AreYouSureResignView.cpp
AreYouSureResignView.hpp ChatView.cpp
ChatView.hpp CodeStatsView.cpp
CodeStatsView.hpp GameInfoView.cpp
GameInfoView.hpp GameToolbarView.cpp
GameToolbarView.hpp GameView.cpp
GameView.hpp HelpScrollView.cpp
HelpScrollView.hpp LobbyView.cpp
LobbyView.hpp MiniMapView.cpp
MiniMapView.hpp ProgressView.cpp
ProgressView.hpp RankView.cpp
RankView.hpp ResignView.cpp
ResignView.hpp
VehicleSelectionView.cpp
VehicleSelectionView.hpp
WinnerMesgView.cpp WinnerMesgView.hpp
src/NetPanzer/Views/MainMenu: HelpView.cpp HelpView.hpp
MainMenuView.cpp MainMenuView.hpp
MenuTemplateView.cpp
MenuTemplateView.hpp
OptionsTemplateView.cpp
OptionsTemplateView.hpp
OrderingView.cpp OrderingView.hpp
RMouseHackView.hpp
SkirmishView.cpp SkirmishView.hpp
src/NetPanzer/Views/MainMenu/Multi: FlagSelectionView.cpp
FlagSelectionView.hpp
GetSessionHostView.cpp
GetSessionHostView.hpp
GetSessionView.cpp
GetSessionView.hpp
HostJoinTemplateView.cpp
HostJoinTemplateView.hpp
HostOptionsView.cpp
HostOptionsView.hpp
HostView.cpp HostView.hpp
IPAddressView.cpp
IPAddressView.hpp
JoinView.cpp JoinView.hpp
MapSelectionView.cpp
MapSelectionView.hpp
PlayerNameView.cpp
PlayerNameView.hpp
UnitColorView.cpp
UnitColorView.hpp
UnitSelectionView.cpp
UnitSelectionView.hpp
src/NetPanzer/Views/MainMenu/Options: ControlsView.cpp
ControlsView.hpp
InterfaceView.cpp
InterfaceView.hpp
SoundView.cpp
SoundView.hpp
VisualsView.cpp
VisualsView.hpp
Log message:
13-Oct-2003 by Matthias Braun
-fixed wrong const in Surface class
-don't allow copy constructing of surface class
-fixed some views which could still be moved outside the screen
Patches:
Index: netpanzer/BUGS
diff -u netpanzer/BUGS:1.1 netpanzer/BUGS:1.2
--- netpanzer/BUGS:1.1 Sun Oct 12 18:57:18 2003
+++ netpanzer/BUGS Mon Oct 13 10:30:04 2003
@@ -2,7 +2,7 @@
-moving the window in minimap below the borders gets crashs or at least draw
errors. - fixed
-after playing some time we get an assert(totoalByteCount >= 0) in
- Surface::~Surface...
+ Surface::~Surface... - fixed
-another crash reported by kov (happens when someone joins the game):
<kov> Connection lost for ID 0: accept() failed
<kov>
Index: netpanzer/ChangeLog
diff -u netpanzer/ChangeLog:1.12 netpanzer/ChangeLog:1.13
--- netpanzer/ChangeLog:1.12 Sun Oct 12 18:44:01 2003
+++ netpanzer/ChangeLog Mon Oct 13 10:30:05 2003
@@ -1,4 +1,9 @@
-12-Oct-2003
+13-Oct-2003 by Matthias Braun
+-fixed wrong const in Surface class
+-don't allow copy constructing of surface class
+-fixed some views which could still be moved outside the screen
+
+12-Oct-2003 by Matthias Braun
-Fixed a bug in iXY classes.
-Added note about black screen to readme
-fixed bug where MiniMapView was drawing outside it's view space, leading to
Index: netpanzer/src/Jamfile
diff -u netpanzer/src/Jamfile:1.3 netpanzer/src/Jamfile:1.4
--- netpanzer/src/Jamfile:1.3 Sun Oct 5 09:50:08 2003
+++ netpanzer/src/Jamfile Mon Oct 13 10:30:05 2003
@@ -47,5 +47,3 @@
CFlags netpanzer : -DDATADIR=\\\"$(datadir)\\\" ;
ExternalLibs netpanzer : XML SDL SDLNET SDLMIXER SDLIMAGE PHYSFS ;
Help netpanzer : "Build the main netpanzer executable" ;
-
-SubInclude TOP src Editor ;
Index: netpanzer/src/Lib/2D/DigitText.cpp
diff -u netpanzer/src/Lib/2D/DigitText.cpp:1.7
netpanzer/src/Lib/2D/DigitText.cpp:1.8
--- netpanzer/src/Lib/2D/DigitText.cpp:1.7 Tue Sep 16 16:16:09 2003
+++ netpanzer/src/Lib/2D/DigitText.cpp Mon Oct 13 10:30:06 2003
@@ -58,7 +58,7 @@
} // DigitText::initFont
//--------------------------------------------------------------------------
-void DigitText::blt(const Surface &dest, const iXY &pos, const char *string,
const PIX &color)
+void DigitText::blt(Surface &dest, const iXY &pos, const char *string, const
PIX &color)
{
if (bltMode == NORMAL_TRANS) {
bltStringNormalTrans(dest, pos, string, color);
@@ -74,7 +74,7 @@
// Blits the characters without the spaces in the text.
//--------------------------------------------------------------------------
-void DigitText::bltCharNormalTrans(const Surface &dest, const iXY &pos, const
char &character, const PIX &color)
+void DigitText::bltCharNormalTrans(Surface &dest, const iXY &pos, const char
&character, const PIX &color)
{
#ifdef _DEBUG
if (character > charactersNormal.getFrameCount()) {
@@ -89,7 +89,7 @@
// Blits the characters without the spaces in the text.
//--------------------------------------------------------------------------
-void DigitText::bltCharNormalSolid(const Surface &dest, const iXY &pos, const
char &character)
+void DigitText::bltCharNormalSolid(Surface &dest, const iXY &pos, const char
&character)
{
#ifdef _DEBUG
if (character > charactersNormal.getFrameCount()) {
@@ -104,7 +104,7 @@
// Blits the characters without the spaces in the text.
//--------------------------------------------------------------------------
-void DigitText::bltCharNoSpaceTrans(const Surface &dest, const iXY &pos, const
char &character, const PIX &color)
+void DigitText::bltCharNoSpaceTrans(Surface &dest, const iXY &pos, const char
&character, const PIX &color)
{
#ifdef _DEBUG
if (character > charactersNormal.getFrameCount()) {
@@ -119,7 +119,7 @@
// Blits the characters without the spaces in the text.
//--------------------------------------------------------------------------
-void DigitText::bltCharNoSpaceSolid(const Surface &dest, const iXY &pos, const
char &character)
+void DigitText::bltCharNoSpaceSolid(Surface &dest, const iXY &pos, const char
&character)
{
#ifdef _DEBUG
if (character > charactersNormal.getFrameCount()) {
@@ -134,7 +134,7 @@
// Blits the string without the spaces in the text.
//--------------------------------------------------------------------------
-void DigitText::bltStringNormalTrans(const Surface &dest, const iXY &pos,
const char *string, const PIX &color)
+void DigitText::bltStringNormalTrans(Surface &dest, const iXY &pos, const char
*string, const PIX &color)
{
for (int index = 0; string[index] != 0; index++) {
bltCharNormalTrans(dest, iXY(pos.x + (index *
charactersNormal.getPixX()), pos.y), string[index], color);
@@ -143,7 +143,7 @@
// Blits the string without the spaces in the text.
//--------------------------------------------------------------------------
-void DigitText::bltStringNormalSolid(const Surface &dest, const iXY &pos,
const char *string)
+void DigitText::bltStringNormalSolid(Surface &dest, const iXY &pos, const char
*string)
{
for (int index = 0; string[index] != 0; index++) {
bltCharNormalSolid(dest, iXY(pos.x + (index *
charactersNormal.getPixX()), pos.y), string[index]);
@@ -152,7 +152,7 @@
// Blits the string without the spaces in the text.
//--------------------------------------------------------------------------
-void DigitText::bltStringNoSpaceTrans(const Surface &dest, const iXY &pos,
const char *string, const PIX &color)
+void DigitText::bltStringNoSpaceTrans(Surface &dest, const iXY &pos, const
char *string, const PIX &color)
{
for (int index = 0; string[index] != 0; index++) {
bltCharNoSpaceTrans(dest, iXY(pos.x + (index *
charactersNormal.getPixX()), pos.y), string[index], color);
@@ -161,7 +161,7 @@
// Blits the string without the spaces in the text.
//--------------------------------------------------------------------------
-void DigitText::bltStringNoSpaceSolid(const Surface &dest, const iXY &pos,
const char *string)
+void DigitText::bltStringNoSpaceSolid(Surface &dest, const iXY &pos, const
char *string)
{
for (int index = 0; string[index] != 0; index++) {
bltCharNoSpaceSolid(dest, iXY(pos.x + (index *
charactersNormal.getPixX()), pos.y), string[index]);
Index: netpanzer/src/Lib/2D/DigitText.hpp
diff -u netpanzer/src/Lib/2D/DigitText.hpp:1.3
netpanzer/src/Lib/2D/DigitText.hpp:1.4
--- netpanzer/src/Lib/2D/DigitText.hpp:1.3 Tue Sep 16 16:16:09 2003
+++ netpanzer/src/Lib/2D/DigitText.hpp Mon Oct 13 10:30:07 2003
@@ -49,28 +49,28 @@
static DIGIT_BLT_MODES bltMode;
// Blits the characters without the spaces in the text.
- static void bltCharNormalTrans(const Surface &dest, const iXY &pos, const
char &character, const PIX &color);
+ static void bltCharNormalTrans(Surface &dest, const iXY &pos, const char
&character, const PIX &color);
// Blits the characters without the spaces in the text.
- static void bltCharNormalSolid(const Surface &dest, const iXY &pos, const
char &character);
+ static void bltCharNormalSolid(Surface &dest, const iXY &pos, const char
&character);
// Blits the characters without the spaces in the text.
- static void bltCharNoSpaceTrans(const Surface &dest, const iXY &pos, const
char &character, const PIX &color);
+ static void bltCharNoSpaceTrans(Surface &dest, const iXY &pos, const char
&character, const PIX &color);
// Blits the characters without the spaces in the text.
- static void bltCharNoSpaceSolid(const Surface &dest, const iXY &pos, const
char &character);
+ static void bltCharNoSpaceSolid(Surface &dest, const iXY &pos, const char
&character);
// Blits the string without the spaces in the text.
- static void bltStringNormalTrans(const Surface &dest, const iXY &pos,
const char *string, const PIX &color);
+ static void bltStringNormalTrans(Surface &dest, const iXY &pos, const char
*string, const PIX &color);
// Blits the string without the spaces in the text.
- static void bltStringNormalSolid(const Surface &dest, const iXY &pos,
const char *string);
+ static void bltStringNormalSolid(Surface &dest, const iXY &pos, const char
*string);
// Blits the string without the spaces in the text.
- static void bltStringNoSpaceTrans(const Surface &dest, const iXY &pos,
const char *string, const PIX &color);
+ static void bltStringNoSpaceTrans(Surface &dest, const iXY &pos, const
char *string, const PIX &color);
// Blits the string without the spaces in the text.
- static void bltStringNoSpaceSolid(const Surface &dest, const iXY &pos,
const char *string);
+ static void bltStringNoSpaceSolid(Surface &dest, const iXY &pos, const
char *string);
public:
@@ -83,8 +83,8 @@
static void init(const char *filename);
// Calls the appropriate string blitting function depending on the current
mode.
- static void blt(const Surface &dest, const iXY &pos, const char *string,
const PIX &color);
- static void blt(const Surface &dest, const iXY &pos, const char *string)
+ static void blt(Surface &dest, const iXY &pos, const char *string, const
PIX &color);
+ static void blt(Surface &dest, const iXY &pos, const char *string)
{
// The color in this really doesn't matter.
blt(dest, pos, string, Color::black);
@@ -92,8 +92,6 @@
// Sets which type of characters to blt.
static void setBltMode(const DIGIT_BLT_MODES &mode);
-
-}
-; // end DigitText
+}; // end DigitText
#endif // end __DigitText_hpp__
Index: netpanzer/src/Lib/2D/PackedSurface.cpp
diff -u netpanzer/src/Lib/2D/PackedSurface.cpp:1.17
netpanzer/src/Lib/2D/PackedSurface.cpp:1.18
--- netpanzer/src/Lib/2D/PackedSurface.cpp:1.17 Sun Oct 12 15:22:12 2003
+++ netpanzer/src/Lib/2D/PackedSurface.cpp Mon Oct 13 10:30:07 2003
@@ -256,7 +256,7 @@
}
//--------------------------------------------------------------------------
-void PackedSurface::blt(const Surface &dest, int destX, int destY) const
+void PackedSurface::blt(Surface &dest, int destX, int destY) const
{
totalDrawCount++;
@@ -384,41 +384,6 @@
// setTo
//---------------------------------------------------------------------------
-// Purpose: Maps a PackedSurface's coordinates to an existing surface. This
can
-// save you from having to allocate memory for every single
PackedSurface.
-// You can just draw everything onto one PackedSurface in the given
bounds.
-//---------------------------------------------------------------------------
-/*
-void PackedSurface::setTo(const PackedSurface &source, iRect bounds)
-{
- assert(this != 0);
-
- free();
- reset();
-
- orderCoords(bounds);
-
- frameCount = source.getFrameCount();
- fps = source.getFPS();
- pix = bounds.getSize();
- center = ;
- myMem = false;
- offset = source.getOffset();
-
- int frameCount;
- float fps;
- float curFrame;
- iXY offset;
- iXY center;
- iXY pix;
- int *rowOffsetTable;
- uint8_t *packedDataChunk;
- bool myMem;
-
-} // end Surface::setTo
-*/
-// setTo
-//---------------------------------------------------------------------------
// Purpose: Maps the calling PackedSurface to some specified coordinates of
// the another PackedSurface.
//---------------------------------------------------------------------------
@@ -459,7 +424,7 @@
// bltBlend
//--------------------------------------------------------------------------
-void PackedSurface::bltBlend(const Surface &dest, int destX, int destY,
ColorTable &colorTable) const
+void PackedSurface::bltBlend(Surface &dest, int destX, int destY, ColorTable
&colorTable) const
{
totalDrawCount++;
Index: netpanzer/src/Lib/2D/PackedSurface.hpp
diff -u netpanzer/src/Lib/2D/PackedSurface.hpp:1.5
netpanzer/src/Lib/2D/PackedSurface.hpp:1.6
--- netpanzer/src/Lib/2D/PackedSurface.hpp:1.5 Sun Oct 5 09:50:09 2003
+++ netpanzer/src/Lib/2D/PackedSurface.hpp Mon Oct 13 10:30:08 2003
@@ -39,14 +39,14 @@
void pack(const Surface &src);
- void blt(const Surface &dest, int x, int y) const;
- inline void blt(const Surface &dest, iXY pos) const
+ void blt(Surface &dest, int x, int y) const;
+ inline void blt(Surface &dest, iXY pos) const
{
blt(dest, pos.x, pos.y);
}
- void bltBlend(const Surface &dest, int x, int y, ColorTable &colorTable)
const;
- inline void bltBlend(const Surface &dest, iXY pos, ColorTable &colorTable)
const
+ void bltBlend(Surface &dest, int x, int y, ColorTable &colorTable) const;
+ inline void bltBlend(Surface &dest, iXY pos, ColorTable &colorTable) const
{
bltBlend(dest, pos.x, pos.y, colorTable);
}
Index: netpanzer/src/Lib/2D/Surface.cpp
diff -u netpanzer/src/Lib/2D/Surface.cpp:1.36
netpanzer/src/Lib/2D/Surface.cpp:1.37
--- netpanzer/src/Lib/2D/Surface.cpp:1.36 Sun Oct 12 18:57:18 2003
+++ netpanzer/src/Lib/2D/Surface.cpp Mon Oct 13 10:30:09 2003
@@ -239,7 +239,6 @@
totalSurfaceCount++;
totalByteCount += sizeof(Surface);
-
} // end Surface::Surface
// ~Surface
@@ -496,7 +495,7 @@
// Purpose: Puts the surface onto the destination while performing clipping
// on the bounds of the object.
//---------------------------------------------------------------------------
-void Surface::blt(const Surface &dest, iXY min) const
+void Surface::blt(Surface &dest, iXY min) const
{
assert(getDoesExist());
assert(dest.getDoesExist());
@@ -579,7 +578,7 @@
// transparency detection (pixel by pixel basis), while performing
// clipping on the bounds of the object.
//---------------------------------------------------------------------------
-void Surface::bltTrans(const Surface &dest, iXY min) const
+void Surface::bltTrans(Surface &dest, iXY min) const
{
assert(getDoesExist());
assert(dest.getDoesExist());
@@ -666,7 +665,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 uint8_t
&color) const
+void Surface::bltTransColor(Surface &dest, iXY min, const uint8_t &color) const
{
assert(getDoesExist());
assert(dest.getDoesExist());
@@ -2490,7 +2489,7 @@
// Purpose: Blits the specied rom character to the screen at the specified
// location.
//---------------------------------------------------------------------------
-void Surface::bltChar8x8(const iXY &pos, const char &character, const PIX
&color) const
+void Surface::bltChar8x8(const iXY &pos, const char &character, const PIX
&color)
{
#ifdef _DEBUG
if (character > ascii8x8.getFrameCount()) {
@@ -2500,12 +2499,11 @@
ascii8x8.setFrame(character);
ascii8x8.bltTransColor(*this, pos, color);
-
} // end Surface::bltChar8x8
// bltChar5x5
//---------------------------------------------------------------------------
-void Surface::bltChar5x5(const iXY &pos, const char &character, const PIX
&color) const
+void Surface::bltChar5x5(const iXY &pos, const char &character, const PIX
&color)
{
#ifdef _DEBUG
if (character > ascii5x5.getFrameCount()) {
@@ -2524,7 +2522,7 @@
// calls to blitChar for each character of the string. Does not
// handle wrapping.
//---------------------------------------------------------------------------
-void Surface::bltString(const iXY &pos, const char *string, const uint8_t
&color) const
+void Surface::bltString(const iXY &pos, const char *string, const uint8_t
&color)
{
for (int index = 0; string[index] != 0; index++) {
// Don't attempt blank spaces.
@@ -2543,7 +2541,7 @@
// calls to blitChar for each character of the string. Does not
// handle wrapping.
//---------------------------------------------------------------------------
-void Surface::bltString5x5(const iXY &pos, const char *string, const uint8_t
&color) const
+void Surface::bltString5x5(const iXY &pos, const char *string, const uint8_t
&color)
{
for (int index = 0; string[index] != 0; index++) {
bltChar5x5(iXY(pos.x + (index * 5), pos.y), string[index], color);
@@ -2553,7 +2551,7 @@
// bltStringShadowed
//---------------------------------------------------------------------------
-void Surface::bltStringShadowed(const iXY &pos, char const *string, const
uint8_t &textColor, const uint8_t &shadowColor) const
+void Surface::bltStringShadowed(const iXY &pos, char const *string, const
uint8_t &textColor, const uint8_t &shadowColor)
{
for (int index = 0; string[index] != 0; index++) {
bltChar8x8(pos.x + (index << 3) + 1, pos.y + 1, string[index],
shadowColor);
@@ -2567,7 +2565,7 @@
// Purpose: Blits a string of text and centers it horizontally and vertically
// on the screen. Does not handle wrapping.
//---------------------------------------------------------------------------
-void Surface::bltStringCenter(const char *string, PIX color) const
+void Surface::bltStringCenter(const char *string, PIX color)
{
iXY pos;
pos.x = (getPix().x - (strlen(string) * ascii8x8.getPixX())) / 2;
@@ -2582,7 +2580,7 @@
// Purpose: Blits a string of text and centers it horizontally and vertically
// on the screen. Does not handle wrapping.
//---------------------------------------------------------------------------
-void Surface::bltStringShadowedCenter(const char *string, PIX foreground, PIX
background) const
+void Surface::bltStringShadowedCenter(const char *string, PIX foreground, PIX
background)
{
iXY pos;
pos.x = (getPix().x - (strlen(string) * ascii8x8.getPixX())) / 2;
@@ -2596,7 +2594,7 @@
//---------------------------------------------------------------------------
// Purpose: Blits the string centered at the specified point.
//---------------------------------------------------------------------------
-void Surface::bltStringCenteredAtPoint(const iXY &pos, const char *string,
const PIX &color) const
+void Surface::bltStringCenteredAtPoint(const iXY &pos, const char *string,
const PIX &color)
{
iXY destPos;
destPos.x = pos.x - (strlen(string) * ascii8x8.getPixX()) / 2;
@@ -2611,7 +2609,7 @@
//---------------------------------------------------------------------------
// Purpose: Blits the string centered inside the specified rectangle.
//---------------------------------------------------------------------------
-void Surface::bltStringCenteredInRect(const iRect &rect, const char *string,
const PIX &color) const
+void Surface::bltStringCenteredInRect(const iRect &rect, const char *string,
const PIX &color)
{
int length = strlen(string);
@@ -2627,7 +2625,7 @@
// Blit a string of text with a vertical gradient.
//---------------------------------------------------------------------------
-void Surface::bltStringVGradient(const iXY &pos, const char *string,
ColorTable &colorTable) const
+void Surface::bltStringVGradient(const iXY &pos, const char *string,
ColorTable &colorTable)
{
for (int index = 0; string[index] != 0; index++) {
bltChar8x8VGradient(iXY(pos.x + (index << 3), pos.y), string[index],
colorTable);
@@ -2636,7 +2634,7 @@
//---------------------------------------------------------------------------
void Surface::bltChar8x8VGradient(const iXY &pos, const char &character,
- ColorTable &colorTable) const
+ ColorTable &colorTable)
{
#ifdef _DEBUG
if (character > ascii8x8.getFrameCount()) {
@@ -2648,7 +2646,8 @@
}
//---------------------------------------------------------------------------
-void Surface::bltTransVGradient(const Surface &dest, iXY min, ColorTable
&colorTable) const
+void Surface::bltTransVGradient(Surface &dest, iXY min, ColorTable &colorTable)
+ const
{
assert(getDoesExist());
assert(dest.getDoesExist());
@@ -2860,7 +2859,7 @@
// bltStringInBox
//--------------------------------------------------------------------------
-void Surface::bltStringInBox(const iRect &rect, const char *string, PIX color,
int gapSpace, bool drawBox) const
+void Surface::bltStringInBox(const iRect &rect, const char *string, PIX color,
int gapSpace, bool drawBox)
{
if (drawBox) {
drawRect(rect, Color::yellow);
Index: netpanzer/src/Lib/2D/Surface.hpp
diff -u netpanzer/src/Lib/2D/Surface.hpp:1.15
netpanzer/src/Lib/2D/Surface.hpp:1.16
--- netpanzer/src/Lib/2D/Surface.hpp:1.15 Sun Oct 12 18:09:35 2003
+++ netpanzer/src/Lib/2D/Surface.hpp Mon Oct 13 10:30:10 2003
@@ -24,6 +24,7 @@
#include <stdio.h>
#include "iXY.hpp"
#include "iRect.hpp"
+#include "NoCopy.hpp"
class ColorTable;
class Palette;
@@ -66,7 +67,7 @@
/////////////////////////////////////////////////////////////////////////////
//---------------------------------------------------------------------------
-class Surface
+class Surface : public NoCopy
{
public:
void setOffset(const iXY &offset)
@@ -273,42 +274,42 @@
void setTo(const Surface &source);
bool grab(const Surface &s, iRect bounds, bool gottaHaveIt, int stride);
- void blt(const Surface &dest, iXY pos) const;
- inline void blt(const Surface &dest) const
+ void blt(Surface &dest, iXY pos) const;
+ inline void blt(Surface &dest) const
{
blt(dest, iXY(0, 0));
}
- inline void blt(const Surface &dest, int x, int y) const
+ inline void blt(Surface &dest, int x, int y) const
{
blt(dest, iXY(x, y));
}
- void bltTrans(const Surface &dest, iXY pos) const;
- inline void bltTrans(const Surface &dest) const
+ void bltTrans(Surface &dest, iXY pos) const;
+ inline void bltTrans(Surface &dest) const
{
bltTrans(dest, iXY(0, 0));
}
- inline void bltTrans(const Surface &dest, int x, int y) const
+ inline void bltTrans(Surface &dest, int x, int y) const
{
bltTrans(dest, iXY(x, y));
}
- void bltTransColor(const Surface &dest, iXY pos, const PIX &color) const;
- inline void bltTransColor(const Surface &dest, const PIX &color) const
+ void bltTransColor(Surface &dest, iXY pos, const PIX &color) const;
+ inline void bltTransColor(Surface &dest, const PIX &color) const
{
bltTransColor(dest, iXY(0, 0), color);
}
- inline void bltTransColor(const Surface &dest, int x, int y, const PIX
&color) const
+ inline void bltTransColor(Surface &dest, int x, int y, const PIX &color)
const
{
bltTransColor(dest, iXY(x, y), color);
}
- void bltTransVGradient(const Surface &dest, iXY pos, ColorTable
&colorTable) const;
- inline void bltTransVGradient(const Surface &dest, ColorTable &colorTable)
const
+ void bltTransVGradient(Surface &dest, iXY pos, ColorTable &colorTable)
const;
+ inline void bltTransVGradient(Surface &dest, ColorTable &colorTable) const
{
bltTransVGradient(dest, iXY(0, 0), colorTable);
}
- inline void bltTransVGradient(const Surface &dest, int x, int y,
ColorTable &colorTable) const
+ inline void bltTransVGradient(Surface &dest, int x, int y, ColorTable
&colorTable) const
{
bltTransVGradient(dest, iXY(x, y), colorTable);
}
@@ -328,7 +329,7 @@
resize(iXY(xPix, yPix));
}
- inline void bltCentered(const Surface &dest) const
+ inline void bltCentered(Surface &dest) const
{
iXY pos;
pos.x = (dest.getPix().x - pix.x) / 2;
@@ -408,7 +409,7 @@
void flipHorizontal();
void flipVertical();
void rotate(int angle);
- void copy(Surface &dest);
+ void copy(Surface &source);
void setBrightness(int percent);
int nextFrame();
@@ -482,67 +483,64 @@
int loadAllBMPInDirectory(const char *path);
// Blit a single character of text.
- void bltChar8x8(const iXY &pos, const char &character, const PIX &color)
const;
- inline void bltChar8x8(int x, int y, const char &character, const PIX
&color) const
+ void bltChar8x8(const iXY &pos, const char &character, const PIX &color);
+ void bltChar8x8(int x, int y, const char &character, const PIX &color)
{
bltChar8x8(iXY(x, y), character, color);
}
- void bltChar8x8VGradient(const iXY &pos, const char &character, ColorTable
&colorTable) const;
- inline void bltChar8x8VGradient(int x, int y, const char &character,
ColorTable &colorTable) const
+ void bltChar8x8VGradient(const iXY &pos, const char &character, ColorTable
&colorTable);
+ void bltChar8x8VGradient(int x, int y, const char &character, ColorTable
&colorTable)
{
bltChar8x8VGradient(iXY(x, y), character, colorTable);
}
- void bltChar5x5(const iXY &pos, const char &character, const PIX &color)
const;
- inline void bltChar5x5(int x, int y, const char &character, const PIX
&color) const
+ void bltChar5x5(const iXY &pos, const char &character, const PIX &color);
+ inline void bltChar5x5(int x, int y, const char &character, const PIX
&color)
{
bltChar5x5(iXY(x, y), character, color);
}
// Blit a string of text in a single color.
- void bltString(const iXY &pos, const char *string, const PIX &color) const;
- inline void bltString(int x, int y, const char *string, const PIX &color)
const
+ void bltString(const iXY &pos, const char *string, const PIX &color);
+ inline void bltString(int x, int y, const char *string, const PIX &color)
{
bltString(iXY(x, y), string, color);
}
- inline void bltStringInBox(int minX, int minY, int maxX, int maxY, const
char *string, PIX color, int gapSpace = 14, bool drawBox = false) const
+ void bltStringInBox(int minX, int minY, int maxX, int maxY, const char
*string, PIX color, int gapSpace = 14, bool drawBox = false)
{
bltStringInBox(iRect(minX, minY, maxX, maxY), string, color, gapSpace,
drawBox);
}
- void bltStringInBox(const iRect &rect, const char *string, PIX color, int
gapSpace = 14, bool drawBox = false) const;
+ void bltStringInBox(const iRect &rect, const char *string, PIX color, int
gapSpace = 14, bool drawBox = false);
// Blit a string of text with a vertical gradient.
- void bltStringVGradient(const iXY &pos, const char *string, ColorTable
&colorTable) const;
- inline void bltStringVGradient(int x, int y, const char *string,
ColorTable &colorTable) const
+ void bltStringVGradient(const iXY &pos, const char *string, ColorTable
&colorTable);
+ void bltStringVGradient(int x, int y, const char *string, ColorTable
&colorTable)
{
bltStringVGradient(iXY(x, y), string, colorTable);
}
// Blit a string of text.
- void bltString5x5(const iXY &pos, const char *string, const PIX &color)
const;
-
- inline void bltString5x5(int x, int y, const char *string, const PIX
&color) const
+ void bltString5x5(const iXY &pos, const char *string, const PIX &color);
+ void bltString5x5(int x, int y, const char *string, const PIX &color)
{
bltString5x5(iXY(x, y), string, color);
}
// Blit a shadowed string of text.
- void bltStringShadowed(const iXY &pos, const char *string, const PIX
&textColor, const PIX &shadowColor) const;
-
- inline void bltStringShadowed(int x, int y, const char *string, const PIX
&textColor, const PIX &shadowColor) const
+ void bltStringShadowed(const iXY &pos, const char *string, const PIX
&textColor, const PIX &shadowColor);
+ void bltStringShadowed(int x, int y, const char *string, const PIX
&textColor, const PIX &shadowColor)
{
bltStringShadowed(iXY(x, y), string, textColor, shadowColor);
}
// Blits a string of text and centers it horizontally and vertically on
the screen.
- void bltStringCenter(const char *string, PIX color) const;
-
- void bltStringShadowedCenter(const char *string, PIX foreground, PIX
background) const;
+ void bltStringCenter(const char *string, PIX color);
- void bltStringCenteredAtPoint(const iXY &pos, const char *string, const
PIX &color) const;
- void bltStringCenteredInRect(const iRect &rect, const char *string, const
PIX &color) const;
+ void bltStringShadowedCenter(const char *string, PIX foreground, PIX
background);
+ void bltStringCenteredAtPoint(const iXY &pos, const char *string, const
PIX &color);
+ void bltStringCenteredInRect(const iRect &rect, const char *string, const
PIX &color);
void loadBMP(const char *fileName, bool needAlloc = true, void
*returnPalette = 0);
Index: netpanzer/src/Lib/LibView.cpp
diff -u netpanzer/src/Lib/LibView.cpp:1.6 netpanzer/src/Lib/LibView.cpp:1.7
--- netpanzer/src/Lib/LibView.cpp:1.6 Sat Oct 4 10:44:36 2003
+++ netpanzer/src/Lib/LibView.cpp Mon Oct 13 10:30:05 2003
@@ -31,6 +31,7 @@
#include "Span.hpp"
#include "GameView.hpp"
#include "CraterParticle2D.hpp"
+#include "ScreenSurface.hpp"
bool gDrawGameTiles = true;
bool gDrawUnitTips = false;
@@ -119,7 +120,7 @@
// doDraw
//---------------------------------------------------------------------------
-void LibView::doDraw(const Surface &viewArea, const Surface &clientArea)
+void LibView::doDraw(Surface &viewArea, Surface &clientArea)
{
//bltViewBackground(viewArea);
@@ -147,7 +148,7 @@
} // end LibView::doDraw
//--------------------------------------------------------------------------
-void LibView::drawSurfaceInfo(const Surface &dest, iXY pos)
+void LibView::drawSurfaceInfo(Surface &dest, iXY pos)
{
int yOffset = 15;
@@ -192,7 +193,7 @@
}
//--------------------------------------------------------------------------
-void LibView::drawParticleInfo(const Surface &dest, iXY pos)
+void LibView::drawParticleInfo(Surface &dest, iXY pos)
{
int yOffset = 15;
int xOffset = 15;
@@ -272,6 +273,7 @@
void LibView::rMouseDrag(const iXY &downPos, const iXY &prevPos, const iXY
&newPos)
{
moveTo(min + newPos - prevPos);
+ checkArea(screen->getPix());
}
// doActivate
@@ -279,12 +281,11 @@
void LibView::doActivate()
{
Desktop::setActiveView(this);
-
} // end LibView::doActivate
// drawEnvironmentInfo
//---------------------------------------------------------------------------
-void LibView::drawEnvironmentInfo(const Surface &dest, iXY pos)
+void LibView::drawEnvironmentInfo(Surface &dest, iXY pos)
{
int yOffset = 15;
//int xOffset = 15;
Index: netpanzer/src/Lib/LibView.hpp
diff -u netpanzer/src/Lib/LibView.hpp:1.4 netpanzer/src/Lib/LibView.hpp:1.5
--- netpanzer/src/Lib/LibView.hpp:1.4 Tue Sep 16 16:16:09 2003
+++ netpanzer/src/Lib/LibView.hpp Mon Oct 13 10:30:05 2003
@@ -36,9 +36,9 @@
class LibView : public GameTemplateView
{
protected:
- void drawSurfaceInfo(const Surface &clientArea, iXY pos);
- void drawParticleInfo(const Surface &clientArea, iXY pos);
- void drawEnvironmentInfo(const Surface &dest, iXY pos);
+ void drawSurfaceInfo(Surface &clientArea, iXY pos);
+ void drawParticleInfo(Surface &clientArea, iXY pos);
+ void drawEnvironmentInfo(Surface &dest, iXY pos);
CheckBox checkBoxAllowParticleGeneration;
CheckBox checkBoxAllowTimeSlice;
@@ -54,13 +54,12 @@
virtual ~LibView()
{}
- virtual void doDraw(const Surface &windowArea, const Surface &clientArea);
+ virtual void doDraw(Surface &windowArea, Surface &clientArea);
virtual void rMouseDrag(const iXY &downPos, const iXY &prevPos, const iXY
&newPos);
virtual void doActivate();
virtual void actionPerformed(mMouseEvent me);
static int displayMode;
-}
-; // end LibView
+}; // end LibView
#endif // end __LibView_hpp__
Index: netpanzer/src/Lib/NoCopy.hpp
diff -u netpanzer/src/Lib/NoCopy.hpp:1.2 netpanzer/src/Lib/NoCopy.hpp:1.3
--- netpanzer/src/Lib/NoCopy.hpp:1.2 Tue Sep 16 16:16:09 2003
+++ netpanzer/src/Lib/NoCopy.hpp Mon Oct 13 10:30:05 2003
@@ -32,7 +32,6 @@
{ }
void operator=(const NoCopy& other)
{ }
-}
-;
+};
#endif
Index: netpanzer/src/Lib/Particles/ParticleInterface.cpp
diff -u netpanzer/src/Lib/Particles/ParticleInterface.cpp:1.12
netpanzer/src/Lib/Particles/ParticleInterface.cpp:1.13
--- netpanzer/src/Lib/Particles/ParticleInterface.cpp:1.12 Sun Oct 5
09:50:10 2003
+++ netpanzer/src/Lib/Particles/ParticleInterface.cpp Mon Oct 13 10:30:11 2003
@@ -463,7 +463,7 @@
}
//--------------------------------------------------------------------------
-void ParticleInterface::testSimText(const Surface &dest)
+void ParticleInterface::testSimText(Surface &dest)
{
char strBuf[256];
Index: netpanzer/src/Lib/Particles/ParticleInterface.hpp
diff -u netpanzer/src/Lib/Particles/ParticleInterface.hpp:1.5
netpanzer/src/Lib/Particles/ParticleInterface.hpp:1.6
--- netpanzer/src/Lib/Particles/ParticleInterface.hpp:1.5 Sun Oct 5
09:50:10 2003
+++ netpanzer/src/Lib/Particles/ParticleInterface.hpp Mon Oct 13 10:30:11 2003
@@ -125,7 +125,7 @@
ParticleInterface();
static void testSim();
- static void testSimText(const Surface &dest);
+ static void testSimText(Surface &dest);
static void addHit(const UnitState &unitState);
static void addMiss(const iXY &worldPos, uint8_t unitType);
@@ -146,7 +146,6 @@
static void addUnitDamagePuffParticle(const UnitState &unitState);
-}
-; // end ParticleInterface
+}; // end ParticleInterface
#endif // __ParticleInterface_hpp__
Index: netpanzer/src/Lib/Particles/ParticleTweakView.cpp
diff -u netpanzer/src/Lib/Particles/ParticleTweakView.cpp:1.4
netpanzer/src/Lib/Particles/ParticleTweakView.cpp:1.5
--- netpanzer/src/Lib/Particles/ParticleTweakView.cpp:1.4 Tue Sep 16
16:16:09 2003
+++ netpanzer/src/Lib/Particles/ParticleTweakView.cpp Mon Oct 13 10:30:12 2003
@@ -36,10 +36,9 @@
// doDraw
//---------------------------------------------------------------------------
-void ParticleTweakView::doDraw(const Surface &viewArea, const Surface
&clientArea)
+void ParticleTweakView::doDraw(Surface &viewArea, Surface &clientArea)
{
viewArea.fill(Color::black);
View::doDraw(viewArea, clientArea);
-
} // end ParticleTweakView::doDraw
Index: netpanzer/src/Lib/Particles/ParticleTweakView.hpp
diff -u netpanzer/src/Lib/Particles/ParticleTweakView.hpp:1.2
netpanzer/src/Lib/Particles/ParticleTweakView.hpp:1.3
--- netpanzer/src/Lib/Particles/ParticleTweakView.hpp:1.2 Tue Sep 16
16:16:09 2003
+++ netpanzer/src/Lib/Particles/ParticleTweakView.hpp Mon Oct 13 10:30:12 2003
@@ -29,10 +29,8 @@
public:
ParticleTweakView();
- virtual void doDraw (const Surface &viewArea, const Surface
&clientArea);
-
-}
-; // end ParticleTweakView
+ virtual void doDraw (Surface &viewArea, Surface &clientArea);
+}; // end ParticleTweakView
#endif // end __ParticleTweakView_hpp__
Index: netpanzer/src/Lib/View/AbstractButton.hpp
diff -u netpanzer/src/Lib/View/AbstractButton.hpp:1.3
netpanzer/src/Lib/View/AbstractButton.hpp:1.4
--- netpanzer/src/Lib/View/AbstractButton.hpp:1.3 Tue Sep 16 16:16:10 2003
+++ netpanzer/src/Lib/View/AbstractButton.hpp Mon Oct 13 10:30:12 2003
@@ -15,23 +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
*/
-
#ifndef __AbstractButton_hpp__
#define __AbstractButton_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
#include "Button.hpp"
#include "cTimeStamp.hpp"
#include "String.hpp"
#include "Icon.hpp"
#include "MouseEvent.hpp"
-
//--------------------------------------------------------------------------
class AbstractButton : public Button
{
@@ -55,19 +47,19 @@
virtual ~AbstractButton()
{}
- void init(const String &text, const Icon &icon)
+ void init(const String &text, Icon &icon)
{
AbstractButton::text = text;
- AbstractButton::icon = icon;
+ AbstractButton::icon.copy(icon);
}
void doClick()
{}
void doClick(TIMESTAMP time)
{}
- const Surface &getDisableIcon()
+ const Surface& getDisableIcon()
{
- return disableIcon;
+ return (const Surface&) disableIcon;
}
const Surface &getIcon()
{
Index: netpanzer/src/Lib/View/Button.cpp
diff -u netpanzer/src/Lib/View/Button.cpp:1.5
netpanzer/src/Lib/View/Button.cpp:1.6
--- netpanzer/src/Lib/View/Button.cpp:1.5 Tue Sep 16 16:16:10 2003
+++ netpanzer/src/Lib/View/Button.cpp Mon Oct 13 10:30:12 2003
@@ -23,7 +23,7 @@
// draw
//---------------------------------------------------------------------------
-void Button::draw(const Surface &dest)
+void Button::draw(Surface &dest)
{
iRect bounds;
getBounds(bounds);
Index: netpanzer/src/Lib/View/Button.hpp
diff -u netpanzer/src/Lib/View/Button.hpp:1.3
netpanzer/src/Lib/View/Button.hpp:1.4
--- netpanzer/src/Lib/View/Button.hpp:1.3 Tue Sep 16 16:16:10 2003
+++ netpanzer/src/Lib/View/Button.hpp Mon Oct 13 10:30:12 2003
@@ -84,10 +84,8 @@
}
//void processEvent() { label = l; }
- virtual void draw(const Surface &dest);
+ virtual void draw(Surface &dest);
virtual void actionPerformed(const mMouseEvent &me);
-
-}
-; // end Button
+}; // end Button
#endif // end __Button_hpp__
Index: netpanzer/src/Lib/View/CheckBox.cpp
diff -u netpanzer/src/Lib/View/CheckBox.cpp:1.7
netpanzer/src/Lib/View/CheckBox.cpp:1.8
--- netpanzer/src/Lib/View/CheckBox.cpp:1.7 Sun Oct 12 15:22:12 2003
+++ netpanzer/src/Lib/View/CheckBox.cpp Mon Oct 13 10:30:12 2003
@@ -23,7 +23,7 @@
// draw
//---------------------------------------------------------------------------
-void CheckBox::draw(const Surface &dest)
+void CheckBox::draw(Surface &dest)
{
iRect bounds;
@@ -42,7 +42,7 @@
// drawCheckBox
//---------------------------------------------------------------------------
-void CheckBox::drawCheckBox(const Surface &dest)
+void CheckBox::drawCheckBox(Surface &dest)
{
iRect bounds;
@@ -63,7 +63,7 @@
// drawCheck
//---------------------------------------------------------------------------
-void CheckBox::drawCheck(const Surface &dest)
+void CheckBox::drawCheck(Surface &dest)
{
iXY pos(min + iXY(2,2));
@@ -77,7 +77,7 @@
// drawLabel
//---------------------------------------------------------------------------
-void CheckBox::drawLabel(const Surface &dest)
+void CheckBox::drawLabel(Surface &dest)
{
iXY pos;
@@ -86,7 +86,6 @@
pos.y = min.y + (size.y - Surface::getFontHeight()) / 2;
dest.bltString(pos, (const char *) label, Color::white);
-
} // end CheckBox::drawLabel
// actionPerformed
Index: netpanzer/src/Lib/View/CheckBox.hpp
diff -u netpanzer/src/Lib/View/CheckBox.hpp:1.4
netpanzer/src/Lib/View/CheckBox.hpp:1.5
--- netpanzer/src/Lib/View/CheckBox.hpp:1.4 Sun Oct 12 15:22:12 2003
+++ netpanzer/src/Lib/View/CheckBox.hpp Mon Oct 13 10:30:12 2003
@@ -32,9 +32,9 @@
bool state;
StateChangedCallback* callback;
- virtual void drawCheckBox(const Surface &dest);
- virtual void drawCheck(const Surface &dest);
- virtual void drawLabel(const Surface &dest);
+ virtual void drawCheckBox(Surface &dest);
+ virtual void drawCheck(Surface &dest);
+ virtual void drawLabel(Surface &dest);
public:
CheckBox(StateChangedCallback* newcallback = 0)
@@ -74,9 +74,8 @@
callback = newcallback;
}
- virtual void draw(const Surface &dest);
+ virtual void draw(Surface &dest);
virtual void actionPerformed(const mMouseEvent &me);
-}
-; // end CheckBox
+}; // end CheckBox
#endif // end __CheckBox_hpp__
Index: netpanzer/src/Lib/View/Choice.cpp
diff -u netpanzer/src/Lib/View/Choice.cpp:1.9
netpanzer/src/Lib/View/Choice.cpp:1.10
--- netpanzer/src/Lib/View/Choice.cpp:1.9 Sun Oct 5 09:50:10 2003
+++ netpanzer/src/Lib/View/Choice.cpp Mon Oct 13 10:30:12 2003
@@ -168,7 +168,7 @@
// draw
//---------------------------------------------------------------------------
-void Choice::draw(const Surface &dest)
+void Choice::draw(Surface &dest)
{
iXY parentDimensions(((View *)parent)->getClientRect().getSize());
Index: netpanzer/src/Lib/View/Choice.hpp
diff -u netpanzer/src/Lib/View/Choice.hpp:1.4
netpanzer/src/Lib/View/Choice.hpp:1.5
--- netpanzer/src/Lib/View/Choice.hpp:1.4 Thu Sep 18 13:44:18 2003
+++ netpanzer/src/Lib/View/Choice.hpp Mon Oct 13 10:30:13 2003
@@ -71,7 +71,7 @@
callback = newcallback;
}
- virtual void draw(const Surface &dest);
+ virtual void draw(Surface &dest);
virtual void actionPerformed(const mMouseEvent &me);
private:
Index: netpanzer/src/Lib/View/Component.hpp
diff -u netpanzer/src/Lib/View/Component.hpp:1.8
netpanzer/src/Lib/View/Component.hpp:1.9
--- netpanzer/src/Lib/View/Component.hpp:1.8 Sun Oct 12 15:22:12 2003
+++ netpanzer/src/Lib/View/Component.hpp Mon Oct 13 10:30:13 2003
@@ -89,7 +89,7 @@
{
return foreground;
}
- inline Surface getGraphics() const
+ inline Surface& getGraphics()
{
return surface;
}
@@ -147,12 +147,8 @@
void setVisible(bool b)
{}
- virtual void draw(const Surface &dest)
- {}
- virtual void actionPerformed(const mMouseEvent &me)
- {}
-
-}
-; // end Component
+ virtual void draw(Surface &dest) = 0;
+ virtual void actionPerformed(const mMouseEvent &me) = 0;
+}; // end Component
#endif // end __Component_hpp__
Index: netpanzer/src/Lib/View/Desktop.cpp
diff -u netpanzer/src/Lib/View/Desktop.cpp:1.13
netpanzer/src/Lib/View/Desktop.cpp:1.14
--- netpanzer/src/Lib/View/Desktop.cpp:1.13 Fri Oct 3 10:45:01 2003
+++ netpanzer/src/Lib/View/Desktop.cpp Mon Oct 13 10:30:13 2003
@@ -472,7 +472,8 @@
if (mouseActions & View::MA_MOVE) {
// Move the window
- lMouseView->moveTo(mousePos - mouseActionOffset);
+ // XXX need to check for screen size
+ //lMouseView->moveTo(mousePos - mouseActionOffset);
} else if (mouseActions & View::MA_SCROLL_BAR) {
lMouseView->scrollBarMove(lMouseView->getScreenToClientPos(prevMousePos),
lMouseView->getScreenToClientPos(mousePos));
} else if (lMouseView->getResize()) {
@@ -497,8 +498,11 @@
lMouseView->min.y + View::RESIZE_YMINSIZE);
}
+ // XXX
+ /*
lMouseView->moveTo(resizeMin);
lMouseView->resize(resizeMax - resizeMin);
+ */
}
} // end Desktop::doMouseActions
@@ -610,7 +614,7 @@
// doDraw
//---------------------------------------------------------------------------
-void DesktopView::doDraw(const Surface &viewArea, const Surface &clientArea)
+void DesktopView::doDraw(Surface &viewArea, Surface &clientArea)
{
viewArea.fill(Color::black);
Index: netpanzer/src/Lib/View/Desktop.hpp
diff -u netpanzer/src/Lib/View/Desktop.hpp:1.9
netpanzer/src/Lib/View/Desktop.hpp:1.10
--- netpanzer/src/Lib/View/Desktop.hpp:1.9 Sun Oct 12 15:22:12 2003
+++ netpanzer/src/Lib/View/Desktop.hpp Mon Oct 13 10:30:13 2003
@@ -172,7 +172,7 @@
public:
DesktopView();
- virtual void doDraw(const Surface &viewArea, const Surface &clientArea);
+ virtual void doDraw(Surface &viewArea, Surface &clientArea);
virtual void rMouseDrag(const iXY &downPos, const iXY &prevPos, const iXY
&newPos);
virtual void doActivate();
Index: netpanzer/src/Lib/View/Icon.hpp
diff -u netpanzer/src/Lib/View/Icon.hpp:1.3 netpanzer/src/Lib/View/Icon.hpp:1.4
--- netpanzer/src/Lib/View/Icon.hpp:1.3 Tue Sep 16 16:16:11 2003
+++ netpanzer/src/Lib/View/Icon.hpp Mon Oct 13 10:30:13 2003
@@ -63,8 +63,6 @@
}
void setImage(const Surface &image)
{}
-
-}
-; // end Icon
+}; // end Icon
#endif // end __Icon_hpp__
Index: netpanzer/src/Lib/View/ScrollBar.cpp
diff -u netpanzer/src/Lib/View/ScrollBar.cpp:1.7
netpanzer/src/Lib/View/ScrollBar.cpp:1.8
--- netpanzer/src/Lib/View/ScrollBar.cpp:1.7 Sun Oct 5 09:50:11 2003
+++ netpanzer/src/Lib/View/ScrollBar.cpp Mon Oct 13 10:30:13 2003
@@ -112,7 +112,7 @@
// draw
//---------------------------------------------------------------------------
-void ScrollBar::draw(const Surface &dest)
+void ScrollBar::draw(Surface &dest)
{
setLocation();
setSize();
@@ -237,8 +237,9 @@
// clicked
//---------------------------------------------------------------------------
-void ScrollBar::actionPerformed(const iXY &pos)
+void ScrollBar::actionPerformed(const mMouseEvent& me)
{
+ iXY pos = me.getPoint();
if (parent != 0) {
if (orientation == HORIZONTAL) {
percent = float(pos.x) / float(size.x);
Index: netpanzer/src/Lib/View/ScrollBar.hpp
diff -u netpanzer/src/Lib/View/ScrollBar.hpp:1.4
netpanzer/src/Lib/View/ScrollBar.hpp:1.5
--- netpanzer/src/Lib/View/ScrollBar.hpp:1.4 Sun Oct 5 09:50:11 2003
+++ netpanzer/src/Lib/View/ScrollBar.hpp Mon Oct 13 10:30:14 2003
@@ -114,8 +114,8 @@
ScrollBar::viewableAmount = viewableAmount;
}
- virtual void draw(const Surface &dest);
- virtual void actionPerformed(const iXY &pos);
+ virtual void draw(Surface &dest);
+ virtual void actionPerformed(const mMouseEvent& me);
}; // end ScrollBar
#endif // end __ScrollBar_hpp__
Index: netpanzer/src/Lib/View/View.cpp
diff -u netpanzer/src/Lib/View/View.cpp:1.19
netpanzer/src/Lib/View/View.cpp:1.20
--- netpanzer/src/Lib/View/View.cpp:1.19 Sun Oct 12 18:09:35 2003
+++ netpanzer/src/Lib/View/View.cpp Mon Oct 13 10:30:14 2003
@@ -103,7 +103,6 @@
free(title);
free(subTitle);
free(labels);
-
} // end ~View::View
// reset
@@ -157,7 +156,7 @@
//---------------------------------------------------------------------------
// Purpose: Draws the borders of the window.
//---------------------------------------------------------------------------
-void View::drawBorder(const Surface &viewArea)
+void View::drawBorder(Surface &viewArea)
{
assert(this != 0);
@@ -168,7 +167,7 @@
//---------------------------------------------------------------------------
// Purpose: Draws the buttons of the window.
//---------------------------------------------------------------------------
-void View::drawButtons(const Surface &viewArea)
+void View::drawButtons(Surface &viewArea)
{
assert(this != 0);
@@ -185,7 +184,7 @@
// Purpose: Draws the title of the view and colors the move area background
// depending on whether the view is active.
//---------------------------------------------------------------------------
-void View::drawTitle(const Surface &viewArea)
+void View::drawTitle(Surface &viewArea)
{
assert(this != 0);
@@ -400,7 +399,11 @@
return;
currentscreen = &surface; // hack
- doDraw(getViewArea(surface), getClientArea(surface));
+ Surface* viewarea = getViewArea(surface);
+ Surface* clientarea = getClientArea(surface);
+ doDraw(*viewarea, *clientarea);
+ delete viewarea;
+ delete clientarea;
} // end draw
// activate
@@ -444,7 +447,7 @@
//---------------------------------------------------------------------------
// Purpose: Default implementation - draws all the componentList of the window.
//---------------------------------------------------------------------------
-void View::doDraw(const Surface &viewArea, const Surface &clientArea)
+void View::doDraw(Surface &viewArea, Surface &clientArea)
{
if (getShowStatus()) {
drawStatus(clientArea);
@@ -619,59 +622,32 @@
//---------------------------------------------------------------------------
// Purpose: Returns a Surface of the view's dimensions.
//---------------------------------------------------------------------------
-Surface View::getViewArea(Surface& dest)
+Surface* View::getViewArea(Surface& dest)
{
assert(this != 0);
iRect rect(min, max);
- Surface surface(dest, rect.min, rect.max, false);
-
- assert(surface.mem != 0);
- return surface;
+ return new Surface(dest, rect.min, rect.max, false);
} // end View::getViewArea
-#if 0
-// getClientArea
-//---------------------------------------------------------------------------
-// Purpose: Sets the destination surface to the specified coodinates within
-// the source surface. If the window does not have borders, then
-// set the coordinates to the whole window area.
-//---------------------------------------------------------------------------
-void View::getClientArea(Surface &dest)
-{
- assert(this != 0);
-
- if (getBordered()) {
- dest.setTo( getViewArea(),
- iRect(borderSize,
- borderSize + moveAreaHeight,
- getSizeX() - borderSize,
- getSizeY() - borderSize));
- } else {
- getViewArea(dest);
- }
-} // end View::getClientArea
-#endif
-
// getClientArea
//---------------------------------------------------------------------------
// Purpose:
//---------------------------------------------------------------------------
-Surface View::getClientArea(Surface& dest)
+Surface* View::getClientArea(Surface& dest)
{
+ Surface* viewarea = getViewArea(dest);
if (getBordered()) {
- Surface surface(getViewArea(dest),
+ Surface* surface = new Surface(*viewarea,
iXY(borderSize, borderSize+moveAreaHeight),
iXY(getSizeX() - borderSize,
getSizeY() - borderSize), false);
-
- assert(surface.mem != 0);
-
+ delete viewarea;
return surface;
}
- return getViewArea(dest);
+ return viewarea;
} // end View::getClientArea
// getClientRect
@@ -1053,7 +1029,7 @@
//---------------------------------------------------------------------------
// Purpose:
//---------------------------------------------------------------------------
-void View::drawLabels(const Surface &clientArea)
+void View::drawLabels(Surface &clientArea)
{
if (!clientArea.getDoesExist()) {
throw Exception("ERROR: Client area does not exist.");
@@ -1070,7 +1046,7 @@
//---------------------------------------------------------------------------
// Purpose:
//---------------------------------------------------------------------------
-void View::drawDefinedButtons(const Surface &clientArea)
+void View::drawDefinedButtons(Surface &clientArea)
{
for (int num = 0; num < buttons.getCount(); num++) {
buttons[num].topSurface.blt(clientArea,
iXY(buttons[num].getBounds().min.x, buttons[num].getBounds().min.y));
@@ -1081,7 +1057,7 @@
//---------------------------------------------------------------------------
// Purpose:
//---------------------------------------------------------------------------
-void View::drawInputFields(const Surface &clientArea)
+void View::drawInputFields(Surface &clientArea)
{
for (int num = 0; num < inputFields.getCount(); num++) {
if (num == selectedInputField) {
@@ -1096,7 +1072,7 @@
//---------------------------------------------------------------------------
// Purpose: Draws the correct image frame for the currently highlighted button.
//---------------------------------------------------------------------------
-void View::drawHighlightedButton(const Surface &clientArea)
+void View::drawHighlightedButton(Surface &clientArea)
{
assert(this != 0);
@@ -1278,7 +1254,7 @@
// drawStatus
//---------------------------------------------------------------------------
-void View::drawStatus(const Surface &dest)
+void View::drawStatus(Surface &dest)
{
// Draw the status bar.
iRect clientRect(getClientRect());
@@ -1339,7 +1315,7 @@
//---------------------------------------------------------------------------
// Purpose: Draws the selected button.
//---------------------------------------------------------------------------
-void View::drawPressedButton(const Surface &clientArea)
+void View::drawPressedButton(Surface &clientArea)
{
assert(this != 0);
Index: netpanzer/src/Lib/View/View.hpp
diff -u netpanzer/src/Lib/View/View.hpp:1.10
netpanzer/src/Lib/View/View.hpp:1.11
--- netpanzer/src/Lib/View/View.hpp:1.10 Sun Oct 12 18:09:36 2003
+++ netpanzer/src/Lib/View/View.hpp Mon Oct 13 10:30:14 2003
@@ -106,9 +106,8 @@
protected:
virtual void actionPerformed(mMouseEvent me)
{}
- Surface getViewArea(Surface& dest);
- //virtual void getClientArea(Surface& dest);
- virtual Surface getClientArea(Surface& dest);
+ Surface* getViewArea(Surface& dest);
+ virtual Surface* getClientArea(Surface& dest);
int pressedButton;
int prevPressedButton;
@@ -191,7 +190,7 @@
void addLabel(const iXY &pos, char *label, const PIX &color);
void addLabelShadowed(const iXY &pos, char *label, const PIX &foreColor,
const PIX &backColor);
void addLabel(const iXY &pos, char *label, const bool &isShadowed, const
PIX &foreColor, const PIX &backColor);
- void drawLabels(const Surface &clientArea);
+ void drawLabels(Surface &clientArea);
// cButton Functions.
void addButtonPackedSurface(const iXY &pos, PackedSurface &source, const
char *toolTip, ITEM_FUNC leftClickFunc);
@@ -207,9 +206,9 @@
}
void addButtonSurface(const iXY &pos, Surface &source, const char
*toolTip, ITEM_FUNC func);
void addButtonSurfaceSingle(const iXY &pos, Surface &source, const char
*toolTip, ITEM_FUNC func);
- /*!FIXME!*/ void drawDefinedButtons (const Surface &clientArea);
- void drawHighlightedButton(const Surface &clientArea);
- void drawPressedButton(const Surface &clientArea);
+ /*!FIXME!*/ void drawDefinedButtons (Surface &clientArea);
+ void drawHighlightedButton(Surface &clientArea);
+ void drawPressedButton(Surface &clientArea);
void setPressedButton(const int &cButton);
void setHighlightedButton(const int &cButton);
int findButtonContaining(const iXY &pos);
@@ -218,17 +217,17 @@
void setSearchName(const char *searchName);
void setTitle(const char *title);
void setSubTitle(const char *subTitle);
- void drawTitle(const Surface &windowArea);
+ void drawTitle(Surface &windowArea);
// Input Field Functions
void addInputField(const iXY &pos, cInputFieldString *string, const char
*excludedCharacters, const bool &isSelected);
int findInputFieldContaining(const iXY &pos);
- void drawInputFields(const Surface &clientArea);
+ void drawInputFields(Surface &clientArea);
/////////////////////////////////
void draw(Surface& drawon);
void showStatus(const char *string);
- void drawStatus(const Surface &dest);
+ void drawStatus(Surface &dest);
void checkResolution(iXY oldResolution, iXY newResolution);
void checkArea(iXY viewarea);
void toggleView();
@@ -237,9 +236,9 @@
/////////////////////////////////
// These options can be modified on a per View type basis
- virtual void drawButtons(const Surface &windowArea);
- virtual void drawBorder(const Surface &windowArea);
- virtual void doDraw(const Surface &windowArea, const Surface &clientArea);
+ virtual void drawButtons(Surface &windowArea);
+ virtual void drawBorder(Surface &windowArea);
+ virtual void doDraw(Surface &windowArea, Surface &clientArea);
virtual void doActivate();
virtual void doDeactivate();
virtual void mouseMove(const iXY &prevPos, const iXY &newPos);
Index: netpanzer/src/Lib/View/cInputField.cpp
diff -u netpanzer/src/Lib/View/cInputField.cpp:1.11
netpanzer/src/Lib/View/cInputField.cpp:1.12
--- netpanzer/src/Lib/View/cInputField.cpp:1.11 Fri Oct 3 10:45:03 2003
+++ netpanzer/src/Lib/View/cInputField.cpp Mon Oct 13 10:30:14 2003
@@ -218,7 +218,7 @@
// draw
//--------------------------------------------------------------------------
-void cInputField::draw(const Surface &dest)
+void cInputField::draw(Surface &dest)
{
checkCursor();
@@ -230,7 +230,7 @@
// drawHighlighted
//--------------------------------------------------------------------------
-void cInputField::drawHighlighted(const Surface &dest)
+void cInputField::drawHighlighted(Surface &dest)
{
checkCursor();
Index: netpanzer/src/Lib/View/cInputField.hpp
diff -u netpanzer/src/Lib/View/cInputField.hpp:1.6
netpanzer/src/Lib/View/cInputField.hpp:1.7
--- netpanzer/src/Lib/View/cInputField.hpp:1.6 Mon Sep 22 09:53:50 2003
+++ netpanzer/src/Lib/View/cInputField.hpp Mon Oct 13 10:30:14 2003
@@ -104,8 +104,8 @@
void setExcludedCharacters(const char *excludedCharacters);
void addChar(int newChar);
void addExtendedChar(int newExtendedChar);
- void draw(const Surface &dest);
- void drawHighlighted(const Surface &dest);
+ void draw(Surface &dest);
+ void drawHighlighted(Surface &dest);
void checkCursor();
private:
Index: netpanzer/src/Lib/cMouse.cpp
diff -u netpanzer/src/Lib/cMouse.cpp:1.5 netpanzer/src/Lib/cMouse.cpp:1.6
--- netpanzer/src/Lib/cMouse.cpp:1.5 Fri Oct 3 10:44:57 2003
+++ netpanzer/src/Lib/cMouse.cpp Mon Oct 13 10:30:05 2003
@@ -39,7 +39,7 @@
//---------------------------------------------------------------------------
// Purpose: Draws the graphical mouse cursor.
//---------------------------------------------------------------------------
-void cMouse::draw(const Surface &dest)
+void cMouse::draw(Surface &dest)
{
assert(pointer != 0);
Index: netpanzer/src/Lib/cMouse.hpp
diff -u netpanzer/src/Lib/cMouse.hpp:1.7 netpanzer/src/Lib/cMouse.hpp:1.8
--- netpanzer/src/Lib/cMouse.hpp:1.7 Fri Oct 3 10:44:57 2003
+++ netpanzer/src/Lib/cMouse.hpp Mon Oct 13 10:30:05 2003
@@ -41,7 +41,7 @@
{}
// cMouse Operation Functions
- static void draw(const Surface &dest); // Handles the drawing of the
cMouse cursor
+ static void draw(Surface &dest); // Handles the drawing of the cMouse
cursor
static inline Surface *getCurPointer()
{
Index: netpanzer/src/NetPanzer/Core/main.cpp
diff -u netpanzer/src/NetPanzer/Core/main.cpp:1.13
netpanzer/src/NetPanzer/Core/main.cpp:1.14
--- netpanzer/src/NetPanzer/Core/main.cpp:1.13 Sun Oct 12 16:47:01 2003
+++ netpanzer/src/NetPanzer/Core/main.cpp Mon Oct 13 10:30:14 2003
@@ -112,6 +112,9 @@
void signalhandler(int signum)
{
+ // set signal handler back to default
+ signal(signum, SIG_DFL);
+
const char* sigtype;
switch(signum) {
case SIGINT: sigtype = "SIGINT"; break;
Index: netpanzer/src/NetPanzer/Interfaces/GameManager.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.61
netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.62
--- netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.61 Sun Oct 12
17:02:22 2003
+++ netpanzer/src/NetPanzer/Interfaces/GameManager.cpp Mon Oct 13 10:30:16 2003
@@ -433,7 +433,9 @@
if (KeyboardInterface::getKeyPressed(SDLK_b)) {
toggleBot = !toggleBot;
- LOGGER.info("Bot enable=%d", toggleBot ? 1 : 0);
+ LOGGER.info("Bot enable=%d", toggleBot ? 1 : 0);
+ ConsoleInterface::postMessage( "bot has been %s.", toggleBot ?
+ "enabled" : "disabled" );
}
if (toggleBot) {
Bot::bot()->processEvents();
Index: netpanzer/src/NetPanzer/Views/Game/AreYouSureExitView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/AreYouSureExitView.cpp:1.6
netpanzer/src/NetPanzer/Views/Game/AreYouSureExitView.cpp:1.7
--- netpanzer/src/NetPanzer/Views/Game/AreYouSureExitView.cpp:1.6 Fri Oct
3 10:45:11 2003
+++ netpanzer/src/NetPanzer/Views/Game/AreYouSureExitView.cpp Mon Oct 13
10:30:17 2003
@@ -76,7 +76,7 @@
// doDraw
//---------------------------------------------------------------------------
-void AreYouSureExitView::doDraw(const Surface &viewArea, const Surface
&clientArea)
+void AreYouSureExitView::doDraw(Surface &viewArea, Surface &clientArea)
{
iRect r(min, max);
Index: netpanzer/src/NetPanzer/Views/Game/AreYouSureExitView.hpp
diff -u netpanzer/src/NetPanzer/Views/Game/AreYouSureExitView.hpp:1.2
netpanzer/src/NetPanzer/Views/Game/AreYouSureExitView.hpp:1.3
--- netpanzer/src/NetPanzer/Views/Game/AreYouSureExitView.hpp:1.2 Tue Sep
16 16:16:12 2003
+++ netpanzer/src/NetPanzer/Views/Game/AreYouSureExitView.hpp Mon Oct 13
10:30:17 2003
@@ -15,20 +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 __AreYouSureExitView_hpp__
#define __AreYouSureExitView_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
#include "SpecialButtonView.hpp"
#include "Surface.hpp"
-
//---------------------------------------------------------------------------
class AreYouSureExitView : public SpecialButtonView
{
@@ -38,10 +30,8 @@
public:
AreYouSureExitView();
- virtual void doDraw(const Surface &windowArea, const Surface &clientArea);
+ virtual void doDraw(Surface &windowArea, Surface &clientArea);
virtual void doActivate();
-
-}
-; // end AreYouSureExitView
+}; // end AreYouSureExitView
#endif // end __AreYouSureExitView_hpp__
Index: netpanzer/src/NetPanzer/Views/Game/AreYouSureResignView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/AreYouSureResignView.cpp:1.14
netpanzer/src/NetPanzer/Views/Game/AreYouSureResignView.cpp:1.15
--- netpanzer/src/NetPanzer/Views/Game/AreYouSureResignView.cpp:1.14 Sat Oct
4 10:44:38 2003
+++ netpanzer/src/NetPanzer/Views/Game/AreYouSureResignView.cpp Mon Oct 13
10:30:17 2003
@@ -145,7 +145,7 @@
// doDraw
//---------------------------------------------------------------------------
-void AreYouSureResignView::doDraw(const Surface &viewArea, const Surface
&clientArea)
+void AreYouSureResignView::doDraw(Surface &viewArea, Surface &clientArea)
{
iRect r(min, max);
Index: netpanzer/src/NetPanzer/Views/Game/AreYouSureResignView.hpp
diff -u netpanzer/src/NetPanzer/Views/Game/AreYouSureResignView.hpp:1.2
netpanzer/src/NetPanzer/Views/Game/AreYouSureResignView.hpp:1.3
--- netpanzer/src/NetPanzer/Views/Game/AreYouSureResignView.hpp:1.2 Tue Sep
16 16:16:12 2003
+++ netpanzer/src/NetPanzer/Views/Game/AreYouSureResignView.hpp Mon Oct 13
10:30:17 2003
@@ -15,20 +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 __AreYouSureResignView_hpp__
#define __AreYouSureResignView_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
#include "SpecialButtonView.hpp"
#include "Surface.hpp"
-
//---------------------------------------------------------------------------
class AreYouSureResignView : public SpecialButtonView
{
@@ -38,10 +30,8 @@
public:
AreYouSureResignView();
- virtual void doDraw(const Surface &windowArea, const Surface &clientArea);
+ virtual void doDraw(Surface &windowArea, Surface &clientArea);
virtual void doActivate();
-
-}
-; // end AreYouSureResignView
+}; // end AreYouSureResignView
#endif // end __AreYouSureResignView_hpp__
Index: netpanzer/src/NetPanzer/Views/Game/ChatView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/ChatView.cpp:1.9
netpanzer/src/NetPanzer/Views/Game/ChatView.cpp:1.10
--- netpanzer/src/NetPanzer/Views/Game/ChatView.cpp:1.9 Sun Oct 5 09:50:13 2003
+++ netpanzer/src/NetPanzer/Views/Game/ChatView.cpp Mon Oct 13 10:30:17 2003
@@ -116,7 +116,7 @@
// drawMessages
//---------------------------------------------------------------------------
-void ChatView::drawMessages(const Surface &dest)
+void ChatView::drawMessages(Surface &dest)
{
/*
iXY offset;
@@ -137,7 +137,7 @@
// doDraw
//---------------------------------------------------------------------------
-void ChatView::doDraw(const Surface &viewArea, const Surface &clientArea)
+void ChatView::doDraw(Surface &viewArea, Surface &clientArea)
{
bltViewBackground(viewArea);
@@ -155,5 +155,4 @@
//drawTitle(viewArea);
//drawDefinedButtons(clientArea);
//drawInputFields(clientArea);
-
} // end doDraw
Index: netpanzer/src/NetPanzer/Views/Game/ChatView.hpp
diff -u netpanzer/src/NetPanzer/Views/Game/ChatView.hpp:1.3
netpanzer/src/NetPanzer/Views/Game/ChatView.hpp:1.4
--- netpanzer/src/NetPanzer/Views/Game/ChatView.hpp:1.3 Tue Sep 16 16:16:12 2003
+++ netpanzer/src/NetPanzer/Views/Game/ChatView.hpp Mon Oct 13 10:30:18 2003
@@ -31,7 +31,7 @@
class ChatView : public GameTemplateView
{
private:
- void drawMessages(const Surface &dest);
+ void drawMessages(Surface &dest);
int messageCount; // How many messages do we currently have?
int viewableMessageCount; // How many items are viewable.
@@ -50,7 +50,7 @@
delete scrollBar;
}
- virtual void doDraw(const Surface &windowArea, const Surface &clientArea);
+ virtual void doDraw(Surface &windowArea, Surface &clientArea);
void addMessage(const char *newMessage);
Index: netpanzer/src/NetPanzer/Views/Game/CodeStatsView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/CodeStatsView.cpp:1.5
netpanzer/src/NetPanzer/Views/Game/CodeStatsView.cpp:1.6
--- netpanzer/src/NetPanzer/Views/Game/CodeStatsView.cpp:1.5 Mon Sep 22
09:53:52 2003
+++ netpanzer/src/NetPanzer/Views/Game/CodeStatsView.cpp Mon Oct 13
10:30:18 2003
@@ -16,6 +16,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <config.h>
+
#include "CodeStatsView.hpp"
#include "GameViewGlobals.hpp"
#include "SpriteSorter.hpp"
@@ -154,7 +155,7 @@
// doDraw
//---------------------------------------------------------------------------
-void CodeStatsView::doDraw(const Surface &viewArea, const Surface &clientArea)
+void CodeStatsView::doDraw(Surface &viewArea, Surface &clientArea)
{
bltViewBackground(viewArea);
@@ -188,7 +189,7 @@
} // end CodeStatsView::doDraw
//---------------------------------------------------------------------------
-void CodeStatsView::drawNetworkStats( const Surface &clientArea)
+void CodeStatsView::drawNetworkStats(Surface &clientArea)
{
char strBuf[256];
@@ -292,7 +293,7 @@
}
//---------------------------------------------------------------------------
-void CodeStatsView::drawSorterStats( const Surface &clientArea)
+void CodeStatsView::drawSorterStats(Surface &clientArea)
{
char strBuf[256];
@@ -313,7 +314,7 @@
}
//---------------------------------------------------------------------------
-void CodeStatsView::drawPathingStats( const Surface &clientArea)
+void CodeStatsView::drawPathingStats(Surface &clientArea)
{
char strBuf[256];
@@ -367,7 +368,7 @@
}
//---------------------------------------------------------------------------
-void CodeStatsView::drawUnitStats( const Surface &clientArea )
+void CodeStatsView::drawUnitStats(Surface &clientArea)
{
char strBuf[256];
Index: netpanzer/src/NetPanzer/Views/Game/CodeStatsView.hpp
diff -u netpanzer/src/NetPanzer/Views/Game/CodeStatsView.hpp:1.2
netpanzer/src/NetPanzer/Views/Game/CodeStatsView.hpp:1.3
--- netpanzer/src/NetPanzer/Views/Game/CodeStatsView.hpp:1.2 Tue Sep 16
16:16:12 2003
+++ netpanzer/src/NetPanzer/Views/Game/CodeStatsView.hpp Mon Oct 13
10:30:18 2003
@@ -30,18 +30,16 @@
class CodeStatsView : public GameTemplateView
{
protected:
- void drawNetworkStats( const Surface &clientArea);
- void drawSorterStats( const Surface &clientArea);
- void drawPathingStats( const Surface &clientArea);
- void drawUnitStats( const Surface &clientArea );
+ void drawNetworkStats(Surface &clientArea);
+ void drawSorterStats(Surface &clientArea);
+ void drawPathingStats(Surface &clientArea);
+ void drawUnitStats(Surface &clientArea );
public:
CodeStatsView();
- virtual void doDraw(const Surface &windowArea, const Surface &clientArea);
-
-}
-; // end CodeStatsView
+ virtual void doDraw(Surface &windowArea, Surface &clientArea);
+}; // end CodeStatsView
#endif // end __CodeStatsView_hpp__
Index: netpanzer/src/NetPanzer/Views/Game/GameInfoView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/GameInfoView.cpp:1.11
netpanzer/src/NetPanzer/Views/Game/GameInfoView.cpp:1.12
--- netpanzer/src/NetPanzer/Views/Game/GameInfoView.cpp:1.11 Sat Oct 4
10:44:39 2003
+++ netpanzer/src/NetPanzer/Views/Game/GameInfoView.cpp Mon Oct 13 10:30:18 2003
@@ -86,7 +86,7 @@
// doDraw
//---------------------------------------------------------------------------
-void GameInfoView::doDraw(const Surface &viewArea, const Surface &clientArea)
+void GameInfoView::doDraw(Surface &viewArea, Surface &clientArea)
{
char unitsBuf[64];
//char killsBuf[64];
Index: netpanzer/src/NetPanzer/Views/Game/GameInfoView.hpp
diff -u netpanzer/src/NetPanzer/Views/Game/GameInfoView.hpp:1.2
netpanzer/src/NetPanzer/Views/Game/GameInfoView.hpp:1.3
--- netpanzer/src/NetPanzer/Views/Game/GameInfoView.hpp:1.2 Tue Sep 16
16:16:12 2003
+++ netpanzer/src/NetPanzer/Views/Game/GameInfoView.hpp Mon Oct 13 10:30:18 2003
@@ -18,17 +18,10 @@
#ifndef __GameInfoView_hpp__
#define __GameInfoView_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
#include "View.hpp"
#include "Surface.hpp"
#include "GameTemplateView.hpp"
-
//---------------------------------------------------------------------------
class GameInfoView : public GameTemplateView
{
@@ -40,9 +33,7 @@
public:
GameInfoView();
- virtual void doDraw(const Surface &windowArea, const Surface &clientArea);
-
-}
-; // end GameInfoView
+ virtual void doDraw(Surface &windowArea, Surface &clientArea);
+}; // end GameInfoView
#endif // end __GameInfoView_hpp__
Index: netpanzer/src/NetPanzer/Views/Game/GameToolbarView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/GameToolbarView.cpp:1.7
netpanzer/src/NetPanzer/Views/Game/GameToolbarView.cpp:1.8
--- netpanzer/src/NetPanzer/Views/Game/GameToolbarView.cpp:1.7 Sat Oct 4
10:44:39 2003
+++ netpanzer/src/NetPanzer/Views/Game/GameToolbarView.cpp Mon Oct 13
10:30:18 2003
@@ -222,10 +222,9 @@
// doDraw
//---------------------------------------------------------------------------
-void GameToolbarView::doDraw(const Surface &viewArea, const Surface
&clientArea)
+void GameToolbarView::doDraw(Surface &viewArea, Surface &clientArea)
{
bltViewBackground(viewArea);
View::doDraw(viewArea, clientArea);
-
} // end GameToolbarView::doDraw
Index: netpanzer/src/NetPanzer/Views/Game/GameToolbarView.hpp
diff -u netpanzer/src/NetPanzer/Views/Game/GameToolbarView.hpp:1.2
netpanzer/src/NetPanzer/Views/Game/GameToolbarView.hpp:1.3
--- netpanzer/src/NetPanzer/Views/Game/GameToolbarView.hpp:1.2 Tue Sep 16
16:16:12 2003
+++ netpanzer/src/NetPanzer/Views/Game/GameToolbarView.hpp Mon Oct 13
10:30:18 2003
@@ -18,26 +18,17 @@
#ifndef __GameToolbarView_hpp__
#define __GameToolbarView_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
#include "View.hpp"
#include "Surface.hpp"
#include "GameTemplateView.hpp"
-
//---------------------------------------------------------------------------
class GameToolbarView : public GameTemplateView
{
public:
GameToolbarView();
- virtual void doDraw(const Surface &windowArea, const Surface &clientArea);
-
-}
-; // end GameToolbarView
+ virtual void doDraw(Surface &windowArea, Surface &clientArea);
+}; // end GameToolbarView
#endif // end __GameToolbarView_hpp__
Index: netpanzer/src/NetPanzer/Views/Game/GameView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/GameView.cpp:1.10
netpanzer/src/NetPanzer/Views/Game/GameView.cpp:1.11
--- netpanzer/src/NetPanzer/Views/Game/GameView.cpp:1.10 Sun Oct 12
18:09:36 2003
+++ netpanzer/src/NetPanzer/Views/Game/GameView.cpp Mon Oct 13 10:30:18 2003
@@ -74,7 +74,7 @@
// doDraw
//---------------------------------------------------------------------------
-void GameView::doDraw(const Surface &viewArea, const Surface &clientArea)
+void GameView::doDraw(Surface &viewArea, Surface &clientArea)
{
// Added for debugging, accesible through LibView.
if (gDrawSolidBackground) {
Index: netpanzer/src/NetPanzer/Views/Game/GameView.hpp
diff -u netpanzer/src/NetPanzer/Views/Game/GameView.hpp:1.4
netpanzer/src/NetPanzer/Views/Game/GameView.hpp:1.5
--- netpanzer/src/NetPanzer/Views/Game/GameView.hpp:1.4 Thu Sep 18 13:44:18 2003
+++ netpanzer/src/NetPanzer/Views/Game/GameView.hpp Mon Oct 13 10:30:18 2003
@@ -36,8 +36,7 @@
void doActivate();
private:
-
- virtual void doDraw(const Surface &windowArea, const Surface &clientArea);
+ virtual void doDraw(Surface &windowArea, Surface &clientArea);
//virtual void mouseEnter(const iXY &pos);
virtual void mouseMove(const iXY & prevPos, const iXY &newPos);
}; // end GameView
Index: netpanzer/src/NetPanzer/Views/Game/HelpScrollView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/HelpScrollView.cpp:1.11
netpanzer/src/NetPanzer/Views/Game/HelpScrollView.cpp:1.12
--- netpanzer/src/NetPanzer/Views/Game/HelpScrollView.cpp:1.11 Fri Oct 3
10:45:14 2003
+++ netpanzer/src/NetPanzer/Views/Game/HelpScrollView.cpp Mon Oct 13
10:30:18 2003
@@ -132,7 +132,7 @@
// doDraw
//---------------------------------------------------------------------------
-void HelpScrollView::doDraw(const Surface &viewArea, const Surface &clientArea)
+void HelpScrollView::doDraw(Surface &viewArea, Surface &clientArea)
{
if (Desktop::getVisible("GameView")) {
bltViewBackground(viewArea);
@@ -156,7 +156,7 @@
// drawHelpText
//--------------------------------------------------------------------------
-void HelpScrollView::drawHelpText(const Surface &dest, const int &x, const int
&y)
+void HelpScrollView::drawHelpText(Surface &dest, const int &x, const int &y)
{
PIX color = Color::white;
Index: netpanzer/src/NetPanzer/Views/Game/HelpScrollView.hpp
diff -u netpanzer/src/NetPanzer/Views/Game/HelpScrollView.hpp:1.4
netpanzer/src/NetPanzer/Views/Game/HelpScrollView.hpp:1.5
--- netpanzer/src/NetPanzer/Views/Game/HelpScrollView.hpp:1.4 Sat Sep 20
13:52:47 2003
+++ netpanzer/src/NetPanzer/Views/Game/HelpScrollView.hpp Mon Oct 13
10:30:18 2003
@@ -34,7 +34,7 @@
int rows;
int maxYOffset;
- void drawHelpText(const Surface &dest, const int &x, const int &y);
+ void drawHelpText(Surface &dest, const int &x, const int &y);
ScrollBar *scrollBar;
cGrowList <String> text;
@@ -55,7 +55,7 @@
delete scrollBar;
}
- virtual void doDraw(const Surface &windowArea, const Surface &clientArea);
+ virtual void doDraw(Surface &windowArea, Surface &clientArea);
virtual void actionPerformed(mMouseEvent me);
virtual void doActivate();
}
Index: netpanzer/src/NetPanzer/Views/Game/LobbyView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/LobbyView.cpp:1.13
netpanzer/src/NetPanzer/Views/Game/LobbyView.cpp:1.14
--- netpanzer/src/NetPanzer/Views/Game/LobbyView.cpp:1.13 Fri Oct 3
10:45:15 2003
+++ netpanzer/src/NetPanzer/Views/Game/LobbyView.cpp Mon Oct 13 10:30:18 2003
@@ -63,7 +63,7 @@
// doDraw
//---------------------------------------------------------------------------
-void LobbyView::doDraw(const Surface &viewArea, const Surface &clientArea)
+void LobbyView::doDraw(Surface &viewArea, Surface &clientArea)
{
if (!backgroundSurface.getDoesExist()) {
loadBackgroundSurface();
@@ -76,7 +76,6 @@
background.blt(clientArea, 179, 153);
View::doDraw(viewArea, clientArea);
-
} // end LobbyView::doDraw
// update
Index: netpanzer/src/NetPanzer/Views/Game/LobbyView.hpp
diff -u netpanzer/src/NetPanzer/Views/Game/LobbyView.hpp:1.3
netpanzer/src/NetPanzer/Views/Game/LobbyView.hpp:1.4
--- netpanzer/src/NetPanzer/Views/Game/LobbyView.hpp:1.3 Tue Sep 16
16:16:12 2003
+++ netpanzer/src/NetPanzer/Views/Game/LobbyView.hpp Mon Oct 13 10:30:19 2003
@@ -34,7 +34,7 @@
LobbyView();
// Standard window related functions.
- virtual void doDraw(const Surface &windowArea, const Surface &clientArea);
+ virtual void doDraw(Surface &windowArea, Surface &clientArea);
//virtual void lMouseDown(const iXY &p);
virtual void doActivate();
Index: netpanzer/src/NetPanzer/Views/Game/MiniMapView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/MiniMapView.cpp:1.18
netpanzer/src/NetPanzer/Views/Game/MiniMapView.cpp:1.19
--- netpanzer/src/NetPanzer/Views/Game/MiniMapView.cpp:1.18 Sun Oct 12
18:44:01 2003
+++ netpanzer/src/NetPanzer/Views/Game/MiniMapView.cpp Mon Oct 13 10:30:19 2003
@@ -92,7 +92,7 @@
// doDraw
//---------------------------------------------------------------------------
-void MiniMapView::doDraw(const Surface &viewArea, const Surface &clientArea)
+void MiniMapView::doDraw(Surface &viewArea, Surface &clientArea)
{
assert(this != 0);
assert(viewArea.getDoesExist());
@@ -223,7 +223,7 @@
// Purpose: Replaces the mouse cursor with a box showing where the viewable
// screen area would be moved to if the mouse was pressed.
//--------------------------------------------------------------------------
-void MiniMapView::drawMouseBox(const Surface &dest)
+void MiniMapView::drawMouseBox(Surface &dest)
{
assert(this != 0);
assert(dest.getDoesExist());
Index: netpanzer/src/NetPanzer/Views/Game/MiniMapView.hpp
diff -u netpanzer/src/NetPanzer/Views/Game/MiniMapView.hpp:1.3
netpanzer/src/NetPanzer/Views/Game/MiniMapView.hpp:1.4
--- netpanzer/src/NetPanzer/Views/Game/MiniMapView.hpp:1.3 Tue Sep 16
16:16:12 2003
+++ netpanzer/src/NetPanzer/Views/Game/MiniMapView.hpp Mon Oct 13 10:30:19 2003
@@ -15,17 +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
*/
-
-
#ifndef __MiniMapView_hpp__
#define __MiniMapView_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
#include "View.hpp"
#include "Surface.hpp"
#include "GameTemplateView.hpp"
@@ -65,7 +57,7 @@
void init();
- virtual void doDraw(const Surface &windowArea, const Surface &clientArea);
+ virtual void doDraw(Surface &windowArea, Surface &clientArea);
virtual void lMouseDown(const iXY &pos);
virtual int lMouseUp(const iXY &downPos, const iXY &upPos);
virtual void lMouseDrag(const iXY &downPos, const iXY &prevPos, const iXY
&newPos);
@@ -73,7 +65,7 @@
virtual void rMouseDown(const iXY &pos);
virtual void mouseMove(const iXY &prevPos, const iXY &newPos);
- void drawMouseBox(const Surface &dest);
+ void drawMouseBox(Surface &dest);
void setViewWindow(const iXY &pos);
static float scaleDelta;
@@ -85,9 +77,7 @@
private:
// XXX added this...
void addButtons();
-
-}
-; // end MiniMapView
+}; // end MiniMapView
extern MiniMapView miniMapView;
Index: netpanzer/src/NetPanzer/Views/Game/ProgressView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/ProgressView.cpp:1.14
netpanzer/src/NetPanzer/Views/Game/ProgressView.cpp:1.15
--- netpanzer/src/NetPanzer/Views/Game/ProgressView.cpp:1.14 Sun Oct 12
18:09:36 2003
+++ netpanzer/src/NetPanzer/Views/Game/ProgressView.cpp Mon Oct 13 10:30:19 2003
@@ -52,7 +52,7 @@
// doDraw
//---------------------------------------------------------------------------
-void ProgressView::doDraw(const Surface &viewArea, const Surface &clientArea)
+void ProgressView::doDraw(Surface &viewArea, Surface &clientArea)
{
if (!backgroundSurface.getDoesExist()) {
loadBackgroundSurface();
Index: netpanzer/src/NetPanzer/Views/Game/ProgressView.hpp
diff -u netpanzer/src/NetPanzer/Views/Game/ProgressView.hpp:1.2
netpanzer/src/NetPanzer/Views/Game/ProgressView.hpp:1.3
--- netpanzer/src/NetPanzer/Views/Game/ProgressView.hpp:1.2 Tue Sep 16
16:16:12 2003
+++ netpanzer/src/NetPanzer/Views/Game/ProgressView.hpp Mon Oct 13 10:30:19 2003
@@ -18,16 +18,9 @@
#ifndef __ProgressView_hpp__
#define __ProgressView_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
#include "View.hpp"
#include "Surface.hpp"
-
//---------------------------------------------------------------------------
class ProgressView : public View
{
@@ -38,7 +31,7 @@
ProgressView();
// Standard window related functions.
- virtual void doDraw(const Surface &windowArea, const Surface &clientArea);
+ virtual void doDraw(Surface &windowArea, Surface &clientArea);
//virtual void lMouseDown(const iXY &p);
virtual void doActivate();
@@ -67,8 +60,7 @@
void toggleGameView();
void toggleMainMenu();
-}
-; // end ProgressView
+}; // end ProgressView
extern ProgressView progressView;
Index: netpanzer/src/NetPanzer/Views/Game/RankView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/RankView.cpp:1.8
netpanzer/src/NetPanzer/Views/Game/RankView.cpp:1.9
--- netpanzer/src/NetPanzer/Views/Game/RankView.cpp:1.8 Sun Oct 5 09:50:13 2003
+++ netpanzer/src/NetPanzer/Views/Game/RankView.cpp Mon Oct 13 10:30:19 2003
@@ -77,7 +77,7 @@
// doDraw
//---------------------------------------------------------------------------
-void RankView::doDraw(const Surface &viewArea, const Surface &clientArea)
+void RankView::doDraw(Surface &viewArea, Surface &clientArea)
{
bltViewBackground(viewArea);
@@ -86,14 +86,13 @@
drawPlayerStats(clientArea);
View::doDraw(viewArea, clientArea);
-
} // end doDraw
// drawPlayerStats
//---------------------------------------------------------------------------
// Purpose:
//---------------------------------------------------------------------------
-void RankView::drawPlayerStats(const Surface &dest)
+void RankView::drawPlayerStats(Surface &dest)
{
char statBuf[256];
Index: netpanzer/src/NetPanzer/Views/Game/RankView.hpp
diff -u netpanzer/src/NetPanzer/Views/Game/RankView.hpp:1.3
netpanzer/src/NetPanzer/Views/Game/RankView.hpp:1.4
--- netpanzer/src/NetPanzer/Views/Game/RankView.hpp:1.3 Tue Sep 16 16:16:13 2003
+++ netpanzer/src/NetPanzer/Views/Game/RankView.hpp Mon Oct 13 10:30:19 2003
@@ -32,7 +32,7 @@
private:
int viewableMessageCount;
enum { ITEM_GAP_SPACE = 10 };
- void drawPlayerStats(const Surface &dest);
+ void drawPlayerStats(Surface &dest);
ScrollBar *scrollBar;
@@ -43,7 +43,7 @@
delete scrollBar;
}
- virtual void doDraw(const Surface &windowArea, const Surface &clientArea);
+ virtual void doDraw(Surface &windowArea, Surface &clientArea);
}
; // end _WIN
Index: netpanzer/src/NetPanzer/Views/Game/ResignView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/ResignView.cpp:1.6
netpanzer/src/NetPanzer/Views/Game/ResignView.cpp:1.7
--- netpanzer/src/NetPanzer/Views/Game/ResignView.cpp:1.6 Fri Oct 3
10:45:15 2003
+++ netpanzer/src/NetPanzer/Views/Game/ResignView.cpp Mon Oct 13 10:30:19 2003
@@ -83,7 +83,7 @@
// doDraw
//---------------------------------------------------------------------------
-void ResignView::doDraw(const Surface &viewArea, const Surface &clientArea)
+void ResignView::doDraw(Surface &viewArea, Surface &clientArea)
{
iRect r(0, 0, currentscreen->getPixX(), currentscreen->getPixY());
Index: netpanzer/src/NetPanzer/Views/Game/ResignView.hpp
diff -u netpanzer/src/NetPanzer/Views/Game/ResignView.hpp:1.2
netpanzer/src/NetPanzer/Views/Game/ResignView.hpp:1.3
--- netpanzer/src/NetPanzer/Views/Game/ResignView.hpp:1.2 Tue Sep 16
16:16:13 2003
+++ netpanzer/src/NetPanzer/Views/Game/ResignView.hpp Mon Oct 13 10:30:19 2003
@@ -15,20 +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 __ResignView_hpp__
#define __ResignView_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
#include "View.hpp"
#include "Surface.hpp"
-
//---------------------------------------------------------------------------
class ResignView : public View
{
@@ -38,10 +30,8 @@
public:
ResignView();
- virtual void doDraw(const Surface &windowArea, const Surface &clientArea);
+ virtual void doDraw(Surface &windowArea, Surface &clientArea);
virtual void doActivate();
-
-}
-; // end ResignView
+}; // end ResignView
#endif // end __ResignView_hpp__
Index: netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.cpp:1.19
netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.cpp:1.20
--- netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.cpp:1.19 Sun Oct
12 18:44:01 2003
+++ netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.cpp Mon Oct 13
10:30:19 2003
@@ -461,7 +461,7 @@
// doDraw
//--------------------------------------------------------------------------
-void VehicleSelectionView::doDraw(const Surface &viewArea, const Surface
&clientArea)
+void VehicleSelectionView::doDraw(Surface &viewArea, Surface &clientArea)
{
char strBuf[256];
@@ -568,7 +568,7 @@
// drawUnitImage
//---------------------------------------------------------------------------
-void VehicleSelectionView::drawUnitImage(const Surface &dest, const iXY &pos,
int unitType)
+void VehicleSelectionView::drawUnitImage(Surface &dest, const iXY &pos, int
unitType)
{
unitImages.setFrame(unitType);
unitImages.blt(dest, pos);
@@ -647,7 +647,7 @@
// drawMiniProductionStatus
//---------------------------------------------------------------------------
-void VehicleSelectionView::drawMiniProductionStatus(const Surface &dest)
+void VehicleSelectionView::drawMiniProductionStatus(Surface &dest)
{
iRect objectiveBounds;
unsigned char objectiveOwner;
@@ -877,7 +877,7 @@
} // end VehicleSelectionView::checkMaxValues
-void VehicleSelectionView::drawUnitProfileInfo(const Surface &dest, const iXY
&pos, short int unitType)
+void VehicleSelectionView::drawUnitProfileInfo(Surface &dest, const iXY &pos,
short int unitType)
{
if (unitType == -1) {
return;
@@ -920,7 +920,7 @@
}
-void VehicleSelectionView::drawBar(const Surface &dest, const iXY &pos, int
length, float percent)
+void VehicleSelectionView::drawBar(Surface &dest, const iXY &pos, int length,
float percent)
{
iXY size(int(float(length) * percent), Surface::getFontHeight());
Index: netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.hpp
diff -u netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.hpp:1.3
netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.hpp:1.4
--- netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.hpp:1.3 Tue Sep
16 16:16:13 2003
+++ netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.hpp Mon Oct 13
10:30:20 2003
@@ -93,8 +93,8 @@
int getUnitRegenTime(unsigned short unitType);
void checkMaxValues(const UnitProfile &profile);
void getProfileData();
- void drawBar(const Surface &dest, const iXY &pos, int length, float
percent);
- void drawUnitProfileInfo(const Surface &dest, const iXY &pos, short int
unitType);
+ void drawBar(Surface &dest, const iXY &pos, int length, float percent);
+ void drawUnitProfileInfo(Surface &dest, const iXY &pos, short int
unitType);
iXY productionUnitPos;
iXY timeRequiredPos;
@@ -111,11 +111,11 @@
{}
virtual void doActivate();
- virtual void doDraw(const Surface &windowArea, const Surface
&clientArea);
+ virtual void doDraw(Surface &windowArea, Surface &clientArea);
virtual void mouseMove(const iXY &prevPos, const iXY &newPos);
static const char *getUnitName(int unitType);
- static void drawMiniProductionStatus(const Surface &dest);
- static void drawUnitImage(const Surface &dest, const iXY &pos, int
unitType);
+ static void drawMiniProductionStatus(Surface &dest);
+ static void drawUnitImage(Surface &dest, const iXY &pos, int
unitType);
static bool displayMiniProductionStatus;
static bool displayOutpostNames;
static void setPowerOn();
@@ -125,8 +125,6 @@
static iRect miniProductionRect;
virtual void actionPerformed(mMouseEvent me);
-
-}
-; // end VehicleSelectionView
+}; // end VehicleSelectionView
#endif // end __VehicleSelectionView_hpp__
Index: netpanzer/src/NetPanzer/Views/Game/WinnerMesgView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/WinnerMesgView.cpp:1.13
netpanzer/src/NetPanzer/Views/Game/WinnerMesgView.cpp:1.14
--- netpanzer/src/NetPanzer/Views/Game/WinnerMesgView.cpp:1.13 Sat Oct 4
10:44:39 2003
+++ netpanzer/src/NetPanzer/Views/Game/WinnerMesgView.cpp Mon Oct 13
10:30:20 2003
@@ -184,7 +184,7 @@
// doDraw
//---------------------------------------------------------------------------
-void WinnerMesgView::doDraw(const Surface &viewArea, const Surface &clientArea)
+void WinnerMesgView::doDraw(Surface &viewArea, Surface &clientArea)
{
bltViewBackground(viewArea);
Index: netpanzer/src/NetPanzer/Views/Game/WinnerMesgView.hpp
diff -u netpanzer/src/NetPanzer/Views/Game/WinnerMesgView.hpp:1.2
netpanzer/src/NetPanzer/Views/Game/WinnerMesgView.hpp:1.3
--- netpanzer/src/NetPanzer/Views/Game/WinnerMesgView.hpp:1.2 Tue Sep 16
16:16:13 2003
+++ netpanzer/src/NetPanzer/Views/Game/WinnerMesgView.hpp Mon Oct 13
10:30:20 2003
@@ -18,12 +18,6 @@
#ifndef __WinnerMesgView_hpp__
#define __WinnerMesgView_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
#include "View.hpp"
#include "Surface.hpp"
#include "GameTemplateView.hpp"
@@ -40,11 +34,8 @@
public:
WinnerMesgView();
- static void setWinnerInfoHack( char *name, int player_index );
- virtual void doDraw(const Surface &windowArea, const Surface &clientArea);
-
-}
-; // end WinnerMesgView
-
+ static void setWinnerInfoHack(char *name, int player_index);
+ virtual void doDraw(Surface &windowArea, Surface &clientArea);
+}; // end WinnerMesgView
#endif // end __WinnerMesgView_hpp__
Index: netpanzer/src/NetPanzer/Views/GameViewGlobals.cpp
diff -u netpanzer/src/NetPanzer/Views/GameViewGlobals.cpp:1.6
netpanzer/src/NetPanzer/Views/GameViewGlobals.cpp:1.7
--- netpanzer/src/NetPanzer/Views/GameViewGlobals.cpp:1.6 Thu Sep 18
13:44:18 2003
+++ netpanzer/src/NetPanzer/Views/GameViewGlobals.cpp Mon Oct 13 10:30:16 2003
@@ -57,13 +57,13 @@
int viewDrawBackgroundMode = VIEW_BACKGROUND_DARK_GRAY_BLEND;
//--------------------------------------------------------------------------
-void bltViewBackground(const Surface &dest)
+void bltViewBackground(Surface &dest)
{
bltBlendRect(dest, dest.getRect());
}
//--------------------------------------------------------------------------
-void bltBlendRect(const Surface &dest, const iRect &r)
+void bltBlendRect(Surface &dest, const iRect &r)
{
if (viewDrawBackgroundMode == VIEW_BACKGROUND_DARK_GRAY_BLEND) {
dest.bltLookup(r, Palette::darkGray256.getColorArray());
Index: netpanzer/src/NetPanzer/Views/GameViewGlobals.hpp
diff -u netpanzer/src/NetPanzer/Views/GameViewGlobals.hpp:1.4
netpanzer/src/NetPanzer/Views/GameViewGlobals.hpp:1.5
--- netpanzer/src/NetPanzer/Views/GameViewGlobals.hpp:1.4 Thu Sep 18
13:44:18 2003
+++ netpanzer/src/NetPanzer/Views/GameViewGlobals.hpp Mon Oct 13 10:30:17 2003
@@ -69,8 +69,8 @@
VIEW_BACKGROUND_COUNT,
};
-void bltViewBackground(const Surface &dest);
-void bltBlendRect(const Surface &dest, const iRect &r);
+void bltViewBackground(Surface &dest);
+void bltBlendRect(Surface &dest, const iRect &r);
// Is the game help currently open?
extern bool gDrawGameHelp;
Index: netpanzer/src/NetPanzer/Views/MainMenu/HelpView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/HelpView.cpp:1.7
netpanzer/src/NetPanzer/Views/MainMenu/HelpView.cpp:1.8
--- netpanzer/src/NetPanzer/Views/MainMenu/HelpView.cpp:1.7 Sun Sep 21
14:29:33 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/HelpView.cpp Mon Oct 13 10:30:20 2003
@@ -33,10 +33,9 @@
// doDraw
//---------------------------------------------------------------------------
-void HelpView::doDraw(const Surface &viewArea, const Surface &clientArea)
+void HelpView::doDraw(Surface &viewArea, Surface &clientArea)
{
MenuTemplateView::doDraw(viewArea, clientArea);
-
} // end HelpView::doDraw
// doActivate
Index: netpanzer/src/NetPanzer/Views/MainMenu/HelpView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/HelpView.hpp:1.3
netpanzer/src/NetPanzer/Views/MainMenu/HelpView.hpp:1.4
--- netpanzer/src/NetPanzer/Views/MainMenu/HelpView.hpp:1.3 Tue Sep 16
16:16:13 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/HelpView.hpp Mon Oct 13 10:30:20 2003
@@ -31,10 +31,9 @@
public:
HelpView();
- virtual void doDraw(const Surface &windowArea, const Surface &clientArea);
+ virtual void doDraw(Surface &windowArea, Surface &clientArea);
virtual void doActivate();
virtual void doDeactivate();
-}
-; // end HelpView
+}; // end HelpView
#endif // end __HelpView_hpp__
Index: netpanzer/src/NetPanzer/Views/MainMenu/MainMenuView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/MainMenuView.cpp:1.10
netpanzer/src/NetPanzer/Views/MainMenu/MainMenuView.cpp:1.11
--- netpanzer/src/NetPanzer/Views/MainMenu/MainMenuView.cpp:1.10 Fri Oct
3 10:45:16 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/MainMenuView.cpp Mon Oct 13
10:30:20 2003
@@ -39,7 +39,7 @@
// doDraw
//---------------------------------------------------------------------------
-void MainMenuView::doDraw(const Surface &viewArea, const Surface &clientArea)
+void MainMenuView::doDraw(Surface &viewArea, Surface &clientArea)
{
MenuTemplateView::doDraw(viewArea, clientArea);
Index: netpanzer/src/NetPanzer/Views/MainMenu/MainMenuView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/MainMenuView.hpp:1.3
netpanzer/src/NetPanzer/Views/MainMenu/MainMenuView.hpp:1.4
--- netpanzer/src/NetPanzer/Views/MainMenu/MainMenuView.hpp:1.3 Sun Sep 21
14:29:33 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/MainMenuView.hpp Mon Oct 13
10:30:21 2003
@@ -28,7 +28,7 @@
public:
MainMenuView();
- virtual void doDraw(const Surface &windowArea, const Surface &clientArea);
+ virtual void doDraw(Surface &windowArea, Surface &clientArea);
}; // end MainMenuView
#endif // end __MainMenuView_hpp__
Index: netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp:1.18
netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp:1.19
--- netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp:1.18 Sat Oct
4 10:44:39 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp Mon Oct 13
10:30:21 2003
@@ -209,7 +209,7 @@
// doDraw
//---------------------------------------------------------------------------
-void MenuTemplateView::doDraw(const Surface &viewArea, const Surface
&clientArea)
+void MenuTemplateView::doDraw(Surface &viewArea, Surface &clientArea)
{
//setWorldRect();
if (Desktop::getVisible("GameView")) {
Index: netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.hpp:1.4
netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.hpp:1.5
--- netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.hpp:1.4 Tue Sep
16 16:16:13 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.hpp Mon Oct 13
10:30:21 2003
@@ -45,7 +45,7 @@
public:
MenuTemplateView();
- virtual void doDraw(const Surface &windowArea, const Surface &clientArea);
+ virtual void doDraw(Surface &windowArea, Surface &clientArea);
virtual void doActivate();
virtual void doDeactivate();
virtual void processEvents();
@@ -63,8 +63,6 @@
//static PackedSurface globeSurface;
static Surface backgroundSurface;
static PackedSurface titlePackedSurface;
-
-}
-; // end MenuTemplateView
+}; // end MenuTemplateView
#endif // end __MenuTemplateView_hpp__
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/FlagSelectionView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/FlagSelectionView.cpp:1.13
netpanzer/src/NetPanzer/Views/MainMenu/Multi/FlagSelectionView.cpp:1.14
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/FlagSelectionView.cpp:1.13
Fri Oct 3 10:45:18 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/FlagSelectionView.cpp Mon Oct
13 10:30:21 2003
@@ -99,7 +99,7 @@
// doDraw
//---------------------------------------------------------------------------
-void FlagSelectionView::doDraw(const Surface &viewArea, const Surface
&clientArea)
+void FlagSelectionView::doDraw(Surface &viewArea, Surface &clientArea)
{
//iRect r(getViewRect());
//viewArea.bltLookup(r, Palette::darkGray256.getColorArray());
@@ -155,5 +155,4 @@
}
return true;
-
} // end FlagSelectionViewlMouseUp
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/FlagSelectionView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/FlagSelectionView.hpp:1.3
netpanzer/src/NetPanzer/Views/MainMenu/Multi/FlagSelectionView.hpp:1.4
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/FlagSelectionView.hpp:1.3
Tue Sep 16 16:16:13 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/FlagSelectionView.hpp Mon Oct
13 10:30:21 2003
@@ -41,9 +41,9 @@
delete scrollBar;
}
- virtual void doDraw(const Surface &windowArea, const Surface &clientArea);
+ virtual void doDraw(Surface &windowArea, Surface &clientArea);
virtual int lMouseUp(const iXY &downPos, const iXY &upPos);
- virtual void drawBorder(const Surface &windowArea)
+ virtual void drawBorder(Surface &windowArea)
{}
void init();
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionHostView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionHostView.cpp:1.8
netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionHostView.cpp:1.9
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionHostView.cpp:1.8
Fri Oct 3 10:45:18 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionHostView.cpp Mon Oct
13 10:30:21 2003
@@ -88,7 +88,7 @@
// doDraw
//---------------------------------------------------------------------------
-void GetSessionHostView::doDraw(const Surface &viewArea, const Surface
&clientArea)
+void GetSessionHostView::doDraw(Surface &viewArea, Surface &clientArea)
{
static float curGroupTime = 0.0f;
@@ -121,7 +121,7 @@
// drawHostList
//---------------------------------------------------------------------------
-void GetSessionHostView::drawHostList(const Surface &dest)
+void GetSessionHostView::drawHostList(Surface &dest)
{
char host_info_str[256];
int curIndex = 0;
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionHostView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionHostView.hpp:1.2
netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionHostView.hpp:1.3
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionHostView.hpp:1.2
Tue Sep 16 16:16:13 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionHostView.hpp Mon Oct
13 10:30:22 2003
@@ -15,15 +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
*/
-
#ifndef __GetSessionHostView_hpp__
#define __GetSessionHostView_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
#include "View.hpp"
#include "Surface.hpp"
#include "cGrowList.hpp"
@@ -90,15 +84,13 @@
}
- void drawHostList(const Surface &dest);
+ void drawHostList(Surface &dest);
void updateHostList();
- virtual void doDraw(const Surface &windowArea, const Surface &clientArea);
+ virtual void doDraw(Surface &windowArea, Surface &clientArea);
virtual void lMouseDown(const iXY &pos);
virtual void actionPerformed(mMouseEvent me);
virtual void mouseMove(const iXY & prevPos, const iXY &newPos);
-
-}
-; // end GetSessionHostView
+}; // end GetSessionHostView
#endif // end __GetSessionHostView_hpp__
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionView.cpp:1.13
netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionView.cpp:1.14
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionView.cpp:1.13
Sat Oct 4 10:44:40 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionView.cpp Mon Oct
13 10:30:22 2003
@@ -217,7 +217,7 @@
// doDraw
//---------------------------------------------------------------------------
-void GetSessionView::doDraw(const Surface &viewArea, const Surface &clientArea)
+void GetSessionView::doDraw(Surface &viewArea, Surface &clientArea)
{
if (previousSessionType != gameconfig->hostorjoin) {
loadTitleSurface();
@@ -230,7 +230,7 @@
} // end GetSessionView::doDraw
//---------------------------------------------------------------------------
-void GetSessionView::drawInfo(const Surface &dest)
+void GetSessionView::drawInfo(Surface &dest)
{
int connectionType = gameconfig->hostorjoin;
@@ -242,7 +242,7 @@
}
//---------------------------------------------------------------------------
-void GetSessionView::drawHostInfo(const Surface &dest, const iRect &rect)
+void GetSessionView::drawHostInfo(Surface &dest, const iRect &rect)
{
static char tcpipInfo[] = "HOSTING LAN GAMES\n"
"\n"
@@ -284,7 +284,7 @@
}
//---------------------------------------------------------------------------
-void GetSessionView::drawJoinInfo(const Surface &dest, const iRect &rect)
+void GetSessionView::drawJoinInfo(Surface &dest, const iRect &rect)
{
static char tcpipInfo[] = "JOINING LAN OR INTERNET GAMES\n"
"\n"
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionView.hpp:1.2
netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionView.hpp:1.3
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionView.hpp:1.2 Tue Sep
16 16:16:13 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionView.hpp Mon Oct
13 10:30:22 2003
@@ -15,16 +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
*/
-
#ifndef __GetSessionView_hpp__
#define __GetSessionView_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
#include "View.hpp"
#include "Surface.hpp"
#include "MenuTemplateView.hpp"
@@ -36,9 +29,9 @@
class GetSessionView : public MenuTemplateView
{
protected:
- void drawHostInfo(const Surface &dest, const iRect &rect);
- void drawJoinInfo(const Surface &dest, const iRect &rect);
- void drawInfo(const Surface &dest);
+ void drawHostInfo(Surface &dest, const iRect &rect);
+ void drawJoinInfo(Surface &dest, const iRect &rect);
+ void drawInfo(Surface &dest);
virtual void loadBackgroundSurface();
virtual void loadTitleSurface();
@@ -46,10 +39,8 @@
public:
GetSessionView();
- virtual void doDraw(const Surface &windowArea, const Surface &clientArea);
+ virtual void doDraw(Surface &windowArea, Surface &clientArea);
virtual void doActivate();
-
-}
-; // end GetSessionView
+}; // end GetSessionView
#endif // end __GetSessionView_hpp__
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp
diff -u
netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp:1.15
netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp:1.16
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp:1.15
Sun Oct 12 15:22:12 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp
Mon Oct 13 10:30:22 2003
@@ -359,7 +359,7 @@
} // end HostJoinTemplateView::addVehicleButtons
-void HostJoinTemplateView::drawVehicleInfo(const Surface &dest, const iXY &pos)
+void HostJoinTemplateView::drawVehicleInfo(Surface &dest, const iXY &pos)
{
// Draw the dimmed background.
iXY size(580, 118);
@@ -409,7 +409,7 @@
// doDraw
//---------------------------------------------------------------------------
-void HostJoinTemplateView::doDraw(const Surface &viewArea, const Surface
&clientArea)
+void HostJoinTemplateView::doDraw(Surface &viewArea, Surface &clientArea)
{
MenuTemplateView::doDraw(viewArea, clientArea);
@@ -438,7 +438,7 @@
// drawNameInfo
//--------------------------------------------------------------------------
-void HostJoinTemplateView::drawNameInfo(const Surface &dest, const iXY &pos)
+void HostJoinTemplateView::drawNameInfo(Surface &dest, const iXY &pos)
{
iXY size(358, 30);
iRect flagBorder(pos.x, pos.y, pos.x + size.x, pos.y + size.y);
@@ -451,7 +451,7 @@
// drawPlayerInfo
//--------------------------------------------------------------------------
-void HostJoinTemplateView::drawPlayerInfo(const Surface &dest, const iXY &pos)
+void HostJoinTemplateView::drawPlayerInfo(Surface &dest, const iXY &pos)
{
char strBuf[256];
@@ -473,7 +473,7 @@
// drawFlagInfo
//--------------------------------------------------------------------------
-void HostJoinTemplateView::drawFlagInfo(const Surface &dest, const iXY &pos)
+void HostJoinTemplateView::drawFlagInfo(Surface &dest, const iXY &pos)
{
// Draw the dimmed background.
iXY size(180, 115);
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.hpp
diff -u
netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.hpp:1.3
netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.hpp:1.4
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.hpp:1.3
Fri Oct 3 10:45:18 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.hpp
Mon Oct 13 10:30:22 2003
@@ -15,16 +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
*/
-
#ifndef __HostJoinTemplateView_hpp__
#define __HostJoinTemplateView_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
#include "View.hpp"
#include "Surface.hpp"
#include "MenuTemplateView.hpp"
@@ -40,10 +33,10 @@
{
private:
void addVehicleButtons(const iXY &pos);
- void drawVehicleInfo(const Surface &dest, const iXY &pos);
- void drawFlagInfo(const Surface &dest, const iXY &pos);
- void drawPlayerInfo(const Surface &dest, const iXY &pos);
- void drawNameInfo(const Surface &clientArea, const iXY &pos);
+ void drawVehicleInfo(Surface &dest, const iXY &pos);
+ void drawFlagInfo(Surface &dest, const iXY &pos);
+ void drawPlayerInfo(Surface &dest, const iXY &pos);
+ void drawNameInfo(Surface &clientArea, const iXY &pos);
virtual void loadBackgroundSurface();
@@ -52,10 +45,8 @@
HostJoinTemplateView();
- virtual void doDraw(const Surface &windowArea, const Surface &clientArea);
+ virtual void doDraw(Surface &windowArea, Surface &clientArea);
virtual void doActivate();
-
-}
-; // end HostJoinTemplateView
+}; // end HostJoinTemplateView
#endif // end __HostJoinTemplateView_hpp__
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostOptionsView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostOptionsView.cpp:1.8
netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostOptionsView.cpp:1.9
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostOptionsView.cpp:1.8
Sat Oct 4 10:44:40 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostOptionsView.cpp Mon Oct
13 10:30:22 2003
@@ -273,7 +273,7 @@
// doDraw
//---------------------------------------------------------------------------
-void HostOptionsView::doDraw(const Surface &viewArea, const Surface
&clientArea)
+void HostOptionsView::doDraw(Surface &viewArea, Surface &clientArea)
{
drawMeterInfo(clientArea, iXY(BORDER_SPACE, BORDER_SPACE));
@@ -426,7 +426,7 @@
// drawMeterInfo
//---------------------------------------------------------------------------
-void HostOptionsView::drawMeterInfo(const Surface &dest, const iXY &pos)
+void HostOptionsView::drawMeterInfo(Surface &dest, const iXY &pos)
{
char strBuf[256];
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostOptionsView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostOptionsView.hpp:1.2
netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostOptionsView.hpp:1.3
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostOptionsView.hpp:1.2
Tue Sep 16 16:16:13 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostOptionsView.hpp Mon Oct
13 10:30:22 2003
@@ -15,16 +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
*/
-
#ifndef __HostOptionsView_hpp__
#define __HostOptionsView_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
#include "RMouseHackView.hpp"
#include "Surface.hpp"
#include "String.hpp"
@@ -37,7 +30,7 @@
{
private:
void addMeterButtons(const iXY &pos);
- void drawMeterInfo(const Surface &dest, const iXY &pos);
+ void drawMeterInfo(Surface &dest, const iXY &pos);
static int cloudCoverageCount;
static int windSpeed;
@@ -58,8 +51,8 @@
virtual ~HostOptionsView()
{}
- virtual void doDraw(const Surface &windowArea, const Surface &clientArea);
- virtual void drawBorder(const Surface &windowArea)
+ virtual void doDraw(Surface &windowArea, Surface &clientArea);
+ virtual void drawBorder(Surface &windowArea)
{}
virtual void actionPerformed(mMouseEvent me);
@@ -86,8 +79,6 @@
static String cloudCoverageString;
static String windSpeedString;
-
-}
-; // end HostOptionsView
+}; // end HostOptionsView
#endif // end __HostOptionsView_hpp__
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostView.cpp:1.8
netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostView.cpp:1.9
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostView.cpp:1.8 Sat Oct
4 10:44:40 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostView.cpp Mon Oct 13
10:30:22 2003
@@ -85,7 +85,7 @@
// doDraw
//---------------------------------------------------------------------------
-void HostView::doDraw(const Surface &viewArea, const Surface &clientArea)
+void HostView::doDraw(Surface &viewArea, Surface &clientArea)
{
HostJoinTemplateView::doDraw(viewArea, clientArea);
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostView.hpp:1.2
netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostView.hpp:1.3
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostView.hpp:1.2 Tue Sep
16 16:16:13 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostView.hpp Mon Oct 13
10:30:22 2003
@@ -15,16 +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
*/
-
#ifndef __HostView_hpp__
#define __HostView_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
#include "View.hpp"
#include "Surface.hpp"
#include "HostJoinTemplateView.hpp"
@@ -38,7 +31,7 @@
public:
protected:
- void drawCurMapInfo(const Surface &dest, const iXY &pos);
+ void drawCurMapInfo(Surface &dest, const iXY &pos);
virtual void loadTitleSurface();
//Choice choiceAllowAllies;
@@ -49,9 +42,7 @@
public:
HostView();
- virtual void doDraw(const Surface &windowArea, const Surface &clientArea);
-
-}
-; // end HostView
+ virtual void doDraw(Surface &windowArea, Surface &clientArea);
+}; // end HostView
#endif // end __HostView_hpp__
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/IPAddressView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/IPAddressView.cpp:1.10
netpanzer/src/NetPanzer/Views/MainMenu/Multi/IPAddressView.cpp:1.11
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/IPAddressView.cpp:1.10 Fri Oct
3 11:00:21 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/IPAddressView.cpp Mon Oct
13 10:30:22 2003
@@ -110,7 +110,7 @@
// doDraw
//---------------------------------------------------------------------------
-void IPAddressView::doDraw(const Surface &viewArea, const Surface &clientArea)
+void IPAddressView::doDraw(Surface &viewArea, Surface &clientArea)
{
clientArea.fill(Color::black);
View::doDraw(viewArea, clientArea);
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/IPAddressView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/IPAddressView.hpp:1.1
netpanzer/src/NetPanzer/Views/MainMenu/Multi/IPAddressView.hpp:1.2
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/IPAddressView.hpp:1.1 Tue Sep
23 10:23:03 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/IPAddressView.hpp Mon Oct
13 10:30:23 2003
@@ -32,7 +32,7 @@
void Init();
- virtual void doDraw(const Surface &windowArea, const Surface &clientArea);
+ virtual void doDraw(Surface &windowArea, Surface &clientArea);
}; // end IPAddressView
#endif // end __IPAddressView_h__
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/JoinView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/JoinView.cpp:1.8
netpanzer/src/NetPanzer/Views/MainMenu/Multi/JoinView.cpp:1.9
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/JoinView.cpp:1.8 Tue Sep
16 16:16:13 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/JoinView.cpp Mon Oct 13
10:30:23 2003
@@ -36,10 +36,9 @@
// doDraw
//---------------------------------------------------------------------------
-void JoinView::doDraw(const Surface &viewArea, const Surface &clientArea)
+void JoinView::doDraw(Surface &viewArea, Surface &clientArea)
{
HostJoinTemplateView::doDraw(viewArea, clientArea);
-
} // end JoinView::doDraw
// doDeactivate
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/JoinView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/JoinView.hpp:1.2
netpanzer/src/NetPanzer/Views/MainMenu/Multi/JoinView.hpp:1.3
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/JoinView.hpp:1.2 Tue Sep
16 16:16:13 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/JoinView.hpp Mon Oct 13
10:30:23 2003
@@ -15,16 +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
*/
-
#ifndef __JoinView_hpp__
#define __JoinView_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
#include "View.hpp"
#include "Surface.hpp"
#include "HostJoinTemplateView.hpp"
@@ -39,10 +32,8 @@
public:
JoinView();
- virtual void doDraw(const Surface &windowArea, const Surface &clientArea);
+ virtual void doDraw(Surface &windowArea, Surface &clientArea);
virtual void doDeactivate();
-
-}
-; // end JoinView
+}; // end JoinView
#endif // end __JoinView_hpp__
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.cpp:1.16
netpanzer/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.cpp:1.17
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.cpp:1.16
Sun Oct 5 09:50:13 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.cpp Mon Oct
13 10:30:23 2003
@@ -104,7 +104,7 @@
// doDraw
//---------------------------------------------------------------------------
-void MapSelectionView::doDraw(const Surface &viewArea, const Surface
&clientArea)
+void MapSelectionView::doDraw(Surface &viewArea, Surface &clientArea)
{
//iRect r(getViewRect());
//viewArea.bltLookup(r, Palette::darkGray256.getColorArray());
@@ -259,7 +259,7 @@
// drawCurMapInfo
//---------------------------------------------------------------------------
-void MapSelectionView::drawCurMapInfo(const Surface &dest, const iXY &pos)
+void MapSelectionView::drawCurMapInfo(Surface &dest, const iXY &pos)
{
// Draw the text.
char strBuf[256];
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.hpp:1.2
netpanzer/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.hpp:1.3
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.hpp:1.2
Tue Sep 16 16:16:13 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.hpp Mon Oct
13 10:30:23 2003
@@ -15,16 +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
*/
-
#ifndef __MapSelectionView_hpp__
#define __MapSelectionView_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
#include "RMouseHackView.hpp"
#include "Surface.hpp"
#include "cGrowList.hpp"
@@ -39,10 +32,7 @@
char description[256];
iXY cells;
int objectiveCount;
-
-}
-; // end MapInfo
-
+}; // end MapInfo
//---------------------------------------------------------------------------
class MapSelectionView : public RMouseHackView
@@ -51,21 +41,19 @@
enum { BORDER_SPACE = 4 };
enum { MAP_SIZE = 100 };
int loadMaps();
- void drawCurMapInfo(const Surface &dest, const iXY &pos);
+ void drawCurMapInfo(Surface &dest, const iXY &pos);
public:
MapSelectionView();
- virtual void doDraw(const Surface &windowArea, const Surface &clientArea);
- virtual void drawBorder(const Surface &windowArea)
+ virtual void doDraw(Surface &windowArea, Surface &clientArea);
+ virtual void drawBorder(Surface &windowArea)
{}
static cGrowList <MapInfo> mapList;
static int curMap;
void init();
-
-}
-; // end MapSelectionView
+}; // end MapSelectionView
#endif // end __MapSelectionView_hpp__
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/PlayerNameView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/PlayerNameView.cpp:1.5
netpanzer/src/NetPanzer/Views/MainMenu/Multi/PlayerNameView.cpp:1.6
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/PlayerNameView.cpp:1.5 Fri Oct
3 10:45:18 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/PlayerNameView.cpp Mon Oct
13 10:30:23 2003
@@ -57,7 +57,7 @@
// doDraw
//---------------------------------------------------------------------------
-void PlayerNameView::doDraw(const Surface &viewArea, const Surface &clientArea)
+void PlayerNameView::doDraw(Surface &viewArea, Surface &clientArea)
{
//iRect r(getViewRect());
//viewArea.bltLookup(r, Palette::darkGray256.getColorArray());
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/PlayerNameView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/PlayerNameView.hpp:1.2
netpanzer/src/NetPanzer/Views/MainMenu/Multi/PlayerNameView.hpp:1.3
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/PlayerNameView.hpp:1.2 Tue Sep
16 16:16:13 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/PlayerNameView.hpp Mon Oct
13 10:30:23 2003
@@ -15,27 +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
*/
-
#ifndef __PlayerNameView_hpp__
#define __PlayerNameView_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
#include "View.hpp"
#include "Surface.hpp"
#include "cGrowList.hpp"
-
//---------------------------------------------------------------------------
class PlayerNameView : public View
{
private:
-
-
enum { BORDER_SPACE = 4 };
enum { INPUT_FIELD_CHARACTERS = 16 };
@@ -44,8 +34,8 @@
virtual ~PlayerNameView()
{}
- virtual void doDraw(const Surface &windowArea, const Surface &clientArea);
- virtual void drawBorder(const Surface &windowArea)
+ virtual void doDraw(Surface &windowArea, Surface &clientArea);
+ virtual void drawBorder(Surface &windowArea)
{}
static cInputFieldString playerName;
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitColorView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitColorView.cpp:1.9
netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitColorView.cpp:1.10
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitColorView.cpp:1.9 Fri Oct
3 10:45:18 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitColorView.cpp Mon Oct
13 10:30:23 2003
@@ -115,7 +115,7 @@
// doDraw
//---------------------------------------------------------------------------
-void UnitColorView::doDraw(const Surface &viewArea, const Surface &clientArea)
+void UnitColorView::doDraw(Surface &viewArea, Surface &clientArea)
{
//unitSurface.fill(0);
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitColorView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitColorView.hpp:1.2
netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitColorView.hpp:1.3
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitColorView.hpp:1.2 Tue Sep
16 16:16:13 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitColorView.hpp Mon Oct
13 10:30:23 2003
@@ -15,16 +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
*/
-
#ifndef __UnitColorView_hpp__
#define __UnitColorView_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
#include "View.hpp"
#include "Surface.hpp"
#include "PackedSurface.hpp"
@@ -42,12 +35,10 @@
public:
UnitColorView();
- virtual void doDraw(const Surface &windowArea, const Surface &clientArea);
+ virtual void doDraw(Surface &windowArea, Surface &clientArea);
virtual void rMouseDown (const iXY &pos);
virtual void rMouseUp (const iXY &downPos, const iXY &upPos);
virtual void rMouseDrag (const iXY &downPos, const iXY &prevPos, const
iXY &newPos);
-
-}
-; // end UnitColorView
+}; // end UnitColorView
#endif // end __UnitColorView_hpp__
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitSelectionView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitSelectionView.cpp:1.7
netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitSelectionView.cpp:1.8
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitSelectionView.cpp:1.7
Sun Oct 5 09:50:14 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitSelectionView.cpp Mon Oct
13 10:30:23 2003
@@ -50,7 +50,7 @@
// doDraw
//---------------------------------------------------------------------------
-void UnitSelectionView::doDraw(const Surface &viewArea, const Surface
&clientArea)
+void UnitSelectionView::doDraw(Surface &viewArea, Surface &clientArea)
{
char strBuf[256];
sprintf(strBuf, "%d", scrollBar->getValue());
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitSelectionView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitSelectionView.hpp:1.2
netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitSelectionView.hpp:1.3
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitSelectionView.hpp:1.2
Tue Sep 16 16:16:13 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitSelectionView.hpp Mon Oct
13 10:30:23 2003
@@ -15,16 +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
*/
-
#ifndef __UnitSelectionView_hpp__
#define __UnitSelectionView_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
#include "View.hpp"
#include "Surface.hpp"
#include "ScrollBar.hpp"
@@ -45,9 +38,7 @@
delete scrollBar;
}
- virtual void doDraw(const Surface &windowArea, const Surface &clientArea);
-
-}
-; // end UnitSelectionView
+ virtual void doDraw(Surface &windowArea, Surface &clientArea);
+}; // end UnitSelectionView
#endif // end __UnitSelectionView_hpp__
Index: netpanzer/src/NetPanzer/Views/MainMenu/Options/ControlsView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Options/ControlsView.cpp:1.8
netpanzer/src/NetPanzer/Views/MainMenu/Options/ControlsView.cpp:1.9
--- netpanzer/src/NetPanzer/Views/MainMenu/Options/ControlsView.cpp:1.8 Fri Oct
3 10:45:19 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Options/ControlsView.cpp Mon Oct
13 10:30:23 2003
@@ -66,7 +66,7 @@
// doDraw
//---------------------------------------------------------------------------
-void ControlsView::doDraw(const Surface &viewArea, const Surface &clientArea)
+void ControlsView::doDraw(Surface &viewArea, Surface &clientArea)
{
MenuTemplateView::doDraw(viewArea, clientArea);
Index: netpanzer/src/NetPanzer/Views/MainMenu/Options/ControlsView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Options/ControlsView.hpp:1.2
netpanzer/src/NetPanzer/Views/MainMenu/Options/ControlsView.hpp:1.3
--- netpanzer/src/NetPanzer/Views/MainMenu/Options/ControlsView.hpp:1.2 Tue Sep
16 16:16:13 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Options/ControlsView.hpp Mon Oct
13 10:30:24 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
*/
-
#ifndef __ControlsView_hpp__
#define __ControlsView_hpp__
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
#include "View.hpp"
//#include "Surface.hpp"
#include "OptionsTemplateView.hpp"
@@ -46,10 +41,8 @@
public:
ControlsView();
- virtual void doDraw(const Surface &windowArea, const Surface &clientArea);
+ virtual void doDraw(Surface &windowArea, Surface &clientArea);
virtual void initButtons();
-
-}
-; // end ControlsView
+}; // end ControlsView
#endif // end __ControlsView_hpp__
Index: netpanzer/src/NetPanzer/Views/MainMenu/Options/InterfaceView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Options/InterfaceView.cpp:1.7
netpanzer/src/NetPanzer/Views/MainMenu/Options/InterfaceView.cpp:1.8
--- netpanzer/src/NetPanzer/Views/MainMenu/Options/InterfaceView.cpp:1.7
Sat Oct 4 10:44:40 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Options/InterfaceView.cpp Mon Oct
13 10:30:24 2003
@@ -81,7 +81,7 @@
// doDraw
//---------------------------------------------------------------------------
-void InterfaceView::doDraw(const Surface &viewArea, const Surface &clientArea)
+void InterfaceView::doDraw(Surface &viewArea, Surface &clientArea)
{
MenuTemplateView::doDraw(viewArea, clientArea);
Index: netpanzer/src/NetPanzer/Views/MainMenu/Options/InterfaceView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Options/InterfaceView.hpp:1.2
netpanzer/src/NetPanzer/Views/MainMenu/Options/InterfaceView.hpp:1.3
--- netpanzer/src/NetPanzer/Views/MainMenu/Options/InterfaceView.hpp:1.2
Tue Sep 16 16:16:13 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Options/InterfaceView.hpp Mon Oct
13 10:30:24 2003
@@ -15,15 +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
*/
-
#ifndef __InterfaceView_hpp__
#define __InterfaceView_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
#include "View.hpp"
#include "OptionsTemplateView.hpp"
@@ -46,10 +40,8 @@
public:
InterfaceView();
- virtual void doDraw(const Surface &windowArea, const Surface &clientArea);
+ virtual void doDraw(Surface &windowArea, Surface &clientArea);
virtual void initButtons();
-
-}
-; // end InterfaceView
+}; // end InterfaceView
#endif // end __InterfaceView_hpp__
Index: netpanzer/src/NetPanzer/Views/MainMenu/Options/SoundView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Options/SoundView.cpp:1.6
netpanzer/src/NetPanzer/Views/MainMenu/Options/SoundView.cpp:1.7
--- netpanzer/src/NetPanzer/Views/MainMenu/Options/SoundView.cpp:1.6 Tue Sep
16 16:16:13 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Options/SoundView.cpp Mon Oct
13 10:30:24 2003
@@ -88,7 +88,7 @@
// doDraw
//---------------------------------------------------------------------------
-void SoundView::doDraw(const Surface &viewArea, const Surface &clientArea)
+void SoundView::doDraw(Surface &viewArea, Surface &clientArea)
{
MenuTemplateView::doDraw(viewArea, clientArea);
Index: netpanzer/src/NetPanzer/Views/MainMenu/Options/SoundView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Options/SoundView.hpp:1.2
netpanzer/src/NetPanzer/Views/MainMenu/Options/SoundView.hpp:1.3
--- netpanzer/src/NetPanzer/Views/MainMenu/Options/SoundView.hpp:1.2 Tue Sep
16 16:16:13 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Options/SoundView.hpp Mon Oct
13 10:30:24 2003
@@ -15,16 +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
*/
-
#ifndef __SoundView_hpp__
#define __SoundView_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
#include "View.hpp"
#include "OptionsTemplateView.hpp"
@@ -47,10 +40,8 @@
public:
SoundView();
- virtual void doDraw(const Surface &windowArea, const Surface &clientArea);
+ virtual void doDraw(Surface &windowArea, Surface &clientArea);
virtual void initButtons();
-
-}
-; // end SoundView
+}; // end SoundView
#endif // end __SoundView_hpp__
Index: netpanzer/src/NetPanzer/Views/MainMenu/Options/VisualsView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Options/VisualsView.cpp:1.11
netpanzer/src/NetPanzer/Views/MainMenu/Options/VisualsView.cpp:1.12
--- netpanzer/src/NetPanzer/Views/MainMenu/Options/VisualsView.cpp:1.11 Sat Oct
4 10:44:41 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Options/VisualsView.cpp Mon Oct
13 10:30:24 2003
@@ -118,7 +118,7 @@
// doDraw
//---------------------------------------------------------------------------
-void VisualsView::doDraw(const Surface &viewArea, const Surface &clientArea)
+void VisualsView::doDraw(Surface &viewArea, Surface &clientArea)
{
MenuTemplateView::doDraw(viewArea, clientArea);
Index: netpanzer/src/NetPanzer/Views/MainMenu/Options/VisualsView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Options/VisualsView.hpp:1.4
netpanzer/src/NetPanzer/Views/MainMenu/Options/VisualsView.hpp:1.5
--- netpanzer/src/NetPanzer/Views/MainMenu/Options/VisualsView.hpp:1.4 Tue Sep
23 11:38:27 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Options/VisualsView.hpp Mon Oct
13 10:30:24 2003
@@ -72,7 +72,7 @@
public:
VisualsView();
- virtual void doDraw(const Surface &windowArea, const Surface &clientArea);
+ virtual void doDraw(Surface &windowArea, Surface &clientArea);
virtual void processEvents();
virtual void initButtons();
virtual void stateChanged(Component* source);
Index: netpanzer/src/NetPanzer/Views/MainMenu/OptionsTemplateView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/OptionsTemplateView.cpp:1.9
netpanzer/src/NetPanzer/Views/MainMenu/OptionsTemplateView.cpp:1.10
--- netpanzer/src/NetPanzer/Views/MainMenu/OptionsTemplateView.cpp:1.9 Fri Oct
3 10:45:17 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/OptionsTemplateView.cpp Mon Oct
13 10:30:21 2003
@@ -101,7 +101,7 @@
// doDraw
//---------------------------------------------------------------------------
-void OptionsTemplateView::doDraw(const Surface &viewArea, const Surface
&clientArea)
+void OptionsTemplateView::doDraw(Surface &viewArea, Surface &clientArea)
{
MenuTemplateView::doDraw(viewArea, clientArea);
Index: netpanzer/src/NetPanzer/Views/MainMenu/OptionsTemplateView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/OptionsTemplateView.hpp:1.3
netpanzer/src/NetPanzer/Views/MainMenu/OptionsTemplateView.hpp:1.4
--- netpanzer/src/NetPanzer/Views/MainMenu/OptionsTemplateView.hpp:1.3 Thu Sep
18 13:44:18 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/OptionsTemplateView.hpp Mon Oct
13 10:30:21 2003
@@ -32,7 +32,7 @@
public:
OptionsTemplateView();
- virtual void doDraw(const Surface &windowArea, const Surface &clientArea);
+ virtual void doDraw(Surface &windowArea, Surface &clientArea);
virtual void initButtons();
}; // end OptionsTemplateView
Index: netpanzer/src/NetPanzer/Views/MainMenu/OrderingView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/OrderingView.cpp:1.7
netpanzer/src/NetPanzer/Views/MainMenu/OrderingView.cpp:1.8
--- netpanzer/src/NetPanzer/Views/MainMenu/OrderingView.cpp:1.7 Fri Oct 3
10:45:17 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/OrderingView.cpp Mon Oct 13
10:30:21 2003
@@ -33,7 +33,7 @@
// doDraw
//---------------------------------------------------------------------------
-void OrderingView::doDraw(const Surface &viewArea, const Surface &clientArea)
+void OrderingView::doDraw(Surface &viewArea, Surface &clientArea)
{
MenuTemplateView::doDraw(viewArea, clientArea);
Index: netpanzer/src/NetPanzer/Views/MainMenu/OrderingView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/OrderingView.hpp:1.2
netpanzer/src/NetPanzer/Views/MainMenu/OrderingView.hpp:1.3
--- netpanzer/src/NetPanzer/Views/MainMenu/OrderingView.hpp:1.2 Tue Sep 16
16:16:13 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/OrderingView.hpp Mon Oct 13
10:30:21 2003
@@ -15,30 +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
*/
-
#ifndef __OrderingView_hpp__
#define __OrderingView_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
#include "View.hpp"
#include "Surface.hpp"
#include "MenuTemplateView.hpp"
-
//--------------------------------------------------------------------------
class OrderingView : public MenuTemplateView
{
public:
OrderingView();
- virtual void doDraw(const Surface &windowArea, const Surface &clientArea);
-
-}
-; // end OrderingView
+ virtual void doDraw(Surface &windowArea, Surface &clientArea);
+}; // end OrderingView
#endif // end __OrderingView_hpp__
Index: netpanzer/src/NetPanzer/Views/MainMenu/RMouseHackView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/RMouseHackView.hpp:1.3
netpanzer/src/NetPanzer/Views/MainMenu/RMouseHackView.hpp:1.4
--- netpanzer/src/NetPanzer/Views/MainMenu/RMouseHackView.hpp:1.3 Tue Sep
16 16:16:13 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/RMouseHackView.hpp Mon Oct 13
10:30:21 2003
@@ -29,7 +29,6 @@
virtual void rMouseDrag(const iXY &downPos, const iXY &prevPos,
const iXY &newPos);
-}
-; // end RMouseHackView
+}; // end RMouseHackView
#endif // end __RMouseHackView_hpp__
Index: netpanzer/src/NetPanzer/Views/MainMenu/SkirmishView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/SkirmishView.cpp:1.6
netpanzer/src/NetPanzer/Views/MainMenu/SkirmishView.cpp:1.7
--- netpanzer/src/NetPanzer/Views/MainMenu/SkirmishView.cpp:1.6 Fri Oct 3
10:45:17 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/SkirmishView.cpp Mon Oct 13
10:30:21 2003
@@ -33,7 +33,7 @@
// doDraw
//---------------------------------------------------------------------------
-void SkirmishView::doDraw(const Surface &viewArea, const Surface &clientArea)
+void SkirmishView::doDraw(Surface &viewArea, Surface &clientArea)
{
MenuTemplateView::doDraw(viewArea, clientArea);
Index: netpanzer/src/NetPanzer/Views/MainMenu/SkirmishView.hpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/SkirmishView.hpp:1.3
netpanzer/src/NetPanzer/Views/MainMenu/SkirmishView.hpp:1.4
--- netpanzer/src/NetPanzer/Views/MainMenu/SkirmishView.hpp:1.3 Tue Sep 16
16:16:13 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/SkirmishView.hpp Mon Oct 13
10:30: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
*/
-
#ifndef __SkirmishView_hpp__
#define __SkirmishView_hpp__
@@ -29,9 +28,7 @@
public:
SkirmishView();
- virtual void doDraw(const Surface &windowArea, const Surface &clientArea);
-
-}
-; // end SkirmishView
+ virtual void doDraw(Surface &windowArea, Surface &clientArea);
+}; // end SkirmishView
#endif // end __SkirmishView_hpp__
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [netPanzer-CVS] netpanzer ./BUGS ./ChangeLog src/Jamfile src/Li...,
Matthias Braun <=