[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[netPanzer-CVS] netpanzer/src ChangeLog config.h Lib/codewiz.hp...
|
From: |
Matthias Braun |
|
Subject: |
[netPanzer-CVS] netpanzer/src ChangeLog config.h Lib/codewiz.hp... |
|
Date: |
Sat, 06 Sep 2003 11:18:20 -0400 |
CVSROOT: /cvsroot/netpanzer
Module name: netpanzer
Branch:
Changes by: Matthias Braun <address@hidden> 03/09/06 11:18:20
Modified files:
src : ChangeLog config.h
src/Lib : codewiz.hpp terminate.cpp
src/Lib/2D : ColorTable.cpp ColorTable.hpp Surface.cpp
src/Lib/PObject/Classes: BoundBox.hpp
src/Lib/Particles: FireParticle2D.cpp FireParticleSystem2D.cpp
GroundExplosionParticle2D.cpp
GroundExplosionParticleSystem2D.cpp
SnowParticle2D.cpp SnowParticleSystem2D.cpp
src/Lib/View : Desktop.cpp View.cpp cButton.hpp
src/NetPanzer/Classes: UnitState.hpp
src/NetPanzer/Classes/Network: NetPacketQueues.cpp
NetworkClient.cpp
NetworkInterface.cpp
NetworkServer.cpp
src/NetPanzer/Classes/Units: UnitGlobals.cpp Vehicle.cpp
src/NetPanzer/Core/unix: main.cpp
src/NetPanzer/Interfaces: GameManager.cpp MapsManager.cpp
UnitProfileInterface.cpp
src/NetPanzer/Views/Game: ControlPaletteView.cpp
GameInfoView.cpp
src/NetPanzer/Views/MainMenu/Multi: UnitColorView.cpp
Added files:
src/Lib : Log.cpp Log.hpp
Removed files:
src/Lib : log.cpp
Log message:
-randomly replaced some \\ in pathnames with /
-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
Patches:
Index: netpanzer/src/ChangeLog
diff -u netpanzer/src/ChangeLog:1.2 netpanzer/src/ChangeLog:1.3
--- netpanzer/src/ChangeLog:1.2 Sat Sep 6 09:12:39 2003
+++ netpanzer/src/ChangeLog Sat Sep 6 11:18:18 2003
@@ -4,6 +4,10 @@
is hard :)
-we still need a big commit to replace all \\ in paths with /
-added a fastly hacked configure script (no autoconf yet)
+-randomly replaced some \\ in pathnames with /
+-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
------------
prior changes (not complete)
Index: netpanzer/src/Lib/2D/ColorTable.cpp
diff -u netpanzer/src/Lib/2D/ColorTable.cpp:1.3
netpanzer/src/Lib/2D/ColorTable.cpp:1.4
--- netpanzer/src/Lib/2D/ColorTable.cpp:1.3 Fri Sep 5 22:01:18 2003
+++ netpanzer/src/Lib/2D/ColorTable.cpp Sat Sep 6 11:18:18 2003
@@ -19,6 +19,7 @@
#include <config.h>
#include <io.h>
#endif
+#include "Exception.hpp"
#include "ColorTable.hpp"
#include "Palette.hpp"
#include "UtilInterface.hpp"
@@ -281,6 +282,7 @@
char tableFilename[256];
//void _splitpath( const char *path, char *drive, char *dir, char
*fname, char *ext );
+ // XXX
#ifdef WIN32
_splitpath(Palette::getName(), 0, 0, paletteFilename, 0);
_splitpath(filename, 0, tablePath, 0, 0);
@@ -289,6 +291,8 @@
// This is dangerous, so make sure the filename can handle the length
of the possible
// sprintf.
sprintf(destname, "%s%s%s%s", tablePath, tableFilename,
paletteFilename, extension);
+#else
+ strcpy(destname, filename);
#endif
return;
@@ -348,30 +352,29 @@
//---------------------------------------------------------------------------
void ColorTable::saveTableError(const char *filename) const
{
- if (!saveTable(filename))
- {
- FUBAR("ERROR: Unable to save %s", filename);
+ try {
+ saveTable(filename);
+ } catch(Exception e) {
+ printf("Exception while saving colortable: '%s'.\n",
e.getMessage());
+ FUBAR("Couldn't save color table '%s'.", filename);
}
-
} // end ColorTable::saveTableError
// saveTable
//---------------------------------------------------------------------------
-bool ColorTable::saveTable(const char *filename) const
+void ColorTable::saveTable(const char *filename) const
{
char strBuf[768];
getDiskName(strBuf, filename);
FILE *fp = fopen(strBuf, "wb");
- if (fp == 0) { return false; }
+ if (fp == 0)
+ throw Exception("couldn't save colortable to '%s'.", filename);
saveTable(fp);
fclose(fp);
-
- return true;
-
} // end ColorTable::saveTable
// saveTable
Index: netpanzer/src/Lib/2D/ColorTable.hpp
diff -u netpanzer/src/Lib/2D/ColorTable.hpp:1.2
netpanzer/src/Lib/2D/ColorTable.hpp:1.3
--- netpanzer/src/Lib/2D/ColorTable.hpp:1.2 Mon Sep 1 16:24:18 2003
+++ netpanzer/src/Lib/2D/ColorTable.hpp Sat Sep 6 11:18:18 2003
@@ -68,7 +68,7 @@
void loadTable(FILE *fp);
void saveTableError(const char *filename) const;
- bool saveTable(const char *filename) const;
+ void saveTable(const char *filename) const;
void saveTable(FILE *fp) const;
bool isValid(const char *filename) const;
Index: netpanzer/src/Lib/2D/Surface.cpp
diff -u netpanzer/src/Lib/2D/Surface.cpp:1.6
netpanzer/src/Lib/2D/Surface.cpp:1.7
--- netpanzer/src/Lib/2D/Surface.cpp:1.6 Sat Sep 6 09:12:39 2003
+++ netpanzer/src/Lib/2D/Surface.cpp Sat Sep 6 11:18:18 2003
@@ -1331,7 +1331,7 @@
{
Surface tempSurface(pix.x, pix.y, stride, 1);
- float angleRadians = -float(angle) / float(DEG_PER_RAD);
+ float angleRadians = -float(angle) / float(180.0 /
M_PI);
float cosAngle = cos(angleRadians);
float sinAngle = sin(angleRadians);
Index: netpanzer/src/Lib/PObject/Classes/BoundBox.hpp
diff -u netpanzer/src/Lib/PObject/Classes/BoundBox.hpp:1.2
netpanzer/src/Lib/PObject/Classes/BoundBox.hpp:1.3
--- netpanzer/src/Lib/PObject/Classes/BoundBox.hpp:1.2 Mon Sep 1 16:24:18 2003
+++ netpanzer/src/Lib/PObject/Classes/BoundBox.hpp Sat Sep 6 11:18:18 2003
@@ -18,6 +18,7 @@
#ifndef _BOUNDBOX_HPP
#define _BOUNDBOX_HPP
+#include <assert.h>
#include "Point.hpp"
class BoundBox : public Recti
Index: netpanzer/src/Lib/Particles/FireParticle2D.cpp
diff -u netpanzer/src/Lib/Particles/FireParticle2D.cpp:1.3
netpanzer/src/Lib/Particles/FireParticle2D.cpp:1.4
--- netpanzer/src/Lib/Particles/FireParticle2D.cpp:1.3 Fri Sep 5 22:01:18 2003
+++ netpanzer/src/Lib/Particles/FireParticle2D.cpp Sat Sep 6 11:18:18 2003
@@ -34,8 +34,6 @@
//---------------------------------------------------------------------------
void FireParticle2D::sim()
{
- FUNC("FireParticle2D::sim");
-
//cWindParticle2D::sim();
totalTime += TimerInterface::getTimeSlice();
@@ -54,8 +52,6 @@
//---------------------------------------------------------------------------
void FireParticle2D::draw(const Surface &dest, SpriteSorter &sorter)
{
- FUNC("FireParticle2D::draw");
-
//if (!isAlive) return;
dest.fillRect(100, 100, 110, 110, Color::red);
Index: netpanzer/src/Lib/Particles/FireParticleSystem2D.cpp
diff -u netpanzer/src/Lib/Particles/FireParticleSystem2D.cpp:1.3
netpanzer/src/Lib/Particles/FireParticleSystem2D.cpp:1.4
--- netpanzer/src/Lib/Particles/FireParticleSystem2D.cpp:1.3 Fri Sep 5
22:01:18 2003
+++ netpanzer/src/Lib/Particles/FireParticleSystem2D.cpp Sat Sep 6
11:18:18 2003
@@ -15,8 +15,9 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
#include <config.h>
+
+#include "Log.hpp"
#include "FireParticleSystem2D.hpp"
#include "TimerInterface.hpp"
Index: netpanzer/src/Lib/Particles/GroundExplosionParticle2D.cpp
diff -u netpanzer/src/Lib/Particles/GroundExplosionParticle2D.cpp:1.3
netpanzer/src/Lib/Particles/GroundExplosionParticle2D.cpp:1.4
--- netpanzer/src/Lib/Particles/GroundExplosionParticle2D.cpp:1.3 Fri Sep
5 22:01:18 2003
+++ netpanzer/src/Lib/Particles/GroundExplosionParticle2D.cpp Sat Sep 6
11:18:18 2003
@@ -15,10 +15,10 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
#include <config.h>
-#include "GroundExplosionParticle2D.hpp"
+#include "Log.hpp"
+#include "GroundExplosionParticle2D.hpp"
Surface GroundExplosionParticle2D::groundParticleSprite0;
Index: netpanzer/src/Lib/Particles/GroundExplosionParticleSystem2D.cpp
diff -u netpanzer/src/Lib/Particles/GroundExplosionParticleSystem2D.cpp:1.3
netpanzer/src/Lib/Particles/GroundExplosionParticleSystem2D.cpp:1.4
--- netpanzer/src/Lib/Particles/GroundExplosionParticleSystem2D.cpp:1.3 Fri Sep
5 22:01:18 2003
+++ netpanzer/src/Lib/Particles/GroundExplosionParticleSystem2D.cpp Sat Sep
6 11:18:18 2003
@@ -15,8 +15,11 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
#include <config.h>
+
+#include <assert.h>
+#include <stdlib.h>
+#include "Log.hpp"
#include "codewiz.hpp"
#include "GroundExplosionParticleSystem2D.hpp"
#include "Physics.hpp"
Index: netpanzer/src/Lib/Particles/SnowParticle2D.cpp
diff -u netpanzer/src/Lib/Particles/SnowParticle2D.cpp:1.3
netpanzer/src/Lib/Particles/SnowParticle2D.cpp:1.4
--- netpanzer/src/Lib/Particles/SnowParticle2D.cpp:1.3 Fri Sep 5 22:01:18 2003
+++ netpanzer/src/Lib/Particles/SnowParticle2D.cpp Sat Sep 6 11:18:18 2003
@@ -17,11 +17,11 @@
*/
#include <config.h>
-#include "SnowParticle2D.hpp"
+#include "Log.hpp"
+#include "SnowParticle2D.hpp"
class SnowParticleSystem2D;
-
//---------------------------------------------------------------------------
SnowParticle2D::SnowParticle2D()
Index: netpanzer/src/Lib/Particles/SnowParticleSystem2D.cpp
diff -u netpanzer/src/Lib/Particles/SnowParticleSystem2D.cpp:1.3
netpanzer/src/Lib/Particles/SnowParticleSystem2D.cpp:1.4
--- netpanzer/src/Lib/Particles/SnowParticleSystem2D.cpp:1.3 Fri Sep 5
22:01:18 2003
+++ netpanzer/src/Lib/Particles/SnowParticleSystem2D.cpp Sat Sep 6
11:18:18 2003
@@ -15,14 +15,13 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
#include <config.h>
+
+#include "Log.hpp"
#include "SnowParticleSystem2D.hpp"
#include "TimerInterface.hpp"
-
int SnowParticleSystem2D::snowParticleCount;
-
// SnowParticleSystem2D constructor
//---------------------------------------------------------------------------
Index: netpanzer/src/Lib/View/Desktop.cpp
diff -u netpanzer/src/Lib/View/Desktop.cpp:1.4
netpanzer/src/Lib/View/Desktop.cpp:1.5
--- netpanzer/src/Lib/View/Desktop.cpp:1.4 Fri Sep 5 22:01:18 2003
+++ netpanzer/src/Lib/View/Desktop.cpp Sat Sep 6 11:18:18 2003
@@ -105,14 +105,10 @@
if (curButton & LMOUSE_BUTTON_MASK)
{
- //LOG_BLOCK(("Button is down"));
-
// The button is down. See if it just got pressed, or if it
was pressed
// before and is being dragged.
if (!(prevButton & LMOUSE_BUTTON_MASK))
{
- //LOG_BLOCK(("Button just got pressed"));
-
// The mouse button just got pressed. Remember the
initial place
// where it got pressed.
lMouseDownPos = mousePos;
@@ -125,15 +121,10 @@
} else
{
- //LOG_BLOCK(("Not double click"));
-
// Not a double click. See what window we're
over
lMouseView = mouseView;
if (lMouseView != 0)
{
-
- //LOG_BLOCK(("Setting lMouseView"));
-
lMouseView->lMouseDown(lMouseView->getScreenToClientPos(mousePos));
if (focus != lMouseView)
{
@@ -184,8 +175,6 @@
}
} else
{
- //LOG_BLOCK(("still down"));
-
// The mouse was down before and is still down. Are we
performing
// and standard window actions?
@@ -222,8 +211,6 @@
// }
//}
- //LOG_BLOCK(("Not doing mouse actions -
lMouseView=%p, mouseActions=%d", lMouseView, mouseActions));
-
// No standard mouse actions. Tell the
window where the mouse
// was originally clicked that the
mouse is being dragged over
// it.
@@ -334,13 +321,6 @@
// of the mouse.
//if (focus != 0)
//focus->mouseMove(focus->getScreenToClientPos(prevMousePos),
focus->getScreenToClientPos(mousePos));
-
-
- //{
- // LOG_BLOCK(("Window stack:"));
- // for (View *w = top ; w ; w = w->next)
- // LOG(("%s", w->title));
- //}
prevButton = curButton;
prevMousePos = mousePos;
Index: netpanzer/src/Lib/View/View.cpp
diff -u netpanzer/src/Lib/View/View.cpp:1.3 netpanzer/src/Lib/View/View.cpp:1.4
--- netpanzer/src/Lib/View/View.cpp:1.3 Fri Sep 5 22:01:18 2003
+++ netpanzer/src/Lib/View/View.cpp Sat Sep 6 11:18:18 2003
@@ -1474,7 +1474,6 @@
void View::addButton(const iXY &pos, const char *name, const char *toolTip,
ITEM_FUNC func)
{
- FUNCF(("View::addButton(pos={%d,%d}, name=%s, toolTip=%s, func=%p)",
pos.x, pos.y, name, toolTip, func));
assert(isValidPtr(this));
// Grow the list
Index: netpanzer/src/Lib/View/cButton.hpp
diff -u netpanzer/src/Lib/View/cButton.hpp:1.2
netpanzer/src/Lib/View/cButton.hpp:1.3
--- netpanzer/src/Lib/View/cButton.hpp:1.2 Mon Sep 1 16:24:20 2003
+++ netpanzer/src/Lib/View/cButton.hpp Sat Sep 6 11:18:18 2003
@@ -15,16 +15,10 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
#ifndef __cButton_hpp__
#define __cButton_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
+#include <stdlib.h>
#include "iXY.hpp"
#include "iRect.hpp"
#include "PackedSurface.hpp"
Index: netpanzer/src/Lib/codewiz.hpp
diff -u netpanzer/src/Lib/codewiz.hpp:1.2 netpanzer/src/Lib/codewiz.hpp:1.3
--- netpanzer/src/Lib/codewiz.hpp:1.2 Mon Sep 1 16:24:18 2003
+++ netpanzer/src/Lib/codewiz.hpp Sat Sep 6 11:18:18 2003
@@ -20,23 +20,6 @@
#define __CODEWIZ_H_INCLUDED__
#include "Util.hpp"
-
-//***************************************************************************
-// includes
-//***************************************************************************
-
-#include <assert.h>
-
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <math.h>
-#include <ctype.h>
-#include <float.h>
-#include <limits.h>
-
#include "Types/LibTypes.hpp"
//***************************************************************************
@@ -46,114 +29,11 @@
const bool LIVE_WITHOUT_IT = false;
//***************************************************************************
-// Persional favorite logging macros
-//***************************************************************************
-
-#define DONOTHING ((void)0)
-
-#ifdef _LOGGING_ON
-
- extern char const *__logFile;
- extern unsigned __logLine;
- extern unsigned __logDepth;
-
- extern void __log(const char *msg, ...);
- extern void __vlog(const char *leader, const char *trailer, const char
*msg, va_list ap);
- extern void __logClose(const char *msg, ...);
- extern void __logOpen(const char *msg, ...);
-
- class CALL_STACK {
- public:
-
- static const CALL_STACK *top;
-
- char myBuf[200]; // If using a formatted
buffer, this holds the formatted string
- char const *const srcFile; // filename of the function
- unsigned const srcLine; // line number of the
function (approx)
- char const *const strPtr; // pointer to the description.
- CALL_STACK const *const nextDown; // pointer up the call stack
-
- // Create a call stack
- inline CALL_STACK(const char *nSrcFile, unsigned nSrcLine,
- const char *nStrPtr) :
- srcFile (nSrcFile),
- srcLine (nSrcLine),
- strPtr (nStrPtr ),
- nextDown(top )
- {
- top = this;
- }
-
- inline CALL_STACK(const char *nSrcFile, unsigned nSrcLine) :
- srcFile (nSrcFile),
- srcLine (nSrcLine),
- strPtr (myBuf ),
- nextDown(top )
- {
- myBuf[0] = '\0';
- top = this;
- }
-
- inline ~CALL_STACK() {
- // pop this guy off the stack
- top = nextDown;
- }
-
- // For formatted buffers
- void setMyBuf(const char *fmt, ...);
- };
-
-
- class __LOG_PLACEHOLDER {
- private:
- unsigned savedDepth;
- bool closed;
-
- public:
- // Create a placeholder for log depth info, so log depth will
- // automatically be restored
- inline __LOG_PLACEHOLDER() {
- savedDepth = __logDepth;
- closed = false;
- }
-
- // Restore the log depth
- inline ~__LOG_PLACEHOLDER() {
- __logFile = 0;
- __logLine = 0;
- __logDepth = savedDepth;
- if (!closed) __log("}");
- }
-
- // Log a return value from a function
- void logReturn(const char *file, unsigned line, const char
*fmt, ...);
- };
-
- // insert function into call stack info
- #define FUNC(funcName) CALL_STACK __callStack(__FILE__, __LINE__,
funcName)
- #define FUNCF(x) CALL_STACK __callStack(__FILE__, __LINE__);
__callStack.setMyBuf x
-
- #define LOG(x) (__logFile = __FILE__, __logLine = __LINE__,
(__log x))
- #define LOG_FUNC(funcName) FUNC(funcName); __LOG_PLACEHOLDER
__func_placeHolder; (__logFile = __FILE__, __logLine = __LINE__,
__logOpen(funcName))
- #define LOG_FUNCF(x) FUNCF(x); __LOG_PLACEHOLDER
__func_placeHolder; (__logFile = __FILE__, __logLine = __LINE__, __logOpen x)
- #define LOG_BLOCK(x) __LOG_PLACEHOLDER __block_placeHolder;
(__logFile = __FILE__, __logLine = __LINE__, (__logOpen x))
- #define RETURN(x); { __func_placeHolder.logReturn(__FILE__,
__LINE__, #x ); return(x); }
- #define RETURNF(x, fmt); { __func_placeHolder.logReturn(__FILE__,
__LINE__, #x " = " fmt, (x)); return(x); }
-
-#else
- #define FUNCF(x) DONOTHING
- #define FUNC(funcName) DONOTHING
- #define LOG(x) DONOTHING
- #define LOG_BLOCK(s) DONOTHING
- #define LOG_FUNC(funcName) DONOTHING
- #define RETURN(x) return(x)
- #define RETURNF(x, fmt) return(x)
-#endif
-
-//***************************************************************************
// Standard program control/cleanup functions
//***************************************************************************
+#include <stdarg.h>
+
void cleanup(bool fubed);
void term(int returnCode, bool fubed, const char *msg, ...);
void vterm(int returnCode, bool fubed, const char *msg, va_list ap);
@@ -161,58 +41,10 @@
void FUBAR(const char *msg, ...);
void vQuitOK(const char *msg, va_list ap);
void vFUBAR(const char *msg, va_list ap);
-void _addCleanupFunc(void (*func)(), bool doEvenOnFubed,
- const char *sourceFile, unsigned lineNum);
-
-#define addCleanupFunc(f, d) _addCleanupFunc((f), (d), __FILE__, __LINE__)
-
-template <class T> inline T align4(T x) {
- return (x + T(3)) & T(~3U);
-}
-
-template <class T, class C> inline T rol(T a, C count) {
- return T((DWORD(a) << unsigned(count)) | (DWORD(a) >>
unsigned(sizeof(T)*8 - count)));
-}
-
-template <class T, class C> inline T ror(T a, C count) {
- return T((DWORD(a) >> unsigned(count)) | (DWORD(a) <<
unsigned(sizeof(T)*8 - count)));
-}
inline bool isValidPtr(const void *ptr) {
return (ptr > 0) && (ptr < (void *)0x90000000);
}
-
-template <class T> inline T squared(T a) { return a*a; }
-
-//***************************************************************************
-// Mathmatical constants and conversions
-//***************************************************************************
-
-#define _E (2.71828182845904523536)
-
-#ifndef PI
-#define PI (3.14159265358979323846)
-#endif
-
-#define RAD_PER_DEG (PI / 180.0)
-#define DEG_PER_RAD (180.0 / PI)
-
-inline float RAD2DEG(float radians) { return radians * DEG_PER_RAD; }
-inline float DEG2RAD(float radians) { return radians * RAD_PER_DEG; }
-
-//***************************************************************************
-// Other standard prototypes
-//***************************************************************************
-
-void trimLeadingWhitespace (char *str);
-void trimTrailingWhitespace(char *str);
-void concatenateWhitespace (char *str);
-
-void swapMem(void *buf1, void *buf2, size_t numBytes);
-
-void reverseBytes(void *buf, size_t numBytes); // A B C D <->
D C B A
-void reverseWords(void *buf, size_t numWords); // AB CD EF GH <->
GH EF CD AB
-void reverseDWords(void *buf, size_t numDWords); // ABCD EFGH IJKL MNOP <->
MNOP IJKL EFGH ABCD
//***************************************************************************
#endif // #ifndef __CODEWIZ_H_INCLUDED__
Index: netpanzer/src/Lib/terminate.cpp
diff -u netpanzer/src/Lib/terminate.cpp:1.3 netpanzer/src/Lib/terminate.cpp:1.4
--- netpanzer/src/Lib/terminate.cpp:1.3 Fri Sep 5 22:01:17 2003
+++ netpanzer/src/Lib/terminate.cpp Sat Sep 6 11:18:18 2003
@@ -46,12 +46,6 @@
} CLEANUP_FUNC;
//***************************************************************************
-// local prototypes
-//***************************************************************************
-
-static void atexit_cleanup();
-
-//***************************************************************************
// local data
//***************************************************************************
@@ -162,30 +156,3 @@
vterm(255, true, msg, ap);
}
-//---------------------------------------------------------------------------
-void _addCleanupFunc(void (*func)(), bool doEvenOnFubed,
- const char *sourceFile, unsigned lineNumber) {
-
- FUNCF(("_addCleanupFunc(doEvenOnFubed=%d, sourceFile=%s,
lineNumber=%u)", doEvenOnFubed, sourceFile, lineNumber));
- static bool initted = false;
- if (!initted) {
- if (atexit(atexit_cleanup))
- FUBAR("Cannot register cleanup function with atexit");
- initted = true;
- }
- if (numCleanupFuncs >= MAX_CLEANUP_FUNCS) {
- FUBAR("Attempted to add more than %u cleanup functions in %s,
line %u",
- MAX_CLEANUP_FUNCS, sourceFile, lineNumber);
- }
- cleanupFunc[numCleanupFuncs].doEvenOnFubed = doEvenOnFubed;
- cleanupFunc[numCleanupFuncs].func = func;
- ++numCleanupFuncs;
-}
-
-//***************************************************************************
-// local code
-//***************************************************************************
-
-void atexit_cleanup() {
- cleanup(false);
-}
Index: netpanzer/src/NetPanzer/Classes/Network/NetPacketQueues.cpp
diff -u netpanzer/src/NetPanzer/Classes/Network/NetPacketQueues.cpp:1.3
netpanzer/src/NetPanzer/Classes/Network/NetPacketQueues.cpp:1.4
--- netpanzer/src/NetPanzer/Classes/Network/NetPacketQueues.cpp:1.3 Fri Sep
5 22:01:18 2003
+++ netpanzer/src/NetPanzer/Classes/Network/NetPacketQueues.cpp Sat Sep 6
11:18:18 2003
@@ -16,10 +16,11 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <config.h>
+
+#include "Log.hpp"
#include "NetPacketQueues.hpp"
#include "codewiz.hpp"
#include "ConsoleInterface.hpp"
-
#define _DEFAULT_WINDOW_TIME (0.15) // in (seconds) 150ms
#define _WINDOW_ESTIMATE_WEIGHT (0.25) // 0 <= weight <= 1
Index: netpanzer/src/NetPanzer/Classes/Network/NetworkClient.cpp
diff -u netpanzer/src/NetPanzer/Classes/Network/NetworkClient.cpp:1.3
netpanzer/src/NetPanzer/Classes/Network/NetworkClient.cpp:1.4
--- netpanzer/src/NetPanzer/Classes/Network/NetworkClient.cpp:1.3 Fri Sep
5 22:01:18 2003
+++ netpanzer/src/NetPanzer/Classes/Network/NetworkClient.cpp Sat Sep 6
11:18:18 2003
@@ -16,6 +16,8 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <config.h>
+
+#include "Log.hpp"
#include "NetworkGlobals.hpp"
#include "NetworkClient.hpp"
Index: netpanzer/src/NetPanzer/Classes/Network/NetworkInterface.cpp
diff -u netpanzer/src/NetPanzer/Classes/Network/NetworkInterface.cpp:1.3
netpanzer/src/NetPanzer/Classes/Network/NetworkInterface.cpp:1.4
--- netpanzer/src/NetPanzer/Classes/Network/NetworkInterface.cpp:1.3 Fri Sep
5 22:01:18 2003
+++ netpanzer/src/NetPanzer/Classes/Network/NetworkInterface.cpp Sat Sep
6 11:18:18 2003
@@ -16,6 +16,8 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <config.h>
+
+#include "Log.hpp"
#include "NetworkInterface.hpp"
#include "codewiz.hpp"
Index: netpanzer/src/NetPanzer/Classes/Network/NetworkServer.cpp
diff -u netpanzer/src/NetPanzer/Classes/Network/NetworkServer.cpp:1.3
netpanzer/src/NetPanzer/Classes/Network/NetworkServer.cpp:1.4
--- netpanzer/src/NetPanzer/Classes/Network/NetworkServer.cpp:1.3 Fri Sep
5 22:01:18 2003
+++ netpanzer/src/NetPanzer/Classes/Network/NetworkServer.cpp Sat Sep 6
11:18:18 2003
@@ -16,6 +16,8 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <config.h>
+
+#include "Log.hpp"
#include "NetworkServer.hpp"
#include "ClientServerNetMessage.hpp"
Index: netpanzer/src/NetPanzer/Classes/UnitState.hpp
diff -u netpanzer/src/NetPanzer/Classes/UnitState.hpp:1.2
netpanzer/src/NetPanzer/Classes/UnitState.hpp:1.3
--- netpanzer/src/NetPanzer/Classes/UnitState.hpp:1.2 Mon Sep 1 16:24:20 2003
+++ netpanzer/src/NetPanzer/Classes/UnitState.hpp Sat Sep 6 11:18:18 2003
@@ -18,6 +18,7 @@
#ifndef _UNITSTATE_HPP
#define _UNITSTATE_HPP
+#include <string.h>
#include "PObject.hpp"
#include "BoundBox.hpp"
#include "Point.hpp"
Index: netpanzer/src/NetPanzer/Classes/Units/UnitGlobals.cpp
diff -u netpanzer/src/NetPanzer/Classes/Units/UnitGlobals.cpp:1.3
netpanzer/src/NetPanzer/Classes/Units/UnitGlobals.cpp:1.4
--- netpanzer/src/NetPanzer/Classes/Units/UnitGlobals.cpp:1.3 Fri Sep 5
22:01:19 2003
+++ netpanzer/src/NetPanzer/Classes/Units/UnitGlobals.cpp Sat Sep 6
11:18:19 2003
@@ -145,39 +145,38 @@
}
void LoadUnitSurfaces( void )
- {
+{
+ gAbramsTurret.load( "units/pics/pak/TitaTNSD.pak" );
+ gAbramsBody.load( "units/pics/pak/TitaHNSD.pak" );
- gAbramsTurret.load( "units\\pics\\pak\\TitaTNSD.pak" );
- gAbramsBody.load( "units\\pics\\pak\\TitaHNSD.pak" );
+ gLeopardTurret.load( "units/pics/pak/PantTNSD.pak" );
+ gLeopardBody.load( "units/pics/pak/PantHNSD.pak" );
- gLeopardTurret.load( "units\\pics\\pak\\PantTNSD.pak" );
- gLeopardBody.load( "units\\pics\\pak\\PantHNSD.pak" );
+ gValentineTurret.load( "units/pics/pak/MantTNSD.pak" );
+ gValentineBody.load( "units/pics/pak/MantHNSD.pak" );
- gValentineTurret.load( "units\\pics\\pak\\MantTNSD.pak" );
- gValentineBody.load( "units\\pics\\pak\\MantHNSD.pak" );
+ gHammerheadTurret.load( "units/pics/pak/StinTNSD.pak" );
+ gHammerheadBody.load( "units/pics/pak/StinHNSD.pak" );
- gHammerheadTurret.load( "units\\pics\\pak\\StinTNSD.pak" );
- gHammerheadBody.load( "units\\pics\\pak\\StinHNSD.pak" );
+ //gHumveeBody.load( "units/pics/pak/ScouHNSD.pak" );
- //gHumveeBody.load( "units\\pics\\pak\\ScouHNSD.pak" );
+ gScorpionTurret.load( "units/pics/pak/WolfTNSD.pak" );
+ gScorpionBody.load( "units/pics/pak/WolfHNSD.pak" );
- gScorpionTurret.load( "units\\pics\\pak\\WolfTNSD.pak" );
- gScorpionBody.load( "units\\pics\\pak\\WolfHNSD.pak" );
+ gLynxTurret.load( "units/pics/pak/BobcTNSD.pak" );
+ gLynxBody.load( "units/pics/pak/BobcHNSD.pak" );
- gLynxTurret.load( "units\\pics\\pak\\BobcTNSD.pak" );
- gLynxBody.load( "units\\pics\\pak\\BobcHNSD.pak" );
+ gM109Turret.load( "units/pics/pak/DrakTNSD.pak" );
+ gM109Body.load( "units/pics/pak/DrakHNSD.pak" );
- gM109Turret.load( "units\\pics\\pak\\DrakTNSD.pak" );
- gM109Body.load( "units\\pics\\pak\\DrakHNSD.pak" );
+ gBearTurret.load( "units/pics/pak/BearTNSD.pak" );
+ gBearBody.load( "units/pics/pak/BearHNSD.pak" );
- gBearTurret.load( "units\\pics\\pak\\BearTNSD.pak" );
- gBearBody.load( "units\\pics\\pak\\BearHNSD.pak" );
+ gSpahPanzerTurret.load( "units/pics/pak/SpahTNSD.pak" );
+ gSpahPanzerBody.load( "units/pics/pak/SpahHNSD.pak" );
- gSpahPanzerTurret.load( "units\\pics\\pak\\SpahTNSD.pak" );
- gSpahPanzerBody.load( "units\\pics\\pak\\SpahHNSD.pak" );
-
- gArcherTurret.load( "units\\pics\\pak\\ArchTNSD.pak" );
- gArcherBody.load( "units\\pics\\pak\\ArchHNSD.pak" );
+ gArcherTurret.load( "units/pics/pak/ArchTNSD.pak" );
+ gArcherBody.load( "units/pics/pak/ArchHNSD.pak" );
/*
if ( gAbramsTurret.getFrameCount() < 36) assert( false );
@@ -208,7 +207,7 @@
*/
#ifdef _GRAY_MAPPED_UNITS
- Palette::init("wads\\netp.act");
+ Palette::init("wads/netp.act");
ColorTable gray256;
float grayPercent = 1.25f;
@@ -260,37 +259,37 @@
#else
//********** DARK BLUE UNITS ************
- gAbramsTurretDarkBlue.load( "units\\pics\\pak\\TitaTNSD.pak" );
- gAbramsBodyDarkBlue.load( "units\\pics\\pak\\TitaHNSD.pak" );
+ gAbramsTurretDarkBlue.load( "units/pics/pak/TitaTNSD.pak" );
+ gAbramsBodyDarkBlue.load( "units/pics/pak/TitaHNSD.pak" );
- gLeopardTurretDarkBlue.load( "units\\pics\\pak\\PantTNSD.pak" );
- gLeopardBodyDarkBlue.load( "units\\pics\\pak\\PantHNSD.pak" );
+ gLeopardTurretDarkBlue.load( "units/pics/pak/PantTNSD.pak" );
+ gLeopardBodyDarkBlue.load( "units/pics/pak/PantHNSD.pak" );
- gValentineTurretDarkBlue.load( "units\\pics\\pak\\MantTNSD.pak" );
- gValentineBodyDarkBlue.load( "units\\pics\\pak\\MantHNSD.pak" );
+ gValentineTurretDarkBlue.load( "units/pics/pak/MantTNSD.pak" );
+ gValentineBodyDarkBlue.load( "units/pics/pak/MantHNSD.pak" );
- gHammerheadTurretDarkBlue.load( "units\\pics\\pak\\StinTNSD.pak" );
- gHammerheadBodyDarkBlue.load( "units\\pics\\pak\\StinHNSD.pak" );
+ gHammerheadTurretDarkBlue.load( "units/pics/pak/StinTNSD.pak" );
+ gHammerheadBodyDarkBlue.load( "units/pics/pak/StinHNSD.pak" );
- //gHumveeBodyDarkBlue.load( "units\\pics\\pak\\ScouHNSD.pak" );
+ //gHumveeBodyDarkBlue.load( "units/pics/pak/ScouHNSD.pak" );
- gScorpionTurretDarkBlue.load( "units\\pics\\pak\\WolfTNSD.pak" );
- gScorpionBodyDarkBlue.load( "units\\pics\\pak\\WolfHNSD.pak" );
+ gScorpionTurretDarkBlue.load( "units/pics/pak/WolfTNSD.pak" );
+ gScorpionBodyDarkBlue.load( "units/pics/pak/WolfHNSD.pak" );
- gLynxTurretDarkBlue.load( "units\\pics\\pak\\BobcTNSD.pak" );
- gLynxBodyDarkBlue.load( "units\\pics\\pak\\BobcHNSD.pak" );
+ gLynxTurretDarkBlue.load( "units/pics/pak/BobcTNSD.pak" );
+ gLynxBodyDarkBlue.load( "units/pics/pak/BobcHNSD.pak" );
- gM109TurretDarkBlue.load( "units\\pics\\pak\\DrakTNSD.pak" );
- gM109BodyDarkBlue.load( "units\\pics\\pak\\DrakHNSD.pak" );
+ gM109TurretDarkBlue.load( "units/pics/pak/DrakTNSD.pak" );
+ gM109BodyDarkBlue.load( "units/pics/pak/DrakHNSD.pak" );
- gBearTurretDarkBlue.load( "units\\pics\\pak\\BearTNSD.pak" );
- gBearBodyDarkBlue.load( "units\\pics\\pak\\BearHNSD.pak" );
+ gBearTurretDarkBlue.load( "units/pics/pak/BearTNSD.pak" );
+ gBearBodyDarkBlue.load( "units/pics/pak/BearHNSD.pak" );
- gSpahPanzerTurretDarkBlue.load( "units\\pics\\pak\\SpahTNSD.pak" );
- gSpahPanzerBodyDarkBlue.load( "units\\pics\\pak\\SpahHNSD.pak" );
+ gSpahPanzerTurretDarkBlue.load( "units/pics/pak/SpahTNSD.pak" );
+ gSpahPanzerBodyDarkBlue.load( "units/pics/pak/SpahHNSD.pak" );
- gArcherTurretDarkBlue.load( "units\\pics\\pak\\ArchTNSD.pak" );
- gArcherBodyDarkBlue.load( "units\\pics\\pak\\ArchHNSD.pak" );
+ gArcherTurretDarkBlue.load( "units/pics/pak/ArchTNSD.pak" );
+ gArcherBodyDarkBlue.load( "units/pics/pak/ArchHNSD.pak" );
#endif
@@ -325,35 +324,35 @@
//********** SHADOWS ************
- gAbramsTurretShadow.load( "units\\pics\\pak\\TitaTSSD.pak" );
- gAbramsBodyShadow.load( "units\\pics\\pak\\TitaHSSD.pak" );
+ gAbramsTurretShadow.load( "units/pics/pak/TitaTSSD.pak" );
+ gAbramsBodyShadow.load( "units/pics/pak/TitaHSSD.pak" );
- gLeopardTurretShadow.load( "units\\pics\\pak\\PantTSSD.pak" );
- gLeopardBodyShadow.load( "units\\pics\\pak\\PantHSSD.pak" );
+ gLeopardTurretShadow.load( "units/pics/pak/PantTSSD.pak" );
+ gLeopardBodyShadow.load( "units/pics/pak/PantHSSD.pak" );
- gValentineTurretShadow.load( "units\\pics\\pak\\MantTSSD.pak" );
- gValentineBodyShadow.load( "units\\pics\\pak\\MantHSSD.pak" );
+ gValentineTurretShadow.load( "units/pics/pak/MantTSSD.pak" );
+ gValentineBodyShadow.load( "units/pics/pak/MantHSSD.pak" );
- gHammerheadTurretShadow.load( "units\\pics\\pak\\StinTSSD.pak" );
- gHammerheadBodyShadow.load( "units\\pics\\pak\\StinHSSD.pak" );
+ gHammerheadTurretShadow.load( "units/pics/pak/StinTSSD.pak" );
+ gHammerheadBodyShadow.load( "units/pics/pak/StinHSSD.pak" );
- //gHumveeBodyShadow.load( "units\\pics\\pak\\ScouHSSD.pak" );
+ //gHumveeBodyShadow.load( "units/pics/pak/ScouHSSD.pak" );
- gLynxTurretShadow.load( "units\\pics\\pak\\BobcTSSD.pak" );
- gLynxBodyShadow.load( "units\\pics\\pak\\BobcHSSD.pak" );
+ gLynxTurretShadow.load( "units/pics/pak/BobcTSSD.pak" );
+ gLynxBodyShadow.load( "units/pics/pak/BobcHSSD.pak" );
- gM109TurretShadow.load( "units\\pics\\pak\\DrakTSSD.pak" );
- gM109BodyShadow.load( "units\\pics\\pak\\DrakHSSD.pak" );
+ gM109TurretShadow.load( "units/pics/pak/DrakTSSD.pak" );
+ gM109BodyShadow.load( "units/pics/pak/DrakHSSD.pak" );
- gSpahPanzerTurretShadow.load( "units\\pics\\pak\\SpahTSSD.pak" );
- gSpahPanzerBodyShadow.load( "units\\pics\\pak\\SpahHSSD.pak" );
+ gSpahPanzerTurretShadow.load( "units/pics/pak/SpahTSSD.pak" );
+ gSpahPanzerBodyShadow.load( "units/pics/pak/SpahHSSD.pak" );
- gBearTurretShadow.load( "units\\pics\\pak\\BearTSSD.pak" );
- gBearBodyShadow.load( "units\\pics\\pak\\BearHSSD.pak" );
+ gBearTurretShadow.load( "units/pics/pak/BearTSSD.pak" );
+ gBearBodyShadow.load( "units/pics/pak/BearHSSD.pak" );
- gScorpionTurretShadow.load( "units\\pics\\pak\\WolfTSSD.pak" );
- gScorpionBodyShadow.load( "units\\pics\\pak\\WolfHSSD.pak" );
+ gScorpionTurretShadow.load( "units/pics/pak/WolfTSSD.pak" );
+ gScorpionBodyShadow.load( "units/pics/pak/WolfHSSD.pak" );
- gArcherTurretShadow.load( "units\\pics\\pak\\ArchTSSD.pak" );
- gArcherBodyShadow.load( "units\\pics\\pak\\ArchHSSD.pak" );
+ gArcherTurretShadow.load( "units/pics/pak/ArchTSSD.pak" );
+ gArcherBodyShadow.load( "units/pics/pak/ArchHSSD.pak" );
}
Index: netpanzer/src/NetPanzer/Classes/Units/Vehicle.cpp
diff -u netpanzer/src/NetPanzer/Classes/Units/Vehicle.cpp:1.3
netpanzer/src/NetPanzer/Classes/Units/Vehicle.cpp:1.4
--- netpanzer/src/NetPanzer/Classes/Units/Vehicle.cpp:1.3 Fri Sep 5
22:01:19 2003
+++ netpanzer/src/NetPanzer/Classes/Units/Vehicle.cpp Sat Sep 6 11:18:19 2003
@@ -16,10 +16,10 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <config.h>
-#include "Vehicle.hpp"
#include <string.h>
-
+#include "Log.hpp"
+#include "Vehicle.hpp"
#include "MapInterface.hpp"
#include "PathScheduler.hpp"
#include "ProjectileInterface.hpp"
Index: netpanzer/src/NetPanzer/Core/unix/main.cpp
diff -u netpanzer/src/NetPanzer/Core/unix/main.cpp:1.2
netpanzer/src/NetPanzer/Core/unix/main.cpp:1.3
--- netpanzer/src/NetPanzer/Core/unix/main.cpp:1.2 Sat Sep 6 09:24:12 2003
+++ netpanzer/src/NetPanzer/Core/unix/main.cpp Sat Sep 6 11:18:19 2003
@@ -1,6 +1,9 @@
#include <config.h>
+#include <stdio.h>
+#include <stdlib.h>
#include <SDL.h>
+#include "Log.hpp"
#include "GameManager.hpp"
int main(int argc, char** argv)
@@ -10,7 +13,14 @@
/*| SDL_INIT_AUDIO*/
);
- GameManager::initialize(argv[1]);
+ LOG( ("Starting GameManager initialisation.") );
+ // XXX hacky hack... needs changes in GameManager I think...
+ const char* commandline = argc > 1 ? argv[1] : "";
+ if (!GameManager::initialize(commandline)) {
+ fprintf(stderr, "Couldn't initialize the game.\n");
+ exit(1);
+ }
+ LOG( ("Initialisation succeeded.") );
while(1) {
GameManager::mainLoop();
Index: netpanzer/src/NetPanzer/Interfaces/GameManager.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.13
netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.14
--- netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.13 Sat Sep 6
09:12:39 2003
+++ netpanzer/src/NetPanzer/Interfaces/GameManager.cpp Sat Sep 6 11:18:19 2003
@@ -59,7 +59,7 @@
#include "SystemNetMessage.hpp"
#include "ConnectNetMessage.hpp"
-// ** PObject netPanzer Includes
+#include "Log.hpp"
#include "MouseInterface.hpp"
#include "KeyboardInterface.hpp"
#include "KeyBinder.hpp"
Index: netpanzer/src/NetPanzer/Interfaces/MapsManager.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/MapsManager.cpp:1.4
netpanzer/src/NetPanzer/Interfaces/MapsManager.cpp:1.5
--- netpanzer/src/NetPanzer/Interfaces/MapsManager.cpp:1.4 Sat Sep 6
09:12:39 2003
+++ netpanzer/src/NetPanzer/Interfaces/MapsManager.cpp Sat Sep 6 11:18:19 2003
@@ -19,6 +19,7 @@
#ifdef WIN32
#include <io.h>
#endif
+#include <stdio.h>
#include <string.h>
#include "FindFirst.hpp"
#include "MapsManager.hpp"
Index: netpanzer/src/NetPanzer/Interfaces/UnitProfileInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/UnitProfileInterface.cpp:1.3
netpanzer/src/NetPanzer/Interfaces/UnitProfileInterface.cpp:1.4
--- netpanzer/src/NetPanzer/Interfaces/UnitProfileInterface.cpp:1.3 Fri Sep
5 22:01:19 2003
+++ netpanzer/src/NetPanzer/Interfaces/UnitProfileInterface.cpp Sat Sep 6
11:18:19 2003
@@ -312,34 +312,34 @@
void UnitProfileInterface::loadUnitProfiles( void )
{
- read_vehicle_profile( "units\\profiles\\Titan.pfl",
+ read_vehicle_profile( "units/profiles/Titan.pfl",
&profile_table[ _unit_type_abrams ] );
- read_vehicle_profile( "units\\profiles\\Manta.pfl",
+ read_vehicle_profile( "units/profiles/Manta.pfl",
&profile_table[ _unit_type_valentine ] );
- read_vehicle_profile( "units\\profiles\\Panther1.pfl",
+ read_vehicle_profile( "units/profiles/Panther1.pfl",
&profile_table[ _unit_type_leopard ] );
- read_vehicle_profile( "units\\profiles\\Stinger.pfl",
+ read_vehicle_profile( "units/profiles/Stinger.pfl",
&profile_table[ _unit_type_hammerhead ] );
- read_vehicle_profile( "units\\profiles\\SPanzer.pfl",
+ read_vehicle_profile( "units/profiles/SPanzer.pfl",
&profile_table[ _unit_type_humvee ] );
- read_vehicle_profile( "units\\profiles\\Bobcat.pfl",
+ read_vehicle_profile( "units/profiles/Bobcat.pfl",
&profile_table[ _unit_type_lynx ] );
- read_vehicle_profile( "units\\profiles\\Wolf.pfl",
+ read_vehicle_profile( "units/profiles/Wolf.pfl",
&profile_table[ _unit_type_scorpion ] );
- read_vehicle_profile( "units\\profiles\\Bear.pfl",
+ read_vehicle_profile( "units/profiles/Bear.pfl",
&profile_table[ _unit_type_spahpanzer ] );
- read_vehicle_profile( "units\\profiles\\Drake.pfl",
+ read_vehicle_profile( "units/profiles/Drake.pfl",
&profile_table[ _unit_type_m109 ] );
- read_vehicle_profile( "units\\profiles\\Archer.pfl",
+ read_vehicle_profile( "units/profiles/Archer.pfl",
&profile_table[ _unit_type_archer ] );
}
Index: netpanzer/src/NetPanzer/Views/Game/ControlPaletteView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/ControlPaletteView.cpp:1.3
netpanzer/src/NetPanzer/Views/Game/ControlPaletteView.cpp:1.4
--- netpanzer/src/NetPanzer/Views/Game/ControlPaletteView.cpp:1.3 Fri Sep
5 22:01:19 2003
+++ netpanzer/src/NetPanzer/Views/Game/ControlPaletteView.cpp Sat Sep 6
11:18:19 2003
@@ -16,6 +16,8 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <config.h>
+
+#include "Log.hpp"
#include "ControlPaletteView.hpp"
#include "cMouse.hpp"
#include "MiniMapInterface.hpp"
Index: netpanzer/src/NetPanzer/Views/Game/GameInfoView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/GameInfoView.cpp:1.3
netpanzer/src/NetPanzer/Views/Game/GameInfoView.cpp:1.4
--- netpanzer/src/NetPanzer/Views/Game/GameInfoView.cpp:1.3 Fri Sep 5
22:01:19 2003
+++ netpanzer/src/NetPanzer/Views/Game/GameInfoView.cpp Sat Sep 6 11:18:19 2003
@@ -16,6 +16,8 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <config.h>
+
+#include "Log.hpp"
#include "GameInfoView.hpp"
#include "GameViewGlobals.hpp"
#include "Desktop.hpp"
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitColorView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitColorView.cpp:1.4
netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitColorView.cpp:1.5
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitColorView.cpp:1.4 Sat Sep
6 06:34:29 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitColorView.cpp Sat Sep
6 11:18:20 2003
@@ -91,13 +91,13 @@
moveTo(400, 200);
- packedBody.load("units\\pics\\pak\\TitaHNSD.pak");
+ packedBody.load("units/pics/pak/TitaHNSD.pak");
packedBody.setFPS(12);
- packedTurret.load("units\\pics\\pak\\TitaTNSD.pak");
+ packedTurret.load("units/pics/pak/TitaTNSD.pak");
packedTurret.setFPS(8);
- grassSurface.loadBMP("pics\\grass.bmp");
+ grassSurface.loadBMP("pics/grass.bmp");
fuckingSurface.create(packedTurret.getPixX(), packedTurret.getPixY(),
packedTurret.getPixX(), 1);
fuckingSurface.fill(0);
Index: netpanzer/src/config.h
diff -u netpanzer/src/config.h:1.4 netpanzer/src/config.h:1.5
--- netpanzer/src/config.h:1.4 Sat Sep 6 07:53:31 2003
+++ netpanzer/src/config.h Sat Sep 6 11:18:18 2003
@@ -7,3 +7,5 @@
#ifdef UNIX
#define USE_SDL
#endif
+
+#define DO_LOGGING
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [netPanzer-CVS] netpanzer/src ChangeLog config.h Lib/codewiz.hp...,
Matthias Braun <=