wpdev-commits

[<xs...@us...>]

Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv26006

Modified Files:
	combat.cpp coord.cpp wolf.dsp wolfpack.cpp 
Log Message:
line of sight fix for surfaces

Index: combat.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/combat.cpp,v
retrieving revision 1.152
retrieving revision 1.153
diff -C2 -d -r1.152 -r1.153
*** combat.cpp	15 Sep 2003 16:49:03 -0000	1.152
--- combat.cpp	17 Sep 2003 19:15:33 -0000	1.153
***************
*** 303,307 ****
  
  		// Can we see our target. 
- 		// I don't know what the +z 13 means...
  		bool los = pAttacker->pos().lineOfSight( pDefender->pos(), true );
  
--- 303,306 ----

Index: coord.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/coord.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** coord.cpp	7 Sep 2003 19:07:46 -0000	1.27
--- coord.cpp	17 Sep 2003 19:15:34 -0000	1.28
***************
*** 342,347 ****
  			tile = TileCache::instance()->getTile( msi->itemid );
  			if(	( (*pit).z >= msi->zoff && (*pit).z <= ( msi->zoff + tile.height ) ) )
! //				||	( tile.height <= 2 && abs( (*pit).z - msi->zoff ) <= abs( dz ) ) )
! 				itemids.insert( msi->itemid );
  
  			++msi;
--- 342,356 ----
  			tile = TileCache::instance()->getTile( msi->itemid );
  			if(	( (*pit).z >= msi->zoff && (*pit).z <= ( msi->zoff + tile.height ) ) )
! 			{
! 				// dont take surfaces into account under certain circumstances
! 				if( tile.flag2 & 0x02 )
! 				{
! 					if( !(z >= target.z && target.z >= (*pit).z) &&
! 						!(z <= target.z && z >= (*pit).z) )
! 						itemids.insert( msi->itemid );
! 				}
! 				else
! 					itemids.insert( msi->itemid );
! 			}
  
  			++msi;
***************
*** 400,404 ****
  
  		// Touch & Impassable
! 		if( touch && tile.flag1 & 0x40 )
  			return false;
  
--- 409,413 ----
  
  		// Touch & Impassable
! 		if( touch && ( tile.flag1 & 0x40 ) )
  			return false;
  

Index: wolf.dsp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolf.dsp,v
retrieving revision 1.232
retrieving revision 1.233
diff -C2 -d -r1.232 -r1.233
*** wolf.dsp	13 Sep 2003 18:47:25 -0000	1.232
--- wolf.dsp	17 Sep 2003 19:15:34 -0000	1.233
***************
*** 1,23 ****
  # Microsoft Developer Studio Project File - Name="wolf" - Package Owner=<4>
  # Microsoft Developer Studio Generated Build File, Format Version 6.00
! # ** NICHT BEARBEITEN **
  
  # TARGTYPE "Win32 (x86) Console Application" 0x0103
  
  CFG=wolf - Win32 Debug
! !MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
! !MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
  !MESSAGE 
  !MESSAGE NMAKE /f "wolf.mak".
  !MESSAGE 
! !MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
! !MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
  !MESSAGE 
  !MESSAGE NMAKE /f "wolf.mak" CFG="wolf - Win32 Debug"
  !MESSAGE 
! !MESSAGE Für die Konfiguration stehen zur Auswahl:
  !MESSAGE 
! !MESSAGE "wolf - Win32 Release" (basierend auf  "Win32 (x86) Console Application")
! !MESSAGE "wolf - Win32 Debug" (basierend auf  "Win32 (x86) Console Application")
  !MESSAGE 
  
--- 1,23 ----
  # Microsoft Developer Studio Project File - Name="wolf" - Package Owner=<4>
  # Microsoft Developer Studio Generated Build File, Format Version 6.00
! # ** DO NOT EDIT **
  
  # TARGTYPE "Win32 (x86) Console Application" 0x0103
  
  CFG=wolf - Win32 Debug
! !MESSAGE This is not a valid makefile. To build this project using NMAKE,
! !MESSAGE use the Export Makefile command and run
  !MESSAGE 
  !MESSAGE NMAKE /f "wolf.mak".
  !MESSAGE 
! !MESSAGE You can specify a configuration when running NMAKE
! !MESSAGE by defining the macro CFG on the command line. For example:
  !MESSAGE 
  !MESSAGE NMAKE /f "wolf.mak" CFG="wolf - Win32 Debug"
  !MESSAGE 
! !MESSAGE Possible choices for configuration are:
  !MESSAGE 
! !MESSAGE "wolf - Win32 Release" (based on "Win32 (x86) Console Application")
! !MESSAGE "wolf - Win32 Debug" (based on "Win32 (x86) Console Application")
  !MESSAGE 
  
***************
*** 52,56 ****
  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 /machine:I386
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib ws2_32.lib $(QTDIR)\lib\qt-mt320.lib shell32.lib /nologo /subsystem:windows /map /machine:I386 /out:"..\wolfpack.exe" /libpath:"lib\ZThread\lib" /libpath:"lib\Python\lib" /libpath:"lib\bugreport\lib" /libpath:"flatstore\Release" /opt:ref /opt:nowin98
  # SUBTRACT LINK32 /pdb:none
  
--- 52,56 ----
  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 /machine:I386
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib ws2_32.lib $(QTDIR)\lib\qt-mt320.lib shell32.lib /nologo /subsystem:windows /map /machine:I386 /out:"Release\wolfpack.exe" /libpath:"lib\ZThread\lib" /libpath:"lib\Python\lib" /libpath:"lib\bugreport\lib" /libpath:"flatstore\Release" /opt:ref /opt:nowin98
  # SUBTRACT LINK32 /pdb:none
  
***************
*** 64,68 ****
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 1
! # PROP Output_Dir "D:\wolfpack\"
  # PROP Intermediate_Dir "Debug"
  # PROP Ignore_Export_Lib 0
--- 64,68 ----
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 1
! # PROP Output_Dir "C:\Software Engineering\wolfpack\"
  # PROP Intermediate_Dir "Debug"
  # PROP Ignore_Export_Lib 0
***************
*** 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 gdi32.lib advapi32.lib ws2_32.lib $(QTDIR)\lib\qt-mt320.lib shell32.lib /nologo /version:12.9 /subsystem:windows /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 gdi32.lib advapi32.lib ws2_32.lib $(QTDIR)\lib\qt-mt320.lib shell32.lib /nologo /version:12.9 /subsystem:windows /map /debug /machine:I386 /out:"C:\Software Engineering\wolfpack\wolfpack.exe" /pdbtype:sept /libpath:"lib\bugreport\lib" /libpath:"flatstore\Debug"
  # SUBTRACT LINK32 /pdb:none
  
***************
*** 437,444 ****
  
  SOURCE=.\console.h
- # End Source File
- # Begin Source File
- 
- SOURCE=.\console_win.h
  # End Source File
  # Begin Source File
--- 437,440 ----

Index: wolfpack.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolfpack.cpp,v
retrieving revision 1.467
retrieving revision 1.468
diff -C2 -d -r1.467 -r1.468
*** wolfpack.cpp	14 Sep 2003 16:09:01 -0000	1.467
--- wolfpack.cpp	17 Sep 2003 19:15:34 -0000	1.468
***************
*** 539,542 ****
--- 539,544 ----
  		}
  
+ 		uiCurrentTime = getNormalizedTime();
+ 
  		// Python threading - end
  		PyEval_RestoreThread( _save );