[Opentnl-cvs] tnl/zap item.cpp,1.3,1.4 sfx.cpp,1.5,1.6 zap.dsp,1.1,1.2
Brought to you by:
mark_frohnmayer,
s_alanet
Menu
▾
▴
[Opentnl-cvs] tnl/zap item.cpp,1.3,1.4 sfx.cpp,1.5,1.6 zap.dsp,1.1,1.2
|
From: Mark F. <mar...@us...> - 2004-04-20 19:45:14
|
Update of /cvsroot/opentnl/tnl/zap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7130/zap Modified Files: item.cpp sfx.cpp zap.dsp Log Message: Updated VC6 project file Index: item.cpp =================================================================== RCS file: /cvsroot/opentnl/tnl/zap/item.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** item.cpp 20 Apr 2004 19:25:48 -0000 1.3 --- item.cpp 20 Apr 2004 19:45:04 -0000 1.4 *************** *** 79,83 **** for(S32 i = 0; i < mMount->mMountedItems.size(); i++) { ! if(mMount->mMountedItems[i] == this) { mMount->mMountedItems.erase(i); --- 79,83 ---- for(S32 i = 0; i < mMount->mMountedItems.size(); i++) { ! if(mMount->mMountedItems[i].getPointer() == this) { mMount->mMountedItems.erase(i); Index: zap.dsp =================================================================== RCS file: /cvsroot/opentnl/tnl/zap/zap.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** zap.dsp 20 Apr 2004 04:27:20 -0000 1.1 --- zap.dsp 20 Apr 2004 19:45:06 -0000 1.2 *************** *** 43,47 **** # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c ! # ADD CPP /nologo /W3 /GR /GX /O2 /I "../glut" /I "../tnl" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" --- 43,47 ---- # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c ! # ADD CPP /nologo /W3 /GR /GX /O2 /I "../tnl" /I "../glut" /I "../openal" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" *************** *** 50,55 **** # ADD BSC32 /nologo 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 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 wsock32.lib opengl32.lib glu32.lib ../glut/glut32.lib 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 /out:"../exe/zap.exe" !ELSEIF "$(CFG)" == "zap - Win32 Debug" --- 50,55 ---- # ADD BSC32 /nologo 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 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 ../openal/alut.lib ../openal/openal32.lib wsock32.lib opengl32.lib glu32.lib ../glut/glut32.lib 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 /out:"../exe/zap.exe" !ELSEIF "$(CFG)" == "zap - Win32 Debug" *************** *** 66,71 **** # PROP Ignore_Export_Lib 0 # 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 /W3 /Gm /GR /GX /ZI /Od /I "../tnl" /I "../glut" /D "TNL_DEBUG" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" --- 66,71 ---- # PROP Ignore_Export_Lib 0 # 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 /W3 /Gm /GR /GX /ZI /Od /I "../tnl" /I "../glut" /I "../openal" /D "TNL_DEBUG" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" *************** *** 74,79 **** # ADD BSC32 /nologo 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 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 wsock32.lib opengl32.lib glu32.lib ../glut/glut32.lib 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 /out:"../exe/zapd.exe" /pdbtype:sept !ENDIF --- 74,79 ---- # ADD BSC32 /nologo 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 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 ../openal/alut.lib ../openal/openal32.lib wsock32.lib opengl32.lib glu32.lib ../glut/glut32.lib 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 /out:"../exe/zapd.exe" /pdbtype:sept !ENDIF *************** *** 97,100 **** --- 97,108 ---- # Begin Source File + SOURCE=.\CTFGame.cpp + # End Source File + # Begin Source File + + SOURCE=.\CTFGame.h + # End Source File + # Begin Source File + SOURCE=.\game.cpp # End Source File *************** *** 137,140 **** --- 145,156 ---- # Begin Source File + SOURCE=.\gameType.cpp + # End Source File + # Begin Source File + + SOURCE=.\gameType.h + # End Source File + # Begin Source File + SOURCE=.\gridDB.cpp # End Source File *************** *** 145,148 **** --- 161,172 ---- # Begin Source File + SOURCE=.\item.cpp + # End Source File + # Begin Source File + + SOURCE=.\item.h + # End Source File + # Begin Source File + SOURCE=.\main.cpp # End Source File *************** *** 161,164 **** --- 185,196 ---- # Begin Source File + SOURCE=.\moveObject.cpp + # End Source File + # Begin Source File + + SOURCE=.\moveObject.h + # End Source File + # Begin Source File + SOURCE=.\point.h # End Source File *************** *** 173,176 **** --- 205,216 ---- # Begin Source File + SOURCE=.\sfx.cpp + # End Source File + # Begin Source File + + SOURCE=.\sfx.h + # End Source File + # Begin Source File + SOURCE=.\ship.cpp # End Source File Index: sfx.cpp =================================================================== RCS file: /cvsroot/opentnl/tnl/zap/sfx.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** sfx.cpp 20 Apr 2004 19:25:49 -0000 1.5 --- sfx.cpp 20 Apr 2004 19:45:05 -0000 1.6 *************** *** 178,182 **** S32 i; for(i = 0; i < gPlayList.size(); i++) ! if(gPlayList[i] == this) return; gPlayList.push_back(this); --- 178,182 ---- S32 i; for(i = 0; i < gPlayList.size(); i++) ! if(this == gPlayList[i].getPointer()) return; gPlayList.push_back(this); *************** *** 194,198 **** for(S32 i = 0; i < gPlayList.size(); i++) { ! if(gPlayList[i] == this) { gPlayList.erase(i); --- 194,198 ---- for(S32 i = 0; i < gPlayList.size(); i++) { ! if(gPlayList[i].getPointer() == this) { gPlayList.erase(i); |