[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[netPanzer-CVS] netpanzer/src ChangeLog Lib/2D/DigitText.cpp Li...
|
From: |
Matthias Braun |
|
Subject: |
[netPanzer-CVS] netpanzer/src ChangeLog Lib/2D/DigitText.cpp Li... |
|
Date: |
Sat, 06 Sep 2003 11:39:27 -0400 |
CVSROOT: /cvsroot/netpanzer
Module name: netpanzer
Branch:
Changes by: Matthias Braun <address@hidden> 03/09/06 11:39:26
Modified files:
src : ChangeLog
src/Lib/2D : DigitText.cpp Palette.cpp Surface.cpp
src/Lib/Particles: ChunkTrajectoryParticle2D.cpp
CloudParticle2D.cpp CraterParticle2D.cpp
DirtKickParticle2D.cpp FlameParticle2D.cpp
FlashParticle2D.cpp
GroundExplosionParticle2D.cpp
PuffParticle2D.cpp RadarPingParticle2D.cpp
SparkParticle2D.cpp
src/Lib/View : View.cpp
src/NetPanzer/Classes/Weapons: Weapon.cpp
src/NetPanzer/Core: loadPics.cpp
src/NetPanzer/Interfaces: GameConfig.cpp GameManager.cpp
MapInterface.cpp MapsManager.cpp
MouseInterface.cpp
PowerUpInterface.cpp
src/NetPanzer/Views/Game: AreYouSureResignView.cpp LobbyView.cpp
ProgressView.cpp
VehicleSelectionView.cpp
WinnerMesgView.cpp
src/NetPanzer/Views/MainMenu: HelpView.cpp MenuTemplateView.cpp
OptionsTemplateView.cpp
OrderingView.cpp
SpecialButtonView.cpp
src/NetPanzer/Views/MainMenu/Multi: FlagSelectionView.cpp
GetConnectionTypeView.cpp
GetSessionView.cpp
HostJoinTemplateView.cpp
HostView.cpp JoinView.cpp
MapSelectionView.cpp
MultiMapSelectorView.cpp
MultiVehicleSelectorView.cpp
src/NetPanzer/Views/MainMenu/Options: ControlsView.cpp
InterfaceView.cpp
SoundView.cpp
VisualsView.cpp
Log message:
replaced all \ with /
Patches:
Index: netpanzer/src/ChangeLog
diff -u netpanzer/src/ChangeLog:1.3 netpanzer/src/ChangeLog:1.4
--- netpanzer/src/ChangeLog:1.3 Sat Sep 6 11:18:18 2003
+++ netpanzer/src/ChangeLog Sat Sep 6 11:39:24 2003
@@ -8,6 +8,9 @@
-More news on my crusade against codewiz.hpp:
*removed some unused stuff from codewiz.hpp and terminate.cpp
*added new but alot simpler logging functions to Log.hpp
+-replaced all \\ in paths with / (gotta love sed). Yes, I made sure that I only
+ change paths (I looked at the list of stuff I change, before applying the sed
+ command)
------------
prior changes (not complete)
Index: netpanzer/src/Lib/2D/DigitText.cpp
diff -u netpanzer/src/Lib/2D/DigitText.cpp:1.3
netpanzer/src/Lib/2D/DigitText.cpp:1.4
--- netpanzer/src/Lib/2D/DigitText.cpp:1.3 Fri Sep 5 22:01:18 2003
+++ netpanzer/src/Lib/2D/DigitText.cpp Sat Sep 6 11:39:24 2003
@@ -36,7 +36,7 @@
charactersNormal.create(11, 17, 11, 128);
// NOTE: Make sure the file size is 128 characters.
- char charfilename[] = "pics\\chars11x17digit.raw";
+ char charfilename[] = "pics/chars11x17digit.raw";
FILE *fp = fopen(charfilename, "rb");
if (fp == 0)
Index: netpanzer/src/Lib/2D/Palette.cpp
diff -u netpanzer/src/Lib/2D/Palette.cpp:1.3
netpanzer/src/Lib/2D/Palette.cpp:1.4
--- netpanzer/src/Lib/2D/Palette.cpp:1.3 Fri Sep 5 22:01:18 2003
+++ netpanzer/src/Lib/2D/Palette.cpp Sat Sep 6 11:39:24 2003
@@ -304,10 +304,10 @@
}
FileUtil::mkdir("pics");
- FileUtil::mkdir("pics\\colorFilters");
+ FileUtil::mkdir("pics/colorFilters");
char strBuf[256];
- char tablePath[] = "pics\\colorFilters\\";
+ char tablePath[] = "pics/colorFilters/";
//progressView->scrollAndUpdate("");
Index: netpanzer/src/Lib/2D/Surface.cpp
diff -u netpanzer/src/Lib/2D/Surface.cpp:1.7
netpanzer/src/Lib/2D/Surface.cpp:1.8
--- netpanzer/src/Lib/2D/Surface.cpp:1.7 Sat Sep 6 11:18:18 2003
+++ netpanzer/src/Lib/2D/Surface.cpp Sat Sep 6 11:39:24 2003
@@ -2669,7 +2669,7 @@
for (int i = 0; i < frameCount; i++)
{
- sprintf(strBuf, "%s\\dump%04d.til", path, num);
+ sprintf(strBuf, "%s/dump%04d.til", path, num);
setFrame(num);
FILE *fp = fopen(strBuf, "wb");
@@ -3952,7 +3952,7 @@
ascii8x8.create(8, 8, 8, 128);
// NOTE: Make sure the file size is 128 characters.
- char charfilename[] = "pics\\chars8x8.raw";
+ char charfilename[] = "pics/chars8x8.raw";
FILE *fp = fopen(charfilename, "rb");
if (fp == 0)
@@ -3979,7 +3979,7 @@
ascii5x5.create(5, 5, 5, 128);
// NOTE: Make sure the file size is 128 characters.
- char charfilename[] = "pics\\chars5x5.raw";
+ char charfilename[] = "pics/chars5x5.raw";
FILE *fp = fopen(charfilename, "rb");
if (fp == 0)
Index: netpanzer/src/Lib/Particles/ChunkTrajectoryParticle2D.cpp
diff -u netpanzer/src/Lib/Particles/ChunkTrajectoryParticle2D.cpp:1.3
netpanzer/src/Lib/Particles/ChunkTrajectoryParticle2D.cpp:1.4
--- netpanzer/src/Lib/Particles/ChunkTrajectoryParticle2D.cpp:1.3 Fri Sep
5 22:01:18 2003
+++ netpanzer/src/Lib/Particles/ChunkTrajectoryParticle2D.cpp Sat Sep 6
11:39:24 2003
@@ -181,7 +181,7 @@
tempPackedSurface.pack(tempSurface);
- char chunkPathPAK[] = "pics\\particles\\chunks\\pak\\";
+ char chunkPathPAK[] = "pics/particles/chunks/pak/";
char strBuf[256];
sprintf(strBuf, "%sgroundChunks.pak", chunkPathPAK);
tempPackedSurface.save(strBuf);
@@ -197,10 +197,10 @@
createUnitBodyGreenChunks();
createUnitBodyGrayChunks();
-
staticPackedGroundChunks.load("pics\\particles\\chunks\\pak\\groundChunks.pak");
-
staticPackedBurnGroundChunks.load("pics\\particles\\chunks\\pak\\greenUnitChunks.pak");
-
staticPackedUnitGreenChunks.load("pics\\particles\\chunks\\pak\\grayUnitChunks.pak");
-
staticPackedUnitGrayChunks.load("pics\\particles\\chunks\\pak\\burnGroundChunks.pak");
+
staticPackedGroundChunks.load("pics/particles/chunks/pak/groundChunks.pak");
+
staticPackedBurnGroundChunks.load("pics/particles/chunks/pak/greenUnitChunks.pak");
+
staticPackedUnitGreenChunks.load("pics/particles/chunks/pak/grayUnitChunks.pak");
+
staticPackedUnitGrayChunks.load("pics/particles/chunks/pak/burnGroundChunks.pak");
} // end ChunkTrajectoryParticle2D::createPAKFiles
@@ -246,7 +246,7 @@
PackedSurface tempPackedSurface;
tempPackedSurface.pack(tempSurface);
- char chunkPathPAK[] = "pics\\particles\\chunks\\pak\\";
+ char chunkPathPAK[] = "pics/particles/chunks/pak/";
char strBuf[256];
sprintf(strBuf, "%sgrayUnitChunks.pak", chunkPathPAK);
tempPackedSurface.save(strBuf);
@@ -295,7 +295,7 @@
PackedSurface tempPackedSurface;
tempPackedSurface.pack(tempSurface);
- char chunkPathPAK[] = "pics\\particles\\chunks\\pak\\";
+ char chunkPathPAK[] = "pics/particles/chunks/pak/";
char strBuf[256];
sprintf(strBuf, "%sgreenUnitChunks.pak", chunkPathPAK);
tempPackedSurface.save(strBuf);
@@ -349,7 +349,7 @@
PackedSurface tempPackedSurface;
tempPackedSurface.pack(tempSurface);
- char chunkPathPAK[] = "pics\\particles\\chunks\\pak\\";
+ char chunkPathPAK[] = "pics/particles/chunks/pak/";
char strBuf[256];
sprintf(strBuf, "%sburnGroundChunks.pak", chunkPathPAK);
tempPackedSurface.save(strBuf);
Index: netpanzer/src/Lib/Particles/CloudParticle2D.cpp
diff -u netpanzer/src/Lib/Particles/CloudParticle2D.cpp:1.3
netpanzer/src/Lib/Particles/CloudParticle2D.cpp:1.4
--- netpanzer/src/Lib/Particles/CloudParticle2D.cpp:1.3 Fri Sep 5 22:01:18 2003
+++ netpanzer/src/Lib/Particles/CloudParticle2D.cpp Sat Sep 6 11:39:24 2003
@@ -89,7 +89,7 @@
//---------------------------------------------------------------------------
void CloudParticle2D::loadTILFiles()
{
- char path[] = "pics\\particles\\clouds\\til\\";
+ char path[] = "pics/particles/clouds/til/";
Surface tempSurface;
if (!tempSurface.loadAllTILInDirectory(path))
@@ -102,7 +102,7 @@
PackedSurface tempPackedSurface;
tempPackedSurface.pack(tempSurface);
- tempPackedSurface.save("pics\\particles\\clouds\\pak\\clouds.pak");
+ tempPackedSurface.save("pics/particles/clouds/pak/clouds.pak");
}
//---------------------------------------------------------------------------
@@ -113,7 +113,7 @@
//---------------------------------------------------------------------------
void CloudParticle2D::loadPAKFiles()
{
- staticPackedCloud.load("pics\\particles\\clouds\\pak\\clouds.pak");
+ staticPackedCloud.load("pics/particles/clouds/pak/clouds.pak");
staticPackedCloud.setOffsetCenter();
}
Index: netpanzer/src/Lib/Particles/CraterParticle2D.cpp
diff -u netpanzer/src/Lib/Particles/CraterParticle2D.cpp:1.3
netpanzer/src/Lib/Particles/CraterParticle2D.cpp:1.4
--- netpanzer/src/Lib/Particles/CraterParticle2D.cpp:1.3 Fri Sep 5
22:01:18 2003
+++ netpanzer/src/Lib/Particles/CraterParticle2D.cpp Sat Sep 6 11:39:24 2003
@@ -93,16 +93,16 @@
craterCache[i].pos.zero();
}
- if
(UtilInterface::getFileSize("pics\\particles\\craters\\pak\\craters.pak") > 0)
+ if
(UtilInterface::getFileSize("pics/particles/craters/pak/craters.pak") > 0)
{
-
staticPackedCrater.load("pics\\particles\\craters\\pak\\craters.pak");
+
staticPackedCrater.load("pics/particles/craters/pak/craters.pak");
} else
{
Surface tempSurface;
-
tempSurface.loadAllBMPInDirectory("pics\\particles\\craters\\bmp\\");
+
tempSurface.loadAllBMPInDirectory("pics/particles/craters/bmp/");
staticPackedCrater.pack(tempSurface);
-
staticPackedCrater.save("pics\\particles\\craters\\pak\\craters.pak");
+
staticPackedCrater.save("pics/particles/craters/pak/craters.pak");
}
} // end CraterParticle2D::init
Index: netpanzer/src/Lib/Particles/DirtKickParticle2D.cpp
diff -u netpanzer/src/Lib/Particles/DirtKickParticle2D.cpp:1.3
netpanzer/src/Lib/Particles/DirtKickParticle2D.cpp:1.4
--- netpanzer/src/Lib/Particles/DirtKickParticle2D.cpp:1.3 Fri Sep 5
22:01:18 2003
+++ netpanzer/src/Lib/Particles/DirtKickParticle2D.cpp Sat Sep 6 11:39:24 2003
@@ -43,7 +43,7 @@
void DirtKickParticle2D::init()
{
dirtKickSprite.create(iXY(48, 46), 48, 6);
- dirtKickSprite.extractPCX("pics\\particles\\dirtKick.pcx", 1, 0);
+ dirtKickSprite.extractPCX("pics/particles/dirtKick.pcx", 1, 0);
dirtKickSprite.scale((int) (48 * 0.5f), (int) (46 * 0.5f));
Index: netpanzer/src/Lib/Particles/FlameParticle2D.cpp
diff -u netpanzer/src/Lib/Particles/FlameParticle2D.cpp:1.3
netpanzer/src/Lib/Particles/FlameParticle2D.cpp:1.4
--- netpanzer/src/Lib/Particles/FlameParticle2D.cpp:1.3 Fri Sep 5 22:01:18 2003
+++ netpanzer/src/Lib/Particles/FlameParticle2D.cpp Sat Sep 6 11:39:24 2003
@@ -24,7 +24,7 @@
const int explosionFPS = 18;
-const char explosionPath[] = "pics\\particles\\explosion\\";
+const char explosionPath[] = "pics/particles/explosion/";
// Used for packing images.
static int maxLevel = 7;
@@ -86,7 +86,7 @@
for (i = minLevel; i <= maxLevel; i += incrementLevel)
{
tempSurface.create(iXY(96, 128), 96, 16);
- sprintf(strBuf, "%s\\pcx\\flack1.pcx", explosionPath);
+ sprintf(strBuf, "%s/pcx/flack1.pcx", explosionPath);
tempSurface.extractPCX(strBuf, 5, 0);
iXY newSize;
@@ -100,7 +100,7 @@
tempSurface.setFPS(explosionFPS);
tempPackedSurface.pack(tempSurface);
- sprintf(strBuf, "%s\\pak\\explosion1-%04d.pak", explosionPath,
i);
+ sprintf(strBuf, "%s/pak/explosion1-%04d.pak", explosionPath, i);
tempPackedSurface.save(strBuf);
}
@@ -108,7 +108,7 @@
for (i = minLevel; i <= maxLevel; i += incrementLevel)
{
tempSurface.create(iXY(128, 96), 128, 15);
- sprintf(strBuf, "%s\\pcx\\flack2.pcx", explosionPath);
+ sprintf(strBuf, "%s/pcx/flack2.pcx", explosionPath);
tempSurface.extractPCX(strBuf, 4, 0);
iXY newSize;
@@ -122,7 +122,7 @@
tempSurface.setFPS(explosionFPS);
tempPackedSurface.pack(tempSurface);
- sprintf(strBuf, "%s\\pak\\explosion2-%04d.pak", explosionPath,
i);
+ sprintf(strBuf, "%s/pak/explosion2-%04d.pak", explosionPath, i);
tempPackedSurface.save(strBuf);
}
}
@@ -131,14 +131,14 @@
//---------------------------------------------------------------------------
void FlameParticle2D::loadPakFiles()
{
- char pathExplosion0[] = "pics\\particles\\explosion\\explosion0\\pak\\";
+ char pathExplosion0[] = "pics/particles/explosion/explosion0/pak/";
if (!loadAllPAKInDirectory(pathExplosion0, staticPackedExplosion0))
{
FUBAR("ERROR: Unable to load any exposion images in %s",
pathExplosion0);
}
- char pathExplosion1[] = "pics\\particles\\explosion\\explosion1\\pak\\";
+ char pathExplosion1[] = "pics/particles/explosion/explosion1/pak/";
if (!loadAllPAKInDirectory(pathExplosion1, staticPackedExplosion1))
{
@@ -157,10 +157,10 @@
/*
explosionFireSprite0.create(iXY(96, 128), 96, 16);
-
explosionFireSprite0.extractPCX("pics\\particles\\explosion\\pcx\\flack1.pcx",
5, 0);
+
explosionFireSprite0.extractPCX("pics/particles/explosion/pcx/flack1.pcx", 5,
0);
explosionFireSprite1.create(iXY(128, 96), 128, 15);
-
explosionFireSprite1.extractPCX("pics\\particles\\explosion\\pcx\\flack2.pcx",
4, 0);
+
explosionFireSprite1.extractPCX("pics/particles/explosion/pcx/flack2.pcx", 4,
0);
explosionFireSprite0.setFPS(explosionFPS);
explosionFireSprite1.setFPS(explosionFPS);
Index: netpanzer/src/Lib/Particles/FlashParticle2D.cpp
diff -u netpanzer/src/Lib/Particles/FlashParticle2D.cpp:1.3
netpanzer/src/Lib/Particles/FlashParticle2D.cpp:1.4
--- netpanzer/src/Lib/Particles/FlashParticle2D.cpp:1.3 Fri Sep 5 22:01:18 2003
+++ netpanzer/src/Lib/Particles/FlashParticle2D.cpp Sat Sep 6 11:39:24 2003
@@ -51,13 +51,13 @@
//staticPackedFlash.setOffsetCenter();
// The following lines packs the light image.
- if
(UtilInterface::getFileSize("pics\\particles\\lights\\pak\\flash2.pak") > 0)
+ if (UtilInterface::getFileSize("pics/particles/lights/pak/flash2.pak")
> 0)
{
-
staticPackedFlash.load("pics\\particles\\lights\\pak\\flash2.pak");
+ staticPackedFlash.load("pics/particles/lights/pak/flash2.pak");
} else
{
packFiles();
-
staticPackedFlash.load("pics\\particles\\lights\\pak\\flash2.pak");
+ staticPackedFlash.load("pics/particles/lights/pak/flash2.pak");
}
} // end FlashParticle2D::init
@@ -70,11 +70,11 @@
Surface scaledSurface;
Surface outputSurface;
- //surface.loadBMP("pics\\particles\\lights\\bmp\\flash.bmp");
+ //surface.loadBMP("pics/particles/lights/bmp/flash.bmp");
- if (!surface.loadTIL("pics\\particles\\lights\\til\\flash2.til"))
+ if (!surface.loadTIL("pics/particles/lights/til/flash2.til"))
{
- FUBAR("ERROR: Unable to load
""pics\\particles\\lights\\til\\flash2.til""");
+ FUBAR("ERROR: Unable to load
""pics/particles/lights/til/flash2.til""");
}
const float minFlashSize = 10.0f;
@@ -106,7 +106,7 @@
PackedSurface packedSurface;
packedSurface.pack(outputSurface);
char strBuf[256];
- sprintf(strBuf, "pics\\particles\\lights\\pak\\flash2.pak");
+ sprintf(strBuf, "pics/particles/lights/pak/flash2.pak");
packedSurface.save(strBuf);
} // end FlashParticle2D::packFiles
Index: netpanzer/src/Lib/Particles/GroundExplosionParticle2D.cpp
diff -u netpanzer/src/Lib/Particles/GroundExplosionParticle2D.cpp:1.4
netpanzer/src/Lib/Particles/GroundExplosionParticle2D.cpp:1.5
--- netpanzer/src/Lib/Particles/GroundExplosionParticle2D.cpp:1.4 Sat Sep
6 11:18:18 2003
+++ netpanzer/src/Lib/Particles/GroundExplosionParticle2D.cpp Sat Sep 6
11:39:24 2003
@@ -45,7 +45,7 @@
{
groundParticleSprite0.create(4, 4, 4, 1);
groundParticleSprite0.fill(Color::brown);
-
//groundParticleSprite0.loadTIL("pics\\particles\\puff\\dirt\\Smoke16.til");
+ //groundParticleSprite0.loadTIL("pics/particles/puff/dirt/Smoke16.til");
//groundParticleSprite0.shrinkWrap();
//groundParticleSprite0.scale(6);
Index: netpanzer/src/Lib/Particles/PuffParticle2D.cpp
diff -u netpanzer/src/Lib/Particles/PuffParticle2D.cpp:1.3
netpanzer/src/Lib/Particles/PuffParticle2D.cpp:1.4
--- netpanzer/src/Lib/Particles/PuffParticle2D.cpp:1.3 Fri Sep 5 22:01:18 2003
+++ netpanzer/src/Lib/Particles/PuffParticle2D.cpp Sat Sep 6 11:39:24 2003
@@ -15,9 +15,8 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-
#include <config.h>
+
#include "PuffParticle2D.hpp"
#include "PackedSurface.hpp"
#include "TimerInterface.hpp"
@@ -33,9 +32,9 @@
// Image paths.
-const char pathSmokeLight[] = "pics\\particles\\puff\\smokeLight\\til\\";
-const char pathSmokeDark[] = "pics\\particles\\puff\\smokeDark\\til\\";
-const char pathDirt[] = "pics\\particles\\puff\\dirt\\til\\";
+const char pathSmokeLight[] = "pics/particles/puff/smokeLight/til/";
+const char pathSmokeDark[] = "pics/particles/puff/smokeDark/til/";
+const char pathDirt[] = "pics/particles/puff/dirt/til/";
// PuffParticle2D
@@ -256,21 +255,21 @@
//---------------------------------------------------------------------------
void PuffParticle2D::loadPAKFiles()
{
- char pathSmokeLight[] = "pics\\particles\\puff\\smokeLight\\pak\\";
+ char pathSmokeLight[] = "pics/particles/puff/smokeLight/pak/";
if (!loadAllPAKInDirectory(pathSmokeLight, staticPackedSmokeLightPuff))
{
FUBAR("ERROR: Unable to load any smoke puff particle images in
%s", pathSmokeLight);
}
- char pathSmokeDark[] = "pics\\particles\\puff\\smokeDark\\pak\\";
+ char pathSmokeDark[] = "pics/particles/puff/smokeDark/pak/";
if (!loadAllPAKInDirectory(pathSmokeDark, staticPackedSmokeDarkPuff))
{
FUBAR("ERROR: Unable to load any smoke puff particle images in
%s", pathSmokeDark);
}
- char pathDirt[] = "pics\\particles\\puff\\dirt\\pak\\";
+ char pathDirt[] = "pics/particles/puff/dirt/pak/";
if (!loadAllPAKInDirectory(pathDirt, staticPackedDirtPuff))
{
@@ -282,8 +281,8 @@
void PuffParticle2D::loadTILFiles()
{
/*
- char pathSmokeLight[] = "pics\\particles\\puff\\smokeLight\\til\\";
- //char pathSmokeLight[] = "pics\\particles\\puff\\smokeLight\\raw\\";
+ char pathSmokeLight[] = "pics/particles/puff/smokeLight/til/";
+ //char pathSmokeLight[] = "pics/particles/puff/smokeLight/raw/";
if (!smokeLightPuffSprite.loadAllPAKInDirectory(pathSmokeLight))
//if (!smokeLightPuffSprite.loadAllRAWInDirectory(pathSmokeLightRAW,
iXY(320, 240)))
@@ -294,9 +293,9 @@
// Following code is for reducing the size of the images.
//smokeLightPuffSprite.shrinkWrap();
//smokeLightPuffSprite.scale(100);
-
//smokeLightPuffSprite.saveAllTIL("pics\\particles\\puff\\smokeLight\\");
+ //smokeLightPuffSprite.saveAllTIL("pics/particles/puff/smokeLight/");
- char pathSmokeDark[] = "pics\\particles\\puff\\smokeDark\\til\\";
+ char pathSmokeDark[] = "pics/particles/puff/smokeDark/til/";
if (!smokeDarkPuffSprite.loadAllPAKInDirectory(pathSmokeDark))
{
@@ -306,9 +305,9 @@
// Following code is for reducing the size of the images.
//smokeDarkPuffSprite.shrinkWrap();
//smokeDarkPuffSprite.scale(100);
- //smokeDarkPuffSprite.saveAllTIL("pics\\particles\\puff\\smokeDark\\");
+ //smokeDarkPuffSprite.saveAllTIL("pics/particles/puff/smokeDark/");
- char pathDirt[] = "pics\\particles\\puff\\dirt\\til\\";
+ char pathDirt[] = "pics/particles/puff/dirt/til/";
if (!dirtPuffSprite.loadAllPAKInDirectory(pathDirt))
{
@@ -318,6 +317,6 @@
// Following code is for reducing the size of the images.
//dirtPuffSprite.shrinkWrap();
//dirtPuffSprite.scale(100);
- //dirtPuffSprite.saveAllTIL("pics\\particles\\puff\\dirt\\");}
+ //dirtPuffSprite.saveAllTIL("pics/particles/puff/dirt/");}
*/
}
Index: netpanzer/src/Lib/Particles/RadarPingParticle2D.cpp
diff -u netpanzer/src/Lib/Particles/RadarPingParticle2D.cpp:1.3
netpanzer/src/Lib/Particles/RadarPingParticle2D.cpp:1.4
--- netpanzer/src/Lib/Particles/RadarPingParticle2D.cpp:1.3 Fri Sep 5
22:01:18 2003
+++ netpanzer/src/Lib/Particles/RadarPingParticle2D.cpp Sat Sep 6 11:39:24 2003
@@ -44,7 +44,7 @@
void RadarPingParticle2D::init()
{
radarPingSprite.create(iXY(48, 46), 48, 6);
- radarPingSprite.loadAllTILInDirectory("pics\\particles\\radarPing\\");
+ radarPingSprite.loadAllTILInDirectory("pics/particles/radarPing/");
radarPingSprite.setOffset(iXY(-radarPingSprite.getCenter().x,
-radarPingSprite.getPix().y));
Index: netpanzer/src/Lib/Particles/SparkParticle2D.cpp
diff -u netpanzer/src/Lib/Particles/SparkParticle2D.cpp:1.3
netpanzer/src/Lib/Particles/SparkParticle2D.cpp:1.4
--- netpanzer/src/Lib/Particles/SparkParticle2D.cpp:1.3 Fri Sep 5 22:01:18 2003
+++ netpanzer/src/Lib/Particles/SparkParticle2D.cpp Sat Sep 6 11:39:24 2003
@@ -42,13 +42,13 @@
void SparkParticle2D::init()
{
sparkSprite.create(iXY(96, 128), 96, 16);
- sparkSprite.extractPCX("pics\\particles\\explosion\\pcx\\flack1.pcx",
5, 0);
+ sparkSprite.extractPCX("pics/particles/explosion/pcx/flack1.pcx", 5, 0);
//sparkSprite.setOffsetCenter();
- //explosion.loadRAW("pics\\explode\\expl0002.raw");
+ //explosion.loadRAW("pics/explode/expl0002.raw");
//spark.create(iXY(64, 64), 64, 16);
//spark.fill(Color::red);
- //spark.extractPCX("pics\\explode\\expl01.pcx", 4, 0);
+ //spark.extractPCX("pics/explode/expl01.pcx", 4, 0);
//spark.scale(iXY(20, 20));
} // end SparkParticle2D::init
Index: netpanzer/src/Lib/View/View.cpp
diff -u netpanzer/src/Lib/View/View.cpp:1.4 netpanzer/src/Lib/View/View.cpp:1.5
--- netpanzer/src/Lib/View/View.cpp:1.4 Sat Sep 6 11:18:18 2003
+++ netpanzer/src/Lib/View/View.cpp Sat Sep 6 11:39:24 2003
@@ -15,10 +15,8 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-
-
#include <config.h>
+
#include "View.hpp"
#include "Desktop.hpp"
#include "MouseInterface.hpp"
@@ -91,32 +89,32 @@
if (topBorder.getFrameCount() <= 0)
{
- sprintf(strBuf, "pics\\viewBorders\\btop.til");
+ sprintf(strBuf, "pics/viewBorders/btop.til");
if (!topBorder.loadTIL(strBuf)) FUBAR("ERROR: Unable to load:
%s", strBuf);
}
if (leftBorder.getFrameCount() <= 0)
{
- sprintf(strBuf, "pics\\viewBorders\\bleft.til");
+ sprintf(strBuf, "pics/viewBorders/bleft.til");
if (!leftBorder.loadTIL(strBuf)) FUBAR("ERROR: Unable to load:
%s", strBuf);
}
if (bottomBorder.getFrameCount() <= 0)
{
- sprintf(strBuf, "pics\\viewBorders\\bbottom.til");
+ sprintf(strBuf, "pics/viewBorders/bbottom.til");
if (!bottomBorder.loadTIL(strBuf)) FUBAR("ERROR: Unable to
load: %s", strBuf);
}
if (rightBorder.getFrameCount() <= 0)
{
- sprintf(strBuf, "pics\\viewBorders\\bright.til");
+ sprintf(strBuf, "pics/viewBorders/bright.til");
if (!rightBorder.loadTIL(strBuf)) FUBAR("ERROR: Unable to load:
%s", strBuf);
}
if (topLeftCornerLarge.getFrameCount() <= 0)
{
- sprintf(strBuf, "pics\\viewBorders\\bctl1.til");
+ sprintf(strBuf, "pics/viewBorders/bctl1.til");
if (!topLeftCornerLarge.loadTIL(strBuf)) FUBAR("ERROR: Unable
to load: %s", strBuf);
}
if (topLeftCornerSmall.getFrameCount() <= 0)
{
- sprintf(strBuf, "pics\\viewBorders\\bctl2.til");
+ sprintf(strBuf, "pics/viewBorders/bctl2.til");
if (!topLeftCornerSmall.loadTIL(strBuf)) FUBAR("ERROR: Unable
to load: %s", strBuf);
}
@@ -159,7 +157,7 @@
// If the button is bordered, then put a close button on it.
//if (status & STATUS_ISBORDERED)
//LOG(("About to addButton"));
- //addButton(iXY(getSizeX()-10, getSizeY()-10),
"pics\\buttons\\wclose.raw", "Close the current window", View::toggleWindow);
+ //addButton(iXY(getSizeX()-10, getSizeY()-10),
"pics/buttons/wclose.raw", "Close the current window", View::toggleWindow);
//LOG(("Past addButton"));
moveTo(pos);
@@ -504,7 +502,7 @@
if (pics.getFrame0() != 0) return;
//pics.create(iXY(12, 11), 12, 2);
- //pics.extractPCX("pics\\buttons.pcx", 6, 1);
+ //pics.extractPCX("pics/buttons.pcx", 6, 1);
} // end loadPics
Index: netpanzer/src/NetPanzer/Classes/Weapons/Weapon.cpp
diff -u netpanzer/src/NetPanzer/Classes/Weapons/Weapon.cpp:1.4
netpanzer/src/NetPanzer/Classes/Weapons/Weapon.cpp:1.5
--- netpanzer/src/NetPanzer/Classes/Weapons/Weapon.cpp:1.4 Sat Sep 6
06:34:29 2003
+++ netpanzer/src/NetPanzer/Classes/Weapons/Weapon.cpp Sat Sep 6 11:39:24 2003
@@ -38,41 +38,41 @@
void Weapon::init()
{
//packFiles();
-
gMissleMediumPackedSurface.load("pics\\particles\\missles\\pak\\misslesMedium.pak");
-
gMissleSmallPackedSurface.load("pics\\particles\\missles\\pak\\misslesSmall.pak");
- gShellPackedSurface.load("pics\\particles\\shells\\pak\\shells.pak");
+
gMissleMediumPackedSurface.load("pics/particles/missles/pak/misslesMedium.pak");
+
gMissleSmallPackedSurface.load("pics/particles/missles/pak/misslesSmall.pak");
+ gShellPackedSurface.load("pics/particles/shells/pak/shells.pak");
Surface temp;
PackedSurface pack;
- if
(UtilInterface::getFileSize("pics\\particles\\lights\\pak\\missleThrust.pak") >
0)
+ if
(UtilInterface::getFileSize("pics/particles/lights/pak/missleThrust.pak") > 0)
{
-
gMissleThrustPackedSurface.load("pics\\particles\\lights\\pak\\missleThrust.pak");
+
gMissleThrustPackedSurface.load("pics/particles/lights/pak/missleThrust.pak");
} else
{
// Missle thrust lighting.
- if
(!temp.loadTIL("pics\\particles\\lights\\til\\missleThrust.til"))
+ if (!temp.loadTIL("pics/particles/lights/til/missleThrust.til"))
{
FUBAR("SHIT!");
}
temp.setOffsetCenter();
pack.pack(temp);
- pack.save("pics\\particles\\lights\\pak\\missleThrust.pak");
+ pack.save("pics/particles/lights/pak/missleThrust.pak");
}
- if
(UtilInterface::getFileSize("pics\\particles\\lights\\pak\\missleGroundLight.pak")
> 0)
+ if
(UtilInterface::getFileSize("pics/particles/lights/pak/missleGroundLight.pak")
> 0)
{
-
gMissleGroundLightPackedSurface.load("pics\\particles\\lights\\pak\\missleGroundLight.pak");
+
gMissleGroundLightPackedSurface.load("pics/particles/lights/pak/missleGroundLight.pak");
} else
{
// Missle ground lighting.
- if
(!temp.loadTIL("pics\\particles\\lights\\til\\missleGroundLight.til"))
+ if
(!temp.loadTIL("pics/particles/lights/til/missleGroundLight.til"))
{
FUBAR("SHIT!");
}
temp.setOffsetCenter();
pack.pack(temp);
-
pack.save("pics\\particles\\lights\\pak\\missleGroundLight.pak");
+ pack.save("pics/particles/lights/pak/missleGroundLight.pak");
}
}
@@ -85,7 +85,7 @@
int i;
// Medium
- tempSurface.loadPCX("pics\\particles\\missles\\pcx\\missle1.pcx");
+ tempSurface.loadPCX("pics/particles/missles/pcx/missle1.pcx");
// Pack the missles.
tempMissleSurface.create(tempSurface.getPix(), tempSurface.getPixX(),
360);
@@ -100,10 +100,10 @@
}
tempPackSurface.pack(tempMissleSurface);
-
tempPackSurface.save("pics\\particles\\missles\\pak\\misslesMedium.pak");
+ tempPackSurface.save("pics/particles/missles/pak/misslesMedium.pak");
// Small
- tempSurface.loadPCX("pics\\particles\\missles\\pcx\\missle0.pcx");
+ tempSurface.loadPCX("pics/particles/missles/pcx/missle0.pcx");
// Pack the missles.
tempMissleSurface.create(tempSurface.getPix(), tempSurface.getPixX(),
360);
@@ -118,7 +118,7 @@
}
tempPackSurface.pack(tempMissleSurface);
- tempPackSurface.save("pics\\particles\\missles\\pak\\misslesSmall.pak");
+ tempPackSurface.save("pics/particles/missles/pak/misslesSmall.pak");
// Pack the shells.
//Surface tempShellSurface(gShellSurface.getPix(),
gShellSurface.getPixX(), 360);
@@ -133,7 +133,7 @@
//}
//
//tempPackSurface.pack(tempShellSurface);
- //tempPackSurface.save("pics\\particles\\shells\\pak\\shells.pak");
+ //tempPackSurface.save("pics/particles/shells/pak/shells.pak");
}
Weapon::Weapon(UnitID &owner, unsigned short owner_type_id, unsigned short
damage, PointXYi &start, PointXYi &end)
Index: netpanzer/src/NetPanzer/Core/loadPics.cpp
diff -u netpanzer/src/NetPanzer/Core/loadPics.cpp:1.3
netpanzer/src/NetPanzer/Core/loadPics.cpp:1.4
--- netpanzer/src/NetPanzer/Core/loadPics.cpp:1.3 Fri Sep 5 22:01:19 2003
+++ netpanzer/src/NetPanzer/Core/loadPics.cpp Sat Sep 6 11:39:25 2003
@@ -70,7 +70,7 @@
//mouseResizeTR.create(40, 30, 40, 30);
//mouseResizeTL.create(40, 30, 40, 30);
- //mouseArrow.loadRAW("pics\\cursors\\arrowPointer.raw");
+ //mouseArrow.loadRAW("pics/cursors/arrowPointer.raw");
mouseArrow.create(20, 20, 20, 1);
mouseArrow.fill(0);
mouseArrow.drawLine(0, 0, mouseArrow.getCenterX(), 0, 241);
@@ -81,22 +81,22 @@
mouseArrow.drawLine(mouseArrow.getPixX() - 5, mouseArrow.getPixY() - 1,
mouseArrow.getPixX(), mouseArrow.getPixY() - 1, 241);
mouseArrow.drawLine(mouseArrow.getPixX() - 1, mouseArrow.getPixY() - 5,
mouseArrow.getPixX() - 1, mouseArrow.getPixY() - 1, 241);
- //mouseMoveLeft.loadRAW("pics\\cursors\\arrowMoveLeft.raw");
- //mouseMoveUp.loadRAW("pics\\cursors\\arrowMoveUp.raw");
+ //mouseMoveLeft.loadRAW("pics/cursors/arrowMoveLeft.raw");
+ //mouseMoveUp.loadRAW("pics/cursors/arrowMoveUp.raw");
- //mouseMoveLeftStop.loadRAW("pics\\cursors\\arrowMoveLeftStop.raw");
- //mouseMoveUpStop.loadRAW("pics\\cursors\\arrowMoveUpStop.raw");
+ //mouseMoveLeftStop.loadRAW("pics/cursors/arrowMoveLeftStop.raw");
+ //mouseMoveUpStop.loadRAW("pics/cursors/arrowMoveUpStop.raw");
// Up/Down
- //mouseResizeUD.loadRAW("pics\\cursors\\resizeud.raw");
+ //mouseResizeUD.loadRAW("pics/cursors/resizeud.raw");
// Left/Right
- //mouseResizeLR.extractPCX("pics\\cursors\\resizetb.pcx", 15, 1);
+ //mouseResizeLR.extractPCX("pics/cursors/resizetb.pcx", 15, 1);
// Diagonals
- //mouseResizeBR.loadRAW("pics\\cursors\\resizebr.raw");
+ //mouseResizeBR.loadRAW("pics/cursors/resizebr.raw");
- //mouseMoveUpLeft.loadRAW("pics\\cursors\\arrowMoveUpperLeft.raw");
-
//mouseMoveUpLeftStop.loadRAW("pics\\cursors\\arrowMoveUpperLeftStop.raw");
+ //mouseMoveUpLeft.loadRAW("pics/cursors/arrowMoveUpperLeft.raw");
+
//mouseMoveUpLeftStop.loadRAW("pics/cursors/arrowMoveUpperLeftStop.raw");
/*
mouseResizeBL.copy(mouseResizeBR);
Index: netpanzer/src/NetPanzer/Interfaces/GameConfig.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/GameConfig.cpp:1.3
netpanzer/src/NetPanzer/Interfaces/GameConfig.cpp:1.4
--- netpanzer/src/NetPanzer/Interfaces/GameConfig.cpp:1.3 Fri Sep 5
22:01:19 2003
+++ netpanzer/src/NetPanzer/Interfaces/GameConfig.cpp Sat Sep 6 11:39:25 2003
@@ -173,7 +173,7 @@
// The LUA library is probably not compatible with
// GPL so I'm commenting it out for now
/*
- lua_return = lua_dofile( "Scripts\\config.lua" );
+ lua_return = lua_dofile( "Scripts/config.lua" );
assert( lua_return == 0 );
envValue = lua_getglobal( "envGameType" );
Index: netpanzer/src/NetPanzer/Interfaces/GameManager.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.14
netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.15
--- netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.14 Sat Sep 6
11:18:19 2003
+++ netpanzer/src/NetPanzer/Interfaces/GameManager.cpp Sat Sep 6 11:39:25 2003
@@ -197,7 +197,7 @@
#endif
setVideoMode(current_video_mode_res);
- loadPalette( "wads\\netp.act" );
+ loadPalette( "wads/netp.act" );
}
void GameManager::shutdownVideoSubSystem()
@@ -236,7 +236,7 @@
LOG(("Initializing Game Viewing System"));
// Use this when needing to create colorfilters.
- loadPalette( "wads\\netp.act" );
+ loadPalette( "wads/netp.act" );
initFont();
loadPics();
@@ -264,7 +264,7 @@
//chatView.init();
//Desktop::add(&chatView);
- loadPalette( "wads\\netpmenu.act" );
+ loadPalette( "wads/netpmenu.act" );
Desktop::add(new MapSelectionView());
Desktop::add(new MainMenuView());
@@ -359,7 +359,7 @@
Desktop::checkViewPositions();
ConsoleInterface::setToSurfaceSize( current_video_mode_res );
- loadPalette( "wads\\netp.act" );
+ loadPalette( "wads/netp.act" );
ConsoleInterface::postMessage( "Screen Resolution : %d x %d",
current_video_mode_res.x, current_video_mode_res.y );
}
@@ -390,7 +390,7 @@
Desktop::checkViewPositions();
ConsoleInterface::setToSurfaceSize( current_video_mode_res );
- loadPalette( "wads\\netp.act" );
+ loadPalette( "wads/netp.act" );
ConsoleInterface::postMessage( "Screen Resolution : %d x %d",
current_video_mode_res.x, current_video_mode_res.y );
}
@@ -656,11 +656,11 @@
{
if (!Desktop::getVisible("GameView"))
{
- decreaseBrightness("wads\\netpmenu.act");
+ decreaseBrightness("wads/netpmenu.act");
}
else
{
- decreaseBrightness("wads\\netp.act");
+ decreaseBrightness("wads/netp.act");
}
}
@@ -668,11 +668,11 @@
{
if (!Desktop::getVisible("GameView"))
{
- increaseBrightness("wads\\netpmenu.act");
+ increaseBrightness("wads/netpmenu.act");
}
else
{
- increaseBrightness("wads\\netp.act");
+ increaseBrightness("wads/netp.act");
}
}
@@ -868,7 +868,7 @@
{
UnitProfileInterface::loadUnitProfiles();
LoadUnitSurfaces();
- UNIT_FLAGS_SURFACE.loadAllBMPInDirectory("pics\\flags\\netp\\");
+ UNIT_FLAGS_SURFACE.loadAllBMPInDirectory("pics/flags/netp/");
GameConfig::loadConfigScript();
return true;
@@ -879,7 +879,7 @@
{
UnitProfileInterface::loadUnitProfiles();
LoadUnitSurfaces();
- UNIT_FLAGS_SURFACE.loadAllBMPInDirectory("pics\\flags\\netp\\");
+ UNIT_FLAGS_SURFACE.loadAllBMPInDirectory("pics/flags/netp/");
GameConfig::loadConfigScript();
}
@@ -904,7 +904,7 @@
else
{ *result_code = _mapload_result_success; }
- strcpy( map_path, ".\\maps\\" );
+ strcpy( map_path, "./maps/" );
strcat( map_path, map_file_path );
if ( MapInterface::startMapLoad( map_path, true, partitions ) == false )
@@ -950,7 +950,7 @@
void GameManager::dedicatedLoadGameMap( char *map_name )
{
- strcpy( map_path, ".\\maps\\" );
+ strcpy( map_path, "./maps/" );
strcat( map_path, map_name );
MapInterface::startMapLoad( map_path, false, 0 );
@@ -1599,7 +1599,7 @@
progressView.close();
// Set the palette to the game palette.
- loadPalette( "wads\\netp.act" );
+ loadPalette( "wads/netp.act" );
setNetPanzerGameOptions();
Index: netpanzer/src/NetPanzer/Interfaces/MapInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/MapInterface.cpp:1.3
netpanzer/src/NetPanzer/Interfaces/MapInterface.cpp:1.4
--- netpanzer/src/NetPanzer/Interfaces/MapInterface.cpp:1.3 Fri Sep 5
22:01:19 2003
+++ netpanzer/src/NetPanzer/Interfaces/MapInterface.cpp Sat Sep 6 11:39:25 2003
@@ -40,7 +40,7 @@
strcat( path, ".npm" );
main_map.loadMapFile( path );
- strcpy( tile_set_path, ".\\wads\\" );
+ strcpy( tile_set_path, "./wads/" );
strcat( tile_set_path, main_map.getAssocTileSet() );
tile_set.loadTileSetInfo( tile_set_path );
@@ -101,17 +101,17 @@
strcat( path, ".npm" );
main_map.loadMapFile( path );
- tile_set.loadTileSetInfo( ".\\wads\\wad.tls" );
+ tile_set.loadTileSetInfo( "./wads/wad.tls" );
generateMappingTable();
main_map.reMap( wad_mapping_table );
if ( load_tiles == true )
{
- tile_set.loadTileSet( ".\\wads\\wad.tls", wad_mapping_table );
+ tile_set.loadTileSet( "./wads/wad.tls", wad_mapping_table );
}
else
{
- tile_set.loadTileSetInfo( ".\\wads\\wad.tls", wad_mapping_table );
+ tile_set.loadTileSetInfo( "./wads/wad.tls", wad_mapping_table );
}
wad_mapping_table.deallocate();
Index: netpanzer/src/NetPanzer/Interfaces/MapsManager.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/MapsManager.cpp:1.5
netpanzer/src/NetPanzer/Interfaces/MapsManager.cpp:1.6
--- netpanzer/src/NetPanzer/Interfaces/MapsManager.cpp:1.5 Sat Sep 6
11:18:19 2003
+++ netpanzer/src/NetPanzer/Interfaces/MapsManager.cpp Sat Sep 6 11:39:25 2003
@@ -47,7 +47,7 @@
void MapsManager::scanMaps( void )
{
- scanMaps( ".\\maps\\" );
+ scanMaps( "./maps/" );
}
void MapsManager::scanMaps( const char *map_directory )
@@ -149,7 +149,7 @@
char temp_path[256];
MAP_HEADER map_info;
- strcpy( temp_path, ".\\maps\\");
+ strcpy( temp_path, "./maps/");
strcat( temp_path, map_name);
strcat( temp_path, ".npm" );
@@ -159,7 +159,7 @@
fclose( fp );
- strcpy( temp_path, ".\\wads\\");
+ strcpy( temp_path, "./wads/");
strcat( temp_path, map_info.tile_set );
fp = fopen( temp_path, "rb" );
Index: netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp:1.4
netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp:1.5
--- netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp:1.4 Sat Sep 6
06:34:29 2003
+++ netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp Sat Sep 6
11:39:25 2003
@@ -75,7 +75,7 @@
mouse_cursor.setOffsetCenter();
#ifndef _MAP_EDITOR_BUILD
// ** NOTE: TEMPORARY
- CURSOR_DBASE.load_dbase( ".\\gdbase\\cursor.dbs" );
+ CURSOR_DBASE.load_dbase( "./gdbase/cursor.dbs" );
#endif // ** _MAP_EDITOR_BUILD
}
Index: netpanzer/src/NetPanzer/Interfaces/PowerUpInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/PowerUpInterface.cpp:1.3
netpanzer/src/NetPanzer/Interfaces/PowerUpInterface.cpp:1.4
--- netpanzer/src/NetPanzer/Interfaces/PowerUpInterface.cpp:1.3 Fri Sep 5
22:01:19 2003
+++ netpanzer/src/NetPanzer/Interfaces/PowerUpInterface.cpp Sat Sep 6
11:39:25 2003
@@ -238,9 +238,9 @@
void PowerUpInterface::initialize( void )
{
int lua_return;
- BONUS_POWERUP_ANIM.load( "PowerUps\\Bolt.pak" );
+ BONUS_POWERUP_ANIM.load( "PowerUps/Bolt.pak" );
BONUS_POWERUP_ANIM.setFPS( 15 );
- BONUS_POWERUP_ANIM_SHADOW.load( "PowerUps\\BoltS.pak" );
+ BONUS_POWERUP_ANIM_SHADOW.load( "PowerUps/BoltS.pak" );
UNIT_POWERUP_ANIM.setTo( BONUS_POWERUP_ANIM );
UNIT_POWERUP_ANIM_SHADOW.setTo( BONUS_POWERUP_ANIM_SHADOW );
@@ -251,9 +251,9 @@
srand( (unsigned)time( 0 ) );
/*
mathlib_open();
- lua_return = lua_dofile( "PowerUps\\UnitPowerUp.lua" );
+ lua_return = lua_dofile( "PowerUps/UnitPowerUp.lua" );
assert( lua_return == 0 );
- lua_return = lua_dofile( "PowerUps\\PowerUp.lua" );
+ lua_return = lua_dofile( "PowerUps/PowerUp.lua" );
assert( lua_return == 0 );
*/
//resetLogic();
Index: netpanzer/src/NetPanzer/Views/Game/AreYouSureResignView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/AreYouSureResignView.cpp:1.5
netpanzer/src/NetPanzer/Views/Game/AreYouSureResignView.cpp:1.6
--- netpanzer/src/NetPanzer/Views/Game/AreYouSureResignView.cpp:1.5 Sat Sep
6 07:04:15 2003
+++ netpanzer/src/NetPanzer/Views/Game/AreYouSureResignView.cpp Sat Sep 6
11:39:25 2003
@@ -53,7 +53,7 @@
GameManager::drawTextCenteredOnScreen("Loading Main View...",
Color::white);
- GameManager::loadPalette("wads\\netpmenu.act");
+ GameManager::loadPalette("wads/netpmenu.act");
// Must remove the gameView first so that the initButtons detects that
// and loads the correct buttons.
Index: netpanzer/src/NetPanzer/Views/Game/LobbyView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/LobbyView.cpp:1.5
netpanzer/src/NetPanzer/Views/Game/LobbyView.cpp:1.6
--- netpanzer/src/NetPanzer/Views/Game/LobbyView.cpp:1.5 Sat Sep 6
07:04:15 2003
+++ netpanzer/src/NetPanzer/Views/Game/LobbyView.cpp Sat Sep 6 11:39:25 2003
@@ -128,7 +128,7 @@
{
GameManager::drawTextCenteredOnScreen("Sec...", Color::white);
- GameManager::loadPalette("wads\\netpmenu.act");
+ GameManager::loadPalette("wads/netpmenu.act");
Desktop::setVisibilityAllWindows(false);
Desktop::setVisibility("LobbyView", true);
@@ -152,7 +152,7 @@
GameManager::drawTextCenteredOnScreen("Sec...", Color::white);
// Set the palette to the game palette.
- GameManager::loadPalette("wads\\netp.act");
+ GameManager::loadPalette("wads/netp.act");
GameManager::setNetPanzerGameOptions();
@@ -187,7 +187,7 @@
//---------------------------------------------------------------------------
void LobbyView::loadBackgroundSurface()
{
- String string = "pics\\backgrounds\\menus\\menu\\til\\loadingMB.til";
+ String string = "pics/backgrounds/menus/menu/til/loadingMB.til";
if (!backgroundSurface.loadTIL(string))
{
Index: netpanzer/src/NetPanzer/Views/Game/ProgressView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/ProgressView.cpp:1.5
netpanzer/src/NetPanzer/Views/Game/ProgressView.cpp:1.6
--- netpanzer/src/NetPanzer/Views/Game/ProgressView.cpp:1.5 Sat Sep 6
07:04:15 2003
+++ netpanzer/src/NetPanzer/Views/Game/ProgressView.cpp Sat Sep 6 11:39:25 2003
@@ -204,7 +204,7 @@
GameManager::drawTextCenteredOnScreen("Sec...", Color::white);
- GameManager::loadPalette("wads\\netpmenu.act");
+ GameManager::loadPalette("wads/netpmenu.act");
Desktop::setVisibilityAllWindows(false);
Desktop::setVisibility("ProgressView", true);
@@ -223,7 +223,7 @@
GameManager::restorePreviousVideoMode();
Desktop::checkViewPositions();
- GameManager::loadPalette("wads\\netp.act");
+ GameManager::loadPalette("wads/netp.act");
backgroundSurface.free();
Desktop::setVisibility("ProgressView", false);
@@ -242,7 +242,7 @@
Desktop::checkViewPositions();
// Set the palette to the game palette.
- GameManager::loadPalette("wads\\netp.act");
+ GameManager::loadPalette("wads/netp.act");
GameManager::setNetPanzerGameOptions();
@@ -277,7 +277,7 @@
//---------------------------------------------------------------------------
void ProgressView::loadBackgroundSurface()
{
- String string = "pics\\backgrounds\\menus\\menu\\til\\loadingMB.til";
+ String string = "pics/backgrounds/menus/menu/til/loadingMB.til";
if (!backgroundSurface.loadTIL(string))
{
Index: netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.cpp:1.3
netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.cpp:1.4
--- netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.cpp:1.3 Fri Sep
5 22:01:19 2003
+++ netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.cpp Sat Sep 6
11:39:25 2003
@@ -365,35 +365,35 @@
// Unit images.
unit_regen_time = getUnitRegenTime(_unit_type_humvee);
sprintf(strBuf, "SpahPanzer - Build Time: %01d:%02d", unit_regen_time /
60, unit_regen_time % 60);
- addButtonTILBordered(pos,
"pics\\menus\\vehicleSelectionView\\til\\scout.til", strBuf, bSelectScout);
+ addButtonTILBordered(pos,
"pics/menus/vehicleSelectionView/til/scout.til", strBuf, bSelectScout);
abstractButtonHumvee.setBounds(iRect(pos, pos + 48));
add(&abstractButtonHumvee);
pos.x += 48 + gapSpace;
unit_regen_time = getUnitRegenTime(_unit_type_valentine);
sprintf(strBuf, "Manta - Build Time: %01d:%02d", unit_regen_time / 60,
unit_regen_time % 60);
- addButtonTILBordered(pos,
"pics\\menus\\vehicleSelectionView\\til\\manta.til", strBuf, bSelectManta);
+ addButtonTILBordered(pos,
"pics/menus/vehicleSelectionView/til/manta.til", strBuf, bSelectManta);
abstractButtonValentine.setBounds(iRect(pos, pos + 48));
add(&abstractButtonValentine);
pos.x += 48 + gapSpace;
unit_regen_time = getUnitRegenTime(_unit_type_leopard);
sprintf(strBuf, "Panther1 - Build Time: %01d:%02d", unit_regen_time / 60,
unit_regen_time % 60);
- addButtonTILBordered(pos,
"pics\\menus\\vehicleSelectionView\\til\\panther1.til", strBuf,
bSelectPanther1);
+ addButtonTILBordered(pos,
"pics/menus/vehicleSelectionView/til/panther1.til", strBuf, bSelectPanther1);
abstractButtonLeopard.setBounds(iRect(pos, pos + 48));
add(&abstractButtonLeopard);
pos.x += 48 + gapSpace;
unit_regen_time = getUnitRegenTime(_unit_type_abrams);
sprintf(strBuf, "Titan - Build Time: %01d:%02d", unit_regen_time / 60,
unit_regen_time % 60);
- addButtonTILBordered(pos,
"pics\\menus\\vehicleSelectionView\\til\\titan.til", strBuf, bSelectTitan);
+ addButtonTILBordered(pos,
"pics/menus/vehicleSelectionView/til/titan.til", strBuf, bSelectTitan);
abstractButtonAbrams.setBounds(iRect(pos, pos + 48));
add(&abstractButtonAbrams);
pos.x += 48 + gapSpace;
unit_regen_time = getUnitRegenTime(_unit_type_hammerhead);
sprintf(strBuf, "Stinger - Build Time: %01d:%02d", unit_regen_time / 60,
unit_regen_time % 60);
- addButtonTILBordered(pos,
"pics\\menus\\vehicleSelectionView\\til\\stinger.til", strBuf, bSelectStinger);
+ addButtonTILBordered(pos,
"pics/menus/vehicleSelectionView/til/stinger.til", strBuf, bSelectStinger);
abstractButtonHammerhead.setBounds(iRect(pos, pos + 48));
add(&abstractButtonHammerhead);
@@ -401,35 +401,35 @@
pos.y += 48 + gapSpace;
unit_regen_time = getUnitRegenTime(_unit_type_lynx);
sprintf(strBuf, "Bobcat - Build Time: %01d:%02d", unit_regen_time / 60,
unit_regen_time % 60);
- addButtonTILBordered(pos,
"pics\\menus\\vehicleSelectionView\\til\\bobcat.til", strBuf, bSelectBobcat);
+ addButtonTILBordered(pos,
"pics/menus/vehicleSelectionView/til/bobcat.til", strBuf, bSelectBobcat);
abstractButtonLynx.setBounds(iRect(pos, pos + 48));
add(&abstractButtonLynx);
pos.x += 48 + gapSpace;
unit_regen_time = getUnitRegenTime(_unit_type_scorpion);
sprintf(strBuf, "Wolf - Build Time: %01d:%02d", unit_regen_time / 60,
unit_regen_time % 60);
- addButtonTILBordered(pos,
"pics\\menus\\vehicleSelectionView\\til\\wolf.til", strBuf, bSelectWolf);
+ addButtonTILBordered(pos,
"pics/menus/vehicleSelectionView/til/wolf.til", strBuf, bSelectWolf);
abstractButtonScorpion.setBounds(iRect(pos, pos + 48));
add(&abstractButtonScorpion);
pos.x += 48 + gapSpace;
unit_regen_time = getUnitRegenTime(_unit_type_spahpanzer);
sprintf(strBuf, "Bear - Build Time: %01d:%02d", unit_regen_time / 60,
unit_regen_time % 60);
- addButtonTILBordered(pos,
"pics\\menus\\vehicleSelectionView\\til\\bear.til", strBuf, bSelectBear);
+ addButtonTILBordered(pos,
"pics/menus/vehicleSelectionView/til/bear.til", strBuf, bSelectBear);
abstractButtonSpahpanzer.setBounds(iRect(pos, pos + 48));
add(&abstractButtonSpahpanzer);
pos.x += 48 + gapSpace;
unit_regen_time = getUnitRegenTime(_unit_type_m109);
sprintf(strBuf, "Drake - Build Time: %01d:%02d", unit_regen_time / 60,
unit_regen_time % 60);
- addButtonTILBordered(pos,
"pics\\menus\\vehicleSelectionView\\til\\drake.til", strBuf, bSelectDrake);
+ addButtonTILBordered(pos,
"pics/menus/vehicleSelectionView/til/drake.til", strBuf, bSelectDrake);
abstractButtonM109.setBounds(iRect(pos, pos + 48));
add(&abstractButtonM109);
pos.x += 48 + gapSpace;
unit_regen_time = getUnitRegenTime(_unit_type_archer);
sprintf(strBuf, "Archer - Build Time: %01d:%02d", unit_regen_time / 60,
unit_regen_time % 60);
- addButtonTILBordered(pos,
"pics\\menus\\vehicleSelectionView\\til\\archer.til", strBuf, bSelectArcher);
+ addButtonTILBordered(pos,
"pics/menus/vehicleSelectionView/til/archer.til", strBuf, bSelectArcher);
abstractButtonArcher.setBounds(iRect(pos, pos + 48));
add(&abstractButtonArcher);
@@ -456,34 +456,34 @@
Surface tempSurface;
int i = 0;
- if
(!tempSurface.loadTIL("pics\\menus\\vehicleSelectionView\\til\\manta.til")) {
FUBAR("Shit!"); }
+ if
(!tempSurface.loadTIL("pics/menus/vehicleSelectionView/til/manta.til")) {
FUBAR("Shit!"); }
unitImages.setFrame(i++);
tempSurface.blt(unitImages);
- if
(!tempSurface.loadTIL("pics\\menus\\vehicleSelectionView\\til\\panther1.til"))
{ FUBAR("Shit!"); }
+ if
(!tempSurface.loadTIL("pics/menus/vehicleSelectionView/til/panther1.til")) {
FUBAR("Shit!"); }
unitImages.setFrame(i++);
tempSurface.blt(unitImages);
- if
(!tempSurface.loadTIL("pics\\menus\\vehicleSelectionView\\til\\titan.til")) {
FUBAR("Shit!"); }
+ if
(!tempSurface.loadTIL("pics/menus/vehicleSelectionView/til/titan.til")) {
FUBAR("Shit!"); }
unitImages.setFrame(i++);
tempSurface.blt(unitImages);
- if
(!tempSurface.loadTIL("pics\\menus\\vehicleSelectionView\\til\\stinger.til")) {
FUBAR("Shit!"); }
+ if
(!tempSurface.loadTIL("pics/menus/vehicleSelectionView/til/stinger.til")) {
FUBAR("Shit!"); }
unitImages.setFrame(i++);
tempSurface.blt(unitImages);
- if
(!tempSurface.loadTIL("pics\\menus\\vehicleSelectionView\\til\\bobcat.til")) {
FUBAR("Shit!"); }
+ if
(!tempSurface.loadTIL("pics/menus/vehicleSelectionView/til/bobcat.til")) {
FUBAR("Shit!"); }
unitImages.setFrame(i++);
tempSurface.blt(unitImages);
- if
(!tempSurface.loadTIL("pics\\menus\\vehicleSelectionView\\til\\bear.til")) {
FUBAR("Shit!"); }
+ if
(!tempSurface.loadTIL("pics/menus/vehicleSelectionView/til/bear.til")) {
FUBAR("Shit!"); }
unitImages.setFrame(i++);
tempSurface.blt(unitImages);
- if
(!tempSurface.loadTIL("pics\\menus\\vehicleSelectionView\\til\\archer.til")) {
FUBAR("Shit!"); }
+ if
(!tempSurface.loadTIL("pics/menus/vehicleSelectionView/til/archer.til")) {
FUBAR("Shit!"); }
unitImages.setFrame(i++);
tempSurface.blt(unitImages);
- if
(!tempSurface.loadTIL("pics\\menus\\vehicleSelectionView\\til\\wolf.til")) {
FUBAR("Shit!"); }
+ if
(!tempSurface.loadTIL("pics/menus/vehicleSelectionView/til/wolf.til")) {
FUBAR("Shit!"); }
unitImages.setFrame(i++);
tempSurface.blt(unitImages);
- if
(!tempSurface.loadTIL("pics\\menus\\vehicleSelectionView\\til\\drake.til")) {
FUBAR("Shit!"); }
+ if
(!tempSurface.loadTIL("pics/menus/vehicleSelectionView/til/drake.til")) {
FUBAR("Shit!"); }
unitImages.setFrame(i++);
tempSurface.blt(unitImages);
- if
(!tempSurface.loadTIL("pics\\menus\\vehicleSelectionView\\til\\scout.til")) {
FUBAR("Shit!"); }
+ if
(!tempSurface.loadTIL("pics/menus/vehicleSelectionView/til/scout.til")) {
FUBAR("Shit!"); }
unitImages.setFrame(i++);
tempSurface.blt(unitImages);
unitImages.setFrame(i++);
Index: netpanzer/src/NetPanzer/Views/Game/WinnerMesgView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/WinnerMesgView.cpp:1.5
netpanzer/src/NetPanzer/Views/Game/WinnerMesgView.cpp:1.6
--- netpanzer/src/NetPanzer/Views/Game/WinnerMesgView.cpp:1.5 Sat Sep 6
07:04:15 2003
+++ netpanzer/src/NetPanzer/Views/Game/WinnerMesgView.cpp Sat Sep 6
11:39:25 2003
@@ -64,7 +64,7 @@
GameManager::drawTextCenteredOnScreen("Loading Main View...",
Color::white);
- GameManager::loadPalette("wads\\netpmenu.act");
+ GameManager::loadPalette("wads/netpmenu.act");
Desktop::setVisibilityAllWindows(false);
Index: netpanzer/src/NetPanzer/Views/MainMenu/HelpView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/HelpView.cpp:1.3
netpanzer/src/NetPanzer/Views/MainMenu/HelpView.cpp:1.4
--- netpanzer/src/NetPanzer/Views/MainMenu/HelpView.cpp:1.3 Fri Sep 5
22:01:19 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/HelpView.cpp Sat Sep 6 11:39:25 2003
@@ -75,6 +75,6 @@
//---------------------------------------------------------------------------
void HelpView::loadTitleSurface()
{
-
doLoadTitleSurface("pics\\backgrounds\\menus\\menu\\til\\helpTitle.til");
+ doLoadTitleSurface("pics/backgrounds/menus/menu/til/helpTitle.til");
} // end HelpView::loadTitleSurface
Index: netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp:1.5
netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp:1.6
--- netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp:1.5 Sat Sep
6 07:04:15 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp Sat Sep 6
11:39:25 2003
@@ -365,21 +365,21 @@
//if (globeSurface.getFrameCount() <= 0)
//{
// // See if the pak image already exists.
- // if
(getFileSize("pics\\backgrounds\\menus\\globe\\pak\\globe.pak") > 0)
+ // if
(getFileSize("pics/backgrounds/menus/globe/pak/globe.pak") > 0)
// {
- //
globeSurface.load("pics\\backgrounds\\menus\\globe\\pak\\globe.pak");
+ //
globeSurface.load("pics/backgrounds/menus/globe/pak/globe.pak");
// } else
// {
// Surface tempSurface;
//
- // if
(!tempSurface.loadAllTILInDirectory("pics\\backgrounds\\menus\\globe\\til\\"))
+ // if
(!tempSurface.loadAllTILInDirectory("pics/backgrounds/menus/globe/til/"))
// {
// FUBAR("Shit");
// }
// tempSurface.setFPS(14);
//
// globeSurface.pack(tempSurface);
- //
globeSurface.save("pics\\backgrounds\\menus\\globe\\pak\\globe.pak");
+ //
globeSurface.save("pics/backgrounds/menus/globe/pak/globe.pak");
// }
//}
loadBackgroundSurface();
@@ -395,7 +395,7 @@
//---------------------------------------------------------------------------
void MenuTemplateView::loadBackgroundSurface()
{
-
doLoadBackgroundSurface("pics\\backgrounds\\menus\\menu\\til\\defaultMB.til");
+
doLoadBackgroundSurface("pics/backgrounds/menus/menu/til/defaultMB.til");
} // end MenuTemplateView::loadBackgroundSurface
@@ -414,7 +414,7 @@
//---------------------------------------------------------------------------
void MenuTemplateView::loadTitleSurface()
{
-
doLoadTitleSurface("pics\\backgrounds\\menus\\menu\\til\\mainTitle.til");
+ doLoadTitleSurface("pics/backgrounds/menus/menu/til/mainTitle.til");
} // end MenuTemplateView::loadTitleSurface
@@ -426,7 +426,7 @@
titleFlashTimeHalf = 2.5;
String pakString;
- pakString = "pics\\backgrounds\\menus\\menu\\pak\\";
+ pakString = "pics/backgrounds/menus/menu/pak/";
pakString += UtilInterface::getFilename(string);
pakString += ".pak";
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/FlagSelectionView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/FlagSelectionView.cpp:1.4
netpanzer/src/NetPanzer/Views/MainMenu/Multi/FlagSelectionView.cpp:1.5
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/FlagSelectionView.cpp:1.4
Sat Sep 6 06:34:29 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/FlagSelectionView.cpp Sat Sep
6 11:39:25 2003
@@ -44,7 +44,7 @@
moveTo(bodyTextRect.min.x + bodyTextRect.getSizeX() / 2 + 10 + 30,
bodyTextRect.min.y + 50);
// Load the flag images.
- //flags.loadAllBMPInDirectory("pics\\flags\\netpmenu\\");
+ //flags.loadAllBMPInDirectory("pics/flags/netpmenu/");
resizeClientArea(bodyTextRect.getSizeX() / 2 - 10 - 30, 108);
@@ -67,7 +67,7 @@
//---------------------------------------------------------------------------
void FlagSelectionView::init()
{
- playerFlag.loadAllBMPInDirectory("pics\\flags\\netpmenu\\");
+ playerFlag.loadAllBMPInDirectory("pics/flags/netpmenu/");
iXY flagStartOffset(BORDER_SPACE, BORDER_SPACE * 2 +
playerFlag.getPixY());
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetConnectionTypeView.cpp
diff -u
netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetConnectionTypeView.cpp:1.3
netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetConnectionTypeView.cpp:1.4
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetConnectionTypeView.cpp:1.3
Fri Sep 5 22:01:20 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetConnectionTypeView.cpp
Sat Sep 6 11:39:25 2003
@@ -94,15 +94,15 @@
//Surface tempSurface;
//
-
//tempSurface.loadAllTILInDirectory("pics\\backgrounds\\menus\\multi\\getConnection\\buttons\\tcpip\\til\\");
+
//tempSurface.loadAllTILInDirectory("pics/backgrounds/menus/multi/getConnection/buttons/tcpip/til/");
//assert(tempSurface.getFrameCount() == 3);
//addButtonSurface(iXY(173, 99), tempSurface, "Selects a TCP/IP connection
type.", bTCP);
//
-
//tempSurface.loadAllTILInDirectory("pics\\backgrounds\\menus\\multi\\getConnection\\buttons\\directConnect\\til\\");
+
//tempSurface.loadAllTILInDirectory("pics/backgrounds/menus/multi/getConnection/buttons/directConnect/til/");
//assert(tempSurface.getFrameCount() == 3);
//addButtonSurface(iXY(134, 119), tempSurface, "Selects a DirectConnect
connection type.", bDirect);
//
-
//tempSurface.loadAllTILInDirectory("pics\\backgrounds\\menus\\multi\\getConnection\\buttons\\modem\\til\\");
+
//tempSurface.loadAllTILInDirectory("pics/backgrounds/menus/multi/getConnection/buttons/modem/til/");
//assert(tempSurface.getFrameCount() == 3);
//addButtonSurface(iXY(104, 138), tempSurface, "Selects a modem connection
type.", bModem);
@@ -197,7 +197,7 @@
//---------------------------------------------------------------------------
void GetConnectionTypeView::loadBackgroundSurface()
{
-
doLoadBackgroundSurface(("pics\\backgrounds\\menus\\menu\\til\\connectionMB.til"));
+
doLoadBackgroundSurface(("pics/backgrounds/menus/menu/til/connectionMB.til"));
} // end MenuTemplateView::loadBackgroundSurface
@@ -207,15 +207,15 @@
{
if (GameConfig::GetNetworkConnectType() == _connection_tcpip)
{
-
doLoadTitleSurface("pics\\backgrounds\\menus\\menu\\til\\tcpipTitle.til");
+
doLoadTitleSurface("pics/backgrounds/menus/menu/til/tcpipTitle.til");
}
else if (GameConfig::GetNetworkConnectType() ==
_connection_direct_connect)
{
-
doLoadTitleSurface("pics\\backgrounds\\menus\\menu\\til\\directConnectionTitle.til");
+
doLoadTitleSurface("pics/backgrounds/menus/menu/til/directConnectionTitle.til");
}
else if (GameConfig::GetNetworkConnectType() == _connection_modem)
{
-
doLoadTitleSurface("pics\\backgrounds\\menus\\menu\\til\\modemTitle.til");
+
doLoadTitleSurface("pics/backgrounds/menus/menu/til/modemTitle.til");
}
} // end GetConnectionTypeView::loadTitleSurface
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionView.cpp:1.5
netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionView.cpp:1.6
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionView.cpp:1.5 Sat Sep
6 07:04:15 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionView.cpp Sat Sep
6 11:39:25 2003
@@ -208,17 +208,17 @@
// Surface tempSurface;
//
-//
tempSurface.loadAllTILInDirectory("pics\\backgrounds\\menus\\multi\\getSession\\buttons\\join\\til\\");
+//
tempSurface.loadAllTILInDirectory("pics/backgrounds/menus/multi/getSession/buttons/join/til/");
// assert(tempSurface.getFrameCount() == 3);
// addButtonSurface(iXY(137, 118), tempSurface, "Join a multiplayer
session.", bJoin);
//
-//
tempSurface.loadAllTILInDirectory("pics\\backgrounds\\menus\\multi\\getSession\\buttons\\host\\til\\");
+//
tempSurface.loadAllTILInDirectory("pics/backgrounds/menus/multi/getSession/buttons/host/til/");
// assert(tempSurface.getFrameCount() == 3);
// addButtonSurface(iXY(106, 138), tempSurface, "Host a multiplayer
session.", bHost);
//
// addButtonCenterText(iXY(360, 438), 100, "Next", "Accepts the current
selection.", bNext);
//
-//
tempSurface.loadAllTILInDirectory("pics\\backgrounds\\menus\\buttons\\back\\til\\");
+//
tempSurface.loadAllTILInDirectory("pics/backgrounds/menus/buttons/back/til/");
// assert(tempSurface.getFrameCount() == 3);
// addButtonSurface(iXY(505, 440), tempSurface, "Move back menu.", bBack);
//
@@ -327,7 +327,7 @@
//---------------------------------------------------------------------------
void GetSessionView::loadBackgroundSurface()
{
-
doLoadBackgroundSurface(("pics\\backgrounds\\menus\\menu\\til\\sessionMB.til"));
+
doLoadBackgroundSurface(("pics/backgrounds/menus/menu/til/sessionMB.til"));
} // end GetSessionView::loadBackgroundSurface
@@ -337,11 +337,11 @@
{
if (GameConfig::GetHostOrJoin() == _game_session_host)
{
-
doLoadTitleSurface("pics\\backgrounds\\menus\\menu\\til\\hostTitle.til");
+
doLoadTitleSurface("pics/backgrounds/menus/menu/til/hostTitle.til");
}
else if (GameConfig::GetHostOrJoin() == _game_session_join)
{
-
doLoadTitleSurface("pics\\backgrounds\\menus\\menu\\til\\joinTitle.til");
+
doLoadTitleSurface("pics/backgrounds/menus/menu/til/joinTitle.til");
}
} // end GetSessionView::loadTitleSurface
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp
diff -u
netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp:1.5
netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp:1.6
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp:1.5
Sat Sep 6 07:04:15 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp
Sat Sep 6 11:39:25 2003
@@ -343,9 +343,9 @@
// Add the vehicle buttons.
// Get the dimensions of the buttons to draw.
Surface tempSurface;
- if (!tempSurface.loadTIL("pics\\vehicleSelectionMenu\\light.til"))
+ if (!tempSurface.loadTIL("pics/vehicleSelectionMenu/light.til"))
{
- FUBAR("ERROR: Unable to open
pics\\vehicleSelectionMenu\\light.til to find the size to make the buttons.");
+ FUBAR("ERROR: Unable to open
pics/vehicleSelectionMenu/light.til to find the size to make the buttons.");
}
iXY buttonSize(tempSurface.getPix());
@@ -358,19 +358,19 @@
y = pos.y;
- addButtonTILBordered(iXY(x, y),
"pics\\vehicleSelectionMenu\\humvee.til", "", 0);
+ addButtonTILBordered(iXY(x, y), "pics/vehicleSelectionMenu/humvee.til",
"", 0);
x += buttonSize.x + 1;
- addButtonTILBordered(iXY(x, y),
"pics\\vehicleSelectionMenu\\light.til", "", 0);
+ addButtonTILBordered(iXY(x, y), "pics/vehicleSelectionMenu/light.til",
"", 0);
x += buttonSize.x + 1;
- addButtonTILBordered(iXY(x, y),
"pics\\vehicleSelectionMenu\\medium.til", "", 0);
+ addButtonTILBordered(iXY(x, y), "pics/vehicleSelectionMenu/medium.til",
"", 0);
x += buttonSize.x + 1;
- addButtonTILBordered(iXY(x, y),
"pics\\vehicleSelectionMenu\\heavy.til", "", 0);
+ addButtonTILBordered(iXY(x, y), "pics/vehicleSelectionMenu/heavy.til",
"", 0);
x += buttonSize.x + 1;
- addButtonTILBordered(iXY(x, y),
"pics\\vehicleSelectionMenu\\missle.til", "", 0);
+ addButtonTILBordered(iXY(x, y), "pics/vehicleSelectionMenu/missle.til",
"", 0);
x += buttonSize.x + 1;
// Draw the arrows to change the numbers.
@@ -593,6 +593,6 @@
//---------------------------------------------------------------------------
void HostJoinTemplateView::loadBackgroundSurface()
{
-
doLoadBackgroundSurface("pics\\backgrounds\\menus\\menu\\til\\hostjoinMB.til");
+
doLoadBackgroundSurface("pics/backgrounds/menus/menu/til/hostjoinMB.til");
} // end HostJoinTemplateView::loadBackgroundSurface
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostView.cpp:1.4
netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostView.cpp:1.5
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostView.cpp:1.4 Sat Sep
6 06:34:29 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostView.cpp Sat Sep 6
11:39:25 2003
@@ -23,7 +23,7 @@
#include "HostOptionsView.hpp"
-static char screenSurfacePathTIL[] = "pics\\backgrounds\\menus\\multimb.til";
+static char screenSurfacePathTIL[] = "pics/backgrounds/menus/multimb.til";
/////////////////////////////////////////////////////////////////////////////
@@ -166,6 +166,6 @@
//---------------------------------------------------------------------------
void HostView::loadTitleSurface()
{
-
doLoadTitleSurface("pics\\backgrounds\\menus\\menu\\til\\hostTitle.til");
+ doLoadTitleSurface("pics/backgrounds/menus/menu/til/hostTitle.til");
} // end HostView::loadTitleSurface
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/JoinView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/JoinView.cpp:1.4
netpanzer/src/NetPanzer/Views/MainMenu/Multi/JoinView.cpp:1.5
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/JoinView.cpp:1.4 Sat Sep
6 06:34:29 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/JoinView.cpp Sat Sep 6
11:39:25 2003
@@ -61,6 +61,6 @@
//---------------------------------------------------------------------------
void JoinView::loadTitleSurface()
{
-
doLoadTitleSurface("pics\\backgrounds\\menus\\menu\\til\\joinTitle.til");
+ doLoadTitleSurface("pics/backgrounds/menus/menu/til/joinTitle.til");
} // end JoinView::loadTitleSurface
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.cpp:1.5
netpanzer/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.cpp:1.6
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.cpp:1.5
Sat Sep 6 09:12:39 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.cpp Sat Sep
6 11:39:25 2003
@@ -141,7 +141,7 @@
char strBuf[256];
char pathWild[256];
- const char mapsPath[] = "maps\\";
+ const char mapsPath[] = "maps/";
sprintf(pathWild, "%s*.npm", mapsPath);
@@ -243,7 +243,7 @@
{for (int i = 0; i < mapList.getCount(); i++)
{
- mapList[i].thumbnail.mapFromPalette("wads\\netp.act");
+ mapList[i].thumbnail.mapFromPalette("wads/netp.act");
}}
assert(mapList.getCount() > 0);
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/MultiMapSelectorView.cpp
diff -u
netpanzer/src/NetPanzer/Views/MainMenu/Multi/MultiMapSelectorView.cpp:1.3
netpanzer/src/NetPanzer/Views/MainMenu/Multi/MultiMapSelectorView.cpp:1.4
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/MultiMapSelectorView.cpp:1.3
Fri Sep 5 22:01:20 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/MultiMapSelectorView.cpp
Sat Sep 6 11:39:25 2003
@@ -43,7 +43,7 @@
char strBuf[256];
char pathWild[256];
- const char path[] = "maps\\";
+ const char path[] = "maps/";
sprintf(pathWild, "%s*.npm", path);
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/MultiVehicleSelectorView.cpp
diff -u
netpanzer/src/NetPanzer/Views/MainMenu/Multi/MultiVehicleSelectorView.cpp:1.3
netpanzer/src/NetPanzer/Views/MainMenu/Multi/MultiVehicleSelectorView.cpp:1.4
---
netpanzer/src/NetPanzer/Views/MainMenu/Multi/MultiVehicleSelectorView.cpp:1.3
Fri Sep 5 22:01:20 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/MultiVehicleSelectorView.cpp
Sat Sep 6 11:39:25 2003
@@ -39,7 +39,7 @@
//---------------------------------------------------------------------------
void MultiVehicleSelectorView::loadImages()
{
- if (!images.loadAllTILInDirectory("pics\\vehicleSelectionMenu\\"))
+ if (!images.loadAllTILInDirectory("pics/vehicleSelectionMenu/"))
{
FUBAR("ERROR: Unable to load any vehicles in
MultiVehicleSelectorView::loadImages.");
}
Index: netpanzer/src/NetPanzer/Views/MainMenu/Options/ControlsView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Options/ControlsView.cpp:1.4
netpanzer/src/NetPanzer/Views/MainMenu/Options/ControlsView.cpp:1.5
--- netpanzer/src/NetPanzer/Views/MainMenu/Options/ControlsView.cpp:1.4 Sat Sep
6 07:04:15 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Options/ControlsView.cpp Sat Sep
6 11:39:26 2003
@@ -26,7 +26,7 @@
#include "GameViewGlobals.hpp"
-//static char screenSurfacePathTIL[] =
"pics\\backgrounds\\menus\\optionmb.til";
+//static char screenSurfacePathTIL[] = "pics/backgrounds/menus/optionmb.til";
// never used
#if 0
@@ -130,6 +130,6 @@
//---------------------------------------------------------------------------
void ControlsView::loadTitleSurface()
{
-
doLoadTitleSurface("pics\\backgrounds\\menus\\menu\\til\\controlsTitle.til");
+ doLoadTitleSurface("pics/backgrounds/menus/menu/til/controlsTitle.til");
} // end ControlsView::loadTitleSurface
Index: netpanzer/src/NetPanzer/Views/MainMenu/Options/InterfaceView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Options/InterfaceView.cpp:1.3
netpanzer/src/NetPanzer/Views/MainMenu/Options/InterfaceView.cpp:1.4
--- netpanzer/src/NetPanzer/Views/MainMenu/Options/InterfaceView.cpp:1.3
Fri Sep 5 22:01:20 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Options/InterfaceView.cpp Sat Sep
6 11:39:26 2003
@@ -238,6 +238,6 @@
//---------------------------------------------------------------------------
void InterfaceView::loadTitleSurface()
{
-
doLoadTitleSurface("pics\\backgrounds\\menus\\menu\\til\\interfaceTitle.til");
+
doLoadTitleSurface("pics/backgrounds/menus/menu/til/interfaceTitle.til");
} // end InterfaceView::loadTitleSurface
Index: netpanzer/src/NetPanzer/Views/MainMenu/Options/SoundView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Options/SoundView.cpp:1.3
netpanzer/src/NetPanzer/Views/MainMenu/Options/SoundView.cpp:1.4
--- netpanzer/src/NetPanzer/Views/MainMenu/Options/SoundView.cpp:1.3 Fri Sep
5 22:01:20 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Options/SoundView.cpp Sat Sep
6 11:39:26 2003
@@ -161,6 +161,6 @@
//---------------------------------------------------------------------------
void SoundView::loadTitleSurface()
{
-
doLoadTitleSurface("pics\\backgrounds\\menus\\menu\\til\\soundTitle.til");
+ doLoadTitleSurface("pics/backgrounds/menus/menu/til/soundTitle.til");
} // end SoundView::loadTitleSurface
Index: netpanzer/src/NetPanzer/Views/MainMenu/Options/VisualsView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Options/VisualsView.cpp:1.3
netpanzer/src/NetPanzer/Views/MainMenu/Options/VisualsView.cpp:1.4
--- netpanzer/src/NetPanzer/Views/MainMenu/Options/VisualsView.cpp:1.3 Fri Sep
5 22:01:20 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Options/VisualsView.cpp Sat Sep
6 11:39:26 2003
@@ -397,7 +397,7 @@
//---------------------------------------------------------------------------
void VisualsView::loadTitleSurface()
{
-
doLoadTitleSurface("pics\\backgrounds\\menus\\menu\\til\\visualsTitle.til");
+ doLoadTitleSurface("pics/backgrounds/menus/menu/til/visualsTitle.til");
} // end VisualsView::loadTitleSurface
Index: netpanzer/src/NetPanzer/Views/MainMenu/OptionsTemplateView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/OptionsTemplateView.cpp:1.4
netpanzer/src/NetPanzer/Views/MainMenu/OptionsTemplateView.cpp:1.5
--- netpanzer/src/NetPanzer/Views/MainMenu/OptionsTemplateView.cpp:1.4 Sat Sep
6 07:04:15 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/OptionsTemplateView.cpp Sat Sep
6 11:39:25 2003
@@ -150,7 +150,7 @@
//---------------------------------------------------------------------------
void OptionsTemplateView::loadBackgroundSurface()
{
-
doLoadBackgroundSurface(("pics\\backgrounds\\menus\\menu\\til\\optionsMB.til"));
+
doLoadBackgroundSurface(("pics/backgrounds/menus/menu/til/optionsMB.til"));
} // end OptionsTemplateView::loadBackgroundSurface
@@ -158,6 +158,6 @@
//---------------------------------------------------------------------------
void OptionsTemplateView::loadTitleSurface()
{
-
doLoadTitleSurface("pics\\backgrounds\\menus\\menu\\til\\optionsTitle.til");
+ doLoadTitleSurface("pics/backgrounds/menus/menu/til/optionsTitle.til");
} // end ControlsView::loadTitleSurface
Index: netpanzer/src/NetPanzer/Views/MainMenu/OrderingView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/OrderingView.cpp:1.4
netpanzer/src/NetPanzer/Views/MainMenu/OrderingView.cpp:1.5
--- netpanzer/src/NetPanzer/Views/MainMenu/OrderingView.cpp:1.4 Sat Sep 6
07:04:15 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/OrderingView.cpp Sat Sep 6
11:39:25 2003
@@ -24,7 +24,7 @@
#include "GameViewGlobals.hpp"
-// static char screenSurfacePathTIL[] =
"pics\\backgrounds\\menus\\ordermb.til";
+// static char screenSurfacePathTIL[] = "pics/backgrounds/menus/ordermb.til";
// OrderingView
Index: netpanzer/src/NetPanzer/Views/MainMenu/SpecialButtonView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/SpecialButtonView.cpp:1.3
netpanzer/src/NetPanzer/Views/MainMenu/SpecialButtonView.cpp:1.4
--- netpanzer/src/NetPanzer/Views/MainMenu/SpecialButtonView.cpp:1.3 Fri Sep
5 22:01:20 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/SpecialButtonView.cpp Sat Sep
6 11:39:25 2003
@@ -43,7 +43,7 @@
prefix = "inMenus";
}
- sprintf(strBuf,
"pics\\backgrounds\\menus\\buttons\\default\\pak\\%s%s.pak", (const char *)
prefix, fileString);
+ sprintf(strBuf, "pics/backgrounds/menus/buttons/default/pak/%s%s.pak",
(const char *) prefix, fileString);
if (UtilInterface::getFileSize(strBuf) > 0)
{
@@ -58,7 +58,7 @@
Surface buttonSurface;
Surface tempSurface;
- sprintf(strBuf,
"pics\\backgrounds\\menus\\buttons\\default\\til\\%sbutover.til", (const char
*) prefix);
+ sprintf(strBuf,
"pics/backgrounds/menus/buttons/default/til/%sbutover.til", (const char *)
prefix);
// Create.
if (!tempSurface.loadTIL(strBuf))
@@ -77,7 +77,7 @@
buttonSurface.setFrame(2);
tempSurface.blt(buttonSurface);
- sprintf(strBuf,
"pics\\backgrounds\\menus\\buttons\\default\\til\\%sbuton.til", (const char *)
prefix);
+ sprintf(strBuf,
"pics/backgrounds/menus/buttons/default/til/%sbuton.til", (const char *)
prefix);
if (!tempSurface.loadTIL(strBuf))
{
@@ -92,7 +92,7 @@
tempSurface.blt(buttonSurface);
// Unhighlight.
- sprintf(strBuf,
"pics\\backgrounds\\menus\\buttons\\default\\til\\%sbutoff.til", (const char *)
prefix);
+ sprintf(strBuf,
"pics/backgrounds/menus/buttons/default/til/%sbutoff.til", (const char *)
prefix);
if (!tempSurface.loadTIL(strBuf))
{
@@ -121,7 +121,7 @@
PackedSurface tempPack;
tempPack.pack(buttonSurface);
- sprintf(strBuf,
"pics\\backgrounds\\menus\\buttons\\default\\pak\\%s%s.pak", (const char *)
prefix, fileString);
+ sprintf(strBuf,
"pics/backgrounds/menus/buttons/default/pak/%s%s.pak", (const char *) prefix,
fileString);
tempPack.save(strBuf);
addButtonPackedSurface(pos, tempPack, "", function);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [netPanzer-CVS] netpanzer/src ChangeLog Lib/2D/DigitText.cpp Li...,
Matthias Braun <=