[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[netPanzer-CVS] netpanzer ./ChangeLog src/Lib/2D/Surface.cpp sr...
|
From: |
Matthias Braun |
|
Subject: |
[netPanzer-CVS] netpanzer ./ChangeLog src/Lib/2D/Surface.cpp sr... |
|
Date: |
Sat, 25 Oct 2003 10:52:19 -0400 |
CVSROOT: /cvsroot/netpanzer
Module name: netpanzer
Branch:
Changes by: Matthias Braun <address@hidden> 03/10/25 10:52:17
Modified files:
. : ChangeLog
src/Lib/2D : Surface.cpp Surface.hpp
src/Lib/Particles: CloudParticle2D.cpp CloudParticle2D.hpp
FlashParticle2D.cpp FlashParticle2D.hpp
PuffParticle2D.cpp RadarPingParticle2D.cpp
src/Lib/View : View.cpp View.hpp cButton.cpp cButton.hpp
src/NetPanzer/Classes/Weapons: Weapon.cpp
src/NetPanzer/Interfaces: PlayerGameManager.cpp
src/NetPanzer/Views/Game: LobbyView.cpp ProgressView.cpp
VehicleSelectionView.cpp
src/NetPanzer/Views/MainMenu: HelpView.cpp MenuTemplateView.cpp
OptionsTemplateView.cpp
SpecialButtonView.cpp
src/NetPanzer/Views/MainMenu/Multi: GetSessionView.cpp
HostJoinTemplateView.cpp
HostView.cpp JoinView.cpp
src/NetPanzer/Views/MainMenu/Options: ControlsView.cpp
InterfaceView.cpp
SoundView.cpp
VisualsView.cpp
Added files:
pics/backgrounds/menus/menu: connectionMB.bmp defaultMB.bmp
hostjoinMB.bmp loadingMB.bmp
optionsMB.bmp sessionMB.bmp
pics/menus/vehicleSelectionView: archer.bmp bear.bmp bobcat.bmp
drake.bmp manta.bmp
panther1.bmp scout.bmp
stinger.bmp titan.bmp wolf.bmp
Removed files:
pics/backgrounds/menus/menu/til: connectionMB.til defaultMB.til
hostjoinMB.til loadingMB.til
optionsMB.til sessionMB.til
pics/menus/vehicleSelectionView/til: archer.til bear.til
bobcat.til drake.til
manta.til panther1.til
scout.til stinger.til
titan.til wolf.til
Log message:
removed support for .til files and converted them to .bmp
Patches:
Index: netpanzer/ChangeLog
diff -u netpanzer/ChangeLog:1.18 netpanzer/ChangeLog:1.19
--- netpanzer/ChangeLog:1.18 Thu Oct 23 15:26:14 2003
+++ netpanzer/ChangeLog Sat Oct 25 10:52:09 2003
@@ -1,3 +1,6 @@
+25-Oct-2003 by Matthias Braun
+-removed support for .til files and converted them to .bmp
+
23-Oct-2003 by Ivo Danihelka
-implemented respawntype="Random" parameter
Index: netpanzer/src/Lib/2D/Surface.cpp
diff -u netpanzer/src/Lib/2D/Surface.cpp:1.37
netpanzer/src/Lib/2D/Surface.cpp:1.38
--- netpanzer/src/Lib/2D/Surface.cpp:1.37 Mon Oct 13 10:30:09 2003
+++ netpanzer/src/Lib/2D/Surface.cpp Sat Oct 25 10:52:14 2003
@@ -1930,30 +1930,6 @@
return Palette::findNearestColor(RGBColor(avgR, avgG, avgB));
} // end Surface::getAverageColor
-// loadTIL
-//---------------------------------------------------------------------------
-void Surface::loadTIL(const char* filename)
-{
- std::auto_ptr<ReadFile> file(FileSystem::openRead(filename));
-
- FletchTileHeader fletchTileHeader;
- file->read(&fletchTileHeader, sizeof(FletchTileHeader), 1);
-
- if (frame0 == 0 || mem == 0 || pix.x != int(fletchTileHeader.xSize) ||
pix.y != int(fletchTileHeader.ySize)) {
- create(fletchTileHeader.xSize, fletchTileHeader.ySize,
fletchTileHeader.xSize, 1);
- }
-
- int numBytes = pix.x * pix.y * sizeof(uint8_t);
-
- if (numBytes <= 0) return;
- if (mem == 0) {
- throw Exception("ERROR: This should not happen.");
- }
-
- if(file->read(mem, numBytes, 1) != 1)
- throw Exception("Error reading .TIL '%s'", filename);
-} // end Surface::loadTIL
-
// setBrightness
void Surface::setBrightness(int percent)
{
@@ -2322,56 +2298,6 @@
} // end bltAdd
-// loadAllTILInDirectory
-//---------------------------------------------------------------------------
-int Surface::loadAllTILInDirectory(const char *path)
-{
- char** list = FileSystem::enumerateFiles(path);
-
- std::vector<std::string> filenames;
- Surface tempSurface;
- iXY maxSize(0, 0);
- for(char** file = list; *file != 0; file++) {
- std::string name = path;
- name += *file;
- if(name.find(".til") != std::string::npos) {
- filenames.push_back(name);
-
- // Get the max image size.
- tempSurface.loadTIL(name.c_str());
- if (maxSize.x < tempSurface.getPix().x) {
- maxSize.x = tempSurface.getPix().x;
- }
- if (maxSize.y < tempSurface.getPix().y) {
- maxSize.y = tempSurface.getPix().y;
- }
- }
- }
-
- FileSystem::freeList(list);
-
- std::sort(filenames.begin(), filenames.end());
-
- // Create the Surface to have the size of the largest image in the
- // diRectory. All other images will be centered based off the
- // largest size.
- create(maxSize, maxSize.x, filenames.size());
-
- // Now load in the sorted TIL names.
- for (size_t i = 0; i < filenames.size(); i++) {
- setFrame(i);
-
- tempSurface.loadTIL(filenames[i].c_str());
- iXY myOffset;
- myOffset = maxSize - tempSurface.getPix();
-
- fill(Color::black);
- tempSurface.blt(*this, myOffset);
- }
-
- return 1;
-} // end loadAllTILInDirectory
-
// loadAllBMPInDirectory
//---------------------------------------------------------------------------
int Surface::loadAllBMPInDirectory(const char *path)
@@ -2407,7 +2333,7 @@
// largest size.
create(maxSize, maxSize.x, filenames.size());
- // Now load in the sorted TIL names.
+ // Now load in the sorted BMP names.
for (size_t i = 0; i < filenames.size(); i++) {
setFrame(i);
Index: netpanzer/src/Lib/2D/Surface.hpp
diff -u netpanzer/src/Lib/2D/Surface.hpp:1.16
netpanzer/src/Lib/2D/Surface.hpp:1.17
--- netpanzer/src/Lib/2D/Surface.hpp:1.16 Mon Oct 13 10:30:10 2003
+++ netpanzer/src/Lib/2D/Surface.hpp Sat Oct 25 10:52:14 2003
@@ -28,41 +28,13 @@
class ColorTable;
class Palette;
+class ReadFile;
typedef uint8_t PIX;
// This must be called before any of the string blitting functions are used.
void initFont();
/////////////////////////////////////////////////////////////////////////////
-// structs
-/////////////////////////////////////////////////////////////////////////////
-
-#ifdef MSVC
-#pragma pack (1)
-#endif
-
-// A ".til" file.
-class FletchTileHeader
-{
-public:
- uint8_t minVer; // Version number
- uint8_t majVer; // Version number
- uint16_t headSize; // Size (in bytes) of header. Also offset of data
- uint32_t xSize; // Horizontal pixel count
- uint32_t ySize; // Vertical pixel count
- uint32_t frameCount; // Number of frames
- uint8_t avgR; // Average color in 24-bit format
- uint8_t avgG; // .
- uint8_t avgB; // .
- uint8_t avgIndex; // Closest palette entry to the average color
-}
-__attribute__((packed)); // end FletchTileHeader
-
-#ifdef MSVC
-#pragma pack ()
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
// class Surface
/////////////////////////////////////////////////////////////////////////////
@@ -456,8 +428,6 @@
PIX getAverageColor();
- virtual void loadTIL(const char* filename);
-
void scale(const iXY &pix);
inline void scale(int x, int y)
{
@@ -479,7 +449,6 @@
void bltLightDark(const Surface &source, const Surface &lightTable) const;
void setToBrightnessIndexes128();
void bltAdd(const Surface &dest, iXY min) const;
- int loadAllTILInDirectory(const char *path);
int loadAllBMPInDirectory(const char *path);
// Blit a single character of text.
Index: netpanzer/src/Lib/Particles/CloudParticle2D.cpp
diff -u netpanzer/src/Lib/Particles/CloudParticle2D.cpp:1.10
netpanzer/src/Lib/Particles/CloudParticle2D.cpp:1.11
--- netpanzer/src/Lib/Particles/CloudParticle2D.cpp:1.10 Sat Oct 4
10:44:36 2003
+++ netpanzer/src/Lib/Particles/CloudParticle2D.cpp Sat Oct 25 10:52:14 2003
@@ -83,24 +83,6 @@
} // end CloudParticle2D::setRandomSurface
//---------------------------------------------------------------------------
-void CloudParticle2D::loadTILFiles()
-{
- char path[] = "pics/particles/clouds/til/";
-
- Surface tempSurface;
- if (!tempSurface.loadAllTILInDirectory(path)) {
- throw Exception("ERROR: Unable to load any cloud images in %s", path);
- }
-
- tempSurface.shrinkWrap();
- tempSurface.setOffsetCenter();
-
- PackedSurface tempPackedSurface;
- tempPackedSurface.pack(tempSurface);
- tempPackedSurface.save("pics/particles/clouds/pak/clouds.pak");
-}
-
-//---------------------------------------------------------------------------
void CloudParticle2D::packFiles()
{}
@@ -115,9 +97,7 @@
//---------------------------------------------------------------------------
void CloudParticle2D::init()
{
- //loadTILFiles();
loadPAKFiles();
-
} // end CloudParticle2D::init
// sim
Index: netpanzer/src/Lib/Particles/CloudParticle2D.hpp
diff -u netpanzer/src/Lib/Particles/CloudParticle2D.hpp:1.2
netpanzer/src/Lib/Particles/CloudParticle2D.hpp:1.3
--- netpanzer/src/Lib/Particles/CloudParticle2D.hpp:1.2 Tue Sep 16 16:16:09 2003
+++ netpanzer/src/Lib/Particles/CloudParticle2D.hpp Sat Oct 25 10:52:15 2003
@@ -28,8 +28,6 @@
class CloudParticle2D : public WindParticle2D
{
private:
-
- static void loadTILFiles();
static void loadPAKFiles();
static void packFiles();
Index: netpanzer/src/Lib/Particles/FlashParticle2D.cpp
diff -u netpanzer/src/Lib/Particles/FlashParticle2D.cpp:1.10
netpanzer/src/Lib/Particles/FlashParticle2D.cpp:1.11
--- netpanzer/src/Lib/Particles/FlashParticle2D.cpp:1.10 Tue Sep 23
21:26:18 2003
+++ netpanzer/src/Lib/Particles/FlashParticle2D.cpp Sat Oct 25 10:52:15 2003
@@ -47,63 +47,8 @@
//---------------------------------------------------------------------------
void FlashParticle2D::init()
{
- //staticPackedFlash.shrinkWrap();
- //staticPackedFlash.setOffsetCenter();
-
- // The following lines packs the light image.
- if (UtilInterface::getFileSize("pics/particles/lights/pak/flash2.pak") >
0) {
- 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
-
-// packFiles
-//---------------------------------------------------------------------------
-void FlashParticle2D::packFiles()
-{
- Surface surface;
- Surface scaledSurface;
- Surface outputSurface;
-
- //surface.loadBMP("pics/particles/lights/bmp/flash.bmp");
-
- surface.loadTIL("pics/particles/lights/til/flash2.til");
-
- const float minFlashSize = 10.0f;
- const float maxFlashSize = 200.0f;
- const float flashCount = 20.0f;
-
- outputSurface.create(surface.getPixX(), surface.getPixY(),
surface.getPixX(), int(flashCount));
-
- int n = 0;
-
- for (int i = (int)minFlashSize; i < maxFlashSize - minFlashSize; i +=
int((maxFlashSize - minFlashSize) / flashCount)) {
- // Set the output frame.
- outputSurface.setFrame(n++);
- outputSurface.fill(0);
-
- // Copy and scale the surface.
- scaledSurface.copy(surface);
- int x = int(float(surface.getPixX()) * (float(i) / maxFlashSize));
- int y = int(float(surface.getPixY()) * (float(i) / maxFlashSize));
- scaledSurface.scale(x, y);
-
- iXY dest((surface.getPix() - scaledSurface.getPix()) / 2);
-
- // Blit the scaled surface onto the output surface.
- scaledSurface.blt(outputSurface, dest.x, dest.y);
- }
-
- PackedSurface packedSurface;
- packedSurface.pack(outputSurface);
- char strBuf[256];
- sprintf(strBuf, "pics/particles/lights/pak/flash2.pak");
- packedSurface.save(strBuf);
-
-} // end FlashParticle2D::packFiles
// draw
//---------------------------------------------------------------------------
Index: netpanzer/src/Lib/Particles/FlashParticle2D.hpp
diff -u netpanzer/src/Lib/Particles/FlashParticle2D.hpp:1.2
netpanzer/src/Lib/Particles/FlashParticle2D.hpp:1.3
--- netpanzer/src/Lib/Particles/FlashParticle2D.hpp:1.2 Tue Sep 16 16:16:09 2003
+++ netpanzer/src/Lib/Particles/FlashParticle2D.hpp Sat Oct 25 10:52:15 2003
@@ -48,9 +48,6 @@
virtual void draw(const Surface &dest, SpriteSorter &sorter);
virtual void sim();
- static void packFiles();
-
-}
-; // end FlashParticle2D
+}; // end FlashParticle2D
#endif // __FlashParticle2D_hpp__
Index: netpanzer/src/Lib/Particles/PuffParticle2D.cpp
diff -u netpanzer/src/Lib/Particles/PuffParticle2D.cpp:1.9
netpanzer/src/Lib/Particles/PuffParticle2D.cpp:1.10
--- netpanzer/src/Lib/Particles/PuffParticle2D.cpp:1.9 Sat Oct 4 10:44:36 2003
+++ netpanzer/src/Lib/Particles/PuffParticle2D.cpp Sat Oct 25 10:52:15 2003
@@ -32,13 +32,6 @@
cGrowList <PackedSurface> PuffParticle2D::staticPackedSmokeDarkPuff;
cGrowList <PackedSurface> PuffParticle2D::staticPackedDirtPuff;
-
-// 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/";
-
-
// PuffParticle2D
//---------------------------------------------------------------------------
PuffParticle2D::PuffParticle2D( const fXYZ &pos,
@@ -158,67 +151,6 @@
} // end PuffParticle2D::draw
-//---------------------------------------------------------------------------
-// not used
-#if 0
-static void pakFiles()
-{
- const int maxSize = 70;
- const int minSize = 4;
- const int increment = 4;
-
- int i;
-
- Surface tempSurface;
- PackedSurface tempPackedSurface;
-
- // Light Smoke.
- for (i = minSize; i <= maxSize; i += increment) {
- if (!tempSurface.loadAllTILInDirectory(pathSmokeLight)) {
- throw Exception("ERROR: Unable to load any smoke puff particle
images in %s", pathSmokeLight);
- }
-
- tempSurface.scale(i);
-
- tempPackedSurface.pack(tempSurface);
-
- char strBuf[256];
- sprintf(strBuf, "%ssmokeLightPuff%04d.pak", pathSmokeLight, i);
- tempPackedSurface.save(strBuf);
- }
-
- // Dark Smoke.
- for (i = minSize; i <= maxSize; i += increment) {
- if (!tempSurface.loadAllTILInDirectory(pathSmokeDark)) {
- throw Exception("ERROR: Unable to load any smoke puff particle
images in %s", pathSmokeDark);
- }
-
- tempSurface.scale(i);
-
- tempPackedSurface.pack(tempSurface);
-
- char strBuf[256];
- sprintf(strBuf, "%ssmokeDarkPuff%04d.pak", pathSmokeDark, i);
- tempPackedSurface.save(strBuf);
- }
-
- // Dirt.
- for (i = minSize; i <= maxSize; i += increment) {
- if (!tempSurface.loadAllTILInDirectory(pathDirt)) {
- throw Exception("ERROR: Unable to load any particle images in %s",
pathDirt);
- }
-
- tempSurface.scale(i);
-
- tempPackedSurface.pack(tempSurface);
-
- char strBuf[256];
- sprintf(strBuf, "%sdirtPuff%04d.pak", pathDirt, i);
- tempPackedSurface.save(strBuf);
- }
-}
-#endif
-
// init
//---------------------------------------------------------------------------
void PuffParticle2D::init()
@@ -256,43 +188,4 @@
//---------------------------------------------------------------------------
void PuffParticle2D::loadTILFiles()
{
- /*
- 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)))
- {
- throw Exception("ERROR: Unable to load any smoke puff particle
images in %s", pathSmokeLight);
- }
-
- // Following code is for reducing the size of the images.
- //smokeLightPuffSprite.shrinkWrap();
- //smokeLightPuffSprite.scale(100);
- //smokeLightPuffSprite.saveAllTIL("pics/particles/puff/smokeLight/");
-
- char pathSmokeDark[] = "pics/particles/puff/smokeDark/til/";
-
- if (!smokeDarkPuffSprite.loadAllPAKInDirectory(pathSmokeDark))
- {
- throw Exception("ERROR: Unable to load any smoke puff particle
images in %s", pathSmokeDark);
- }
-
- // Following code is for reducing the size of the images.
- //smokeDarkPuffSprite.shrinkWrap();
- //smokeDarkPuffSprite.scale(100);
- //smokeDarkPuffSprite.saveAllTIL("pics/particles/puff/smokeDark/");
-
- char pathDirt[] = "pics/particles/puff/dirt/til/";
-
- if (!dirtPuffSprite.loadAllPAKInDirectory(pathDirt))
- {
- throw Exception("ERROR: Unable to load any dirt puff particle
images in %s", pathDirt);
- }
-
- // Following code is for reducing the size of the images.
- //dirtPuffSprite.shrinkWrap();
- //dirtPuffSprite.scale(100);
- //dirtPuffSprite.saveAllTIL("pics/particles/puff/dirt/");}
- */
}
Index: netpanzer/src/Lib/Particles/RadarPingParticle2D.cpp
diff -u netpanzer/src/Lib/Particles/RadarPingParticle2D.cpp:1.6
netpanzer/src/Lib/Particles/RadarPingParticle2D.cpp:1.7
--- netpanzer/src/Lib/Particles/RadarPingParticle2D.cpp:1.6 Tue Sep 16
16:16:09 2003
+++ netpanzer/src/Lib/Particles/RadarPingParticle2D.cpp Sat Oct 25 10:52:15 2003
@@ -45,7 +45,6 @@
void RadarPingParticle2D::init()
{
radarPingSprite.create(iXY(48, 46), 48, 6);
- radarPingSprite.loadAllTILInDirectory("pics/particles/radarPing/");
radarPingSprite.setOffset(iXY(-radarPingSprite.getCenter().x,
-radarPingSprite.getPix().y));
Index: netpanzer/src/Lib/View/View.cpp
diff -u netpanzer/src/Lib/View/View.cpp:1.21
netpanzer/src/Lib/View/View.cpp:1.22
--- netpanzer/src/Lib/View/View.cpp:1.21 Mon Oct 20 18:34:10 2003
+++ netpanzer/src/Lib/View/View.cpp Sat Oct 25 10:52:15 2003
@@ -1129,7 +1129,7 @@
//---------------------------------------------------------------------------
// Purpose: Adds a button of a TIL image.
//---------------------------------------------------------------------------
-void View::addButtonTIL(const iXY &pos, const char *imageName, const char
*toolTip, ITEM_FUNC func, const bool &isBordered)
+void View::addButtonBMP(const iXY &pos, const char *imageName, const char
*toolTip, ITEM_FUNC func, const bool &isBordered)
{
// Add a new button to the button list.
buttons.setNum(buttons.getCount() + 1);
@@ -1137,13 +1137,13 @@
cButton &b = buttons[buttons.getCount() - 1];
if (isBordered) {
- b.createTILBordered(pos, imageName, toolTip, func);
+ b.createBMPBordered(pos, imageName, toolTip, func);
} else {
- b.createTIL(pos, imageName, toolTip, func);
+ b.createBMP(pos, imageName, toolTip, func);
}
-} // end addButtonTIL
+} // end addButtonBMP
// addButtonSurface
//---------------------------------------------------------------------------
Index: netpanzer/src/Lib/View/View.hpp
diff -u netpanzer/src/Lib/View/View.hpp:1.11
netpanzer/src/Lib/View/View.hpp:1.12
--- netpanzer/src/Lib/View/View.hpp:1.11 Mon Oct 13 10:30:14 2003
+++ netpanzer/src/Lib/View/View.hpp Sat Oct 25 10:52:15 2003
@@ -195,14 +195,14 @@
// cButton Functions.
void addButtonPackedSurface(const iXY &pos, PackedSurface &source, const
char *toolTip, ITEM_FUNC leftClickFunc);
void addButtonCenterText(const iXY &pos, const int &xSize, const char
*nName, const char *nToolTip, ITEM_FUNC nLeftClickFunc);
- void addButtonTIL(const iXY &pos, const char *imageName, const char
*toolTip, ITEM_FUNC func, const bool &isBordered);
- inline void addButtonTIL(const iXY &pos, const char *imageName, const char
*toolTip, ITEM_FUNC func)
+ void addButtonBMP(const iXY &pos, const char *imageName, const char
*toolTip, ITEM_FUNC func, const bool &isBordered);
+ inline void addButtonBMP(const iXY &pos, const char *imageName, const char
*toolTip, ITEM_FUNC func)
{
- addButtonTIL(pos, imageName, toolTip, func, false);
+ addButtonBMP(pos, imageName, toolTip, func, false);
}
- inline void addButtonTILBordered(const iXY &pos, const char *imageName,
const char *toolTip, ITEM_FUNC func)
+ inline void addButtonBMPBordered(const iXY &pos, const char *imageName,
const char *toolTip, ITEM_FUNC func)
{
- addButtonTIL(pos, imageName, toolTip, func, true);
+ addButtonBMP(pos, imageName, toolTip, func, true);
}
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);
Index: netpanzer/src/Lib/View/cButton.cpp
diff -u netpanzer/src/Lib/View/cButton.cpp:1.10
netpanzer/src/Lib/View/cButton.cpp:1.11
--- netpanzer/src/Lib/View/cButton.cpp:1.10 Mon Oct 20 18:34:10 2003
+++ netpanzer/src/Lib/View/cButton.cpp Sat Oct 25 10:52:15 2003
@@ -101,9 +101,9 @@
} // end createCenterText
-// createTIL
+// createBMP
//---------------------------------------------------------------------------
-void cButton::createTIL(iXY pos,
+void cButton::createBMP(iXY pos,
const char *imageName,
const char *nToolTip,
ITEM_FUNC nLeftClickFunc,
@@ -112,7 +112,7 @@
Surface tempTopSurface;
Surface tempSurface;
- tempSurface.loadTIL(imageName);
+ tempSurface.loadBMP(imageName);
tempTopSurface.create(tempSurface.getPix(), tempSurface.getPix().x, 3);
@@ -142,7 +142,7 @@
leftClickFunc = nLeftClickFunc;
topSurface.pack(tempTopSurface);
-} // end createTIL
+} // end createBMP
// createSurface
//---------------------------------------------------------------------------
Index: netpanzer/src/Lib/View/cButton.hpp
diff -u netpanzer/src/Lib/View/cButton.hpp:1.6
netpanzer/src/Lib/View/cButton.hpp:1.7
--- netpanzer/src/Lib/View/cButton.hpp:1.6 Tue Sep 23 19:43:18 2003
+++ netpanzer/src/Lib/View/cButton.hpp Sat Oct 25 10:52:15 2003
@@ -69,14 +69,14 @@
void createCenterText(iXY pos, int xSize, const char *nName, const char
*nToolTip, ITEM_FUNC nLeftClickFunc);
- void createTIL(iXY pos, const char *imageName, const char *nToolTip,
ITEM_FUNC nLeftClickFunc, bool isBordered);
- inline void createTIL(iXY pos, const char *imageName, const char
*nToolTip, ITEM_FUNC nLeftClickFunc)
+ void createBMP(iXY pos, const char *imageName, const char *nToolTip,
ITEM_FUNC nLeftClickFunc, bool isBordered);
+ inline void createBMP(iXY pos, const char *imageName, const char
*nToolTip, ITEM_FUNC nLeftClickFunc)
{
- createTIL(pos, imageName, nToolTip, nLeftClickFunc, false);
+ createBMP(pos, imageName, nToolTip, nLeftClickFunc, false);
}
- inline void createTILBordered(iXY pos, const char *imageName, const char
*nToolTip, ITEM_FUNC nLeftClickFunc)
+ inline void createBMPBordered(iXY pos, const char *imageName, const char
*nToolTip, ITEM_FUNC nLeftClickFunc)
{
- createTIL(pos, imageName, nToolTip, nLeftClickFunc, true);
+ createBMP(pos, imageName, nToolTip, nLeftClickFunc, true);
}
void createSurface(iXY pos, Surface &source, const char *nToolTip,
ITEM_FUNC nLeftClickFunc, bool isBordered);
Index: netpanzer/src/NetPanzer/Classes/Weapons/Weapon.cpp
diff -u netpanzer/src/NetPanzer/Classes/Weapons/Weapon.cpp:1.14
netpanzer/src/NetPanzer/Classes/Weapons/Weapon.cpp:1.15
--- netpanzer/src/NetPanzer/Classes/Weapons/Weapon.cpp:1.14 Sun Oct 5
09:50:13 2003
+++ netpanzer/src/NetPanzer/Classes/Weapons/Weapon.cpp Sat Oct 25 10:52:15 2003
@@ -48,25 +48,8 @@
Surface temp;
PackedSurface pack;
- if
(UtilInterface::getFileSize("pics/particles/lights/pak/missleThrust.pak") > 0) {
-
gMissleThrustPackedSurface.load("pics/particles/lights/pak/missleThrust.pak");
- } else {
- // Missle thrust lighting.
- temp.loadTIL("pics/particles/lights/til/missleThrust.til");
- temp.setOffsetCenter();
- pack.pack(temp);
- pack.save("pics/particles/lights/pak/missleThrust.pak");
- }
-
- if
(UtilInterface::getFileSize("pics/particles/lights/pak/missleGroundLight.pak")
> 0) {
-
gMissleGroundLightPackedSurface.load("pics/particles/lights/pak/missleGroundLight.pak");
- } else {
- // Missle ground lighting.
- temp.loadTIL("pics/particles/lights/til/missleGroundLight.til");
- temp.setOffsetCenter();
- pack.pack(temp);
- pack.save("pics/particles/lights/pak/missleGroundLight.pak");
- }
+
gMissleThrustPackedSurface.load("pics/particles/lights/pak/missleThrust.pak");
+
gMissleGroundLightPackedSurface.load("pics/particles/lights/pak/missleGroundLight.pak");
}
void Weapon::packFiles()
Index: netpanzer/src/NetPanzer/Interfaces/PlayerGameManager.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/PlayerGameManager.cpp:1.3
netpanzer/src/NetPanzer/Interfaces/PlayerGameManager.cpp:1.4
--- netpanzer/src/NetPanzer/Interfaces/PlayerGameManager.cpp:1.3 Wed Oct
22 19:05:40 2003
+++ netpanzer/src/NetPanzer/Interfaces/PlayerGameManager.cpp Sat Oct 25
10:52:16 2003
@@ -268,8 +268,9 @@
progressView->scrollAndUpdateDirect( "Launching Server ..." );
try {
SERVER->hostSession();
- } catch(Exception e) {
+ } catch(std::exception& e) {
progressView->scrollAndUpdateDirect( "SERVER LAUNCH FAILED" );
+ progressView->scrollAndUpdateDirect(e.what());
wait.changePeriod( 4 );
while( !wait.count() );
Index: netpanzer/src/NetPanzer/Views/Game/LobbyView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/LobbyView.cpp:1.15
netpanzer/src/NetPanzer/Views/Game/LobbyView.cpp:1.16
--- netpanzer/src/NetPanzer/Views/Game/LobbyView.cpp:1.15 Wed Oct 22
09:19:31 2003
+++ netpanzer/src/NetPanzer/Views/Game/LobbyView.cpp Sat Oct 25 10:52:16 2003
@@ -183,7 +183,6 @@
//---------------------------------------------------------------------------
void LobbyView::loadBackgroundSurface()
{
- String string = "pics/backgrounds/menus/menu/til/loadingMB.til";
-
- backgroundSurface.loadTIL(string);
+ backgroundSurface.loadBMP("pics/backgrounds/menus/menu/loadingMB.bmp");
} // end MenuTemplateView::loadBackgroundSurface
+
Index: netpanzer/src/NetPanzer/Views/Game/ProgressView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/ProgressView.cpp:1.17
netpanzer/src/NetPanzer/Views/Game/ProgressView.cpp:1.18
--- netpanzer/src/NetPanzer/Views/Game/ProgressView.cpp:1.17 Wed Oct 22
09:19:31 2003
+++ netpanzer/src/NetPanzer/Views/Game/ProgressView.cpp Sat Oct 25 10:52:16 2003
@@ -180,5 +180,6 @@
//---------------------------------------------------------------------------
void ProgressView::loadBackgroundSurface()
{
- backgroundSurface.loadTIL("pics/backgrounds/menus/menu/til/loadingMB.til");
+ backgroundSurface.loadBMP("pics/backgrounds/menus/menu/loadingMB.bmp");
} // end MenuTemplateView::loadBackgroundSurface
+
Index: netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.cpp:1.20
netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.cpp:1.21
--- netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.cpp:1.20 Mon Oct
13 10:30:19 2003
+++ netpanzer/src/NetPanzer/Views/Game/VehicleSelectionView.cpp Sat Oct 25
10:52:16 2003
@@ -320,35 +320,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);
+ addButtonBMPBordered(pos, "pics/menus/vehicleSelectionView/scout.bmp",
strBuf, bSelectScout);
abstractButtonHumvee.setBounds(iRect(pos, pos + iXY(48,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);
+ addButtonBMPBordered(pos, "pics/menus/vehicleSelectionView/manta.bmp",
strBuf, bSelectManta);
abstractButtonValentine.setBounds(iRect(pos, pos + iXY(48,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);
+ addButtonBMPBordered(pos, "pics/menus/vehicleSelectionView/panther1.bmp",
strBuf, bSelectPanther1);
abstractButtonLeopard.setBounds(iRect(pos, pos + iXY(48,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);
+ addButtonBMPBordered(pos, "pics/menus/vehicleSelectionView/titan.bmp",
strBuf, bSelectTitan);
abstractButtonAbrams.setBounds(iRect(pos, pos + iXY(48,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);
+ addButtonBMPBordered(pos, "pics/menus/vehicleSelectionView/stinger.bmp",
strBuf, bSelectStinger);
abstractButtonHammerhead.setBounds(iRect(pos, pos + iXY(48,48)));
add(&abstractButtonHammerhead);
@@ -356,35 +356,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);
+ addButtonBMPBordered(pos, "pics/menus/vehicleSelectionView/bobcat.bmp",
strBuf, bSelectBobcat);
abstractButtonLynx.setBounds(iRect(pos, pos + iXY(48,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);
+ addButtonBMPBordered(pos, "pics/menus/vehicleSelectionView/wolf.bmp",
strBuf, bSelectWolf);
abstractButtonScorpion.setBounds(iRect(pos, pos + iXY(48, 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);
+ addButtonBMPBordered(pos, "pics/menus/vehicleSelectionView/bear.bmp",
strBuf, bSelectBear);
abstractButtonSpahpanzer.setBounds(iRect(pos, pos + iXY(48, 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);
+ addButtonBMPBordered(pos, "pics/menus/vehicleSelectionView/drake.bmp",
strBuf, bSelectDrake);
abstractButtonM109.setBounds(iRect(pos, pos + iXY(48, 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);
+ addButtonBMPBordered(pos, "pics/menus/vehicleSelectionView/archer.bmp",
strBuf, bSelectArcher);
abstractButtonArcher.setBounds(iRect(pos, pos + iXY(48, 48)));
add(&abstractButtonArcher);
@@ -409,34 +409,34 @@
Surface tempSurface;
int i = 0;
- tempSurface.loadTIL("pics/menus/vehicleSelectionView/til/manta.til");
+ tempSurface.loadBMP("pics/menus/vehicleSelectionView/manta.bmp");
unitImages.setFrame(i++);
tempSurface.blt(unitImages);
- tempSurface.loadTIL("pics/menus/vehicleSelectionView/til/panther1.til");
+ tempSurface.loadBMP("pics/menus/vehicleSelectionView/panther1.bmp");
unitImages.setFrame(i++);
tempSurface.blt(unitImages);
- tempSurface.loadTIL("pics/menus/vehicleSelectionView/til/titan.til");
+ tempSurface.loadBMP("pics/menus/vehicleSelectionView/titan.bmp");
unitImages.setFrame(i++);
tempSurface.blt(unitImages);
- tempSurface.loadTIL("pics/menus/vehicleSelectionView/til/stinger.til");
+ tempSurface.loadBMP("pics/menus/vehicleSelectionView/stinger.bmp");
unitImages.setFrame(i++);
tempSurface.blt(unitImages);
- tempSurface.loadTIL("pics/menus/vehicleSelectionView/til/bobcat.til");
+ tempSurface.loadBMP("pics/menus/vehicleSelectionView/bobcat.bmp");
unitImages.setFrame(i++);
tempSurface.blt(unitImages);
- tempSurface.loadTIL("pics/menus/vehicleSelectionView/til/bear.til");
+ tempSurface.loadBMP("pics/menus/vehicleSelectionView/bear.bmp");
unitImages.setFrame(i++);
tempSurface.blt(unitImages);
- tempSurface.loadTIL("pics/menus/vehicleSelectionView/til/archer.til");
+ tempSurface.loadBMP("pics/menus/vehicleSelectionView/archer.bmp");
unitImages.setFrame(i++);
tempSurface.blt(unitImages);
- tempSurface.loadTIL("pics/menus/vehicleSelectionView/til/wolf.til");
+ tempSurface.loadBMP("pics/menus/vehicleSelectionView/wolf.bmp");
unitImages.setFrame(i++);
tempSurface.blt(unitImages);
- tempSurface.loadTIL("pics/menus/vehicleSelectionView/til/drake.til");
+ tempSurface.loadBMP("pics/menus/vehicleSelectionView/drake.bmp");
unitImages.setFrame(i++);
tempSurface.blt(unitImages);
- tempSurface.loadTIL("pics/menus/vehicleSelectionView/til/scout.til");
+ tempSurface.loadBMP("pics/menus/vehicleSelectionView/scout.bmp");
unitImages.setFrame(i++);
tempSurface.blt(unitImages);
unitImages.setFrame(i++);
Index: netpanzer/src/NetPanzer/Views/MainMenu/HelpView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/HelpView.cpp:1.8
netpanzer/src/NetPanzer/Views/MainMenu/HelpView.cpp:1.9
--- netpanzer/src/NetPanzer/Views/MainMenu/HelpView.cpp:1.8 Mon Oct 13
10:30:20 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/HelpView.cpp Sat Oct 25 10:52:16 2003
@@ -57,5 +57,5 @@
//---------------------------------------------------------------------------
void HelpView::loadTitleSurface()
{
- doLoadTitleSurface("pics/backgrounds/menus/menu/til/helpTitle.til");
+ doLoadTitleSurface("pics/backgrounds/menus/menu/helpTitle.bmp");
} // end HelpView::loadTitleSurface
Index: netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp:1.20
netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp:1.21
--- netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp:1.20 Wed Oct
15 17:16:33 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp Sat Oct 25
10:52:16 2003
@@ -258,21 +258,21 @@
//---------------------------------------------------------------------------
void MenuTemplateView::loadBackgroundSurface()
{
- doLoadBackgroundSurface("pics/backgrounds/menus/menu/til/defaultMB.til");
+ doLoadBackgroundSurface("pics/backgrounds/menus/menu/defaultMB.bmp");
} // end MenuTemplateView::loadBackgroundSurface
// doLoadBackgroundSurface
//---------------------------------------------------------------------------
void MenuTemplateView::doLoadBackgroundSurface(String string)
{
- backgroundSurface.loadTIL(string);
+ backgroundSurface.loadBMP(string);
} // end MenuTemplateView::doLoadBackgroundSurface
// loadTitleSurface
//---------------------------------------------------------------------------
void MenuTemplateView::loadTitleSurface()
{
- doLoadTitleSurface("pics/backgrounds/menus/menu/til/mainTitle.til");
+ doLoadTitleSurface("pics/backgrounds/menus/menu/mainTitle.bmp");
} // end MenuTemplateView::loadTitleSurface
// doLoadBackgroundSurface
@@ -294,7 +294,7 @@
Surface titleSurface;
try {
- titleSurface.loadTIL(string);
+ titleSurface.loadBMP(string);
} catch(Exception&) {
titleSurface.create(300, 50, 300, 1);
titleSurface.fill(128);
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionView.cpp:1.14
netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionView.cpp:1.15
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionView.cpp:1.14
Mon Oct 13 10:30:22 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionView.cpp Sat Oct
25 10:52:17 2003
@@ -194,25 +194,6 @@
addSpecialButton( backPos,
"Back",
bBack);
-
- // Surface tempSurface;
- //
- //
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/");
- // 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/");
- // assert(tempSurface.getFrameCount() == 3);
- // addButtonSurface(iXY(505, 440), tempSurface, "Move back menu.",
bBack);
- //
- // gameconfig->SetHostOrJoin(_game_session_host);
-
} // end GetSessionView::GetSessionView
// doDraw
@@ -312,7 +293,7 @@
//---------------------------------------------------------------------------
void GetSessionView::loadBackgroundSurface()
{
- doLoadBackgroundSurface(("pics/backgrounds/menus/menu/til/sessionMB.til"));
+ doLoadBackgroundSurface("pics/backgrounds/menus/menu/sessionMB.bmp");
} // end GetSessionView::loadBackgroundSurface
@@ -321,9 +302,9 @@
void GetSessionView::loadTitleSurface()
{
if (gameconfig->hostorjoin == _game_session_host) {
- doLoadTitleSurface("pics/backgrounds/menus/menu/til/hostTitle.til");
+ doLoadTitleSurface("pics/backgrounds/menus/menu/hostTitle.bmp");
} else if (gameconfig->hostorjoin == _game_session_join) {
- doLoadTitleSurface("pics/backgrounds/menus/menu/til/joinTitle.til");
+ doLoadTitleSurface("pics/backgrounds/menus/menu/joinTitle.bmp");
}
} // end GetSessionView::loadTitleSurface
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp
diff -u
netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp:1.18
netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp:1.19
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp:1.18
Thu Oct 23 20:22:26 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp
Sat Oct 25 10:52:17 2003
@@ -301,7 +301,7 @@
// Add the vehicle buttons.
// Get the dimensions of the buttons to draw.
Surface tempSurface;
- tempSurface.loadTIL("pics/vehicleSelectionMenu/light.til");
+ tempSurface.loadTIL("pics/vehicleSelectionMenu/light.bmp");
iXY buttonSize(tempSurface.getPix());
int arrowButtonWidth = 16;
@@ -313,19 +313,19 @@
y = pos.y;
- addButtonTILBordered(iXY(x, y), "pics/vehicleSelectionMenu/humvee.til",
"", 0);
+ addButtonTILBordered(iXY(x, y), "pics/vehicleSelectionMenu/humvee.bmp",
"", 0);
x += buttonSize.x + 1;
- addButtonTILBordered(iXY(x, y), "pics/vehicleSelectionMenu/light.til", "",
0);
+ addButtonTILBordered(iXY(x, y), "pics/vehicleSelectionMenu/light.bmp", "",
0);
x += buttonSize.x + 1;
- addButtonTILBordered(iXY(x, y), "pics/vehicleSelectionMenu/medium.til",
"", 0);
+ addButtonTILBordered(iXY(x, y), "pics/vehicleSelectionMenu/medium.bmp",
"", 0);
x += buttonSize.x + 1;
- addButtonTILBordered(iXY(x, y), "pics/vehicleSelectionMenu/heavy.til", "",
0);
+ addButtonTILBordered(iXY(x, y), "pics/vehicleSelectionMenu/heavy.bmp", "",
0);
x += buttonSize.x + 1;
- addButtonTILBordered(iXY(x, y), "pics/vehicleSelectionMenu/missle.til",
"", 0);
+ addButtonTILBordered(iXY(x, y), "pics/vehicleSelectionMenu/missle.bmp",
"", 0);
x += buttonSize.x + 1;
// Draw the arrows to change the numbers.
@@ -501,6 +501,5 @@
//---------------------------------------------------------------------------
void HostJoinTemplateView::loadBackgroundSurface()
{
- doLoadBackgroundSurface("pics/backgrounds/menus/menu/til/hostjoinMB.til");
-
+ doLoadBackgroundSurface("pics/backgrounds/menus/menu/hostjoinMB.bmp");
} // end HostJoinTemplateView::loadBackgroundSurface
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostView.cpp:1.9
netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostView.cpp:1.10
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostView.cpp:1.9 Mon Oct
13 10:30:22 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostView.cpp Sat Oct 25
10:52:17 2003
@@ -127,6 +127,6 @@
//---------------------------------------------------------------------------
void HostView::loadTitleSurface()
{
- doLoadTitleSurface("pics/backgrounds/menus/menu/til/hostTitle.til");
+ doLoadTitleSurface("pics/backgrounds/menus/menu/hostTitle.bmp");
} // end HostView::loadTitleSurface
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/JoinView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/JoinView.cpp:1.9
netpanzer/src/NetPanzer/Views/MainMenu/Multi/JoinView.cpp:1.10
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/JoinView.cpp:1.9 Mon Oct
13 10:30:23 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/JoinView.cpp Sat Oct 25
10:52:17 2003
@@ -57,6 +57,6 @@
//---------------------------------------------------------------------------
void JoinView::loadTitleSurface()
{
- doLoadTitleSurface("pics/backgrounds/menus/menu/til/joinTitle.til");
+ doLoadTitleSurface("pics/backgrounds/menus/menu/joinTitle.bmp");
} // end JoinView::loadTitleSurface
Index: netpanzer/src/NetPanzer/Views/MainMenu/Options/ControlsView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Options/ControlsView.cpp:1.9
netpanzer/src/NetPanzer/Views/MainMenu/Options/ControlsView.cpp:1.10
--- netpanzer/src/NetPanzer/Views/MainMenu/Options/ControlsView.cpp:1.9 Mon Oct
13 10:30:23 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Options/ControlsView.cpp Sat Oct
25 10:52:17 2003
@@ -100,6 +100,6 @@
//---------------------------------------------------------------------------
void ControlsView::loadTitleSurface()
{
- doLoadTitleSurface("pics/backgrounds/menus/menu/til/controlsTitle.til");
+ doLoadTitleSurface("pics/backgrounds/menus/menu/controlsTitle.bmp");
} // end ControlsView::loadTitleSurface
Index: netpanzer/src/NetPanzer/Views/MainMenu/Options/InterfaceView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Options/InterfaceView.cpp:1.8
netpanzer/src/NetPanzer/Views/MainMenu/Options/InterfaceView.cpp:1.9
--- netpanzer/src/NetPanzer/Views/MainMenu/Options/InterfaceView.cpp:1.8
Mon Oct 13 10:30:24 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Options/InterfaceView.cpp Sat Oct
25 10:52:17 2003
@@ -106,5 +106,5 @@
//---------------------------------------------------------------------------
void InterfaceView::loadTitleSurface()
{
- doLoadTitleSurface("pics/backgrounds/menus/menu/til/interfaceTitle.til");
+ doLoadTitleSurface("pics/backgrounds/menus/menu/interfaceTitle.bmp");
} // end InterfaceView::loadTitleSurface
Index: netpanzer/src/NetPanzer/Views/MainMenu/Options/SoundView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Options/SoundView.cpp:1.7
netpanzer/src/NetPanzer/Views/MainMenu/Options/SoundView.cpp:1.8
--- netpanzer/src/NetPanzer/Views/MainMenu/Options/SoundView.cpp:1.7 Mon Oct
13 10:30:24 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Options/SoundView.cpp Sat Oct
25 10:52:17 2003
@@ -128,6 +128,6 @@
//---------------------------------------------------------------------------
void SoundView::loadTitleSurface()
{
- doLoadTitleSurface("pics/backgrounds/menus/menu/til/soundTitle.til");
+ doLoadTitleSurface("pics/backgrounds/menus/menu/soundTitle.bmp");
} // end SoundView::loadTitleSurface
Index: netpanzer/src/NetPanzer/Views/MainMenu/Options/VisualsView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Options/VisualsView.cpp:1.12
netpanzer/src/NetPanzer/Views/MainMenu/Options/VisualsView.cpp:1.13
--- netpanzer/src/NetPanzer/Views/MainMenu/Options/VisualsView.cpp:1.12 Mon Oct
13 10:30:24 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Options/VisualsView.cpp Sat Oct
25 10:52:17 2003
@@ -137,7 +137,7 @@
//---------------------------------------------------------------------------
void VisualsView::loadTitleSurface()
{
- doLoadTitleSurface("pics/backgrounds/menus/menu/til/visualsTitle.til");
+ doLoadTitleSurface("pics/backgrounds/menus/menu/visualsTitle.bmp");
} // end VisualsView::loadTitleSurface
// actionPerformed
Index: netpanzer/src/NetPanzer/Views/MainMenu/OptionsTemplateView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/OptionsTemplateView.cpp:1.10
netpanzer/src/NetPanzer/Views/MainMenu/OptionsTemplateView.cpp:1.11
--- netpanzer/src/NetPanzer/Views/MainMenu/OptionsTemplateView.cpp:1.10 Mon Oct
13 10:30:21 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/OptionsTemplateView.cpp Sat Oct
25 10:52:16 2003
@@ -113,7 +113,7 @@
//---------------------------------------------------------------------------
void OptionsTemplateView::loadBackgroundSurface()
{
- doLoadBackgroundSurface(("pics/backgrounds/menus/menu/til/optionsMB.til"));
+ doLoadBackgroundSurface(("pics/backgrounds/menus/menu/optionsMB.bmp"));
} // end OptionsTemplateView::loadBackgroundSurface
@@ -121,6 +121,6 @@
//---------------------------------------------------------------------------
void OptionsTemplateView::loadTitleSurface()
{
- doLoadTitleSurface("pics/backgrounds/menus/menu/til/optionsTitle.til");
+ doLoadTitleSurface("pics/backgrounds/menus/menu/optionsTitle.bmp");
} // end ControlsView::loadTitleSurface
Index: netpanzer/src/NetPanzer/Views/MainMenu/SpecialButtonView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/SpecialButtonView.cpp:1.8
netpanzer/src/NetPanzer/Views/MainMenu/SpecialButtonView.cpp:1.9
--- netpanzer/src/NetPanzer/Views/MainMenu/SpecialButtonView.cpp:1.8 Fri Oct
3 10:45:17 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/SpecialButtonView.cpp Sat Oct
25 10:52:17 2003
@@ -53,10 +53,10 @@
Surface buttonSurface;
Surface tempSurface;
- sprintf(strBuf,
"pics/backgrounds/menus/buttons/default/til/%sbutover.til", (const char *)
prefix);
+ sprintf(strBuf,
"pics/backgrounds/menus/buttons/default/%sbutover.bmp", (const char *) prefix);
// Create.
- tempSurface.loadTIL(strBuf);
+ tempSurface.loadBMP(strBuf);
//-------------------
//tempSurface.fill(0);
@@ -69,9 +69,9 @@
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/%sbuton.bmp",
(const char *) prefix);
- tempSurface.loadTIL(strBuf);
+ tempSurface.loadBMP(strBuf);
//-------------------
//tempSurface.fill(0);
@@ -81,9 +81,9 @@
tempSurface.blt(buttonSurface);
// Unhighlight.
- sprintf(strBuf,
"pics/backgrounds/menus/buttons/default/til/%sbutoff.til", (const char *)
prefix);
+ sprintf(strBuf, "pics/backgrounds/menus/buttons/default/%sbutoff.bmp",
(const char *) prefix);
- tempSurface.loadTIL(strBuf);
+ tempSurface.loadBMP(strBuf);
//-------------------
//tempSurface.fill(0);