Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv14222
Modified Files:
debug.cpp spawnregions.cpp walking.cpp wolf.dsp
Log Message:
Fixed spawn region
cleared up Python extension to map tiles.
Index: debug.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/debug.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** debug.cpp 11 Aug 2003 03:34:40 -0000 1.11
--- debug.cpp 4 Sep 2003 01:22:54 -0000 1.12
***************
*** 579,583 ****
};
! static debugThread myDebugThread;
--- 579,583 ----
};
! //static debugThread myDebugThread;
Index: spawnregions.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/spawnregions.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** spawnregions.cpp 23 Aug 2003 01:03:31 -0000 1.44
--- spawnregions.cpp 4 Sep 2003 01:22:54 -0000 1.45
***************
*** 216,220 ****
pos.z = this->z_[rndRectNum];
else
! pos.z = Map->height( pos );
pos.map = rectangles_[rndRectNum].map;
--- 216,220 ----
pos.z = this->z_[rndRectNum];
else
! pos.z = Map->mapElevation( pos );
pos.map = rectangles_[rndRectNum].map;
***************
*** 296,299 ****
--- 296,300 ----
this->npcSerials_.push_back( pc->serial() );
pc->setSpawnregion( this->name_ );
+ pc->update();
}
}
Index: walking.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/walking.cpp,v
retrieving revision 1.89
retrieving revision 1.90
diff -C2 -d -r1.89 -r1.90
*** walking.cpp 3 Sep 2003 20:58:17 -0000 1.89
--- walking.cpp 4 Sep 2003 01:22:54 -0000 1.90
***************
*** 1509,1513 ****
if( pos.x >= ( Map->mapTileWidth(pos.map) * 8 ) || pos.y >= ( Map->mapTileHeight(pos.map) * 8 ) )
return false;
! const signed char elev = Map->height( pos );
Coord_cl target = pos;
target.z = elev;
--- 1509,1513 ----
if( pos.x >= ( Map->mapTileWidth(pos.map) * 8 ) || pos.y >= ( Map->mapTileHeight(pos.map) * 8 ) )
return false;
! const signed char elev = Map->mapElevation( pos );
Coord_cl target = pos;
target.z = elev;
Index: wolf.dsp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolf.dsp,v
retrieving revision 1.215
retrieving revision 1.216
diff -C2 -d -r1.215 -r1.216
*** wolf.dsp 3 Sep 2003 20:58:17 -0000 1.215
--- wolf.dsp 4 Sep 2003 01:22:54 -0000 1.216
***************
*** 69,73 ****
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
! # ADD CPP /nologo /MD /Gm /GR /GX /ZI /Od /I "sqlite" /I "lib\bugreport" /I "$(QTDIR)\include" /D "_CONSOLE" /D "_MBCS" /D "_DEBUG" /D "WIN32" /D "QT_DLL" /D "QT_NO_STL" /D "QT_THREAD_SUPPORT" /FR /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
--- 69,73 ----
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
! # ADD CPP /nologo /MD /Gm /GR /GX /ZI /Od /I "sqlite" /I "lib\bugreport" /I "$(QTDIR)\include" /D "_CONSOLE" /D "_MBCS" /D "_DEBUG" /D "WIN32" /D "QT_DLL" /D "QT_NO_STL" /D "QT_THREAD_SUPPORT" /D "MYSQL_DRIVER" /FR /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
***************
*** 77,81 ****
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib $(QTDIR)\lib\qt-mt312.lib /nologo /version:12.9 /subsystem:console /map /debug /machine:I386 /out:"..\Wolfpack.exe" /pdbtype:sept /libpath:"lib\bugreport\lib" /libpath:"flatstore\Debug"
# SUBTRACT LINK32 /pdb:none
--- 77,81 ----
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib $(QTDIR)\lib\qt-mt320.lib /nologo /version:12.9 /subsystem:console /map /debug /machine:I386 /out:"..\Wolfpack.exe" /pdbtype:sept /libpath:"lib\bugreport\lib" /libpath:"flatstore\Debug"
# SUBTRACT LINK32 /pdb:none
|
