Missed some merge errors

Sync with trunk. Haven't tried to compile yet. Will do that later...
Sync with trunk. My sanity is gone :(
2026-11-09 17:52:08 -10:00 · 2009-02-09 22:27:40 +00:00 · 2009-02-09 05:26:56 +00:00 · 2008-10-01 23:03:31 +00:00 · 2008-07-20 14:35:43 +00:00 · 2008-07-11 00:44:23 +00:00
1090 changed files with 251484 additions and 71102 deletions
@@ -12,16 +12,18 @@ Win32-MinGW:


 Linux and other unix variants (NOT YET COMPLETE)
-  ./configure [options]    (options tbd)
-  make -f makefile.linux
+  ./configure [options]
+  make



 === for the project maintainers (people who need to 
-=== keep the makefiles up to date):
+=== keep the makefiles up to date) and those building
+=== from CVS:

-aclocal
-autoconf
-automake
-./configure
+./autogen.sh (should only has to be done once)
+./configure [options]
 make
+
+automake v1.6.1+ and
+autoconf v2.54+ are required
@@ -2,7 +2,7 @@
 #
 # This file uses GNU Automake to generate makefiles

-SUBDIRS = libjpeg code
+SUBDIRS = libjpeg lua code


 EXTRA_DIST =	\
@@ -10,13 +10,22 @@ EXTRA_DIST =	\
 	projects/MSVC_2005/Freespace2.sln	\
 	projects/MSVC_2005/Freespace2.vcproj	\
 	projects/MSVC_2005/code.vcproj	\
+	projects/MSVC_6/Fred2.dsp	\
 	projects/MSVC_6/Freespace2.dsp	\
 	projects/MSVC_6/Freespace2.dsw	\
 	projects/MSVC_6/code.dsp	\
 	projects/MSVC_6/libjpeg.dsp	\
+	projects/MSVC_6/liblua.dsp	\
 	projects/MSVC_6/wxFRED2.dsp	\
-	projects/anjuta1/FS2_Open.prj	\
-	projects/anjuta1/README
+	projects/Xcode/English.lproj/InfoPlist.strings	\
+	projects/Xcode/FS2_Open.icns	\
+	projects/Xcode/FS2_Open.xcodeproj/project.pbxproj	\
+	projects/Xcode/Frameworks.tgz	\
+	projects/Xcode/Info-debug.plist	\
+	projects/Xcode/Info.plist	\
+	projects/Xcode/README.Xcode	\
+	projects/Xcode/SDLMain.h	\
+	projects/Xcode/SDLMain.m


 # D_ variants are defaults and should always be used
@@ -380,3 +380,335 @@ AC_DEFUN([AM_PATH_WXCONFIG],
  AC_SUBST(WX_LIBS_STATIC)
  AC_SUBST(WX_VERSION)
 ])
+
+# Configure paths for libogg
+# Jack Moffitt <[email protected]> 10-21-2000
+# Shamelessly stolen from Owen Taylor and Manish Singh
+
+dnl XIPH_PATH_OGG([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+dnl Test for libogg, and define OGG_CFLAGS and OGG_LIBS
+dnl
+AC_DEFUN([XIPH_PATH_OGG],
+[dnl 
+dnl Get the cflags and libraries
+dnl
+AC_ARG_WITH(ogg,[  --with-ogg=PFX   Prefix where libogg is installed (optional)], ogg_prefix="$withval", ogg_prefix="")
+AC_ARG_WITH(ogg-libraries,[  --with-ogg-libraries=DIR   Directory where libogg library is installed (optional)], ogg_libraries="$withval", ogg_libraries="")
+AC_ARG_WITH(ogg-includes,[  --with-ogg-includes=DIR   Directory where libogg header files are installed (optional)], ogg_includes="$withval", ogg_includes="")
+AC_ARG_ENABLE(oggtest, [  --disable-oggtest       Do not try to compile and run a test Ogg program],, enable_oggtest=yes)
+
+  if test "x$ogg_libraries" != "x" ; then
+    OGG_LIBS="-L$ogg_libraries"
+  elif test "x$ogg_prefix" != "x" ; then
+    OGG_LIBS="-L$ogg_prefix/lib"
+  elif test "x$prefix" != "xNONE" ; then
+    OGG_LIBS="-L$libdir"
+  fi
+
+  OGG_LIBS="$OGG_LIBS -logg"
+
+  if test "x$ogg_includes" != "x" ; then
+    OGG_CFLAGS="-I$ogg_includes"
+  elif test "x$ogg_prefix" != "x" ; then
+    OGG_CFLAGS="-I$ogg_prefix/include"
+  elif test "x$prefix" != "xNONE"; then
+    OGG_CFLAGS=""
+  fi
+
+  AC_MSG_CHECKING(for Ogg)
+  no_ogg=""
+
+
+  if test "x$enable_oggtest" = "xyes" ; then
+    ac_save_CFLAGS="$CFLAGS"
+    ac_save_LIBS="$LIBS"
+    CFLAGS="$CFLAGS $OGG_CFLAGS"
+    LIBS="$LIBS $OGG_LIBS"
+dnl
+dnl Now check if the installed Ogg is sufficiently new.
+dnl
+      rm -f conf.oggtest
+      AC_TRY_RUN([
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ogg/ogg.h>
+
+int main ()
+{
+  system("touch conf.oggtest");
+  return 0;
+}
+
+],, no_ogg=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+  fi
+
+  if test "x$no_ogg" = "x" ; then
+     AC_MSG_RESULT(yes)
+     ifelse([$1], , :, [$1])     
+  else
+     AC_MSG_RESULT(no)
+     if test -f conf.oggtest ; then
+       :
+     else
+       echo "*** Could not run Ogg test program, checking why..."
+       CFLAGS="$CFLAGS $OGG_CFLAGS"
+       LIBS="$LIBS $OGG_LIBS"
+       AC_TRY_LINK([
+#include <stdio.h>
+#include <ogg/ogg.h>
+],     [ return 0; ],
+       [ echo "*** The test program compiled, but did not run. This usually means"
+       echo "*** that the run-time linker is not finding Ogg or finding the wrong"
+       echo "*** version of Ogg. If it is not finding Ogg, you'll need to set your"
+       echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+       echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+       echo "*** is required on your system"
+       echo "***"
+       echo "*** If you have an old version installed, it is best to remove it, although"
+       echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
+       [ echo "*** The test program failed to compile or link. See the file config.log for the"
+       echo "*** exact error that occured. This usually means Ogg was incorrectly installed"
+       echo "*** or that you have moved Ogg since it was installed." ])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+     OGG_CFLAGS=""
+     OGG_LIBS=""
+     ifelse([$2], , :, [$2])
+  fi
+  AC_SUBST(OGG_CFLAGS)
+  AC_SUBST(OGG_LIBS)
+  rm -f conf.oggtest
+])
+
+# Configure paths for libvorbis
+# Jack Moffitt <[email protected]> 10-21-2000
+# Shamelessly stolen from Owen Taylor and Manish Singh
+# thomasvs added check for vorbis_bitrate_addblock which is new in rc3
+
+dnl XIPH_PATH_VORBIS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+dnl Test for libvorbis, and define VORBIS_CFLAGS and VORBIS_LIBS
+dnl
+AC_DEFUN([XIPH_PATH_VORBIS],
+[dnl 
+dnl Get the cflags and libraries
+dnl
+AC_ARG_WITH(vorbis,[  --with-vorbis=PFX   Prefix where libvorbis is installed (optional)], vorbis_prefix="$withval", vorbis_prefix="")
+AC_ARG_WITH(vorbis-libraries,[  --with-vorbis-libraries=DIR   Directory where libvorbis library is installed (optional)], vorbis_libraries="$withval", vorbis_libraries="")
+AC_ARG_WITH(vorbis-includes,[  --with-vorbis-includes=DIR   Directory where libvorbis header files are installed (optional)], vorbis_includes="$withval", vorbis_includes="")
+AC_ARG_ENABLE(vorbistest, [  --disable-vorbistest       Do not try to compile and run a test Vorbis program],, enable_vorbistest=yes)
+
+  if test "x$vorbis_libraries" != "x" ; then
+    VORBIS_LIBS="-L$vorbis_libraries"
+  elif test "x$vorbis_prefix" != "x" ; then
+    VORBIS_LIBS="-L$vorbis_prefix/lib"
+  elif test "x$prefix" != "xNONE"; then
+    VORBIS_LIBS="-L$libdir"
+  fi
+
+  VORBIS_LIBS="$VORBIS_LIBS -lvorbis -lm"
+  VORBISFILE_LIBS="-lvorbisfile"
+  VORBISENC_LIBS="-lvorbisenc"
+
+  if test "x$vorbis_includes" != "x" ; then
+    VORBIS_CFLAGS="-I$vorbis_includes"
+  elif test "x$vorbis_prefix" != "x" ; then
+    VORBIS_CFLAGS="-I$vorbis_prefix/include"
+  elif test "x$prefix" != "xNONE"; then
+    VORBIS_CFLAGS=""
+  fi
+
+
+  AC_MSG_CHECKING(for Vorbis)
+  no_vorbis=""
+
+
+  if test "x$enable_vorbistest" = "xyes" ; then
+    ac_save_CFLAGS="$CFLAGS"
+    ac_save_LIBS="$LIBS"
+    CFLAGS="$CFLAGS $VORBIS_CFLAGS $OGG_CFLAGS"
+    LIBS="$LIBS $VORBIS_LIBS $VORBISENC_LIBS $OGG_LIBS"
+dnl
+dnl Now check if the installed Vorbis is sufficiently new.
+dnl
+      rm -f conf.vorbistest
+      AC_TRY_RUN([
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <vorbis/codec.h>
+#include <vorbis/vorbisenc.h>
+
+int main ()
+{
+    vorbis_block 	vb;
+    vorbis_dsp_state	vd;
+    vorbis_info		vi;
+
+    vorbis_info_init (&vi);
+    vorbis_encode_init (&vi, 2, 44100, -1, 128000, -1);
+    vorbis_analysis_init (&vd, &vi);
+    vorbis_block_init (&vd, &vb);
+    /* this function was added in 1.0rc3, so this is what we're testing for */
+    vorbis_bitrate_addblock (&vb);
+
+    system("touch conf.vorbistest");
+    return 0;
+}
+
+],, no_vorbis=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+  fi
+
+  if test "x$no_vorbis" = "x" ; then
+     AC_MSG_RESULT(yes)
+     ifelse([$1], , :, [$1])     
+  else
+     AC_MSG_RESULT(no)
+     if test -f conf.vorbistest ; then
+       :
+     else
+       echo "*** Could not run Vorbis test program, checking why..."
+       CFLAGS="$CFLAGS $VORBIS_CFLAGS"
+       LIBS="$LIBS $VORBIS_LIBS $OGG_LIBS"
+       AC_TRY_LINK([
+#include <stdio.h>
+#include <vorbis/codec.h>
+],     [ return 0; ],
+       [ echo "*** The test program compiled, but did not run. This usually means"
+       echo "*** that the run-time linker is not finding Vorbis or finding the wrong"
+       echo "*** version of Vorbis. If it is not finding Vorbis, you'll need to set your"
+       echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+       echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+       echo "*** is required on your system"
+       echo "***"
+       echo "*** If you have an old version installed, it is best to remove it, although"
+       echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
+       [ echo "*** The test program failed to compile or link. See the file config.log for the"
+       echo "*** exact error that occured. This usually means Vorbis was incorrectly installed"
+       echo "*** or that you have moved Vorbis since it was installed." ])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+     VORBIS_CFLAGS=""
+     VORBIS_LIBS=""
+     VORBISFILE_LIBS=""
+     VORBISENC_LIBS=""
+     ifelse([$2], , :, [$2])
+  fi
+  AC_SUBST(VORBIS_CFLAGS)
+  AC_SUBST(VORBIS_LIBS)
+  AC_SUBST(VORBISFILE_LIBS)
+  AC_SUBST(VORBISENC_LIBS)
+  rm -f conf.vorbistest
+])
+
+dnl XIPH_PATH_THEORA([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+dnl Test for libtheora, and define THEORA_CFLAGS and THEORA_LIBS
+dnl
+AC_DEFUN([XIPH_PATH_THEORA],
+[dnl 
+dnl Get the cflags and libraries
+dnl
+AC_ARG_WITH(theora,[  --with-theora=PFX   Prefix where libtheora is installed (optional)], theora_prefix="$withval", theora_prefix="")
+AC_ARG_WITH(theora-libraries,[  --with-theora-libraries=DIR   Directory where libtheora library is installed (optional)], theora_libraries="$withval", theora_libraries="")
+AC_ARG_WITH(theora-includes,[  --with-theora-includes=DIR   Directory where libtheora header files are installed (optional)], theora_includes="$withval", theora_includes="")
+AC_ARG_ENABLE(theoratest, [  --disable-theoratest       Do not try to compile and run a test Theora program],, enable_theoratest=yes)
+
+  if test "x$theora_libraries" != "x" ; then
+    THEORA_LIBS="-L$theora_libraries"
+  elif test "x$theora_prefix" != "x" ; then
+    THEORA_LIBS="-L$theora_prefix/lib"
+  elif test "x$prefix" != "xNONE"; then
+    THEORA_LIBS="-L$libdir"
+  fi
+
+  THEORA_LIBS="$THEORA_LIBS -ltheora"
+
+  if test "x$theora_includes" != "x" ; then
+    THEORA_CFLAGS="-I$theora_includes"
+  elif test "x$theora_prefix" != "x" ; then
+    THEORA_CFLAGS="-I$theora_prefix/include"
+  elif test "x$prefix" != "xNONE"; then
+    THEORA_CFLAGS=""
+  fi
+
+
+  AC_MSG_CHECKING(for Theora)
+  no_theora=""
+
+
+  if test "x$enable_theoratest" = "xyes" ; then
+    ac_save_CFLAGS="$CFLAGS"
+    ac_save_LIBS="$LIBS"
+    CFLAGS="$CFLAGS $THEORA_CFLAGS $OGG_CFLAGS"
+    LIBS="$LIBS $THEORA_LIBS $OGG_LIBS"
+dnl
+dnl Now check if the installed Theora is sufficiently new.
+dnl
+      rm -f conf.theoratest
+      AC_TRY_RUN([
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <theora/theora.h>
+#include <vorbis/codec.h>
+
+int main ()
+{
+    theora_info		ti;
+    theora_state	ts;
+
+    theora_info_init(&ti);
+
+    system("touch conf.theoratest");
+    return 0;
+}
+
+],, no_theora=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+  fi
+
+  if test "x$no_theora" = "x" ; then
+     AC_MSG_RESULT(yes)
+     ifelse([$1], , :, [$1])     
+  else
+     AC_MSG_RESULT(no)
+     if test -f conf.theoratest ; then
+       :
+     else
+       echo "*** Could not run Theora test program, checking why..."
+       CFLAGS="$CFLAGS $THEORA_CFLAGS"
+       LIBS="$LIBS $THEORA_LIBS $OGG_LIBS"
+       AC_TRY_LINK([
+#include <stdio.h>
+#include <vorbis/codec.h>
+],     [ return 0; ],
+       [ echo "*** The test program compiled, but did not run. This usually means"
+       echo "*** that the run-time linker is not finding Theora or finding the wrong"
+       echo "*** version of Theora. If it is not finding Theora, you'll need to set your"
+       echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+       echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+       echo "*** is required on your system"
+       echo "***"
+       echo "*** If you have an old version installed, it is best to remove it, although"
+       echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
+       [ echo "*** The test program failed to compile or link. See the file config.log for the"
+       echo "*** exact error that occured. This usually means Theora was incorrectly installed"
+       echo "*** or that you have moved Theora since it was installed." ])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+     THEORA_CFLAGS=""
+     THEORA_LIBS=""
+     ifelse([$2], , :, [$2])
+  fi
+  AC_SUBST(THEORA_CFLAGS)
+  AC_SUBST(THEORA_LIBS)
+  rm -f conf.theoratest
+])
@@ -1,6 +1,6 @@
 ## code/Makefile.am for fs2_open
 ##
-## $Id: Makefile.am,v 1.20 2005-07-18 03:37:35 taylor Exp $
+## $Id: Makefile.am,v 1.31.2.10 2007-11-22 04:52:12 taylor Exp $


 EXTRA_DIST =	\
@@ -12,13 +12,180 @@ EXTRA_DIST =	\
 	freespace2/goal_inc.bmp	\
 	freespace2/goal_none.bmp	\
 	freespace2/goal_ord.bmp	\
-	wxfred2/res/FRED.ico	\
+	fred2/addvariabledlg.cpp	\
+	fred2/addvariabledlg.h	\
+	fred2/adjustgriddlg.cpp	\
+	fred2/adjustgriddlg.h	\
+	fred2/asteroideditordlg.cpp	\
+	fred2/asteroideditordlg.h	\
+	fred2/bgbitmapdlg.cpp	\
+	fred2/bgbitmapdlg.h	\
+	fred2/briefingeditordlg.cpp	\
+	fred2/briefingeditordlg.h	\
+	fred2/campaigneditordlg.cpp	\
+	fred2/campaigneditordlg.h	\
+	fred2/campaignfilelistbox.cpp	\
+	fred2/campaignfilelistbox.h	\
+	fred2/campaigntreeview.cpp	\
+	fred2/campaigntreeview.h	\
+	fred2/campaigntreewnd.cpp	\
+	fred2/campaigntreewnd.h	\
+	fred2/cmdbrief.cpp	\
+	fred2/cmdbrief.h	\
+	fred2/createwingdlg.cpp	\
+	fred2/createwingdlg.h	\
+	fred2/customwingnames.cpp	\
+	fred2/customwingnames.h	\
+	fred2/debriefingeditordlg.cpp	\
+	fred2/debriefingeditordlg.h	\
+	fred2/dialog1.cpp	\
+	fred2/dialog1.h	\
+	fred2/dumpstats.cpp	\
+	fred2/dumpstats.h	\
+	fred2/editor.h	\
+	fred2/eventeditor.cpp	\
+	fred2/eventeditor.h	\
+	fred2/folderdlg.cpp	\
+	fred2/folderdlg.h	\
+	fred2/fred.cpp	\
+	fred2/fred.h	\
+	fred2/fred.rc	\
+	fred2/freddoc.cpp	\
+	fred2/freddoc.h	\
+	fred2/fredrender.cpp	\
+	fred2/fredrender.h	\
+	fred2/fredstubs.cpp	\
+	fred2/fredview.cpp	\
+	fred2/fredview.h	\
+	fred2/grid.cpp	\
+	fred2/grid.h	\
+	fred2/ignoreordersdlg.cpp	\
+	fred2/ignoreordersdlg.h	\
+	fred2/initialships.cpp	\
+	fred2/initialships.h	\
+	fred2/initialstatus.cpp	\
+	fred2/initialstatus.h	\
+	fred2/mainfrm.cpp	\
+	fred2/mainfrm.h	\
+	fred2/makehelp.bat	\
+	fred2/management.cpp	\
+	fred2/management.h	\
+	fred2/messageeditordlg.cpp	\
+	fred2/messageeditordlg.h	\
+	fred2/missiongoalsdlg.cpp	\
+	fred2/missiongoalsdlg.h	\
+	fred2/missionnotesdlg.cpp	\
+	fred2/missionnotesdlg.h	\
+	fred2/missionsave.cpp	\
+	fred2/missionsave.h	\
+	fred2/modifyvariabledlg.cpp	\
+	fred2/modifyvariabledlg.h	\
+	fred2/operatorargtypeselect.cpp	\
+	fred2/operatorargtypeselect.h	\
+	fred2/orienteditor.cpp	\
+	fred2/orienteditor.h	\
+	fred2/playerstarteditor.cpp	\
+	fred2/playerstarteditor.h	\
+	fred2/prefsdlg.cpp	\
+	fred2/prefsdlg.h	\
+	fred2/reinforcementeditordlg.cpp	\
+	fred2/reinforcementeditordlg.h	\
+	fred2/resource.h	\
+	fred2/resource.hm	\
+	fred2/setglobalshipflags.cpp	\
+	fred2/setglobalshipflags.h	\
+	fred2/sexp_tree.cpp	\
+	fred2/sexp_tree.h	\
+	fred2/shieldsysdlg.cpp	\
+	fred2/shieldsysdlg.h	\
+	fred2/ship_select.cpp	\
+	fred2/ship_select.h	\
+	fred2/shipchecklistbox.cpp	\
+	fred2/shipchecklistbox.h	\
+	fred2/shipclasseditordlg.cpp	\
+	fred2/shipclasseditordlg.h	\
+	fred2/shipeditordlg.cpp	\
+	fred2/shipeditordlg.h	\
+	fred2/shipflagsdlg.cpp	\
+	fred2/shipflagsdlg.h	\
+	fred2/shipgoalsdlg.cpp	\
+	fred2/shipgoalsdlg.h	\
+	fred2/shipspecialdamage.cpp	\
+	fred2/shipspecialdamage.h	\
+	fred2/shipspecialhitpoints.cpp	\
+	fred2/shipspecialhitpoints.h	\
+	fred2/shiptexturesdlg.cpp	\
+	fred2/shiptexturesdlg.h	\
+	fred2/starfieldeditor.cpp	\
+	fred2/starfieldeditor.h	\
+	fred2/stdafx.cpp	\
+	fred2/stdafx.h	\
+	fred2/textviewdlg.cpp	\
+	fred2/textviewdlg.h	\
+	fred2/voiceactingmanager.cpp	\
+	fred2/voiceactingmanager.h	\
+	fred2/waypointpathdlg.cpp	\
+	fred2/waypointpathdlg.h	\
+	fred2/weaponeditordlg.cpp	\
+	fred2/weaponeditordlg.h	\
+	fred2/wing.cpp	\
+	fred2/wing.h	\
+	fred2/wing_editor.cpp	\
+	fred2/wing_editor.h	\
+	fred2/hlp/afxcore.rtf	\
+	fred2/hlp/afxhelp.hm	\
+	fred2/hlp/afxprint.rtf	\
+	fred2/hlp/appexit.bmp	\
+	fred2/hlp/bullet.bmp	\
+	fred2/hlp/curarw2.bmp	\
+	fred2/hlp/curarw4.bmp	\
+	fred2/hlp/curhelp.bmp	\
+	fred2/hlp/editcopy.bmp	\
+	fred2/hlp/editcut.bmp	\
+	fred2/hlp/editpast.bmp	\
+	fred2/hlp/editundo.bmp	\
+	fred2/hlp/filenew.bmp	\
+	fred2/hlp/fileopen.bmp	\
+	fred2/hlp/fileprnt.bmp	\
+	fred2/hlp/filesave.bmp	\
+	fred2/hlp/fred.hm	\
+	fred2/hlp/fred.hpj	\
+	fred2/hlp/help.log	\
+	fred2/hlp/hlpsbar.bmp	\
+	fred2/hlp/hlptbar.bmp	\
+	fred2/hlp/recfirst.bmp	\
+	fred2/hlp/reclast.bmp	\
+	fred2/hlp/recnext.bmp	\
+	fred2/hlp/recprev.bmp	\
+	fred2/hlp/scmax.bmp	\
+	fred2/hlp/scmenu.bmp	\
+	fred2/hlp/scmin.bmp	\
+	fred2/res/bitmap1.bmp	\
+	fred2/res/black_do.bmp	\
+	fred2/res/bmp00001.bmp	\
+	fred2/res/chained.bmp	\
+	fred2/res/chained_directive.bmp	\
+	fred2/res/cursor1.cur	\
+	fred2/res/cursor2.cur	\
+	fred2/res/data.bmp	\
+	fred2/res/fred.ico	\
+	fred2/res/fred.rc2	\
+	fred2/res/freddoc.ico	\
+	fred2/res/green_do.bmp	\
+	fred2/res/root.bmp	\
+	fred2/res/root_directive.bmp	\
+	fred2/res/toolbar.bmp	\
+	fred2/res/toolbar1.bmp	\
+	fred2/res/variable.bmp	\
+	sound/phrases.xml	\
+	sound/gc.exe	\
+	wxfred2/res/fred.ico	\
 	wxfred2/wxfred.xrc


 # D_ variants are defaults and should always be used
 # FS2_ variants are for game building and wxFRED
-AM_CXXFLAGS = @D_CFLAGS@ @FS2_CXXFLAGS@
+AM_CXXFLAGS = @D_CFLAGS@ @FS2_CXXFLAGS@ -I../lua
 AM_LDFLAGS = @D_LDFLAGS@ @FS2_LDFLAGS@

 noinst_LIBRARIES = libcode.a
@@ -42,6 +209,8 @@ FS2_SOURCES =	\
 	ai/aiinternal.h	\
 	ai/ailocal.h	\
 	ai/aiturret.cpp	\
+	ai/ai_profiles.cpp	\
+	ai/ai_profiles.h	\
 	anim/animplay.cpp	\
 	anim/animplay.h	\
 	anim/packunpack.cpp	\
@@ -71,8 +240,16 @@ FS2_SOURCES =	\
 	controlconfig/controlsconfigcommon.cpp	\
 	cutscene/cutscenes.cpp	\
 	cutscene/cutscenes.h	\
+	cutscene/decoder16.cpp	\
+	cutscene/decoder8.cpp	\
 	cutscene/movie.cpp	\
 	cutscene/movie.h	\
+	cutscene/mve_audio.cpp	\
+	cutscene/mvelib.cpp	\
+	cutscene/mvelib.h	\
+	cutscene/mveplayer.cpp	\
+	cutscene/oggplayer.cpp	\
+	cutscene/oggplayer.h	\
 	ddsutils/ddsutils.cpp	\
 	ddsutils/ddsutils.h	\
 	debris/debris.cpp	\
@@ -90,14 +267,13 @@ FS2_SOURCES =	\
 	fireball/fireballs.cpp	\
 	fireball/fireballs.h	\
 	fireball/warpineffect.cpp	\
-	fs2open_pxo/Client.cpp	\
-	fs2open_pxo/Client.h	\
-	fs2open_pxo/TCP_Client.cpp	\
-	fs2open_pxo/TCP_Socket.cpp	\
-	fs2open_pxo/TCP_Socket.h	\
-	fs2open_pxo/protocol.h	\
-	fs2open_pxo/udpsocket.cpp	\
-	fs2open_pxo/udpsocket.h	\
+	fs2netd/fs2netd_client.cpp	\
+	fs2netd/fs2netd_client.h	\
+	fs2netd/tcp_client.cpp	\
+	fs2netd/tcp_client.h	\
+	fs2netd/tcp_socket.cpp	\
+	fs2netd/tcp_socket.h	\
+	fs2netd/protocol.h	\
 	gamehelp/contexthelp.cpp	\
 	gamehelp/contexthelp.h	\
 	gamehelp/gameplayhelp.cpp	\
@@ -108,6 +284,8 @@ FS2_SOURCES =	\
 	globalincs/alphacolors.h	\
 	globalincs/crypt.cpp	\
 	globalincs/crypt.h	\
+	globalincs/def_files.cpp	\
+	globalincs/def_files.h	\
 	globalincs/globals.h	\
 	globalincs/linklist.h	\
 	globalincs/pstypes.h	\
@@ -119,6 +297,8 @@ FS2_SOURCES =	\
 	graphics/2d.h	\
 	graphics/font.cpp	\
 	graphics/font.h	\
+	graphics/generic.cpp	\
+	graphics/generic.h	\
 	graphics/grbatch.cpp	\
 	graphics/grbatch.h	\
 	graphics/grinternal.h	\
@@ -126,17 +306,22 @@ FS2_SOURCES =	\
 	graphics/gropengl.h	\
 	graphics/gropenglbmpman.cpp	\
 	graphics/gropenglbmpman.h	\
+	graphics/gropengldraw.cpp	\
+	graphics/gropengldraw.h	\
 	graphics/gropenglextension.cpp	\
 	graphics/gropenglextension.h	\
 	graphics/gropengllight.cpp	\
 	graphics/gropengllight.h	\
+	graphics/gropenglshader.cpp	\
+	graphics/gropenglshader.h	\
+	graphics/gropenglstate.cpp	\
+	graphics/gropenglstate.h	\
 	graphics/gropengltexture.cpp	\
 	graphics/gropengltexture.h	\
 	graphics/gropengltnl.cpp	\
 	graphics/gropengltnl.h	\
+	graphics/grstub.cpp	\
 	graphics/grstub.h	\
-	graphics/grzbuffer.cpp	\
-	graphics/grzbuffer.h	\
 	graphics/line.h	\
 	graphics/tmapper.h	\
 	hud/hud.cpp	\
@@ -175,6 +360,14 @@ FS2_SOURCES =	\
 	hud/hudtargetbox.h	\
 	hud/hudwingmanstatus.cpp	\
 	hud/hudwingmanstatus.h	\
+	iff_defs/iff_defs.cpp	\
+	iff_defs/iff_defs.h	\
+	inetfile/cftp.cpp	\
+	inetfile/cftp.h	\
+	inetfile/chttpget.cpp	\
+	inetfile/chttpget.h	\
+	inetfile/inetgetfile.cpp	\
+	inetfile/inetgetfile.h	\
 	io/key.cpp	\
 	io/key.h	\
 	io/keycontrol.cpp	\
@@ -183,8 +376,8 @@ FS2_SOURCES =	\
 	io/mouse.h	\
 	io/timer.cpp	\
 	io/timer.h	\
-	irc/irc.cpp	\
-	irc/irc.h	\
+	io/trackir.cpp	\
+	io/trackir.h	\
 	jpgutils/jpgutils.cpp	\
 	jpgutils/jpgutils.h	\
 	jumpnode/jumpnode.cpp	\
@@ -232,8 +425,6 @@ FS2_SOURCES =	\
 	menuui/readyroom.h	\
 	menuui/snazzyui.cpp	\
 	menuui/snazzyui.h	\
-	menuui/storybook.cpp	\
-	menuui/storybook.h	\
 	menuui/techmenu.cpp	\
 	menuui/techmenu.h	\
 	menuui/trainingmenu.cpp	\
@@ -260,6 +451,8 @@ FS2_SOURCES =	\
 	mission/missiontraining.h	\
 	missionui/chatbox.cpp	\
 	missionui/chatbox.h	\
+	missionui/fictionviewer.cpp	\
+	missionui/fictionviewer.h	\
 	missionui/missionbrief.cpp	\
 	missionui/missionbrief.h	\
 	missionui/missioncmdbrief.cpp	\
@@ -283,6 +476,8 @@ FS2_SOURCES =	\
 	missionui/redalert.cpp	\
 	missionui/redalert.h	\
 	model/model.h	\
+	model/modelanim.cpp	\
+	model/modelanim.h	\
 	model/modelcollide.cpp	\
 	model/modelinterp.cpp	\
 	model/modelsinc.h	\
@@ -292,10 +487,11 @@ FS2_SOURCES =	\
 	nebula/neb.h	\
 	nebula/neblightning.cpp	\
 	nebula/neblightning.h	\
-	network/fs2ox.cpp	\
-	network/fs2ox.h	\
+	network/chat_api.cpp	\
+	network/chat_api.h	\
 	network/multi.cpp	\
 	network/multi.h	\
+	network/multilag.cpp	\
 	network/multilag.h	\
 	network/multimsgs.cpp	\
 	network/multimsgs.h	\
@@ -334,6 +530,8 @@ FS2_SOURCES =	\
 	network/multi_ping.h	\
 	network/multi_pmsg.cpp	\
 	network/multi_pmsg.h	\
+	network/multi_pxo.cpp	\
+	network/multi_pxo.h	\
 	network/multi_rate.cpp	\
 	network/multi_rate.h	\
 	network/multi_respawn.cpp	\
@@ -349,26 +547,41 @@ FS2_SOURCES =	\
 	network/psnet.h	\
 	network/psnet2.cpp	\
 	network/psnet2.h	\
+	network/stand_gui.cpp	\
+	network/stand_gui-unix.cpp	\
+	network/stand_gui.h	\
 	object/collidedebrisship.cpp	\
 	object/collidedebrisweapon.cpp	\
 	object/collideshipship.cpp	\
 	object/collideshipweapon.cpp	\
 	object/collideweaponweapon.cpp	\
+	object/deadobjectdock.cpp	\
+	object/deadobjectdock.h	\
 	object/objcollide.cpp	\
 	object/objcollide.h	\
 	object/objectdock.cpp	\
 	object/objectdock.h	\
 	object/object.cpp	\
 	object/object.h	\
+	object/objectshield.cpp	\
+	object/objectshield.h	\
 	object/objectsort.cpp	\
+	object/parseobjectdock.cpp	\
+	object/parseobjectdock.h	\
+	object/waypoint.cpp	\
+	object/waypoint.h	\
 	observer/observer.cpp	\
 	observer/observer.h	\
 	palman/palman.cpp	\
 	palman/palman.h	\
 	parse/encrypt.cpp	\
 	parse/encrypt.h	\
+	parse/lua.cpp	\
+	parse/lua.h	\
 	parse/parselo.cpp	\
 	parse/parselo.h	\
+	parse/scripting.cpp	\
+	parse/scripting.h	\
 	parse/sexp.cpp	\
 	parse/sexp.h	\
 	particle/particle.cpp	\
@@ -481,23 +694,10 @@ endif
 if FS2_OS_UNIX
 JOY_SOURCES =	\
 	io/joy.h	\
+	io/joy_ff.h	\
 	io/joy-unix.cpp
 endif

-## networking support sources
-if FS2_OS_WIN32
-FS2_SOURCES +=	\
-	network/multilag.cpp	\
-	network/stand_gui.cpp	\
-	network/stand_gui.h
-endif
-
-if FS2_OS_UNIX
-FS2_SOURCES +=	\
-	network/stand_gui-unix.cpp	\
-	network/stand_gui.h
-endif
-
 ## sound support sources
 if FS2_SOUND
 SOUND_SOURCES =	\
@@ -519,6 +719,8 @@ SOUND_SOURCES =	\
 	sound/ds.h	\
 	sound/ds3d.cpp	\
 	sound/ds3d.h	\
+	sound/dscap.cpp	\
+	sound/dscap.h	\
 	sound/midifile.cpp	\
 	sound/midifile.h	\
 	sound/midiseq.h	\
@@ -536,14 +738,9 @@ SOUND_SOURCES =	\
 	sound/fsspeech.cpp	\
 	sound/fsspeech.h	\
 	sound/speech.cpp	\
-	sound/speech.h
-
-if FS2_OS_WIN32
-SOUND_SOURCES +=	\
-	sound/dscap.cpp	\
-	sound/dscap.h
-endif
-
+	sound/speech.h	\
+	sound/voicerec.cpp	\
+	sound/voicerec.h
 endif

 ## Win32-specific sources
@@ -566,13 +763,10 @@ WIN32_SOURCES =	\
 	graphics/gl/Gl.h	\
 	graphics/gl/Glext.h	\
 	graphics/gl/wglext.h	\
-	graphics/GrD3DParticle.cpp	\
-	graphics/GrD3DParticle.h	\
 	graphics/GrD3DStateBlock.cpp	\
+	graphics/GrD3DStateBlock.h	\
 	graphics/grd3d.cpp	\
 	graphics/grd3d.h	\
-	graphics/grd3dbatch.cpp	\
-	graphics/grd3dbatch.h	\
 	graphics/grd3dcalls.cpp	\
 	graphics/grd3dbmpman.cpp	\
 	graphics/grd3dbmpman.h	\
@@ -627,15 +821,13 @@ FS2OPEN_SOURCES = \
 	freespace2/levelpaging.h

 fs2_open_d_SOURCES =	\
-	${FS2OPEN_SOURCES}	\
-	${PLATFORM_SOURCES}
+	${FS2OPEN_SOURCES}

 fs2_open_r_SOURCES =	\
-	${FS2OPEN_SOURCES}	\
-	${PLATFORM_SOURCES}
+	${FS2OPEN_SOURCES}

-fs2_open_d_LDADD = libcode.a ../libjpeg/libjpeg.a
-fs2_open_r_LDADD = libcode.a ../libjpeg/libjpeg.a
+fs2_open_d_LDADD = libcode.a ../libjpeg/libjpeg.a ../lua/liblua.a
+fs2_open_r_LDADD = libcode.a ../libjpeg/libjpeg.a ../lua/liblua.a

 ##
 ## End MAIN binary
@@ -656,12 +848,10 @@ wxFRED_SOURCES = \
 	wxfred2/wxfred_xrc.h

 wxFRED2_d_SOURCES = \
-	${wxFRED_SOURCES}	\
-	${PLATFORM_SOURCES}
+	${wxFRED_SOURCES}

 wxFRED2_r_SOURCES =	\
-	${wxFRED_SOURCES}	\
-	${PLATFORM_SOURCES}
+	${wxFRED_SOURCES}

 wxFRED2_d_LDADD = libcode.a ../libjpeg/libjpeg.a
 wxFRED2_r_LDADD = libcode.a ../libjpeg/libjpeg.a
@@ -9,11 +9,43 @@

 /*
 * $Logfile: /Freespace2/code/Ship/ai.h $
- * $Revision: 1.7 $
- * $Date: 2005-07-27 17:22:22 $
+ * $Revision: 1.12.2.2 $
+ * $Date: 2007-08-11 16:51:55 $
 * $Author: Goober5000 $
 *
 * $Log: not supported by cvs2svn $
+ * Revision 1.12.2.1  2006/06/04 01:03:12  Goober5000
+ * add fighterbay restriction code
+ * --Goober5000
+ *
+ * Revision 1.12  2006/02/25 21:46:59  Goober5000
+ * spelling
+ *
+ * Revision 1.11  2006/02/20 02:13:07  Goober5000
+ * added ai-ignore-new which hopefully should fix the ignore bug
+ * --Goober5000
+ *
+ * Revision 1.10  2006/02/19 22:00:09  Goober5000
+ * restore original ignore behavior and remove soon-to-be-obsolete ai-chase-any-except
+ * --Goober5000
+ *
+ * Revision 1.9  2005/11/24 08:46:11  Goober5000
+ * * cleaned up mission_do_departure
+ *   * fixed a hidden crash (array index being -1; would only
+ * be triggered for ships w/o subspace drives under certain conditions)
+ *   * removed finding a new fighterbay target because it might screw up missions
+ *   * improved clarity, code flow, and readability :)
+ * * added custom AI flag for disabling warpouts if navigation subsystem fails
+ * --Goober5000
+ *
+ * Revision 1.8  2005/11/21 00:46:05  Goober5000
+ * add ai_settings.tbl
+ * --Goober5000
+ *
+ * Revision 1.7  2005/07/27 17:22:22  Goober5000
+ * more tweaks to the dock code
+ * --Goober5000
+ *
 * Revision 1.6  2005/07/25 03:13:24  Goober5000
 * various code cleanups, tweaks, and fixes; most notably the MISSION_FLAG_USE_NEW_AI
 * should now be added to all places where it is needed (except the turret code, which I still
@@ -114,7 +146,7 @@
 * Full-fledged ballistic primary support added!  Try it and see! :)
 *
 * Revision 2.2  2002/10/19 19:29:28  bobboau
- * inital commit, trying to get most of my stuff into FSO, there should be most of my fighter beam, beam rendering, beam shield hit, ABtrails, and ssm stuff. one thing you should be happy to know is the beam texture tileing is now set in the beam section section of the weapon table entry
+ * initial commit, trying to get most of my stuff into FSO, there should be most of my fighter beam, beam rendering, beam shield hit, ABtrails, and ssm stuff. one thing you should be happy to know is the beam texture tileing is now set in the beam section section of the weapon table entry
 *
 * Revision 2.1  2002/08/01 01:41:09  penguin
 * The big include file move
@@ -301,6 +333,7 @@ struct object;

 // Goober5000
 #define	AIF_UNLOAD_PRIMARIES				(1 << 24)	//	Fire primaries as fast as possible!
+#define AIF_TRYING_UNSUCCESSFULLY_TO_WARP	(1 << 25)	// Trying to warp, but can't warp at the moment

 #define	AIF_AVOID_SHOCKWAVE		(AIF_AVOID_SHOCKWAVE_SHIP | AIF_AVOID_SHOCKWAVE_WEAPON)
 #define	AIF_FORMATION			(AIF_FORMATION_WING | AIF_FORMATION_OBJECT)
@@ -355,10 +388,6 @@ struct object;

 #define	KAMIKAZE_HULL_ON_DEATH	-1000.0f	//	Hull strength ship gets set to if it crash-dies.

-// Goober5000, currently only used for the ai-chase-any-except behavior.  This can never go
-// above 32, because 32 is the maximum number of bits possible in a unit data type.  If you
-// need more, you're out of luck - you'll have to add a second special object array. :)
-#define MAX_SPECIAL_OBJECTS	32

 // structure for AI goals
 typedef struct ai_goal {
@@ -374,13 +403,6 @@ typedef struct ai_goal {
 	int	wp_index;			// index into waypoints list of waypoints that this ship might fly.
 	int	weapon_signature;	// signature of weapon this ship might be chasing.  Paired with above value to get target.

-	// Goober5000
-	char	*special_object[MAX_SPECIAL_OBJECTS];		// name of ship (or wing) that this goal acts upon
-	int		special_object_num[MAX_SPECIAL_OBJECTS];	// index of ship or wing in Ship[] or Wing[]
-	int		special_object_index[MAX_SPECIAL_OBJECTS];	// index of special_object in Goal_ship_names[][]
-	uint	special_object_flags;
-	int		num_special_objects;
-
 	// unions for docking stuff.
 	// (AIGF_DOCKER_INDEX_VALID and AIGF_DOCKEE_INDEX_VALID tell us to use indexes; otherwise we use names)
 	// these are the dockpoints used on the docker and dockee ships, not the ships themselves
@@ -424,19 +446,8 @@ typedef struct ai_goal {
 #define	MAX_AI_BEHAVIORS		22	//	Number of AIM_xxxx types

 #define	MAX_WAYPOINTS_PER_LIST	20
-#define	MAX_WAYPOINT_LISTS		32
 #define	MAX_ENEMY_DISTANCE	2500.0f			//	maximum distance from which a ship will pursue an enemy.

-// waypoint list flags bitmasks.
-#define WL_MARKED	0x01
-
-typedef struct waypoint_list {
-	char		name[NAME_LENGTH];
-	int		count;
-	char		flags[MAX_WAYPOINTS_PER_LIST];
-	vec3d	waypoints[MAX_WAYPOINTS_PER_LIST];
-} waypoint_list;
-
 #define AI_GOAL_NONE				-1

 #define	AI_ACTIVE_GOAL_DYNAMIC	999
@@ -527,13 +538,16 @@ typedef struct pnode {
 extern pnode	Path_points[MAX_PATH_POINTS];
 extern pnode	*Ppfp;			//	Free pointer in path points.

+// Goober5000 (based on the "you can only remember 7 things in short-term memory" assumption)
+#define MAX_IGNORE_NEW_OBJECTS	7
+
 typedef struct ai_info {
 	int		ai_flags;				//	Special flags for AI behavior.
 	int		shipnum;					// Ship using this slot, -1 means none.
 	int		type;						//	
 	int		wing;						//	Member of what wing? -1 means none. 

-	int		behavior;				//	AI Class.  Doesn't change after initial setting.
+	int		behavior;				//	AI behavior; vestigial field from early development of FS1
 	int		mode;
 	int		previous_mode;
 	int		mode_time;				//	timestamp at which current mode elapses.
@@ -563,6 +577,10 @@ typedef struct ai_info {
 	int		ignore_objnum;			//	ship to be ignored, based on player order.  UNUSED_OBJNUM if none.  -(wing_num+1) if ignoring wing.
 	int		ignore_signature;		//	signature of ship to be ignored

+	// Goober5000
+	int		ignore_new_objnums[MAX_IGNORE_NEW_OBJECTS];
+	int		ignore_new_signatures[MAX_IGNORE_NEW_OBJECTS];
+
 	int		ai_class;				//	Class.  Might be override of default.

 	//	Probably become obsolete, to be replaced by path_start, path_cur, etc.
@@ -733,7 +751,6 @@ extern int Num_ai_classes;
 extern int Ai_firing_enabled;

 extern char	*Skill_level_names(int skill_level, int translate = 1);
-extern int	Skill_level_max_attackers[NUM_SKILL_LEVELS];
 extern int Ai_goal_signature;

 // need access to following data in AiBig.cpp
@@ -761,15 +778,12 @@ int get_wingnum(int objnum);
 void set_wingnum(int objnum, int wingnum);
 char *ai_get_goal_ship_name(char *name, int *index);

-extern waypoint_list Waypoint_lists[MAX_WAYPOINT_LISTS];
-extern int	Num_waypoint_lists;
-
 extern void init_ai_system(void);
-extern void ai_attack_object(object *attacker, object *attacked, int priority, ship_subsys *ssp, int except = 0);
-extern void ai_evade_object(object *evader, object *evaded, int priority);
-extern void ai_ignore_object(object *ignorer, object *ignored, int priority);
+extern void ai_attack_object(object *attacker, object *attacked, ship_subsys *ssp);
+extern void ai_evade_object(object *evader, object *evaded);
+extern void ai_ignore_object(object *ignorer, object *ignored, int ignore_new);
 extern void ai_ignore_wing(object *ignorer, int wingnum, int priority);
-extern void ai_dock_with_object(object *docker, int docker_index, object *dockee, int dockee_index, int priority, int dock_type);
+extern void ai_dock_with_object(object *docker, int docker_index, object *dockee, int dockee_index, int dock_type);
 extern void ai_stay_still(object *still_objp, vec3d *view_pos);
 extern void ai_set_default_behavior(object *obj, int classnum);
 extern void ai_do_default_behavior(object *obj);
@@ -790,14 +804,14 @@ extern void ai_update_danger_weapon(int objnum, int weapon_objnum);
 // called externally from MissionParse.cpp to position ships in wings upon arrival into the
 // mission.
 extern void get_absolute_wing_pos( vec3d *result_pos, object *leader_objp, int wing_index, int formation_object_flag);
-
+extern void get_absolute_wing_pos_autopilot( vec3d *result_pos, object *leader_objp, int wing_index, int formation_object_flag);

 //	Interface from goals code to AI.  Set ship to guard.  *objp guards *other_objp
 extern void ai_set_guard_object(object *objp, object *other_objp);
 extern void ai_set_evade_object(object *objp, object *other_objp);
 extern void ai_set_guard_wing(object *objp, int wingnum);
 extern void ai_warp_out(object *objp, vec3d *vp);
-extern void ai_attack_wing(object *attacker, int wingnum, int priority);
+extern void ai_attack_wing(object *attacker, int wingnum);
 extern void ai_deathroll_start(object *ship_obj);
 extern void ai_fly_in_formation(int wing_num);		//	Force wing to fly in formation.
 extern void ai_disband_formation(int wing_num);		//	Force wing to disband formation flying.
@@ -805,7 +819,7 @@ extern int set_target_objnum(ai_info *aip, int objnum);
 extern void ai_form_on_wing(object *objp, object *goal_objp);
 extern void ai_do_stay_near(object *objp, object *other_obj, float dist);
 extern ship_subsys *set_targeted_subsys(ai_info *aip, ship_subsys *new_subsys, int parent_objnum);
-extern void ai_rearm_repair( object *objp, int docker_index, object *goal_objp, int dockee_index, int priority );
+extern void ai_rearm_repair( object *objp, int docker_index, object *goal_objp, int dockee_index );
 extern void ai_add_rearm_goal( object *requester_objp, object *support_objp );
 extern void create_model_path(object *pl_objp, object *mobjp, int path_num, int subsys_path=0);

@@ -813,8 +827,8 @@ extern void create_model_path(object *pl_objp, object *mobjp, int path_num, int
 extern void ai_do_safety(object *objp);

 // used to get path info for fighter bay emerging and departing
-int ai_acquire_emerge_path(object *pl_objp, int parent_objnum, vec3d *pos, vec3d *fvec);
-int ai_acquire_depart_path(object *pl_objp, int parent_objnum);
+int ai_acquire_emerge_path(object *pl_objp, int parent_objnum, int path_mask, vec3d *pos, vec3d *fvec);
+int ai_acquire_depart_path(object *pl_objp, int parent_objnum, int path_mask);

 // used by AiBig.cpp
 extern void ai_set_positions(object *pl_objp, object *en_objp, ai_info *aip, vec3d *player_pos, vec3d *enemy_pos);
@@ -835,7 +849,7 @@ extern int ai_maybe_fire_afterburner(object *objp, ai_info *aip);
 extern void set_predicted_enemy_pos(vec3d *predicted_enemy_pos, object *pobjp, object *eobjp, ai_info *aip);

 extern int is_instructor(object *objp);
-extern int find_enemy(int objnum, float range, int max_attackers, int except = 0);
+extern int find_enemy(int objnum, float range, int max_attackers);

 float ai_get_weapon_speed(ship_weapon *swp);
 void set_predicted_enemy_pos_turret(vec3d *predicted_enemy_pos, vec3d *gun_pos, object *pobjp, vec3d *enemy_pos, vec3d *enemy_vel, float weapon_speed, float time_enemy_in_range);
@@ -853,7 +867,7 @@ extern int find_danger_weapon(object *sobjp, float dtime, float *atime, float do
 void ai_set_mode_warp_out(object *objp, ai_info *aip);

 // prototyped by Goober5000
-int get_nearest_objnum(int objnum, int enemy_team_mask, int enemy_wing, float range, int max_attackers, int except = 0);
+int get_nearest_objnum(int objnum, int enemy_team_mask, int enemy_wing, float range, int max_attackers);

 // moved to header file by Goober5000
 void ai_announce_ship_dying(object *dying_objp);
@@ -0,0 +1,444 @@
+/*
+ * Created by Ian "Goober5000" Warfield for the FreeSpace2 Source Code Project.
+ * You may not sell or otherwise commercially exploit the source or things you
+ * create based on the source.
+ */
+
+/*
+ * $Logfile: /Freespace2/code/ai/ai_profiles.cpp $
+ * $Revision: 1.13.2.9 $
+ * $Date: 2007-10-15 06:43:08 $
+ * $Author: taylor $
+ *
+ * $Log: not supported by cvs2svn $
+ * Revision 1.13.2.8  2007/09/02 02:07:37  Goober5000
+ * added fixes for #1415 and #1483, made sure every read_file_text had a corresponding setjmp, and sync'd the parse error messages between HEAD and stable
+ *
+ * Revision 1.13.2.7  2007/07/28 22:04:13  Goober5000
+ * apply some of Turey's changes to stable branch
+ *
+ * Revision 1.13.2.6  2007/07/15 02:45:48  Goober5000
+ * fixed a small bug in the lab
+ * moved WMC's no damage scaling flag to ai_profiles and made it work correctly
+ * removed my old supercap damage scaling change
+ * moved Turey's truefire flag to ai_profiles
+ *
+ * Revision 1.13.2.5  2007/02/27 01:44:44  Goober5000
+ * add two features for WCS: specifyable shield/weapon recharge rates, and removal of linked fire penalty
+ *
+ * Revision 1.13.2.4  2006/09/11 01:15:03  taylor
+ * fixes for stuff_string() bounds checking
+ *
+ * Revision 1.13.2.3  2006/07/12 04:57:20  taylor
+ * fix the endless-loop fix ;)  (this is what broke shield recharging btw)
+ *
+ * Revision 1.13.2.2  2006/07/06 18:19:55  Goober5000
+ * fix dumb endless loop bug
+ * --Goober5000
+ *
+ * Revision 1.13.2.1  2006/07/02 03:39:34  Goober5000
+ * remove associated AI flags
+ * --Goober5000
+ *
+ * Revision 1.13  2006/04/20 06:32:00  Goober5000
+ * proper capitalization according to Volition
+ *
+ * Revision 1.12  2006/03/20 06:25:19  taylor
+ * change wording to ease Goober's ulcer. ;)
+ *
+ * Revision 1.11  2006/03/20 06:19:03  taylor
+ * add ai_profiles flag to get rid of limit on minimum speed a docked ship can move
+ * (not going to Int3() here from < 0.1 speed by default, a support ship actually hit it)
+ *
+ * Revision 1.10  2006/02/13 04:56:58  Goober5000
+ * enabled modular tables for ai_profiles and added the default table to def_files
+ * --Goober5000
+ *
+ * Revision 1.9  2006/02/13 00:20:44  Goober5000
+ * more tweaks, plus clarification of checks for the existence of files
+ * --Goober5000
+ *
+ * Revision 1.8  2005/12/22 04:32:44  taylor
+ * GCC knows that fix == int so it hates the utility functions here, for sanity sake just rename them to type specific to avoid rampant casting
+ *
+ * Revision 1.7  2005/12/06 03:17:48  taylor
+ * cleanup some debug log messages:
+ *   note that a nprintf() with "Warning" or "General" is basically the same thing as mprintf()
+ *   make sure that OpenAL init failures always get to the debug log
+ *
+ * Revision 1.6  2005/11/24 09:08:44  Goober5000
+ * bah, forgot a colon
+ * --Goober5000
+ *
+ * Revision 1.5  2005/11/24 08:46:11  Goober5000
+ * * cleaned up mission_do_departure
+ *   * fixed a hidden crash (array index being -1; would only
+ * be triggered for ships w/o subspace drives under certain conditions)
+ *   * removed finding a new fighterbay target because it might screw up missions
+ *   * improved clarity, code flow, and readability :)
+ * * added custom AI flag for disabling warpouts if navigation subsystem fails
+ * --Goober5000
+ *
+ * Revision 1.4  2005/11/24 07:27:14  taylor
+ * fix fred2 startup crash (we probably need to Assert() this case so it doesn't easily happen again)
+ *
+ * Revision 1.3  2005/11/21 15:01:18  taylor
+ * little cleaner, lot more friendly to 64-bit archs (long type is usually 64-bit there)
+ *
+ * Revision 1.2  2005/11/21 03:47:51  Goober5000
+ * bah and double bah
+ * --Goober5000
+ *
+ * Revision 1.1  2005/11/21 02:43:30  Goober5000
+ * change from "setting" to "profile"; this way makes more sense
+ * --Goober5000
+ *
+ */
+
+
+#include "globalincs/pstypes.h"
+#include "globalincs/def_files.h"
+#include "ai/ai_profiles.h"
+#include "parse/parselo.h"
+#include "localization/localize.h"
+
+
+// global stuff
+int Num_ai_profiles;
+int Default_ai_profile;
+ai_profile_t Ai_profiles[MAX_AI_PROFILES];
+
+// local to this file
+static int Ai_profiles_initted = 0;
+static char Default_profile_name[NAME_LENGTH];
+
+
+// utility
+void set_flag(ai_profile_t *profile, char *name, int flag)
+{
+	if (optional_string(name))
+	{
+		bool val;
+		stuff_boolean(&val);
+
+		if (val)
+			profile->flags |= flag;
+		else
+			profile->flags &= ~flag;
+	}
+}
+
+void parse_ai_profiles_tbl(char *filename)
+{
+	int i, rval;
+	bool no_create = false;
+	char profile_name[NAME_LENGTH];
+	ai_profile_t dummy_profile;
+	char *saved_Mp = NULL;
+
+	// open localization
+	lcl_ext_open();
+
+	if ((rval = setjmp(parse_abort)) != 0)
+	{
+		mprintf(("TABLES: Unable to parse '%s'!  Error code = %i.\n", (filename) ? filename : "<default ai_profiles.tbl>", rval));
+		lcl_ext_close();
+		return;
+	}
+
+	if (filename == NULL)
+		read_file_text_from_array(defaults_get_file("ai_profiles.tbl"));
+	else
+		read_file_text(filename, CF_TYPE_TABLES);
+
+	reset_parse();		
+
+
+	// start parsing
+	required_string("#AI Profiles");
+
+	// new default?
+	if (optional_string("$Default Profile:"))
+		stuff_string(Default_profile_name, F_NAME, NAME_LENGTH);
+
+	// begin reading data
+	while (required_string_either("#End","$Profile Name:"))
+	{
+		ai_profile_t *profile = &dummy_profile;
+		ai_profile_t *previous_profile = NULL;
+		
+		// get the name
+		required_string("$Profile Name:");
+		stuff_string(profile_name, F_NAME, NAME_LENGTH);
+
+		// see if it exists
+		for (i = 0; i < Num_ai_profiles; i++)
+		{
+			if (!stricmp(Ai_profiles[i].profile_name, profile_name))
+			{
+				previous_profile = &Ai_profiles[i];
+				break;
+			}
+		}
+
+		// modular table stuff
+		if (optional_string("+nocreate"))
+		{
+			no_create = true;
+
+			// use the previous one if possible,
+			// otherwise continue to use the dummy one
+			if (previous_profile != NULL)
+				profile = previous_profile;
+		}
+		else
+		{
+			// don't create multiple profiles with the same name
+			if (previous_profile != NULL)
+			{
+				Warning(LOCATION, "An ai profile named '%s' already exists!  The new one will not be created.\n", profile_name);
+			}
+			else
+			{
+				// make sure we're under the limit
+				if (Num_ai_profiles >= MAX_AI_PROFILES)
+				{
+					Warning(LOCATION, "Too many profiles in ai_profiles.tbl!  Max is %d.\n", MAX_AI_PROFILES-1);	// -1 because one is built-in
+					skip_to_string("#End", NULL);
+					break;
+				}
+
+				profile = &Ai_profiles[Num_ai_profiles];
+				Num_ai_profiles++;
+			}
+		}
+
+		// initialize profile if we're not building from a previously parsed one
+		if (!no_create)
+		{
+			// base profile, so zero it out
+			if (profile == &Ai_profiles[0])
+			{
+				memset(profile, 0, sizeof(ai_profile_t));
+			}
+			// brand new profile, so set it to the base defaults
+			else
+			{
+				memcpy(profile, &Ai_profiles[0], sizeof(ai_profile_t));
+			}
+		}
+
+		// set the name
+		strcpy(profile->profile_name, profile_name);
+
+
+		// fill in any and all settings; they're all optional and can be in any order
+		while (!check_for_string("$Profile Name:") && !check_for_string("#End"))
+		{
+			if (optional_string("$Player Afterburner Recharge Scale:"))
+				parse_float_list(profile->afterburner_recharge_scale, NUM_SKILL_LEVELS);
+
+			if (optional_string("$Max Beam Friendly Fire Damage:"))
+				parse_float_list(profile->beam_friendly_damage_cap, NUM_SKILL_LEVELS);
+
+			if (optional_string("$Player Countermeasure Life Scale:"))
+				parse_float_list(profile->cmeasure_life_scale, NUM_SKILL_LEVELS);
+
+			if (optional_string("$AI Countermeasure Firing Chance:"))
+				parse_float_list(profile->cmeasure_fire_chance, NUM_SKILL_LEVELS);
+
+			if (optional_string("$AI In Range Time:"))
+				parse_float_list(profile->in_range_time, NUM_SKILL_LEVELS);
+
+			if (optional_string("$AI Always Links Ammo Weapons:"))
+				parse_float_list(profile->link_ammo_levels_always, NUM_SKILL_LEVELS);
+
+			if (optional_string("$AI Maybe Links Ammo Weapons:"))
+				parse_float_list(profile->link_ammo_levels_maybe, NUM_SKILL_LEVELS);
+
+			if (optional_string("$AI Always Links Energy Weapons:"))
+				parse_float_list(profile->link_energy_levels_always, NUM_SKILL_LEVELS);
+
+			if (optional_string("$AI Maybe Links Energy Weapons:"))
+				parse_float_list(profile->link_energy_levels_maybe, NUM_SKILL_LEVELS);
+
+			if (optional_string("$Max Missles Locked on Player:"))
+				parse_int_list(profile->max_allowed_player_homers, NUM_SKILL_LEVELS);
+
+			if (optional_string("$Max Player Attackers:"))
+				parse_int_list(profile->max_attackers, NUM_SKILL_LEVELS);
+
+			if (optional_string("$Max Incoming Asteroids:"))
+				parse_int_list(profile->max_incoming_asteroids, NUM_SKILL_LEVELS);
+
+			if (optional_string("$Player Damage Factor:") || optional_string("$AI Damage Reduction to Player Hull:"))
+				parse_float_list(profile->player_damage_scale, NUM_SKILL_LEVELS);
+
+			if (optional_string("$Player Subsys Damage Factor:") || optional_string("$AI Damage Reduction to Player Subsys:"))
+				parse_float_list(profile->subsys_damage_scale, NUM_SKILL_LEVELS);
+
+			// represented in fractions of F1_0
+			if (optional_string("$Predict Position Delay:"))
+			{
+				int i;
+				float temp_list[NUM_SKILL_LEVELS];
+
+				parse_float_list(temp_list, NUM_SKILL_LEVELS);
+
+				for (i = 0; i < NUM_SKILL_LEVELS; i++)
+					profile->predict_position_delay[i] = fl2f(temp_list[i]);
+			}
+
+			if (optional_string("$Player Shield Recharge Scale:"))
+				parse_float_list(profile->shield_energy_scale, NUM_SKILL_LEVELS);
+
+			if (optional_string("$AI Shield Manage Delay:") || optional_string("$AI Shield Manage Delays:"))
+				parse_float_list(profile->shield_manage_delay, NUM_SKILL_LEVELS);
+
+			if (optional_string("$Friendly AI Fire Delay Scale:"))
+				parse_float_list(profile->ship_fire_delay_scale_friendly, NUM_SKILL_LEVELS);
+
+			if (optional_string("$Hostile AI Fire Delay Scale:"))
+				parse_float_list(profile->ship_fire_delay_scale_hostile, NUM_SKILL_LEVELS);
+
+			if (optional_string("$Friendly AI Secondary Fire Delay Scale:"))
+				parse_float_list(profile->ship_fire_secondary_delay_scale_friendly, NUM_SKILL_LEVELS);
+
+			if (optional_string("$Hostile AI Secondary Fire Delay Scale:"))
+				parse_float_list(profile->ship_fire_secondary_delay_scale_hostile, NUM_SKILL_LEVELS);
+
+			if (optional_string("$Player Subsys Damage Factor:") || optional_string("$AI Damage Reduction to Player Subsys:"))
+				parse_float_list(profile->subsys_damage_scale, NUM_SKILL_LEVELS);
+
+			if (optional_string("$AI Turn Time Scale:"))
+				parse_float_list(profile->turn_time_scale, NUM_SKILL_LEVELS);
+
+			if (optional_string("$Player Weapon Recharge Scale:"))
+				parse_float_list(profile->weapon_energy_scale, NUM_SKILL_LEVELS);
+
+			if (optional_string("$Max Turret Target Ownage:"))
+				parse_int_list(profile->max_turret_ownage_target, NUM_SKILL_LEVELS);
+
+			if (optional_string("$Max Turret Player Ownage:"))
+				parse_int_list(profile->max_turret_ownage_player, NUM_SKILL_LEVELS);
+
+			if (optional_string("$Percentage Required For Kill Scale:"))
+				parse_float_list(profile->kill_percentage_scale, NUM_SKILL_LEVELS);
+
+			if (optional_string("$Percentage Required For Assist Scale:"))
+				parse_float_list(profile->assist_percentage_scale, NUM_SKILL_LEVELS);
+
+			if (optional_string("$Percentage Awarded For Capship Assist:"))
+				parse_float_list(profile->assist_award_percentage_scale, NUM_SKILL_LEVELS);
+
+			set_flag(profile, "$big ships can attack beam turrets on untargeted ships:", AIPF_BIG_SHIPS_CAN_ATTACK_BEAM_TURRETS_ON_UNTARGETED_SHIPS);
+
+			set_flag(profile, "$smart primary weapon selection:", AIPF_SMART_PRIMARY_WEAPON_SELECTION);
+
+			set_flag(profile, "$smart secondary weapon selection:", AIPF_SMART_SECONDARY_WEAPON_SELECTION);
+
+			set_flag(profile, "$smart shield management:", AIPF_SMART_SHIELD_MANAGEMENT);
+
+			set_flag(profile, "$smart afterburner management:", AIPF_SMART_AFTERBURNER_MANAGEMENT);
+
+			set_flag(profile, "$allow rapid secondary dumbfire:", AIPF_ALLOW_RAPID_SECONDARY_DUMBFIRE);
+			
+			set_flag(profile, "$huge turret weapons ignore bombs:", AIPF_HUGE_TURRET_WEAPONS_IGNORE_BOMBS);
+
+			set_flag(profile, "$don't insert random turret fire delay:", AIPF_DONT_INSERT_RANDOM_TURRET_FIRE_DELAY);
+
+			set_flag(profile, "$hack improve non-homing swarm turret fire accuracy:", AIPF_HACK_IMPROVE_NON_HOMING_SWARM_TURRET_FIRE_ACCURACY);
+
+			set_flag(profile, "$shockwaves damage small ship subsystems:", AIPF_SHOCKWAVES_DAMAGE_SMALL_SHIP_SUBSYSTEMS);
+
+			set_flag(profile, "$navigation subsystem governs warpout capability:", AIPF_NAVIGATION_SUBSYS_GOVERNS_WARP);
+
+			set_flag(profile, "$ignore lower bound for minimum speed of docked ship:", AIPF_NO_MIN_DOCK_SPEED_CAP);
+
+			set_flag(profile, "$disable linked fire penalty:", AIPF_DISABLE_LINKED_FIRE_PENALTY);
+
+			set_flag(profile, "$disable weapon damage scaling:", AIPF_DISABLE_WEAPON_DAMAGE_SCALING);
+
+			set_flag(profile, "$use additive weapon velocity:", AIPF_USE_ADDITIVE_WEAPON_VELOCITY);
+
+			set_flag(profile, "$use newtonian dampening:", AIPF_USE_NEWTONIAN_DAMPENING);
+
+			set_flag(profile, "$include beams for kills and assists:", AIPF_INCLUDE_BEAMS_IN_STAT_CALCS);
+
+			set_flag(profile, "$score kills based on damage caused:", AIPF_KILL_SCORING_SCALES_WITH_DAMAGE);
+
+			set_flag(profile, "$score assists based on damage caused:", AIPF_ASSIST_SCORING_SCALES_WITH_DAMAGE);
+
+			set_flag(profile, "$allow event and goal scoring in multiplayer:", AIPF_ALLOW_MULTI_EVENT_SCORING);
+
+			set_flag(profile, "$fix linked primary weapon decision bug:", AIPF_FIX_LINKED_PRIMARY_BUG);
+
+			set_flag(profile, "$prevent turrets targeting too distant bombs:", AIPF_PREVENT_TARGETING_BOMBS_BEYOND_RANGE);
+
+			set_flag(profile, "$smart subsystem targeting for turrets:", AIPF_SMART_SUBSYSTEM_TARGETING_FOR_TURRETS);
+
+			set_flag(profile, "$fix heat seekers homing on stealth ships bug:", AIPF_FIX_HEAT_SEEKER_STEALTH_BUG);
+
+			set_flag(profile, "$multi allow empty primaries:", AIPF_MULTI_ALLOW_EMPTY_PRIMARIES);
+
+			set_flag(profile, "$multi allow empty secondaries:", AIPF_MULTI_ALLOW_EMPTY_SECONDARIES);
+
+			// if we've been through once already and are at the same place, force a move
+			if ( saved_Mp && (saved_Mp == Mp) )
+				Mp++;
+
+			// find next valid option
+			skip_to_start_of_string_either("$", "#");
+			saved_Mp = Mp;
+		}
+	}
+	
+	required_string("#End");
+
+	// add tbl/tbm to multiplayer validation list
+	extern void fs2netd_add_table_validation(char *tblname);
+	fs2netd_add_table_validation(filename);
+
+	// close localization
+	lcl_ext_close();
+}
+
+void ai_profiles_init()
+{
+	int temp;
+
+	if (Ai_profiles_initted)
+		return;
+
+	Num_ai_profiles = 0;
+	Default_ai_profile = 0;
+	Default_profile_name[0] = '\0';
+
+	// init retail entry first
+	parse_ai_profiles_tbl(NULL);
+
+	// now parse the supplied table (if any)
+	if (cf_exists_full("ai_profiles.tbl", CF_TYPE_TABLES))
+		parse_ai_profiles_tbl("ai_profiles.tbl");
+
+	// parse any modular tables
+	parse_modular_table("*-aip.tbm", parse_ai_profiles_tbl);
+
+	// set default if specified
+	temp = ai_profile_lookup(Default_profile_name);
+	if (temp >= 0)
+		Default_ai_profile = temp;
+
+    Ai_profiles[Default_ai_profile].flags |= AIPF_SMART_SECONDARY_WEAPON_SELECTION;
+
+	Ai_profiles_initted = 1;
+}
+
+int ai_profile_lookup(char *name)
+{
+	for (int i = 0; i < Num_ai_profiles; i++)
+		if (!stricmp(name, Ai_profiles[i].profile_name))
+			return i;
+
+	return -1;
+}
@@ -0,0 +1,156 @@
+/*
+ * Created by Ian "Goober5000" Warfield for the FreeSpace2 Source Code Project.
+ * You may not sell or otherwise commercially exploit the source or things you
+ * create based on the source.
+ */
+
+/*
+ * $Logfile: /Freespace2/code/ai/ai_profiles.h $
+ * $Revision: 1.4.2.5 $
+ * $Date: 2007-07-28 22:04:14 $
+ * $Author: Goober5000 $
+ *
+ * $Log: not supported by cvs2svn $
+ * Revision 1.4.2.4  2007/07/15 02:45:48  Goober5000
+ * fixed a small bug in the lab
+ * moved WMC's no damage scaling flag to ai_profiles and made it work correctly
+ * removed my old supercap damage scaling change
+ * moved Turey's truefire flag to ai_profiles
+ *
+ * Revision 1.4.2.3  2007/02/27 01:44:44  Goober5000
+ * add two features for WCS: specifyable shield/weapon recharge rates, and removal of linked fire penalty
+ *
+ * Revision 1.4.2.2  2006/07/02 04:13:43  Goober5000
+ * bah
+ *
+ * Revision 1.4.2.1  2006/07/02 03:39:34  Goober5000
+ * remove associated AI flags
+ * --Goober5000
+ *
+ * Revision 1.4  2006/04/20 06:32:00  Goober5000
+ * proper capitalization according to Volition
+ *
+ * Revision 1.3  2006/03/20 06:19:03  taylor
+ * add ai_profiles flag to get rid of limit on minimum speed a docked ship can move
+ * (not going to Int3() here from < 0.1 speed by default, a support ship actually hit it)
+ *
+ * Revision 1.2  2005/11/24 08:46:11  Goober5000
+ * * cleaned up mission_do_departure
+ *   * fixed a hidden crash (array index being -1; would only
+ * be triggered for ships w/o subspace drives under certain conditions)
+ *   * removed finding a new fighterbay target because it might screw up missions
+ *   * improved clarity, code flow, and readability :)
+ * * added custom AI flag for disabling warpouts if navigation subsystem fails
+ * --Goober5000
+ *
+ * Revision 1.1  2005/11/21 02:43:30  Goober5000
+ * change from "setting" to "profile"; this way makes more sense
+ * --Goober5000
+ *
+ */
+
+#ifndef _AI_PROFILES_H_
+#define _AI_PROFILES_H_
+
+#include "globalincs/pstypes.h"
+#include "globalincs/globals.h"
+#include "globalincs/systemvars.h"
+
+
+// flags
+#define AIPF_SMART_SHIELD_MANAGEMENT								(1 << 0)
+#define AIPF_BIG_SHIPS_CAN_ATTACK_BEAM_TURRETS_ON_UNTARGETED_SHIPS	(1 << 1)
+#define AIPF_SMART_PRIMARY_WEAPON_SELECTION							(1 << 2)
+#define AIPF_SMART_SECONDARY_WEAPON_SELECTION						(1 << 3)
+#define AIPF_ALLOW_RAPID_SECONDARY_DUMBFIRE							(1 << 4)
+#define AIPF_HUGE_TURRET_WEAPONS_IGNORE_BOMBS						(1 << 5)
+#define AIPF_DONT_INSERT_RANDOM_TURRET_FIRE_DELAY					(1 << 6)
+#define AIPF_HACK_IMPROVE_NON_HOMING_SWARM_TURRET_FIRE_ACCURACY		(1 << 7)
+#define AIPF_SHOCKWAVES_DAMAGE_SMALL_SHIP_SUBSYSTEMS				(1 << 8)
+#define AIPF_NAVIGATION_SUBSYS_GOVERNS_WARP							(1 << 9)
+#define AIPF_NO_MIN_DOCK_SPEED_CAP									(1 << 10)
+#define AIPF_DISABLE_LINKED_FIRE_PENALTY							(1 << 11)
+#define AIPF_DISABLE_WEAPON_DAMAGE_SCALING							(1 << 12)
+#define AIPF_USE_ADDITIVE_WEAPON_VELOCITY							(1 << 13)
+#define AIPF_USE_NEWTONIAN_DAMPENING								(1 << 14)
+#define AIPF_INCLUDE_BEAMS_IN_STAT_CALCS							(1 << 15)
+#define AIPF_KILL_SCORING_SCALES_WITH_DAMAGE						(1 << 16)
+#define AIPF_ASSIST_SCORING_SCALES_WITH_DAMAGE						(1 << 17)
+#define AIPF_ALLOW_MULTI_EVENT_SCORING								(1 << 18)
+#define AIPF_SMART_AFTERBURNER_MANAGEMENT							(1 << 19)
+#define AIPF_FIX_LINKED_PRIMARY_BUG									(1 << 20)
+#define AIPF_PREVENT_TARGETING_BOMBS_BEYOND_RANGE					(1 << 21)
+#define AIPF_SMART_SUBSYSTEM_TARGETING_FOR_TURRETS					(1 << 22)
+#define AIPF_FIX_HEAT_SEEKER_STEALTH_BUG							(1 << 23)
+#define AIPF_MULTI_ALLOW_EMPTY_PRIMARIES							(1 << 24)
+#define AIPF_MULTI_ALLOW_EMPTY_SECONDARIES							(1 << 25)
+
+
+#define MAX_AI_PROFILES	5
+
+typedef struct ai_profile_t {
+
+	char profile_name[NAME_LENGTH];
+
+	int flags;
+
+	// difficulty-related values
+	int max_incoming_asteroids[NUM_SKILL_LEVELS];			// max number of asteroids thrown at friendlies
+	int	max_allowed_player_homers[NUM_SKILL_LEVELS];		// max number of simultaneous homing weapons on player
+	int	max_attackers[NUM_SKILL_LEVELS];					// max number of ships that can attack a ship
+	fix predict_position_delay[NUM_SKILL_LEVELS];			// how long until AI predicts a ship position
+	float in_range_time[NUM_SKILL_LEVELS];					// seconds to add to time it takes to get enemy in range (only for player's enemies)
+	float shield_manage_delay[NUM_SKILL_LEVELS];			// how long before AI manages shields (note that the player's team always uses the average skill's delay)
+
+	// AI ships link primaries if energy levels greater than these percents
+	float link_energy_levels_always[NUM_SKILL_LEVELS];		// always link
+	float link_energy_levels_maybe[NUM_SKILL_LEVELS];		// link if hull strength low
+
+	// AI ships link primaries if ammunition levels greater than these percents
+	float link_ammo_levels_always[NUM_SKILL_LEVELS];		//	always link
+	float link_ammo_levels_maybe[NUM_SKILL_LEVELS];			//	link if hull strength low
+
+	// difficulty-related scales
+	float cmeasure_life_scale[NUM_SKILL_LEVELS];			// life of countermeasures
+	float cmeasure_fire_chance[NUM_SKILL_LEVELS];			// chance a countermeasure will be fired based on skill level (also scaled by ai_class)
+	float weapon_energy_scale[NUM_SKILL_LEVELS];			// weapon energy available
+	float shield_energy_scale[NUM_SKILL_LEVELS];			// shield energy available
+	float afterburner_recharge_scale[NUM_SKILL_LEVELS];		// speed of afterburner recharge
+	float player_damage_scale[NUM_SKILL_LEVELS];			// damage applied to the player
+	
+	float subsys_damage_scale[NUM_SKILL_LEVELS];			// damage applied to a player subsystem
+	float beam_friendly_damage_cap[NUM_SKILL_LEVELS];		// damage cap values for friendly beam fire
+	float turn_time_scale[NUM_SKILL_LEVELS];				// speed at which enemy ships turn
+
+	//	Multiplicative delay factors for increasing skill levels.
+	float ship_fire_delay_scale_hostile[NUM_SKILL_LEVELS];
+	float ship_fire_delay_scale_friendly[NUM_SKILL_LEVELS];
+
+	//	Multiplicative secondary delay factors for increasing skill levels.
+	float ship_fire_secondary_delay_scale_hostile[NUM_SKILL_LEVELS];
+	float ship_fire_secondary_delay_scale_friendly[NUM_SKILL_LEVELS];
+
+	//	Maximum turrets of one ship allowed to shoot the same target
+	int max_turret_ownage_target[NUM_SKILL_LEVELS];
+	int max_turret_ownage_player[NUM_SKILL_LEVELS];
+
+	// percentage of damage caused required for a kill/assist
+	float kill_percentage_scale[NUM_SKILL_LEVELS];
+	float assist_percentage_scale[NUM_SKILL_LEVELS];
+
+	// percentage of the capships score given to other team mates on a kill
+	float assist_award_percentage_scale[NUM_SKILL_LEVELS];
+
+} ai_profile_t;
+
+
+extern int Num_ai_profiles;
+extern int Default_ai_profile;
+extern ai_profile_t Ai_profiles[MAX_AI_PROFILES];
+
+
+void ai_profiles_init();
+
+int ai_profile_lookup(char *name);
+
+#endif
@@ -9,13 +9,37 @@

 /*
 * $Logfile: /Freespace2/code/Ship/AiBig.cpp $
- * $Revision: 1.6 $
- * $Date: 2005-09-01 04:14:03 $
- * $Author: taylor $
+ * $Revision: 1.12.2.2 $
+ * $Date: 2007-07-15 04:19:32 $
+ * $Author: Goober5000 $
 *
 * C module for AI code related to large ships
 *
 * $Log: not supported by cvs2svn $
+ * Revision 1.12.2.1  2007/02/20 04:19:09  Goober5000
+ * the great big duplicate model removal commit
+ *
+ * Revision 1.12  2006/02/25 21:46:59  Goober5000
+ * spelling
+ *
+ * Revision 1.11  2006/01/13 03:30:59  Goober5000
+ * übercommit of custom IFF stuff :)
+ *
+ * Revision 1.10  2005/11/21 02:43:30  Goober5000
+ * change from "setting" to "profile"; this way makes more sense
+ * --Goober5000
+ *
+ * Revision 1.9  2005/11/21 00:46:05  Goober5000
+ * add ai_settings.tbl
+ * --Goober5000
+ *
+ * Revision 1.8  2005/10/22 22:22:41  Goober5000
+ * rolled back UnknownPlayer's commit
+ * --Goober5000
+ *
+ * Revision 1.6  2005/09/01 04:14:03  taylor
+ * various weapon_range cap fixes for primary, secondary weapons and hud targetting info
+ *
 * Revision 1.5  2005/07/27 18:27:49  Goober5000
 * verified that submode_start_time is updated whenever submode is changed
 * --Goober5000
@@ -80,7 +104,7 @@
 * --Goober5000
 *
 * Revision 2.2  2002/10/19 19:29:28  bobboau
- * inital commit, trying to get most of my stuff into FSO, there should be most of my fighter beam, beam rendering, beam shield hit, ABtrails, and ssm stuff. one thing you should be happy to know is the beam texture tileing is now set in the beam section section of the weapon table entry
+ * initial commit, trying to get most of my stuff into FSO, there should be most of my fighter beam, beam rendering, beam shield hit, ABtrails, and ssm stuff. one thing you should be happy to know is the beam texture tileing is now set in the beam section section of the weapon table entry
 *
 * Revision 2.1  2002/08/01 01:41:09  penguin
 * The big include file move
@@ -415,6 +439,7 @@
 #include "weapon/weapon.h"
 #include "io/timer.h"
 #include "mission/missionparse.h"
+#include "iff_defs/iff_defs.h"



@@ -472,11 +497,12 @@ void ai_bpap(object *objp, vec3d *attacker_objp_pos, vec3d *attacker_objp_fvec,
 	model_octant	*octp;
 	polymodel	*pm;
 	int		i, q, octs[4];	
+	ship_info *sip = &Ship_info[Ships[objp->instance].ship_info_index];

 	best_point = objp->pos;
 	nearest_dist = weapon_travel_dist;

-	model_which_octant_distant_many(attacker_objp_pos, Ships[objp->instance].modelnum, &objp->orient, &objp->pos, &pm, octs);
+	model_which_octant_distant_many(attacker_objp_pos, sip->model_num, &objp->orient, &objp->pos, &pm, octs);

 	num_tries = (int) (vm_vec_dist(&objp->pos, attacker_objp_pos)/objp->radius);

@@ -551,7 +577,7 @@ done_1:
 	}
 	
 	mc_info mc;
-	mc.model_num = Ships[objp->instance].modelnum;
+	mc.model_num = sip->model_num;
 	mc.orient = &objp->orient;
 	mc.pos = &objp->pos;
 	mc.p0 = attacker_objp_pos;
@@ -753,7 +779,7 @@ int ai_big_maybe_follow_subsys_path(int do_dot_check)
 		int			subsys_path_num, subsys_in_sight, checked_sight;
 		float			dist;

-		pm = model_get( Ships[Pl_objp->instance].modelnum );
+		pm = model_get( Ship_info[Ships[Pl_objp->instance].ship_info_index].model_num );
 	
 		// If attacking a subsystem, ensure that we have an unobstructed line of sight... if not, then move
 		// towards path linked to subsystem
@@ -768,8 +794,8 @@ int ai_big_maybe_follow_subsys_path(int do_dot_check)
 			aip->path_subsystem_next_check = timestamp(1500);

 			// get world pos of eye (stored in geye)
-			ep = &(pm->view_positions[0] );
-			model_find_world_point( &geye, &ep->pnt, Ships[Pl_objp->instance].modelnum, 0, &Pl_objp->orient, &Pl_objp->pos );
+			ep = &(pm->view_positions[Ships[Pl_objp->instance].current_viewpoint]);
+			model_find_world_point( &geye, &ep->pnt, pm->id, 0, &Pl_objp->orient, &Pl_objp->pos );
 			
 			// get world pos of subsystem
 			vm_vec_unrotate(&gsubpos, &aip->targeted_subsys->system_info->pnt, &En_objp->orient);
@@ -891,7 +917,7 @@ int ai_big_maybe_start_strafe(ai_info *aip, ship_info *sip)
 				test_objp = &Objects[so->objnum];
 				test_sp = &Ships[test_objp->instance];

-				if ( test_sp->team != Ships[Pl_objp->instance].team ) {
+				if ( iff_x_attacks_y(Ships[Pl_objp->instance].team, test_sp->team) ) {
 					if ( Ship_info[test_sp->ship_info_index].flags & SIF_SMALL_SHIP ) {
 						dist_squared = vm_vec_dist_squared(&Pl_objp->pos, &test_objp->pos);
 						if ( dist_squared < ENTER_STRAFE_THREAT_DIST_SQUARED ) {
@@ -924,7 +950,7 @@ void ai_big_chase_attack(ai_info *aip, ship_info *sip, vec3d *enemy_pos, float d
 		if (Pl_objp->phys_info.speed < 3.0f) {
 			object *objp;
 			for ( objp = GET_FIRST(&obj_used_list); objp !=END_OF_LIST(&obj_used_list); objp = GET_NEXT(objp) ) {
-				if ((objp->type == OBJ_WEAPON) && (Weapons[objp->instance].team != Ships[Pl_objp->instance].team))
+				if ((objp->type == OBJ_WEAPON) && (iff_x_attacks_y(Ships[Pl_objp->instance].team, Weapons[objp->instance].team)))
 					if (Weapon_info[objp->instance].subtype == WP_LASER) {
 						vec3d	in_vec;
 						float		dist;
@@ -1227,7 +1253,7 @@ void ai_big_chase()
 	} else if (En_objp->flags & OF_PROTECTED) {	//	If protected and we're not attacking a subsystem, stop attacking!
 		update_aspect_lock_information(aip, &vec_to_enemy, dist_to_enemy - En_objp->radius, En_objp->radius);
 		aip->target_objnum = -1;
-		if (find_enemy(Pl_objp-Objects, MAX_ENEMY_DISTANCE, Skill_level_max_attackers[Game_skill_level]) == -1) {
+		if (find_enemy(Pl_objp-Objects, MAX_ENEMY_DISTANCE, The_mission.ai_profile->max_attackers[Game_skill_level]) == -1) {
 			ai_do_default_behavior(Pl_objp);
 			return;
 		}
@@ -1265,7 +1291,7 @@ void ai_big_chase()
 	case SM_ATTACK:
 	case SM_SUPER_ATTACK:
 	case SM_ATTACK_FOREVER:
-		ai_big_chase_attack(aip, sip, &enemy_pos, dist_to_enemy, shipp->modelnum);
+		ai_big_chase_attack(aip, sip, &enemy_pos, dist_to_enemy, sip->model_num);
 		break;

 	case SM_EVADE:
@@ -1497,7 +1523,7 @@ void ai_big_attack_get_data(vec3d *enemy_pos, float *dist_to_enemy, float *dot_t
 		predicted_enemy_pos=*enemy_pos;
 	} else {
 		vec3d	gun_pos, pnt;
-		polymodel *po = model_get( shipp->modelnum );
+		polymodel *po = model_get( Ship_info[shipp->ship_info_index].model_num );
 		float		weapon_speed;

 		//	Compute position of gun in absolute space and use that as fire position.
@@ -1962,7 +1988,7 @@ void ai_big_strafe_maybe_attack_turret(object *ship_objp, object *weapon_objp)
 	// the ai will not always go after different ships firing beams at them.
 	// Approx 1/4 chance we'll go after the other ship's beam.

-	bool attack_turret_on_different_ship = (The_mission.flags & MISSION_FLAG_USE_NEW_AI)
+	bool attack_turret_on_different_ship = (The_mission.ai_profile->flags & AIPF_BIG_SHIPS_CAN_ATTACK_BEAM_TURRETS_ON_UNTARGETED_SHIPS)
 		&& (Weapon_info[weapon_objp->instance].wi_flags & WIF_BEAM) && (frand()*100 < 25.0f);

 	// unless we're making an exception, we should only attack a turret if it sits on the current target
@@ -9,13 +9,28 @@

 /*
 * $Logfile: /Freespace2/code/Ship/AiGoals.h $
- * $Revision: 1.2 $
- * $Date: 2005-07-13 02:50:48 $
+ * $Revision: 1.6 $
+ * $Date: 2006-04-20 06:32:00 $
 * $Author: Goober5000 $
 *
 * <insert description of file here>
 *
 * $Log: not supported by cvs2svn $
+ * Revision 1.5  2006/02/20 02:13:07  Goober5000
+ * added ai-ignore-new which hopefully should fix the ignore bug
+ * --Goober5000
+ *
+ * Revision 1.4  2006/02/19 22:00:09  Goober5000
+ * restore original ignore behavior and remove soon-to-be-obsolete ai-chase-any-except
+ * --Goober5000
+ *
+ * Revision 1.3  2005/12/29 08:08:33  wmcoolmon
+ * Codebase commit, most notably including objecttypes.tbl
+ *
+ * Revision 1.2  2005/07/13 02:50:48  Goober5000
+ * remove PreProcDefine #includes in FS2
+ * --Goober5000
+ *
 * Revision 1.1  2005/03/25 06:45:13  wmcoolmon
 * Initial AI code move commit - note that aigoals.cpp has some escape characters in it, I'm not sure if this is really a problem.
 *
@@ -149,10 +164,10 @@
 * add more stuff to save/restore
 * 
 * 24    7/24/97 4:55p Allender
- * added ai-evade-ship to fred and to Freespace
+ * added ai-evade-ship to Fred and to FreeSpace
 * 
 * 23    7/17/97 4:23p Allender
- * ai-guard-wing now in both Fred and Freespace
+ * ai-guard-wing now in both Fred and FreeSpace
 * 
 * 22    7/15/97 11:57a Hoffoss
 * Added a general ai goal reference update mode.
@@ -168,6 +183,7 @@
 #define _AIGOALS_H

 #include "globalincs/globals.h"
+#include "globalincs/pstypes.h"

 struct wing;
 struct ai_info;
@@ -179,6 +195,7 @@ struct ai_goal;
 // ai_update_goal_references() and query_referenced_in_ai_goals() or else risk breaking
 // Fred.  If the goal you add doesn't have a target (such as chase_any), then you don't have
 // to worry about doing this.  Also add it to list in Fred\Management.cpp, and let Hoffoss know!
+// WMC - Oh and add them to Ai_goal_names plz. TY! :)
 #define AI_GOAL_CHASE					(1<<1)
 #define AI_GOAL_DOCK						(1<<2)		// used for undocking as well
 #define AI_GOAL_WAYPOINTS				(1<<3)
@@ -201,26 +218,20 @@ struct ai_goal;
 #define AI_GOAL_KEEP_SAFE_DISTANCE	(1<<18)
 #define AI_GOAL_REARM_REPAIR			(1<<19)

+// resume regular goals
 #define AI_GOAL_STAY_STILL				(1<<20)
 #define AI_GOAL_PLAY_DEAD				(1<<21)
 #define AI_GOAL_CHASE_WEAPON			(1<<22)

-
-// Goober5000: new goals go here
-
-// Goober5000: this new goal is special: it doesn't take the usual kind of argument; it takes
-// many arguments, requiring a modification to the ai_goal data type.  Therefore, I didn't
-// add it to ai_update_goal_references() or ai_query_goal_references().  I also didn't add it
-// to the list in Fred\Management.cpp, because it can't be specified as an initial order - it
-// can only be specified through a sexp.
-#define AI_GOAL_CHASE_ANY_EXCEPT		(1<<23)		// hey Hoffoss!  I added a new goal! :p
-
-#define AI_GOAL_FLY_TO_SHIP				(1<<24) // kazan
+#define AI_GOAL_FLY_TO_SHIP				(1<<23) // kazan
+#define AI_GOAL_IGNORE_NEW				(1<<24)	// Goober5000

 // now the masks for ship types

 // Goober5000: added AI_GOAL_STAY_NEAR_SHIP and AI_GOAL_KEEP_SAFE_DISTANCE as valid for fighters
-#define AI_GOAL_ACCEPT_FIGHTER		( AI_GOAL_FLY_TO_SHIP | AI_GOAL_CHASE | AI_GOAL_WAYPOINTS | AI_GOAL_WAYPOINTS_ONCE | AI_GOAL_WARP | AI_GOAL_DESTROY_SUBSYSTEM | AI_GOAL_CHASE_WING | AI_GOAL_GUARD | AI_GOAL_DISABLE_SHIP | AI_GOAL_DISARM_SHIP | AI_GOAL_CHASE_ANY | AI_GOAL_IGNORE | AI_GOAL_GUARD_WING | AI_GOAL_EVADE_SHIP | AI_GOAL_STAY_STILL | AI_GOAL_PLAY_DEAD | AI_GOAL_STAY_NEAR_SHIP | AI_GOAL_KEEP_SAFE_DISTANCE | AI_GOAL_CHASE_ANY_EXCEPT )
+//WMC - Don't need these anymore. Whee!
+/*
+#define AI_GOAL_ACCEPT_FIGHTER		( AI_GOAL_FLY_TO_SHIP | AI_GOAL_CHASE | AI_GOAL_WAYPOINTS | AI_GOAL_WAYPOINTS_ONCE | AI_GOAL_WARP | AI_GOAL_DESTROY_SUBSYSTEM | AI_GOAL_CHASE_WING | AI_GOAL_GUARD | AI_GOAL_DISABLE_SHIP | AI_GOAL_DISARM_SHIP | AI_GOAL_CHASE_ANY | AI_GOAL_IGNORE | AI_GOAL_IGNORE_NEW | AI_GOAL_GUARD_WING | AI_GOAL_EVADE_SHIP | AI_GOAL_STAY_STILL | AI_GOAL_PLAY_DEAD | AI_GOAL_STAY_NEAR_SHIP | AI_GOAL_KEEP_SAFE_DISTANCE )
 #define AI_GOAL_ACCEPT_BOMBER			( AI_GOAL_FLY_TO_SHIP | AI_GOAL_ACCEPT_FIGHTER | AI_GOAL_STAY_NEAR_SHIP )
 #define AI_GOAL_ACCEPT_STEALTH		( AI_GOAL_FLY_TO_SHIP | AI_GOAL_ACCEPT_FIGHTER | AI_GOAL_STAY_NEAR_SHIP )
 #define AI_GOAL_ACCEPT_TRANSPORT		( AI_GOAL_FLY_TO_SHIP | AI_GOAL_CHASE | AI_GOAL_CHASE_WING | AI_GOAL_DOCK | AI_GOAL_WAYPOINTS | AI_GOAL_WAYPOINTS_ONCE | AI_GOAL_WARP | AI_GOAL_UNDOCK | AI_GOAL_STAY_STILL | AI_GOAL_PLAY_DEAD| AI_GOAL_STAY_NEAR_SHIP )
@@ -233,9 +244,15 @@ struct ai_goal;
 #define AI_GOAL_ACCEPT_SUPERCAP		( AI_GOAL_FLY_TO_SHIP | AI_GOAL_ACCEPT_CAPITAL | AI_GOAL_STAY_NEAR_SHIP )
 #define AI_GOAL_ACCEPT_SUPPORT		( AI_GOAL_FLY_TO_SHIP | AI_GOAL_DOCK | AI_GOAL_UNDOCK | AI_GOAL_WAYPOINTS | AI_GOAL_WAYPOINTS_ONCE | AI_GOAL_STAY_NEAR_SHIP | AI_GOAL_KEEP_SAFE_DISTANCE | AI_GOAL_STAY_STILL | AI_GOAL_PLAY_DEAD)
 #define AI_GOAL_ACCEPT_ESCAPEPOD		( AI_GOAL_FLY_TO_SHIP | AI_GOAL_ACCEPT_TRANSPORT| AI_GOAL_STAY_NEAR_SHIP  )
+*/

 #define MAX_AI_DOCK_NAMES				25

+typedef flag_def_list ai_goal_list;
+
+extern ai_goal_list Ai_goal_names[];
+extern int Num_ai_goals;
+
 extern int Num_ai_dock_names;
 extern char Ai_dock_names[MAX_AI_DOCK_NAMES][NAME_LENGTH];

@@ -246,7 +263,10 @@ extern void ai_post_process_mission();
 extern void ai_maybe_add_form_goal( wing *wingp );
 extern void ai_process_mission_orders( int objnum, ai_info *aip );

+extern int ai_goal_num(ai_goal *goals);
+
 // adds goals to ships/wing through sexpressions
+extern void ai_add_ship_goal_scripting(int mode, int submode, int priority, char *shipname, ai_info *aip);
 extern void ai_add_ship_goal_sexp( int sexp, int type, ai_info *aip );
 extern void ai_add_wing_goal_sexp( int sexp, int type, int wingnum );
 extern void ai_add_goal_sub_sexp( int sexp, int type, ai_goal *aigp );
@@ -10,9 +10,6 @@
 #ifndef _AIINTERNAL_H
 #define _AIINTERNAL_H

-//Returns the enemy team mask for the specified subobject
-int get_enemy_team_mask(int objnum);
-
 //Returns true if the specified object is a stealth ship, false if not
 bool is_object_stealth_ship(object* objp);

@@ -9,13 +9,25 @@

 /*
 * $Logfile: /Freespace2/code/Anim/AnimPlay.cpp $
- * $Revision: 2.17 $
- * $Date: 2005-05-28 19:40:59 $
+ * $Revision: 2.19.2.2 $
+ * $Date: 2006-09-11 01:00:27 $
 * $Author: taylor $
 *
 * C module for playing back anim files
 *
 * $Log: not supported by cvs2svn $
+ * Revision 2.19.2.1  2006/06/22 14:59:44  taylor
+ * fix various things that Valgrind has been complaining about
+ *
+ * Revision 2.19  2006/03/21 00:27:27  taylor
+ * some minor cleanup
+ *
+ * Revision 2.18  2005/11/13 06:39:38  taylor
+ * remove Cmdline_cache_ani support, it only worked if not in a VP and only on streaming ani so it was pretty much useless
+ *
+ * Revision 2.17  2005/05/28 19:40:59  taylor
+ * fix ani corruption detection so that certain streaming anis don't hit it (check was wrong anyway)
+ *
 * Revision 2.16  2005/05/23 05:58:31  taylor
 * quick catch for some corrupted anis, only a partial fix but it will do until something
 *  a bit more heavy duty comes along in the near future
@@ -368,7 +380,7 @@ void anim_render_one(int screen_id, anim_instance *ani, float frametime)
 	}	
 }

-MONITOR(NumANIPlayed);
+MONITOR(NumANIPlayed)

 // Setup an anim_play_struct for passing into anim_play().  Will fill in default values, which you
 // can then change before calling anim_play().
@@ -456,6 +468,7 @@ anim_instance *anim_play(anim_play_struct *aps)
 	}
 	instance->frame = (ubyte *) vm_malloc(instance->parent->width * instance->parent->height * 2);
 	Assert( instance->frame != NULL );
+	memset( instance->frame, 0, instance->parent->width * instance->parent->height * 2 );
 	instance->time_elapsed = 0.0f;
 	instance->stop_at = aps->stop_at;
 	instance->x = aps->x;
@@ -895,7 +908,7 @@ void anim_release_all_instances(int screen_id)
 //	2			|	width
 //	2			|	height
 //	2			|	number of frames
-//	2			|	packer code
+//	1			|	packer code
 //	763		|	palette
 //	2			|	number of key frames
 //	2			|	key frame number	}		repeats
@@ -951,14 +964,13 @@ void anim_read_header(anim *ptr, CFILE *fp)

 	if (diff != 0) {
 		if (ptr->height > 16) {
-			mprintf(("ANI %s with size %dx%d (%.1f%% wasted)\n", ptr->name, ptr->height, ptr->height, waste));
+			mprintf(("ANI %s with size %dx%d (%.1f%% wasted)\n", ptr->name, ptr->width, ptr->height, waste));
 		}
 	}
 #endif

 	ptr->total_frames = cfread_short(fp);
-	cfread(&ptr->packer_code, 1, 1, fp);
-	ptr->packer_code = INTEL_SHORT(ptr->packer_code);
+	ptr->packer_code = cfread_ubyte(fp);
 	cfread(&ptr->palette, 256, 3, fp);
 	ptr->num_keys = cfread_short(fp);

@@ -986,17 +998,13 @@ void anim_read_header(anim *ptr, CFILE *fp)
 //	returns:	pointer to anim that is loaded	=> sucess
 //				NULL										=>	failure
 //
-anim *anim_load(char *real_filename, int file_mapped)
+anim *anim_load(char *real_filename, int cf_dir_type, int file_mapped)
 {
 	anim			*ptr;
 	CFILE			*fp;
 	int			count,idx;
 	char name[_MAX_PATH];

-	if(Cmdline_cache_ani) {
-	 	file_mapped = PAGE_FROM_MEM;
-	}
-
 	Assert ( real_filename != NULL );

 	strcpy( name, real_filename );
@@ -1015,7 +1023,7 @@ anim *anim_load(char *real_filename, int file_mapped)
 	}

 	if (!ptr) {
-		fp = cfopen(name, "rb");
+		fp = cfopen(name, "rb", CFILE_NORMAL, cf_dir_type);
 		if ( !fp )
 			return NULL;

@@ -1072,14 +1080,14 @@ anim *anim_load(char *real_filename, int file_mapped)
 		if ( file_mapped == PAGE_FROM_MEM) {
 			// Try mapping the file to memory 
 			ptr->flags |= ANF_MEM_MAPPED;
-			ptr->cfile_ptr = cfopen(name, "rb", CFILE_MEMORY_MAPPED);
+			ptr->cfile_ptr = cfopen(name, "rb", CFILE_MEMORY_MAPPED, cf_dir_type);
 		}

 		// couldn't memory-map file... must be in a packfile, so stream manually
 		if ( file_mapped && !ptr->cfile_ptr ) {
 			ptr->flags &= ~ANF_MEM_MAPPED;
 			ptr->flags |= ANF_STREAMED;
-			ptr->cfile_ptr = cfopen(name, "rb");
+			ptr->cfile_ptr = cfopen(name, "rb", CFILE_NORMAL, cf_dir_type);
 		}

 		ptr->cache = NULL;
@@ -9,13 +9,17 @@

 /*
 * $Logfile: /Freespace2/code/Anim/AnimPlay.h $
- * $Revision: 2.6 $
- * $Date: 2005-07-13 02:50:48 $
- * $Author: Goober5000 $
+ * $Revision: 2.6.2.1 $
+ * $Date: 2006-09-08 06:14:43 $
+ * $Author: taylor $
 *
 * Header file for playing back anim files
 *
 * $Log: not supported by cvs2svn $
+ * Revision 2.6  2005/07/13 02:50:48  Goober5000
+ * remove PreProcDefine #includes in FS2
+ * --Goober5000
+ *
 * Revision 2.5  2005/04/05 05:53:14  taylor
 * s/vector/vec3d/g, better support for different compilers (Jens Granseuer)
 *
@@ -122,11 +126,11 @@
 #define __ANIMPLAY_H__

 #include "globalincs/pstypes.h"
+#include "cfile/cfile.h"

 struct anim;
 struct anim_info;
 struct anim_instance;
-struct CFILE;

 // structure passed in when playing an anim.  Talk about overkill..
 typedef struct {
@@ -149,7 +153,7 @@ enum
 {
 	PAGE_FROM_MEM		  = 0,
 	PAGE_FROM_DISK		  = 1,
-	PAGE_FROM_DISK_FORCED = 2,
+	PAGE_FROM_DISK_FORCED = 2
 };

 extern int Anim_paused;
@@ -166,7 +170,7 @@ int				anim_stop_playing(anim_instance* anim_instance);
 int				anim_show_next_frame(anim_instance *instance, float frametime);
 void				anim_release_all_instances(int screen_id = 0);
 void				anim_release_render_instance(anim_instance* instance);
-anim			  *anim_load(char *name, int file_mapped = PAGE_FROM_MEM);
+anim			  *anim_load(char *name, int cf_dir_type = CF_TYPE_ANY, int file_mapped = PAGE_FROM_MEM);
 int				anim_free(anim *ptr);
 int				anim_playing(anim_instance *ai);
 int				anim_write_frames_out(char *filename);
@@ -9,8 +9,8 @@

 /*
 * $Logfile: /Freespace2/code/Anim/PackUnpack.cpp $
- * $Revision: 2.10 $
- * $Date: 2005-05-24 03:13:36 $
+ * $Revision: 2.13.2.2 $
+ * $Date: 2007-10-28 16:32:06 $
 * $Author: taylor $
 *
 * Code for handling packing and unpacking in Hoffoss's RLE format, used for
@@ -18,6 +18,21 @@
 * utilizing an Anim), and getting getting frames of the Anim.
 *
 * $Log: not supported by cvs2svn $
+ * Revision 2.13.2.1  2006/06/22 14:59:44  taylor
+ * fix various things that Valgrind has been complaining about
+ *
+ * Revision 2.13  2006/03/21 00:27:27  taylor
+ * some minor cleanup
+ *
+ * Revision 2.12  2006/01/22 19:57:35  wmcoolmon
+ * 0...1...2...4?
+ *
+ * Revision 2.11  2005/11/13 06:40:19  taylor
+ * add support for 8/16/24/32 bit output from ani frame decoder
+ *
+ * Revision 2.10  2005/05/24 03:13:36  taylor
+ * extra check to make sure that RLE reading never goes over frame size in new ANI formats
+ *
 * Revision 2.9  2005/05/23 05:58:31  taylor
 * quick catch for some corrupted anis, only a partial fix but it will do until something
 *  a bit more heavy duty comes along in the near future
@@ -215,8 +230,8 @@



-int packer_code = PACKER_CODE;
-int transparent_code = 254;
+const int packer_code = PACKER_CODE;
+const int transparent_code = 254;

 void anim_check_for_palette_change(anim_instance *instance) {
 	if ( instance->parent->screen_sig != gr_screen.signature ) {
@@ -257,11 +272,10 @@ anim_instance *init_anim_instance(anim *ptr, int bpp)
 	inst->stop_now = FALSE;
 	inst->aa_color = NULL;

-	if(bpp == 16){
-		inst->frame = (ubyte *) vm_malloc(inst->parent->width * inst->parent->height * 2);
-	} else {
-		inst->frame = (ubyte *) vm_malloc(inst->parent->width * inst->parent->height);
-	}
+	inst->frame = (ubyte *) vm_malloc(inst->parent->width * inst->parent->height * (bpp >> 3));
+	Assert( inst->frame != NULL );
+	memset( inst->frame, 0, inst->parent->width * inst->parent->height * (bpp >> 3) );
+
 	return inst;
 }

@@ -834,7 +848,7 @@ void convert_24_to_16(int bit_24, ushort *bit_16)
 	ubyte *pixel = (ubyte*)&bit_24;
 	ubyte alpha = 1;

-	bm_set_components((ubyte*)bit_16, (ubyte*)&pixel[0], (ubyte*)&pixel[1], (ubyte*)&pixel[2], &alpha);	
+	bm_set_components((ubyte*)bit_16, (ubyte*)&pixel[0], (ubyte*)&pixel[1], (ubyte*)&pixel[2], &alpha);
 }

 // unpack a pixel given the passed index and the anim_instance's palette, return bytes stuffed
@@ -845,8 +859,9 @@ int unpack_pixel(anim_instance *ai, ubyte *data, ubyte pix, int aabitmap, int bp
 	ubyte bit_8 = 0;
 	ubyte al = 0;
 	ubyte r, g, b;
+	int pixel_size = (bpp / 8);
 	anim *a = ai->parent;
-	Assert(a);	
+	Assert(a);

 	// if this is an aabitmap, don't run through the palette
 	if(aabitmap){
@@ -863,35 +878,61 @@ int unpack_pixel(anim_instance *ai, ubyte *data, ubyte pix, int aabitmap, int bp
 	} else {		
 		// if the pixel value is 255, or is the xparent color, make it so		
 		if(((a->palette[pix*3] == a->xparent_r) && (a->palette[pix*3+1] == a->xparent_g) && (a->palette[pix*3+2] == a->xparent_b)) ){
-			r = b = 0;
-			g = 255;
-			bm_set_components((ubyte*)&bit_16, &r, &g, &b, &al);
-		} else {
-			// stuff the 24 bit value
-			memcpy(&bit_24, &ai->parent->palette[pix * 3], 3);
+			if (pixel_size > 2) {
+				bit_24 = 0;
+			} else {
+				r = b = 0;
+				g = 255;

-			// convert to 16 bit
-			convert_24_to_16(bit_24, &bit_16);
+				bm_set_components((ubyte*)&bit_16, &r, &g, &b, &al);
+			}
+		} else {
+			if (pixel_size > 2) {
+				ubyte pixel[4];
+				pixel[0] = ai->parent->palette[pix * 3 + 2];
+				pixel[1] = ai->parent->palette[pix * 3 + 1];
+				pixel[2] = ai->parent->palette[pix * 3];
+				pixel[3] = 255;
+				memcpy(&bit_24, pixel, sizeof(int));
+
+				if (pixel_size == 4) {
+					bit_24 = INTEL_INT(bit_24);
+				}
+			} else {
+				// stuff the 24 bit value
+				memcpy(&bit_24, &ai->parent->palette[pix * 3], 3);
+
+				// convert to 16 bit
+				convert_24_to_16(bit_24, &bit_16);
+			}
 		}
 	}

 	// stuff the pixel
-	switch(bpp){
-	case 16 :
-		memcpy(data, &bit_16, sizeof(ushort));
-		return sizeof(ushort);
+	switch (bpp) {
+		case 32:
+		case 24:
+			memcpy(data, &bit_24, pixel_size);
+			break;

-	case 8 :
-		*data = bit_8;		
-		return sizeof(ubyte);	
+		case 16:
+			memcpy(data, &bit_16, pixel_size);
+			break;
+
+		case 8:
+			*data = bit_8;
+			break;
+
+		default:
+			Int3();
+			return 0;
 	}

-	Int3();
-	return 0;
+	return pixel_size;
 }

 // unpack a pixel given the passed index and the anim_instance's palette, return bytes stuffed
-int unpack_pixel_count(anim_instance *ai, ubyte *data, ubyte pix, int count, int aabitmap, int bpp)
+int unpack_pixel_count(anim_instance *ai, ubyte *data, ubyte pix, int count = 0, int aabitmap = 0, int bpp = 8)
 {
 	int bit_24;
 	int idx;
@@ -899,6 +940,7 @@ int unpack_pixel_count(anim_instance *ai, ubyte *data, ubyte pix, int count, int
 	ushort bit_16 = 0;	
 	ubyte bit_8 = 0;
 	anim *a = ai->parent;
+	int pixel_size = (bpp / 8);
 	ubyte r, g, b;
 	Assert(a);	

@@ -917,34 +959,55 @@ int unpack_pixel_count(anim_instance *ai, ubyte *data, ubyte pix, int count, int
 	} else {		
 		// if the pixel value is 255, or is the xparent color, make it so		
 		if(((a->palette[pix*3] == a->xparent_r) && (a->palette[pix*3+1] == a->xparent_g) && (a->palette[pix*3+2] == a->xparent_b)) ){
-			r = b = 0;
-			g = 255;
-			bm_set_components((ubyte*)&bit_16, &r, &g, &b, &al);
+			if (pixel_size > 2) {
+				bit_24 = 0;
+			} else {
+				r = b = 0;
+				g = 255;
+				
+				bm_set_components((ubyte*)&bit_16, &r, &g, &b, &al);
+			}
 		} else {
-			// stuff the 24 bit value
-			memcpy(&bit_24, &ai->parent->palette[pix * 3], 3);
+			if (pixel_size > 2) {
+				ubyte pixel[4];
+				pixel[0] = ai->parent->palette[pix * 3 + 2];
+				pixel[1] = ai->parent->palette[pix * 3 + 1];
+				pixel[2] = ai->parent->palette[pix * 3];
+				pixel[3] = 255;
+				memcpy(&bit_24, pixel, sizeof(int));

-			// convert to 16 bit
-			convert_24_to_16(bit_24, &bit_16);
+				if (pixel_size == 4) {
+					bit_24 = INTEL_INT(bit_24);
+				}
+			} else {
+				// stuff the 24 bit value
+				memcpy(&bit_24, &ai->parent->palette[pix * 3], 3);
+				
+				// convert to 16 bit
+				convert_24_to_16(bit_24, &bit_16);
+			}
 		}
 	}
 	
 	// stuff the pixel
-	for(idx=0; idx<count; idx++){
-		switch(bpp){
-		case 16 :
-			memcpy(data + (idx*2), &bit_16, sizeof(ushort));
-			break;
-		case 8 :
-			*(data + idx) = bit_8;
-			break;
-		}
+	for (idx=0; idx<count; idx++) {
+		switch (bpp) {
+			case 32:
+			case 24:
+				memcpy(data + (idx * pixel_size), &bit_24, pixel_size);
+				break;
+
+			case 16:
+				memcpy(data + (idx * pixel_size), &bit_16, pixel_size);
+				break;
+
+			case 8:
+				*(data + idx) = bit_8;
+				break;
+			}
 	}

-	if(bpp == 16){
-		return sizeof(ushort) * count;
-	}
-	return sizeof(ubyte) * count;
+	return (pixel_size * count);
 }

 // ptr = packed data to unpack
@@ -955,7 +1018,7 @@ ubyte	*unpack_frame(anim_instance *ai, ubyte *ptr, ubyte *frame, int size, ubyte
 {
 	int	xlate_pal, value, count = 0;
 	int stuffed;			
-	int pixel_size = (bpp == 16) ? 2 : 1;
+	int pixel_size = (bpp / 8);

 	if ( pal_translate == NULL ) {
 		xlate_pal = 0;
@@ -1142,7 +1205,7 @@ int unpack_frame_from_file(anim_instance *ai, ubyte *frame, int size, ubyte *pal
 	int	xlate_pal, value, count = 0;
 	int	offset = 0;
 	int stuffed;	
-	int pixel_size = (bpp == 16) ? 2 : 1;
+	int pixel_size = (bpp / 8);

 	if ( pal_translate == NULL ) {
 		xlate_pal = 0;
@@ -9,15 +9,19 @@

 /*
 * $Logfile: /Freespace2/code/Anim/PackUnpack.h $
- * $Revision: 2.5 $
- * $Date: 2005-07-13 02:50:48 $
- * $Author: Goober5000 $
+ * $Revision: 2.6 $
+ * $Date: 2006-03-21 00:27:27 $
+ * $Author: taylor $
 *
 * Code for handling packing and unpacking in Hoffoss's RLE format, used for
 * Anim files.  Also handles Anim loading, creating Anim instances (for
 * utilizing an Anim), and getting getting frames of the Anim.
 *
 * $Log: not supported by cvs2svn $
+ * Revision 2.5  2005/07/13 02:50:48  Goober5000
+ * remove PreProcDefine #includes in FS2
+ * --Goober5000
+ *
 * Revision 2.4  2005/04/05 05:53:14  taylor
 * s/vector/vec3d/g, better support for different compilers (Jens Granseuer)
 *
@@ -248,8 +252,6 @@ typedef struct anim_instance {
 	int		loop_count;		// starts at 0, and is incremented each time it loops
 } anim_instance;

-extern int packer_code;
-
 int	pack_key_frame(ubyte *frame, ubyte *save, long size, long max, int compress_type);
 int	pack_frame(ubyte *frame, ubyte *frame2, ubyte *save, long size, long max, int compress_type);

@@ -9,13 +9,103 @@

 /*
 * $Logfile: /Freespace2/code/Asteroid/Asteroid.cpp $
- * $Revision: 2.20 $
- * $Date: 2005-07-22 10:18:36 $
- * $Author: Goober5000 $
+ * $Revision: 2.35.2.12 $
+ * $Date: 2007-12-28 02:10:34 $
+ * $Author: Backslash $
 *
 * C module for asteroid code
 *
 * $Log: not supported by cvs2svn $
+ * Revision 2.35.2.11  2007/09/02 02:07:38  Goober5000
+ * added fixes for #1415 and #1483, made sure every read_file_text had a corresponding setjmp, and sync'd the parse error messages between HEAD and stable
+ *
+ * Revision 2.35.2.10  2007/05/28 18:27:32  wmcoolmon
+ * Added armor support for asteroid, debris, ship, and beam damage
+ *
+ * Revision 2.35.2.9  2007/02/20 04:19:09  Goober5000
+ * the great big duplicate model removal commit
+ *
+ * Revision 2.35.2.8  2007/02/11 09:35:11  taylor
+ * add VALID_FNAME() macro and put it around a few places (more to come)
+ * clean out some old variables
+ * move CLAMP() macro from opengl header to global header
+ * update COUNT_ESTIMATE to match new bmpman changes
+ *
+ * Revision 2.35.2.7  2006/12/07 17:53:08  taylor
+ * a little clean up for bits of code that isn't used
+ *
+ * Revision 2.35.2.6  2006/11/15 00:36:08  taylor
+ * various bits of little cleanup
+ * get rid of some more compiler warnings
+ *
+ * Revision 2.35.2.5  2006/09/11 01:15:03  taylor
+ * fixes for stuff_string() bounds checking
+ *
+ * Revision 2.35.2.4  2006/08/27 18:12:38  taylor
+ * make Species_info[] and Asteroid_info[] dynamic
+ *
+ * Revision 2.35.2.3  2006/08/19 04:38:46  taylor
+ * maybe optimize the (PI/2), (PI*2) and (RAND_MAX/2) stuff a little bit
+ *
+ * Revision 2.35.2.2  2006/07/06 04:06:00  Goober5000
+ * 1) complete (almost) changeover to reorganized texture mapping system
+ * 2) finally fix texture animation; textures now animate at the correct speed
+ * --Goober5000
+ *
+ * Revision 2.35.2.1  2006/07/04 07:42:09  Goober5000
+ * --in preparation for fixing an annoying animated texture bug, reorganize the various texture structs and glow point structs and clarify several parts of the texture code :P
+ * --this breaks animated glow maps, and animated regular maps still aren't fixed, but these will be remedied shortly
+ * --Goober5000
+ *
+ * Revision 2.35  2006/05/13 07:02:27  taylor
+ * add lazy (ie, faster) checking of asteroid collisions for time-to-impact
+ *
+ * Revision 2.34  2006/01/26 03:23:29  Goober5000
+ * pare down the pragmas some more
+ * --Goober5000
+ *
+ * Revision 2.33  2006/01/13 03:30:59  Goober5000
+ * übercommit of custom IFF stuff :)
+ *
+ * Revision 2.32  2005/11/21 02:43:30  Goober5000
+ * change from "setting" to "profile"; this way makes more sense
+ * --Goober5000
+ *
+ * Revision 2.31  2005/11/21 00:46:05  Goober5000
+ * add ai_settings.tbl
+ * --Goober5000
+ *
+ * Revision 2.30  2005/10/11 12:24:04  taylor
+ * little cleaner since the two sets weren't needed
+ *
+ * Revision 2.29  2005/10/10 17:21:03  taylor
+ * remove NO_NETWORK
+ *
+ * Revision 2.28  2005/10/08 15:37:26  taylor
+ * fix several asteroid problems, little code duplication but this actually works and is less error prone than the previous method
+ *
+ * Revision 2.27  2005/09/25 22:29:35  Kazan
+ * my bad
+ *
+ * Revision 2.26  2005/09/25 22:23:39  Kazan
+ * correct an error
+ *
+ * Revision 2.25  2005/09/25 20:55:28  Goober5000
+ * oh noes!
+ * --Goober5000
+ *
+ * Revision 2.24  2005/09/25 20:31:42  Goober5000
+ * okay; everything should be good to go
+ * --Goober5000
+ *
+ * Revision 2.23  2005/09/25 08:25:14  Goober5000
+ * Okay, everything should now work again. :p Still have to do a little more with the asteroids.
+ * --Goober5000
+ *
+ * Revision 2.20  2005/07/22 10:18:36  Goober5000
+ * CVS header tweaks
+ * --Goober5000
+ *
 * Revision 2.19  2005/07/13 02:50:48  Goober5000
 * remove PreProcDefine #includes in FS2
 * --Goober5000
@@ -57,7 +147,7 @@
 *
 * Revision 2.7  2004/03/31 05:42:25  Goober5000
 * got rid of all those nasty warnings from xlocale and so forth; also added comments
- * for #pragma warning disable to indicate the message being disabled
+ * to indicate which warnings were being disabled
 * --Goober5000
 *
 * Revision 2.6  2004/03/05 09:01:53  Goober5000
@@ -363,12 +453,14 @@
 #include "parse/parselo.h"
 #include "math/vecmat.h"
 #include "model/model.h"
-
-#ifndef NO_NETWORK
+#include "species_defs/species_defs.h"
+#include "iff_defs/iff_defs.h"
 #include "network/multiutil.h"
 #include "network/multimsgs.h"
 #include "network/multi.h"
-#endif
+#include "parse/scripting.h"
+
+#include <vector>


 //WMC - we want asteroid ability with demo!!
@@ -385,15 +477,15 @@ asteroid_obj	Asteroid_obj_list;						// head of linked list of asteroid_obj stru
 #define LARGE_DEBRIS_WEIGHT	1

 int	Asteroids_enabled = 1;
-int	Num_asteroid_types;
 int	Num_asteroids = 0;
 int	Asteroid_throw_objnum = -1;		//	Object index of ship to throw asteroids at.
 int	Next_asteroid_throw;

-asteroid_info	Asteroid_info[MAX_DEBRIS_TYPES];
+std::vector<asteroid_info> Asteroid_info;
 asteroid			Asteroids[MAX_ASTEROIDS];
 asteroid_field	Asteroid_field;

+
 static int		Asteroid_impact_explosion_ani;
 static float	Asteroid_impact_explosion_radius;

@@ -467,6 +559,8 @@ float asteroid_cap_speed(int asteroid_info_index, float speed)
 {
 	float max, double_max;

+	Assert( asteroid_info_index < (int)Asteroid_info.size() );
+
 	max = Asteroid_info[asteroid_info_index].max_speed;
 	double_max = max * 2;

@@ -555,12 +649,12 @@ object *asteroid_create(asteroid_field *asfieldp, int asteroid_type, int asteroi
 	int				rand_base;

 	// bogus
-	if(asfieldp == NULL){
+	if(asfieldp == NULL) {
 		return NULL;
 	}

-	for (n=0; n<MAX_ASTEROIDS; n++ ) {
-		if ( !(Asteroids[n].flags & AF_USED) ){
+	for (n=0; n<MAX_ASTEROIDS; n++) {
+		if (!(Asteroids[n].flags & AF_USED)) {
 			break;
 		}
 	}
@@ -570,7 +664,11 @@ object *asteroid_create(asteroid_field *asfieldp, int asteroid_type, int asteroi
 		return NULL;
 	}

-	if((asteroid_type < 0) || (asteroid_type >= Num_asteroid_types)){
+	if((asteroid_type < 0) || (asteroid_type >= (((int)Species_info.size() + 1) * NUM_DEBRIS_SIZES))) {
+		return NULL;
+	}
+
+	if((asteroid_subtype < 0) || (asteroid_subtype >= NUM_DEBRIS_POFS)) {
 		return NULL;
 	}

@@ -579,19 +677,15 @@ object *asteroid_create(asteroid_field *asfieldp, int asteroid_type, int asteroi
 		asteroid_subtype = 0;
 	}	

-	if( (asteroid_subtype < 0) || (asteroid_subtype >= MAX_ASTEROID_POFS)){
-		return NULL;
-	}
-
 	asip = &Asteroid_info[asteroid_type];

 	// bogus
-	if(asip->modelp[asteroid_subtype] == NULL){
+	if(asip->modelp[asteroid_subtype] == NULL) {
 		return NULL;
 	}	

 	asp = &Asteroids[n];
-	asp->type = asteroid_type;
+	asp->asteroid_type = asteroid_type;
 	asp->asteroid_subtype = asteroid_subtype;
 	asp->flags = 0;
 	asp->flags |= AF_USED;
@@ -616,11 +710,10 @@ object *asteroid_create(asteroid_field *asfieldp, int asteroid_type, int asteroi

 		inner_bound_pos_fixup(asfieldp, &pos);
 		// vm_set_identity(&orient);
-		angs.p = frand() * 2*PI;
-		angs.b = frand() * 2*PI;
-		angs.h = frand() * 2*PI;
+		angs.p = frand() * PI2;
+		angs.b = frand() * PI2;
+		angs.h = frand() * PI2;
 	} else {
-#ifndef NO_NETWORK
 		signature = multi_assign_network_signature( MULTI_SIG_ASTEROID );
 		rand_base = signature;

@@ -630,10 +723,9 @@ object *asteroid_create(asteroid_field *asfieldp, int asteroid_type, int asteroi

 		inner_bound_pos_fixup(asfieldp, &pos);
 		// vm_set_identity(&orient);
-		angs.p = static_randf( rand_base++ ) * 2*PI;
-		angs.b = static_randf( rand_base++ ) * 2*PI;
-		angs.h = static_randf( rand_base++ ) * 2*PI;
-#endif
+		angs.p = static_randf( rand_base++ ) * PI2;
+		angs.b = static_randf( rand_base++ ) * PI2;
+		angs.h = static_randf( rand_base++ ) * PI2;
 	}

 	vm_angles_2_matrix(&orient, &angs);
@@ -728,11 +820,9 @@ void asteroid_sub_create(object *parent_objp, int asteroid_type, vec3d *relvec)
 	if (new_objp == NULL)
 		return;

-#ifndef NO_NETWORK
 	if ( MULTIPLAYER_MASTER ){
 		send_asteroid_create( new_objp, parent_objp, asteroid_type, relvec );
 	}
-#endif

 	//	Now, bash some values.
 	vm_vec_scale_add(&new_objp->pos, &parent_objp->pos, relvec, 0.5f * parent_objp->radius);
@@ -765,6 +855,13 @@ void asteroid_load(int asteroid_info_index, int asteroid_subtype)
 	asteroid_info	*asip;
 //	int				pof_index;

+	Assert( asteroid_info_index < (int)Asteroid_info.size() );
+	Assert( asteroid_subtype < NUM_DEBRIS_POFS );
+
+	if ( (asteroid_info_index >= (int)Asteroid_info.size()) || (asteroid_subtype >= NUM_DEBRIS_POFS) ) {
+		return;
+	}
+
 	asip = &Asteroid_info[asteroid_info_index];

 	// pick one of MAX_ASTEROID_POFS models
@@ -777,6 +874,9 @@ void asteroid_load(int asteroid_info_index, int asteroid_subtype)
 //		pof_index = 0;
 //	}

+	if ( !VALID_FNAME(asip->pof_files[asteroid_subtype]) )
+		return;
+
 	asip->model_num[asteroid_subtype] = model_load( asip->pof_files[asteroid_subtype], 0, NULL );

 	if (asip->model_num[asteroid_subtype] > -1) {
@@ -793,28 +893,34 @@ void asteroid_load(int asteroid_info_index, int asteroid_subtype)
 int get_debris_from_same_group(int index) {
 	int group_base, group_offset;

-	group_base = (index / 3) * 3;
+	group_base = (index / NUM_DEBRIS_SIZES) * NUM_DEBRIS_SIZES;
 	group_offset = index - group_base;

 	// group base + offset
 	// offset is formed by adding 1 or 2 (since 3 in model group) and mapping back in the 0-2 range
-	return group_base + ((group_offset + rand()%2 + 1) % 3);
+	return group_base + ((group_offset + rand()%(NUM_DEBRIS_SIZES-1) + 1) % NUM_DEBRIS_SIZES);
 }

 // returns a weight that depends on asteroid size.
 // the weight is then used to determine the frequencty of different sizes of ship debris
 int get_debris_weight(int ship_debris_index)
 {
-	if (ship_debris_index % 3 == 0)
-		return SMALL_DEBRIS_WEIGHT;
+	int size = ship_debris_index % NUM_DEBRIS_SIZES;
+	switch (size)
+	{
+		case ASTEROID_TYPE_SMALL:
+			return SMALL_DEBRIS_WEIGHT;

-	if (ship_debris_index % 3 == 1)
-		return MEDIUM_DEBRIS_WEIGHT;
+		case ASTEROID_TYPE_MEDIUM:
+			return MEDIUM_DEBRIS_WEIGHT;

-	if (ship_debris_index % 3 == 2)
-		return LARGE_DEBRIS_WEIGHT;
-	//Int3();
-	return 1;
+		case ASTEROID_TYPE_LARGE:
+			return LARGE_DEBRIS_WEIGHT;
+
+		default:
+			Int3();
+			return 1;
+	}
 }

 // Create all the asteroids for the mission, called from 
@@ -825,8 +931,12 @@ void asteroid_create_all()
 	// ship_debris_odds_table keeps track of debris type of the next debris piece
 	// each different type (size) of debris piece has a diffenent weight, smaller weighted more heavily than larger.
 	// choose next type from table ship_debris_odds_table by rand()%max_weighted_range,
-	//  the first column in ship_debris_odds_table random number *below* which the debris type in the second column is selected.
-	int ship_debris_odds_table[3][2];
+	// the threshold *below* which the debris type is selected.
+	struct {
+		int random_threshold;
+		int debris_type;
+	} ship_debris_odds_table[MAX_ACTIVE_DEBRIS_TYPES];
+
 	int max_weighted_range = 0;

 	if (!Asteroids_enabled)
@@ -842,7 +952,7 @@ void asteroid_create_all()

 	// get number of ship debris types
 	if (Asteroid_field.debris_genre == DG_SHIP) {
-		for (idx=0; idx<3; idx++) {
+		for (idx=0; idx<MAX_ACTIVE_DEBRIS_TYPES; idx++) {
 			if (Asteroid_field.field_debris_type[idx] != -1) {
 				num_debris_types++;
 			}
@@ -851,8 +961,8 @@ void asteroid_create_all()
 		// Calculate the odds table
 		for (idx=0; idx<num_debris_types; idx++) {
 			int debris_weight = get_debris_weight(Asteroid_field.field_debris_type[idx]);
-			ship_debris_odds_table[idx][0] = max_weighted_range + debris_weight;
-			ship_debris_odds_table[idx][1] = Asteroid_field.field_debris_type[idx];
+			ship_debris_odds_table[idx].random_threshold = max_weighted_range + debris_weight;
+			ship_debris_odds_table[idx].debris_type = Asteroid_field.field_debris_type[idx];
 			max_weighted_range += debris_weight;
 		}
 	}
@@ -866,19 +976,19 @@ void asteroid_create_all()
 		if (Asteroid_field.field_debris_type[0] != -1) {
 			asteroid_load(ASTEROID_TYPE_SMALL, 0);
 			asteroid_load(ASTEROID_TYPE_MEDIUM, 0);
-			asteroid_load(ASTEROID_TYPE_BIG, 0);
+			asteroid_load(ASTEROID_TYPE_LARGE, 0);
 		}

 		if (Asteroid_field.field_debris_type[1] != -1) {
 			asteroid_load(ASTEROID_TYPE_SMALL, 1);
 			asteroid_load(ASTEROID_TYPE_MEDIUM, 1);
-			asteroid_load(ASTEROID_TYPE_BIG, 1);
+			asteroid_load(ASTEROID_TYPE_LARGE, 1);
 		}

 		if (Asteroid_field.field_debris_type[2] != -1) {
 			asteroid_load(ASTEROID_TYPE_SMALL, 2);
 			asteroid_load(ASTEROID_TYPE_MEDIUM, 2);
-			asteroid_load(ASTEROID_TYPE_BIG, 2);
+			asteroid_load(ASTEROID_TYPE_LARGE, 2);
 		}
 	}

@@ -888,21 +998,21 @@ void asteroid_create_all()
 			// For asteroid, load only large asteroids

 			// get a valid subtype
-			int subtype = rand() % 3;
+			int subtype = rand() % NUM_DEBRIS_POFS;
 			while (Asteroid_field.field_debris_type[subtype] == -1) {
-				subtype = (subtype + 1) % 3;
+				subtype = (subtype + 1) % NUM_DEBRIS_POFS;
 			}

-			asteroid_create(&Asteroid_field, ASTEROID_TYPE_BIG, subtype);
+			asteroid_create(&Asteroid_field, ASTEROID_TYPE_LARGE, subtype);
 		} else {
 			Assert(num_debris_types > 0);

 			int rand_choice = rand() % max_weighted_range;

-			for (idx=0; idx<3; idx++) {
+			for (idx=0; idx<MAX_ACTIVE_DEBRIS_TYPES; idx++) {
 				// for ship debris, choose type according to odds table
-				if (rand_choice < ship_debris_odds_table[idx][0]) {
-					asteroid_create(&Asteroid_field, ship_debris_odds_table[idx][1], 0);
+				if (rand_choice < ship_debris_odds_table[idx].random_threshold) {
+					asteroid_create(&Asteroid_field, ship_debris_odds_table[idx].debris_type, 0);
 					break;
 				}
 			}
@@ -923,10 +1033,8 @@ void asteroid_level_init()
 // 0 from this function.  We will force a wrap on the clients when server tells us
 int asteroid_should_wrap(object *objp, asteroid_field *asfieldp)
 {
-#ifndef NO_NETWORK
 	if ( MULTIPLAYER_CLIENT )
 		return 0;
-#endif

 	if (objp->pos.xyz.x < asfieldp->min_bound.xyz.x) {
 		return 1;
@@ -1041,8 +1149,6 @@ void asteroid_aim_at_target(object *objp, object *asteroid_objp, float delta_tim
 	vm_vec_scale_add(&asteroid_objp->last_pos, &asteroid_objp->pos, &asteroid_objp->phys_info.vel, -flFrametime);
 }

-int	Max_incoming_asteroids[NUM_SKILL_LEVELS] = {3, 4, 5, 7, 10};
-
 //	Call once per frame to maybe throw an asteroid at a ship.
 //	"count" asteroids already targeted on 
 void maybe_throw_asteroid(int count)
@@ -1057,7 +1163,7 @@ void maybe_throw_asteroid(int count)

 	nprintf(("AI", "Incoming asteroids: %i\n", count));

-	if (count > Max_incoming_asteroids[Game_skill_level])
+	if (count > The_mission.ai_profile->max_incoming_asteroids[Game_skill_level])
 		return;

 	Next_asteroid_throw = timestamp(1000 + 1200 * count/(Game_skill_level+1));
@@ -1066,11 +1172,11 @@ void maybe_throw_asteroid(int count)
 	for ( so = GET_FIRST(&Ship_obj_list); so != END_OF_LIST(&Ship_obj_list); so = GET_NEXT(so) ) {
 		object *A = &Objects[so->objnum];
 		if (so->objnum == Asteroid_throw_objnum) {
-			int subtype = rand() % 3;
+			int subtype = rand() % NUM_DEBRIS_POFS;
 			while (Asteroid_field.field_debris_type[subtype] == -1) {
-				subtype = (subtype + 1) % 3;
+				subtype = (subtype + 1) % NUM_DEBRIS_POFS;
 			}
-			object *objp = asteroid_create(&Asteroid_field, ASTEROID_TYPE_BIG, subtype);
+			object *objp = asteroid_create(&Asteroid_field, ASTEROID_TYPE_LARGE, subtype);
 			if (objp != NULL) {
 				asteroid_aim_at_target(A, objp, ASTEROID_MIN_COLLIDE_TIME + frand() * 20.0f);

@@ -1083,11 +1189,9 @@ void maybe_throw_asteroid(int count)
 					// this line gives too many collision pairs.
 					// asteroid_update_collide(objp);

-#ifndef NO_NETWORK
 					if ( MULTIPLAYER_MASTER ) {
 						send_asteroid_throw( objp );
 					}
-#endif
 				}
 			}

@@ -1166,10 +1270,8 @@ void asteroid_maybe_reposition(object *objp, asteroid_field *asfieldp)

 					asteroid_update_collide(objp);

-#ifndef NO_NETWORK
 					if ( MULTIPLAYER_MASTER )
 						send_asteroid_throw( objp );
-#endif
 				}
 			}
 		}
@@ -1184,10 +1286,10 @@ void lerp(float *goal, float f1, float f2, float scale)
 void asteroid_process_pre( object *objp, float frame_time)
 {
 	if (Asteroids_enabled) {
-		vec3d	*v, *vv;
+	//	vec3d	*v, *vv;

-		v = &objp->phys_info.vel;
-		vv = &objp->phys_info.desired_vel;
+	//	v = &objp->phys_info.vel;
+	//	vv = &objp->phys_info.desired_vel;

 		//nprintf(("AI", "Frm %i: Obj #%2i: Hull: %5.1f Vel: %5.1f %5.1f %5.1f Des: %5.1f %5.1f %5.1f\n", Framecount, objp-Objects, objp->hull_strength, v->xyz.x, v->xyz.y, v->xyz.z, vv->xyz.x, vv->xyz.y, vv->xyz.z));

@@ -1198,8 +1300,6 @@ void asteroid_process_pre( object *objp, float frame_time)
 	}
 }

-#pragma warning ( push )
-#pragma warning ( disable : 4701 )	// possible use of variable without initialization
 int asteroid_check_collision(object *pasteroid, object *other_obj, vec3d *hitpos, collision_info_struct *asteroid_hit_info)
 {
 	if (!Asteroids_enabled) {
@@ -1221,7 +1321,7 @@ int asteroid_check_collision(object *pasteroid, object *other_obj, vec3d *hitpos
 	if ( asteroid_hit_info == NULL ) {
 		// asteroid weapon collision
 		Assert( other_obj->type == OBJ_WEAPON );
-		mc.model_num = Asteroid_info[Asteroids[num].type].model_num[asteroid_subtype];	// Fill in the model to check
+		mc.model_num = Asteroid_info[Asteroids[num].asteroid_type].model_num[asteroid_subtype];	// Fill in the model to check
 		model_clear_instance( mc.model_num );
 		mc.orient = &pasteroid->orient;					// The object's orient
 		mc.pos = &pasteroid->pos;							// The object's position
@@ -1280,7 +1380,7 @@ int asteroid_check_collision(object *pasteroid, object *other_obj, vec3d *hitpos
 	int mc_ret_val = 0;

 	if ( asteroid_hit_info->heavy == ship_obj ) {	// ship is heavier, so asteroid is sphere. Check sphere collision against ship poly model
-		mc.model_num = Ships[ship_obj->instance].modelnum;		// Fill in the model to check
+		mc.model_num = Ship_info[Ships[ship_obj->instance].ship_info_index].model_num;		// Fill in the model to check
 		mc.orient = &ship_obj->orient;								// The object's orient
 		mc.radius = pasteroid->radius;
 		mc.flags = (MC_CHECK_MODEL | MC_CHECK_SPHERELINE);
@@ -1311,7 +1411,7 @@ int asteroid_check_collision(object *pasteroid, object *other_obj, vec3d *hitpos
 				model_get_rotating_submodel_list(submodel_list, &num_rotating_submodels, heavy_obj);

 				// Get polymodel and turn off all rotating submodels, collide against only 1 at a time.
-				pm = model_get(Ships[heavy_obj->instance].modelnum);
+				pm = model_get(Ship_info[Ships[heavy_obj->instance].ship_info_index].model_num);

 				// turn off all rotating submodels and test for collision
 				int i;
@@ -1402,10 +1502,10 @@ int asteroid_check_collision(object *pasteroid, object *other_obj, vec3d *hitpos

 	} else {
 		// Asteroid is heavier obj
-		mc.model_num = Asteroid_info[Asteroids[num].type].model_num[asteroid_subtype];		// Fill in the model to check
+		mc.model_num = Asteroid_info[Asteroids[num].asteroid_type].model_num[asteroid_subtype];		// Fill in the model to check
 		model_clear_instance( mc.model_num );
 		mc.orient = &pasteroid->orient;				// The object's orient
-		mc.radius = model_get_core_radius( Ships[ship_obj->instance].modelnum );
+		mc.radius = model_get_core_radius(Ship_info[Ships[ship_obj->instance].ship_info_index].model_num);

 		// check for collision between asteroid model and ship sphere
 		mc.flags = (MC_CHECK_MODEL | MC_CHECK_SPHERELINE);
@@ -1455,8 +1555,6 @@ int asteroid_check_collision(object *pasteroid, object *other_obj, vec3d *hitpos
 		return 0;
 	}
 }
-#pragma warning ( pop )
-

 void asteroid_render(object * obj)
 {
@@ -1473,8 +1571,8 @@ void asteroid_render(object * obj)

 		Assert( asp->flags & AF_USED );

-		model_clear_instance( Asteroid_info[asp->type].model_num[asp->asteroid_subtype]);
-		model_render(Asteroid_info[asp->type].model_num[asp->asteroid_subtype], &obj->orient, &obj->pos, MR_NORMAL|MR_IS_ASTEROID, OBJ_INDEX(obj) );	//	Replace MR_NORMAL with 0x07 for big yellow blobs
+		model_clear_instance( Asteroid_info[asp->asteroid_type].model_num[asp->asteroid_subtype]);
+		model_render(Asteroid_info[asp->asteroid_type].model_num[asp->asteroid_subtype], &obj->orient, &obj->pos, MR_NORMAL|MR_IS_ASTEROID, OBJ_INDEX(obj) );	//	Replace MR_NORMAL with 0x07 for big yellow blobs
 	}
 }

@@ -1503,8 +1601,8 @@ float asteroid_get_fireball_scale_multiplier(int num)
 {
 	if (Asteroids[num].flags & AF_USED) {

-		switch(Asteroids[num].type) {
-		case ASTEROID_TYPE_BIG:
+		switch(Asteroids[num].asteroid_type) {
+		case ASTEROID_TYPE_LARGE:
 			return 1.5f;
 			break;

@@ -1528,7 +1626,7 @@ float asteroid_create_explosion(object *objp)

 	fireball_scale_multiplier = asteroid_get_fireball_scale_multiplier(objp->instance);

-	fireball_objnum = fireball_create( &objp->pos, FIREBALL_ASTEROID, OBJ_INDEX(objp), objp->radius*fireball_scale_multiplier, 0, &objp->phys_info.vel );
+	fireball_objnum = fireball_create( &objp->pos, FIREBALL_ASTEROID, FIREBALL_LARGE_EXPLOSION, OBJ_INDEX(objp), objp->radius*fireball_scale_multiplier, 0, &objp->phys_info.vel );
 	if ( fireball_objnum > -1 )	{
 		explosion_life = fireball_lifeleft(&Objects[fireball_objnum]);
 	} else {
@@ -1544,14 +1642,14 @@ void asteriod_explode_sound(object *objp, int type, int play_loud)
 	int	sound_index = -1;
 	float range_factor = 1.0f;		// how many times sound should traver farther than normal

-	if (type % 3 <= 1)
+	if (type % NUM_DEBRIS_SIZES <= 1)
 	{
 		sound_index = SND_ASTEROID_EXPLODE_SMALL;
 		range_factor = 5.0;
 	}
 	else
 	{
-		sound_index = SND_ASTEROID_EXPLODE_BIG;
+		sound_index = SND_ASTEROID_EXPLODE_LARGE;
 		range_factor = 10.0f;
 	}

@@ -1578,7 +1676,7 @@ void asteroid_do_area_effect(object *asteroid_objp)
 	asteroid_info	*asip;

 	asp = &Asteroids[asteroid_objp->instance];
-	asip = &Asteroid_info[asp->type];
+	asip = &Asteroid_info[asp->asteroid_type];

 	if ( asip->damage <= 0 ) {		// do a quick out if there is no damage to apply
 		return;
@@ -1617,11 +1715,9 @@ void asteroid_hit( object * asteroid_obj, object * other_obj, vec3d * hitpos, fl
 		return;
 	}

-#ifndef NO_NETWORK
 	if ( MULTIPLAYER_MASTER ){
 		send_asteroid_hit( asteroid_obj, other_obj, hitpos, damage );
 	}
-#endif

 	asteroid_obj->hull_strength -= damage;

@@ -1635,7 +1731,7 @@ void asteroid_hit( object * asteroid_obj, object * other_obj, vec3d * hitpos, fl
 			if ( asp->collide_objnum == OBJ_INDEX(other_obj) ) {
 //				play_loud_collision = 1;
 			}
-			asteriod_explode_sound(asteroid_obj, asp->type, play_loud_collision);
+			asteriod_explode_sound(asteroid_obj, asp->asteroid_type, play_loud_collision);
 			asteroid_do_area_effect(asteroid_obj);

 			asp->final_death_time = timestamp( fl2i(explosion_life*1000.0f)/5 );	// Wait till 30% of vclip time before breaking the asteroid up.
@@ -1752,56 +1848,56 @@ void asteroid_maybe_break_up(object *asteroid_obj)
 	if ( timestamp_elapsed(asp->final_death_time) ) {
 		vec3d	relvec, vfh, tvec;

-		asteroid_obj->flags |= OF_SHOULD_BE_DEAD;
+		Script_system.SetHookObject("Self", asteroid_obj);
+		if(!Script_system.IsConditionOverride(CHA_DEATH, asteroid_obj))
+		{
+			asteroid_obj->flags |= OF_SHOULD_BE_DEAD;

-		// multiplayer clients won't go through the following code.  asteroid_sub_create will send
-		// a create packet to the client in the above named function
-#ifndef NO_NETWORK
-		if ( !MULTIPLAYER_CLIENT ) {
-#endif
-
-			if (asp->type <= ASTEROID_TYPE_BIG) // 3
+			// multiplayer clients won't go through the following code.  asteroid_sub_create will send
+			// a create packet to the client in the above named function
+			if ( !MULTIPLAYER_CLIENT ) {
 				// if this isn't true it's just debris, and debris doesn't break up
-			{
-				switch (asp->type) {
-					case ASTEROID_TYPE_SMALL:
-						break;
-					case ASTEROID_TYPE_MEDIUM:
-						asc_get_relvec(&relvec, asteroid_obj, &asp->death_hit_pos);
-						asteroid_sub_create(asteroid_obj, ASTEROID_TYPE_SMALL, &relvec);
-					
-						vm_vec_normalized_dir(&vfh, &asteroid_obj->pos, &asp->death_hit_pos);
-						vm_vec_copy_scale(&tvec, &vfh, 2.0f);
-						vm_vec_sub2(&tvec, &relvec);
-						asteroid_sub_create(asteroid_obj, ASTEROID_TYPE_SMALL, &tvec);
+				if (asp->asteroid_type <= ASTEROID_TYPE_LARGE)
+				{
+					switch (asp->asteroid_type) {
+						case ASTEROID_TYPE_SMALL:
+							break;
+						case ASTEROID_TYPE_MEDIUM:
+							asc_get_relvec(&relvec, asteroid_obj, &asp->death_hit_pos);
+							asteroid_sub_create(asteroid_obj, ASTEROID_TYPE_SMALL, &relvec);
 						
-						break;
-					case ASTEROID_TYPE_BIG:
-						asc_get_relvec(&relvec, asteroid_obj, &asp->death_hit_pos);
-						asteroid_sub_create(asteroid_obj, ASTEROID_TYPE_MEDIUM, &relvec);
-					
-						vm_vec_normalized_dir(&vfh, &asteroid_obj->pos, &asp->death_hit_pos);
-						vm_vec_copy_scale(&tvec, &vfh, 2.0f);
-						vm_vec_sub2(&tvec, &relvec);
-						asteroid_sub_create(asteroid_obj, ASTEROID_TYPE_MEDIUM, &tvec);
+							vm_vec_normalized_dir(&vfh, &asteroid_obj->pos, &asp->death_hit_pos);
+							vm_vec_copy_scale(&tvec, &vfh, 2.0f);
+							vm_vec_sub2(&tvec, &relvec);
+							asteroid_sub_create(asteroid_obj, ASTEROID_TYPE_SMALL, &tvec);
+							
+							break;
+						case ASTEROID_TYPE_LARGE:
+							asc_get_relvec(&relvec, asteroid_obj, &asp->death_hit_pos);
+							asteroid_sub_create(asteroid_obj, ASTEROID_TYPE_MEDIUM, &relvec);
+						
+							vm_vec_normalized_dir(&vfh, &asteroid_obj->pos, &asp->death_hit_pos);
+							vm_vec_copy_scale(&tvec, &vfh, 2.0f);
+							vm_vec_sub2(&tvec, &relvec);
+							asteroid_sub_create(asteroid_obj, ASTEROID_TYPE_MEDIUM, &tvec);

-						while (frand() > 0.6f) {
-							vec3d	rvec, tvec2;
-							vm_vec_rand_vec_quick(&rvec);
-							vm_vec_scale_add(&tvec2, &vfh, &rvec, 0.75f);
-							asteroid_sub_create(asteroid_obj, ASTEROID_TYPE_SMALL, &tvec2);
-						}
-						break;
+							while (frand() > 0.6f) {
+								vec3d	rvec, tvec2;
+								vm_vec_rand_vec_quick(&rvec);
+								vm_vec_scale_add(&tvec2, &vfh, &rvec, 0.75f);
+								asteroid_sub_create(asteroid_obj, ASTEROID_TYPE_SMALL, &tvec2);
+							}
+							break;

-					default: // this isn't going to happen.. really
-						break;
+						default: // this isn't going to happen.. really
+							break;
+					}
 				}
 			}
-#ifndef NO_NETWORK
+			asp->final_death_time = timestamp(-1);
 		}
-#endif
-
-		asp->final_death_time = timestamp(-1);
+		Script_system.RunCondition(CHA_DEATH, '\0', NULL, asteroid_obj);
+		Script_system.RemHookVar("Self");
 	}
 }

@@ -1824,7 +1920,7 @@ int asteroid_get_random_in_cone(vec3d *pos, vec3d *dir, float ang, int danger)
 	return -1;
 }

-void asteroid_test_collide(object *asteroid_obj, object *ship_obj, mc_info *mc)
+void asteroid_test_collide(object *asteroid_obj, object *ship_obj, mc_info *mc, bool lazy = false)
 {
 	float		asteroid_ray_dist;
 	vec3d	asteroid_fvec, terminus;
@@ -1844,13 +1940,16 @@ void asteroid_test_collide(object *asteroid_obj, object *ship_obj, mc_info *mc)

 	ship_model_start(ship_obj);

-	mc->model_num = Ships[ship_obj->instance].modelnum;			// Fill in the model to check
+	mc->model_num = Ship_info[Ships[ship_obj->instance].ship_info_index].model_num;			// Fill in the model to check
 	mc->orient = &ship_obj->orient;										// The object's orientation
 	mc->pos = &ship_obj->pos;												// The object's position
 	mc->p0 = &asteroid_obj->pos;											// Point 1 of ray to check
 	mc->p1 = &terminus;														// Point 2 of ray to check
-//	mc->flags = MC_CHECK_MODEL | MC_ONLY_BOUND_BOX;	
-	mc->flags = MC_CHECK_MODEL | MC_CHECK_SPHERELINE;	
+	if (lazy) {
+		mc->flags = MC_CHECK_MODEL | MC_ONLY_BOUND_BOX;
+	} else {
+		mc->flags = MC_CHECK_MODEL | MC_CHECK_SPHERELINE;
+	}
 	mc->radius = asteroid_obj->radius;

 	model_collide(mc);
@@ -1884,7 +1983,8 @@ int asteroid_valid_ship_to_warn_collide(ship *shipp)
 		return 0;
 	}

-	if ( (shipp->team != Player_ship->team) || (Player_ship->team == TEAM_TRAITOR) ) {
+	// Goober5000 used to be if teams were unequal and player was not traitor, but this works for allies not on your team
+	if ( iff_x_attacks_y(Player_ship->team, shipp->team) ) {
 		return 0;
 	}

@@ -1903,12 +2003,10 @@ void asteroid_update_collide_flag(object *asteroid_objp)
 	asp->collide_objnum = -1;
 	asp->collide_objsig = -1;

-#ifndef NO_NETWORK
 	// multiplayer dogfight
 	if((Game_mode & GM_MULTIPLAYER) && (Netgame.type_flags & NG_TYPE_DOGFIGHT)){
 		return;
 	}
-#endif

 	num_escorts = hud_escort_num_ships_on_list();

@@ -1989,7 +2087,7 @@ float asteroid_time_to_impact(object *asteroid_objp)
 		return time;
 	}
 	
-	asteroid_test_collide(asteroid_objp, &Objects[asp->collide_objnum], &mc);
+	asteroid_test_collide(asteroid_objp, &Objects[asp->collide_objnum], &mc, true);

 	if ( mc.num_hits ) {
 		total_dist = vm_vec_dist(&mc.hit_point_world, &asteroid_objp->pos) - asteroid_objp->radius;
@@ -2004,24 +2102,20 @@ float asteroid_time_to_impact(object *asteroid_objp)
 }

 // read in a single asteroid section from asteroid.tbl
-void asteroid_parse_section()
+void asteroid_parse_section(asteroid_info *asip)
 {
-	asteroid_info	*asip;
-	
-	asip = &Asteroid_info[Num_asteroid_types];
-
 	required_string("$Name:");
-	stuff_string(asip->name, F_NAME, NULL);
+	stuff_string(asip->name, F_NAME, NAME_LENGTH);

 	required_string( "$POF file1:" );
-	stuff_string(asip->pof_files[0], F_NAME, NULL);
+	stuff_string(asip->pof_files[0], F_NAME, MAX_FILENAME_LEN);

 	required_string( "$POF file2:" );
-	stuff_string(asip->pof_files[1], F_NAME, NULL);
+	stuff_string(asip->pof_files[1], F_NAME, MAX_FILENAME_LEN);

-	if ( (strstr(asip->name,"Asteroid") != NULL) || (strstr(asip->name, "asteroid") != NULL) ) {
+	if ( (stristr(asip->name,"Asteroid") != NULL) ) {
 		required_string( "$POF file3:" );
-		stuff_string(asip->pof_files[2], F_NAME, NULL);
+		stuff_string(asip->pof_files[2], F_NAME, MAX_FILENAME_LEN);
 	}

 	asip->num_detail_levels = 0;
@@ -2032,6 +2126,12 @@ void asteroid_parse_section()
 	required_string("$Max Speed:");
 	stuff_float(&asip->max_speed);

+	if(optional_string("$Damage Type:")) {
+		char buf[NAME_LENGTH];
+		stuff_string(buf, F_NAME, NAME_LENGTH);
+		asip->damage_type_idx = damage_type_add(buf);
+	}
+
 	required_string("$Expl inner rad:");
 	stuff_float(&asip->inner_rad);

@@ -2047,40 +2147,72 @@ void asteroid_parse_section()
 	required_string("$Hitpoints:");
 	stuff_float(&asip->initial_asteroid_strength);
 }
-extern int True_NumSpecies;
+
 // read in data from asteroid.tbl into Asteroid_info[] array
 void asteroid_parse_tbl()
 {
-	char impact_ani_file[FILESPEC_LENGTH];
-
-	Num_asteroid_types = 0;
+	char impact_ani_file[MAX_FILENAME_LEN];
+	int *asteroid_tally = NULL;
+	int i, rval;

 	// open localization
 	lcl_ext_open();

-	read_file_text("asteroid.tbl");
+	if ((rval = setjmp(parse_abort)) != 0) {
+		mprintf(("TABLES: Unable to parse '%s'!  Error code = %i.\n", "asteroid.tbl", rval));
+		lcl_ext_close();
+		return;
+	}
+
+	read_file_text("asteroid.tbl", CF_TYPE_TABLES);
 	reset_parse();

 	required_string("#Asteroid Types");

-	// total we're expecting
-	int Total_asteroid_types = ((True_NumSpecies + 1) * 3);
+	asteroid_tally = new int[Species_info.size() + 1];

-	while (required_string_either("#End","$Name:")) {
-		Assert( Num_asteroid_types < Total_asteroid_types );
-		asteroid_parse_section();
-		Num_asteroid_types++;
+	memset(asteroid_tally, 0, sizeof(int) * (Species_info.size()+1));
+
+
+	while (required_string_either("#End","$Name:"))
+	{
+		asteroid_info new_asteroid;
+
+		for (i = 0; i < NUM_DEBRIS_POFS; i++)
+			new_asteroid.model_num[i] = -1;
+
+		asteroid_parse_section( &new_asteroid );
+
+		Assert( Species_info.size() );
+		// sanity check for debris type sizes
+		for (i = Species_info.size(); i >= 0; i--) {
+			// must remain in proper order
+			//   0 - generic debris types
+			// > 0 - species specific debris types
+			if ( (i == 0) || stristr(new_asteroid.name, Species_info[i-1].species_name) ) {
+				Assert( asteroid_tally[i] < NUM_DEBRIS_SIZES );
+
+				if ( asteroid_tally[i] >= NUM_DEBRIS_SIZES ) {
+					// too many sizes specified, don't increment Num_debris_types and we'll overwrite
+					// the current entry with the next
+					break;
+				}
+
+				// we're safe to continue
+				asteroid_tally[i]++;
+				Asteroid_info.push_back( new_asteroid );
+				break;
+			}
+		}
 	}

 	required_string("#End");

-	// check all read in
-	Assert(Num_asteroid_types == Total_asteroid_types);
-
 	Asteroid_impact_explosion_ani = -1;
 	required_string("$Impact Explosion:");
-	stuff_string(impact_ani_file, F_NAME, NULL);
-	if ( stricmp(impact_ani_file,NOX("none")))	{
+	stuff_string(impact_ani_file, F_NAME, MAX_FILENAME_LEN);
+
+	if ( VALID_FNAME(impact_ani_file) ) {
 		int num_frames;
 		Asteroid_impact_explosion_ani = bm_load_animation( impact_ani_file, &num_frames, NULL, 1);
 	}
@@ -2090,6 +2222,32 @@ void asteroid_parse_tbl()

 	// close localization
 	lcl_ext_close();
+
+
+	// check for any missing info
+	char *errormsg = new char[75 + (Species_info.size() * (NAME_LENGTH))];
+	bool species_missing = false;
+	strcpy(errormsg, "The following species are missing debris types in asteroids.tbl:\n");
+	for (i = 0; i < (int)Species_info.size(); i++)
+	{
+		int idx = (i+1);	// offset from generic asteroids at 0..NUM_DEBRIS_SIZES
+
+		if (asteroid_tally[idx] < NUM_DEBRIS_SIZES)
+		{
+			strcat(errormsg, Species_info[i].species_name);
+			strcat(errormsg, "\n");
+			species_missing = true;
+		}
+	}
+	strcat(errormsg, "\0");
+
+	if (species_missing)
+	{
+		Error(LOCATION, errormsg);
+	}
+
+	delete[] asteroid_tally;
+	delete[] errormsg;
 }

 //	Return number of asteroids expected to collide with a ship.
@@ -2163,6 +2321,8 @@ void asteroid_init()
 	asteroid_parse_tbl();
 }

+extern int Cmdline_targetinfo;
+
 // Draw brackets around on-screen asteroids that are about to collide, otherwise draw an offscreen indicator
 void asteroid_show_brackets()
 {
@@ -2196,8 +2356,11 @@ void asteroid_show_brackets()
 		g3_project_vertex(&asteroid_vertex);

 		if (!(asteroid_vertex.flags & PF_OVERFLOW)) {
-			gr_set_color_fast(&IFF_colors[IFF_COLOR_SELECTION][1]);
+			gr_set_color_fast(iff_get_color(IFF_COLOR_SELECTION, 1));
 			hud_show_brackets(asteroid_objp, &asteroid_vertex);
+			if ( Cmdline_targetinfo ) {
+				hud_show_lead_indicator_quick(&asteroid_objp->pos, asteroid_objp);
+			}
 		}

 		// if asteroid is not on screen, draw an offscreen indicator
@@ -2206,7 +2369,7 @@ void asteroid_show_brackets()
 				float dist;
 //				dist = vm_vec_dist_quick(&Player_obj->pos, &asteroid_objp->pos);
 				dist = hud_find_target_distance( asteroid_objp, Player_obj );
-				gr_set_color_fast(&IFF_colors[IFF_COLOR_SELECTION][1]);
+				gr_set_color_fast(iff_get_color(IFF_COLOR_SELECTION, 1));
 				hud_draw_offscreen_indicator(&asteroid_vertex, &asteroid_objp->pos, dist);
 			}
 		}
@@ -2252,12 +2415,13 @@ void asteroid_page_in()
 		nprintf(( "Paging", "Paging in asteroids\n" ));


-		// max of 3 possible debris field models
-		for (i=0; i<3; i++) {
+		// max of MAX_ACTIVE_DEBRIS_TYPES possible debris field models
+		for (i=0; i<MAX_ACTIVE_DEBRIS_TYPES; i++) {
 			asteroid_info	*asip;

 			if (Asteroid_field.debris_genre == DG_ASTEROID) {
 				// asteroid
+				Assert(i < NUM_DEBRIS_SIZES);
 				asip = &Asteroid_info[i];
 			} else {
 				// ship debris - always full until empty
@@ -2269,7 +2433,7 @@ void asteroid_page_in()
 			}


-			for (k=0; k<3; k++) {
+			for (k=0; k<NUM_DEBRIS_POFS; k++) {

 				// SHIP DEBRIS - use subtype 0
 				if (Asteroid_field.debris_genre == DG_SHIP) {
@@ -2282,16 +2446,15 @@ void asteroid_page_in()
 						continue;
 					}
 				}
-				
+
+				if (asip->model_num[k] < 0)
+					continue;
+
 				asip->modelp[k] = model_get(asip->model_num[k]);

 				// Page in textures
 				for (j=0; j<asip->modelp[k]->n_textures; j++ )	{
-					int bitmap_num = asip->modelp[k]->original_textures[j];
-
-					if ( bitmap_num > -1 )	{
-						bm_page_in_texture( bitmap_num );
-					}					
+					asip->modelp[k]->maps[j].PageIn();			
 				}

 			}
@@ -9,13 +9,35 @@

 /*
 * $Logfile: /Freespace2/code/Asteroid/Asteroid.h $
- * $Revision: 2.9 $
- * $Date: 2005-07-13 02:50:48 $
- * $Author: Goober5000 $
+ * $Revision: 2.12.2.4 $
+ * $Date: 2007-05-28 18:27:32 $
+ * $Author: wmcoolmon $
 *
 * Header file for asteroids
 *
 * $Log: not supported by cvs2svn $
+ * Revision 2.12.2.3  2006/11/15 00:36:08  taylor
+ * various bits of little cleanup
+ * get rid of some more compiler warnings
+ *
+ * Revision 2.12.2.2  2006/09/11 01:15:04  taylor
+ * fixes for stuff_string() bounds checking
+ *
+ * Revision 2.12.2.1  2006/08/27 18:12:39  taylor
+ * make Species_info[] and Asteroid_info[] dynamic
+ *
+ * Revision 2.12  2005/09/25 20:31:42  Goober5000
+ * okay; everything should be good to go
+ * --Goober5000
+ *
+ * Revision 2.11  2005/09/25 08:25:14  Goober5000
+ * Okay, everything should now work again. :p Still have to do a little more with the asteroids.
+ * --Goober5000
+ *
+ * Revision 2.9  2005/07/13 02:50:48  Goober5000
+ * remove PreProcDefine #includes in FS2
+ * --Goober5000
+ *
 * Revision 2.8  2005/07/13 02:01:28  Goober5000
 * fixed a bunch of "issues" caused by me with the species stuff
 * --Goober5000
@@ -156,19 +178,31 @@
 #include "globalincs/pstypes.h"
 #include "globalincs/globals.h"		// for NAME_LENGTH

+#include <vector>
+
 struct object;
 struct polymodel;
 struct collision_info_struct;

 #define	MAX_ASTEROIDS			256

+#define NUM_DEBRIS_SIZES	3
+#define	NUM_DEBRIS_POFS		3				// Number of POFs per debris size
+
 #define	ASTEROID_TYPE_SMALL		0
 #define	ASTEROID_TYPE_MEDIUM	1
-#define	ASTEROID_TYPE_BIG		2
+#define	ASTEROID_TYPE_LARGE		2

 // This is for the asteroid types plus DEBRIS_X_Y
 // (X is each species and Y is SMALL, MEDIUM, and LARGE)
-#define	MAX_DEBRIS_TYPES	((MAX_SPECIES + 1) * 3)
+// 20060826 - made dynamic -- taylor
+//#define	MAX_DEBRIS_TYPES	((MAX_SPECIES + 1) * NUM_DEBRIS_SIZES)
+
+// these should always be equal for the benefit of generic asteroids (c.f. asteroid_page_in)
+#define	MAX_ACTIVE_DEBRIS_TYPES		NUM_DEBRIS_SIZES
+
+// Goober5000 - currently same as MAX_SHIP_DETAIL_LEVELS (put here to avoid an #include)
+#define MAX_ASTEROID_DETAIL_LEVELS	5


 // Data structure to track the active asteroids
@@ -179,33 +213,32 @@ typedef struct asteroid_obj {
 extern asteroid_obj Asteroid_obj_list;


-#define	MAX_ASTEROID_POFS			3				// Max number of POFs per asteroid type
-
-#define	AF_USED					(1<<0)			//	Set means used.
-
-// Goober5000 - currently same as MAX_SHIP_DETAIL_LEVELS (put here to avoid an #include)
-#define MAX_ASTEROID_DETAIL_LEVELS	5
-
 typedef struct asteroid_info {
-	char			name[NAME_LENGTH];									// name for the asteroid
-	char			pof_files[MAX_ASTEROID_POFS][NAME_LENGTH];	// POF files to load/associate with ship
+	char			name[NAME_LENGTH];								// name for the asteroid
+	char			pof_files[NUM_DEBRIS_POFS][MAX_FILENAME_LEN];		// POF files to load/associate with ship
 	int			num_detail_levels;									// number of detail levels for this ship
 	int			detail_distance[MAX_ASTEROID_DETAIL_LEVELS];		// distance to change detail levels at
 	float			max_speed;												// cap on speed for asteroid
+	int				damage_type_idx;								//Damage type of the asteroid
 	float			inner_rad;												// radius within which maximum area effect damage is applied
 	float			outer_rad;												// radius at which no area effect damage is applied
 	float			damage;													// maximum damage applied from area effect explosion
 	float			blast;													// maximum blast impulse from area effect explosion									
 	float			initial_asteroid_strength;								// starting strength of asteroid
-	polymodel	*modelp[MAX_ASTEROID_POFS];
-	int			model_num[MAX_ASTEROID_POFS];
+	polymodel	*modelp[NUM_DEBRIS_POFS];
+	int			model_num[NUM_DEBRIS_POFS];
+
+	asteroid_info() { memset(this, 0, sizeof(asteroid_info)); damage_type_idx = -1; };
 } asteroid_info;

+
+#define	AF_USED					(1<<0)			//	Set means used.
+
 typedef	struct asteroid {
 	int		flags;
 	int		objnum;
-	int		type;						//	In 0..Num_asteroid_types
-	int		asteroid_subtype;		// Which index into asteroid_info for modelnum and modelp
+	int		asteroid_type;		// 0..MAX_DEBRIS_TYPES
+	int		asteroid_subtype;	// Index in asteroid_info for modelnum and modelp
 	int		check_for_wrap;		//	timestamp to check for asteroid wrapping around field
 	int		check_for_collide;	// timestamp to check for asteroid colliding with escort ships
 	int		final_death_time;		// timestamp to swap in new models after explosion starts
@@ -215,6 +248,7 @@ typedef	struct asteroid {
 	int		target_objnum;			//	Yes, hah!  Asteroids can have targets.  See asteroid_aim_at_target().
 } asteroid;

+
 // TYPEDEF FOR DEBRIS TYPE
 typedef enum {
 	DG_ASTEROID,
@@ -227,8 +261,6 @@ typedef enum {
 	FT_PASSIVE
 } field_type_t;

-#define	MAX_ACTIVE_DEBRIS_TYPES	3
-
 typedef	struct asteroid_field {
 	vec3d	min_bound;						//	Minimum range of field.
 	vec3d	max_bound;						//	Maximum range of field.
@@ -243,11 +275,10 @@ typedef	struct asteroid_field {
 	int				field_debris_type[MAX_ACTIVE_DEBRIS_TYPES];	// one of the debris type defines above
 } asteroid_field;

-extern asteroid_info Asteroid_info[MAX_DEBRIS_TYPES];
+extern std::vector<asteroid_info> Asteroid_info;
 extern asteroid Asteroids[MAX_ASTEROIDS];
 extern asteroid_field	Asteroid_field;

-extern int	Num_asteroid_types;
 extern int	Num_asteroids;
 extern int	Asteroids_enabled;

@@ -4,11 +4,24 @@

 /*
 * $Logfile: /Freespace2/code/Autopilot/Autopilot.h $
- * $Revision: 1.8 $
- * $Date: 2005-07-13 02:50:49 $
+ * $Revision: 1.9.2.3 $
+ * $Date: 2007-09-02 02:07:38 $
 * $Author: Goober5000 $
 *
 * $Log: not supported by cvs2svn $
+ * Revision 1.9.2.2  2007/07/24 20:08:29  Kazan
+ * Make asteroid/debris fields interrupt autopilot, add "hazards near" message to autopilot.tbl, add use-nav-cinematics sexp, fix mantis #1441
+ *
+ * Revision 1.9.2.1  2007/07/23 16:08:23  Kazan
+ * Autopilot updates, minor misc fixes, working MSVC2005 project files
+ *
+ * Revision 1.9  2006/02/25 21:42:31  Goober5000
+ * fixes from last commit
+ *
+ * Revision 1.8  2005/07/13 02:50:49  Goober5000
+ * remove PreProcDefine #includes in FS2
+ * --Goober5000
+ *
 * Revision 1.7  2005/04/05 05:53:14  taylor
 * s/vector/vec3d/g, better support for different compilers (Jens Granseuer)
 *
@@ -39,9 +52,10 @@
 #define _AUTOPILOT_H_

 #include "globalincs/pstypes.h"
+#include <map>

 // milliseconds between updates
-#define NPS_TICKRATE	250
+#define NPS_TICKRATE	125

 #define MAX_NAVPOINTS	8

@@ -62,13 +76,31 @@ struct NavPoint
 	void *target_obj;
 	int waypoint_num; //only used when flags & NP_WAYPOINT

-	vec3d GetPosition();
+	vec3d *GetPosition();
 	char* GetInteralName();
 };

+
+#define NP_NUM_MESSAGES 6
+#define NP_MSG_FAIL_NOSEL		0
+#define NP_MSG_FAIL_GLIDING		1
+#define NP_MSG_FAIL_TOCLOSE		2
+#define NP_MSG_FAIL_HOSTILES	3
+#define NP_MSG_MISC_LINKED		4
+#define NP_MSG_FAIL_HAZARD		5
+
+struct NavMessage
+{
+	char message[256];
+	char filename[256]; // can be ""
+};
+
 extern bool AutoPilotEngaged;
 extern int CurrentNav;
 extern NavPoint Navs[MAX_NAVPOINTS];
+extern NavMessage NavMsgs[NP_NUM_MESSAGES];
+extern int LockAPConv;
+extern std::map<int,int> autopilot_wings;

 // Cycles through the NavPoint List
 bool Sel_NextNav();
@@ -79,7 +111,8 @@ bool Sel_NextNav();
 //        * Nav point selected
 //        * No enemies within 5,000 meters
 //        * Destination > 1,000 meters away
-bool CanAutopilot();
+bool CanAutopilot(bool send_msg=false);
+bool CanAutopilotPos(vec3d targetPos);

 // Engages autopilot
 // This does:
@@ -113,6 +146,9 @@ void NavSystem_Do();
 // Inits the Nav System
 void NavSystem_Init();

+// parse autopilot.tbl
+void parse_autopilot_table(char *filename);
+
 // Finds a Nav point by name
 int FindNav(char *Nav);

@@ -148,5 +184,8 @@ unsigned int DistanceTo(int nav);

 bool IsVisited(char *nav);
 bool IsVisited(int nav);
+
+void send_autopilot_msg(char *msg, char *snd=NULL);
+void send_autopilot_msgID(int msgid);
 #endif

@@ -9,13 +9,52 @@

 /*
 * $Logfile: /Freespace2/code/bmpman/bm_internal.h $
- * $Revision: 2.3 $
- * $Date: 2005-04-21 15:49:20 $
+ * $Revision: 2.6.2.1 $
+ * $Date: 2007-02-11 09:51:21 $
 * $Author: taylor $
 *
 * bmpman info that's internal to bmpman related files only
 * 
 * $Log: not supported by cvs2svn $
+ * Revision 2.6  2006/05/27 17:20:48  taylor
+ * clean up BM_TYPE_* stuff so it's a little easier to tell what is what
+ * bm_load_sub_fast() doesn't need to lowercase filenames, so don't
+ * byte-swap 16-bit DDS on big endian (they still don't look right though)
+ * update bm_has_alpha_channel() to be less dumb
+ *
+ * Revision 2.5  2006/05/13 07:29:51  taylor
+ * OpenGL envmap support
+ * newer OpenGL extension support
+ * add GL_ARB_texture_rectangle support for non-power-of-2 textures as interface graphics
+ * add cubemap reading and writing support to DDS loader
+ * fix bug in DDS loader that made compressed images with mipmaps use more memory than they really required
+ * add support for a default envmap named "cubemap.dds"
+ * new mission flag "$Environment Map:" to use a pre-existing envmap
+ * minor cleanup of compiler warning messages
+ * get rid of wasteful math from gr_set_proj_matrix()
+ * remove extra gr_set_*_matrix() calls from starfield.cpp as there was no longer a reason for them to be there
+ * clean up bmpman flags in reguards to cubemaps and render targets
+ * disable D3D envmap code until it can be upgraded to current level of code
+ * remove bumpmap code from OpenGL stuff (sorry but it was getting in the way, if it was more than copy-paste it would be worth keeping)
+ * replace gluPerspective() call with glFrustum() call, it's a lot less math this way and saves the extra function call
+ *
+ * Revision 2.4  2005/11/13 06:44:17  taylor
+ * small bit of EFF cleanup
+ * add -img2dds support
+ * cleanup some D3D stuff (missing a lot since the old code is so unstable I couldn't get it working like I wanted)
+ * some minor OGL cleanup and small performance changes
+ * converge the various pcx_read_bitmap* functions into one
+ * cleanup/rename/remove some cmdline options
+ *
+ * Revision 2.3  2005/04/21 15:49:20  taylor
+ * update of bmpman and model bitmap management, well tested but things may get a bit bumpy
+ *  - use VM_* macros for bmpman since it didn't seem to register the memory correctly (temporary)
+ *  - a little "stupid" fix for dds bitmap reading
+ *  - fix it so that memory is released properly on bitmap read errors
+ *  - some cleanup to model texture loading
+ *  - allow model textures to get released rather than just unloaded, saves bitmap slots
+ *  - bump MAX_BITMAPS to 4750, should be able to decrease after public testing of new code
+ *
 * Revision 2.2  2005/03/03 14:29:37  bobboau
 * fixed a small error from my earlier commit.
 *
@@ -40,46 +79,52 @@
 #include "bmpman/bmpman.h"


-// keep this defined to use per-ship nondarkening pixels
-#define BMPMAN_SPECIAL_NONDARK
-
-
-#define	BM_TYPE_NONE			0
-#define	BM_TYPE_PCX				1
-#define	BM_TYPE_USER			2
-#define	BM_TYPE_ANI				3		// in-house ANI format
-#define BM_TYPE_EFF				4		// specifies any type of animated image, the EFF itself is just text
-
-#define BM_TYPE_32_BIT_FORMATS	5		// everything after this could/should be 24/32-bit
-#define	BM_TYPE_TGA				6		// 16 or 32 bit targa
-#define BM_TYPE_DDS				7		// generic identifier for DDS
+// no-type			( used in: bm_bitmaps[i].type )
+#define BM_TYPE_NONE			0
+// in-memory type	( used in: bm_bitmaps[i].type )
+#define BM_TYPE_USER			1
+// file-type types	( used in: bm_bitmaps[i].type )
+#define BM_TYPE_PCX				2
+#define BM_TYPE_TGA				3		// 16 or 32 bit targa
+#define BM_TYPE_DDS				4		// generic identifier for DDS
+#define BM_TYPE_JPG				5		// 32 bit jpeg
+#define BM_TYPE_ANI				6		// in-house ANI format
+#define BM_TYPE_EFF				7		// specifies any type of animated image, the EFF itself is just text
+// c-type types		( used in: bm_bitmaps[i].c_type )
 #define BM_TYPE_DXT1			8		// 24 bit with switchable alpha		(compressed)
 #define BM_TYPE_DXT3			9		// 32 bit with 4 bit alpha			(compressed)
 #define BM_TYPE_DXT5			10		// 32 bit with 8 bit alpha			(compressed)
-#define BM_TYPE_JPG				11		// 32 bit jpeg
-#define BM_TYPE_RENDER_TARGET	12		// 32 bit setup internaly as a render target
+#define BM_TYPE_CUBEMAP_DDS		11		// generic DDS cubemap	(uncompressed cubemap surface)
+#define BM_TYPE_CUBEMAP_DXT1	12		// 24-bit cubemap		(compressed cubemap surface)
+#define BM_TYPE_CUBEMAP_DXT3	13		// 32-bit cubemap		(compressed cubemap surface)
+#define BM_TYPE_CUBEMAP_DXT5	14		// 32-bit cubemap		(compressed cubemap surface)
+// special types	( used in: bm_bitmaps[i].type )
+#define BM_TYPE_RENDER_TARGET_STATIC	16		// 24/32 bit setup internally as a static render target
+#define BM_TYPE_RENDER_TARGET_DYNAMIC	17		// 24/32 bit setup internally as a dynamic render target


 /// Moved from cpp file ///////////////////
 // Consider these 'protected' structures and functions that should only be used by special bitmap functions
-typedef struct bm_extra_info {
+typedef union bm_extra_info {
 	struct {
 		// Stuff needed for animations
 		int		first_frame;								// used for animations -- points to index of first frame
-		ubyte		num_frames;									// used for animation -- number of frames in the animation
-		ubyte		fps;											// used for animation -- frames per second
+		ubyte	num_frames;									// used for animation -- number of frames in the animation
+		ubyte	fps;										// used for animation -- frames per second
+
+		struct {
+			// stuff for static animations
+			ubyte	type;									// type for individual images
+			char	filename[MAX_FILENAME_LEN];				// filename for individual images
+		} eff;
 	} ani;
+
 	struct {
 		// Stuff needed for user bitmaps
 		void		*data;									// For user bitmaps, this is where the data comes from
 		ubyte		bpp;									// For user bitmaps, this is what format the data is
 		ubyte		flags;									// Flags passed to bm_create
 	} user;
-	struct {
-		// Stuff for static animations
-		ubyte		type;									// type for individual images
-		char		filename[MAX_FILENAME_LEN];				// filename for individual images
-	} eff;
 } bm_extra_info;


@@ -92,7 +137,8 @@ typedef struct bitmap_entry	{
 	int		handle;										// Handle = id*MAX_BITMAPS + bitmapnum
 	int		last_used;									// When this bitmap was last used

-	ubyte		type;											// PCX, USER, ANI, etc
+	ubyte		type;									// PCX, USER, ANI, etc
+	ubyte		comp_type;								// What sort of compressed type, BM_TYPE_NONE if not compressed
 	signed char	ref_count;								// Number of locks on bitmap.  Can't unload unless ref_count is 0.

 	int		dir_type;								// which directory this was loaded from (to skip other locations with same name)
@@ -137,4 +183,3 @@ void bm_lock_user( int handle, int bitmapnum, bitmap_entry *be, bitmap *bmp, uby
 #endif // BMPMAN_INTERNAL

 #endif // __BM_INTERNAL_H__
-
@@ -10,13 +10,103 @@
 /*
 * $Logfile: /Freespace2/code/Bmpman/BmpMan.h $
 *
- * $Revision: 2.25 $
- * $Date: 2005-08-20 20:34:49 $
+ * $Revision: 2.37.2.6 $
+ * $Date: 2007-03-22 20:14:16 $
 * $Author: taylor $
 *
 * Prototypes for Bitmap Manager functions
 *
 * $Log: not supported by cvs2svn $
+ * Revision 2.37.2.5  2007/02/11 09:51:21  taylor
+ * remove some dead code
+ * better texture memory handling (a work in-progress)
+ * new image finding/loading
+ * get rid of -pcx32 and -jpgtga
+ * change the game_busy() reporting during bitmap page-in to only catch one frame of an animation
+ * fix numerous little bugs in gropenglbmpman relating to -img2dds
+ *
+ * Revision 2.37.2.4  2007/01/07 12:07:40  taylor
+ * fix bm_page_in_texture() so that it will load all frames of an animation (caused slowdowns in-game with it)
+ *
+ * Revision 2.37.2.3  2006/07/05 23:41:02  Goober5000
+ * spelling
+ *
+ * Revision 2.37.2.2  2006/07/05 23:36:55  Goober5000
+ * cvs comment tweaks
+ *
+ * Revision 2.37.2.1  2006/06/22 14:59:44  taylor
+ * fix various things that Valgrind has been complaining about
+ *
+ * Revision 2.37  2006/05/27 17:20:48  taylor
+ * clean up BM_TYPE_* stuff so it's a little easier to tell what is what
+ * bm_load_sub_fast() doesn't need to lowercase filenames, so don't
+ * byte-swap 16-bit DDS on big endian (they still don't look right though)
+ * update bm_has_alpha_channel() to be less dumb
+ *
+ * Revision 2.36  2006/05/13 07:29:51  taylor
+ * OpenGL envmap support
+ * newer OpenGL extension support
+ * add GL_ARB_texture_rectangle support for non-power-of-2 textures as interface graphics
+ * add cubemap reading and writing support to DDS loader
+ * fix bug in DDS loader that made compressed images with mipmaps use more memory than they really required
+ * add support for a default envmap named "cubemap.dds"
+ * new mission flag "$Environment Map:" to use a pre-existing envmap
+ * minor cleanup of compiler warning messages
+ * get rid of wasteful math from gr_set_proj_matrix()
+ * remove extra gr_set_*_matrix() calls from starfield.cpp as there was no longer a reason for them to be there
+ * clean up bmpman flags in reguards to cubemaps and render targets
+ * disable D3D envmap code until it can be upgraded to current level of code
+ * remove bumpmap code from OpenGL stuff (sorry but it was getting in the way, if it was more than copy-paste it would be worth keeping)
+ * replace gluPerspective() call with glFrustum() call, it's a lot less math this way and saves the extra function call
+ *
+ * Revision 2.35  2006/02/16 05:00:01  taylor
+ * various bmpman related fixes
+ *  - some new error checking (and fixes related to that) and cleanup
+ *  - fix EFFs not getting released/unloaded properly (was in a local tree but apparently missed CVS)
+ *  - minor fixes for bm_release() to produce a more properly cleaned slot
+ *  - use fast unloading for page_in stuff since we don't actually want really want the load count changing for texture maps
+ *    and to make sure that we free the memory usage regardless of load count
+ *
+ * Revision 2.34  2006/01/21 02:22:04  wmcoolmon
+ * Scripting updates; Special scripting image list; Better operator meta; Orientation type; Wing type; Texture type. Fix for MSVC7 compiling.
+ *
+ * Revision 2.33  2005/12/06 03:05:53  taylor
+ * add base support for 8-bit DDS images
+ * clean up some DDS error messages and other minor bug/comment fixes
+ * move bitmap stuff from pstypes.h, it makes more sense here anyway
+ * start of 8-bit palette conversion, needs work but is here for WMCoolmon to look at and play with
+ *
+ * Revision 2.32  2005/12/04 19:07:48  wmcoolmon
+ * Final commit of codebase
+ *
+ * Revision 2.31  2005/11/08 01:03:59  wmcoolmon
+ * More warnings instead of Int3s/Asserts, better Lua scripting, weapons_expl.tbl is no longer needed nor read, added "$Disarmed ImpactSnd:", fire-beam fix
+ *
+ * Revision 2.30  2005/09/26 04:53:19  Goober5000
+ * moved these per taylor's recommendation
+ * --Goober5000
+ *
+ * Revision 2.29  2005/09/26 04:08:53  Goober5000
+ * some more cleanup
+ * --Goober5000
+ *
+ * Revision 2.28  2005/09/26 02:15:02  Goober5000
+ * okay, this should all be working :)
+ * --Goober5000
+ *
+ * Revision 2.27  2005/09/25 05:13:07  Goober5000
+ * hopefully complete species upgrade
+ * --Goober5000
+ *
+ * Revision 2.26  2005/09/24 07:07:17  Goober5000
+ * another species overhaul
+ * --Goober5000
+ *
+ * Revision 2.25  2005/08/20 20:34:49  taylor
+ * some bmpman and render_target function name changes so that they make sense
+ * always use bm_set_render_target() rather than the gr_ version so that the graphics state is set properly
+ * save the original gamma ramp on OGL init so that it can be restored on exit
+ *
 * Revision 2.24  2005/07/13 02:50:49  Goober5000
 * remove PreProcDefine #includes in FS2
 * --Goober5000
@@ -149,7 +239,8 @@
 * The big DX/main line merge. This has been uploaded to the main CVS since I can't manage to get it to upload to the DX branch. Apologies to all who may be affected adversely, but I'll work to debug it as fast as I can.
 *
 * Revision 2.3  2003/01/19 01:07:41  bobboau
- * redid the way glowmaps are handeled, you now must set the global int GLOWMAP (no longer an array) before you render a poly that uses a glow map then set  GLOWMAP to -1 when you're done with, fixed a few other misc bugs it
+ * redid the way glow maps are handled; you now must set a global variable before you render a poly that uses a glow map, then set it to -1 when you're done with it
+ * fixed a few other misc bugs too
 *
 * Revision 2.2  2003/01/18 19:55:16  phreak
 * fixed around the bmpman system to now accept compressed textures
@@ -372,13 +463,39 @@
 //  --  Taylor


-// 16 bit pixel formats
-#define BM_PIXEL_FORMAT_ARGB				0						// for glide - can assume certain things, like 1555 LFB writes, whee!
-#define BM_PIXEL_FORMAT_D3D				1						// d3d - card dependant. booo!
-#define BM_PIXEL_FORMAT_ARGB_D3D			2						// this card has nice 1555 textures like Glide - ahhhhh!
+#define	BMP_AABITMAP						(1<<0)				// antialiased bitmap
+#define	BMP_TEX_XPARENT						(1<<1)				// transparent texture
+#define	BMP_TEX_OTHER						(1<<2)				// so we can identify all "normal" textures
+#define BMP_TEX_DXT1						(1<<3)				// dxt1 compressed 8r8g8b1a (24bit)
+#define BMP_TEX_DXT3						(1<<4)				// dxt3 compressed 8r8g8b4a (32bit)
+#define BMP_TEX_DXT5						(1<<5)				// dxt5 compressed 8r8g8b8a (32bit)
+#define BMP_TEX_CUBEMAP						(1<<6)				// a texture made for cubic environment map
+// ***** NOTE:  bitmap.flags is an 8-bit value, no more BMP_TEX_* flags can be added unless the type is changed!! ******

+//compressed texture types
+#define BMP_TEX_COMP			( BMP_TEX_DXT1 | BMP_TEX_DXT3 | BMP_TEX_DXT5 )
+
+//non compressed textures
+#define BMP_TEX_NONCOMP			( BMP_TEX_XPARENT | BMP_TEX_OTHER )
+
+// any texture type
+#define	BMP_TEX_ANY				( BMP_TEX_COMP | BMP_TEX_NONCOMP )
+
+#define BMP_FLAG_RENDER_TARGET_STATIC		(1<<0)
+#define BMP_FLAG_RENDER_TARGET_DYNAMIC		(1<<1)
+#define BMP_FLAG_CUBEMAP					(1<<2)
+
+typedef struct bitmap {
+	short	w, h;		// Width and height
+	short	rowsize;	// What you need to add to go to next row
+	ubyte	bpp;		// How many bits per pixel it is. (7,8,15,16,24,32) (what is requested)
+	ubyte	true_bpp;	// How many bits per pixel the image actually is.
+	ubyte	flags;		// See the BMP_???? defines for values (this isn't for the BMP_FLAG_* stuff)
+	ptr_u	data;		// Pointer to data, or maybe offset into VRAM.
+	ubyte *palette;		// If bpp==8, this is pointer to palette.   If the BMP_NO_PALETTE_MAP flag
+						// is not set, this palette just points to the screen palette. (gr_palette)
+} bitmap;

-extern int bm_inited;

 extern int Bm_paging;

@@ -394,11 +511,6 @@ void *bm_malloc(int n, int size);

 void bm_update_memory_used(int n, int size);

-// 16 bit pixel formats
-extern int Bm_pixel_format;
-
-#define BYTES_PER_PIXEL(x)	((x+7)/8)
-
 // how many bytes of textures are used.
 extern int bm_texture_ram;

@@ -421,27 +533,30 @@ int bm_load_duplicate(char *filename);
 // On success, it returns the bitmap number.  You cannot 
 // free that RAM until bm_release is called on that bitmap.  
 // See example at bottom of this file
-int bm_create( int bpp, int w, int h, void * data, int flags = 0);
+int bm_create( int bpp, int w, int h, void *data = NULL, int flags = 0);

 // Frees up a bitmap's data, but bitmap number 'n' can
 // still be used, it will just have to be paged in next
 // time it is locked.
-int bm_unload( int n, bool = false );
+int bm_unload( int n, int clear_render_targets = 0 );

 // like bm_unload() except that it's safe to use to free data without worrying about
 // load_count so it's safe to use in relation to bm_release() and in gr_*_texture functions
-int bm_unload_fast( int n, bool = false );
+int bm_unload_fast( int n, int clear_render_targets = 0 );

 // Frees up a bitmap's data, and it's slot, so bitmap 
 // number 'n' cannot be used anymore, and bm_load or
 // bm_create might reuse the slot.
-void bm_release(int n);
+int bm_release( int n, int clear_render_targets = 0 );

 // This loads a bitmap sequence so we can draw with it later.
 // It returns a negative number if it couldn't load
 // the bitmap.   On success, it returns the bitmap
 // number of the first frame and nframes is set.
-extern int bm_load_animation( char * filename, int * nframes, int *fps = NULL, int can_drop_frames = 0, int dir_type = CF_TYPE_ANY );
+extern int bm_load_animation( char * filename, int * nframes = NULL, int *fps = NULL, int can_drop_frames = 0, int dir_type = CF_TYPE_ANY );
+
+//Loads either animation (bm_load_animation) or still image (bm_load)
+extern int bm_load_either(char *filename, int *nframes = NULL, int *fps = NULL, int can_drop_frames = 0, int dir_type = CF_TYPE_ANY);

 // This locks down a bitmap and returns a pointer to a bitmap
 // that can be accessed until you call bm_unlock.   Only lock
@@ -457,8 +572,12 @@ extern uint bm_get_signature( int bitmapnum);
 // Unlocks a bitmap
 extern void bm_unlock( int bitmapnum );

+//WMC - Returns 0 if invalid, nonzero if valid
+extern int bm_is_valid(int handle);
+
 // Gets info.   w,h,or flags,nframes or fps can be NULL if you don't care.
-extern void bm_get_info( int bitmapnum, int *w=NULL, int * h=NULL, ubyte * flags=NULL, int *nframes=NULL, int *fps=NULL );
+//WMC - Returns -1 on failure, handle or first frame handle on success.
+int bm_get_info( int bitmapnum, int *w=NULL, int * h=NULL, ubyte * flags=NULL, int *nframes=NULL, int *fps=NULL );

 // get filename
 extern void bm_get_filename(int bitmapnum, char *filename);	 
@@ -535,11 +654,7 @@ void bm_page_in_stop();

 // Marks a texture as being used for this level
 // If num_frames is passed, assume this is an animation
-void bm_page_in_texture( int bitmapnum, int num_frames=1 );
-
-// Marks a texture as being used for this level
-// If num_frames is passed, assume this is an animation
-void bm_page_in_nondarkening_texture( int bitmap, int num_frames=1 );
+void bm_page_in_texture( int bitmapnum, int num_frames = 0 );

 // marks a texture as being a transparent textyre used for this level
 // Marks a texture as being used for this level
@@ -568,8 +683,6 @@ void BM_SELECT_ALPHA_TEX_FORMAT();
 // set the rgba components of a pixel, any of the parameters can be NULL
 extern void (*bm_set_components)(ubyte *pixel, ubyte *r, ubyte *g, ubyte *b, ubyte *a);
 extern void (*bm_set_components_32)(ubyte *pixel, ubyte *r, ubyte *g, ubyte *b, ubyte *a);
-void bm_set_components_argb(ubyte *pixel, ubyte *r, ubyte *g, ubyte *b, ubyte *a);
-void bm_set_components_d3d(ubyte *pixel, ubyte *r, ubyte *g, ubyte *b, ubyte *a);
 void bm_set_components_argb_d3d_16_screen(ubyte *pixel, ubyte *r, ubyte *g, ubyte *b, ubyte *a);
 void bm_set_components_argb_d3d_32_screen(ubyte *pixel, ubyte *r, ubyte *g, ubyte *b, ubyte *a);
 void bm_set_components_argb_d3d_16_tex(ubyte *pixel, ubyte *r, ubyte *g, ubyte *b, ubyte *a);
@@ -578,18 +691,22 @@ void bm_set_components_argb_d3d_32_tex(ubyte *pixel, ubyte *r, ubyte *g, ubyte *
 // get the rgba components of a pixel, any of the parameters can be NULL
 void bm_get_components(ubyte *pixel, ubyte *r, ubyte *g, ubyte *b, ubyte *a);

-extern int GLOWMAP;	//this holds a reference to a map that is a fully lit version of it's index -Bobboau
+extern int GLOWMAP;	//this holds a reference to a map that is a fully lit version of its index -Bobboau
 extern int SPECMAP;	//this holds a reference to a map that is for specular mapping -Bobboau
 extern int ENVMAP;	//this holds a reference to a map that is for environment mapping -Bobboau
+extern int NORMMAP;	// normal mapping
+extern int HEIGHTMAP;	// height map for normal mapping

 int bm_is_compressed(int num);
 int bm_get_tcache_type(int num);
 int bm_get_size(int num);
 int bm_get_num_mipmaps(int num);
+int bm_has_alpha_channel(int handle);

 void bm_print_bitmaps();

-int bm_make_render_target( int &x_res, int &y_res, int flags );
-bool bm_is_render_target(int bitmap_id);
-bool bm_set_render_target(int handle, int face = -1);
+int bm_make_render_target( int width, int height, int flags );
+int bm_is_render_target(int bitmap_id);
+int bm_set_render_target(int handle, int face = -1);
+
 #endif
@@ -0,0 +1,179 @@
+
+#ifndef _CAMERA_H
+#define _CAMERA_H
+
+#include "graphics/2d.h"
+#include "globalincs/pstypes.h"
+#include "globalincs/globals.h"
+#include "physics/physics.h"	//for avd
+#include "object/object.h"
+
+#include <string>
+#include <vector>
+
+#define CAM_STATIONARY_FOV			(1<<0)
+#define CAM_STATIONARY_ORI			(1<<1)
+#define CAM_STATIONARY_POS			(1<<2)
+#define CAM_DEFAULT_FLAGS			0
+
+class camera
+{
+	friend class avd_camera;
+protected:
+	char name[NAME_LENGTH];
+	int sig;
+	int flags;
+
+	object_h object_host;
+	int object_host_submodel;
+
+	object_h object_target;
+	int object_target_submodel;
+
+	void (*func_custom_position)(camera *cam, vec3d *pos);
+	void (*func_custom_orientation)(camera *cam, matrix *ori);
+
+	avd_movement fov;
+
+	avd_movement pos_x;
+	avd_movement pos_y;
+	avd_movement pos_z;
+
+	//avd_movement ori_p;
+	//avd_movement ori_b;
+	//avd_movement ori_h;
+	//avd_movement ori_progress;
+	//matrix ori_initial;
+	//matrix ori_final;
+	avd_movement ori[9];
+
+	//Cache stuff
+	float c_fov;
+	vec3d c_pos;
+	matrix c_ori;
+public:
+	camera(char *in_name=NULL, int in_signature=-1);
+	~camera();
+	void clear();
+	void reset();
+
+	//Set
+	void set_name(char *in_name);
+
+	void set_object_host(object *objp, int n_object_host_submodel = -1);
+	void set_object_target(object *objp, int n_object_target_submodel = -1);
+
+	void set_custom_position_function(void (*n_func_custom_position)(camera *cam, vec3d *pos));
+	void set_custom_orientation_function(void (*n_func_custom_orientation)(camera *cam, matrix *ori));
+
+	void set_fov(float in_fov, float in_fov_time = 0.0f, float in_fov_acceleration_time = 0.0f, float in_deceleration_time = 0.0f);
+
+	void set_position(vec3d *in_position = NULL, float in_translation_time = 0.0f, float in_translation_acceleration_time = 0.0f, float in_translation_deceleration_time = 0.0f, float in_end_velocity = 0.0f);
+	void set_translation_velocity(vec3d *in_velocity, float in_acceleration_time = 0.0f);
+
+	void set_rotation(matrix *in_orientation = NULL, float in_rotation_time = 0.0f, float in_rotation_acceleration_time = 0.0f, float in_rotation_deceleration_time = 0.0f);
+	void set_rotation(angles *in_angles, float in_rotation_time = 0.0f, float in_rotation_acceleration_time = 0.0f, float in_rotation_deceleration_time = 0.0f);
+	void set_rotation_facing(vec3d *in_target, float in_rotation_time = 0.0f, float in_rotation_acceleration_time = 0.0f, float in_rotation_deceleration_time = 0.0f);
+	void set_rotation_velocity(angles *in_rotation_rate, float in_acceleration_time = 0.0f);
+
+	//Get
+	char *get_name() {return name;}
+	int get_signature() {return sig;}
+	object *get_object_host();
+	int get_object_host_submodel();
+	object *get_object_target();
+	int get_object_target_submodel();
+	float get_fov();
+	void get_info(vec3d *position, matrix *orientation);
+
+	//Is
+	bool is_empty(){return sig < 0;}
+
+	//Do
+	void do_frame(float in_frametime);
+};
+
+class warp_camera
+{
+private:
+	float c_time;
+	float c_damping;
+
+	vec3d c_vel;
+	vec3d c_desired_vel;
+
+	vec3d c_pos;
+	matrix c_ori;
+public:
+	warp_camera();
+	warp_camera(object *objp);
+	void reset();
+
+	void set_position(vec3d *in_pos);
+	void set_rotation(matrix *in_ori);
+	void set_velocity(vec3d *in_vel, bool instantaneous);
+
+	void do_frame(float in_frametime);
+
+	void get_info(vec3d *position, matrix *orientation);
+};
+
+extern warp_camera Warp_camera;
+
+class subtitle
+{
+private:
+	void clone(const subtitle &sub);
+
+	std::vector<std::string> text_lines;
+	float text_pos[2];
+
+	float display_time;
+	float fade_time;
+	color text_color;
+
+	//Done with set
+	char imageanim[MAX_FILENAME_LEN];
+	int image_id;
+	int image_pos[2];
+	
+	//Time this has been displayed
+	float time_displayed;
+
+	//When to end it
+	float time_displayed_end;
+
+public:
+	subtitle(int in_x_pos, int in_y_pos, char* in_text, float in_display_time, char* in_imageanim = NULL, float in_fade_time = 0.0f, color *in_text_color = NULL, bool center_x = false, bool center_y = false, int in_width = 200);
+	~subtitle();
+
+    subtitle(const subtitle &sub) { clone(sub); }
+    const subtitle &operator=(const subtitle &sub);
+
+	void do_frame(float frametime);
+};
+
+//Some global stuff
+extern std::vector<subtitle> Subtitles;
+extern float VIEWER_ZOOM_DEFAULT;
+extern float Sexp_fov;
+
+//Helpful functions
+void cam_init();
+void cam_close();
+void cam_do_frame(float frametime);
+camid cam_create(char *n_name=NULL, vec3d *n_pos=NULL, matrix *n_ori=NULL, object *n_object=NULL, int n_submodel_parent=-1);
+camid cam_create(char *n_name, vec3d *n_pos, vec3d *n_norm, object *n_object=NULL, int n_submodel_parent=-1);
+void cam_delete(camid cid);
+bool cam_set_camera(camid cid);
+void cam_reset_camera();
+camid cam_lookup(char *name);
+camid cam_get_camera(uint index);
+camid cam_get_current();
+uint cam_get_num();
+
+void subtitles_init();
+void subtitles_close();
+void subtitles_do_frame(float frametime);
+
+#endif // _CAMERA_H
@@ -9,13 +9,67 @@

 /*
 * $Logfile: /Freespace2/code/CFile/cfile.h $
- * $Revision: 2.12 $
- * $Date: 2005-07-13 02:50:49 $
+ * $Revision: 2.17.2.5 $
+ * $Date: 2007-11-21 07:27:45 $
 * $Author: Goober5000 $
 *
 * <insert description of file here>
 *
 * $Log: not supported by cvs2svn $
+ * Revision 2.17.2.4  2007/04/11 18:21:20  taylor
+ * cleanup of chcksum stuff (works properly on 64-bit systems now)
+ * add chksum support for VPs, both a startup in debug builds, and via cmdline option (-verify_vps)
+ * little cleanup in cmdline.cpp (get rid of the remaining "fix bugs" crap)
+ *
+ * Revision 2.17.2.3  2007/03/22 20:22:44  taylor
+ * a little better error handling for cf_exists_full()
+ * add a cf_exists_full_ext() which can find a series of extensions and returns true if any of them exist
+ * use cf_exists_full_ext() for eventmusic file checks (to check for ogg and wav)
+ * get rid of SPM hack, it's wrong (just commented out for now though)
+ * fix a bunch of bugs in cf_find_file_location_ext():
+ *  - try to handle files with multiple periods a bit better (for the wav files like: blah_1.5.wav)
+ *  - load issue with finding incorrect files by mistake
+ *  - prevent finding different file types in various paths/roots
+ *
+ * Revision 2.17.2.2  2007/02/11 09:25:42  taylor
+ * some CFILE cleanup and slight directory order reorg
+ * add cfopen_special() for quickly opening files that have already been found with cf_find_file_location_ext()
+ * remove NO_SOUND
+ *
+ * Revision 2.17.2.1  2006/08/27 18:01:45  taylor
+ * various small cleanup and speedup changes
+ * add a cf_find_file_location_ext() function, which you can pass a filename and a list of extensions and it will search for all of them at once
+ *
+ * Revision 2.17  2006/02/13 00:20:45  Goober5000
+ * more tweaks, plus clarification of checks for the existence of files
+ * --Goober5000
+ *
+ * Revision 2.16  2006/01/17 02:33:20  wmcoolmon
+ * data/scripts directory
+ *
+ * Revision 2.15  2005/12/28 22:06:47  taylor
+ * fix up cf_find_file_location() and related elements so that it's safer (based on WMC's work, but actually safe this time ;))
+ *
+ * Revision 2.14  2005/12/06 03:13:49  taylor
+ * fix quite a few CFILE issues:
+ *   use #define's for path lengths when possible so it's easier to move between functions
+ *   fix huge Cfile_stack[] issue (how the hell did that get through :v: QA?)
+ *   add Int3() check on cfopen() so it's easier to know if it get's called before cfile is ready to use
+ *   move path separators to pstypes.h
+ *   fix possible string overruns when setting up CFILE roots
+ *   make sure we don't try to init current directory again thinking it's a CD-ROM
+ *   add the list of VP roots to debug log, this will undoubtedly be useful
+ * when -nosound is use go ahead and set -nomusic too to both checks are correct
+ * add list of cmdline options to debug log
+ * fix possible overwrite issues with get_version_string() and remove '(fs2_open)' from string plus change OGL->OpenGL, D3D->Direct3D
+ *
+ * Revision 2.13  2005/10/16 23:15:46  wmcoolmon
+ * Hardened cfile against array overflows
+ *
+ * Revision 2.12  2005/07/13 02:50:49  Goober5000
+ * remove PreProcDefine #includes in FS2
+ * --Goober5000
+ *
 * Revision 2.11  2005/04/05 05:53:14  taylor
 * s/vector/vec3d/g, better support for different compilers (Jens Granseuer)
 *
@@ -378,16 +432,6 @@
 #include <time.h>
 #include "globalincs/pstypes.h"

-#if defined _WIN32
-  #define DIR_SEPARATOR_CHAR '\\'
-  #define DIR_SEPARATOR_STR  "\\"
-#elif defined SCP_UNIX
-  #define DIR_SEPARATOR_CHAR '/'
-  #define DIR_SEPARATOR_STR  "/"
-#else
-  #error unknown OS
-#endif
-
 #define CF_EOF (-1)

 #define CF_SEEK_SET (0)
@@ -415,39 +459,40 @@ typedef struct {
 #define CF_TYPE_DATA				2
 #define CF_TYPE_MAPS				3
 #define CF_TYPE_TEXT				4
-#define CF_TYPE_MISSIONS			5
-#define CF_TYPE_MODELS				6
-#define CF_TYPE_TABLES				7
-#define CF_TYPE_SOUNDS				8
-#define CF_TYPE_SOUNDS_8B22K		9
-#define CF_TYPE_SOUNDS_16B11K		10
-#define CF_TYPE_VOICE				11
-#define CF_TYPE_VOICE_BRIEFINGS		12
-#define CF_TYPE_VOICE_CMD_BRIEF		13
-#define CF_TYPE_VOICE_DEBRIEFINGS	14
-#define CF_TYPE_VOICE_PERSONAS		15
-#define CF_TYPE_VOICE_SPECIAL		16
-#define CF_TYPE_VOICE_TRAINING		17
-#define CF_TYPE_MUSIC				18
-#define CF_TYPE_MOVIES				19
-#define CF_TYPE_INTERFACE			20
-#define CF_TYPE_FONT				21
-#define CF_TYPE_EFFECTS				22
-#define CF_TYPE_HUD					23
-#define CF_TYPE_PLAYER_MAIN			24
-#define CF_TYPE_PLAYER_IMAGES_MAIN	25
-#define CF_TYPE_CACHE				26
-#define CF_TYPE_PLAYERS				27
-#define CF_TYPE_SINGLE_PLAYERS		28
-#define CF_TYPE_MULTI_PLAYERS		29
-#define CF_TYPE_MULTI_CACHE			30
+#define CF_TYPE_MODELS				5
+#define CF_TYPE_TABLES				6
+#define CF_TYPE_SOUNDS				7
+#define CF_TYPE_SOUNDS_8B22K		8
+#define CF_TYPE_SOUNDS_16B11K		9
+#define CF_TYPE_VOICE				10
+#define CF_TYPE_VOICE_BRIEFINGS		11
+#define CF_TYPE_VOICE_CMD_BRIEF		12
+#define CF_TYPE_VOICE_DEBRIEFINGS	13
+#define CF_TYPE_VOICE_PERSONAS		14
+#define CF_TYPE_VOICE_SPECIAL		15
+#define CF_TYPE_VOICE_TRAINING		16
+#define CF_TYPE_MUSIC				17
+#define CF_TYPE_MOVIES				18
+#define CF_TYPE_INTERFACE			19
+#define CF_TYPE_FONT				20
+#define CF_TYPE_EFFECTS				21
+#define CF_TYPE_HUD					22
+#define CF_TYPE_PLAYERS				23
+#define CF_TYPE_PLAYER_IMAGES		24
+#define CF_TYPE_SQUAD_IMAGES		25
+#define CF_TYPE_SINGLE_PLAYERS		26
+#define CF_TYPE_MULTI_PLAYERS		27
+#define CF_TYPE_CACHE				28
+#define CF_TYPE_MULTI_CACHE			29
+#define CF_TYPE_MISSIONS			30
 #define CF_TYPE_CONFIG				31
-#define CF_TYPE_SQUAD_IMAGES_MAIN	32
-#define CF_TYPE_DEMOS				33
-#define CF_TYPE_CBANIMS				34
-#define CF_TYPE_INTEL_ANIMS			35
+#define CF_TYPE_DEMOS				32
+#define CF_TYPE_CBANIMS				33
+#define CF_TYPE_INTEL_ANIMS			34
+#define CF_TYPE_SCRIPTS				35
+#define CF_TYPE_FICTION				36

-#define CF_MAX_PATH_TYPES				36			// Can be as high as you'd like //DTP; yeah but beware alot of things uses CF_MAX_PATH_TYPES
+#define CF_MAX_PATH_TYPES			37			// Can be as high as you'd like //DTP; yeah but beware alot of things uses CF_MAX_PATH_TYPES


 // TRUE if type is specified and valid
@@ -495,6 +540,10 @@ int cf_get_dir_type(CFILE *cfile);
 // default path.  If mode is NULL, delete the file.  
 CFILE *cfopen(char *filename, char *mode, int type = CFILE_NORMAL, int dir_type = CF_TYPE_ANY, bool localize = false);

+// like cfopen(), but it accepts a fully qualified path only (ie, the result of a cf_find_file_location() call)
+// NOTE: only supports reading files!!
+CFILE *cfopen_special(char *file_path, char *mode, const int size, const int offset, int dir_type = CF_TYPE_ANY);
+
 // Flush the open file buffer
 int cflush(CFILE *cfile);

@@ -503,13 +552,21 @@ int cflush(CFILE *cfile);
 void cf_set_version( CFILE * cfile, int version );

 // Deletes a file. Returns 0 on error, 1 if successful
-int cf_delete( char *filename, int dir_type );
+int cf_delete(char *filename, int dir_type);

 // Same as _access function to read a file's access bits
-int cf_access( char *filename, int dir_type, int mode );
+int cf_access(char *filename, int dir_type, int mode);

-// Returns 1 if file exists, 0 if not.
-int cf_exist( char *filename, int dir_type );
+// Returns 1 if the file exists, 0 if not.
+// Checks only the file system.
+int cf_exists(char *filename, int dir_type);
+
+// Goober5000
+// Returns 1 if the file exists, 0 if not.
+// Checks both the file system and the VPs.
+int cf_exists_full(char *filename, int dir_type);
+// check num_ext worth of ext_list extensions
+int cf_exists_full_ext(char *filename, int dir_type, const int num_ext, const char **ext_list);

 // ctmpfile() opens a temporary file stream.  File is deleted automatically when closed
 CFILE *ctmpfile();
@@ -517,6 +574,9 @@ CFILE *ctmpfile();
 // Closes the file
 int cfclose(CFILE *cfile);

+//Checks if the given handle is valid
+int cf_is_valid(CFILE *cfile);
+
 // Returns size of file...
 int cfilelength(CFILE *fp);

@@ -568,13 +628,15 @@ int cf_chksum_long(char *filename, uint *chksum, int max_size = -1, int cf_type
 // NOTE : preserves current file position
 int cf_chksum_long(CFILE *file, uint *chksum, int max_size = -1);

+int cf_chksum_pack(char *filename, uint *chk_long, bool full = false);
+
 // convenient for misc checksumming purposes ------------------------------------------

 // update cur_chksum with the chksum of the new_data of size new_data_size
-ushort cf_add_chksum_short(ushort seed, char *buffer, int size);
+ushort cf_add_chksum_short(ushort seed, ubyte *buffer, int size);

 // update cur_chksum with the chksum of the new_data of size new_data_size
-unsigned long cf_add_chksum_long(unsigned long seed, char *buffer, int size);
+uint cf_add_chksum_long(uint seed, ubyte *buffer, int size);

 // convenient for misc checksumming purposes ------------------------------------------

@@ -642,11 +704,26 @@ void cf_sort_filenames( int n, char **list, int sort, file_list_info *info = NUL
 // CD's and pack files.
 // Input:  filespace   - Filename & extension
 //         pathtype    - See CF_TYPE_ defines in CFILE.H
+//         max_out     - Maximum string size to be stuffed into pack_filename
 // Output: pack_filename - Absolute path and filename of this file.   Could be a packfile or the actual file.
 //         size        - File size
 //         offset      - Offset into pack file.  0 if not a packfile.
 // Returns: If not found returns 0.
-int cf_find_file_location( char *filespec, int pathtype, char *pack_filename, int *size, int *offset, bool localize = false);
+int cf_find_file_location( char *filespec, int pathtype, int max_out, char *pack_filename, int *size, int *offset, bool localize = false);
+
+// Searches for a file.   Follows all rules and precedence and searches
+// CD's and pack files.  Searches all locations in order for first filename using ext filter list.
+// Input:  filename    - Filename & extension
+//         ext_num     - number of extensions to look for
+//         ext_list    - extension filter list
+//         pathtype    - See CF_TYPE_ defines in CFILE.H
+//         max_out     - Maximum string length that should be stuffed into pack_filename
+// Output: pack_filename - Absolute path and filename of this file.   Could be a packfile or the actual file.
+//         size        - File size
+//         offset      - Offset into pack file.  0 if not a packfile.
+// Returns: If not found returns -1, else returns offset into ext_list.
+// (NOTE: This function is exponentially slow, so don't use it unless truely needed!!)
+int cf_find_file_location_ext(char *filename, const int ext_num, const char **ext_list, int pathtype, int max_out = 0, char *pack_filename = NULL, int *size = NULL, int *offset = NULL, bool localize = false);

 // Functions to change directories
 int cfile_chdir(char *dir);
@@ -112,14 +112,14 @@

 #include "cfile/cfile.h"
 #include "cfile/cfilearchive.h"
-
+#include "luaconf.h"


 #define CHECK_POSITION

 // Called once to setup the low-level reading code.

-void cf_init_lowlevel_read_code( CFILE * cfile, int offset, int size )
+void cf_init_lowlevel_read_code( CFILE * cfile, int lib_offset, int size, int pos )
 {
 	Assert(cfile != NULL);

@@ -127,8 +127,8 @@ void cf_init_lowlevel_read_code( CFILE * cfile, int offset, int size )
 	Assert(cfile->id >= 0 && cfile->id < MAX_CFILE_BLOCKS);
 	cb = &Cfile_block_list[cfile->id];	

-	cb->lib_offset = offset;
-	cb->raw_position = 0;
+	cb->lib_offset = lib_offset;
+	cb->raw_position = pos;
 	cb->size = size;

 	if ( cb->fp )	{
@@ -268,22 +268,22 @@ int cfseek( CFILE *cfile, int offset, int where )
 //
 int cfread(void *buf, int elsize, int nelem, CFILE *cfile)
 {
-	Assert(cfile != NULL);
-	Assert(buf != NULL);
-	Assert(cfile->id >= 0 && cfile->id < MAX_CFILE_BLOCKS);
-
-	Cfile_block *cb;
-	cb = &Cfile_block_list[cfile->id];	
-
-	// cfread() not supported for memory-mapped files
-	Assert( !cb->data );
-	Assert(cb->fp != NULL);
+	if(!cf_is_valid(cfile))
+		return 0;

 	int size = elsize*nelem;

-	Assert(nelem > 0);
-	Assert(elsize > 0);
-	Assert(size > 0);
+	if(buf == NULL || size <= 0)
+		return 0;
+
+	Cfile_block *cb = &Cfile_block_list[cfile->id];	
+
+	// cfread() not supported for memory-mapped files
+	if(cb->data != NULL)
+	{
+		Warning(LOCATION, "Writing is not supported for mem-mapped files");
+		return 0;
+	}

 	if ( (cb->raw_position+size) > cb->size ) {
 		size = cb->size - cb->raw_position;
@@ -308,3 +308,34 @@ int cfread(void *buf, int elsize, int nelem, CFILE *cfile)

 }

+int cfread_lua_number(double *buf, CFILE *cfile)
+{
+	if(!cf_is_valid(cfile))
+		return 0;
+
+	if(buf == NULL)
+		return 0;
+
+	Cfile_block *cb = &Cfile_block_list[cfile->id];	
+
+	// cfread() not supported for memory-mapped files
+	if(cb->data != NULL)
+	{
+		Warning(LOCATION, "Writing is not supported for mem-mapped files");
+		return 0;
+	}
+
+	long orig_pos = ftell(cb->fp);
+	int items_read = fscanf(cb->fp, LUA_NUMBER_SCAN, buf);
+	cb->raw_position += ftell(cb->fp)-orig_pos;		
+
+	#if defined(CHECK_POSITION) && !defined(NDEBUG)
+		int tmp_offset;
+		tmp_offset = ftell(cb->fp) - cb->lib_offset;
+		Assert(tmp_offset==cb->raw_position);
+	#endif
+
+	return items_read;
+
+}
+
@@ -90,6 +90,6 @@ extern Cfile_block Cfile_block_list[MAX_CFILE_BLOCKS];
 extern CFILE Cfile_list[MAX_CFILE_BLOCKS];

 // Called once to setup the low-level reading code.
-void cf_init_lowlevel_read_code( CFILE * cfile, int offset, int size );
+void cf_init_lowlevel_read_code( CFILE * cfile, int lib_offset, int size, int pos );

 #endif
@@ -9,13 +9,19 @@

 /*
 * $Logfile: /Freespace2/code/CFile/CfileList.cpp $
- * $Revision: 2.6 $
- * $Date: 2005-01-31 23:27:51 $
+ * $Revision: 2.6.2.2 $
+ * $Date: 2007-05-20 02:51:26 $
 * $Author: taylor $
 *
 * Code for doing directory lists and sorts
 *
 * $Log: not supported by cvs2svn $
+ * Revision 2.6.2.1  2006/08/19 04:16:49  taylor
+ * "byte" was the same as "ubyte", but since "byte" has to be an extra #define on everything but Windows, lets just get rid of it
+ *
+ * Revision 2.6  2005/01/31 23:27:51  taylor
+ * merge with Linux/OSX tree - p0131-2
+ *
 * Revision 2.5  2004/07/26 20:47:25  Kazan
 * remove MCD complete
 *
@@ -161,14 +167,22 @@ void cf_sort_filenames( int n, char **list, int sort, file_list_info *info )
 	} else if (sort == CF_SORT_REVERSE) {
 		incr = n / 2;
 		char buffer[MAX_FILENAME_LEN];
+		file_list_info tt_tmp;

 		for (i = 0; i < incr; i++) {
 			t = list[n - 1 - i];

-			if ( stricmp(list[i], t) > 0 ) {
+			if (list[i] != t) {
 				strcpy(buffer, list[i]);
 				strcpy(list[i], t);
 				strcpy(t, buffer);
+
+				if (info) {
+					tt = info[n - 1 - i];
+					tt_tmp = info[i];
+					info[i] = tt;
+					tt = tt_tmp;
+				}
 			}
 		}

@@ -364,7 +378,7 @@ int cfread_compressed(void *buf, int elsize, int nelem, CFILE *cfile)
 	
 	while(1)	{

-		byte count;
+		ubyte count;

 		if ( cfread( &count, 1, 1, cfile ) != 1 )	{
 			break;
@@ -377,7 +391,7 @@ int cfread_compressed(void *buf, int elsize, int nelem, CFILE *cfile)
 		if ( count > 0 )	{
 			if ( run_span )	{
 				// RLE'd data
-				byte c;
+				ubyte c;
 				if ( cfread( &c, 1, 1, cfile ) != 1 )	{
 					break;
 				}
@@ -9,8 +9,8 @@

 /*
 * $Logfile: /Freespace2/code/CFile/CfileSystem.h $
- * $Revision: 2.3 $
- * $Date: 2005-07-13 02:50:49 $
+ * $Revision: 2.5 $
+ * $Date: 2006-04-20 06:32:00 $
 * $Author: Goober5000 $
 *
 * Functions to keep track of and find files that can exist
@@ -20,6 +20,13 @@
 * all those locations, inherently enforcing precedence orders.
 *
 * $Log: not supported by cvs2svn $
+ * Revision 2.4  2005/10/16 23:15:46  wmcoolmon
+ * Hardened cfile against array overflows
+ *
+ * Revision 2.3  2005/07/13 02:50:49  Goober5000
+ * remove PreProcDefine #includes in FS2
+ * --Goober5000
+ *
 * Revision 2.2  2004/08/11 05:06:19  Kazan
 * added preprocdefines.h to prevent what happened with fred -- make sure to make all fred2 headers include this file as the _first_ include -- i have already modified fs2 files to do this
 *
@@ -65,7 +72,7 @@ void cf_free_secondary_filelist();
 // Internal stuff
 typedef struct cf_pathtype {
 	int		index;					// To verify that the CF_TYPE define is correctly indexed into this array
-	char		*path;					// Path relative to Freespace root, has ending backslash.
+	char		*path;					// Path relative to FreeSpace root, has ending backslash.
 	char		*extensions;			// Extensions used in this pathtype, separated by spaces
 	int		parent_index;			// Index of this directory's parent.  Used for creating directories when writing.
 } cf_pathtype;
@@ -79,9 +86,11 @@ extern cf_pathtype Pathtypes[CF_MAX_PATH_TYPES];
 // If filename isn't null it will also tack the filename
 // on the end, creating a completely valid filename.
 // Input:   pathtype  - CF_TYPE_??
+//			path_max  - Maximum characters in the path
 //          filename  - optional, if set, tacks the filename onto end of path.
 // Output:  path      - Fully qualified pathname.
-void cf_create_default_path_string( char *path, int pathtype, char *filename=NULL, bool localize = false);
+//Returns 0 if result would be too long (invalid result)
+int cf_create_default_path_string( char *path, uint path_max, int pathtype, char *filename=NULL, bool localize = false);


 #endif	//_CFILESYSTEM_H
@@ -9,13 +9,20 @@

 /*
 * $Logfile: /Freespace2/code/Cfilearchiver/CfileArchiver.cpp $
- * $Revision: 2.3 $
- * $Date: 2005-09-08 00:09:31 $
+ * $Revision: 2.4.2.1 $
+ * $Date: 2007-05-11 03:09:21 $
 * $Author: taylor $
 *
 * Program to create an archive file for use with cfile stuff
 *
 * $Log: not supported by cvs2svn $
+ * Revision 2.4  2005/11/13 06:38:04  taylor
+ * never did port this stupid thing to PPC
+ *
+ * Revision 2.3  2005/09/08 00:09:31  taylor
+ * fix building/linking of command line tools under Linux/OSX
+ * add tools as targets to OSX project file
+ *
 * Revision 2.2  2005/01/30 12:50:08  taylor
 * merge with Linux/OSX tree - p0130
 *
@@ -52,9 +59,32 @@
 #include "globalincs/pstypes.h"
 #include "cfile/cfile.h"

+
 static int data_error;
 static int no_dir;

+// right out of pstypes.h but we don't want to use the INTEL_INT macro here
+// since it would require SDL which isn't used on WIN32 platforms
+#if BYTE_ORDER == BIG_ENDIAN
+#define INT_SWAP(x)	(								\
+						(x << 24) |					\
+						(((ulong)x) >> 24) |		\
+						((x & 0x0000ff00) << 8) |	\
+						((x & 0x00ff0000) >> 8)		\
+						)
+#else
+#define INT_SWAP(x) (x)
+#endif
+
+
+size_t fswrite_int(int *wint, FILE *stream)
+{
+	int tmp = *wint;
+	tmp = INT_SWAP(tmp);
+
+	return fwrite(&tmp, 1, sizeof(int), stream);
+}
+
 unsigned int Total_size=16; // Start with size of header
 unsigned int Num_files =0;
 FILE *fp_out = NULL;
@@ -79,26 +109,36 @@ char tmp_data[BLOCK_SIZE];		// 1 MB

 void write_header()
 {
+	int ver = VERSION_NUMBER;
+
 	fseek(fp_out, 0, SEEK_SET);
 	fwrite("VPVP", 1, 4, fp_out);
-	int ver = VERSION_NUMBER;
-	fwrite(&ver, 1, 4, fp_out);
-	fwrite(&Total_size, 1, 4, fp_out);
-	fwrite(&Num_files, 1, 4, fp_out);
+	fswrite_int(&ver, fp_out);
+	fswrite_int((int*)&Total_size, fp_out);
+	fswrite_int((int*)&Num_files, fp_out);
 }

 int write_index(char *hf, char *df)
 {
-	FILE *h = fopen(hf, "rb");
-	if (!h) return 0;
-	FILE *d = fopen(df, "a+b");
-	if (!d) return 0;
-	for (unsigned int i=0;i<Num_files;i++) {
+	FILE *h = NULL, *d = NULL;
+	unsigned int i;
+
+	h = fopen(hf, "rb");
+	d = fopen(df, "a+b");
+
+	if ( (h == NULL) || (d == NULL) )
+		return 0;
+
+	for (i = 0; i < Num_files; i++) {
 		fread(tmp_data, 32+4+4+4, 1, h);
 		fwrite(tmp_data, 32+4+4+4, 1, d);
 	}
+
 	fclose(h);
 	fclose(d);
+
+	unlink(hf);
+
 	return 1;
 }

@@ -121,16 +161,18 @@ void pack_file( char *filespec, char *filename, int filesize, _fs_time_t time_wr
 		return;
 	}

-	memset( path, 0, sizeof(path));
-	strcpy( path, filename );
-	if ( strlen(filename)>31 )	{
-		printf( "Filename '%s' too long\n", filename );
-		exit(1);
+	if ( strlen(filename) > 31 )	{
+		printf( "Filename '%s' too long!  Skipping...\n", filename );
+		return;
 	}
-	fwrite( &Total_size, 1, 4, fp_out_hdr );
-	fwrite( &filesize, 1, 4, fp_out_hdr );
+
+	memset( path, 0, sizeof(path) );
+	strcpy( path, filename );
+
+	fswrite_int( (int*)&Total_size, fp_out_hdr );
+	fswrite_int( &filesize, fp_out_hdr );
 	fwrite( &path, 1, 32, fp_out_hdr );
-	fwrite( &time_write, 1, sizeof(_fs_time_t), fp_out_hdr);
+	fswrite_int( (int*)&time_write, fp_out_hdr );

 	Total_size += filesize;
 	Num_files++;
@@ -169,17 +211,21 @@ void add_directory( char * dirname)
 	char path[256];
 	char *pathptr = path;
 	char *tmpptr;
+	int i = 0;

 	strcpy(path, dirname);
-	fwrite(&Total_size, 1, 4, fp_out_hdr);
-	int i = 0;
-	fwrite(&i, 1, 4, fp_out_hdr);
+
+	fswrite_int( (int*)&Total_size, fp_out_hdr);
+	fswrite_int( &i, fp_out_hdr);
+
 	// strip out any directories that this dir is a subdir of
-	while ((tmpptr = strchr(pathptr, DIR_SEPARATOR_CHAR)) != NULL) {
+	while ( (tmpptr = strchr(pathptr, DIR_SEPARATOR_CHAR)) != NULL ) {
 		pathptr = tmpptr+1;
 	}
+
 	fwrite(pathptr, 1, 32, fp_out_hdr);
-	fwrite(&i, 1, 4, fp_out_hdr); // timestamp = 0
+	fswrite_int( &i, fp_out_hdr); // timestamp = 0
+
 	Num_files++;
 }

@@ -191,28 +237,11 @@ void pack_directory( char * filespec)
 #endif
 	char tmp[512];
 	char tmp1[512];
-
-/*
-	char dir_name[512];
-	char *last_slash;
-
-	last_slash = strrchr(filespec, '\\');
-	if ( last_slash ) {
-		strcpy(dir_name, last_slash+1);
-	} else {
-		strcpy(dir_name, filespec);
-	}
-
-	if ( !stricmp(dir_name, "voice") ) {
-		return;
-	}
-*/
-
 	char *ts;

 	// strip trailing slash
-	ts = filespec+(strlen(filespec)-1);
-	while(*ts == DIR_SEPARATOR_CHAR && ts > filespec)
+	ts = filespec + (strlen(filespec) - 1);
+	while ( (*ts == DIR_SEPARATOR_CHAR) && (ts > filespec) )
 		*ts = '\0';

 	strcpy( tmp1, filespec );
@@ -226,7 +255,7 @@ void pack_directory( char * filespec)
 	find_handle = _findfirst( tmp1, &find );
 	if( find_handle != -1 )	{
 		if ( find.attrib & _A_SUBDIR )	{
-			if (strcmp( "..", find.name) && strcmp( ".", find.name))	{
+			if (strcmp( "..", find.name) && strcmp( ".", find.name) && strcmp( ".svn", find.name))	{
 				strcpy( tmp, filespec );
 				strcat( tmp, "\\" );
 				strcat( tmp, find.name );
@@ -238,7 +267,7 @@ void pack_directory( char * filespec)

 		while( !_findnext( find_handle, &find ) )	{
 			if ( find.attrib & _A_SUBDIR )	{
-				if (strcmp( "..", find.name) && strcmp( ".", find.name))	{
+				if (strcmp( "..", find.name) && strcmp( ".", find.name) && strcmp( ".svn", find.name))	{
 					strcpy( tmp, filespec );
 					strcat( tmp, "\\" );
 					strcat( tmp, find.name );
@@ -271,6 +300,10 @@ void pack_directory( char * filespec)
 				continue;
 			}

+			if ( (strcmp(dir->d_name, ".svn") == 0) ) {
+				continue;
+			}
+
 			if (S_ISDIR(buf.st_mode)) {
 				strcpy( tmp, filespec );
 				strcat( tmp, "/" );
@@ -296,11 +329,11 @@ int verify_directory( char *filespec )

 	// strip trailing '/'
 	ts = filespec+(strlen(filespec)-1);
-	while(*ts == DIR_SEPARATOR_CHAR && ts > filespec)
+	while ( (*ts == DIR_SEPARATOR_CHAR) && (ts > filespec) )
 		*ts = '\0';

 	// make sure last directory is named "data", ignoring case
-	dd = filespec+(strlen(filespec)-4);
+	dd = filespec + (strlen(filespec) - 4);
 	if ( stricmp( dd, "data" ) )
 		data_error = 1;
 	
@@ -310,8 +343,8 @@ int verify_directory( char *filespec )
 void print_instructions()
 {
 	printf( "Creates a vp archive out of a FreeSpace data tree.\n\n" );
-	printf( "Usage:		cfilearchiver archive_name src_dir\n");
-	printf( "Example:	cfilearchiver freespace /tmp/freespace/data\n\n");
+	printf( "Usage:     cfilearchiver archive_name src_dir\n");
+	printf( "Example:   cfilearchiver freespace /tmp/freespace/data\n\n");
 	printf( "Directory structure options:\n" );
 	printf( "   Effects                   (.ani .pcx .neb .tga)\n" );
 	printf( "   Fonts                     (.vf)\n" );
@@ -5,13 +5,25 @@

 /*
 * $Logfile: /Freespace2/code/cfileextractor/cfileextractor.cpp $
- * $Revision: 1.6 $
- * $Date: 2005-09-08 05:04:15 $
- * $Author: taylor $
+ * $Revision: 1.9 $
+ * $Date: 2006-01-20 07:10:33 $
+ * $Author: Goober5000 $
 *
 * Cross-platform cmdline extractor for VP files
 *
 * $Log: not supported by cvs2svn $
+ * Revision 1.8  2005/09/24 02:40:09  Goober5000
+ * get rid of a whole bunch of Microsoft warnings
+ * --Goober5000
+ *
+ * Revision 1.7  2005/09/20 02:45:47  taylor
+ * bump version to 0.6
+ * add a specified directory to output files to
+ *
+ * Revision 1.6  2005/09/08 05:04:15  taylor
+ * make it actually compile under WIN32
+ * bump version to 0.5 since little else is going to be done to this thing
+ *
 * Revision 1.5  2005/09/08 00:09:31  taylor
 * fix building/linking of command line tools under Linux/OSX
 * add tools as targets to OSX project file
@@ -33,6 +45,9 @@
 * $NoKeywords: $
 */

+#include "cfile/cfile.h"
+#include "globalincs/pstypes.h"
+
 #include <vector>
 #include <iostream>
 #include <cstdlib>
@@ -50,9 +65,6 @@
 #include <sys/types.h>
 #include <errno.h>

-#include "globalincs/pstypes.h"
-#include "cfile/cfile.h"
-

 // /////////////////////////////////////////////////////////////////////////////
 //
@@ -75,6 +87,12 @@
 FILE *fp_in = NULL;
 FILE *fp_out = NULL;

+#ifndef MAX_PATH
+#define MAX_PATH	255
+#endif
+
+char out_dir[MAX_PATH];
+
 #define BLOCK_SIZE (1024*1024)

 char tmp_data[BLOCK_SIZE];		// 1 MB
@@ -82,11 +100,12 @@ char tmp_data[BLOCK_SIZE];		// 1 MB
 static int have_index = 0;
 static int have_header = 0;

-#define ERR_NO_FP_IN	0
-#define ERR_NO_FP_OUT	1
-#define ERR_INVALID_VP	2
-#define ERR_NO_INDEX	3
-#define ERR_NO_HEADER	4
+#define ERR_NO_FP_IN		0
+#define ERR_NO_FP_OUT		1
+#define ERR_INVALID_VP		2
+#define ERR_NO_INDEX		3
+#define ERR_NO_HEADER		4
+#define ERR_PATH_TOO_LONG	5

 typedef struct vp_header {
 	char id[4];  // 'VPVP'
@@ -158,6 +177,9 @@ void print_error(int err)
 		case ERR_NO_HEADER:
 			printf("ERROR: No file header is available!  Exiting...\n");
 			break;
+		case ERR_PATH_TOO_LONG:
+			printf("ERROR: Path to output directory is too long!  Exiting...\n");
+			break;
 		default:
 			break;
 	}
@@ -261,15 +283,34 @@ void extract_all_files(char *file)

 	int status, m_error, nbytes, nbytes_remaining;
 	char path[CF_MAX_PATHNAME_LENGTH+CF_MAX_FILENAME_LENGTH+1]; // path length + filename length + extra NULL
+	char path2[CF_MAX_PATHNAME_LENGTH+CF_MAX_FILENAME_LENGTH+1]; // path length + filename length + extra NULL
 	char *c;
+	ubyte have_outdir = 0;

-	printf("VP file extractor - version 0.01\n");
+	int out_len = strlen(out_dir);
+
+	if (out_len > 0)
+		have_outdir = 1;
+
+	printf("VP file extractor - version 0.6\n");
 	printf("\n");
+
+	if (have_outdir) {
+		printf("Output directory: \"%s\"\n", out_dir);
+	}
+
 	printf("Extracting: %s...\n", file);

 	for (uint i = 0; i < VP_FileInfo.size(); i++) {
 		// save the file path to a temp location and recursively make the needed directories
-		sprintf(path, "%s%s", VP_FileInfo[i].file_path, DIR_SEPARATOR_STR);
+		if (have_outdir) {
+			if ( (out_len + 1 + strlen(path)) > MAX_PATH-1 )
+				print_error(ERR_PATH_TOO_LONG);
+
+			sprintf(path, "%s%s%s%s", out_dir, DIR_SEPARATOR_STR, VP_FileInfo[i].file_path, DIR_SEPARATOR_STR);
+		} else {
+			sprintf(path, "%s%s", VP_FileInfo[i].file_path, DIR_SEPARATOR_STR);
+		}

 		c = &path[0];

@@ -296,11 +337,24 @@ void extract_all_files(char *file)
 			}
 		}

+		memset( path, 0, CF_MAX_PATHNAME_LENGTH+CF_MAX_FILENAME_LENGTH+1);
+
 		// start writing out the file
 		fseek(fp_in, VP_FileInfo[i].offset, SEEK_SET);

 		sprintf(path, "%s%s%s", VP_FileInfo[i].file_path, DIR_SEPARATOR_STR, VP_FileInfo[i].file_name);
-		fp_out = fopen(path, "wb");
+
+		// this is cheap, I know.
+		if (have_outdir) {
+			if ( (out_len + 1 + strlen(path)) > MAX_PATH-1 )
+				print_error(ERR_PATH_TOO_LONG);
+
+			sprintf(path2, "%s%s%s", out_dir, DIR_SEPARATOR_STR, path);
+		} else {
+			strcpy(path2, path);
+		}
+
+		fp_out = fopen(path2, "wb");

 		printf("  %s ... ", path);

@@ -344,7 +398,7 @@ void list_all_files(char *file)
 		print_error(ERR_NO_INDEX);

 	
-	printf("VP file extractor - version 0.01\n");
+	printf("VP file extractor - version 0.6\n");
 	printf("\n");
 	printf("%s:\n", file);
 	printf("\n");
@@ -390,9 +444,9 @@ void list_all_files(char *file)

 void help()
 {
-	printf("VP file extractor - version 0.5\n");
+	printf("VP file extractor - version 0.6\n");
 	printf("\n");
-	printf("Usage:  cfileextractor [-x | -l] [-L] <vp_filename>\n");
+	printf("Usage:  cfileextractor [-x | -l] [-L] [-o <dir>] <vp_filename>\n");
 	printf("\n");
 	printf(" Commands (only one at the time):\n");
 	printf("  -x | --extract        Extract all files into current directory.\n");
@@ -401,6 +455,8 @@ void help()
 	printf("\n");
 	printf(" Options:\n");
 	printf("  -L | --lowercase      Force all filenames to be lower case.\n");
+	printf("  -o <dir>              Extract files to <dir> instead of current directory.\n");
+	printf("                        NOTE: No spaces allowed, enclose path in \" \" if needed.\n");
 	printf("\n");
 	printf("  (No command specified will list all files in the VP archive.)\n");
 	printf("\n");
@@ -435,6 +491,8 @@ int main(int argc, char *argv[])
 	// if the header is invalid then read_header() should exit us out
 	read_header();

+	memset(out_dir, 0, MAX_PATH);
+
 	// TODO: add filter based extraction
 	for (int i = 1; i < argc-1; i++) {
 		if (!strcmp(argv[i], "-x") || !strcmp(argv[i], "--extract")) {
@@ -451,6 +509,9 @@ int main(int argc, char *argv[])
 				exit(0);
 			}
 			list = 1;
+		} else if ( !strcmp(argv[i], "-o") && (i+1 < argc) && (argv[i+1][0] != '-') ) {
+			strncpy(out_dir, argv[i+1], MAX_PATH-1);
+			i++;  // have to increment "i" past the output directory
 		} else {
 			help();
 			return 0;
@@ -11,11 +11,130 @@
 /*
 * $Logfile: /Freespace2/code/Cmdline/cmdline.h $

- * $Revision: 2.73 $
- * $Date: 2005-07-25 05:24:16 $
- * $Author: Goober5000 $
+ * $Revision: 2.89.2.9 $
+ * $Date: 2008-01-08 01:41:13 $
+ * $Author: Kazan $
 *
 * $Log: not supported by cvs2svn $
+ * Revision 2.89.2.8  2007/10/15 06:43:08  taylor
+ * FS2NetD v.2  (still a work in progress, but is ~98% complete)
+ *
+ * Revision 2.89.2.7  2007/04/11 18:21:22  taylor
+ * cleanup of chcksum stuff (works properly on 64-bit systems now)
+ * add chksum support for VPs, both a startup in debug builds, and via cmdline option (-verify_vps)
+ * little cleanup in cmdline.cpp (get rid of the remaining "fix bugs" crap)
+ *
+ * Revision 2.89.2.6  2007/04/06 12:55:37  karajorma
+ * Add the -cap_object_update command line to force multiplayer clients to a more server friendly object update setting.
+ *
+ * Revision 2.89.2.5  2007/02/11 09:24:08  taylor
+ * remove -pcx32 and -jpgtga
+ *
+ * Revision 2.89.2.4  2006/11/15 00:21:40  taylor
+ * clean up some cmdline options which were/weren't FSO only
+ * add back the "-32bit" option, for retail compatibility (doesn't do anything, it's just there to avoid the unknown option message)
+ * add "-debug_window" to turn on the Windows-only extra debug output window (it's off by default now, only logging to file instead)
+ *
+ * Revision 2.89.2.3  2006/07/08 18:09:41  taylor
+ * remove -allslev
+ * make CTRL-SHIFT-S hotkey work in mission simulator (it's a toggle, so you can turn it on or off while on the screen)
+ * fix a bug where blank lines would show up in the campaign list for branch/alternate type missions that are otherwise marked as not completed
+ *
+ * Revision 2.89.2.2  2006/06/18 17:21:49  taylor
+ * add a -disable_fbo troubleshooting option for those ATI users having trouble with FBOs, but can still use envmapping otherwise
+ *
+ * Revision 2.89.2.1  2006/06/15 00:16:23  taylor
+ * remove previous attempts at the Y bug fix, it's now back to the retail code for that
+ *
+ * Revision 2.89  2006/05/27 17:17:57  taylor
+ * few things:
+ *   - comment out that -fixbugs and -nocrash crap, that's just stupid
+ *   - move -env off of the experimental list (since it's working pretty well in OGL)
+ *   - remove -nobeampierce
+ *   - remove -max_subdivide (didn't do anything)
+ *   - remove -rt (didn't do anything, and per-coder cmdline options should never be in CVS)
+ *   - move -cache_bitmaps to game speed rather than graphics
+ *   - add options for env and spec map scaling for envmaps (temporary, to be removed before official 3.6.8)
+ *   - add option for new alpha blend mode so that artists can still test with it but not mess up normal users with the bad MediaVPs
+ *   - remove -d3d_particle (it's obsolete now)
+ *
+ * Revision 2.88  2006/05/13 07:29:51  taylor
+ * OpenGL envmap support
+ * newer OpenGL extension support
+ * add GL_ARB_texture_rectangle support for non-power-of-2 textures as interface graphics
+ * add cubemap reading and writing support to DDS loader
+ * fix bug in DDS loader that made compressed images with mipmaps use more memory than they really required
+ * add support for a default envmap named "cubemap.dds"
+ * new mission flag "$Environment Map:" to use a pre-existing envmap
+ * minor cleanup of compiler warning messages
+ * get rid of wasteful math from gr_set_proj_matrix()
+ * remove extra gr_set_*_matrix() calls from starfield.cpp as there was no longer a reason for them to be there
+ * clean up bmpman flags in reguards to cubemaps and render targets
+ * disable D3D envmap code until it can be upgraded to current level of code
+ * remove bumpmap code from OpenGL stuff (sorry but it was getting in the way, if it was more than copy-paste it would be worth keeping)
+ * replace gluPerspective() call with glFrustum() call, it's a lot less math this way and saves the extra function call
+ *
+ * Revision 2.87  2006/04/05 13:47:01  taylor
+ * remove -tga16, it's obsolete now
+ * add a temporary -no_emissive_light option to not use emission type light in OGL
+ *
+ * Revision 2.86  2006/03/18 10:17:58  taylor
+ * we already have a variable to show the framerate so lets just use the one
+ *
+ * Revision 2.85  2006/02/24 07:36:49  taylor
+ * try and make some sense out of that cmdline option mess, maybe it will stay sane for a few days at least :)
+ *
+ * Revision 2.84  2006/01/10 18:37:45  randomtiger
+ * Improvements to voice recognition system.
+ * Also function put on -voicer launcher option.
+ *
+ * Revision 2.83  2005/11/24 06:37:47  phreak
+ * Added -missile_lighting command line
+ *
+ * Revision 2.82  2005/11/23 00:43:20  phreak
+ * Command lines for rearm countdown timer.
+ *
+ * Revision 2.81  2005/11/21 00:46:06  Goober5000
+ * add ai_settings.tbl
+ * --Goober5000
+ *
+ * Revision 2.80  2005/11/13 06:55:38  taylor
+ * cmdline option cleanup:
+ * remove from launcher -pcx32, -cell, -UseNewAI
+ * remove from game -loadonlyused, -dxt, -pcx2dds
+ * rename -d3dmipmap, -d3d_no_vsync, -dnoshowvid to non API specific sounding names
+ * add -nograb into help output under Linux/OSX
+ * add -loadallweps and -img2dds
+ *
+ * Revision 2.79  2005/10/30 20:00:22  taylor
+ * same basic cleanup and self-sanity changes
+ * split up WinMain() and main() so it doesn't resemble ifdef hell
+ * rename WinMainSub() to game_main() and move anything that should have been in WinMain() to WinMain()
+ *
+ * Revision 2.78  2005/10/23 11:45:06  taylor
+ * add -ogl_shine to adjust the OGL shininess value so that people can play around and find the best value to use
+ *
+ * Revision 2.77  2005/10/22 04:28:16  unknownplayer
+ * Added -UseNewAI command line option to force the game to always use
+ * the SCP AI changes. As of now there's some problem in gr_d3d_set_render_target
+ * that crashes the game when it gets to a mission.
+ *
+ * Revision 2.76  2005/10/12 05:43:40  taylor
+ * temporary cmdline option, -y_bug_fix, to switch between original code (default) and previous attempt at the Y-bug fix
+ *
+ * Revision 2.75  2005/09/30 09:47:06  taylor
+ * remove -rlm, it's always on now since there was never a complaint and pretty much everyone uses it
+ * add -cache_bitmaps and have bitmap caching between levels off by default
+ * when -cache_bitmaps is used then use C-BMP for top-right memory listing, and just BMP otherwise
+ *
+ * Revision 2.74  2005/09/21 03:55:31  Goober5000
+ * add option for warp flash; mess with the cmdlines a bit
+ * --Goober5000
+ *
+ * Revision 2.73  2005/07/25 05:24:16  Goober5000
+ * cleaned up some command line and mission flag stuff
+ * --Goober5000
+ *
 * Revision 2.72  2005/07/13 02:50:49  Goober5000
 * remove PreProcDefine #includes in FS2
 * --Goober5000
@@ -483,11 +602,8 @@
 #ifndef FS_CMDLINE_HEADER_FILE
 #define FS_CMDLINE_HEADER_FILE

-#ifdef _WIN32
+
 int parse_cmdline(char *cmdline);
-#else
-int parse_cmdline(int argc, char *argv[]);
-#endif

 int fred2_parse_cmdline(int argc, char *argv[]);
 // COMMAND LINE SETTINGS
@@ -497,109 +613,127 @@ int fred2_parse_cmdline(int argc, char *argv[]);
 // Add any extern definitions here and put the actual variables inside of cmdline.cpp for ease of use
 // Also, check to make sure anything you add doesn't break Fred or TestCode

-extern int Cmdline_multi_stream_chat_to_file;
-extern int Cmdline_freespace_no_sound;
-extern int Cmdline_freespace_no_music;
-extern int Cmdline_gimme_all_medals;
-extern int Cmdline_use_last_pilot;
-extern int Cmdline_cd_check;
-extern int Cmdline_start_netgame;
-extern int Cmdline_closed_game;
-extern int Cmdline_restricted_game;
-extern int Cmdline_network_port;
+
+// RETAIL OPTIONS ----------------------------------------------
+extern char *Cmdline_connect_addr;
 extern char *Cmdline_game_name;
 extern char *Cmdline_game_password;
 extern char *Cmdline_rank_above;
 extern char *Cmdline_rank_below;
-extern char *Cmdline_connect_addr;
-extern int Cmdline_multi_log;
-extern int Cmdline_server_firing;
+extern int Cmdline_cd_check;
 extern int Cmdline_client_dodamage;
-extern int Cmdline_spew_pof_info;
+extern int Cmdline_closed_game;
+extern int Cmdline_freespace_no_music;
+extern int Cmdline_freespace_no_sound;
+extern int Cmdline_gimme_all_medals;
 extern int Cmdline_mouse_coords;
+extern int Cmdline_multi_log;
+extern int Cmdline_multi_stream_chat_to_file;
+extern int Cmdline_network_port;
+extern int Cmdline_restricted_game;
+extern int Cmdline_server_firing;
+extern int Cmdline_spew_pof_info;
+extern int Cmdline_start_netgame;
 extern int Cmdline_timeout;
-extern int Cmdline_SpewMission_CRCs;
-extern int Cmdline_SpewTable_CRCs;
-
+extern int Cmdline_use_last_pilot;
 extern int Cmdline_window;
-extern char *Cmdline_almission;	//DTP for autoload mission
-extern int Cmdline_gf4fix;	//DTP for Random tigers GF4fix.
-extern int Cmdline_allslev;
-extern int Cmdline_dualscanlines;
-extern int Cmdline_dnoshowvid;	//WMC Toggles movie playing support
-extern int Cmdline_noscalevid;	// disables fit-to-window for movies - taylor
-extern char *Cmdline_mod; //DTP for mod support
-extern int Cmdline_show_fps;//DTP moved here because it is the correct place for it to be.
-extern int Cmdline_show_stats;
-extern int Cmdline_safeloading;
-extern int Cmdline_nospec;
-extern int Cmdline_orb_radar;
-extern int Cmdline_TBPWarpEffects;  // TBP warp effects -Et1
+extern char *Cmdline_res;

-extern int Cmdline_cache_ani;
-extern int Cmdline_d3dmipmap;

-extern int Cmdline_beams_no_pierce_shields;	// Goober5000
-extern float Cmdline_fov;
+// FSO OPTIONS -------------------------------------------------

-extern float static_light_factor;
-extern float static_tube_factor;
-extern float static_point_factor;
+// Graphics related
 extern double specular_exponent_value;
-
+extern float Cmdline_clip_dist;
+extern float Cmdline_fov;
+extern float Cmdline_ogl_spec;
+extern float Cmdline_glow_factor;
+extern float static_light_factor;
+extern float static_point_factor;
+extern float static_tube_factor;
+extern int Cmdline_ambient_factor;
 extern int Cmdline_cell;
-extern int Cmdline_nohtl;
-extern int Cmdline_dxt;
-extern int Cmdline_jpgtga;
-extern int Cmdline_no_set_gamma;
-extern int Cmdline_d3d_no_vsync;
-extern int Cmdline_pcx32;
-extern int Cmdline_pcx32dds;
+extern int Cmdline_decals;
+extern int Cmdline_env;
+extern int Cmdline_mipmap;
+extern int Cmdline_missile_lighting;
+extern int Cmdline_glow;
 extern int Cmdline_nomotiondebris;
-extern int Cmdline_rlm;
-extern int Cmdline_noibx;
+extern int Cmdline_noscalevid;	// disables fit-to-window for movies - taylor
+extern int Cmdline_spec;
+extern int Cmdline_normal;
+extern int Cmdline_height;
+extern int Cmdline_enable_3d_shockwave;

+// Game Speed related
+extern int Cmdline_cache_bitmaps;
+extern int Cmdline_img2dds;
+extern int Cmdline_NoFPSCap;
+extern int Cmdline_no_vsync;
+
+// HUD related
+extern int Cmdline_ballistic_gauge;
+extern int Cmdline_dualscanlines;
+extern int Cmdline_orb_radar;
+extern int Cmdline_rearm_timer;
+extern int Cmdline_targetinfo;
+
+// Gameplay related
+extern int Cmdline_3dwarp;
+extern int Cmdline_ship_choice_3d;
+extern int Cmdline_weapon_choice_3d;
+extern int Cmdline_warp_flash;
+extern int Cmdline_autopilot_interruptable;
+
+// Audio related
+extern int Cmdline_query_speech;
+extern int Cmdline_snd_preload;
+extern int Cmdline_voice_recognition;
+
+// MOD related
+extern char *Cmdline_mod;	 // DTP for mod support
+extern int Cmdline_tbp;
+extern int Cmdline_wcsaga;
+
+// Multiplayer/Network related
+extern char *Cmdline_almission;	// DTP for autoload mission (for multi only)
+extern int Cmdline_ingamejoin;
+extern int Cmdline_mpnoreturn;
+extern char *Cmdline_spew_mission_crcs;
+extern char *Cmdline_spew_table_crcs;
+extern int Cmdline_objupd;
+
+// Troubleshooting
+extern int Cmdline_d3d_lesstmem;
+extern int Cmdline_load_all_weapons;
+extern int Cmdline_nohtl;
+extern int Cmdline_noibx;
+extern int Cmdline_nomovies;	// WMC Toggles movie playing support
+extern int Cmdline_no_set_gamma;
+extern int Cmdline_novbo;
+extern int Cmdline_safeloading;
+extern int Cmdline_no_fbo;
+extern int Cmdline_noglsl;
+extern int Cmdline_ati_color_swap;
+
+// Developer/Testing related
+extern char *Cmdline_start_mission;
+extern int Cmdline_dis_collisions;
+extern int Cmdline_dis_weapons;
+extern int Cmdline_noparseerrors;
+extern int Cmdline_nowarn;
+extern int Cmdline_show_mem_usage;
+extern int Cmdline_show_pos;
+extern int Cmdline_show_stats;
+extern int Cmdline_timerbar;
+extern int Cmdline_save_render_targets;
+extern int Cmdline_debug_window;
+extern int Cmdline_verify_vps;
 #ifdef SCP_UNIX
-	extern int Cmdline_no_grab;
+extern int Cmdline_no_grab;
 #endif

-extern int Cmdline_noglow;
-extern int Cmdline_timerbar;
-extern int Cmdline_query_speech;
-extern int Cmdline_ship_choice_3d;
-extern int Cmdline_d3d_particle;

-extern int Cmdline_ambient_factor;
-extern int Cmdline_show_mem_usage;
-extern int Cmdline_rt;
-extern int Cmdline_ingamejoin;
-extern char *Cmdline_start_mission;
-
-extern int Cmdline_d3d_lesstmem;
-extern int Cmdline_batch_3dunlit;
-
-extern int Cmdline_2d_poof;
-extern int Cmdline_3dwarp;
-
-extern int Cmdline_FRED2_htl;
-extern int CmdLine_NoWarn;
-
-extern int Cmdline_novbo;
-extern int Cmdline_snd_preload;
-extern int Cmdline_NoFPSCap;
-
-extern float Cmdline_max_subdivide;
-
-extern int Cmdline_alpha_env;
-extern int Cmdline_env;
-extern int Cmdline_decals;
-
-extern int Cmdline_ballistic_gauge;
-extern int Cmdline_smart_shields;
-
-extern int Cmdline_tga16;
-
-extern int Cmdline_wcsaga;

 //extern char FreeSpace_Directory[]; // allievating a cfilesystem problem caused by fred -- Kazan
 #endif
@@ -9,13 +9,24 @@

 /*
 * $Logfile: /Freespace2/code/CMeasure/CMeasure.cpp $
- * $Revision: 2.6 $
- * $Date: 2005-04-05 05:53:15 $
- * $Author: taylor $
+ * $Revision: 2.9 $
+ * $Date: 2005-12-04 19:07:48 $
+ * $Author: wmcoolmon $
 *
 * Counter measures.  Created by Mike Kulas, May 12, 1997.
 *
 * $Log: not supported by cvs2svn $
+ * Revision 2.8  2005/11/21 02:43:30  Goober5000
+ * change from "setting" to "profile"; this way makes more sense
+ * --Goober5000
+ *
+ * Revision 2.7  2005/11/21 00:46:06  Goober5000
+ * add ai_settings.tbl
+ * --Goober5000
+ *
+ * Revision 2.6  2005/04/05 05:53:15  taylor
+ * s/vector/vec3d/g, better support for different compilers (Jens Granseuer)
+ *
 * Revision 2.5  2004/07/26 20:47:25  Kazan
 * remove MCD complete
 *
@@ -230,26 +241,31 @@
 * $NoKeywords: $
 */

-#include "globalincs/systemvars.h"
 #include "cmeasure/cmeasure.h"
-#include "freespace2/freespace.h"
-#include "model/model.h"
+//#include "freespace2/freespace.h"
+//#include "model/model.h"
 #include "ship/ship.h"
 #include "math/staticrand.h"
 #include "object/object.h"
+#include "weapon/weapon.h"
+#include "hud/hud.h"
+#include "gamesnd/gamesnd.h"
+#include "network/multimsgs.h"
+#include "mission/missionparse.h"


+//cmeasure_info Cmeasure_info[MAX_CMEASURE_TYPES];
+//cmeasure Cmeasures[MAX_CMEASURES];

-cmeasure_info Cmeasure_info[MAX_CMEASURE_TYPES];
-cmeasure Cmeasures[MAX_CMEASURES];
-
-int	Num_cmeasure_types = 0;
-int	Num_cmeasures = 0;
-int	Cmeasure_inited = 0;
+//int	Num_cmeasure_types = 0;
+//int	Num_cmeasures = 0;
+//int	Cmeasure_inited = 0;
 int	Cmeasures_homing_check = 0;
 int	Countermeasures_enabled = 1;			//	Debug, set to 0 means no one can fire countermeasures.

 // This will get called at the start of each level.
+//Not anymore - WMC
+/*
 void cmeasure_init()
 {
 	int i;
@@ -264,8 +280,8 @@ void cmeasure_init()
 		Cmeasures[i].subtype = CMEASURE_UNUSED;
 	}
 		
-}
-
+}*/
+/*
 void cmeasure_render(object * objp)
 {
 	// JAS TODO: Replace with proper fireball
@@ -279,16 +295,6 @@ void cmeasure_render(object * objp)
 		Int3();	//	Hey, what are we doing in here?
 		return;
 	}
-
-//	float				size = -1.0f;
-//	vertex			p;
-//	g3_rotate_vertex(&p, &objp->pos );
-//	if ( rand() > RAND_MAX/2 )	{
-//		gr_set_color( 255, 0, 0 );
-//	} else {
-//		gr_set_color( 255, 255, 255 );
-//	}
-//	g3_draw_sphere(&p, 100.0f );
 	
 	if ( cmip->model_num > -1 )	{
 		model_clear_instance(cmip->model_num);
@@ -296,39 +302,8 @@ void cmeasure_render(object * objp)
 	} else {
 		mprintf(( "Not rendering countermeasure because model_num is negative\n" ));
 	}
-
-
+}*/
 /*
-	// JAS TODO: Replace with proper fireball
-	int				framenum = -1;
-	float				size = -1.0f;
-	vertex			p;
-	cmeasure			*cmp;
-
-	fireball_data	*fd;
-
-	cmp = &Cmeasures[objp->instance];
-	fd = &Fireball_data[FIREBALL_SHIP_EXPLODE1];
-
-	switch (cmp->subtype) {
-	case CMEASURE_UNUSED:
-		Int3();	//	Hey, what are we doing in here?
-		break;
-	default:
-		framenum = (int) (fd->num_frames * Cmeasures[objp->instance].lifeleft*4) % fd->num_frames;
-		size = objp->radius;
-		break;
-	}
-
-	Assert(framenum != -1);
-	Assert(size != -1.0f);
-
-	gr_set_bitmap(fd->bitmap_id + framenum);
-	g3_rotate_vertex(&p, &objp->pos );
-	g3_draw_bitmap(&p, 0, size*0.5f, TMAP_FLAG_TEXTURED );
-*/
-}
-
 void cmeasure_delete( object * objp )
 {
 	int num;
@@ -340,15 +315,15 @@ void cmeasure_delete( object * objp )
 	Cmeasures[num].subtype = CMEASURE_UNUSED;
 	Num_cmeasures--;
 	Assert( Num_cmeasures >= 0 );
-}
+}*/

 // broke cmeasure_move into two functions -- process_pre and process_post (as was done with
 // all *_move functions).  Nothing to do for process_pre
-
+/*
 void cmeasure_process_pre( object *objp, float frame_time)
 {
-}
-
+}*/
+/*
 void cmeasure_process_post(object * objp, float frame_time)
 {
 	int num;
@@ -365,13 +340,12 @@ void cmeasure_process_post(object * objp, float frame_time)
 		}
 	}

-}
-
-float Skill_level_cmeasure_life_scale[NUM_SKILL_LEVELS] = {3.0f, 2.0f, 1.5f, 1.25f, 1.0f};
+}*/

 // creates one countermeasure.  A ship fires 1 of these per launch.  rand_val is used
 // in multiplayer.  If -1, then create a random number.  If non-negative, use this
 // number for static_rand functions
+/*
 int cmeasure_create( object * source_obj, vec3d * pos, int cm_type, int rand_val )
 {
 	int		n, objnum, parent_objnum, arand;
@@ -380,11 +354,6 @@ int cmeasure_create( object * source_obj, vec3d * pos, int cm_type, int rand_val
 	cmeasure	*cmp;
 	cmeasure_info	*cmeasurep;

-#ifndef NDEBUG
-	if (!Countermeasures_enabled || !Ai_firing_enabled)
-		return -1;
-#endif
-
 	Cmeasures_homing_check = 2;		//	Tell homing code to scan everything for two frames.  If only one frame, get sync problems due to objects being created at end of frame!

 	parent_objnum = OBJ_INDEX(source_obj);
@@ -423,7 +392,7 @@ int cmeasure_create( object * source_obj, vec3d * pos, int cm_type, int rand_val

 	cmp->lifeleft = static_randf(arand) * (cmeasurep->life_max - cmeasurep->life_min) / cmeasurep->life_min;
 	if (source_obj->flags & OF_PLAYER_SHIP){
-		cmp->lifeleft *= Skill_level_cmeasure_life_scale[Game_skill_level];
+		cmp->lifeleft *= The_mission.ai_profile->cmeasure_life_scale[Game_skill_level];
 	}
 	cmp->lifeleft = cmeasurep->life_min + cmp->lifeleft * (cmeasurep->life_max - cmeasurep->life_min);

@@ -442,47 +411,105 @@ int cmeasure_create( object * source_obj, vec3d * pos, int cm_type, int rand_val
 	
 	Num_cmeasures++;

+	//Set countermeasure velocity
 	vec3d vel, rand_vec;

+	//Get cmeasure rear velocity in world
 	vm_vec_scale_add(&vel, &source_obj->phys_info.vel, &source_obj->orient.vec.fvec, -25.0f);

+	//Get random velocity vector
 	static_randvec(arand+1, &rand_vec);

+	//Add it to the rear velocity
 	vm_vec_scale_add2(&vel, &rand_vec, 2.0f);

 	obj->phys_info.vel = vel;

 	vm_vec_zero(&obj->phys_info.rotvel);
+	vm_vec_zero(&obj->phys_info.max_vel);
+	vm_vec_zero(&obj->phys_info.max_rotvel);

 	// blow out his reverse thrusters. Or drag, same thing.
 	obj->phys_info.rotdamp = 10000.0f;
 	obj->phys_info.side_slip_time_const = 10000.0f;

-	vm_vec_zero(&obj->phys_info.max_vel);		// make so he can't turn on his own VOLITION anymore.
 	obj->phys_info.max_vel.xyz.z = -25.0f;
 	vm_vec_copy_scale(&obj->phys_info.desired_vel, &obj->orient.vec.fvec, obj->phys_info.max_vel.xyz.z );

-	vm_vec_zero(&obj->phys_info.max_rotvel);	// make so he can't change speed on his own VOLITION anymore.
-
-//	obj->phys_info.flags |= PF_USE_VEL;
-
 	return arand;										// need to return this value for multiplayer purposes
+}*/
+
+//Used to set a countermeasure velocity after being launched from a ship as a countermeasure
+//ie not as a primary or secondary.
+void cmeasure_set_ship_launch_vel(object *objp, object *parent_objp, int arand)
+{
+	vec3d vel, rand_vec;
+
+	//Get cmeasure rear velocity in world
+	vm_vec_scale_add(&vel, &parent_objp->phys_info.vel, &parent_objp->orient.vec.fvec, -25.0f);
+
+	//Get random velocity vector
+	static_randvec(arand+1, &rand_vec);
+
+	//Add it to the rear velocity
+	vm_vec_scale_add2(&vel, &rand_vec, 2.0f);
+
+	objp->phys_info.vel = vel;
+
+	//Zero out this stuff so it isn't moving
+	vm_vec_zero(&objp->phys_info.rotvel);
+	vm_vec_zero(&objp->phys_info.max_vel);
+	vm_vec_zero(&objp->phys_info.max_rotvel);
+	
+	//Idunnit. -WMC
+	//objp->phys_info.flags |= PF_CONST_VEL;
+
+	//WMC - I don't think this stuff is needed with the flag I set
+	//WMC - Or maybe it is.
+	
+	// blow out his reverse thrusters. Or drag, same thing.
+	objp->phys_info.rotdamp = 10000.0f;
+	objp->phys_info.side_slip_time_const = 10000.0f;
+
+	objp->phys_info.max_vel.xyz.z = -25.0f;
+	vm_vec_copy_scale(&objp->phys_info.desired_vel, &objp->orient.vec.fvec, objp->phys_info.max_vel.xyz.z );
 }

-void cmeasure_select_next(object *objp)
+void cmeasure_select_next(ship *shipp)
 {
-	ship	*shipp;
+	Assert(shipp != NULL);
+	int i, new_index;

-	Assert(objp->type == OBJ_SHIP);
+	for (i = 1; i < Num_weapon_types; i++)
+	{
+		new_index = (shipp->current_cmeasure + i) % Num_weapon_types;

-	shipp = &Ships[objp->instance];
-	shipp->current_cmeasure++;
-
-	if (shipp->current_cmeasure >= Num_cmeasure_types)
-		shipp->current_cmeasure = 0;
+		if(Weapon_info[new_index].wi_flags & WIF_CMEASURE)
+		{
+			shipp->current_cmeasure = new_index;
+			return;
+		}
+	}

 	//snd_play( &Snds[SND_CMEASURE_CYCLE] );

 	mprintf(("Countermeasure type set to %i in frame %i\n", shipp->current_cmeasure, Framecount));
 }

+// If this is a player countermeasure, let the player know he evaded a missile
+void cmeasure_maybe_alert_success(object *objp)
+{
+	//Is this a countermeasure, and does it have a parent
+	if ( objp->type != OBJ_WEAPON || objp->parent < 0) {
+		return;
+	}
+
+	Assert(Weapon_info[Weapons[objp->instance].weapon_info_index].wi_flags & WIF_CMEASURE);
+
+	if ( objp->parent == OBJ_INDEX(Player_obj) ) {
+		hud_start_text_flash(XSTR("Evaded", 1430), 800);
+		snd_play(&Snds[SND_MISSILE_EVADED_POPUP]);
+	} else if ( Objects[objp->parent].flags & OF_PLAYER_SHIP ) {
+		send_countermeasure_success_packet( objp->parent );
+	}
+}
@@ -9,13 +9,17 @@

 /*
 * $Logfile: /Freespace2/code/CMeasure/CMeasure.h $
- * $Revision: 2.5 $
- * $Date: 2005-07-13 02:50:50 $
- * $Author: Goober5000 $
+ * $Revision: 2.6 $
+ * $Date: 2005-12-04 19:07:48 $
+ * $Author: wmcoolmon $
 *
 * Counter measures.  Created by Mike Kulas, May 12, 1997.
 *
 * $Log: not supported by cvs2svn $
+ * Revision 2.5  2005/07/13 02:50:50  Goober5000
+ * remove PreProcDefine #includes in FS2
+ * --Goober5000
+ *
 * Revision 2.4  2005/04/05 05:53:15  taylor
 * s/vector/vec3d/g, better support for different compilers (Jens Granseuer)
 *
@@ -129,31 +133,32 @@
 #define _CMEASURE_H

 #include "globalincs/globals.h"
+#include "globalincs/systemvars.h"

 struct object;
-struct vec3d;
+//struct vec3d;

-#define MAX_CMEASURES 64
+//#define MAX_CMEASURES 64

 //	Goes in cmeasure.subtype
-#define	CMEASURE_UNUSED			-1
+//#define	CMEASURE_UNUSED			-1

-#define	MAX_CMEASURE_TYPES		3
+//#define	MAX_CMEASURE_TYPES		3

 #define	CMEASURE_WAIT				333			//	delay in milliseconds between countermeasure firing.

-#define	CMF_DUD_HEAT				0x01			//	If set, this cmeasure is a dud to heat seekers.  Set at create time.
-#define	CMF_DUD_ASPECT				0x02			//	If set, this cmeasure is a dud to aspect seekers.  Set at create time.
+//#define	CMF_DUD_HEAT				0x01			//	If set, this cmeasure is a dud to heat seekers.  Set at create time.
+//#define	CMF_DUD_ASPECT				0x02			//	If set, this cmeasure is a dud to aspect seekers.  Set at create time.

-#define	CMF_DUD	(CMF_DUD_HEAT | CMF_DUD_ASPECT)
+//#define	CMF_DUD	(CMF_DUD_HEAT | CMF_DUD_ASPECT)

 //	Maximum distance at which a countermeasure can be tracked
 //	If this value is too large, missiles will always be tracking countermeasures.
 #define	MAX_CMEASURE_TRACK_DIST	300.0f
-
+/*
 typedef struct cmeasure_info {
 	char	cmeasure_name[NAME_LENGTH];
-	float	max_speed;								// launch speed, relative to ship
+	//float	max_speed;								// launch speed, relative to ship
 	float	fire_wait;								//	time between launches
 	float	life_min, life_max;					//	lifetime will be in range min..max.
 	int	launch_sound;							//	Sound played when launched.
@@ -170,19 +175,24 @@ typedef struct cmeasure {
 	int		team;					// Team of the ship where the cmeasure came from
 	float		lifeleft;			// When 0 or less object dies
 } cmeasure;
-
-extern cmeasure_info Cmeasure_info[MAX_CMEASURE_TYPES];
-extern cmeasure Cmeasures[MAX_CMEASURES];
-extern int Num_cmeasure_types;
-extern int Num_cmeasures;
+*/
+//extern cmeasure_info Cmeasure_info[MAX_CMEASURE_TYPES];
+//extern cmeasure Cmeasures[MAX_CMEASURES];
+//extern int Num_cmeasure_types;
+//extern int Num_cmeasures;
 extern int Cmeasures_homing_check;
+extern int Countermeasures_enabled;

-extern void cmeasure_init();
-extern void cmeasure_render( object * obj );
-extern void cmeasure_delete( object * obj );
-extern void cmeasure_process_pre( object * obj, float frame_time);
-extern void cmeasure_process_post( object * obj, float frame_time);
-extern int cmeasure_create( object * source_obj, vec3d *pos, int cm_type, int rand_val = -1 );
+//extern void cmeasure_init();
+//extern void cmeasure_render( object * obj );
+//extern void cmeasure_delete( object * obj );
+//extern void cmeasure_process_pre( object * obj, float frame_time);
+//extern void cmeasure_process_post( object * obj, float frame_time);
+//extern int cmeasure_create( object * source_obj, vec3d *pos, int cm_type, int rand_val = -1 );
+extern void cmeasure_set_ship_launch_vel(object *objp, object *parent_objp, int arand);
 extern void cmeasure_select_next(object *objp);
+extern void cmeasure_maybe_alert_success(object *objp);
+
+extern float Skill_level_cmeasure_life_scale[NUM_SKILL_LEVELS];

 #endif // _CMEASURE_H
@@ -9,13 +9,21 @@

 /*
 * $Logfile: /Freespace2/code/ControlConfig/ControlsConfig.cpp $
- * $Revision: 2.17 $
- * $Date: 2005-07-22 10:18:37 $
- * $Author: Goober5000 $
+ * $Revision: 2.18.2.1 $
+ * $Date: 2007-12-28 02:10:35 $
+ * $Author: Backslash $
 *
 * C module for keyboard, joystick and mouse configuration
 *
 * $Log: not supported by cvs2svn $
+ * Revision 2.18  2005/10/10 17:14:30  taylor
+ * remove NO_NETWORK
+ * fix controlconfig so that axes can be set to joystick/mouse using the mouse (required when no joystick attached)
+ *
+ * Revision 2.17  2005/07/22 10:18:37  Goober5000
+ * CVS header tweaks
+ * --Goober5000
+ *
 * Revision 2.16  2005/07/13 02:50:50  Goober5000
 * remove PreProcDefine #includes in FS2
 * --Goober5000
@@ -382,11 +390,9 @@
 #include "popup/popup.h"
 #include "ui/uidefs.h"
 #include "globalincs/alphacolors.h"
-
-#ifndef NO_NETWORK
 #include "network/multi_pmsg.h"
 #include "network/multiutil.h"
-#endif
+

 #ifndef NDEBUG
 #include "hud/hud.h"
@@ -747,6 +753,7 @@ int control_config_detect_axis()
 {
 	int i, d, axis = -1, delta = 16384;
 	int axes_values[JOY_NUM_AXES];
+	int dx, dy, dz, fudge = 7;

 	joystick_read_raw_axis(JOY_NUM_AXES, axes_values);
 	for (i=0; i<JOY_NUM_AXES; i++) {
@@ -757,6 +764,18 @@ int control_config_detect_axis()
 		}
 	}

+	if ( (axis == -1) && Use_mouse_to_fly ) {
+		mouse_get_delta( &dx, &dy, &dz );
+
+		if ( (dx > fudge) || (dx < -fudge) ) {
+			axis = 0;
+		} else if ( (dy > fudge) || (dy < -fudge) ) {
+			axis = 1;
+		} else if ( (dz > fudge) || (dz < -fudge) ) {
+			axis = 2;
+		}
+	}
+		
 	return axis;
 }

@@ -1851,8 +1870,8 @@ void control_config_do_frame(float frametime)
 						break;
 				}

-				if (Cc_lines[Selected_line].cc_index == BANK_WHEN_PRESSED)  // a special hack just for Mike K.
-					if ( (Last_key >= 0) && (k <= 0) && !keyd_pressed[Last_key] )
+				if (Cc_lines[Selected_line].cc_index == BANK_WHEN_PRESSED || /*Cc_lines[Selected_line].cc_index == SLIDE_WHEN_PRESSED ||*/ Cc_lines[Selected_line].cc_index == GLIDE_WHEN_PRESSED)  // a special hack just for Mike K.
+					if ( (Last_key >= 0) && (k <= 0) && !keyd_pressed[Last_key] )	//Backslash - ok it's not just for Mike K. any more :-P  but seriously, this is so we can bind such controls to Shift or Alt.  Does this actually get used?
 						k = Last_key;

 				if ((k > 0) && !Config_allowed[k & KEY_MASK]) {
@@ -2472,12 +2491,10 @@ int check_control(int id, int key)

 	last_key = key;

-#ifndef NO_NETWORK
 	// if we're in multiplayer text enter (for chat) mode, check to see if we should ignore controls
 	if ((Game_mode & GM_MULTIPLAYER) && multi_ignore_controls()){
 		return 0;
 	}
-#endif

 	if (Control_config[id].type == CC_TYPE_CONTINUOUS) {
 		if (joy_down(Control_config[id].joy_id) || joy_down_count(Control_config[id].joy_id, 1)) {
@@ -9,13 +9,23 @@

 /*
 * $Logfile: /Freespace2/code/ControlConfig/ControlsConfig.h $
- * $Revision: 2.13 $
- * $Date: 2005-07-13 02:50:50 $
- * $Author: Goober5000 $
+ * $Revision: 2.15.2.1 $
+ * $Date: 2007-12-28 02:10:34 $
+ * $Author: Backslash $
 *
 * Header file for keyboard, joystick and mouse configuration
 *
 * $Log: not supported by cvs2svn $
+ * Revision 2.15  2006/02/25 21:46:59  Goober5000
+ * spelling
+ *
+ * Revision 2.14  2005/10/11 05:24:33  wmcoolmon
+ * Gliding
+ *
+ * Revision 2.13  2005/07/13 02:50:50  Goober5000
+ * remove PreProcDefine #includes in FS2
+ * --Goober5000
+ *
 * Revision 2.12  2005/07/13 02:30:52  Goober5000
 * removed autopilot #define
 * --Goober5000
@@ -52,7 +62,7 @@
 * fixed misspelling of "category" as "catagory"
 *
 * Revision 2.2  2002/10/19 19:29:27  bobboau
- * inital commit, trying to get most of my stuff into FSO, there should be most of my fighter beam, beam rendering, beam shield hit, ABtrails, and ssm stuff. one thing you should be happy to know is the beam texture tileing is now set in the beam section section of the weapon table entry
+ * initial commit, trying to get most of my stuff into FSO, there should be most of my fighter beam, beam rendering, beam shield hit, ABtrails, and ssm stuff. one thing you should be happy to know is the beam texture tileing is now set in the beam section section of the weapon table entry
 *
 * Revision 2.1  2002/10/17 20:40:50  randomtiger
 * Added ability to remove HUD ingame on keypress shift O
@@ -455,8 +465,10 @@ typedef struct config_item {

 #define XFER_SHIELD										81
 #define XFER_LASER										82
-#define SHOW_DAMAGE_POPUP								83 // AL: this binding should be removing next time the controls are reorganized
+//#define SHOW_DAMAGE_POPUP								83 // AL: this binding should be removing next time the controls are reorganized

+#define GLIDE_WHEN_PRESSED								83
+//Backslash -- this was a convenient place for Glide When Pressed, since Show Damage Popup isn't used
 #define BANK_WHEN_PRESSED								84
 #define SHOW_NAVMAP										85
 #define ADD_REMOVE_ESCORT								86
@@ -504,8 +516,11 @@ typedef struct config_item {
 #define AUTO_PILOT_TOGGLE								115
 #define NAV_CYCLE										116

+//Gliding
+#define TOGGLE_GLIDING									117
+
 // this should be the total number of control action defines above (or last define + 1)
-#define CCFG_MAX 117
+#define CCFG_MAX 118

 extern int Failed_key_index;
 extern int Invert_heading;
@@ -9,13 +9,27 @@

 /*
 * $Logfile: /Freespace2/code/ControlConfig/ControlsConfigCommon.cpp $
- * $Revision: 2.12 $
- * $Date: 2005-07-13 02:30:52 $
- * $Author: Goober5000 $
+ * $Revision: 2.14.2.2 $
+ * $Date: 2007-12-28 02:10:35 $
+ * $Author: Backslash $
 *
 * C module for keyboard, joystick and mouse configuration common stuff (between Fred and FreeSpace)
 *
 * $Log: not supported by cvs2svn $
+ * Revision 2.14.2.1  2006/07/20 01:51:20  Goober5000
+ * tweak control text
+ * --Goober5000
+ *
+ * Revision 2.14  2006/02/25 21:46:59  Goober5000
+ * spelling
+ *
+ * Revision 2.13  2005/10/11 05:24:33  wmcoolmon
+ * Gliding
+ *
+ * Revision 2.12  2005/07/13 02:30:52  Goober5000
+ * removed autopilot #define
+ * --Goober5000
+ *
 * Revision 2.11  2005/03/03 06:05:27  wmcoolmon
 * Merge of WMC's codebase. "Features and bugs, making Goober say "Grr!", as release would be stalled now for two months for sure"
 *
@@ -45,7 +59,7 @@
 * --Goober5000
 *
 * Revision 2.3  2002/10/19 19:29:27  bobboau
- * inital commit, trying to get most of my stuff into FSO, there should be most of my fighter beam, beam rendering, beam shield hit, ABtrails, and ssm stuff. one thing you should be happy to know is the beam texture tileing is now set in the beam section section of the weapon table entry
+ * initial commit, trying to get most of my stuff into FSO, there should be most of my fighter beam, beam rendering, beam shield hit, ABtrails, and ssm stuff. one thing you should be happy to know is the beam texture tileing is now set in the beam section section of the weapon table entry
 *
 * Revision 2.2  2002/10/17 20:40:50  randomtiger
 * Added ability to remove HUD ingame on keypress shift O
@@ -451,13 +465,13 @@ config_item Control_config[CCFG_MAX + 1] = {
 	{                           KEY_Y,				4,  TARGET_TAB,	true, "Target Ship in Reticle" },
 	{                           KEY_G,				-1, TARGET_TAB,	true, "Target Target's Nearest Attacker" },
 	{ KEY_ALTED	|					 KEY_Y,			-1, TARGET_TAB,	true, "Target Last Ship to Send Transmission" },
-	{ KEY_ALTED |               KEY_T,				-1, TARGET_TAB,	true, "Turn Off Auto-Targeting" },
+	{ KEY_ALTED |               KEY_T,				-1, TARGET_TAB,	true, "Turn Off Targeting" },

 	// targeting a ship's subsystem
 	{                           KEY_V,				-1, TARGET_TAB,	true, "Target Subsystem in Reticle" },
 	{                           KEY_S,				-1, TARGET_TAB,	true, "Target Next Subsystem" },
 	{             KEY_SHIFTED | KEY_S,				-1, TARGET_TAB,	true, "Target Previous Subsystem" },
-	{ KEY_ALTED |               KEY_S,				-1, TARGET_TAB,	true, "Turn Off Auto-Targeting of Subsystems" },
+	{ KEY_ALTED |               KEY_S,				-1, TARGET_TAB,	true, "Turn Off Targeting of Subsystems" },

 	// matching speed
 	{                           KEY_M,				-1, COMPUTER_TAB,	true, "Match Target Speed" },
@@ -494,15 +508,15 @@ config_item Control_config[CCFG_MAX + 1] = {
 	{             KEY_SHIFTED | KEY_A,				-1, COMPUTER_TAB,	true, "Attack My Target" },
 	{             KEY_SHIFTED | KEY_Z,				-1, COMPUTER_TAB,	true, "Disarm My Target" },
 	{             KEY_SHIFTED | KEY_D,				-1, COMPUTER_TAB,	true, "Disable My Target" },
-	{             KEY_SHIFTED | KEY_V,				-1, COMPUTER_TAB,	true, "Attack my Subsystem" },
+	{             KEY_SHIFTED | KEY_V,				-1, COMPUTER_TAB,	true, "Attack My Subsystem" },
 	{             KEY_SHIFTED | KEY_X,				-1, COMPUTER_TAB,	true, "Capture My Target" },
 	{             KEY_SHIFTED | KEY_E,				-1, COMPUTER_TAB,	true, "Engage Enemy" },
-	{             KEY_SHIFTED | KEY_W,				-1, COMPUTER_TAB,	true, "Form on my Wing" },
-	{             KEY_SHIFTED | KEY_I,				-1, COMPUTER_TAB,	true, "Ignore my Target" },
-	{             KEY_SHIFTED | KEY_P,				-1, COMPUTER_TAB,	true, "Protect my Target" },
-	{             KEY_SHIFTED | KEY_C,				-1, COMPUTER_TAB,	true, "Cover me" },
-	{             KEY_SHIFTED | KEY_J,				-1, COMPUTER_TAB,	true, "Return to base" },
-	{				  KEY_SHIFTED | KEY_R,			-1, COMPUTER_TAB, true, "Rearm me" },
+	{             KEY_SHIFTED | KEY_W,				-1, COMPUTER_TAB,	true, "Form on My Wing" },
+	{             KEY_SHIFTED | KEY_I,				-1, COMPUTER_TAB,	true, "Ignore My Target" },
+	{             KEY_SHIFTED | KEY_P,				-1, COMPUTER_TAB,	true, "Protect My Target" },
+	{             KEY_SHIFTED | KEY_C,				-1, COMPUTER_TAB,	true, "Cover Me" },
+	{             KEY_SHIFTED | KEY_J,				-1, COMPUTER_TAB,	true, "Return to Base" },
+	{				  KEY_SHIFTED | KEY_R,			-1, COMPUTER_TAB, true, "Rearm Me" },

 	{									 KEY_R,		6,  TARGET_TAB,	true, "Target Closest Attacking Ship" },

@@ -510,7 +524,7 @@ config_item Control_config[CCFG_MAX + 1] = {
 	{                           KEY_PADMULTIPLY,	-1, COMPUTER_TAB,	true, "Chase View" },
 	{                           KEY_PADPERIOD,		-1, COMPUTER_TAB,	true, "External View"},
 	{                           KEY_PADENTER,		-1, COMPUTER_TAB,	true, "Toggle External Camera Lock"},
-	{                           KEY_PAD0,			-1, COMPUTER_TAB,	true, "Free Look View", CC_TYPE_CONTINUOUS },
+	{                           KEY_PAD0,			-1, COMPUTER_TAB,	true, "Free Look View", CC_TYPE_CONTINUOUS }, // Not in use anymore (Swifty)
 	{                           KEY_PADDIVIDE,		-1, COMPUTER_TAB,	true, "Current Target View" },
 	{                           KEY_PADPLUS,		-1, COMPUTER_TAB,	true, "Increase View Distance", CC_TYPE_CONTINUOUS },
 	{                           KEY_PADMINUS,		-1, COMPUTER_TAB,	true, "Decrease View Distance", CC_TYPE_CONTINUOUS },
@@ -535,17 +549,19 @@ config_item Control_config[CCFG_MAX + 1] = {
 	{                           KEY_PAGEDOWN,		-1, COMPUTER_TAB,	true, "Decrease Engine Energy" },
 	{ KEY_ALTED |               KEY_D,				-1, COMPUTER_TAB, true, "Equalize Energy Settings" },

-	{                           KEY_Q,				7,  COMPUTER_TAB,	true, "Equalize Shield" },
+	{                           KEY_Q,				7,  COMPUTER_TAB,	true, "Equalize Shields" },
 	{                           KEY_UP,				-1, COMPUTER_TAB,	true, "Augment Forward Shield" },
 	{                           KEY_DOWN,			-1, COMPUTER_TAB,	true, "Augment Rear Shield" },
 	{                           KEY_LEFT,			-1, COMPUTER_TAB,	true, "Augment Left Shield" },
 	{                           KEY_RIGHT,			-1, COMPUTER_TAB,	true, "Augment Right Shield" },
 	{                           KEY_SCROLLOCK,	-1, COMPUTER_TAB,	true, "Transfer Energy Laser->Shield" },
 	{             KEY_SHIFTED | KEY_SCROLLOCK,	-1, COMPUTER_TAB,	true, "Transfer Energy Shield->Laser" },
-	{                           -1,					-1, -1,				true, "Show Damage Popup Window" },	
+//	{                           -1,					-1, -1,				true, "Show Damage Popup Window" },	

+	{							-1,					-1, SHIP_TAB,		false, "Glide When Pressed", CC_TYPE_CONTINUOUS },
+//Backslash -- this was a convenient place for Glide When Pressed, as Show Damage Popup isn't used
 	{                           -1,					-1, SHIP_TAB,		true, "Bank When Pressed", CC_TYPE_CONTINUOUS },
-	{									 -1,					-1, -1,				true, "Show NavMap" },
+	{									 -1,					-1, -1,				true, "Show Nav Map" },
 	{ KEY_ALTED |	             KEY_E,				-1, COMPUTER_TAB,	true, "Add or Remove Escort" },
 	{ KEY_ALTED | KEY_SHIFTED | KEY_E,				-1, COMPUTER_TAB,	true, "Clear Escort List" },
 	{					             KEY_E,				-1, TARGET_TAB,	true, "Target Next Escort Ship" },
@@ -553,7 +569,7 @@ config_item Control_config[CCFG_MAX + 1] = {

 	{                           KEY_U,				-1, TARGET_TAB,	true, "Target Next Uninspected Cargo" },
 	{             KEY_SHIFTED | KEY_U,				-1, TARGET_TAB,	true, "Target Previous Uninspected Cargo" },
-	{									 KEY_N,		-1, TARGET_TAB,	true, "Target Newest Ship In Area" },
+	{									 KEY_N,		-1, TARGET_TAB,	true, "Target Newest Ship in Area" },
 	{                           KEY_K,				-1, TARGET_TAB,	true, "Target Next Live Turret" },
 	{             KEY_SHIFTED | KEY_K,				-1, TARGET_TAB,	true, "Target Previous Live Turret" },

@@ -565,15 +581,12 @@ config_item Control_config[CCFG_MAX + 1] = {
 	{									 KEY_2,				-1, COMPUTER_TAB, true, "(Multiplayer) Message Friendly", CC_TYPE_CONTINUOUS },
 	{									 KEY_3,				-1, COMPUTER_TAB, true, "(Multiplayer) Message Hostile", CC_TYPE_CONTINUOUS },
 	{									 KEY_4,				-1, COMPUTER_TAB, true, "(Multiplayer) Message Target", CC_TYPE_CONTINUOUS },
-	{ KEY_ALTED	|					 KEY_X,				-1, COMPUTER_TAB, true, "(Multiplayer) Observer zoom to target"},	
-
-	{             KEY_SHIFTED | KEY_PERIOD,		-1, COMPUTER_TAB,	true, "Increase time compression" },
-	{             KEY_SHIFTED | KEY_COMMA,			-1, COMPUTER_TAB,	true, "Decrease time compression" },
-
-	{									 KEY_L,				-1, COMPUTER_TAB, true, "Toggle high HUD contrast" },	
-
-	{				  KEY_SHIFTED | KEY_N,				-1, COMPUTER_TAB, true, "(Multiplayer) Toggle network info"},
-	{				  KEY_SHIFTED | KEY_END,			-1, COMPUTER_TAB, true, "(Multiplayer) Self destruct"},
+	{ KEY_ALTED	|					 KEY_X,				-1, COMPUTER_TAB, true, "(Multiplayer) Observer Zoom to Target"},	
+	{             KEY_SHIFTED | KEY_PERIOD,		-1, COMPUTER_TAB,	true, "Increase Time Compression" },
+	{             KEY_SHIFTED | KEY_COMMA,			-1, COMPUTER_TAB,	true, "Decrease Time Compression" },
+	{									 KEY_L,				-1, COMPUTER_TAB, true, "Toggle High HUD Contrast" },	
+	{				  KEY_SHIFTED | KEY_N,				-1, COMPUTER_TAB, true, "(Multiplayer) Toggle Network Info"},
+	{				  KEY_SHIFTED | KEY_END,			-1, COMPUTER_TAB, true, "(Multiplayer) Self Destruct"},

 	// Misc
 	{				  KEY_SHIFTED | KEY_O,			-1, COMPUTER_TAB, true, "Toggle HUD"},
@@ -581,14 +594,13 @@ config_item Control_config[CCFG_MAX + 1] = {
 	{				  KEY_SHIFTED | KEY_1,			-1, SHIP_TAB, true, "Left Thrust", CC_TYPE_CONTINUOUS},
 	{				  KEY_SHIFTED | KEY_PADPLUS,	-1, SHIP_TAB, true, "Up Thrust", CC_TYPE_CONTINUOUS},
 	{				  KEY_SHIFTED | KEY_PADENTER,	-1, SHIP_TAB, true, "Down Thrust", CC_TYPE_CONTINUOUS},
-	{ KEY_ALTED |     KEY_SHIFTED | KEY_Q,			-1, COMPUTER_TAB, true, "Toggle HUD Wireframe Targetbox"},
-	{							-1,					-1,	COMPUTER_TAB, false, "Top-down View"},
-	{							-1,					-1, COMPUTER_TAB, false, "Track targeted object", CC_TYPE_CONTINUOUS},
-
+	{ KEY_ALTED |     KEY_SHIFTED | KEY_Q,			-1, COMPUTER_TAB, true, "Toggle HUD Wireframe Target View"},
+	{							-1,					-1,	COMPUTER_TAB, false, "Top-Down View"},
+	{							-1,					-1, COMPUTER_TAB, false, "Target Padlock View"}, // (Swifty) Toggle for VM_TRACK
 	// Auto Navigation Systen
 	{ KEY_ALTED |					KEY_A,			-1, COMPUTER_TAB, false, "Toggle Auto Pilot"},
 	{ KEY_ALTED |					KEY_N,			-1, COMPUTER_TAB, false, "Cycle Nav Points"},
-
+	{ KEY_ALTED |					KEY_G,			-1, SHIP_TAB, false, "Toggle Gliding"},
 	{                           -1,					-1, -1,			 false,	"" }
 };

@@ -875,8 +887,10 @@ char *textify_scancode(int code)
 	if (code < 0)
 		return "None";

+	int keycode = code & KEY_MASK;
+
 	*text = 0;
-	if (code & KEY_ALTED) {
+	if (code & KEY_ALTED && !(keycode == KEY_LALT || keycode == KEY_RALT)) {
 		if(Lcl_gr){		
 			strcat(text, "Alt-");
 		} else if(Lcl_fr){		
@@ -886,7 +900,7 @@ char *textify_scancode(int code)
 		}		
 	}

-	if (code & KEY_SHIFTED) {		
+	if (code & KEY_SHIFTED && !(keycode == KEY_LSHIFT || keycode == KEY_RSHIFT)) {		
 		if(Lcl_gr){
 			strcat(text, "Shift-");
 		} else if(Lcl_fr){		
@@ -896,7 +910,7 @@ char *textify_scancode(int code)
 		}
 	}

-	strcat(text, Scan_code_text[code & KEY_MASK]);
+	strcat(text, Scan_code_text[keycode]);
 	return text;
 }
 //XSTR:ON
@@ -9,16 +9,32 @@

 /*
 * $Logfile: /Freespace2/code/Cutscene/Cutscenes.cpp $
- * $Revision: 2.17 $
- * $Date: 2005-07-02 19:42:14 $
- * $Author: taylor $
- * $Revision: 2.17 $
- * $Date: 2005-07-02 19:42:14 $
- * $Author: taylor $
+ * $Revision: 2.18.2.4 $
+ * $Date: 2007-09-02 02:07:39 $
+ * $Author: Goober5000 $
+ * $Revision: 2.18.2.4 $
+ * $Date: 2007-09-02 02:07:39 $
+ * $Author: Goober5000 $
 *
 * Code for the cutscenes viewer screen
 *
 * $Log: not supported by cvs2svn $
+ * Revision 2.18.2.3  2007/03/22 20:54:00  taylor
+ * give a better msg when movies can't play because they are user-disabled with the cmdline option
+ *
+ * Revision 2.18.2.2  2007/02/09 23:58:28  taylor
+ * add the "show all" hotkey to the cutscene viewer
+ *
+ * Revision 2.18.2.1  2006/09/11 01:15:04  taylor
+ * fixes for stuff_string() bounds checking
+ *
+ * Revision 2.18  2006/05/09 09:21:15  taylor
+ * fix incorrect button locations, it matches the correct layout of the other techroom screens now
+ *    (thought Backslash was going to fix this, but I got tired of waiting. :))
+ *
+ * Revision 2.17  2005/07/02 19:42:14  taylor
+ * ton of non-standard resolution fixes
+ *
 * Revision 2.16  2005/05/12 17:49:11  taylor
 * use vm_malloc(), vm_free(), vm_realloc(), vm_strdup() rather than system named macros
 *   fixes various problems and is past time to make the switch
@@ -239,6 +255,9 @@
 #include "parse/parselo.h"


+extern int Cmdline_nomovies;
+
+
 char *Cutscene_bitmap_name[GR_NUM_RESOLUTIONS] = {
 	"ViewFootage",
 	"2_ViewFootage"
@@ -248,53 +267,71 @@ char *Cutscene_mask_name[GR_NUM_RESOLUTIONS] = {
 	"2_ViewFootage-m"
 };

-int Num_cutscenes;
+using std::vector;
+
+size_t Num_cutscenes;
 int Cutscenes_viewable;
 int Description_index;
-cutscene_info Cutscenes[MAX_CUTSCENES];
+vector<cutscene_info> Cutscenes;

 //extern int All_movies_enabled;		//	If set, all movies may be viewed.  Keyed off cheat code.
-void cutsceen_close(){
-	for(int i = 0; i<MAX_CUTSCENES; i++)
-	if(Cutscenes[i].description)vm_free(Cutscenes[i].description);
+void cutscene_close()
+{
+	for(size_t i = 0; i < Num_cutscenes; i++)
+    {
+	    if(Cutscenes[i].description)
+        {
+            vm_free(Cutscenes[i].description);
+        }
+    }
 }

 // initialization stuff for cutscenes
 void cutscene_init()
 {
-	atexit(cutsceen_close);
+	atexit(cutscene_close);
 	char buf[MULTITEXT_LENGTH];
 	int rval;
-
-	if ((rval = setjmp(parse_abort)) != 0) {
-		Error(LOCATION, "Error parsing 'rank.tbl'\r\nError code = %i.\r\n", rval);
-	} 
+    cutscene_info cutinfo;

 	// open localization
 	lcl_ext_open();

-	read_file_text("cutscenes.tbl");
+	if ((rval = setjmp(parse_abort)) != 0) {
+		mprintf(("TABLES: Unable to parse '%s'!  Error code = %i.\n", "cutscenes.tbl", rval));
+		lcl_ext_close();
+		return;
+	}
+
+	read_file_text("cutscenes.tbl", CF_TYPE_TABLES);
 	reset_parse();

-	// parse in all the rank names
+	// parse in all the cutscenes
 	Num_cutscenes = 0;
 	skip_to_string("#Cutscenes");
 	ignore_white_space();
-	while ( required_string_either("#End", "$Filename:") ) {
-		Assert ( Num_cutscenes < MAX_CUTSCENES );
+
+	while ( required_string_either("#End", "$Filename:") ) 
+    {
+        memset(&cutinfo, 0, sizeof(cutscene_info));
+
 		required_string("$Filename:");
-		stuff_string( Cutscenes[Num_cutscenes].filename, F_PATHNAME, NULL );
+		stuff_string( cutinfo.filename, F_PATHNAME, MAX_FILENAME_LEN );
+
 		required_string("$Name:");
-		stuff_string( Cutscenes[Num_cutscenes].name, F_NAME, NULL );
+		stuff_string( cutinfo.name, F_NAME, NAME_LENGTH );
+
 		required_string("$Description:");
-		stuff_string(buf, F_MULTITEXT, NULL);
+		stuff_string(buf, F_MULTITEXT, sizeof(buf));
 		drop_white_space(buf);
 		compact_multitext_string(buf);
-		Cutscenes[Num_cutscenes].description = vm_strdup(buf);
-		required_string("$cd:");
-		stuff_int( &Cutscenes[Num_cutscenes].cd );
+		cutinfo.description = vm_strdup(buf);

-		Num_cutscenes++;
+		required_string("$cd:");
+		stuff_int( &cutinfo.cd );
+
+        Cutscenes.push_back(cutinfo);
+        Num_cutscenes++;
 	}

 	required_string("#End");
@@ -312,7 +349,7 @@ int cutscenes_get_cd_num( char *filename )
 #if defined(OEM_BUILD)
 	return 0;				// only 1 cd for OEM
 #else
-	int i;
+	size_t i;

 	for (i = 0; i < Num_cutscenes; i++ ) {
 		if ( !stricmp(Cutscenes[i].filename, filename) ) {
@@ -327,7 +364,7 @@ int cutscenes_get_cd_num( char *filename )
 // marks a cutscene as viewable
 void cutscene_mark_viewable(char *filename)
 {
-	int i;
+	size_t i;
 	char cut_file[MAX_FILENAME_LEN];
 	char file[MAX_FILENAME_LEN];

@@ -369,7 +406,7 @@ void cutscene_mark_viewable(char *filename)
 #define EXIT_BUTTON				7

 static int Num_files;
-static int Cutscene_list[MAX_CUTSCENES];
+static vector<int> Cutscene_list;
 //static int Stats_scroll_offset;  // not used - taylor
 static int Selected_line = 0;  // line that is currently selected for binding
 static int Scroll_offset;
@@ -379,8 +416,8 @@ static UI_WINDOW Ui_window;

 static ui_button_info Buttons[GR_NUM_RESOLUTIONS][NUM_BUTTONS] = {
 	{ // GR_640
-		ui_button_info("TDB_00",	7,		5,		37,	7,		0),			// tech database 1
-		ui_button_info("TDB_01",	7,		19,	37,	23,	1),			// tech database 2
+		ui_button_info("TDB_00",	7,		3,		37,	7,		0),			// tech database 1
+		ui_button_info("TDB_01",	7,		18,	37,	23,	1),			// tech database 2
 		ui_button_info("TDB_02",	7,		34,	37,	38,	2),			// tech database 3
 		ui_button_info("TDB_03",	7,		49,	37,	54,	3),			// tech database 4

@@ -390,7 +427,7 @@ static ui_button_info Buttons[GR_NUM_RESOLUTIONS][NUM_BUTTONS] = {
 		ui_button_info("VFB_07",	574,	431,	587,	413,	7),			// exit
 	},
 	{ // GR_1024
-		ui_button_info("2_TDB_00",	12,	7,		59,	12,	0),			// tech database 1
+		ui_button_info("2_TDB_00",	12,	5,		59,	12,	0),			// tech database 1
 		ui_button_info("2_TDB_01",	12,	31,	59,	37,	1),			// tech database 2
 		ui_button_info("2_TDB_02",	12,	56,	59,	62,	2),			// tech database 3
 		ui_button_info("2_TDB_03",	12,	81,	59,	88,	3),			// tech database 4
@@ -539,13 +576,18 @@ void cutscenes_screen_play()
 //	full_name = cf_add_ext(name, NOX(".mve"));

 	main_hall_stop_music();
+	main_hall_stop_ambient();
 	int rval = movie_play(name);
 	main_hall_start_music();

 	if ( !rval ) {
 		char str[256];

-		sprintf(str, XSTR( "Unable to play movie %s.", 204), Cutscenes[which_cutscene].name );
+		if (Cmdline_nomovies)
+			sprintf(str, XSTR("Movies are currently disabled.", -1));
+		else
+			sprintf(str, XSTR("Unable to play movie %s.", 204), Cutscenes[which_cutscene].name);
+
 		popup(0, 1, POPUP_OK, str );
 	}
 	
@@ -660,6 +702,7 @@ int cutscenes_screen_button_pressed(int n)
 void cutscenes_screen_init()
 {
 	int i;
+    size_t j;
 	ui_button_info *b;

 	Ui_window.create(0, 0, gr_screen.max_w_unscaled, gr_screen.max_h_unscaled, 0);
@@ -704,9 +747,10 @@ void cutscenes_screen_init()
 //  		Cutscenes_viewable = 0xffffffff;		//	Cheat code enables all movies.

 	Num_files = 0;
-	for ( i = 0; i < Num_cutscenes; i++ ) {
-		if ( Cutscenes_viewable & (1<<i) ) {
-			Cutscene_list[Num_files] = i;
+    Cutscene_list.clear();
+	for ( j = 0; j < Num_cutscenes; j++ ) {
+		if ( Cutscenes_viewable & (1<<j) ) {
+            Cutscene_list.push_back((int)j);
 			Num_files++;
 		}
 	}
@@ -723,6 +767,7 @@ void cutscenes_screen_close()
 void cutscenes_screen_do_frame()
 {
 	int i, k, y, z;
+    size_t t;
 	int font_height = gr_get_font_height();
 	int select_tease_line = -1;

@@ -761,6 +806,19 @@ void cutscenes_screen_do_frame()
 		case KEY_F2:  // goto options screen
 			gameseq_post_event(GS_EVENT_OPTIONS_MENU);
 			break;
+
+		// the "show-all" hotkey
+		case KEY_CTRLED | KEY_SHIFTED | KEY_S:
+		{
+			Num_files = 0;
+            Cutscene_list.clear();
+			for (t = 0; t < Num_cutscenes; t++) {
+                Cutscene_list.push_back((int)t);
+				Num_files++;
+			}
+
+			break;
+		}
 	}	// end switch

 	for (i=0; i<NUM_BUTTONS; i++){
@@ -65,8 +65,7 @@

 #include "globalincs/globals.h"
 #include "globalincs/pstypes.h"
-
-#define MAX_CUTSCENES	10
+#include <vector>

 // this cutscene is always available.
 #define INTRO_CUTSCENE_FLAG		(1<<0)
@@ -79,8 +78,8 @@ typedef struct cutscene_info
 	int		cd;
 } cutscene_info;

-extern cutscene_info Cutscenes[MAX_CUTSCENES];
-extern int Num_cutscenes;
+extern std::vector<cutscene_info> Cutscenes;
+extern size_t Num_cutscenes;
 extern int Cutscenes_viewable;

 // initializa table data
@@ -0,0 +1,669 @@
+/*
+ * $Logfile: /Freespace2/src/cutscene/decoder16.cpp $
+ * $Revision: 2.1.2.1 $
+ * $Date: 2006-08-19 04:14:57 $
+ * $Author: taylor $
+ *
+ * decoder for 16-bit MVE image data
+ *
+ * $Log: not supported by cvs2svn $
+ * Revision 2.1  2006/05/13 06:59:48  taylor
+ * MVE player (audio only works with OpenAL builds!)
+ *
+ *
+ * $NoKeywords: $
+ *
+ */
+
+#include "globalincs/pstypes.h"
+
+extern int g_width, g_height;
+extern void *g_vBackBuf1, *g_vBackBuf2;
+
+/* 16 bit decoding routines */
+
+static ushort *backBuf1, *backBuf2;
+static int lookup_initialized;
+
+static void dispatchDecoder16(ushort **pFrame, unsigned char codeType, unsigned char **pData, unsigned char **pOffData, int *pDataRemain, int *curXb, int *curYb);
+static void genLoopkupTable();
+
+void decodeFrame16(unsigned char *pFrame, unsigned char *pMap, int mapRemain, unsigned char *pData, int dataRemain)
+{
+	unsigned char *pOrig;
+	unsigned char *pOffData, *pEnd;
+	ushort offset;
+	int length;
+	int op;
+	int i, j;
+	int xb, yb;
+
+	if (!lookup_initialized) {
+		genLoopkupTable();
+	}
+
+	backBuf1 = (ushort *)g_vBackBuf1;
+	backBuf2 = (ushort *)g_vBackBuf2;
+
+	xb = g_width >> 3;
+	yb = g_height >> 3;
+
+	offset = pData[0]|(pData[1]<<8);
+
+	pOffData = pData + offset;
+	pEnd = pData + offset;
+
+	pData += 2;
+
+	pOrig = pData;
+	length = offset - 2; /*dataRemain-2;*/
+
+	for (j=0; j<yb; j++) {
+		for (i=0; i<xb/2; i++) {
+			op = (*pMap) & 0xf;
+			dispatchDecoder16((ushort **)&pFrame, op, &pData, &pOffData, &dataRemain, &i, &j);
+
+			op = ((*pMap) >> 4) & 0xf;
+			dispatchDecoder16((ushort **)&pFrame, op, &pData, &pOffData, &dataRemain, &i, &j);
+
+			pMap++;
+			mapRemain--;
+		}
+
+		pFrame += 7*g_width*2;
+	}
+
+	if ((length-(pData-pOrig)) != 0) {
+		nprintf(("MVE", "DEBUG: junk left over: %d,%d,%d\n", (pData-pOrig), length, (length-(pData-pOrig))));
+	}
+}
+
+static ushort GETPIXEL(unsigned char **buf, int off)
+{
+	ushort val = (*buf)[0+off] | ((*buf)[1+off] << 8);
+	return val;
+}
+
+static ushort GETPIXELI(unsigned char **buf, int off)
+{
+	ushort val = (*buf)[0+off] | ((*buf)[1+off] << 8);
+	(*buf) += 2;
+	return val;
+}
+
+static void relClose(int i, int *x, int *y)
+{
+	int ma, mi;
+
+	ma = i >> 4;
+	mi = i & 0xf;
+
+	*x = mi - 8;
+	*y = ma - 8;
+}
+
+static void relFar(int i, int sign, int *x, int *y)
+{
+	if (i < 56) {
+		*x = sign * (8 + (i % 7));
+		*y = sign *	  (i / 7);
+	} else {
+		*x = sign * (-14 + (i - 56) % 29);
+		*y = sign *   (8 + (i - 56) / 29);
+	}
+}
+
+static int close_table[512];
+static int far_p_table[512];
+static int far_n_table[512];
+
+static void genLoopkupTable()
+{
+	int i;
+	int x, y;
+
+	for (i = 0; i < 256; i++) {
+		relClose(i, &x, &y);
+
+		close_table[i*2+0] = x;
+		close_table[i*2+1] = y;
+
+		relFar(i, 1, &x, &y);
+
+		far_p_table[i*2+0] = x;
+		far_p_table[i*2+1] = y;
+
+		relFar(i, -1, &x, &y);
+
+		far_n_table[i*2+0] = x;
+		far_n_table[i*2+1] = y;
+	}
+
+	lookup_initialized = 1;
+}
+
+static void copyFrame(ushort *pDest, ushort *pSrc)
+{
+	int i;
+
+	for (i=0; i<8; i++) {
+		memcpy(pDest, pSrc, 16);
+		pDest += g_width;
+		pSrc += g_width;
+	}
+}
+
+static void patternRow4Pixels(ushort *pFrame, unsigned char pat0, unsigned char pat1, ushort *p)
+{
+	ushort mask=0x0003;
+	ushort shift=0;
+	ushort pattern = (pat1 << 8) | pat0;
+
+	while (mask != 0) {
+		*pFrame++ = p[(mask & pattern) >> shift];
+		mask <<= 2;
+		shift += 2;
+	}
+}
+
+static void patternRow4Pixels2(ushort *pFrame, unsigned char pat0, ushort *p)
+{
+	unsigned char mask=0x03;
+	unsigned char shift=0;
+	ushort pel;
+/* ORIGINAL VERSION IS BUGGY
+	int skip=1;
+
+	while (mask != 0) {
+		pel = p[(mask & pat0) >> shift];
+		pFrame[0] = pel;
+		pFrame[2] = pel;
+		pFrame[g_width + 0] = pel;
+		pFrame[g_width + 2] = pel;
+		pFrame += skip;
+		skip = 4 - skip;
+		mask <<= 2;
+		shift += 2;
+	}
+*/
+	while (mask != 0) {
+		pel = p[(mask & pat0) >> shift];
+		pFrame[0] = pel;
+		pFrame[1] = pel;
+		pFrame[g_width + 0] = pel;
+		pFrame[g_width + 1] = pel;
+		pFrame += 2;
+		mask <<= 2;
+		shift += 2;
+	}
+}
+
+static void patternRow4Pixels2x1(ushort *pFrame, unsigned char pat, ushort *p)
+{
+	unsigned char mask=0x03;
+	unsigned char shift=0;
+	ushort pel;
+
+	while (mask != 0) {
+		pel = p[(mask & pat) >> shift];
+		pFrame[0] = pel;
+		pFrame[1] = pel;
+		pFrame += 2;
+		mask <<= 2;
+		shift += 2;
+	}
+}
+
+static void patternQuadrant4Pixels(ushort *pFrame, unsigned char pat0, unsigned char pat1, unsigned char pat2, unsigned char pat3, ushort *p)
+{
+	unsigned long mask = 0x00000003UL;
+	int shift=0;
+	int i;
+	unsigned long pat = (pat3 << 24) | (pat2 << 16) | (pat1 << 8) | pat0;
+
+	for (i=0; i<16; i++) {
+		pFrame[i&3] = p[(pat & mask) >> shift];
+
+		if ((i&3) == 3)
+			pFrame += g_width;
+
+		mask <<= 2;
+		shift += 2;
+	}
+}
+
+static void patternRow2Pixels(ushort *pFrame, unsigned char pat, ushort *p)
+{
+	unsigned char mask=0x01;
+
+	while (mask != 0) {
+		*pFrame++ = p[(mask & pat) ? 1 : 0];
+		mask <<= 1;
+	}
+}
+
+static void patternRow2Pixels2(ushort *pFrame, unsigned char pat, ushort *p)
+{
+	ushort pel;
+	unsigned char mask=0x1;
+
+/* ORIGINAL VERSION IS BUGGY
+	int skip=1;
+	while (mask != 0x10) {
+		pel = p[(mask & pat) ? 1 : 0];
+		pFrame[0] = pel;
+		pFrame[2] = pel;
+		pFrame[g_width + 0] = pel;
+		pFrame[g_width + 2] = pel;
+		pFrame += skip;
+		skip = 4 - skip;
+		mask <<= 1;
+	}
+*/
+	while (mask != 0x10) {
+		pel = p[(mask & pat) ? 1 : 0];
+
+		pFrame[0] = pel;
+		pFrame[1] = pel;
+		pFrame[g_width + 0] = pel;
+		pFrame[g_width + 1] = pel;
+		pFrame += 2;
+
+		mask <<= 1;
+	}
+}
+
+static void patternQuadrant2Pixels(ushort *pFrame, unsigned char pat0, unsigned char pat1, ushort *p)
+{
+	ushort mask = 0x0001;
+	int i;
+	ushort pat = (pat1 << 8) | pat0;
+
+	for (i=0; i<16; i++) {
+		pFrame[i&3] = p[(pat & mask) ? 1 : 0];
+
+		if ((i&3) == 3)
+			pFrame += g_width;
+
+		mask <<= 1;
+	}
+
+}
+
+static void dispatchDecoder16(ushort **pFrame, unsigned char codeType, unsigned char **pData, unsigned char **pOffData, int *pDataRemain, int *curXb, int *curYb)
+{
+	ushort p[4];
+	unsigned char pat[16];
+	int i, j, k;
+	int x, y;
+	ushort *pDstBak;
+
+	pDstBak = *pFrame;
+
+	switch(codeType) {
+		case 0x0:
+			copyFrame(*pFrame, *pFrame + (backBuf2 - backBuf1));
+			break; // ADDED
+
+		case 0x1:
+			break;
+
+		case 0x2:
+			/* relFar(*(*pOffData)++, 1, &x, &y); */
+
+			k = *(*pOffData)++;
+			x = far_p_table[k*2+0];
+			y = far_p_table[k*2+1];
+
+			copyFrame(*pFrame, *pFrame + x + y*g_width);
+			*pDataRemain--;
+			break;
+
+		case 0x3:
+			/* relFar(*(*pOffData)++, -1, &x, &y); */
+
+			k = *(*pOffData)++;
+			x = far_n_table[k*2+0];
+			y = far_n_table[k*2+1];
+
+			copyFrame(*pFrame, *pFrame + x + y*g_width);
+			*pDataRemain--;				  
+			break;
+
+		case 0x4:
+			/* relClose(*(*pOffData)++, &x, &y); */
+
+			k = *(*pOffData)++;
+			x = close_table[k*2+0];
+			y = close_table[k*2+1];
+
+			copyFrame(*pFrame, *pFrame + (backBuf2 - backBuf1) + x + y*g_width);
+			*pDataRemain--;
+			break;
+
+		case 0x5:
+			x = (char)*(*pData)++;
+			y = (char)*(*pData)++;
+			copyFrame(*pFrame, *pFrame + (backBuf2 - backBuf1) + x + y*g_width);
+			*pDataRemain -= 2;
+			break;
+
+		case 0x6:
+			nprintf(("MVE", "STUB: encoding 6 not tested\n"));
+
+			for (i=0; i<2; i++) {
+				*pFrame += 16;
+
+				if (++*curXb == (g_width >> 3)) {
+					*pFrame += 7*g_width;
+					*curXb = 0;
+
+					if (++*curYb == (g_height >> 3))
+						return;
+				}
+			}
+			break;
+
+		case 0x7:
+			p[0] = GETPIXELI(pData, 0);
+			p[1] = GETPIXELI(pData, 0);
+
+			if (!((p[0]/*|p[1]*/)&0x8000)) {
+				for (i=0; i<8; i++) {
+					patternRow2Pixels(*pFrame, *(*pData), p);
+					(*pData)++;
+
+					*pFrame += g_width;
+				}
+			} else {
+				for (i=0; i<2; i++) {
+					patternRow2Pixels2(*pFrame, *(*pData) & 0xf, p);
+					*pFrame += 2*g_width;
+					patternRow2Pixels2(*pFrame, *(*pData) >> 4, p);
+					(*pData)++;
+
+					*pFrame += 2*g_width;
+				}
+			}
+			break;
+
+		case 0x8:
+			p[0] = GETPIXEL(pData, 0);
+
+			if (!(p[0] & 0x8000)) {
+				for (i=0; i<4; i++) {
+					p[0] = GETPIXELI(pData, 0);
+					p[1] = GETPIXELI(pData, 0);
+
+					pat[0] = (*pData)[0];
+					pat[1] = (*pData)[1];
+					(*pData) += 2;
+
+					patternQuadrant2Pixels(*pFrame, pat[0], pat[1], p);
+
+					if (i & 1) {
+						*pFrame -= (4*g_width - 4);
+					} else {
+						*pFrame += 4*g_width;
+					}
+				}
+			} else {
+				p[2] = GETPIXEL(pData, 8);
+
+				if (!(p[2]&0x8000)) {
+					for (i=0; i<4; i++) {
+						if ((i & 1) == 0) {
+							p[0] = GETPIXELI(pData, 0);
+							p[1] = GETPIXELI(pData, 0);
+						}
+						pat[0] = *(*pData)++;
+						pat[1] = *(*pData)++;
+						patternQuadrant2Pixels(*pFrame, pat[0], pat[1], p);
+
+						if (i & 1) {
+							*pFrame -= (4*g_width - 4);
+						} else {
+							*pFrame += 4*g_width;
+						}
+					}
+				} else {
+					for (i=0; i<8; i++) {
+						if ((i & 3) == 0) {
+							p[0] = GETPIXELI(pData, 0);
+							p[1] = GETPIXELI(pData, 0);
+						}
+						patternRow2Pixels(*pFrame, *(*pData), p);
+						(*pData)++;
+
+						*pFrame += g_width;
+					}
+				}
+			}
+			break;
+
+		case 0x9:
+			p[0] = GETPIXELI(pData, 0);
+			p[1] = GETPIXELI(pData, 0);
+			p[2] = GETPIXELI(pData, 0);
+			p[3] = GETPIXELI(pData, 0);
+
+			*pDataRemain -= 8;
+
+			if (!(p[0] & 0x8000)) {
+				if (!(p[2] & 0x8000)) {
+					for (i=0; i<8; i++) {
+						pat[0] = (*pData)[0];
+						pat[1] = (*pData)[1];
+						(*pData) += 2;
+						patternRow4Pixels(*pFrame, pat[0], pat[1], p);
+						*pFrame += g_width;
+					}
+					*pDataRemain -= 16;
+				} else {
+					patternRow4Pixels2(*pFrame, (*pData)[0], p);
+					*pFrame += 2*g_width;
+					patternRow4Pixels2(*pFrame, (*pData)[1], p);
+					*pFrame += 2*g_width;
+					patternRow4Pixels2(*pFrame, (*pData)[2], p);
+					*pFrame += 2*g_width;
+					patternRow4Pixels2(*pFrame, (*pData)[3], p);
+
+					(*pData) += 4;
+					*pDataRemain -= 4;
+				}
+			} else {
+				if (!(p[2] & 0x8000))  {
+					for (i=0; i<8; i++) {
+						pat[0] = (*pData)[0];
+						(*pData) += 1;
+						patternRow4Pixels2x1(*pFrame, pat[0], p);
+						*pFrame += g_width;
+					}
+					*pDataRemain -= 8;
+				} else {
+					for (i=0; i<4; i++) {
+						pat[0] = (*pData)[0];
+						pat[1] = (*pData)[1];
+
+						(*pData) += 2;
+
+						patternRow4Pixels(*pFrame, pat[0], pat[1], p);
+						*pFrame += g_width;
+						patternRow4Pixels(*pFrame, pat[0], pat[1], p);
+						*pFrame += g_width;
+					}
+					*pDataRemain -= 8;
+				}
+			}
+			break;
+
+		case 0xa:
+			p[0] = GETPIXEL(pData, 0);
+
+			if (!(p[0] & 0x8000)) {
+				for (i=0; i<4; i++) {
+					p[0] = GETPIXELI(pData, 0);
+					p[1] = GETPIXELI(pData, 0);
+					p[2] = GETPIXELI(pData, 0);
+					p[3] = GETPIXELI(pData, 0);
+					pat[0] = (*pData)[0];
+					pat[1] = (*pData)[1];
+					pat[2] = (*pData)[2];
+					pat[3] = (*pData)[3];
+
+					(*pData) += 4;
+
+					patternQuadrant4Pixels(*pFrame, pat[0], pat[1], pat[2], pat[3], p);
+
+					if (i & 1) {
+						*pFrame -= (4*g_width - 4);
+					} else {
+						*pFrame += 4*g_width;
+					}
+				}
+			} else {
+				p[0] = GETPIXEL(pData, 16);
+
+				if (!(p[0] & 0x8000)) {
+					for (i=0; i<4; i++) {
+						if ((i&1) == 0) {
+							p[0] = GETPIXELI(pData, 0); 
+							p[1] = GETPIXELI(pData, 0);
+							p[2] = GETPIXELI(pData, 0);
+							p[3] = GETPIXELI(pData, 0);
+						}
+
+						pat[0] = (*pData)[0];
+						pat[1] = (*pData)[1];
+						pat[2] = (*pData)[2];
+						pat[3] = (*pData)[3];
+
+						(*pData) += 4;
+
+						patternQuadrant4Pixels(*pFrame, pat[0], pat[1], pat[2], pat[3], p);
+
+						if (i & 1) {
+							*pFrame -= (4*g_width - 4);
+						} else {
+							*pFrame += 4*g_width;
+						}
+					}
+				} else {
+					for (i=0; i<8; i++) {
+						if ((i&3) == 0) {
+							p[0] = GETPIXELI(pData, 0);
+							p[1] = GETPIXELI(pData, 0);
+							p[2] = GETPIXELI(pData, 0);
+							p[3] = GETPIXELI(pData, 0);
+						}
+
+						pat[0] = (*pData)[0];
+						pat[1] = (*pData)[1];
+						patternRow4Pixels(*pFrame, pat[0], pat[1], p);
+						*pFrame += g_width;
+
+						(*pData) += 2;
+					}
+				}
+			}
+			break;
+
+		case 0xb:
+			for (i=0; i<8; i++) {
+#if BYTE_ORDER == BIG_ENDIAN
+				ubyte frame_tmp[16];
+				memcpy(&frame_tmp, *pData, 16);
+
+				ushort *swap_tmp;
+				for (j = 0; j < 16; j += 2) {
+					swap_tmp = (ushort*)(frame_tmp + j);
+					*swap_tmp = INTEL_SHORT(*swap_tmp);
+				}
+				memcpy(*pFrame, &frame_tmp, 16);
+#else
+				memcpy(*pFrame, *pData, 16);
+#endif
+				*pFrame += g_width;
+				*pData += 16;
+				*pDataRemain -= 16;
+			}
+			break;
+
+		case 0xc:
+			for (i=0; i<4; i++) {
+				p[0] = GETPIXEL(pData, 0);
+				p[1] = GETPIXEL(pData, 2);
+				p[2] = GETPIXEL(pData, 4);
+				p[3] = GETPIXEL(pData, 6);
+
+				for (j=0; j<2; j++) {
+					for (k=0; k<4; k++) {
+						(*pFrame)[2*k] = p[k];
+						(*pFrame)[2*k+1] = p[k];
+					//	(*pFrame)[j+2*k] = p[k];
+					//	(*pFrame)[g_width+j+2*k] = p[k];
+					}
+					*pFrame += g_width;
+				}
+
+				*pData += 8;
+				*pDataRemain -= 8;
+			}
+			break;
+
+		case 0xd:
+			for (i=0; i<2; i++) {
+				p[0] = GETPIXEL(pData, 0);
+				p[1] = GETPIXEL(pData, 2);
+
+				for (j=0; j<4; j++) {
+					for (k=0; k<4; k++) {
+						(*pFrame)[k*g_width+j] = p[0];
+						(*pFrame)[k*g_width+j+4] = p[1];
+					}
+				}
+
+				*pFrame += 4*g_width;
+
+				*pData += 4;
+				*pDataRemain -= 4;
+			}
+			break;
+
+		case 0xe:
+			p[0] = GETPIXEL(pData, 0);
+
+			for (i = 0; i < 8; i++) {
+				for (j = 0; j < 8; j++) {
+					(*pFrame)[j] = p[0];
+				}
+
+				*pFrame += g_width;
+			}
+
+			*pData += 2;
+			*pDataRemain -= 2;
+
+			break;
+
+		case 0xf:
+			p[0] = GETPIXEL(pData, 0);
+			p[1] = GETPIXEL(pData, 1);
+
+			for (i=0; i<8; i++) {
+				for (j=0; j<8; j++) {
+					(*pFrame)[j] = p[(i+j)&1];
+				}
+				*pFrame += g_width;
+			}
+
+			*pData += 4;
+			*pDataRemain -= 4;
+			break;
+
+		default:
+			break;
+	}
+
+	*pFrame = pDstBak+8;
+}
@@ -0,0 +1,545 @@
+/*
+ * $Logfile: /Freespace2/src/cutscene/decoder8.cpp $
+ * $Revision: 1.1.2.1 $
+ * $Date: 2006-08-19 04:14:57 $
+ * $Author: taylor $
+ *
+ * decoder for 8-bit MVE image data
+ *
+ * $Log: not supported by cvs2svn $
+ *
+ * $NoKeywords: $
+ *
+ */
+
+#include "globalincs/pstypes.h"
+
+
+extern int g_width, g_height;
+extern void *g_vBackBuf1, *g_vBackBuf2;
+
+static void dispatchDecoder8(ubyte **pFrame, ubyte codeType, ubyte **pData, int *pDataRemain, int *curXb, int *curYb);
+
+void decodeFrame8(ubyte *pFrame, ubyte *pMap, int mapRemain, ubyte *pData, int dataRemain)
+{
+	int i, j;
+	int xb, yb;
+
+	xb = g_width >> 3;
+	yb = g_height >> 3;
+
+	for (j = 0; j < yb; j++) {
+		for (i = 0; i < (xb / 2); i++) {
+			dispatchDecoder8(&pFrame, (*pMap) & 0xf, &pData, &dataRemain, &i, &j);
+
+			dispatchDecoder8(&pFrame, (*pMap) >> 4, &pData, &dataRemain, &i, &j);
+
+			pMap++;
+			mapRemain--;
+		}
+
+		pFrame += 7*g_width;
+	}
+}
+
+static void relClose(int i, int *x, int *y)
+{
+	int ma, mi;
+
+	ma = i >> 4;
+	mi = i & 0xf;
+
+	*x = mi - 8;
+	*y = ma - 8;
+}
+
+static void relFar(int i, int sign, int *x, int *y)
+{
+	if (i < 56) {
+		*x = sign * (8 + (i % 7));
+		*y = sign *      (i / 7);
+	} else {
+		*x = sign * (-14 + (i - 56) % 29);
+		*y = sign *   (8 + (i - 56) / 29);
+	}
+}
+
+/* copies an 8x8 block from pSrc to pDest.
+   pDest and pSrc are both g_width bytes wide */
+static void copyFrame(ubyte *pDest, ubyte *pSrc)
+{
+	int i;
+
+	for (i = 0; i < 8; i++) {
+		memcpy(pDest, pSrc, 8);
+		pDest += g_width;
+		pSrc += g_width;
+	}
+}
+
+// Fill in the next eight bytes with p[0], p[1], p[2], or p[3],
+// depending on the corresponding two-bit value in pat0 and pat1
+static void patternRow4Pixels(ubyte *pFrame, ubyte pat0, ubyte pat1, ubyte *p)
+{
+	ushort mask = 0x0003;
+	ushort shift = 0;
+	ushort pattern = (pat1 << 8) | pat0;
+
+	while (mask != 0) {
+		*pFrame++ = p[(mask & pattern) >> shift];
+		mask <<= 2;
+		shift += 2;
+	}
+}
+
+// Fill in the next four 2x2 pixel blocks with p[0], p[1], p[2], or p[3],
+// depending on the corresponding two-bit value in pat0.
+static void patternRow4Pixels2(ubyte *pFrame, ubyte pat0, ubyte *p)
+{
+	ubyte mask = 0x03;
+	ubyte shift = 0;
+	ubyte pel;
+
+	while (mask != 0) {
+		pel = p[(mask & pat0) >> shift];
+		pFrame[0] = pel;
+		pFrame[1] = pel;
+		pFrame[g_width + 0] = pel;
+		pFrame[g_width + 1] = pel;
+		pFrame += 2;
+		mask <<= 2;
+		shift += 2;
+	}
+}
+
+// Fill in the next four 2x1 pixel blocks with p[0], p[1], p[2], or p[3],
+// depending on the corresponding two-bit value in pat.
+static void patternRow4Pixels2x1(ubyte *pFrame, ubyte pat, ubyte *p)
+{
+	ubyte mask = 0x03;
+	ubyte shift = 0;
+	ubyte pel;
+
+	while (mask != 0) {
+		pel = p[(mask & pat) >> shift];
+		pFrame[0] = pel;
+		pFrame[1] = pel;
+		pFrame += 2;
+		mask <<= 2;
+		shift += 2;
+	}
+}
+
+// Fill in the next 4x4 pixel block with p[0], p[1], p[2], or p[3],
+// depending on the corresponding two-bit value in pat0, pat1, pat2, and pat3.
+static void patternQuadrant4Pixels(ubyte *pFrame, ubyte pat0, ubyte pat1, ubyte pat2, ubyte pat3, ubyte *p)
+{
+	unsigned long mask = 0x00000003UL;
+	int shift=0;
+	int i;
+	unsigned long pat = (pat3 << 24) | (pat2 << 16) | (pat1 << 8) | pat0;
+
+	for (i = 0; i < 16; i++) {
+		pFrame[i&3] = p[(pat & mask) >> shift];
+
+		if ( (i & 3) == 3 )
+			pFrame += g_width;
+
+		mask <<= 2;
+		shift += 2;
+	}
+}
+
+// fills the next 8 pixels with either p[0] or p[1], depending on pattern
+static void patternRow2Pixels(ubyte *pFrame, ubyte pat, ubyte *p)
+{
+	ubyte mask=0x01;
+
+	while (mask != 0) {
+		*pFrame++ = p[(mask & pat) ? 1 : 0];
+		mask <<= 1;
+	}
+}
+
+// fills the next four 2 x 2 pixel boxes with either p[0] or p[1], depending on pattern
+static void patternRow2Pixels2(ubyte *pFrame, ubyte pat, ubyte *p)
+{
+	ubyte pel;
+	ubyte mask=0x1;
+
+	while (mask != 0x10) {
+		pel = p[(mask & pat) ? 1 : 0];
+
+		pFrame[0] = pel;              // upper-left
+		pFrame[1] = pel;              // upper-right
+		pFrame[g_width + 0] = pel;    // lower-left
+		pFrame[g_width + 1] = pel;    // lower-right
+		pFrame += 2;
+
+		mask <<= 1;
+	}
+}
+
+// fills pixels in the next 4 x 4 pixel boxes with either p[0] or p[1], depending on pat0 and pat1.
+static void patternQuadrant2Pixels(ubyte *pFrame, ubyte pat0, ubyte pat1, ubyte *p)
+{
+	ubyte pel;
+	ushort mask = 0x0001;
+	int i, j;
+	ushort pat = (pat1 << 8) | pat0;
+
+	for (i = 0; i < 4; i++) {
+		for (j = 0; j < 4; j++) {
+			pel = p[(pat & mask) ? 1 : 0];
+
+			pFrame[j + i * g_width] = pel;
+
+			mask <<= 1;
+		}
+	}
+}
+
+static void dispatchDecoder8(ubyte **pFrame, ubyte codeType, ubyte **pData, int *pDataRemain, int *curXb, int *curYb)
+{
+	ubyte p[4];
+	ubyte pat[16];
+	int i, j, k;
+	int x, y;
+
+	switch(codeType) {
+		case 0x0:
+			copyFrame(*pFrame, *pFrame + ((ubyte *)g_vBackBuf2 - (ubyte *)g_vBackBuf1));
+			*pFrame += 8;
+			break;
+
+		case 0x1:
+			*pFrame += 8;
+			break;
+
+		case 0x2:
+			relFar(*(*pData)++, 1, &x, &y);
+			copyFrame(*pFrame, *pFrame + x + y*g_width);
+			*pFrame += 8;
+			*pDataRemain--;
+			break;
+
+		case 0x3:
+			relFar(*(*pData)++, -1, &x, &y);
+			copyFrame(*pFrame, *pFrame + x + y*g_width);
+			*pFrame += 8;
+			*pDataRemain--;
+			break;
+
+		case 0x4:
+			relClose(*(*pData)++, &x, &y);
+			copyFrame(*pFrame, *pFrame + ((ubyte *)g_vBackBuf2 - (ubyte *)g_vBackBuf1) + x + y*g_width);
+			*pFrame += 8;
+			*pDataRemain--;
+			break;
+
+		case 0x5:
+			x = (signed char)*(*pData)++;
+			y = (signed char)*(*pData)++;
+			copyFrame(*pFrame, *pFrame + ((ubyte *)g_vBackBuf2 - (ubyte *)g_vBackBuf1) + x + y*g_width);
+			*pFrame += 8;
+			*pDataRemain -= 2;
+			break;
+
+		case 0x6:
+			for (i = 0; i < 2; i++) {
+				*pFrame += 16;
+
+				if (++*curXb == (g_width >> 3)) {
+					*pFrame += 7*g_width;
+					*curXb = 0;
+
+					if (++*curYb == (g_height >> 3))
+						return;
+				}
+			}
+			break;
+
+		case 0x7:
+			p[0] = *(*pData)++;
+			p[1] = *(*pData)++;
+
+			if (p[0] <= p[1]) {
+				for (i = 0; i < 8; i++) {
+					patternRow2Pixels(*pFrame, *(*pData)++, p);
+					*pFrame += g_width;
+				}
+			} else {
+				for (i = 0; i < 2; i++) {
+					patternRow2Pixels2(*pFrame, *(*pData) & 0xf, p);
+					*pFrame += 2*g_width;
+
+					patternRow2Pixels2(*pFrame, *(*pData)++ >> 4, p);
+					*pFrame += 2*g_width;
+				}
+			}
+
+			*pFrame -= (8*g_width - 8);
+			break;
+
+		case 0x8:
+			if ( (*pData)[0] <= (*pData)[1] ) {
+				// four quadrant case
+				for (i = 0; i < 4; i++) {
+					p[0] = *(*pData)++;
+					p[1] = *(*pData)++;
+					pat[0] = *(*pData)++;
+					pat[1] = *(*pData)++;
+					patternQuadrant2Pixels(*pFrame, pat[0], pat[1], p);
+
+					// alternate between moving down and moving up and right
+					if (i & 1)
+						*pFrame += 4 - 4*g_width; // up and right
+					else
+						*pFrame += 4*g_width;     // down
+				}
+			} else if ( (*pData)[6] <= (*pData)[7] ) {
+				// split horizontal
+				for (i = 0; i < 4; i++) {
+					if ((i & 1) == 0) {
+						p[0] = *(*pData)++;
+						p[1] = *(*pData)++;
+					}
+
+					pat[0] = *(*pData)++;
+					pat[1] = *(*pData)++;
+					patternQuadrant2Pixels(*pFrame, pat[0], pat[1], p);
+
+					if (i & 1)
+						*pFrame -= (4*g_width - 4);
+					else
+						*pFrame += 4*g_width;
+				}
+			} else {
+				// split vertical
+				for (i = 0; i < 8; i++) {
+					if ((i & 3) == 0) {
+						p[0] = *(*pData)++;
+						p[1] = *(*pData)++;
+					}
+
+					patternRow2Pixels(*pFrame, *(*pData)++, p);
+					*pFrame += g_width;
+				}
+
+				*pFrame -= (8*g_width - 8);
+			}
+			break;
+
+		case 0x9:
+			if ( (*pData)[0] <= (*pData)[1] ) {
+				if ( (*pData)[2] <= (*pData)[3] ) {
+					p[0] = *(*pData)++;
+					p[1] = *(*pData)++;
+					p[2] = *(*pData)++;
+					p[3] = *(*pData)++;
+
+					for (i = 0; i < 8; i++) {
+						pat[0] = *(*pData)++;
+						pat[1] = *(*pData)++;
+
+						patternRow4Pixels(*pFrame, pat[0], pat[1], p);
+						*pFrame += g_width;
+					}
+
+					*pFrame -= (8*g_width - 8);
+				} else {
+					p[0] = *(*pData)++;
+					p[1] = *(*pData)++;
+					p[2] = *(*pData)++;
+					p[3] = *(*pData)++;
+
+					patternRow4Pixels2(*pFrame, *(*pData)++, p);
+					*pFrame += 2*g_width;
+
+					patternRow4Pixels2(*pFrame, *(*pData)++, p);
+					*pFrame += 2*g_width;
+
+					patternRow4Pixels2(*pFrame, *(*pData)++, p);
+					*pFrame += 2*g_width;
+
+					patternRow4Pixels2(*pFrame, *(*pData)++, p);
+					*pFrame -= (6*g_width - 8);
+				}
+			} else {
+				if ( (*pData)[2] <= (*pData)[3] ) {
+					// draw 2x1 strips
+					p[0] = *(*pData)++;
+					p[1] = *(*pData)++;
+					p[2] = *(*pData)++;
+					p[3] = *(*pData)++;
+
+					for (i = 0; i < 8; i++) {
+						pat[0] = *(*pData)++;
+
+						patternRow4Pixels2x1(*pFrame, pat[0], p);
+						*pFrame += g_width;
+					}
+
+					*pFrame -= (8*g_width - 8);
+				} else {
+					// draw 1x2 strips
+					p[0] = *(*pData)++;
+					p[1] = *(*pData)++;
+					p[2] = *(*pData)++;
+					p[3] = *(*pData)++;
+
+					for (i = 0; i < 4; i++) {
+						pat[0] = *(*pData)++;
+						pat[1] = *(*pData)++;
+
+						patternRow4Pixels(*pFrame, pat[0], pat[1], p);
+						*pFrame += g_width;
+
+						patternRow4Pixels(*pFrame, pat[0], pat[1], p);
+						*pFrame += g_width;
+					}
+
+					*pFrame -= (8*g_width - 8);
+				}
+			}
+			break;
+
+		case 0xa:
+			if ( (*pData)[0] <= (*pData)[1] ) {
+				for (i = 0; i < 4; i++) {
+					p[0] = *(*pData)++;
+					p[1] = *(*pData)++;
+					p[2] = *(*pData)++;
+					p[3] = *(*pData)++;
+					pat[0] = *(*pData)++;
+					pat[1] = *(*pData)++;
+					pat[2] = *(*pData)++;
+					pat[3] = *(*pData)++;
+
+					patternQuadrant4Pixels(*pFrame, pat[0], pat[1], pat[2], pat[3], p);
+
+					if (i & 1)
+						*pFrame -= (4*g_width - 4);
+					else
+						*pFrame += 4*g_width;
+				}
+			} else {
+				if ( (*pData)[12] <= (*pData)[13] ) {
+					// split vertical
+					for (i = 0; i < 4; i++) {
+						if ((i&1) == 0) {
+							p[0] = *(*pData)++;
+							p[1] = *(*pData)++;
+							p[2] = *(*pData)++;
+							p[3] = *(*pData)++;
+						}
+
+						pat[0] = *(*pData)++;
+						pat[1] = *(*pData)++;
+						pat[2] = *(*pData)++;
+						pat[3] = *(*pData)++;
+
+						patternQuadrant4Pixels(*pFrame, pat[0], pat[1], pat[2], pat[3], p);
+
+						if (i & 1)
+							*pFrame -= (4*g_width - 4);
+						else
+							*pFrame += 4*g_width;
+					}
+				} else {
+					// split horizontal
+					for (i = 0; i < 8; i++) {
+						if ((i&3) == 0) {
+							p[0] = *(*pData)++;
+							p[1] = *(*pData)++;
+							p[2] = *(*pData)++;
+							p[3] = *(*pData)++;
+						}
+
+						pat[0] = *(*pData)++;
+						pat[1] = *(*pData)++;
+
+						patternRow4Pixels(*pFrame, pat[0], pat[1], p);
+						*pFrame += g_width;
+					}
+
+					*pFrame -= (8*g_width - 8);
+				}
+			}
+			break;
+
+		case 0xb:
+			for (i = 0; i < 8; i++) {
+				memcpy(*pFrame, *pData, 8);
+				*pFrame += g_width;
+				*pData += 8;
+				*pDataRemain -= 8;
+			}
+
+			*pFrame -= (8*g_width - 8);
+			break;
+
+		case 0xc:
+			for (i = 0; i < 4; i++) {
+				for (j = 0; j < 2; j++) {
+					for (k = 0; k < 4; k++) {
+						(*pFrame)[2*k]   = (*pData)[k];
+						(*pFrame)[2*k+1] = (*pData)[k];
+					}
+
+					*pFrame += g_width;
+				}
+
+				*pData += 4;
+				*pDataRemain -= 4;
+			}
+
+			*pFrame -= (8*g_width - 8);
+			break;
+
+		case 0xd:
+			for (i = 0; i < 2; i++) {
+				for (j = 0; j < 4; j++) {
+					for (k = 0; k < 4; k++) {
+						(*pFrame)[k*g_width+j] = (*pData)[0];
+						(*pFrame)[k*g_width+j+4] = (*pData)[1];
+					}
+				}
+
+				*pFrame += 4*g_width;
+				*pData += 2;
+				*pDataRemain -= 2;
+			}
+
+			*pFrame -= (8*g_width - 8);
+			break;
+
+		case 0xe:
+			for (i = 0; i < 8; i++) {
+				memset(*pFrame, **pData, 8);
+				*pFrame += g_width;
+			}
+
+			(*pData)++;
+			*pDataRemain--;
+			*pFrame -= (8*g_width - 8);
+			break;
+
+		case 0xf:
+			for (i = 0; i < 8; i++) {
+				for (j = 0; j < 8; j++) {
+					(*pFrame)[j] = (*pData)[(i+j)&1];
+				}
+
+				*pFrame += g_width;
+			}
+
+			*pData += 2;
+			*pDataRemain -= 2;
+			*pFrame -= (8*g_width - 8);
+			break;
+
+		default:
+			break;
+	}
+}
@@ -0,0 +1,260 @@
+/*
+ * Copyright (C) Volition, Inc. 1999.  All rights reserved.
+ *
+ * All source code herein is the property of Volition, Inc. You may not sell 
+ * or otherwise commercially exploit the source or things you created based on the 
+ * source.
+ *
+*/
+
+/*
+ * $Logfile: /Freespace2/code/cutscene/movie.cpp $
+ * $Revision: 2.31.2.11 $
+ * $Date: 2007-02-11 09:23:14 $
+ * $Author: taylor $
+ *
+ * movie player code
+ * 
+ * $Log: not supported by cvs2svn $
+ * Revision 2.31.2.10  2007/01/07 12:10:18  taylor
+ * remove D3D support for Theora movies, make sure that it doesn't try to play them (since it wouldn't work properly anyway)
+ * fix triple-buffer problem with page flipping (Mantis #1190)
+ *
+ * Revision 2.31.2.9  2006/12/26 05:13:29  taylor
+ * add support for Theora movies (the default format)
+ * some little bits of cleanup
+ * add second gr_clear() so that double-buffer'd visuals will work properly (ie, not flicker when playing MVE/OGG)
+ *
+ * Revision 2.31.2.8  2006/12/07 17:57:25  taylor
+ * cleanup for movie init stuff (this will be even cleaner once the rest of the Theora code finally gets in)
+ * get rid of the clear screen hack for Windows, we can handle that better now
+ *
+ * Revision 2.31.2.7  2006/11/15 00:24:47  taylor
+ * clean up AVI movie stuff a bit:
+ *  - use the default black brush for clearing the screen, it's a little less stupid this way
+ *  - have the AVI player send messages back to the game rather than trying to poll for that extra crap
+ *  - remove the only DivX6 fix, there is better addressed by newer window handling code
+ *
+ * Revision 2.31.2.6  2006/09/09 21:27:50  taylor
+ * be sure to reset color and clear color before MVE playback (fix for Mantis bug #1041)
+ *
+ * Revision 2.31.2.5  2006/08/28 17:14:52  taylor
+ * stupid, stupid, stupid...
+ *  - fix AVI/MPG movie playback
+ *  - fix missing campaign craziness
+ *
+ * Revision 2.31.2.4  2006/08/27 18:02:26  taylor
+ * switch to using cf_find_file_location_ext() when looking for movies
+ *
+ * Revision 2.31.2.3  2006/08/19 04:14:57  taylor
+ * add decoder for 8-bit MVEs
+ * a basic fix for finding AVIs over MVEs, for mod dir stuff (this needs some CFILE support added to be a true fix, it's on the TODO list)
+ * little bits of cleanup for old/unused code
+ * make sure MVE filenames are correct in mvelib
+ *
+ * Revision 2.31.2.2  2006/07/13 22:06:38  taylor
+ * handle non-MVE movies a bit better in OpenGL (don't get freaky with the window, don't lose input, etc.)
+ * some cleanup to OpenGL window handling, to fix min/max/full issues, and try to make shutdown a little nicer
+ *
+ * Revision 2.31.2.1  2006/06/18 16:54:36  taylor
+ * various compiler warning fixes
+ *
+ * Revision 2.31  2006/05/27 17:13:22  taylor
+ * add NO_DIRECT3D support
+ *
+ * Revision 2.30  2006/05/13 06:59:48  taylor
+ * MVE player (audio only works with OpenAL builds!)
+ *
+ * Revision 2.29  2005/12/28 22:17:01  taylor
+ * deal with cf_find_file_location() changes
+ * add a central parse_modular_table() function which anything can use
+ * fix up weapon_expl so that it can properly handle modular tables and LOD count changes
+ * add support for for a fireball TBM (handled a little different than a normal TBM is since it only changes rather than adds)
+ *
+ * Revision 2.28  2005/11/13 06:46:10  taylor
+ * some minor movie cleanup, not what I would like but enough for now
+ *
+ * Revision 2.27  2005/10/16 23:15:46  wmcoolmon
+ * Hardened cfile against array overflows
+ *
+ * Revision 2.26  2005/05/12 17:37:48  taylor
+ * add an extra gr_flip() after gr_clear() to make sure the change is made active
+ *
+ * Revision 2.25  2005/04/24 06:52:23  wmcoolmon
+ * Enabled movies in windowed mode; if this causes problems for people, they can always use -dnoshowvid
+ *
+ * Revision 2.24  2005/02/05 00:30:49  taylor
+ * fix a few things post merge
+ *
+ * Revision 2.23  2004/11/27 10:42:18  taylor
+ * this should get movies working again in D3D and help OGL too
+ *
+ * Revision 2.22  2004/07/26 20:47:26  Kazan
+ * remove MCD complete
+ *
+ * Revision 2.21  2004/07/12 16:32:43  Kazan
+ * MCD - define _MCD_CHECK to use memory tracking
+ *
+ * Revision 2.20  2004/04/26 13:09:20  taylor
+ * cvs log header, mark cutscenes viewable for later, gr_flip() to fix OGL white flash
+ *
+ * 
+ * 
+ * $NoKeywords: $
+ */
+
+#ifdef _WIN32
+#include <windows.h>
+#include "graphics/grd3dinternal.h"
+#endif
+
+#include "graphics/2d.h"
+#include "globalincs/systemvars.h"
+#include "cutscene/movie.h"
+#include "osapi/osapi.h"
+#include "cmdline/cmdline.h"	
+#include "cfile/cfile.h"
+#include "cutscene/cutscenes.h" // cutscene_mark_viewable()
+#include "cutscene/mvelib.h"
+#include "cutscene/oggplayer.h"
+
+extern int Game_mode;
+
+
+#define MOVIE_NONE	-1
+#define MOVIE_OGG	0
+#define MOVIE_MVE	1
+
+// This module links freespace movie calls to the actual API calls the play the movie.
+// This module handles all the different requires of OS and gfx API and finding the file to play
+
+
+// filename		- file to search for
+// out_name		- output, full path to file
+// returns non-zero if file is found
+int movie_find(char *filename, char *out_name)
+{
+	char full_path[MAX_PATH];
+	char tmp_name[MAX_PATH];
+	int size, offset = 0;
+	const int NUM_EXT = 2;
+	const char *movie_ext[NUM_EXT] = { ".ogg", ".mve" };
+
+	if (out_name == NULL)
+		return MOVIE_NONE;
+
+
+	memset( full_path, 0, sizeof(full_path) );
+	memset( tmp_name, 0, sizeof(tmp_name) );
+
+	// remove extension
+	strcpy( tmp_name, filename );
+	char *p = strrchr(tmp_name, '.');
+	if ( p ) *p = 0;
+
+    int rc = cf_find_file_location_ext(tmp_name, NUM_EXT, movie_ext, CF_TYPE_ANY, sizeof(full_path) - 1, full_path, &size, &offset, 0);
+
+	if (rc == MOVIE_NONE)
+		return MOVIE_NONE;
+
+	strcpy( out_name, full_path );
+
+	return rc;
+}
+
+// Play one movie
+bool movie_play(char *name)
+{
+	// mark the movie as viewable to the player when in a campaign
+	// do this before anything else so that we're sure the movie is available
+	// to the player even if it's not going to play right now
+	if (Game_mode & GM_CAMPAIGN_MODE) {
+		cutscene_mark_viewable(name);
+	}
+
+	extern int Mouse_hidden;
+	extern int Is_standalone;
+
+	if (Cmdline_nomovies || Is_standalone)
+		return false;
+
+
+	char full_name[MAX_PATH];
+	int rc = 0;
+
+	memset(full_name, 0, sizeof(full_name));
+
+	rc = movie_find(name, full_name);
+
+	if (rc == MOVIE_NONE) {
+		strcpy(full_name, name);
+		char *p = strrchr(full_name, '.');
+		if ( p ) *p = 0;
+
+		mprintf(("Movie Error:  Unable to open '%s' movie in any supported format.\n", full_name));
+		return false;
+	}
+
+	// clear the screen and hide the mouse cursor
+	Mouse_hidden++;
+	gr_reset_clip();
+	gr_set_color(255, 255, 255);
+	gr_set_clear_color(0, 0, 0);
+	gr_zbuffer_clear(0);
+	// clear first buffer
+	gr_clear();
+	gr_flip();
+	// clear second buffer (may not be one, but that's ok)
+	gr_clear();
+	gr_flip();
+	// clear third buffer (may not be one, but that's ok)
+	gr_clear();
+
+	if (rc == MOVIE_OGG) {
+		if (gr_screen.mode == GR_DIRECT3D) {
+			mprintf(("MOVIE ERROR: Theora movies are not currently supported in Direct3D mode!\n"));
+			return false;
+		}
+
+		THEORAFILE *movie_ogg = theora_open(name);
+
+		if (movie_ogg) {
+			// start playing ...
+			theora_play(movie_ogg);
+
+			// ... done playing, close the movie
+			theora_close(movie_ogg);
+		} else {
+			// uh-oh, movie is invalid... Abory, Retry, Fail?
+			mprintf(("MOVIE ERROR: Found invalid movie! (%s)\n", name));
+			return false;
+		}
+	} else if (rc == MOVIE_MVE) {
+		MVESTREAM *movie_mve = mve_open(name);
+
+		if (movie_mve) {
+			// start playing ...
+			mve_init(movie_mve);
+			mve_play(movie_mve);
+
+			// ... done playing, close the movie
+			mve_shutdown();
+			mve_close(movie_mve);
+		} else {
+			// uh-oh, movie is invalid... Abory, Retry, Fail?
+			mprintf(("MOVIE ERROR: Found invalid movie! (%s)\n", name));
+			return false;
+		}
+	}
+
+	// show the mouse cursor again
+	Mouse_hidden--;
+
+	return true;
+}
+
+void movie_play_two(char *name1, char *name2)
+{
+	if ( movie_play(name1) )
+		movie_play(name2);
+}
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) Volition, Inc. 1999.  All rights reserved.
+ *
+ * All source code herein is the property of Volition, Inc. You may not sell 
+ * or otherwise commercially exploit the source or things you created based on the 
+ * source.
+ *
+*/
+
+/*
+ * $Logfile: /Freespace2/code/cutscene/movie.h $
+ * $Revision: 2.6.2.1 $
+ * $Date: 2007-02-11 09:23:14 $
+ * $Author: taylor $
+ *
+ * movie player header
+ * 
+ * $Log: not supported by cvs2svn $
+ *
+ * $NoKeywords: $
+ */
+
+#ifndef _MOVIE_HEADER_FILE
+#define _MOVIE_HEADER_FILE
+
+bool movie_play(char *name);
+void movie_play_two(char *name1, char *name2);
+
+#endif
@@ -0,0 +1,79 @@
+/*
+ * $Logfile: /Freespace2/src/cutscene/mve_audio.cpp $
+ * $Revision: 2.1 $
+ * $Date: 2006-05-13 06:59:48 $
+ * $Author: taylor $
+ *
+ * Handles compressed audio data in MVE files
+ *
+ * $Log: not supported by cvs2svn $
+ * Revision 1.2  2005/03/29 07:50:34  taylor
+ * Update to newest movie code with much better video support and audio support from
+ *   Pierre Willenbrock.  Movies are enabled always now (no longer a build option)
+ *   and but can be skipped with the "--nomovies" or "-n" cmdline options.
+ *
+ *
+ *
+ * $NoKeywords: $
+ *
+ */
+
+#ifdef USE_OPENAL
+
+static int audio_exp_table[256] =
+{
+         0,      1,      2,      3,      4,      5,      6,      7,      8,      9,     10,     11,     12,     13,     14,     15,
+        16,     17,     18,     19,     20,     21,     22,     23,     24,     25,     26,     27,     28,     29,     30,     31,
+        32,     33,     34,     35,     36,     37,     38,     39,     40,     41,     42,     43,     47,     51,     56,     61,
+        66,     72,     79,     86,     94,    102,    112,    122,    133,    145,    158,    173,    189,    206,    225,    245,
+       267,    292,    318,    348,    379,    414,    452,    493,    538,    587,    640,    699,    763,    832,    908,    991,
+      1081,   1180,   1288,   1405,   1534,   1673,   1826,   1993,   2175,   2373,   2590,   2826,   3084,   3365,   3672,   4008,
+      4373,   4772,   5208,   5683,   6202,   6767,   7385,   8059,   8794,   9597,  10472,  11428,  12471,  13609,  14851,  16206,
+     17685,  19298,  21060,  22981,  25078,  27367,  29864,  32589, -29973, -26728, -23186, -19322, -15105, -10503,  -5481,     -1,
+         1,      1,   5481,  10503,  15105,  19322,  23186,  26728,  29973, -32589, -29864, -27367, -25078, -22981, -21060, -19298,
+    -17685, -16206, -14851, -13609, -12471, -11428, -10472,  -9597,  -8794,  -8059,  -7385,  -6767,  -6202,  -5683,  -5208,  -4772,
+     -4373,  -4008,  -3672,  -3365,  -3084,  -2826,  -2590,  -2373,  -2175,  -1993,  -1826,  -1673,  -1534,  -1405,  -1288,  -1180,
+     -1081,   -991,   -908,   -832,   -763,   -699,   -640,   -587,   -538,   -493,   -452,   -414,   -379,   -348,   -318,   -292,
+      -267,   -245,   -225,   -206,   -189,   -173,   -158,   -145,   -133,   -122,   -112,   -102,    -94,    -86,    -79,    -72,
+       -66,    -61,    -56,    -51,    -47,    -43,    -42,    -41,    -40,    -39,    -38,    -37,    -36,    -35,    -34,    -33,
+       -32,    -31,    -30,    -29,    -28,    -27,    -26,    -25,    -24,    -23,    -22,    -21,    -20,    -19,    -18,    -17,
+       -16,    -15,    -14,    -13,    -12,    -11,    -10,     -9,     -8,     -7,     -6,     -5,     -4,     -3,     -2,     -1
+};
+
+static int getWord(unsigned char **fin)
+{
+    int value = ((*fin)[1] << 8) | (*fin)[0];
+    *fin += 2;
+    return value;
+}
+
+static void sendWord(short **fout, int nOffset)
+{
+    *(*fout)++ = nOffset;
+}
+
+static void processSwath(short *fout, unsigned char *data, int swath, int *offsets)
+{
+    int i;
+    for (i=0; i<swath; i++)
+    {
+        offsets[i&1] += audio_exp_table[data[i]];
+        sendWord(&fout, offsets[i&1]);
+    }
+}
+
+void mveaudio_uncompress(short *buffer, unsigned char *data, int length)
+{
+    int nCurOffsets[2];
+    int swath;
+
+    data += 4;
+    swath = getWord(&data) / 2;
+    nCurOffsets[0] = getWord(&data);
+    nCurOffsets[1] = getWord(&data);
+    sendWord(&buffer, nCurOffsets[0]);
+    sendWord(&buffer, nCurOffsets[1]);
+    processSwath(buffer, data, swath, nCurOffsets);
+}
+
+#endif
@@ -0,0 +1,385 @@
+/*
+ * $Logfile: /Freespace2/src/cutscene/mvelib.cpp $
+ * $Revision: 2.1.2.1 $
+ * $Date: 2006-08-19 04:14:57 $
+ * $Author: taylor $
+ *
+ * main lib for using MVEs
+ *
+ * $Log: not supported by cvs2svn $
+ * Revision 2.1  2006/05/13 06:59:48  taylor
+ * MVE player (audio only works with OpenAL builds!)
+ *
+ *
+ * $NoKeywords: $
+ *
+ */
+
+#include "globalincs/pstypes.h"
+#include "cutscene/mvelib.h"
+#include "cfile/cfile.h"
+
+
+static const char MVE_HEADER[]  = "Interplay MVE File\x1A";
+static const short MVE_HDRCONST1 = 0x001A;
+static const short MVE_HDRCONST2 = 0x0100;
+static const short MVE_HDRCONST3 = 0x1133;
+
+
+// -----------------------------------------------------------
+// public MVEFILE functions
+// -----------------------------------------------------------
+
+// utility functions for mvefile and mveplayer
+short mve_get_short(ubyte *data)
+{
+	short value;
+	value = data[0] | (data[1] << 8);
+	return value;
+}
+
+ushort mve_get_ushort(ubyte *data)
+{
+	ushort value;
+	value = data[0] | (data[1] << 8);
+	return value;
+}
+
+int mve_get_int(ubyte *data)
+{
+	int value;
+	value = data[0] | (data[1] << 8) | (data[2] << 16) | (data[3] << 24);
+	return value;
+}
+
+// open an MVE file
+MVEFILE *mvefile_open(char *filename)
+{
+	int cf_opened = 0;
+	int mve_valid = 1;
+	char lower_name[MAX_FILENAME_LEN];
+	char buffer[20];
+	MVEFILE *file;
+
+	// create the file
+	file = (MVEFILE *)vm_malloc(sizeof(MVEFILE));
+
+	// set defaults
+	file->stream = NULL;
+	file->cur_chunk = NULL;
+	file->buf_size = 0;
+	file->cur_fill = 0;
+	file->next_segment = 0;
+
+	// lower case filename for checking
+	strncpy(lower_name, filename, strlen(filename)+1);
+	strlwr(lower_name);
+	
+	char *p = strchr( lower_name, '.' );
+	if ( p ) *p = 0;
+
+	SAFE_STRCAT( lower_name, ".mve", sizeof(lower_name) );
+
+	// NOTE: CF_TYPE *must* be ANY to get movies off of the CDs
+	// assume lower case filename for *nix
+	if ( (file->stream = cfopen(lower_name, "rb", CFILE_NORMAL, CF_TYPE_ANY)) ) {
+		cf_opened = 1;
+	}
+
+	if (!cf_opened) {
+		mvefile_close(file);
+		return NULL;
+	}
+
+	// initialize the buffer
+	file->cur_chunk = (ubyte *)vm_malloc(100 + 1024);
+	file->buf_size = 100 + 1024;
+
+	// verify the file's header
+	cfread_string(buffer, 20, file->stream);
+	
+	if (strcmp(buffer, MVE_HEADER))
+		mve_valid = 0;
+
+	if (cfread_short(file->stream) != MVE_HDRCONST1)
+		mve_valid = 0;
+
+	if (cfread_short(file->stream) != MVE_HDRCONST2)
+		mve_valid = 0;
+
+	if (cfread_short(file->stream) != MVE_HDRCONST3)
+		mve_valid = 0;
+
+	if (!mve_valid) {
+		mvefile_close(file);
+		return NULL;
+	}
+
+	// now, prefetch the next chunk
+	mvefile_fetch_next_chunk(file);
+
+	return file;
+}
+
+// close a MVE file
+void mvefile_close(MVEFILE *file)
+{
+	// free the stream
+	if (file->stream)
+		cfclose(file->stream);
+
+	file->stream = NULL;
+
+	// free the buffer
+	if (file->cur_chunk)
+		vm_free(file->cur_chunk);
+
+	file->cur_chunk = NULL;
+
+	// not strictly necessary
+	file->buf_size = 0;
+	file->cur_fill = 0;
+	file->next_segment = 0;
+
+	// free the struct
+	vm_free(file);
+}
+
+// get the size of the next segment
+int mvefile_get_next_segment_size(MVEFILE *file)
+{
+	// if nothing is cached, fail
+	if (file->cur_chunk == NULL || file->next_segment >= file->cur_fill)
+		return -1;
+
+	// if we don't have enough data to get a segment, fail
+	if (file->cur_fill - file->next_segment < 4)
+		return -1;
+
+	// otherwise, get the data length
+	return mve_get_short(file->cur_chunk + file->next_segment);
+}
+
+// get type of next segment in chunk (0xff if no more segments in chunk)
+ubyte mvefile_get_next_segment_major(MVEFILE *file)
+{
+	// if nothing is cached, fail
+	if (file->cur_chunk == NULL || file->next_segment >= file->cur_fill)
+		return 0xff;
+
+	// if we don't have enough data to get a segment, fail
+	if (file->cur_fill - file->next_segment < 4)
+		return 0xff;
+
+	// otherwise, get the data length
+	return file->cur_chunk[file->next_segment + 2];
+}
+
+// get subtype (version) of next segment in chunk (0xff if no more segments in chunk)
+ubyte mvefile_get_next_segment_minor(MVEFILE *file)
+{
+	// if nothing is cached, fail
+	if (file->cur_chunk == NULL || file->next_segment >= file->cur_fill)
+		return 0xff;
+
+	// if we don't have enough data to get a segment, fail
+	if (file->cur_fill - file->next_segment < 4)
+		return 0xff;
+
+	// otherwise, get the data length
+	return file->cur_chunk[file->next_segment + 3];
+}
+
+// see next segment (return NULL if no next segment)
+ubyte *mvefile_get_next_segment(MVEFILE *file)
+{
+	// if nothing is cached, fail
+	if (file->cur_chunk == NULL || file->next_segment >= file->cur_fill)
+		return NULL;
+
+	// if we don't have enough data to get a segment, fail
+	if (file->cur_fill - file->next_segment < 4)
+		return NULL;
+
+	// otherwise, get the data length
+	return file->cur_chunk + file->next_segment + 4;
+}
+
+// advance to next segment
+void mvefile_advance_segment(MVEFILE *file)
+{
+	// if nothing is cached, fail
+	if (file->cur_chunk == NULL || file->next_segment >= file->cur_fill)
+		return;
+
+	// if we don't have enough data to get a segment, fail
+	if (file->cur_fill - file->next_segment < 4)
+		return;
+
+	// else, advance to next segment
+	file->next_segment += (4 + mve_get_ushort(file->cur_chunk + file->next_segment));
+}
+
+// fetch the next chunk (return 0 if at end of stream)
+int mvefile_fetch_next_chunk(MVEFILE *file)
+{
+	ubyte buffer[4];
+	ubyte *new_buffer;
+	ushort length;
+
+	// fail if not open
+	if (file->stream == NULL)
+		return 0;
+
+	// fail if we can't read the next segment descriptor
+	if (cfread(buffer, 1, 4, file->stream) < 4)
+		return 0;
+
+	// pull out the next length
+	length = mve_get_short(buffer);
+
+	// setup a new buffer if needed --
+	// only allocate new buffer is old one is too small
+	if (length > file->buf_size) {
+		// allocate new buffer
+		new_buffer = (ubyte *)vm_malloc(100 + length);
+
+		// copy old data
+		if (file->cur_chunk && file->cur_fill)
+			memcpy(new_buffer, file->cur_chunk, file->cur_fill);
+
+		// free old buffer
+		if (file->cur_chunk) {
+			vm_free(file->cur_chunk);
+			file->cur_chunk = NULL;
+		}
+
+		// install new buffer
+		file->cur_chunk = new_buffer;
+		file->buf_size = 100 + length;
+	}
+
+	// read the chunk
+	if (length > 0) {
+		if (cfread(file->cur_chunk, 1, length, file->stream) < length)
+			return 0;
+	}
+
+	file->cur_fill = length;
+	file->next_segment = 0;
+
+	return 1;
+}
+
+// -----------------------------------------------------------
+// public MVESTREAM functions
+// -----------------------------------------------------------
+
+// open an MVE stream
+MVESTREAM *mve_open(char *filename)
+{
+	MVESTREAM *stream;
+
+	// allocate
+	stream = (MVESTREAM *)vm_malloc(sizeof(MVESTREAM));
+
+	// defaults
+	stream->movie = NULL;
+
+	// open
+	stream->movie = mvefile_open(filename);
+
+	if (stream->movie == NULL) {
+		mve_close(stream);
+		return NULL;
+	}
+
+	return stream;
+}
+
+// close an MVE stream
+void mve_close(MVESTREAM *stream)
+{
+	// close MVEFILE
+	if (stream->movie)
+		mvefile_close(stream->movie);
+
+	stream->movie = NULL;
+
+	vm_free(stream);
+}
+
+// play next chunk
+int mve_play_next_chunk(MVESTREAM *stream)
+{
+	ubyte major, minor;
+	ubyte *data;
+	int len;
+
+	// loop over segments
+	major = mvefile_get_next_segment_major(stream->movie);
+	while (major != 0xff) {
+		// check whether to handle the segment
+		if (major < 32) {
+			minor = mvefile_get_next_segment_minor(stream->movie);
+			len = mvefile_get_next_segment_size(stream->movie);
+			data = mvefile_get_next_segment(stream->movie);
+
+			switch (major) {
+				case 0x00:
+					mve_end_movie();
+					break;
+				case 0x01:
+					mve_end_chunk();
+					break;
+				case 0x02:
+					mve_timer_create(data);
+					break;
+				case 0x03:
+					mve_audio_createbuf(minor, data);
+					break;
+				case 0x04:
+					mve_audio_play();
+					break;
+				case 0x05:
+					if (!mve_video_createbuf(minor, data))
+						return 0;
+					break;
+				case 0x07:
+					mve_video_display();
+					break;
+				case 0x08:
+					mve_audio_data(major, data);
+					break;
+				case 0x09:
+					mve_audio_data(major, data);
+					break;
+				case 0x0a:
+					if (!mve_video_init(data))
+						return 0;
+					break;
+				case 0x0c:
+					mve_video_palette(data);
+					break;
+				case 0x0f:
+					mve_video_codemap(data, len);
+					break;
+				case 0x11:
+					mve_video_data(data, len);
+					break;
+				default:
+					break;
+			}
+		}
+
+		// advance to next segment
+		mvefile_advance_segment(stream->movie);
+		major = mvefile_get_next_segment_major(stream->movie);
+	}
+
+	if (!mvefile_fetch_next_chunk(stream->movie))
+		return 0;
+
+	// return status
+	return 1;
+}
@@ -0,0 +1,101 @@
+/*
+ * $Logfile: /Freespace2/src/cutscene/mvelib.h $
+ * $Revision: 2.1 $
+ * $Date: 2006-05-13 06:59:48 $
+ * $Author: taylor $
+ *
+ * main lib for using MVEs
+ *
+ * $Log: not supported by cvs2svn $
+ *
+ * $NoKeywords: $
+ *
+ */
+
+#ifndef INCLUDED_MVELIB_H
+#define INCLUDED_MVELIB_H
+
+
+#include "globalincs/pstypes.h"
+
+struct CFILE;
+
+// structure for maintaining info on a MVEFILE stream
+typedef struct MVEFILE
+{
+	CFILE	*stream;
+	ubyte	*cur_chunk;
+	int		buf_size;
+	int		cur_fill;
+	int		next_segment;
+} MVEFILE;
+
+// open a .MVE file
+MVEFILE *mvefile_open(char *filename);
+
+// close a .MVE file
+void mvefile_close(MVEFILE *movie);
+
+// get size of next segment in chunk (-1 if no more segments in chunk)
+int mvefile_get_next_segment_size(MVEFILE *movie);
+
+// get type of next segment in chunk (0xff if no more segments in chunk)
+ubyte mvefile_get_next_segment_major(MVEFILE *movie);
+
+// get subtype (version) of next segment in chunk (0xff if no more segments in chunk)
+ubyte mvefile_get_next_segment_minor(MVEFILE *movie);
+
+// see next segment (return NULL if no next segment)
+ubyte *mvefile_get_next_segment(MVEFILE *movie);
+
+// advance to next segment
+void mvefile_advance_segment(MVEFILE *movie);
+
+// fetch the next chunk (return 0 if at end of stream)
+int mvefile_fetch_next_chunk(MVEFILE *movie);
+
+// structure for maintaining an MVE stream
+typedef struct MVESTREAM
+{
+	MVEFILE		*movie;
+} MVESTREAM;
+
+// open an MVE stream
+MVESTREAM *mve_open(char *filename);
+
+// close an MVE stream
+void mve_close(MVESTREAM *movie);
+
+// play next chunk
+int mve_play_next_chunk(MVESTREAM *movie);
+
+// basic movie playing functions
+void mve_init(MVESTREAM *mve);
+void mve_play(MVESTREAM *mve);
+void mve_shutdown();
+
+// utility functions
+short mve_get_short(ubyte *data);
+ushort mve_get_ushort(ubyte *data);
+int mve_get_int(ubyte *data);
+
+// callbacks for data handling
+// audio
+void mve_audio_createbuf(ubyte minor, ubyte *data);
+int mve_audio_data(ubyte major, ubyte *data);
+void mve_audio_play();
+// video
+int mve_video_createbuf(ubyte minor, ubyte *data);
+int mve_video_init(ubyte *data);
+void mve_video_palette(ubyte *data);
+void mve_video_data(ubyte *data, int len);
+void mve_video_codemap(ubyte *data, int len);
+void mve_video_display();
+// misc
+void mve_end_movie();
+void mve_end_chunk();
+int mve_timer_create(ubyte *data);
+
+typedef short mves;
+
+#endif /* INCLUDED_MVELIB_H */
@@ -0,0 +1,846 @@
+/*
+ * $Logfile: /Freespace2/code/cutscene/mveplayer.cpp $
+ * $Revision: 2.1.2.4 $
+ * $Date: 2007-02-10 00:01:53 $
+ * $Author: taylor $
+ *
+ * MVE movie playing routines
+ *
+ * $Log: not supported by cvs2svn $
+ * Revision 2.1.2.3  2006/12/26 05:14:52  taylor
+ * get rid of some stale vars that we don't use any longer
+ * a little at-exit cleanup
+ * handle rounding error on X/Y placement locations under Windows
+ *
+ * Revision 2.1.2.2  2006/12/07 17:55:51  taylor
+ * port over some Theora player stuff:
+ *  - support for GL_ARB_texture_rectangle
+ *  - fix GL tear-down on movie exit
+ *  - fix sound tear-down order issue on OS X
+ *  - some speed increases, and get rid of the extra gr_clear() per-frame now that it's handled properly
+ *  - proper support for widescreen resolutions
+ *
+ * Revision 2.1.2.1  2006/08/19 04:14:57  taylor
+ * add decoder for 8-bit MVEs
+ * a basic fix for finding AVIs over MVEs, for mod dir stuff (this needs some CFILE support added to be a true fix, it's on the TODO list)
+ * little bits of cleanup for old/unused code
+ * make sure MVE filenames are correct in mvelib
+ *
+ * Revision 2.1  2006/05/13 06:59:48  taylor
+ * MVE player (audio only works with OpenAL builds!)
+ *
+ *
+ * $NoKeywords: $
+ */
+
+#ifdef SCP_UNIX
+#include <errno.h>
+#include <time.h>
+#include <sys/time.h>
+#endif
+
+#include "graphics/gropengl.h"
+#include "graphics/gropengltexture.h"
+#include "graphics/gropenglextension.h"
+#include "graphics/gropenglstate.h"
+
+#include "globalincs/pstypes.h"
+#include "cutscene/mvelib.h"
+#include "cutscene/movie.h"
+#include "graphics/2d.h"
+#include "io/key.h"
+#include "osapi/osapi.h"
+#include "io/timer.h"
+#include "sound/sound.h"
+#include "sound/ds.h"
+#include "bmpman/bmpman.h"
+//#include "sound/audiostr.h"
+
+
+extern int Cmdline_noscalevid;
+
+static int mve_playing;
+
+// timer variables
+static int micro_frame_delay = 0;
+static int timer_started = 0;
+#ifdef SCP_UNIX
+static struct timeval timer_expire = { 0, 0 };
+#else
+static int timer_expire;
+#endif
+
+// audio variables
+#define MVE_AUDIO_BUFFERS 64  // total buffers to interact with stream
+static int mve_audio_buffer_tail = 0;
+static int mve_audio_playing = 0;
+static int mve_audio_canplay = 0;
+static int mve_audio_compressed = 0;
+static int audiobuf_created;
+
+#ifdef USE_OPENAL
+// struct for the audio stream information
+typedef struct MVE_AUDIO_T {
+	ALenum format;
+	int sample_rate;
+	int bytes_per_sec;
+	int channels;
+	int bitsize;
+	ALuint source_id;
+	ALuint audio_buffer[MVE_AUDIO_BUFFERS];
+} mve_audio_t;
+
+mve_audio_t *mas;  // mve_audio_stream
+
+// audio decompressor
+extern void mveaudio_uncompress(short *buffer, unsigned char *data, int length);
+#endif // USE_OPENAL
+
+// video variables
+int g_width, g_height;
+void *g_vBuffers = NULL;
+void *g_vBackBuf1, *g_vBackBuf2;
+ushort *pixelbuf = NULL;
+static GLuint GLtex = 0;
+static GLint gl_screenYH = 0;
+static GLint gl_screenXW = 0;
+static GLfloat gl_screenU = 0;
+static GLfloat gl_screenV = 0;
+static int g_screenWidth, g_screenHeight;
+static int g_screenX, g_screenY;
+static int g_truecolor = 0;
+static ubyte g_palette[768];
+static ubyte *g_pCurMap = NULL;
+static int g_nMapLength = 0;
+static int videobuf_created, video_inited;
+static int hp2, wp2;
+static uint mve_video_skiptimer = 0;
+static int mve_scale_video = 0;
+
+// video externs from API graphics functions
+extern void opengl_tcache_get_adjusted_texture_size(int w_in, int h_in, int *w_out, int *h_out);
+extern GLenum GL_previous_texture_target;
+
+// the decoders
+extern void decodeFrame16(ubyte *pFrame, ubyte *pMap, int mapRemain, ubyte *pData, int dataRemain);
+extern void decodeFrame8(ubyte *pFrame, ubyte *pMap, int mapRemain, ubyte *pData, int dataRemain);
+
+
+/*************************
+ * general handlers
+ *************************/
+void mve_end_movie()
+{
+	mve_playing = 0;
+}
+
+/*************************
+ * timer handlers
+ *************************/
+
+int mve_timer_create(ubyte *data)
+{
+	int rate = mve_get_int(data);
+	int subd = mve_get_short(data+4);
+
+	micro_frame_delay = rate * subd;
+
+	return 1;
+}
+
+static void mve_timer_start(void)
+{
+#ifdef SCP_UNIX
+	int nsec = 0;
+
+	gettimeofday(&timer_expire, NULL);
+
+	timer_expire.tv_usec += micro_frame_delay;
+
+	if (timer_expire.tv_usec > 1000000) {
+		nsec = timer_expire.tv_usec / 1000000;
+		timer_expire.tv_sec += nsec;
+		timer_expire.tv_usec -= nsec * 1000000;
+	}
+#else
+	timer_expire = timer_get_microseconds();
+	timer_expire += micro_frame_delay;
+#endif
+
+	timer_started = 1;
+}
+
+static int mve_do_timer_wait(void)
+{
+	if (!timer_started)
+		return 0;
+
+#ifdef SCP_UNIX
+	int nsec = 0;
+	struct timespec ts, tsRem;
+	struct timeval tv;
+
+	gettimeofday(&tv, NULL);
+
+	if (tv.tv_sec > timer_expire.tv_sec)
+		goto end;
+
+	if ( (tv.tv_sec == timer_expire.tv_sec) && (tv.tv_usec >= timer_expire.tv_usec) )
+		goto end;
+
+	ts.tv_sec = timer_expire.tv_sec - tv.tv_sec;
+	ts.tv_nsec = 1000 * (timer_expire.tv_usec - tv.tv_usec);
+
+	if (ts.tv_nsec < 0) {
+		ts.tv_nsec += 1000000000UL;
+		--ts.tv_sec;
+	}
+
+	if ( (nanosleep(&ts, &tsRem) == -1) && (errno == EINTR) ) {
+		// so we got an error that was a signal interupt, try to sleep again with remainder of time
+		if ( (nanosleep(&tsRem, NULL) == -1) && (errno == EINTR) ) {
+			mprintf(("MVE: Timer error! Aborting movie playback!\n"));
+			return 1;
+		}
+	}
+
+end:
+    timer_expire.tv_usec += micro_frame_delay;
+
+    if (timer_expire.tv_usec > 1000000) {
+        nsec = timer_expire.tv_usec / 1000000;
+        timer_expire.tv_sec += nsec;
+        timer_expire.tv_usec -= nsec * 1000000;
+    }
+#else
+	int tv, ts, ts2;
+
+	tv = timer_get_microseconds();
+
+	if (tv > timer_expire)
+		goto end;
+
+	ts = timer_expire - tv;
+
+	ts2 = ts/1000;
+
+	Sleep(ts2);
+
+end:
+	timer_expire += micro_frame_delay;
+#endif
+
+	return 0;
+}
+
+static void mve_timer_stop()
+{
+#ifdef SCP_UNIX
+	timer_expire.tv_sec = 0;
+	timer_expire.tv_usec = 0;
+#else
+	timer_expire = 0;
+#endif
+	timer_started = 0;
+}
+
+/*************************
+ * audio handlers
+ *************************/
+
+// setup the audio information from the data stream
+void mve_audio_createbuf(ubyte minor, ubyte *data)
+{
+	if (audiobuf_created)
+		return;
+
+	// if game sound disabled don't try and play movie audio
+	if (!Sound_enabled) {
+		mve_audio_canplay = 0;
+		return;
+	}
+
+#ifdef USE_OPENAL
+    int flags, desired_buffer, sample_rate;
+
+    mas = (mve_audio_t *) vm_malloc ( sizeof(mve_audio_t) );
+	memset(mas, 0, sizeof(mve_audio_t));
+
+	mas->format = AL_INVALID;
+
+    flags = mve_get_ushort(data + 2);
+    sample_rate = mve_get_ushort(data + 4);
+    desired_buffer = mve_get_int(data + 6);
+
+    mas->channels = (flags & 0x0001) ? 2 : 1;
+	mas->bitsize = (flags & 0x0002) ? 16 : 8;
+
+	mas->sample_rate = sample_rate;
+
+    if (minor > 0) {
+    	mve_audio_compressed = flags & 0x0004 ? 1 : 0;
+    } else {
+		mve_audio_compressed = 0;
+    }
+
+    if (mas->bitsize == 16) {
+		if (mas->channels == 2) {
+			mas->format = AL_FORMAT_STEREO16;
+		} else if (mas->channels == 1) {
+			mas->format = AL_FORMAT_MONO16;
+		}
+	} else if (mas->bitsize == 8) {
+		if (mas->channels == 2) {
+			mas->format = AL_FORMAT_STEREO8;
+		} else if (mas->channels == 1) {
+			mas->format = AL_FORMAT_MONO8;
+		}
+	}
+
+	// somethings wrong, bail now
+	if (mas->format == AL_INVALID) {
+		mve_audio_canplay = 0;
+		audiobuf_created = 1;
+		return;
+	}
+
+	OpenAL_ErrorCheck( alGenSources(1, &mas->source_id), { mve_audio_canplay = 0; return; } );
+
+	mve_audio_canplay = 1;
+
+	OpenAL_ErrorPrint( alSourcef(mas->source_id, AL_GAIN, 1.0f) );
+
+	memset(mas->audio_buffer, 0, MVE_AUDIO_BUFFERS * sizeof(ALuint));
+#endif // USE_OPENAL
+
+    mve_audio_buffer_tail = 0;
+
+	audiobuf_created = 1;
+}
+
+// play and stream the audio
+void mve_audio_play()
+{
+	if (mve_audio_canplay) {
+#ifdef USE_OPENAL
+		ALint status, bqueued;
+
+		OpenAL_ErrorCheck( alGetSourcei(mas->source_id, AL_SOURCE_STATE, &status), return );
+	
+		OpenAL_ErrorCheck( alGetSourcei(mas->source_id, AL_BUFFERS_QUEUED, &bqueued), return );
+	
+		mve_audio_playing = 1;
+
+		if (status != AL_PLAYING && bqueued > 0) {
+			OpenAL_ErrorPrint( alSourcePlay(mas->source_id) );
+		}
+#endif // USE_OPENAL
+	}
+}
+
+// call this in shutdown to stop and close audio
+static void mve_audio_stop()
+{
+	if (!audiobuf_created)
+		return;
+
+#ifdef USE_OPENAL
+	ALint p = 0;
+
+	mve_audio_playing = 0;
+
+	OpenAL_ErrorPrint( alSourceStop(mas->source_id) );
+	OpenAL_ErrorPrint( alGetSourcei(mas->source_id, AL_BUFFERS_PROCESSED, &p) );
+	OpenAL_ErrorPrint( alSourceUnqueueBuffers(mas->source_id, p, mas->audio_buffer) );
+	OpenAL_ErrorPrint( alDeleteSources(1, &mas->source_id) );
+
+	for (int i = 0; i < MVE_AUDIO_BUFFERS; i++) {
+		// make sure that the buffer is real before trying to delete, it could crash for some otherwise
+		if ( (mas->audio_buffer[i] != 0) && alIsBuffer(mas->audio_buffer[i]) ) {
+			OpenAL_ErrorPrint( alDeleteBuffers(1, &mas->audio_buffer[i]) );
+		}
+	}
+
+	if (mas != NULL) {
+		vm_free(mas);
+		mas = NULL;
+	}
+#endif // USE_OPENAL
+}
+
+int mve_audio_data(ubyte major, ubyte *data)
+{
+	static const int selected_chan=1;
+	int chan;
+	int nsamp;
+
+	if (mve_audio_canplay) {
+#ifdef USE_OPENAL
+		chan = mve_get_ushort(data + 2);
+		nsamp = mve_get_ushort(data + 4);
+
+		if (chan & selected_chan) {
+			ALint bprocessed, bqueued, status;
+			ALuint bid;
+
+			OpenAL_ErrorCheck( alGetSourcei(mas->source_id, AL_BUFFERS_PROCESSED, &bprocessed), return 0 );
+
+			while (bprocessed-- > 2)
+				OpenAL_ErrorPrint( alSourceUnqueueBuffers(mas->source_id, 1, &bid) );
+
+			OpenAL_ErrorCheck( alGetSourcei(mas->source_id, AL_BUFFERS_QUEUED, &bqueued), return 0 );
+		    
+			if (bqueued == 0) 
+				mprintf(("MVE: Buffer underun (First is normal)\n"));
+
+			OpenAL_ErrorCheck( alGetSourcei(mas->source_id, AL_SOURCE_STATE, &status), return 0 );
+
+			if ( (mve_audio_playing) && (status != AL_PLAYING) && (bqueued > 0) ) {
+				OpenAL_ErrorCheck( alSourcePlay(mas->source_id), return 0 );
+			}
+
+			if (bqueued < MVE_AUDIO_BUFFERS) {
+				short *buf = NULL;
+
+				/* HACK: +4 mveaudio_uncompress adds 4 more bytes */
+				if (major == 8) {
+				    if (mve_audio_compressed) {
+						nsamp += 4;
+
+						buf = (short *)vm_malloc(nsamp);
+						mveaudio_uncompress(buf, data, -1); /* XXX */
+					} else {
+						nsamp -= 8;
+						data += 8;
+
+						buf = (short *)vm_malloc(nsamp);
+						memcpy(buf, data, nsamp);
+					}	              
+				} else {
+					buf = (short *)vm_malloc(nsamp);
+
+					memset(buf, 0, nsamp); /* XXX */
+				}
+
+
+				if (!mas->audio_buffer[mve_audio_buffer_tail]) {
+					OpenAL_ErrorCheck( alGenBuffers(1,&mas->audio_buffer[mve_audio_buffer_tail]), { vm_free(buf); return 0; } );
+				}
+
+				OpenAL_ErrorCheck( alBufferData(mas->audio_buffer[mve_audio_buffer_tail], mas->format, buf, nsamp, mas->sample_rate), { vm_free(buf); return 0; } );
+	    
+				OpenAL_ErrorCheck( alSourceQueueBuffers(mas->source_id, 1, &mas->audio_buffer[mve_audio_buffer_tail]), { vm_free(buf); return 0;} );
+
+				//fprintf(stderr,"Queued buffer %d(%d)\n", mve_audio_buftail, mas->audio_buffer[mve_audio_buftail]);
+
+				if (++mve_audio_buffer_tail == MVE_AUDIO_BUFFERS)
+					mve_audio_buffer_tail = 0;
+
+				bqueued++;
+				vm_free(buf);
+			} else {
+				mprintf(("MVE: Buffer overrun: Queue full\n"));
+			}
+		}
+#endif // USE_OPENAL
+	}
+
+	return 1;
+}
+
+/*************************
+ * video handlers
+ *************************/
+
+int mve_video_createbuf(ubyte minor, ubyte *data)
+{
+	if (videobuf_created)
+		return 1;
+
+	short w, h;
+	short count, truecolor;
+	w = mve_get_short(data);
+	h = mve_get_short(data+2);
+
+	if (minor > 0) {
+		count = mve_get_short(data+4);
+	} else {
+		count = 1;
+	}
+
+	if (minor > 1) {
+		truecolor = mve_get_short(data+6);
+	} else {
+		truecolor = 0;
+	}
+
+	g_width = w << 3;
+	g_height = h << 3;
+
+	g_vBackBuf1 = g_vBuffers = vm_malloc(g_width * g_height * 4);
+
+	if (g_vBackBuf1 == NULL) {
+		nprintf(("MOVIE", "ERROR: Can't allocate video buffer"));
+		videobuf_created = 1;
+		return 0;
+	}
+
+	if (truecolor)
+		g_vBackBuf2 = (ushort *)g_vBackBuf1 + (g_width * g_height);
+	else
+		g_vBackBuf2 = (ubyte *)g_vBackBuf1 + (g_width * g_height);
+		
+	memset(g_vBackBuf1, 0, g_width * g_height * 4);
+
+	g_truecolor = truecolor;
+	videobuf_created = 1;
+
+	if (gr_screen.mode == GR_OPENGL) {
+		GLfloat scale_by = 1.0f;
+
+		float screen_ratio = (float)gr_screen.max_w / (float)gr_screen.max_h;
+		float movie_ratio = (float)g_width / (float)g_height;
+
+		if (screen_ratio > movie_ratio)
+			scale_by = (float)gr_screen.max_h / (float)g_height;
+		else
+			scale_by = (float)gr_screen.max_w / (float)g_width;
+
+		// don't bother setting anything if we aren't going to need it
+		if (!Cmdline_noscalevid && (scale_by != 1.0f)) {
+			glMatrixMode(GL_MODELVIEW);
+			glPushMatrix();
+			glLoadIdentity();
+
+			glScalef( scale_by, scale_by, 1.0f );
+			mve_scale_video = 1;
+		}
+
+		if (mve_scale_video) {
+			g_screenX = ((fl2i(gr_screen.max_w / scale_by + 0.5f) - g_width) / 2);
+			g_screenY = ((fl2i(gr_screen.max_h / scale_by + 0.5f) - g_height) / 2);
+		} else {
+			// centers on 1024x768, fills on 640x480
+			g_screenX = ((gr_screen.max_w - g_width) / 2);
+			g_screenY = ((gr_screen.max_h - g_height) / 2);
+		}
+
+		// set additional values for screen width/height and UV coords
+		if (gr_screen.mode == GR_OPENGL) {
+			gl_screenYH = g_screenY + g_height;
+			gl_screenXW = g_screenX + g_width;
+
+			gl_screenU = i2fl(g_width) / i2fl(wp2);
+			gl_screenV = i2fl(g_height) / i2fl(hp2);
+		}
+	}
+
+	return 1;
+}
+
+static void mve_convert_and_draw()
+{
+	ushort *pDests;
+	ushort *pSrcs = NULL;
+	ushort *pixels = (ushort *)g_vBackBuf1;
+	int x, y;
+
+	ubyte *pSrcs8 = NULL;
+	ubyte *pixels8 = (ubyte *)g_vBackBuf1;
+	ubyte r, g, b;
+	ushort bit_16;
+
+	if (g_truecolor)
+		pSrcs = pixels;
+	else
+		pSrcs8 = pixels8;
+
+	pDests = pixelbuf;
+
+	if (gr_screen.mode != GR_OPENGL) {
+		if (g_screenWidth > g_width)
+			pDests += ((g_screenWidth - g_width) / 2) / 2;
+
+		if (g_screenHeight > g_height)
+			pDests += ((g_screenHeight - g_height) / 2) * g_screenWidth;
+	}
+
+	for (y=0; y<g_height; y++) {
+		for (x = 0; x < g_width; x++) {
+			if (g_truecolor) {
+				Assert( pSrcs != NULL );
+
+				pDests[x] = (1<<15)|*pSrcs;
+				pSrcs++;
+			} else {
+				Assert( pSrcs8 != NULL );
+
+				// grab rgb color
+				r = (g_palette[(*pSrcs8)*3] / 2);
+				g = (g_palette[(*pSrcs8)*3 + 1] / 2);
+				b = (g_palette[(*pSrcs8)*3 + 2] / 2);
+
+				// stuff the color
+				bit_16 = (ushort)(r << Gr_t_red.shift);
+				bit_16 |= (ushort)(g << Gr_t_green.shift);
+				bit_16 |= (ushort)(b << Gr_t_blue.shift);
+				bit_16 |= (ushort)(Gr_t_alpha.mask);
+
+				// stuff the pixel
+				pDests[x] = (1<<15)|bit_16;
+
+				pSrcs8++;
+			}
+		}
+
+		pDests += g_screenWidth;
+	}
+
+}
+
+void mve_video_display()
+{
+	fix t1 = timer_get_fixed_seconds();
+
+	mve_convert_and_draw();
+
+	// this thing is basically stupid but I don't care
+	// micro_frame_delay is divided by 10 to match mve_video_skiptimer overflow catch
+	if ( mve_video_skiptimer > (uint)(micro_frame_delay/10) ) {
+		// we are running slow so subtract desired time from actual and skip this frame
+		mve_video_skiptimer -= (micro_frame_delay/10);
+		return;
+	} else {
+		// zero out so we can get a new count
+		mve_video_skiptimer = 0;
+	}
+
+	if (gr_screen.mode == GR_OPENGL) {
+		glTexSubImage2D(GL_state.Texture.GetTarget(), 0, 0, 0, g_width, g_height, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, pixelbuf);
+
+		glBegin(GL_QUADS);
+			glTexCoord2f(0, 0);
+				glVertex2i(g_screenX, g_screenY);
+
+			glTexCoord2f(0, gl_screenV);
+				glVertex2i(g_screenX, gl_screenYH);
+
+			glTexCoord2f(gl_screenU, gl_screenV);
+				glVertex2i(gl_screenXW, gl_screenYH);
+
+			glTexCoord2f(gl_screenU, 0);
+				glVertex2i(gl_screenXW, g_screenY);
+		glEnd();
+	} else {
+		// DDOI - This is probably really fricking slow
+		int bitmap = bm_create (16, g_screenWidth, g_screenHeight, pixelbuf, 0);
+		gr_set_bitmap (bitmap);
+		gr_bitmap (g_screenX, g_screenY, true);
+		bm_release (bitmap);
+	}
+
+	gr_flip();
+	os_poll();
+
+	fix t2 = timer_get_fixed_seconds();
+
+	// only get a new count if we are definitely through with old count
+	if ( mve_video_skiptimer == 0 ) {
+		// for a more accurate count convert the frame rate to a float and multiply
+		// by one-hundred-thousand before converting to an uint.
+		mve_video_skiptimer = (uint)(f2fl(t2-t1) * 100000);
+	}
+
+	int k = key_inkey();
+	switch (k) {
+		case KEY_ESC:
+		case KEY_ENTER:
+		case KEY_SPACEBAR:
+			mve_playing = 0;
+	}
+
+	//mprintf(("mve frame took this long: %.6f\n", f2fl(t2-t1) / 1000.0f));
+}
+
+int mve_video_init(ubyte *data)
+{
+	if (video_inited)
+		return 1;
+
+	short width, height;
+
+	width = mve_get_short(data);
+	height = mve_get_short(data+2);
+
+	g_screenWidth = width;
+	g_screenHeight = height;
+
+	// DDOI - Allocate RGB565 pixel buffer
+	pixelbuf = (ushort *)vm_malloc(g_screenWidth * g_screenHeight * 2);
+
+	if (pixelbuf == NULL) {
+		nprintf(("MOVIE", "ERROR: Can't allocate memory for pixelbuf"));
+		video_inited = 1;
+		return 0;
+	}
+
+	memset(pixelbuf, 0, g_screenWidth * g_screenHeight * 2);
+
+	if (gr_screen.mode == GR_OPENGL) {
+		opengl_set_texture_target(GL_TEXTURE_2D);
+		opengl_tcache_get_adjusted_texture_size(g_screenWidth, g_screenHeight, &wp2, &hp2);
+
+		glGenTextures(1, &GLtex);
+
+		Assert( GLtex != 0 );
+
+		if ( GLtex == 0 ) {
+			nprintf(("MOVIE", "ERROR: Can't create a GL texture"));
+			video_inited = 1;
+			return 0;
+		}
+
+		gr_set_lighting(false, false);
+		GL_state.Texture.DisableAll();
+
+		GL_state.Texture.SetActiveUnit(0);
+		GL_state.Texture.SetTarget(GL_texture_target);
+		GL_state.Texture.Enable(GLtex);
+
+		GL_state.SetTextureSource(TEXTURE_SOURCE_DECAL);
+		GL_state.SetAlphaBlendMode(ALPHA_BLEND_NONE);
+		GL_state.SetZbufferType(ZBUFFER_TYPE_NONE);
+
+		GL_state.Texture.SetWrapS(GL_CLAMP_TO_EDGE);
+		GL_state.Texture.SetWrapT(GL_CLAMP_TO_EDGE);
+
+		// NOTE: using NULL instead of pixelbuf crashes some drivers, but then so does pixelbuf
+		glTexImage2D(GL_state.Texture.GetTarget(), 0, GL_RGB5_A1, wp2, hp2, 0, GL_BGRA_EXT, GL_UNSIGNED_SHORT_1_5_5_5_REV, NULL);
+
+		// set our color so that we can make sure that it's correct
+		glColor3f(1.0f, 1.0f, 1.0f);
+	}
+#ifndef NO_DIRECT3D
+	else if (gr_screen.mode == GR_DIRECT3D) {
+		// TODO: is there a fast way to do frames in D3D too?
+	}
+#endif
+
+	memset(g_palette, 0, 768);
+	
+	video_inited = 1;
+	
+	return 1;
+}
+
+void mve_video_palette(ubyte *data)
+{
+	short start, count;
+	start = mve_get_short(data);
+	count = mve_get_short(data+2);
+	memcpy(g_palette + 3*start, data+4, 3*count);
+}
+
+void mve_video_codemap(ubyte *data, int len)
+{
+	g_pCurMap = data;
+	g_nMapLength = len;
+}
+
+void mve_video_data(ubyte *data, int len)
+{
+	short nFrameHot, nFrameCold;
+	short nXoffset, nYoffset;
+	short nXsize, nYsize;
+	ushort nFlags;
+	ubyte *temp;
+
+	nFrameHot = mve_get_short(data);
+	nFrameCold = mve_get_short(data+2);
+	nXoffset = mve_get_short(data+4);
+	nYoffset = mve_get_short(data+6);
+	nXsize = mve_get_short(data+8);
+	nYsize = mve_get_short(data+10);
+	nFlags = mve_get_ushort(data+12);
+
+	if (nFlags & 1) {
+		temp = (ubyte *)g_vBackBuf1;
+		g_vBackBuf1 = g_vBackBuf2;
+		g_vBackBuf2 = temp;
+	}
+
+	if (g_truecolor)
+		decodeFrame16((ubyte *)g_vBackBuf1, g_pCurMap, g_nMapLength, data+14, len-14);
+	else
+		decodeFrame8((ubyte *)g_vBackBuf1, g_pCurMap, g_nMapLength, data+14, len-14);
+}
+
+void mve_end_chunk()
+{
+	g_pCurMap = NULL;
+}
+
+void mve_init(MVESTREAM *mve)
+{
+	// reset to default values
+	mve_audio_buffer_tail = 0;
+	mve_audio_playing = 0;
+	mve_audio_canplay = 0;
+	mve_audio_compressed = 0;
+	audiobuf_created = 0;
+
+	videobuf_created = 0;
+	video_inited = 0;
+	mve_scale_video = 0;
+
+	mve_playing = 1;
+}
+
+void mve_play(MVESTREAM *mve)
+{
+	int init_timer = 0, timer_error = 0;
+	int cont = 1;
+
+	if (!timer_started)
+		mve_timer_start();
+
+	while (cont && mve_playing && !timer_error) {
+		cont = mve_play_next_chunk(mve);
+
+		if (micro_frame_delay && !init_timer) {
+			mve_timer_start();
+			init_timer = 1;
+		}
+
+		timer_error = mve_do_timer_wait();
+	}
+}
+
+void mve_shutdown()
+{
+	if (gr_screen.mode == GR_OPENGL) {
+		if (mve_scale_video) {
+			glMatrixMode(GL_MODELVIEW);
+			glPopMatrix();
+		}
+
+		GL_state.Texture.Disable();
+		GL_state.Texture.Delete(GLtex);
+		glDeleteTextures(1, &GLtex);
+		GLtex = 0;
+	}
+
+	if (pixelbuf != NULL) {
+		vm_free(pixelbuf);
+		pixelbuf = NULL;
+	}
+
+	if (g_vBuffers != NULL) {
+		vm_free(g_vBuffers);
+		g_vBuffers = NULL;
+	}
+
+	mve_audio_stop();
+
+	mve_timer_stop();
+}
@@ -0,0 +1,957 @@
+/*
+ * $Logfile: /Freespace2/code/cutscene/oggplayer.cpp $
+ * $Revision: 1.1.2.5 $
+ * $Date: 2007-04-11 14:44:32 $
+ * $Author: taylor $
+ *
+ * movie player code
+ * 
+ * $Log: not supported by cvs2svn $
+ * Revision 1.1.2.4  2007/03/22 20:23:58  taylor
+ * fix stupidness that screwed up RGB values (Mantis #1307)
+ *
+ * Revision 1.1.2.3  2007/02/10 00:01:53  taylor
+ * make sure that our color is getting set properly (should properly fix the red/green tint problem, Mantis #1041)
+ * slight optimization for Theora YUV->RGB converter
+ *
+ * Revision 1.1.2.2  2007/01/07 12:10:18  taylor
+ * remove D3D support for Theora movies, make sure that it doesn't try to play them (since it wouldn't work properly anyway)
+ * fix triple-buffer problem with page flipping (Mantis #1190)
+ *
+ * Revision 1.1.2.1  2006/12/25 21:44:11  taylor
+ * initial OGG Theora movie support (likely to be rewritten at least in large part)
+ *
+ *
+ *
+ * $NoKeywords: $
+ *
+ */
+
+// This player code is based largely on the player example in the libtheora package
+// and so they get a fair bit of credit for this code, even if in ideas/comments only
+
+
+#ifdef SCP_UNIX
+#include <sys/time.h>
+#include <errno.h>
+#endif
+
+#include "globalincs/pstypes.h"
+#include "cfile/cfile.h"
+#include "graphics/gropengl.h"
+#include "graphics/gropengltexture.h"
+#include "graphics/gropenglextension.h"
+#include "graphics/gropenglshader.h"
+#include "graphics/gropenglstate.h"
+#include "graphics/2d.h"
+#include "io/key.h"
+#include "osapi/osapi.h"
+#include "sound/sound.h"
+#include "sound/ds.h"
+#include "bmpman/bmpman.h"
+#include "cutscene/oggplayer.h"
+#include "io/timer.h"
+
+#include "theora/theora.h"
+#include "vorbis/codec.h"
+
+
+extern int Cmdline_noscalevid;
+
+static int hp2, wp2;
+static int video_inited = 0;
+static int scale_video = 0;
+static int playing = 1;
+static ubyte *pixelbuf = NULL;
+static uint g_screenWidth = 0;
+static uint g_screenHeight = 0;
+static int g_screenX = 0;
+static int g_screenY = 0;
+
+static GLuint GLtex = 0;
+static GLint gl_screenYH = 0;
+static GLint gl_screenXW = 0;
+static GLfloat gl_screenU = 0;
+static GLfloat gl_screenV = 0;
+
+// video externs from API graphics functions
+extern void opengl_tcache_get_adjusted_texture_size(int w_in, int h_in, int *w_out, int *h_out);
+
+static int timer_started = 0;
+static longlong base_time = -1;
+#ifdef SCP_UNIX
+static struct timeval timer_expire = { 0, 0 };
+#else
+static int timer_expire;
+#endif
+
+static int audio_inited = 0;
+static int audio_buffer_tail = 0;
+static ALuint audio_sid = 0;
+#define OGG_AUDIO_BUFFERS	15
+static ALuint audio_buffers[OGG_AUDIO_BUFFERS];
+
+// single audio fragment audio buffering
+static int audiobuf_fill = 0;
+static short *audiobuf = NULL;
+static longlong audiobuf_granulepos = 0; // time position of last sample
+static int audiofd_fragsize = 0;
+
+// single frame video buffering
+static longlong videobuf_granulepos = -1;
+static double videobuf_time = 0;
+
+
+// -----------------------------------------------------------------------------
+//  Utility items
+//
+
+// helper; just grab some more compressed bitstream and sync it for page extraction
+static int OGG_buffer_data(THEORAFILE *movie)
+{
+	char *buffer = ogg_sync_buffer(&movie->osyncstate, 4096);
+	int bytes = cfread(buffer, 1, 4096, movie->cfp);
+
+	ogg_sync_wrote(&movie->osyncstate, bytes);
+
+	return bytes;
+}
+
+
+// helper: push a page into the appropriate steam
+// this can be done blindly; a stream won't accept a page that doesn't belong to it
+static void OGG_queue_page(THEORAFILE *movie)
+{
+	Assert( movie->theora_p );
+
+	ogg_stream_pagein(&movie->t_osstate, &movie->opage);
+
+	if (movie->vorbis_p)
+		ogg_stream_pagein(&movie->v_osstate, &movie->opage);
+}
+
+// get relative time since beginning playback, compensating for A/V drift
+static double OGG_get_time()
+{
+#ifdef SCP_UNIX
+	longlong now;
+	struct timeval tv;
+
+	gettimeofday(&tv, NULL);
+	now = tv.tv_sec * 1000 + tv.tv_usec / 1000;
+
+	if (base_time == -1)
+		base_time = now;
+
+	return (now - base_time) * 0.001;
+#else
+	if (base_time == -1)
+		base_time = timer_get_milliseconds();
+
+	return (timer_get_milliseconds() - base_time) * 0.001;
+#endif
+}
+
+static void OGG_timer_init()
+{
+#if SCP_UNIX
+	int nsec = 0;
+
+	gettimeofday(&timer_expire, NULL);
+
+	timer_expire.tv_usec += (int)((videobuf_time - OGG_get_time()) * 1000000.0);
+
+	if (timer_expire.tv_usec > 1000000) {
+		nsec = timer_expire.tv_usec / 1000000;
+		timer_expire.tv_sec += nsec;
+		timer_expire.tv_usec -= nsec * 1000000;
+	}
+#else
+	timer_expire = timer_get_microseconds();
+	timer_expire += (int)((videobuf_time - OGG_get_time()) * 1000000.0);
+#endif
+
+	timer_started = 1;
+}
+
+static void OGG_timer_do_wait()
+{
+	if (!timer_started)
+		OGG_timer_init();
+
+#if SCP_UNIX
+	int nsec = 0;
+	struct timespec ts, tsRem;
+	struct timeval tv;
+
+	gettimeofday(&tv, NULL);
+
+	if (tv.tv_sec > timer_expire.tv_sec)
+		goto end;
+
+	if ( (tv.tv_sec == timer_expire.tv_sec) && (tv.tv_usec >= timer_expire.tv_usec) )
+		goto end;
+
+	ts.tv_sec = timer_expire.tv_sec - tv.tv_sec;
+	ts.tv_nsec = 1000 * (timer_expire.tv_usec - tv.tv_usec);
+
+	if (ts.tv_nsec < 0) {
+		ts.tv_nsec += 1000000000UL;
+		--ts.tv_sec;
+	}
+
+	if ( (nanosleep(&ts, &tsRem) == -1) && (errno == EINTR) ) {
+		// so we got an error that was a signal interupt, try to sleep again with remainder of time
+		if ( (nanosleep(&tsRem, NULL) == -1) && (errno == EINTR) ) {
+			mprintf(("MVE: Timer error! Aborting movie playback!\n"));
+			return;
+		}
+	}
+
+end:
+    timer_expire.tv_usec += (int)((videobuf_time - OGG_get_time()) * 1000000.0);
+
+    if (timer_expire.tv_usec > 1000000) {
+        nsec = timer_expire.tv_usec / 1000000;
+        timer_expire.tv_sec += nsec;
+        timer_expire.tv_usec -= nsec * 1000000;
+    }
+#else
+	int tv, ts, ts2;
+
+	tv = timer_get_microseconds();
+
+	if (tv > timer_expire)
+		goto end;
+
+	ts = timer_expire - tv;
+
+	ts2 = ts/1000;
+
+	Sleep(ts2);
+
+end:
+	timer_expire += (int)((videobuf_time - OGG_get_time()) * 1000000.0);
+#endif
+}
+
+//
+//  End Utility items
+// -----------------------------------------------------------------------------
+
+// -----------------------------------------------------------------------------
+//  That wonderful Audio
+//
+
+static void OGG_audio_init(vorbis_info *vinfo)
+{
+	if (audio_inited)
+		return;
+
+	Assert( vinfo != NULL );
+
+	audio_inited = 1;
+
+	OpenAL_ErrorCheck( alGenSources(1, &audio_sid), return );
+	OpenAL_ErrorPrint( alSourcef(audio_sid, AL_GAIN, 1.0f) );
+
+	memset( &audio_buffers, 0, sizeof(ALuint) * OGG_AUDIO_BUFFERS );
+
+	audiofd_fragsize = (((vinfo->channels * 16) / 8) * vinfo->rate);
+
+	audiobuf = (short *) vm_malloc(audiofd_fragsize);
+}
+
+static void OGG_audio_close()
+{
+	if ( !audio_inited )
+		return;
+
+	audio_inited = 0;
+
+	ALint p = 0;
+
+	OpenAL_ErrorPrint( alSourceStop(audio_sid) );
+	OpenAL_ErrorPrint( alGetSourcei(audio_sid, AL_BUFFERS_PROCESSED, &p) );
+	OpenAL_ErrorPrint( alSourceUnqueueBuffers(audio_sid, p, audio_buffers) );
+	OpenAL_ErrorPrint( alDeleteSources(1, &audio_sid) );
+
+	for (int i = 0; i < OGG_AUDIO_BUFFERS; i++) {
+		// make sure that the buffer is real before trying to delete, it could crash for some otherwise
+		if ( (audio_buffers[i] != 0) && alIsBuffer(audio_buffers[i]) ) {
+			OpenAL_ErrorPrint( alDeleteBuffers(1, &audio_buffers[i]) );
+		}
+	}
+
+	audio_sid = 0;
+	audio_buffer_tail = 0;
+
+	audiobuf_fill = 0;
+	audiobuf_granulepos = 0;
+	audiofd_fragsize = 0;
+
+	if (audiobuf != NULL) {
+		vm_free(audiobuf);
+		audiobuf = NULL;
+	}
+}
+
+static void OGG_audio_write(vorbis_info *vorbis, bool *ready)
+{
+	ALint status, queued, processed = 0;
+	ALuint bid = 0;
+
+	if ( !audio_inited || !(*ready) )
+		return;
+
+	OpenAL_ErrorCheck( alGetSourcei(audio_sid, AL_BUFFERS_PROCESSED, &processed), return );
+
+	while (processed-- > 2)
+		OpenAL_ErrorPrint( alSourceUnqueueBuffers(audio_sid, 1, &bid) );
+
+	if ( !(*ready) )
+		return;
+
+	OpenAL_ErrorCheck( alGetSourcei(audio_sid, AL_BUFFERS_QUEUED, &queued), return );
+
+	if ( audiobuf_fill && (queued < OGG_AUDIO_BUFFERS) ) {
+		if ( !audio_buffers[audio_buffer_tail] )
+			OpenAL_ErrorCheck( alGenBuffers(1, &audio_buffers[audio_buffer_tail]), return );
+
+		ALenum format = (vorbis->channels == 2) ? AL_FORMAT_STEREO16 : AL_FORMAT_MONO16;
+
+		OpenAL_ErrorCheck( alBufferData(audio_buffers[audio_buffer_tail], format, audiobuf, audiobuf_fill, vorbis->rate), return );
+	    
+		OpenAL_ErrorCheck( alSourceQueueBuffers(audio_sid, 1, &audio_buffers[audio_buffer_tail]), return );
+
+		if (++audio_buffer_tail == OGG_AUDIO_BUFFERS)
+			audio_buffer_tail = 0;
+
+		audiobuf_fill = 0;
+		*ready = false;
+	} else {
+	//	mprintf(("Theora WARN: Buffer overrun: Queue full\n"));
+	}
+
+	OpenAL_ErrorCheck( alGetSourcei(audio_sid, AL_SOURCE_STATE, &status), return );
+	
+	OpenAL_ErrorCheck( alGetSourcei(audio_sid, AL_BUFFERS_QUEUED, &queued), return );
+
+	if ( (status != AL_PLAYING) && (queued > 0) )
+		OpenAL_ErrorPrint( alSourcePlay(audio_sid) );
+}
+
+//
+//  End Audio stuff
+// -----------------------------------------------------------------------------
+
+// -----------------------------------------------------------------------------
+//  Video related stuff
+//
+
+static void OGG_video_init(theora_info *tinfo)
+{
+	float scale_by = 0.0f;
+
+	if (video_inited)
+		return;
+
+	Assert( tinfo != NULL );
+
+	g_screenWidth = tinfo->frame_width;
+	g_screenHeight = tinfo->frame_height;
+
+
+	if (gr_screen.mode == GR_OPENGL) {
+		opengl_set_texture_target(GL_TEXTURE_2D);
+		opengl_tcache_get_adjusted_texture_size(g_screenWidth, g_screenHeight, &wp2, &hp2);
+
+		glGenTextures(1, &GLtex);
+
+		Assert( GLtex != 0 );
+
+		if ( GLtex == 0 ) {
+			nprintf(("MOVIE", "ERROR: Can't create a GL texture"));
+			video_inited = 1;
+			return;
+		}
+
+		gr_set_lighting(false, false);
+		GL_state.Texture.DisableAll();
+
+		GL_state.Texture.SetActiveUnit(0);
+		GL_state.Texture.SetTarget(GL_texture_target);
+		GL_state.Texture.Enable(GLtex);
+
+		GL_state.SetTextureSource(TEXTURE_SOURCE_DECAL);
+		GL_state.SetAlphaBlendMode(ALPHA_BLEND_NONE);
+		GL_state.SetZbufferType(ZBUFFER_TYPE_NONE);
+
+		GL_state.Texture.SetWrapS(GL_CLAMP_TO_EDGE);
+		GL_state.Texture.SetWrapT(GL_CLAMP_TO_EDGE);
+
+		// NOTE: using NULL instead of pixelbuf crashes some drivers, but then so does pixelbuf
+		glTexImage2D(GL_state.Texture.GetTarget(), 0, GL_RGB8, wp2, hp2, 0, GL_BGR, GL_UNSIGNED_BYTE, NULL);
+
+		float screen_ratio = (float)gr_screen.max_w / (float)gr_screen.max_h;
+		float movie_ratio = (float)g_screenWidth / (float)g_screenHeight;
+
+		if (screen_ratio > movie_ratio)
+			scale_by = (float)gr_screen.max_h / (float)g_screenHeight;
+		else
+			scale_by = (float)gr_screen.max_w / (float)g_screenWidth;
+
+		// don't bother setting anything if we aren't going to need it
+		if (!Cmdline_noscalevid && (scale_by != 1.0f)) {
+			glMatrixMode(GL_MODELVIEW);
+			glPushMatrix();
+			glLoadIdentity();
+
+			glScalef( scale_by, scale_by, -1.0f );
+			scale_video = 1;
+		}
+
+		// set our color so that we can make sure that it's correct
+		glColor3f(1.0f, 1.0f, 1.0f);
+	}
+
+	pixelbuf = (ubyte *) vm_malloc_q(g_screenWidth * g_screenHeight * 3);
+
+	if (pixelbuf == NULL) {
+		nprintf(("MOVIE", "ERROR: Can't allocate memory for pixelbuf"));
+		video_inited = 1;
+		return;
+	}
+
+	memset( pixelbuf, 0, g_screenWidth * g_screenHeight * 3 );
+
+	if (scale_video) {
+		g_screenX = ((fl2i(gr_screen.max_w / scale_by + 0.5f) - g_screenWidth) / 2);
+		g_screenY = ((fl2i(gr_screen.max_h / scale_by + 0.5f) - g_screenHeight) / 2);
+	} else {
+		// centers on 1024x768, fills on 640x480
+		g_screenX = ((gr_screen.max_w - g_screenWidth) / 2);
+		g_screenY = ((gr_screen.max_h - g_screenHeight) / 2);
+	}
+
+	// set additional values for screen width/height and UV coords
+	if (gr_screen.mode == GR_OPENGL) {
+		gl_screenYH = g_screenY + g_screenHeight;
+		gl_screenXW = g_screenX + g_screenWidth;
+
+		gl_screenU = i2fl(g_screenWidth) / i2fl(wp2);
+		gl_screenV = i2fl(g_screenHeight) / i2fl(hp2);
+	}
+
+	video_inited = 1;
+}
+
+static void OGG_video_close()
+{
+	if ( !video_inited ) {
+		return;
+	}
+
+	if (gr_screen.mode == GR_OPENGL) {
+		if (scale_video) {
+			glMatrixMode(GL_MODELVIEW);
+			glPopMatrix();
+		}
+
+		GL_state.Texture.Disable();
+		GL_state.Texture.Delete(GLtex);
+		glDeleteTextures(1, &GLtex);
+
+		opengl_set_texture_target();
+
+		GLtex = 0;
+	}
+
+	if (pixelbuf != NULL) {
+		vm_free(pixelbuf);
+		pixelbuf = NULL;
+	}
+
+	video_inited = 0;
+	scale_video = 0;
+	pixelbuf = NULL;
+	g_screenWidth = 0;
+	g_screenHeight = 0;
+	g_screenX = 0;
+	g_screenY = 0;
+
+	GLtex = 0;
+	gl_screenYH = 0;
+	gl_screenXW = 0;
+	gl_screenU = 0;
+	gl_screenV = 0;
+}
+
+static void convert_YUV_to_RGB(yuv_buffer *yuv)
+{
+	int Y1, Y2, U, V;
+	int R = 0, G = 0, B = 0;
+	int C, D, E;
+	uint x, y;
+	uint width_2 = g_screenWidth/2;
+
+	ubyte *pix = &pixelbuf[0];
+
+	ubyte *y_ptr = (ubyte *)yuv->y;
+	ubyte *u_ptr = (ubyte *)yuv->u;
+	ubyte *v_ptr = (ubyte *)yuv->v;
+
+	for (y = 0; y < g_screenHeight; y++) {
+		for (x = 0; x < width_2; x++) {
+			// we need two pixels of Y
+			Y1 = *y_ptr; y_ptr++;
+			Y2 = *y_ptr; y_ptr++;
+
+			// only one pixel of U and V (half the size of Y)
+			U = u_ptr[x];
+			V = v_ptr[x];
+
+			D = (U - 128);
+			E = (V - 128);
+
+			// first pixel
+			C = (Y1 - 16) * 298;
+	
+			R = ((C           + 409 * E + 128) >> 8);
+			G = ((C - 100 * D - 208 * E + 128) >> 8);
+			B = ((C + 516 * D           + 128) >> 8);
+
+			CLAMP(R, 0, 255);
+			CLAMP(G, 0, 255);
+			CLAMP(B, 0, 255);
+
+			*pix++ = (ubyte)B;
+			*pix++ = (ubyte)G;
+			*pix++ = (ubyte)R;
+
+			// second pixel (U and V values are resused)
+			C = (Y2 - 16) * 298;
+
+			R = ((C           + 409 * E + 128) >> 8);
+			G = ((C - 100 * D - 208 * E + 128) >> 8);
+			B = ((C + 516 * D           + 128) >> 8);
+
+			CLAMP(R, 0, 255);
+			CLAMP(G, 0, 255);
+			CLAMP(B, 0, 255);
+
+			*pix++ = (ubyte)B;
+			*pix++ = (ubyte)G;
+			*pix++ = (ubyte)R;
+		}
+
+		y_ptr += (yuv->y_stride - yuv->y_width);
+
+		// u and v have to be done every other row (it's a 2x2 block)
+		if (y % 2) {
+			u_ptr += yuv->uv_stride;
+			v_ptr += yuv->uv_stride;
+		}
+	}
+}
+
+static void OGG_video_draw(theora_state *tstate)
+{
+	yuv_buffer yuv;
+
+	theora_decode_YUVout(tstate, &yuv);
+	convert_YUV_to_RGB(&yuv);
+
+	if (gr_screen.mode == GR_OPENGL) {
+		glTexSubImage2D(GL_state.Texture.GetTarget(), 0, 0, 0, g_screenWidth, g_screenHeight, GL_BGR, GL_UNSIGNED_BYTE, pixelbuf);
+
+		glBegin(GL_QUADS);
+			glTexCoord2f(0, 0);
+				glVertex2i(g_screenX, g_screenY);
+
+			glTexCoord2f(0, gl_screenV);
+				glVertex2i(g_screenX, gl_screenYH);
+
+			glTexCoord2f(gl_screenU, gl_screenV);
+				glVertex2i(gl_screenXW, gl_screenYH);
+
+			glTexCoord2f(gl_screenU, 0);
+				glVertex2i(gl_screenXW, g_screenY);
+		glEnd();
+	}
+
+	gr_flip();
+	os_poll();
+
+	int k = key_inkey();
+	switch (k) {
+		case KEY_ESC:
+		case KEY_ENTER:
+		case KEY_SPACEBAR:
+			playing = 0;
+	}
+}
+
+//
+//  End Video related stuff
+// -----------------------------------------------------------------------------
+
+
+// -----------------------------------------------------------------------------
+//  The global stuff...
+//
+
+// close out a theora movie and free it's memory
+void theora_close(THEORAFILE *movie)
+{
+	Assert( movie != NULL );
+
+	timer_started = 0;
+	base_time = -1;
+
+	videobuf_granulepos = -1;
+	videobuf_time = 0;
+
+	if (movie->vorbis_p) {
+		ogg_stream_clear(&movie->v_osstate);
+
+		vorbis_block_clear(&movie->vblock);
+		vorbis_dsp_clear(&movie->vstate);
+		vorbis_comment_clear(&movie->vcomment);
+		vorbis_info_clear(&movie->vinfo);
+	}
+
+	if (movie->theora_p) {
+		ogg_stream_clear(&movie->t_osstate);
+
+		theora_clear(&movie->tstate);
+		theora_comment_clear(&movie->tcomment);
+		theora_info_clear(&movie->tinfo);
+	}
+ 
+	ogg_sync_clear(&movie->osyncstate);
+
+	// free the stream
+	if (movie->cfp)
+		cfclose(movie->cfp);
+
+	// free the struct
+	vm_free(movie);
+
+	playing = 1;
+}
+
+// opens a theora file, verifies we can use it, initializes everything needed
+// to decode and use the file
+THEORAFILE *theora_open(char *filename)
+{
+	char lower_name[MAX_FILENAME_LEN];
+	THEORAFILE *movie;
+	int stateflag = 0;
+
+	
+	// create the file
+	movie = (THEORAFILE *) vm_malloc_q( sizeof(THEORAFILE) );
+
+	if (movie == NULL)
+		return NULL;
+
+	memset( movie, 0, sizeof(THEORAFILE) );
+
+	// lower case filename for checking
+	memset( lower_name, 0, sizeof(lower_name) );
+	strncpy( lower_name, filename, strlen(filename) );
+	strlwr(lower_name);
+	
+	char *p = strchr( lower_name, '.' );
+	if ( p ) *p = 0;
+
+	SAFE_STRCAT( lower_name, ".ogg", sizeof(lower_name) );
+
+	// NOTE: Because the .ogg extension is used for both movies and sounds, we have to
+	//       be a bit more specific about our search locations, so we look only in the
+	//       two places that Theora movies might exist.
+	movie->cfp = cfopen(lower_name, "rb", CFILE_NORMAL, CF_TYPE_ROOT);
+
+	if (movie->cfp == NULL)
+		movie->cfp = cfopen(lower_name, "rb", CFILE_NORMAL, CF_TYPE_MOVIES);
+
+	if (movie->cfp == NULL) {
+		mprintf(("Theora ERROR:  Unable to find and open movie file named '%s'\n", lower_name));
+		goto Error;
+	}
+
+	// start up Ogg stream synchronization layer
+	ogg_sync_init(&movie->osyncstate);
+
+	// init supporting Vorbis structures needed in header parsing
+	vorbis_info_init(&movie->vinfo);
+	vorbis_comment_init(&movie->vcomment);
+
+	// init supporting Theora structures needed in header parsing
+	theora_comment_init(&movie->tcomment);
+	theora_info_init(&movie->tinfo);
+
+	// ogg file open so parse the headers
+	// we are only interested in Vorbis/Theora streams
+	while ( !stateflag ) {
+		int ret = OGG_buffer_data(movie);
+
+		if (ret == 0)
+			break;
+
+		while (ogg_sync_pageout(&movie->osyncstate, &movie->opage) > 0) {
+			ogg_stream_state test;
+
+			// is this a mandated initial header? If not, stop parsing
+			if ( !ogg_page_bos(&movie->opage) ) {
+  				// don't leak the page; get it into the appropriate stream
+				OGG_queue_page(movie);
+				stateflag = 1;
+				break;
+			}
+
+			ogg_stream_init(&test, ogg_page_serialno(&movie->opage));
+			ogg_stream_pagein(&test, &movie->opage);
+			ogg_stream_packetout(&test, &movie->opacket);
+
+			// identify the codec: try theora
+			if ( !movie->theora_p && (theora_decode_header(&movie->tinfo, &movie->tcomment, &movie->opacket) >= 0) ) {
+				// it is theora
+				memcpy( &movie->t_osstate, &test, sizeof(test) );
+				movie->theora_p = 1;
+			} else if ( !movie->vorbis_p && (vorbis_synthesis_headerin(&movie->vinfo, &movie->vcomment, &movie->opacket) >= 0) ) {
+				// it is vorbis
+				memcpy( &movie->v_osstate, &test, sizeof(test) );
+				movie->vorbis_p = 1;
+			} else {
+				// whatever it is, we don't care about it
+				ogg_stream_clear(&test);
+			}
+		}
+		// fall through to non-bos page parsing
+	}
+
+	// if we don't have usable video then bail out now
+	if ( !movie->theora_p ) {
+		mprintf(("Theora ERROR: Unable to find video data in '%s'\n", lower_name));
+		goto Error;
+	}
+
+	// go ahead and do some audio stream error checking...
+	if ( (movie->vinfo.channels < 0) || (movie->vinfo.channels > 2) ) {
+		mprintf(("Theora ERROR:  Unsupported number of audio channels!\n"));
+		movie->vorbis_p = 0;
+	}
+
+	// if we don't have usable audio then close out it's partial setup and just use the video
+	if ( !Sound_enabled || !movie->vorbis_p ) {
+		vorbis_info_clear(&movie->vinfo);
+		vorbis_comment_clear(&movie->vcomment);
+		movie->vorbis_p = 0;
+	}
+
+	// we're expecting more header packets.
+	while ( (movie->theora_p < 3) || (movie->vorbis_p && (movie->vorbis_p < 3)) ) {
+		int ret;
+
+		// look for further theora headers
+		while ( (movie->theora_p < 3) && (ret = ogg_stream_packetout(&movie->t_osstate, &movie->opacket)) ){ 
+			if ( (ret < 0) || theora_decode_header(&movie->tinfo, &movie->tcomment, &movie->opacket) ) {
+				mprintf(("Theora ERROR:  Error parsing Theora stream headers on '%s'!  Corrupt stream?\n", lower_name));
+				goto Error;
+			}
+
+			if (++movie->theora_p == 3)
+				break;
+		}
+
+		// look for more vorbis header packets
+		while ( movie->vorbis_p && (movie->vorbis_p < 3) && (ret = ogg_stream_packetout(&movie->v_osstate, &movie->opacket)) ) {
+			if ( (ret < 0) || vorbis_synthesis_headerin(&movie->vinfo, &movie->vcomment, &movie->opacket) ) {
+				mprintf(("Theora ERROR:  Error parsing Vorbis stream headers on '%s'!  Corrupt stream?\n", lower_name));
+				goto Error;
+			}
+
+			if (++movie->vorbis_p == 3)
+				break;
+		}
+
+		// The header pages/packets will arrive before anything else we care about, or the stream is not obeying spec
+
+		if ( ogg_sync_pageout(&movie->osyncstate, &movie->opage) > 0 ) {
+			OGG_queue_page(movie); // demux into the appropriate stream
+		} else {
+			ret = OGG_buffer_data(movie); // someone needs more data
+
+			if ( ret == 0 ) {
+				mprintf(("Theora ERROR:  End of file while searching for codec headers in '%s'!\n", lower_name));
+				goto Error;
+			}
+		}
+	}
+
+	// initialize video decoder
+	theora_decode_init(&movie->tstate, &movie->tinfo);
+
+	// and now for video stream error checking...
+	if (movie->tinfo.pixelformat != OC_PF_420) {
+		mprintf(("Theora ERROR:  Only the yuv420p chroma is supported!\n"));
+		goto Error;
+	}
+
+	if (movie->tinfo.offset_x || movie->tinfo.offset_y) {
+		mprintf(("Theora ERROR:  Player does not support frame offsets!\n"));
+		goto Error;
+	}
+
+	// initialize audio decoder, if there is audio
+	if (movie->vorbis_p) {
+		vorbis_synthesis_init(&movie->vstate, &movie->vinfo);
+		vorbis_block_init(&movie->vstate, &movie->vblock);
+	}
+
+	return movie;
+
+
+Error:
+	theora_close(movie);
+
+	return NULL;
+}
+
+// play that funky music... err, movie!
+void theora_play(THEORAFILE *movie)
+{
+	int i, j;
+	bool stateflag = false;
+	bool videobuf_ready = false;
+	bool audiobuf_ready = false;
+	double last_time = 0.0;	// for frame skipper
+
+	if ( (movie == NULL) || !movie->theora_p )
+		return;
+
+	// only OGL is supported
+	if (gr_screen.mode != GR_OPENGL)
+		return;
+
+	// open audio
+	if (movie->vorbis_p)
+		OGG_audio_init(&movie->vinfo);
+
+	// open video
+	OGG_video_init(&movie->tinfo);
+
+	// on to the main decode loop.	We assume in this example that audio
+	// and video start roughly together, and don't begin playback until
+	// we have a start frame for both.	This is not necessarily a valid
+	// assumption in Ogg A/V streams! It will always be true of the
+	// example_encoder (and most streams) though.
+
+	while (playing) {
+		// we want a video and audio frame ready to go at all times.	If
+		// we have to buffer incoming, buffer the compressed data (ie, let
+		// ogg do the buffering)
+		while ( movie->vorbis_p && !audiobuf_ready ) {
+			int ret;
+			float **pcm;
+
+			// if there's pending, decoded audio, grab it
+			if ( (ret = vorbis_synthesis_pcmout(&movie->vstate, &pcm)) > 0 ) {
+				int count = (audiobuf_fill / 2);
+				int maxsamples = (audiofd_fragsize - audiobuf_fill) / 2 / movie->vinfo.channels;
+
+				for (i = 0; (i < ret) && (i < maxsamples); i++) {
+					for (j = 0; j < movie->vinfo.channels; j++) {
+						int val = fl2i(pcm[j][i] * 32767.0f + 0.5f);
+
+						if (val > 32767)
+							val = 32767;
+
+						if (val < -32768)
+							val = -32768;
+
+						audiobuf[count++] = val;
+					}
+				}
+
+				vorbis_synthesis_read(&movie->vstate, i);
+
+				audiobuf_fill += (i * movie->vinfo.channels * 2);
+
+				if (audiobuf_fill == audiofd_fragsize)
+					audiobuf_ready = true;
+
+				if (movie->vstate.granulepos >= 0)
+					audiobuf_granulepos = movie->vstate.granulepos - ret + i;
+				else
+					audiobuf_granulepos += i;
+			} else {
+				// no pending audio; is there a pending packet to decode?
+				if ( ogg_stream_packetout(&movie->v_osstate, &movie->opacket) > 0 ) {
+					if ( vorbis_synthesis(&movie->vblock, &movie->opacket) == 0 )
+						vorbis_synthesis_blockin(&movie->vstate, &movie->vblock);
+				}
+				// we need more data; break out to suck in another page
+				else {
+					break;
+				}
+			}
+		}
+
+		while ( !videobuf_ready ) {
+			// theora is one in, one out...
+			if ( ogg_stream_packetout(&movie->t_osstate, &movie->opacket) <= 0 )
+				break;
+
+			theora_decode_packetin(&movie->tstate, &movie->opacket);
+				
+			videobuf_time = theora_granule_time(&movie->tstate, movie->tstate.granulepos);
+
+			double now_time = OGG_get_time();
+			double delay = videobuf_time - OGG_get_time();
+
+			// if we are running slow then skip the frame, otherwise to go into ready mode
+			if ( (delay >= 0.0) || (now_time - last_time >= 1.0) )
+				videobuf_ready = true;
+		}
+
+		if ( !videobuf_ready && (movie->vorbis_p && !audiobuf_ready) && cfeof(movie->cfp) )
+			break;
+
+		if ( !videobuf_ready || (movie->vorbis_p && !audiobuf_ready) ) {
+			// no data yet for somebody.	Grab another page
+			OGG_buffer_data(movie);
+
+			while (ogg_sync_pageout(&movie->osyncstate, &movie->opage) > 0)
+				OGG_queue_page(movie);
+		}
+
+		// If playback has begun, top audio buffer off immediately.
+		if ( stateflag )
+			OGG_audio_write(&movie->vinfo, &audiobuf_ready);
+
+		// are we at or past time for this video frame?
+		if ( stateflag && videobuf_ready && (videobuf_time <= OGG_get_time()) ) {
+			OGG_video_draw(&movie->tstate);
+			last_time = OGG_get_time();
+			videobuf_ready = false;
+		}
+
+		// if our buffers either don't exist or are ready to go, we can begin playback
+		if ( videobuf_ready && (audiobuf_ready || !movie->vorbis_p) )
+			stateflag = true;
+
+		// bail if we run into eof
+	//	if ( cfeof(movie->cfp) )
+	//		break;
+
+		if (videobuf_ready)
+			OGG_timer_do_wait();
+	}
+
+	// tear it all down
+	OGG_audio_close();
+	OGG_video_close();
+}
@@ -0,0 +1,52 @@
+/*
+ * $Logfile: /Freespace2/src/cutscene/oggplayer.h $
+ * $Revision: 1.1.2.1 $
+ * $Date: 2006-12-25 21:44:11 $
+ * $Author: taylor $
+ *
+ * main lib for using Theora movies
+ *
+ * $Log: not supported by cvs2svn $
+ *
+ * $NoKeywords: $
+ *
+ */
+
+#ifndef _OGGPLAYER_H
+#define _OGGPLAYER_H
+
+#include "globalincs/pstypes.h"
+
+#include "theora/theora.h"
+#include "vorbis/codec.h"
+
+struct CFILE;
+
+// structure for maintaining info on a THEORAFILE stream
+typedef struct THEORAFILE
+{
+	CFILE	*cfp;
+	ubyte	theora_p;
+	ubyte	vorbis_p;
+
+	ogg_sync_state		osyncstate;
+	ogg_page			opage;
+	ogg_packet			opacket;
+	ogg_stream_state 	v_osstate;
+	ogg_stream_state	t_osstate;
+
+	theora_info			tinfo;
+	theora_comment		tcomment;
+	theora_state		tstate;
+
+	vorbis_info			vinfo;
+	vorbis_dsp_state	vstate;
+	vorbis_block		vblock;
+	vorbis_comment		vcomment;
+} THEORAFILE;
+
+void theora_play(THEORAFILE *movie);
+THEORAFILE *theora_open(char *filename);
+void theora_close(THEORAFILE *movie);
+
+#endif
@@ -0,0 +1,501 @@
+
+#include "ddsutils/ddsutils.h"
+#include "cfile/cfile.h"
+#include "osapi/osregistry.h"
+
+
+/*	Currently supported formats:
+ *		DXT1a	(compressed)
+ *		DXT1c	(compressed)
+ *		DXT3	(compressed)
+ *		DXT5	(compressed)
+ *		uncompressed 1555	(16-bit, 1-bit being alpha)
+ *		uncompressed 8888	(32-bit)
+ *		uncompressed 888	(24-bit, no alpha)
+ *		paletted 8-bit		(256 colors)
+ */
+ 
+
+int Texture_compression_available = 0;
+int Use_compressed_textures = 0;
+
+// power of two check, to verify that a given DDS will always be usable since
+// some may not be power-of-2
+static inline int is_power_of_two(int w, int h)
+{
+	return ( (w && !(w & (w-1))) && (h && !(h & (h-1))) );
+}
+
+
+int dds_read_header(char *filename, CFILE *img_cfp, int *width, int *height, int *bpp, int *compression_type, int *levels, int *size, ubyte *palette)
+{
+	DDSURFACEDESC2 dds_header;
+	int code = 0;
+	CFILE *ddsfile;
+	char real_name[MAX_FILENAME_LEN];
+	int retval = DDS_ERROR_NONE;
+	int ct = DDS_UNCOMPRESSED;
+	int bits = 0;
+	int i, trash, is_cubemap = 0;
+	int d_width = 0, d_height = 0, d_depth = 0, d_size = 0;
+
+
+	if (img_cfp == NULL) {
+		// this better not happen.. ever
+		Assert(filename != NULL);
+
+		// make sure there is an extension
+		strcpy(real_name, filename);
+		char *p = strchr(real_name, '.');
+		if (p) { *p=0; }
+		strcat(real_name, ".dds");
+
+		// try to open the file
+		ddsfile = cfopen(real_name, "rb");
+
+		// file not found
+		if (ddsfile == NULL)
+			return DDS_ERROR_INVALID_FILENAME;
+	} else {
+		ddsfile = img_cfp;
+	}
+
+	// read the code
+	code = cfread_int(ddsfile);
+
+	// check it
+	if (code != DDS_FILECODE) {
+		retval = DDS_ERROR_BAD_HEADER;
+		goto Done;
+	}
+
+	// read header variables
+	dds_header.dwSize				= cfread_uint(ddsfile);
+	dds_header.dwFlags				= cfread_uint(ddsfile);
+	dds_header.dwHeight				= cfread_uint(ddsfile);
+	dds_header.dwWidth				= cfread_uint(ddsfile);
+	dds_header.dwPitchOrLinearSize	= cfread_uint(ddsfile);
+	dds_header.dwDepth				= cfread_uint(ddsfile);
+	dds_header.dwMipMapCount		= cfread_uint(ddsfile);
+
+	// skip over the crap we don't care about
+	for (i = 0; i < 11; i++)
+		trash = cfread_uint(ddsfile);
+
+	dds_header.ddpfPixelFormat.dwSize				= cfread_uint(ddsfile);
+	dds_header.ddpfPixelFormat.dwFlags				= cfread_uint(ddsfile);
+	dds_header.ddpfPixelFormat.dwFourCC				= cfread_uint(ddsfile);
+	dds_header.ddpfPixelFormat.dwRGBBitCount		= cfread_uint(ddsfile);
+	dds_header.ddpfPixelFormat.dwRBitMask			= cfread_uint(ddsfile);
+	dds_header.ddpfPixelFormat.dwGBitMask			= cfread_uint(ddsfile);
+	dds_header.ddpfPixelFormat.dwBBitMask			= cfread_uint(ddsfile);
+	dds_header.ddpfPixelFormat.dwRGBAlphaBitMask	= cfread_uint(ddsfile);
+
+	dds_header.ddsCaps.dwCaps1		= cfread_uint(ddsfile);
+	dds_header.ddsCaps.dwCaps2		= cfread_uint(ddsfile);
+
+	// sanity
+	if (dds_header.dwDepth == 0)
+		dds_header.dwDepth = 1;
+
+	if (dds_header.dwMipMapCount < 1)
+		dds_header.dwMipMapCount = 1;
+
+	d_width = dds_header.dwWidth;
+	d_height = dds_header.dwHeight;
+	d_depth = dds_header.dwDepth;
+
+	// calculate the type and size of the data
+	if (dds_header.ddpfPixelFormat.dwFlags & DDPF_FOURCC) {
+		// did I mention lately that I hate Microsoft?
+		// this is here to fix the situation where Microsoft doesn't follow their own docs
+		if ( dds_header.dwPitchOrLinearSize <= 0 ) {
+			// calculate the block size, mult by 8 for DXT1, 16 for DXT3 & 5
+			d_size = ((dds_header.dwWidth + 3)/4) * ((dds_header.dwHeight + 3)/4) * ((dds_header.dwDepth + 3)/4) * ((dds_header.ddpfPixelFormat.dwFourCC == FOURCC_DXT1) ? 8 : 16);
+		} else {
+			d_size = dds_header.dwPitchOrLinearSize;
+		}
+
+		// if we have mipmaps then compute them into the final size too
+		for (i = 1; i < (int)dds_header.dwMipMapCount; i++) {
+			// reduce size by half for the next pass
+			d_width /= 2;
+			d_height /= 2;
+
+			if (d_width <= 0)
+				d_width = 1;
+
+			if (d_height <= 0)
+				d_height = 1;
+
+			// size of data block (4x4)
+			d_size += ((d_width + 3) / 4) * ((d_height + 3) / 4) * ((dds_header.ddpfPixelFormat.dwFourCC == FOURCC_DXT1) ? 8 : 16);
+		}
+
+		if ( dds_header.ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP ) {
+			if ( !(dds_header.ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP_ALLFACES) ) {
+				retval = DDS_ERROR_CUBEMAP_FACES;
+				ct = DDS_DXT_INVALID;
+				goto Done;
+			}
+
+			// it's a valid cubemap, probably
+			is_cubemap = 1;
+
+			// the previously computed size is just per face, mult by 6 for full size
+			d_size *= 6;
+		}
+
+		Assert( d_size > 0 );
+		*size = d_size;
+
+		switch (dds_header.ddpfPixelFormat.dwFourCC) {
+			case FOURCC_DXT1:
+				bits = 24;
+				ct = (is_cubemap) ? DDS_CUBEMAP_DXT1 : DDS_DXT1;
+				break;
+
+			case FOURCC_DXT3:
+				bits = 32;
+				ct = (is_cubemap) ? DDS_CUBEMAP_DXT3 : DDS_DXT3;
+				break;
+
+			case FOURCC_DXT5:
+				bits = 32;
+				ct = (is_cubemap) ? DDS_CUBEMAP_DXT5 : DDS_DXT5;
+				break;
+
+			// dxt2 and dxt4 aren't supported
+			case FOURCC_DXT2:
+			case FOURCC_DXT4:
+				retval = DDS_ERROR_UNSUPPORTED;
+				ct = DDS_DXT_INVALID;
+				goto Done;
+				break;
+
+			// none of the above
+			default:
+				retval = DDS_ERROR_INVALID_FORMAT;
+				ct = DDS_DXT_INVALID;
+				goto Done;
+				break;
+		}
+	} else if ( dds_header.ddpfPixelFormat.dwFlags & (DDPF_RGB | DDPF_PALETTEINDEXED8) ) {
+		d_size += d_width * d_height * d_depth * (dds_header.ddpfPixelFormat.dwRGBBitCount / 8);
+
+		// calculate full data size for all mipmap levels
+		for (i = 1; i < (int)dds_header.dwMipMapCount; i++) {
+			d_width /= 2;
+			d_height /= 2;
+			d_depth /= 2;
+
+			if (d_width < 1)
+				d_width = 1;
+
+			if (d_height < 1)
+				d_height = 1;
+
+			if (d_depth < 1)
+				d_depth = 1;
+
+			d_size += d_width * d_height * d_depth * (dds_header.ddpfPixelFormat.dwRGBBitCount / 8);
+		}
+
+		Assert( d_size > 0 );
+
+		if ( dds_header.ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP ) {
+			if ( !(dds_header.ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP_ALLFACES) ) {
+				retval = DDS_ERROR_CUBEMAP_FACES;
+				ct = DDS_DXT_INVALID;
+				goto Done;
+			}
+
+			// it's a valid cubemap, probably
+			is_cubemap = 1;
+
+			// the previously computed size is just per face, mult by 6 for full size
+			d_size *= 6;
+		}
+
+		*size = d_size;
+		
+		bits = dds_header.ddpfPixelFormat.dwRGBBitCount;
+		ct = (is_cubemap) ? DDS_CUBEMAP_UNCOMPRESSED : DDS_UNCOMPRESSED;
+	} else {
+		// it's not a readable format
+		retval = DDS_ERROR_INVALID_FORMAT;
+		goto Done;
+	}
+
+	// we don't support compressed, non-power-of-2 images
+	if ( (ct != DDS_UNCOMPRESSED) && (!is_power_of_two(dds_header.dwWidth, dds_header.dwHeight)) ) {
+		retval = DDS_ERROR_NON_POWER_OF_2;
+		goto Done;
+	}
+
+	// make sure that the video card can handle compressed textures before using them
+	if ( !Use_compressed_textures && (ct != DDS_UNCOMPRESSED) && (ct != DDS_DXT_INVALID) ) {
+		retval = DDS_ERROR_NO_COMPRESSION;
+		goto Done;
+	}
+
+	// stuff important info
+	if (bpp)
+		*bpp = bits;
+
+	if (compression_type)
+		*compression_type = ct;
+
+	if (width)
+		*width = dds_header.dwWidth;
+
+	if (height)
+		*height = dds_header.dwHeight;
+
+	if (levels)
+		*levels = dds_header.dwMipMapCount;
+
+	if (palette && (bits == 8)) {
+		cfseek(ddsfile, DDS_OFFSET, CF_SEEK_SET);
+		cfread(palette, 1, 1024, ddsfile);
+	}
+
+
+Done:
+	if (img_cfp == NULL) {
+		// close file and return
+		cfclose(ddsfile);
+		ddsfile = NULL;
+	}
+
+	return retval;
+}
+
+//reads pixel info from a dds file
+int dds_read_bitmap(char *filename, ubyte *data, ubyte *bpp, int cf_type)
+{
+	int retval;
+	int w,h,ct,lvl;
+	int size = 0, bits = 0;
+	CFILE *cfp;
+	char real_name[MAX_FILENAME_LEN];
+
+	// this better not happen.. ever
+	Assert(filename != NULL);
+
+	// make sure there is an extension
+	strcpy(real_name, filename);
+	char *p = strchr(real_name, '.');
+	if (p) { *p = 0; }
+	strcat(real_name, ".dds");
+
+	// open it up and go to the data section
+	cfp = cfopen(real_name, "rb", CFILE_NORMAL, cf_type);
+
+	// just in case
+	if (cfp == NULL)
+		return DDS_ERROR_INVALID_FILENAME;
+
+	// read the header -- if its at this stage, it should be legal.
+	retval = dds_read_header(real_name, cfp, &w, &h, &bits, &ct, &lvl, &size);
+	Assert(retval == DDS_ERROR_NONE);
+
+	// this really shouldn't be needed but better safe than sorry
+	if (retval != DDS_ERROR_NONE) {
+		return retval;
+	}
+
+	cfseek(cfp, DDS_OFFSET, CF_SEEK_SET);
+
+	// read in the data
+	cfread(data, 1, size, cfp);
+
+	if (bpp)
+		*bpp = (ubyte)bits;
+
+	// we look done here
+	cfclose(cfp);
+
+	return DDS_ERROR_NONE;
+}
+
+// save some image data as a DDS image
+// NOTE: we only support, uncompressed, 24-bit RGB and 32-bit RGBA images here!!
+void dds_save_image(int width, int height, int bpp, int num_mipmaps, ubyte *data, int cubemap, char *filename)
+{
+	DDSURFACEDESC2 dds_header;
+	char real_filename[MAX_FILENAME_LEN];
+
+	if (data == NULL) {
+		Int3();
+		return;
+	}
+
+	// header size check
+	if (sizeof(DDSURFACEDESC2) != 124) {
+		Int3();
+		return;
+	}
+
+
+	// not that that's out of the way we can get down to business, constructing a sane filename
+	memset( &real_filename, 0, sizeof(real_filename) );
+
+	int count = os_config_read_uint(NULL, "ImageExportNum", 0);
+
+	if (count > 999)
+		count = 0;
+
+	if (filename == NULL) {
+		if (cubemap) {
+			sprintf(real_filename, "cubemap%.3d.dds", count++);
+		} else {
+			sprintf(real_filename, "image%.3d.dds", count++);
+		}
+		os_config_write_uint(NULL, "ImageExportNum", count);
+	} else {
+		Assert( strlen(filename) < MAX_FILENAME_LEN-5 );
+
+		strcpy(real_filename, filename);
+
+		char *p = strchr(real_filename, '.');
+		if (p) { *p = 0; }
+
+		strcat(real_filename, ".dds");
+	}
+
+	CFILE *image = cfopen( real_filename, "wb", CFILE_NORMAL, CF_TYPE_CACHE );
+
+	if (image == NULL) {
+		mprintf(("Unable to open DDS image for saving!!\n"));
+		return;
+	}
+
+	if (num_mipmaps < 1)
+		num_mipmaps = 1;
+
+	// we have a filename and file handle, so now lets create our DDS header...
+	memset( &dds_header, 0, sizeof(DDSURFACEDESC2) );
+
+	uint flags = (DDSD_CAPS | DDSD_PITCH | DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT);
+	uint pixel_flags = DDPF_RGB;
+	uint caps1 = DDSCAPS_TEXTURE;
+	uint caps2 = 0;
+
+	if (bpp == 32) {
+		pixel_flags |= DDPF_ALPHAPIXELS;
+	}
+
+	if (num_mipmaps > 1) {
+		flags |= DDSD_MIPMAPCOUNT;
+		caps1 |= (DDSCAPS_COMPLEX | DDSCAPS_MIPMAP);
+	}
+
+	if (cubemap) {
+		caps1 |= DDSCAPS_COMPLEX;
+		caps2 |= (DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_ALLFACES);
+	}
+
+	dds_header.dwSize				= 124;
+	dds_header.dwFlags				= flags;
+	dds_header.dwHeight				= height;
+	dds_header.dwWidth				= width;
+	dds_header.dwPitchOrLinearSize	= (width * (bpp >> 3));
+	dds_header.dwDepth				= 0;
+	dds_header.dwMipMapCount		= num_mipmaps;
+
+	dds_header.ddpfPixelFormat.dwSize				= 32;
+	dds_header.ddpfPixelFormat.dwFlags				= pixel_flags;
+	dds_header.ddpfPixelFormat.dwFourCC				= 0;
+	dds_header.ddpfPixelFormat.dwRGBBitCount		= bpp;
+	dds_header.ddpfPixelFormat.dwRBitMask			= 0x00ff0000;
+	dds_header.ddpfPixelFormat.dwGBitMask			= 0x0000ff00;
+	dds_header.ddpfPixelFormat.dwBBitMask			= 0x000000ff;
+	dds_header.ddpfPixelFormat.dwRGBAlphaBitMask	= (bpp == 32) ? 0xff000000 : 0x00000000;
+
+	dds_header.ddsCaps.dwCaps1		= caps1;
+	dds_header.ddsCaps.dwCaps2		= caps2;
+
+	// now save it all...
+	uint dds_id = DDS_FILECODE;
+	cfwrite(&dds_id, 1, 4, image);
+	cfwrite(&dds_header, 1, sizeof(DDSURFACEDESC2), image);
+
+	int faces = (cubemap) ? 6 : 1;
+	int f_width = width;
+	int f_height = height;
+	int f_size = 0, f_offset = 0;
+
+	// cubemaps are written:
+	//  face 1
+	//    all face 1 mipmaps
+	//  face 2
+	//    all face 2 mipmaps
+	// ... etc.
+
+	for (int i = 0; i < faces; i++) {
+		for (int j = 0; j < num_mipmaps; j++) {
+			f_size = (f_width * f_height * (bpp >> 3));
+
+			cfwrite(data + f_offset, 1, f_size, image);
+
+			// increase offset for next mipmap level
+			f_offset += f_size;
+
+			// half width and height for next mipmap level
+			f_width /= 2;
+			f_height /= 2;
+
+			if (f_width < 1)
+				f_width = 1;
+
+			if (f_height < 1)
+				f_height = 1;
+		}
+
+		// reset width and height to original values for the next face
+		f_width = width;
+		f_height = height;
+	}
+
+	// done!  now lets go get something to eat...
+	cfclose(image);
+}
+
+
+// returns string representation of DDS_** error code
+const char *dds_error_string(int code)
+{
+	switch (code)
+	{
+		case DDS_ERROR_NONE:
+			return "No error";
+
+		case DDS_ERROR_INVALID_FILENAME:
+			return "File not found";
+
+		case DDS_ERROR_BAD_HEADER:
+			return "Filecode did not equal \"DDS \"";
+
+		case DDS_ERROR_INVALID_FORMAT:
+			return "DDS was in an unsupported/unknown format";
+			
+		case DDS_ERROR_UNSUPPORTED:
+			return "DDS format was known but is not supported (ie. DXT2/DXT4)";
+
+		case DDS_ERROR_NO_COMPRESSION:
+			return "DDS is compressed but compression support is not enabled";
+
+		case DDS_ERROR_NON_POWER_OF_2:
+			return "Cannot load DDS if not power-of-2";
+
+		case DDS_ERROR_CUBEMAP_FACES:
+			return "Cubemaps must have all 6 faces";
+
+		default:
+			return "Abort, retry, fail?";
+	}
+
+	//get a warning otherwise
+	return "Abort, retry, fail?";
+}
@@ -0,0 +1,156 @@
+//header file to load .dds files
+//these use dxtc texture compression
+
+#ifndef __DDS_H
+#define __DDS_H
+
+#include "globalincs/pstypes.h"
+#include "cfile/cfile.h"
+
+
+#define DDS_ERROR_NONE					0		// everything went fine
+#define DDS_ERROR_INVALID_FILENAME		1		// bad or missing file
+#define DDS_ERROR_UNSUPPORTED			2		// a known format but one we don't support
+#define DDS_ERROR_INVALID_FORMAT		3		// format that's not supported
+#define DDS_ERROR_BAD_HEADER			4		// header was not "DDS "
+#define DDS_ERROR_NO_COMPRESSION		5		// file is compressed, compression isn't supported
+#define DDS_ERROR_NON_POWER_OF_2		6		// file is not a power of 2 in dimensions
+#define DDS_ERROR_CUBEMAP_FACES			7		// file is a cubemap, but doesn't have all six faces
+
+
+#define DDS_DXT_INVALID				-1
+#define DDS_UNCOMPRESSED				0
+#define DDS_DXT1						1
+#define DDS_DXT3						3
+#define DDS_DXT5						5
+#define DDS_CUBEMAP_UNCOMPRESSED		10
+#define DDS_CUBEMAP_DXT1				11
+#define DDS_CUBEMAP_DXT3				13
+#define DDS_CUBEMAP_DXT5				15
+
+#ifndef MAKEFOURCC
+    #define MAKEFOURCC(ch0, ch1, ch2, ch3)                              \
+                ((uint)(ubyte)(ch0) | ((uint)(ubyte)(ch1) << 8) |   \
+                ((uint)(ubyte)(ch2) << 16) | ((uint)(ubyte)(ch3) << 24 ))
+#endif //defined(MAKEFOURCC)
+
+// FOURCC codes for DX compressed-texture pixel formats
+#define FOURCC_DXT1  (MAKEFOURCC('D','X','T','1'))
+#define FOURCC_DXT2  (MAKEFOURCC('D','X','T','2'))
+#define FOURCC_DXT3  (MAKEFOURCC('D','X','T','3'))
+#define FOURCC_DXT4  (MAKEFOURCC('D','X','T','4'))
+#define FOURCC_DXT5  (MAKEFOURCC('D','X','T','5'))
+
+#define DDS_FILECODE	0x20534444	// "DDS " in file
+
+// DDS format stuff ...
+#define DDSD_LINEARSIZE			0x00080000
+#define DDSD_PITCH				0x00000008
+#define DDPF_ALPHAPIXELS		0x00000001
+#define DDPF_FOURCC				0x00000004
+#define DDPF_PALETTEINDEXED4	0x00000008
+#define DDPF_PALETTEINDEXEDTO8	0x00000010
+#define DDPF_PALETTEINDEXED8	0x00000020
+#define DDPF_RGB				0x00000040
+#define DDSD_PIXELFORMAT		0x00001000
+#define DDSD_WIDTH				0x00000004
+#define DDSD_HEIGHT				0x00000002
+#define DDSD_CAPS				0x00000001
+#define DDSD_MIPMAPCOUNT		0x00020000
+
+#define DDSCAPS_COMPLEX			0x00000008
+#define DDSCAPS_PRIMARYSURFACE	0x00000200
+#define DDSCAPS_MIPMAP			0x00400000
+#define DDSCAPS_TEXTURE			0x00001000
+
+#define DDSCAPS2_CUBEMAP				0x00000200
+#define DDSCAPS2_VOLUME					0x00200000
+#define DDSCAPS2_CUBEMAP_POSITIVEX		0x00000400
+#define DDSCAPS2_CUBEMAP_NEGATIVEX		0x00000800
+#define DDSCAPS2_CUBEMAP_POSITIVEY		0x00001000
+#define DDSCAPS2_CUBEMAP_NEGATIVEY		0x00002000
+#define DDSCAPS2_CUBEMAP_POSITIVEZ		0x00004000
+#define DDSCAPS2_CUBEMAP_NEGATIVEZ		0x00008000
+
+#define DDSCAPS2_CUBEMAP_ALLFACES	( DDSCAPS2_CUBEMAP_POSITIVEX |	\
+									  DDSCAPS2_CUBEMAP_NEGATIVEX |	\
+									  DDSCAPS2_CUBEMAP_POSITIVEY |	\
+									  DDSCAPS2_CUBEMAP_NEGATIVEY |	\
+									  DDSCAPS2_CUBEMAP_POSITIVEZ |	\
+									  DDSCAPS2_CUBEMAP_NEGATIVEZ )
+
+#pragma pack(1)
+// these structures are the headers for a dds file
+/*typedef struct _DDPIXELFORMAT {
+	uint	dwSize;
+	uint	dwFlags;
+	uint	dwFourCC;
+	uint	dwRGBBitCount;
+	uint	dwRBitMask;
+	uint 	dwGBitMask;
+	uint 	dwBBitMask;
+	uint	dwRGBAlphaBitMask;
+} DDPIXELFORMAT;
+
+typedef struct _DDSCAPS2
+{
+	uint		dwCaps1;
+	uint		dwCaps2;
+	uint		Reserved[2];
+} DDSCAPS2;*/
+
+typedef struct _DDSURFACEDESC2
+{
+	uint			dwSize;				// size of the DDSURFACEDESC structure
+	uint			dwFlags;			// determines what fields are valid
+	uint			dwHeight;			// height of surface to be created
+	uint			dwWidth;			// width of input surface
+	uint			dwPitchOrLinearSize;
+	uint			dwDepth;
+	uint			dwMipMapCount;
+	uint			dwReserved1[11];
+
+	struct {
+		uint	dwSize;
+		uint	dwFlags;
+		uint	dwFourCC;
+		uint	dwRGBBitCount;
+		uint	dwRBitMask;
+		uint 	dwGBitMask;
+		uint 	dwBBitMask;
+		uint	dwRGBAlphaBitMask;
+	} ddpfPixelFormat;
+
+	struct {
+		uint		dwCaps1;
+		uint		dwCaps2;
+		uint		Reserved[2];
+	} ddsCaps;
+
+//	DDPIXELFORMAT	ddpfPixelFormat;
+//	DDSCAPS2		ddsCaps;			// direct draw surface capabilities
+	uint			dwReserved2;
+} DDSURFACEDESC2;
+#pragma pack()
+
+#define DDS_OFFSET						4+sizeof(DDSURFACEDESC2)		//place where the data starts -- should be 128
+
+//reads a dds header
+//returns one of the error values
+//'compression_type' comes back as one of the DDS_DXTC* defines
+int dds_read_header(char *filename, CFILE *img_cfp = NULL, int *width = 0, int *height = 0, int *bpp = 0, int *compression_type = 0, int *levels = 0, int *size = 0, ubyte *palette = NULL);
+
+//reads bitmap
+//size of the data it stored in size
+int dds_read_bitmap(char *filename, ubyte *data, ubyte *bpp = NULL, int cf_type = CF_TYPE_ANY);
+
+// writes a DDS file using given data
+void dds_save_image(int width, int height, int bpp, int num_mipmaps, ubyte *data = NULL, int cubemap = 0, char *filename = NULL);
+
+//returns a string from a DDS error code
+const char *dds_error_string(int code);
+
+extern int Texture_compression_available;
+extern int Use_compressed_textures;
+
+#endif //__DDS_H
@@ -9,13 +9,66 @@

 /*
 * $Logfile: /Freespace2/code/Debris/Debris.cpp $
- * $Revision: 2.17 $
- * $Date: 2005-07-22 10:18:37 $
+ * $Revision: 2.23.2.8 $
+ * $Date: 2007-02-20 04:19:09 $
 * $Author: Goober5000 $
 *
 * Code for the pieces of exploding object debris.
 *
 * $Log: not supported by cvs2svn $
+ * Revision 2.23.2.7  2007/02/12 00:22:05  taylor
+ * some generic_bitmap fixes to go with new changes (not in CVS just yet, don't freak out)
+ * make use of VALID_FNAME() where possible
+ * fix an animation time issue (sub-second animation playback caused div-by-0)
+ *
+ * Revision 2.23.2.6  2007/02/11 09:21:12  taylor
+ * remove NO_SOUND
+ * fix debris recycling
+ *
+ * Revision 2.23.2.5  2006/09/11 01:00:27  taylor
+ * various small compiler warning and strict compiling fixes
+ *
+ * Revision 2.23.2.4  2006/08/27 18:12:40  taylor
+ * make Species_info[] and Asteroid_info[] dynamic
+ *
+ * Revision 2.23.2.3  2006/08/19 04:22:33  taylor
+ * an int wrap-around issue could (and was) make debris not have electrical arcs (or lighting or sounds) since it would always fail this check
+ *
+ * Revision 2.23.2.2  2006/07/06 04:06:00  Goober5000
+ * 1) complete (almost) changeover to reorganized texture mapping system
+ * 2) finally fix texture animation; textures now animate at the correct speed
+ * --Goober5000
+ *
+ * Revision 2.23.2.1  2006/07/04 07:42:09  Goober5000
+ * --in preparation for fixing an annoying animated texture bug, reorganize the various texture structs and glow point structs and clarify several parts of the texture code :P
+ * --this breaks animated glow maps, and animated regular maps still aren't fixed, but these will be remedied shortly
+ * --Goober5000
+ *
+ * Revision 2.23  2006/01/26 03:23:29  Goober5000
+ * pare down the pragmas some more
+ * --Goober5000
+ *
+ * Revision 2.22  2005/12/29 08:08:33  wmcoolmon
+ * Codebase commit, most notably including objecttypes.tbl
+ *
+ * Revision 2.21  2005/10/30 06:44:56  wmcoolmon
+ * Codebase commit - nebula.tbl, scripting, new dinky explosion/shockwave stuff, moving muzzle flashes
+ *
+ * Revision 2.20  2005/10/10 17:21:03  taylor
+ * remove NO_NETWORK
+ *
+ * Revision 2.19  2005/09/25 05:13:05  Goober5000
+ * hopefully complete species upgrade
+ * --Goober5000
+ *
+ * Revision 2.18  2005/09/24 07:07:15  Goober5000
+ * another species overhaul
+ * --Goober5000
+ *
+ * Revision 2.17  2005/07/22 10:18:37  Goober5000
+ * CVS header tweaks
+ * --Goober5000
+ *
 * Revision 2.16  2005/07/13 02:50:51  Goober5000
 * remove PreProcDefine #includes in FS2
 * --Goober5000
@@ -54,7 +107,7 @@
 *
 * Revision 2.6  2004/03/31 05:42:26  Goober5000
 * got rid of all those nasty warnings from xlocale and so forth; also added comments
- * for #pragma warning disable to indicate the message being disabled
+ * to indicate which warnings were being disabled
 * --Goober5000
 *
 * Revision 2.5  2004/03/05 09:01:59  Goober5000
@@ -293,13 +346,11 @@
 #include "io/timer.h"
 #include "species_defs/species_defs.h"
 #include "ship/ship.h"
+#include "ship/shipfx.h"
 #include "radar/radarsetup.h"
-
-#ifndef NO_NETWORK
 #include "network/multi.h"
 #include "network/multimsgs.h"
 #include "network/multiutil.h"
-#endif



@@ -309,7 +360,8 @@
 #define DEBRIS_SOUND_DELAY						2000	// time to start debris sound after created

 // limit the number of hull debris chunks that can exist.  
-#define	MAX_HULL_PIECES		10
+//#define	MAX_HULL_PIECES		10
+#define MAX_HULL_PIECES			MAX_DEBRIS_PIECES //-WMCD
 int		Num_hull_pieces;		// number of hull pieces in existance
 debris	Hull_debris_list;		// head of linked list for hull debris chunks, for quick search

@@ -322,11 +374,6 @@ int Debris_model = -1;
 int Debris_vaporize_model = -1;
 int Debris_num_submodels = 0;

-char Debris_texture_files[MAX_SPECIES][FILESPEC_LENGTH];
-
-
-int Debris_textures[MAX_SPECIES];
-
 #define	MAX_DEBRIS_DIST					10000.0f			//	Debris goes away if it's this far away.
 #define	DEBRIS_DISTANCE_CHECK_TIME		(10*1000)		//	Check every 10 seconds.
 #define	DEBRIS_INDEX(dp) (dp-Debris)
@@ -334,7 +381,7 @@ int Debris_textures[MAX_SPECIES];
 #define	MAX_SPEED_SMALL_DEBRIS		200					// maximum velocity of small debris piece
 #define	MAX_SPEED_BIG_DEBRIS			150					// maximum velocity of big debris piece
 #define	MAX_SPEED_CAPITAL_DEBRIS	100					// maximum velocity of capital debris piece
-#define	DEBRIS_SPEED_DEBUG
+//#define	DEBRIS_SPEED_DEBUG

 // ---------------------------------------------------------------------------------------
 // debris_start_death_roll()
@@ -345,13 +392,14 @@ static void debris_start_death_roll(object *debris_obj, debris *debris_p)
 {
 	if (debris_p->is_hull)	{
 		// tell everyone else to blow up the piece of debris
-#ifndef NO_NETWORK
 		if( MULTIPLAYER_MASTER )
 			send_debris_update_packet(debris_obj,DEBRIS_UPDATE_NUKE);
-#endif

-		int fireball_type = FIREBALL_EXPLOSION_LARGE1 + rand()%FIREBALL_NUM_LARGE_EXPLOSIONS;
-		fireball_create( &debris_obj->pos, fireball_type, OBJ_INDEX(debris_obj), debris_obj->radius*1.75f);
+		int fireball_type = fireball_ship_explosion_type(&Ship_info[debris_p->ship_info_index]);
+		if(fireball_type < 0) {
+			fireball_type = FIREBALL_EXPLOSION_LARGE1 + rand()%FIREBALL_NUM_LARGE_EXPLOSIONS;
+		}
+		fireball_create( &debris_obj->pos, fireball_type, FIREBALL_LARGE_EXPLOSION, OBJ_INDEX(debris_obj), debris_obj->radius*1.75f);

 		// only play debris destroy sound if hull piece and it has been around for at least 2 seconds
 		if ( Missiontime > debris_p->time_started + 2*F1_0 ) {
@@ -395,7 +443,7 @@ void debris_init()
 // Page in debris bitmaps at level load
 void debris_page_in()
 {
-	int i;
+	uint i;

 	Debris_model = model_load( NOX("debris01.pof"), 0, NULL );
 	if (Debris_model >= 0)	{
@@ -406,19 +454,25 @@ void debris_page_in()

 	Debris_vaporize_model = model_load( NOX("debris02.pof"), 0, NULL );

-	for (i=0; i<True_NumSpecies; i++ )	{
-		nprintf(( "Paging", "Paging in debris texture '%s'\n", Debris_texture_files[i] ));
-		Debris_textures[i] = bm_load( Debris_texture_files[i] );
-		if ( Debris_textures[i] < 0 ) { 
-			Warning( LOCATION, "Couldn't load species %d debris\ntexture, '%s'\n", i, Debris_texture_files[i] );
+	for (i=0; i<Species_info.size(); i++ )
+	{
+		species_info *species = &Species_info[i];
+
+		nprintf(( "Paging", "Paging in debris texture '%s'\n", species->debris_texture.filename));
+
+		species->debris_texture.bitmap_id = bm_load(species->debris_texture.filename);
+		if (species->debris_texture.bitmap_id < 0)
+		{
+			Warning( LOCATION, "Couldn't load species %s debris\ntexture, '%s'\n", species->species_name, species->debris_texture.filename);
 		}
-		bm_page_in_texture( Debris_textures[i] );
+
+		bm_page_in_texture(species->debris_texture.bitmap_id);
 	}
 	
 }

-MONITOR(NumSmallDebrisRend);
-MONITOR(NumHullDebrisRend);
+MONITOR(NumSmallDebrisRend)
+MONITOR(NumHullDebrisRend)

 // ---------------------------------------------------------------------------------------
 // debris_render()
@@ -435,19 +489,23 @@ void debris_render(object * obj)
 	pm = NULL;	
 	num = obj->instance;

-	Assert(num >= 0 && num < MAX_DEBRIS_PIECES );
+	Assert(num >= 0 && num < MAX_DEBRIS_PIECES);
 	db = &Debris[num];

-	Assert( db->flags & DEBRIS_USED );
+	Assert(db->flags & DEBRIS_USED);
+
+	texture_info *tbase = NULL;

 	// Swap in a different texture depending on the species
-	if ( (db->species > -1) && (db->species < MAX_SPECIES) )	{
-
+	if (db->species >= 0)
+	{
 		pm = model_get( db->model_num );

-		if ( pm && (pm->n_textures == 1) ) {
-			swapped = pm->textures[0];
-			pm->textures[0] = Debris_textures[db->species];
+		//WMC - Someday, we should have glowing debris.
+		if ( pm != NULL && (pm->n_textures == 1) ) {
+			tbase = &pm->maps[0].textures[TM_BASE_TYPE];
+			swapped = tbase->GetTexture();
+			tbase->SetTexture(Species_info[db->species].debris_texture.bitmap_id);
 		}
 	}

@@ -470,8 +528,8 @@ void debris_render(object * obj)
 		submodel_render( db->model_num, db->submodel_num, &obj->orient, &obj->pos, MR_NO_LIGHTING );
 	}

-	if ((swapped!=-1) && pm)	{
-		pm->textures[0] = swapped;
+	if (tbase != NULL && (swapped!=-1) && pm)	{
+		tbase->SetTexture(swapped);
 	}
 }

@@ -520,7 +578,7 @@ void maybe_delete_debris(debris *db)
 {
 	object	*objp;

-	if (timestamp_elapsed(db->next_distance_check)) {
+	if (timestamp_elapsed(db->next_distance_check) && timestamp_elapsed(db->must_survive_until)) {
 		if (!(Game_mode & GM_MULTIPLAYER)) {		//	In single player game, just check against player.
 			if (vm_vec_dist_quick(&Player_obj->pos, &Objects[db->objnum].pos) > MAX_DEBRIS_DIST)
 				db->lifeleft = 0.1f;
@@ -546,8 +604,8 @@ void debris_process_pre( object *objp, float frame_time)
 {
 }

-MONITOR(NumSmallDebris);
-MONITOR(NumHullDebris);
+MONITOR(NumSmallDebris)
+MONITOR(NumHullDebris)

 // ---------------------------------------------------------------------------------------
 // debris_process_post()
@@ -572,9 +630,7 @@ void debris_process_post(object * obj, float frame_time)
 		radar_plot_object( obj );

 		if ( timestamp_elapsed(db->sound_delay) ) {
-#ifndef NO_SOUND
 			obj_snd_assign(objnum, SND_DEBRIS, &vmd_zero_vector, 0);
-#endif
 			db->sound_delay = 0;
 		}
 	} else {
@@ -739,12 +795,15 @@ object *debris_create(object *source_obj, int model_num, int submodel_num, vec3d
 	debris	*db;	
 	polymodel *pm;
 	int vaporize;
+	physics_info *pi = NULL;
+	ship_info *sip = NULL;

 	parent_objnum = OBJ_INDEX(source_obj);

 	Assert( (source_obj->type == OBJ_SHIP ) || (source_obj->type == OBJ_GHOST));
 	Assert( source_obj->instance >= 0 && source_obj->instance < MAX_SHIPS );	
 	shipp = &Ships[source_obj->instance];
+	sip = &Ship_info[shipp->ship_info_index];
 	vaporize = (shipp->flags &SF_VAPORIZE);

 	if ( !hull_flag )	{
@@ -772,21 +831,57 @@ object *debris_create(object *source_obj, int model_num, int submodel_num, vec3d
 			break;
 	}

-	if ( n == MAX_DEBRIS_PIECES ) {
+	if (n == MAX_DEBRIS_PIECES) {
+		n = debris_find_oldest();
+
+		if (n >= 0)
+			debris_start_death_roll(&Objects[Debris[n].objnum], &Debris[n]);
+
 		nprintf(("Warning","Frame %i: Could not create debris, no more slots left\n", Framecount));
 		return NULL;
 	}

 	db = &Debris[n];

-	// Create Debris piece n!
-	if ( hull_flag ) {
-		if (rand() < RAND_MAX/6)	// Make some pieces blow up shortly after explosion.
-			db->lifeleft = 2.0f * ((float) myrand()/(float) RAND_MAX) + 0.5f;
-		else
-			db->lifeleft = -1.0f;		// large hull pieces stay around forever
-	}	else {
-		db->lifeleft = (i2fl(myrand())/i2fl(RAND_MAX))*2.0f+0.1f;
+	//WMC - We must survive until now, at least.
+	db->must_survive_until = timestamp();
+
+	if(hull_flag && sip->debris_min_lifetime >= 0.0f && sip->debris_max_lifetime >= 0.0f)
+	{
+		db->lifeleft = (( sip->debris_max_lifetime - sip->debris_min_lifetime ) * frand()) + sip->debris_min_lifetime;
+	}
+	else
+	{
+		// Create Debris piece n!
+		if ( hull_flag ) {
+			if (rand() < RAND_MAX/6)	// Make some pieces blow up shortly after explosion.
+				db->lifeleft = 2.0f * ((float) myrand()/(float) RAND_MAX) + 0.5f;
+			else
+				db->lifeleft = -1.0f;		// large hull pieces stay around forever
+		} else {
+			db->lifeleft = (i2fl(myrand())/i2fl(RAND_MAX))*2.0f+0.1f;
+		}
+	}
+
+	//WMC - Oh noes, we may need to change lifeleft
+	if(hull_flag)
+	{
+		if(sip->debris_min_lifetime >= 0.0f && sip->debris_max_lifetime >= 0.0f)
+		{
+			db->must_survive_until = timestamp(fl2i(sip->debris_min_lifetime * 1000.0f));
+			db->lifeleft = (( sip->debris_max_lifetime - sip->debris_min_lifetime ) * frand()) + sip->debris_min_lifetime;
+		}
+		else if(sip->debris_min_lifetime >= 0.0f)
+		{
+			db->must_survive_until = timestamp(fl2i(sip->debris_min_lifetime * 1000.0f));
+			if(db->lifeleft < sip->debris_min_lifetime)
+				db->lifeleft = sip->debris_min_lifetime;
+		}
+		else if(sip->debris_max_lifetime >= 0.0f)
+		{
+			if(db->lifeleft > sip->debris_max_lifetime)
+				db->lifeleft = sip->debris_max_lifetime;
+		}
 	}

 	// increase lifetime for vaporized debris
@@ -803,6 +898,7 @@ object *debris_create(object *source_obj, int model_num, int submodel_num, vec3d
 	db->time_started = Missiontime;
 	db->species = Ship_info[shipp->ship_info_index].species;
 	db->next_distance_check = (myrand() % 2000) + 4*DEBRIS_DISTANCE_CHECK_TIME;
+	db->parent_alt_name = shipp->alt_type_index;

 	for (i=0; i<MAX_DEBRIS_ARCS; i++ )	{
 		db->arc_timestamp[i] = timestamp(-1);
@@ -811,7 +907,7 @@ object *debris_create(object *source_obj, int model_num, int submodel_num, vec3d

 	if ( db->is_hull )	{
 		// Only make 1/2 of the pieces have arcs
-		if ( myrand() < RAND_MAX*2/3 )	{
+		if ( myrand() < RAND_MAX_2 ) {
 			db->arc_frequency = 1000;
 		} else {
 			db->arc_frequency = 0;
@@ -850,15 +946,15 @@ object *debris_create(object *source_obj, int model_num, int submodel_num, vec3d
 	db->objnum = objnum;
 	
 	obj = &Objects[objnum];
+	pi = &obj->phys_info;

 	// assign the network signature.  The signature will be 0 for non-hull pieces, but since that
 	// is our invalid signature, it should be okay.
 	obj->net_signature = 0;
-#ifndef NO_NETWORK
+
 	if ( (Game_mode & GM_MULTIPLAYER) && hull_flag ) {
 		obj->net_signature = multi_get_next_network_signature( MULTI_SIG_DEBRIS );
 	}
-#endif

 	// -- No long need shield: bset_shield_strength(obj, 100.0f);		//	Hey!  Set to some meaningful value!

@@ -932,31 +1028,6 @@ object *debris_create(object *source_obj, int model_num, int submodel_num, vec3d
 	vm_vec_add (&obj->phys_info.vel, &radial_vel, &source_obj->phys_info.vel);
 	vm_vec_add2(&obj->phys_info.vel, &vel_from_rotvel);

-#ifdef DEBRIS_SPEED_DEBUG
-	// check that debris is not created with too high a velocity
-	if (hull_flag) {
-		int ship_info_flag = Ship_info[Ships[source_obj->instance].ship_info_index].flags;
-		if (ship_info_flag & (SIF_SMALL_SHIP | SIF_NOT_FLYABLE | SIF_HARMLESS)) {
-			if (vm_vec_mag_squared(&obj->phys_info.vel) > MAX_SPEED_SMALL_DEBRIS*MAX_SPEED_SMALL_DEBRIS) {
-				float scale = MAX_SPEED_SMALL_DEBRIS / vm_vec_mag(&obj->phys_info.vel);
-				vm_vec_scale(&obj->phys_info.vel, scale);
-			}
-		} else if (ship_info_flag & SIF_BIG_SHIP) {
-			if (vm_vec_mag_squared(&obj->phys_info.vel) > MAX_SPEED_BIG_DEBRIS*MAX_SPEED_BIG_DEBRIS) {
-				float scale = MAX_SPEED_BIG_DEBRIS / vm_vec_mag(&obj->phys_info.vel);
-				vm_vec_scale(&obj->phys_info.vel, scale);
-			}
-		} else if (ship_info_flag & SIF_HUGE_SHIP) {
-			if (vm_vec_mag_squared(&obj->phys_info.vel) > MAX_SPEED_CAPITAL_DEBRIS*MAX_SPEED_CAPITAL_DEBRIS) {
-				float scale = MAX_SPEED_CAPITAL_DEBRIS / vm_vec_mag(&obj->phys_info.vel);
-				vm_vec_scale(&obj->phys_info.vel, scale);
-			}
-		} else {
-			Warning(LOCATION, "Ship has info flag that is not among the following:  SMALL, NOT_FLYABLE, HARMLESS, BIG, CAPITAL, SUPERCAP");
-		}
-	}
-#endif
-
 //	vm_vec_scale_add(&obj->phys_info.vel, &radial_vel, &source_obj->phys_info.vel, frand()/2.0f + 0.5f);
 //	nprintf(("Andsager","object vel from rotvel: %0.2f, %0.2f, %0.2f\n",vel_from_rotvel.x, vel_from_rotvel.y, vel_from_rotvel.z));

@@ -970,26 +1041,31 @@ object *debris_create(object *source_obj, int model_num, int submodel_num, vec3d
 	vm_vec_rand_vec_quick(&rotvel);
 	vm_vec_scale(&rotvel, scale);

-	obj->phys_info.flags |= PF_DEAD_DAMP;
-	obj->phys_info.rotvel = rotvel;
+	pi->flags |= PF_DEAD_DAMP;
+	pi->rotvel = rotvel;
 	check_rotvel_limit( &obj->phys_info );

+	// check that debris is not created with too high a velocity
+	if (hull_flag)
+	{
+		shipfx_debris_limit_speed(db, shipp);
+	}

 	// blow out his reverse thrusters. Or drag, same thing.
-	obj->phys_info.rotdamp = 10000.0f;
-	obj->phys_info.side_slip_time_const = 10000.0f;
-	obj->phys_info.flags |= (PF_REDUCED_DAMP | PF_DEAD_DAMP);	// set damping equal for all axis and not changable
+	pi->rotdamp = 10000.0f;
+	pi->side_slip_time_const = 10000.0f;
+	pi->flags |= (PF_REDUCED_DAMP | PF_DEAD_DAMP);	// set damping equal for all axis and not changable

-	vm_vec_zero(&obj->phys_info.max_vel);		// make so he can't turn on his own VOLITION anymore.
-	vm_vec_zero(&obj->phys_info.max_rotvel);	// make so he can't change speed on his own VOLITION anymore.
+	vm_vec_zero(&pi->max_vel);		// make so he can't turn on his own VOLITION anymore.
+	vm_vec_zero(&pi->max_rotvel);	// make so he can't change speed on his own VOLITION anymore.


 	// ensure vel is valid
 	Assert( !vm_is_vec_nan(&obj->phys_info.vel) );

 //	if ( hull_flag )	{
-//		vm_vec_zero(&obj->phys_info.vel);
-//		vm_vec_zero(&obj->phys_info.rotvel);
+//		vm_vec_zero(&pi->vel);
+//		vm_vec_zero(&pi->rotvel);
 //	}

 	return obj;
@@ -1033,12 +1109,10 @@ void debris_hit(object *debris_obj, object *other_obj, vec3d *hitpos, float dama
 		particle_emit( &pe, PARTICLE_FIRE, 0 );
 	}

-#ifndef NO_NETWORK
 	// multiplayer clients bail here
 	if(MULTIPLAYER_CLIENT){
 		return;
 	}
-#endif

 	if ( damage < 0.0f ) {
 		damage = 0.0f;
@@ -1050,11 +1124,9 @@ void debris_hit(object *debris_obj, object *other_obj, vec3d *hitpos, float dama
 		debris_start_death_roll(debris_obj, debris_p );
 	} else {
 		// otherwise, give all the other players an update on the debris
-#ifndef NO_NETWORK
 		if(MULTIPLAYER_MASTER){
 			send_debris_update_packet(debris_obj,DEBRIS_UPDATE_UPDATE);
 		}
-#endif
 	}
 }

@@ -1065,8 +1137,6 @@ void debris_hit(object *debris_obj, object *other_obj, vec3d *hitpos, float dama
 // NOTE: debris_hit_info pointer NULL for debris:weapon collision, otherwise debris:ship collision.
 //	Return true if hit, else return false.
 //
-#pragma warning ( push )
-#pragma warning ( disable : 4701 )	// possible use of variable without initialization
 int debris_check_collision(object *pdebris, object *other_obj, vec3d *hitpos, collision_info_struct *debris_hit_info)
 {
 	mc_info	mc;
@@ -1138,7 +1208,7 @@ int debris_check_collision(object *pdebris, object *other_obj, vec3d *hitpos, co
 	int mc_ret_val = 0;

 	if ( debris_hit_info->heavy == ship_obj ) {	// ship is heavier, so debris is sphere. Check sphere collision against ship poly model
-		mc.model_num = Ships[ship_obj->instance].modelnum;		// Fill in the model to check
+		mc.model_num = Ship_info[Ships[ship_obj->instance].ship_info_index].model_num;	// Fill in the model to check
 		mc.orient = &ship_obj->orient;								// The object's orient
 		mc.radius = pdebris->radius;
 		mc.flags = (MC_CHECK_MODEL | MC_CHECK_SPHERELINE);
@@ -1169,7 +1239,7 @@ int debris_check_collision(object *pdebris, object *other_obj, vec3d *hitpos, co
 				model_get_rotating_submodel_list(submodel_list, &num_rotating_submodels, heavy_obj);

 				// Get polymodel and turn off all rotating submodels, collide against only 1 at a time.
-				pm = model_get(Ships[heavy_obj->instance].modelnum);
+				pm = model_get(Ship_info[Ships[heavy_obj->instance].ship_info_index].model_num);

 				// turn off all rotating submodels and test for collision
 				int i;
@@ -1264,7 +1334,7 @@ int debris_check_collision(object *pdebris, object *other_obj, vec3d *hitpos, co
 		mc.submodel_num = Debris[num].submodel_num;
 		model_clear_instance( mc.model_num );
 		mc.orient = &pdebris->orient;				// The object's orient
-		mc.radius = model_get_core_radius( Ships[ship_obj->instance].modelnum );
+		mc.radius = model_get_core_radius(Ship_info[Ships[ship_obj->instance].ship_info_index].model_num);

 		// check for collision between debris model and ship sphere
 		mc.flags = (MC_CHECK_MODEL | MC_SUBMODEL | MC_CHECK_SPHERELINE);
@@ -1314,8 +1384,6 @@ int debris_check_collision(object *pdebris, object *other_obj, vec3d *hitpos, co
 		return 0;
 	}
 }
-#pragma warning ( pop )
-

 // ---------------------------------------------------------------------------------------
 // debris_get_team()
@@ -1353,5 +1421,3 @@ void calc_debris_physics_properties( physics_info *pi, vec3d *mins, vec3d *maxs
 	pi->I_body_inv.vec.fvec.xyz.y = 0.0f;
 	pi->I_body_inv.vec.fvec.xyz.z = 12.0f / (pi->mass *  (dx*dx + dy*dy));
 }
-
-
@@ -173,6 +173,7 @@ typedef struct debris {
 	int		team;					// Team of the ship where the debris came from
 	int		objnum;				// What object this is linked to
 	float		lifeleft;			// When 0 or less object dies
+	int		must_survive_until;	//WMC - timestamp of earliest point that it can be murthered.
 	int		model_num;			// What model this uses
 	int		submodel_num;		// What submodel this uses
 	int		next_fireball;		// When to start a fireball
@@ -186,6 +187,7 @@ typedef struct debris {
 	vec3d	arc_pts[MAX_DEBRIS_ARCS][2];		// The endpoints of each arc
 	int		arc_timestamp[MAX_DEBRIS_ARCS];	// When this times out, the spark goes away.  -1 is not used
 	int		arc_frequency;							// Starts at 0, gets bigger
+	char	parent_alt_name;
 	
 } debris;

@@ -9,13 +9,19 @@

 /*
 * $Logfile: /Freespace2/code/DebugConsole/Console.cpp $
- * $Revision: 2.6 $
- * $Date: 2005-04-25 00:07:22 $
- * $Author: wmcoolmon $
+ * $Revision: 2.6.2.2 $
+ * $Date: 2007-02-18 21:26:52 $
+ * $Author: Goober5000 $
 *
 * Routines for managing the debug console window.
 *
 * $Log: not supported by cvs2svn $
+ * Revision 2.6.2.1  2006/09/08 06:14:43  taylor
+ * fix things that strict compiling balked at (from compiling with -ansi and -pedantic)
+ *
+ * Revision 2.6  2005/04/25 00:07:22  wmcoolmon
+ * Bumped console printing buffer size so people can play with the neb2 command
+ *
 * Revision 2.5  2004/07/26 20:47:27  Kazan
 * remove MCD complete
 *
@@ -213,11 +219,11 @@ int command_scroll = 0;

 ///=========================== SCANNER =======================
 typedef enum {
-	LETTER, QUOTE, SPECIAL, EOF_CODE, DIGIT,
+	LETTER, QUOTE, SPECIAL, EOF_CODE, DIGIT
 } CHAR_CODE;

 typedef enum {
-	NO_TOKEN, IDENTIFIER, NUMBER, STRING, 
+	NO_TOKEN, IDENTIFIER, NUMBER, STRING
 } TOKEN_CODE;


@@ -476,6 +482,11 @@ void debug_do_command(char * command)
 		dc_get_arg( ARG_ANY );
 	}

+	if ( !stricmp( Dc_arg, "xyzzy" ) )	{
+		dc_printf("Nothing happens.\n");
+		return;
+	}
+
 	if ( !strcmp( Dc_arg, "?" ) )	{
 		mode = 1;
 		dc_get_arg( ARG_ANY );
@@ -1,3 +1,6 @@
+#include "dbugfile.h"
+#include "globalincs/pstypes.h"
+
 #ifdef _WIN32
 #include <windows.h>
 #endif
@@ -7,11 +10,6 @@
 #include <sys/types.h>
 #include <sys/timeb.h>

-#include "dbugfile.h"
-
-
-
-#pragma warning(disable:4711)	// function selected for inlining

 int  dbugfile_counters[MAX_COUNTERS];
 bool dbugfile_init_var = false;
@@ -1,5 +1,5 @@
 /*
- * Code created by Thomas Whittaker (RT) for a Freespace 2 source code project
+ * Code created by Thomas Whittaker (RT) for a FreeSpace 2 source code project
 *
 * You may not sell or otherwise commercially exploit the source or things you 
 * created based on the source.
@@ -1,5 +1,5 @@
 /*
- * Code created by Thomas Whittaker (RT) for a Freespace 2 source code project
+ * Code created by Thomas Whittaker (RT) for a FreeSpace 2 source code project
 *
 * You may not sell or otherwise commercially exploit the source or things you 
 * created based on the source.
@@ -8,11 +8,15 @@

 /*
 * $Logfile: /Freespace2/code/debugconsole/timerbar.h $
- * $Revision: 1.10 $
- * $Date: 2005-07-13 02:50:50 $
+ * $Revision: 1.11 $
+ * $Date: 2006-04-20 06:32:00 $
 * $Author: Goober5000 $
 *
 * $Log: not supported by cvs2svn $
+ * Revision 1.10  2005/07/13 02:50:50  Goober5000
+ * remove PreProcDefine #includes in FS2
+ * --Goober5000
+ *
 * Revision 1.9  2004/08/11 05:06:20  Kazan
 * added preprocdefines.h to prevent what happened with fred -- make sure to make all fred2 headers include this file as the _first_ include -- i have already modified fs2 files to do this
 *
@@ -37,7 +37,7 @@ of the management functions it is never used directly)
 polygon mamagement is on the other hand signifigant enough to warent it's own section.

 Low Level Polygon Management
-initaly I thought of useing a similar simple lookup system as thedecal management, but the 
+initially I thought of useing a similar simple lookup system as thedecal management, but the 
 lookup of polygons is both more frequent (about a dozen times per created decal) and more 
 intinsive (there are MAX_GLOBAL_DECAL_POLYS to sort through, at the time of documentation 
 this was defined as _11000_ !). I had to devise something a bit more clever. the big_ol_decal_poly_array
@@ -128,6 +128,7 @@ texture for the list is set, then a call is made to render the vertex buffer.

 */

+#ifdef ENABLE_DECALS

 #include "object/object.h"
 #include "globalincs/linklist.h"
@@ -1696,6 +1697,12 @@ void decal_create_tmappoly(ubyte * p)

 	nv = dw(p+36);
 	if ( nv < 0 ) return;
+
+	if ( nv > TMAP_MAX_VERTS ) {
+		Int3();
+		return;
+	}
+
 //TIMERBAR_PUSH(TIMERBAR_WHITE);
 	verts = (model_tmap_vert *)(p+44);

@@ -2222,3 +2229,4 @@ check_poly_decals();
 */
 }

+#endif // ENABLE_DECALS
@@ -4,8 +4,11 @@
 #ifndef _DECAL_H
 #define _DECAL_H

-
 #include "object/object.h"
+#include "globalincs/pstypes.h"
+//#include "ship/ship.h"
+
+#ifdef ENABLE_DECALS

 #define MAX_DECAL_POLY 40
 #define MAX_DECAL_POLY_POINT 10
@@ -17,9 +20,6 @@
 #define QUICKFIND_SEGMENT_LENGTH (MAX_GLOBAL_DECAL_POLYS/QUICKFIND_SUBDIVISION)
 #define MAX_GLOBAL_DECALS 5000

-#include "globalincs/pstypes.h"
-//#include "ship/ship.h"
-
 #define DP_EOF 			0
 #define DP_DEFPOINTS 	1
 #define DP_FLATPOLY		2
@@ -27,6 +27,8 @@
 #define DP_SORTNORM		4
 #define DP_BOUNDBOX		5

+#endif	// ENABLE_DECALS
+
 struct decal;
 struct decal_list;
 struct decal_list_controle;
@@ -95,6 +97,8 @@ struct decal_point{
 	float radius;
 };

+#ifdef ENABLE_DECALS
+
 int decal_create(object * obj, decal_point *point, int subobject, int texture, int backfaced_texture = -1, int glow_texture = -1, int burn_texture = -1, int burn_time = 1000);//makes the decal

 int decal_create_simple(object * obj, decal_point *point, int texture);//makes a simple non-clipped decal
@@ -105,4 +109,21 @@ int decal_create_sub(void *model_ptr);

 void clear_decals(decal_system	*system);

-#endif
+void init_decals();
+
+#else // ENABLE_DECALS
+
+inline int decal_create(object * obj, decal_point *point, int subobject, int texture, int backfaced_texture = -1, int glow_texture = -1, int burn_texture = -1, int burn_time = 1000)
+{
+	return 0;
+}
+
+#define decal_create_simple(a, b, c) (0)
+#define decal_render_all(a)
+#define decal_create_sub(a) (0);
+#define clear_decals(a)
+#define init_decals()
+
+#endif // ENABLE_DECALS
+
+#endif // _DECAL_H
@@ -9,12 +9,16 @@

 /*
 * $Logfile: /Freespace2/code/Demo/Demo.cpp $
- * $Revision: 2.8 $
- * $Date: 2005-05-12 17:49:11 $
- * $Author: taylor $
+ * $Revision: 2.8.2.1 $
+ * $Date: 2007-09-02 18:52:50 $
+ * $Author: Goober5000 $
 *
 *
 * $Log: not supported by cvs2svn $
+ * Revision 2.8  2005/05/12 17:49:11  taylor
+ * use vm_malloc(), vm_free(), vm_realloc(), vm_strdup() rather than system named macros
+ *   fixes various problems and is past time to make the switch
+ *
 * Revision 2.7  2005/04/05 05:53:15  taylor
 * s/vector/vec3d/g, better support for different compilers (Jens Granseuer)
 *
@@ -1001,7 +1005,7 @@ int demo_playback_seek_sub(int frame_size)
 			ship_index = ship_get_by_signature(obj_sig);
 			if(ship_index >= 0){
 				Ships[ship_index].flags = ship_flags;
-				ship_departed(ship_index);
+				ship_actually_depart(ship_index);
 			}
 			}
 			break;
@@ -1,3 +1,4 @@
+#include <windows.h>
 #include <dshow.h>
 #include <stdio.h>

@@ -17,9 +18,9 @@ enum PLAYSTATE {Stopped, Paused, Running, Init};
 void Msg(TCHAR *szFormat, ...);

 // Local
-HRESULT InitPlayerWindow(HWND ghApp);
+//HRESULT InitPlayerWindow(HWND ghApp);
 HRESULT InitVideoWindow(HWND ghApp, long w, long h);
-bool HandleGraphEvent(void);
+//bool HandleGraphEvent(void);
 void CheckVisibility(void);
 void CloseInterfaces(void);

@@ -58,7 +59,7 @@ char *ParseDShowError(HRESULT hr)
 //
 BOOL      g_bAudioOnly=FALSE;
 LONG      g_lVolume=VOLUME_FULL;
-DWORD     g_dwGraphRegister=0;
+//DWORD     g_dwGraphRegister=0;
 PLAYSTATE g_psCurrent=Stopped;

 // DirectShow interfaces
@@ -71,10 +72,11 @@ IBasicVideo   *pBV = NULL;
 IMediaSeeking *pMS = NULL;
 IMediaPosition *pMP = NULL;

+/*
 void PassMsgToVideoWindow(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
-    if (pVW)
-        pVW->NotifyOwnerMessage((long) hWnd, message, wParam, lParam);
+	if (pVW)
+		pVW->NotifyOwnerMessage((long) hWnd, message, wParam, lParam);
 }

 void SetCurrentState(PLAYSTATE state)
@@ -91,6 +93,7 @@ BOOL IsAudioOnly()
 {
 	return g_bAudioOnly; 
 }
+*/

 HRESULT PlayMovieInWindow(HWND ghApp, LPTSTR szFile)
 {
@@ -113,6 +116,9 @@ HRESULT PlayMovieInWindow(HWND ghApp, LPTSTR szFile)
    {
        HRESULT load_attempt = pGB->RenderFile(wFile, NULL);

+		// f%#$ing DivX6...
+	//	SetForegroundWindow(ghApp);
+
        // Have the graph builder construct its the appropriate graph automatically
        if(FAILED(load_attempt))
 		{
@@ -142,13 +148,15 @@ HRESULT PlayMovieInWindow(HWND ghApp, LPTSTR szFile)
 		pBV->get_VideoWidth(&width);
 		pBV->get_VideoHeight(&height);

-        JIF(InitVideoWindow(ghApp,width, height));
+	//	JIF(InitVideoWindow(ghApp,width, height));

 		if (!g_bAudioOnly)
        {
            JIF(pVW->put_Owner((OAHWND)ghApp));
            JIF(pVW->put_WindowStyle(WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_VISIBLE));
+			JIF(InitVideoWindow(ghApp, width, height));
 			JIF(pVW->SetWindowForeground(OATRUE));
+			JIF(pVW->put_MessageDrain((OAHWND)ghApp));
 		}

        // Run the graph to play the media file
@@ -279,23 +287,25 @@ void CloseClip(HWND ghApp)

 void CloseInterfaces(void)
 {
-    // Relinquish ownership (IMPORTANT!) after hiding video window
-    if(pVW)
-        pVW->put_Visible(OAFALSE);
+	// Relinquish ownership (IMPORTANT!) after hiding video window
+	if (pVW) {
+		pVW->put_Visible(OAFALSE);
+		pVW->put_Owner(NULL);
+	}

    // Disable event callbacks
-    if (pME)
-        pME->SetNotifyWindow((OAHWND)NULL, 0, 0);
+	if (pME)
+		pME->SetNotifyWindow((OAHWND)NULL, 0, 0);

    // Release and zero DirectShow interfaces
-    SAFE_RELEASE(pME);
-    SAFE_RELEASE(pMS);
-    SAFE_RELEASE(pMP);
-    SAFE_RELEASE(pMC);
-    SAFE_RELEASE(pBA);
-    SAFE_RELEASE(pBV);
-    SAFE_RELEASE(pVW);
-    SAFE_RELEASE(pGB);
+	SAFE_RELEASE(pME);
+	SAFE_RELEASE(pMS);
+	SAFE_RELEASE(pMP);
+	SAFE_RELEASE(pMC);
+	SAFE_RELEASE(pBA);
+	SAFE_RELEASE(pBV);
+	SAFE_RELEASE(pVW);
+	SAFE_RELEASE(pGB);
 }

 void Msg(TCHAR *szFormat, ...)
@@ -338,4 +348,3 @@ bool dx8show_stream_movie(void)

    return false;
 }
-
@@ -9,13 +9,24 @@

 /*
 * $Logfile: /Freespace2/code/ExceptionHandler/ExceptionHandler.cpp $
- * $Revision: 2.8 $
- * $Date: 2005-01-31 23:27:52 $
+ * $Revision: 2.10.2.1 $
+ * $Date: 2006-11-15 00:26:03 $
 * $Author: taylor $
 *
 * Main file for dealing with exception handling
 *
 * $Log: not supported by cvs2svn $
+ * Revision 2.10  2006/01/26 03:23:29  Goober5000
+ * pare down the pragmas some more
+ * --Goober5000
+ *
+ * Revision 2.9  2006/01/20 07:10:33  Goober5000
+ * reordered #include files to quash Microsoft warnings
+ * --Goober5000
+ *
+ * Revision 2.8  2005/01/31 23:27:52  taylor
+ * merge with Linux/OSX tree - p0131-2
+ *
 * Revision 2.7  2004/07/26 20:47:27  Kazan
 * remove MCD complete
 *
@@ -24,7 +35,7 @@
 *
 * Revision 2.5  2004/03/31 05:42:26  Goober5000
 * got rid of all those nasty warnings from xlocale and so forth; also added comments
- * for #pragma warning disable to indicate the message being disabled
+ * to indicate which warnings were being disabled
 * --Goober5000
 *
 * Revision 2.4  2004/03/06 23:28:22  bobboau
@@ -78,11 +89,11 @@ on how to hook it in.

 #ifdef _WIN32

+#include "globalincs/pstypes.h"
+
 #include <windows.h>


-#pragma warning(disable:4711)	// function selected for inlining
-
 // --------------------
 //
 // Defines
@@ -551,7 +562,10 @@ int __cdecl RecordExceptionInfo(PEXCEPTION_POINTERS data, const char *Message)
 	}
 #endif

-	
+#ifndef NDEBUG
+	if (safe_string[0])
+		hprintf(LogFile, "Last safe point: %s\r\n", safe_string);
+#endif

 	RecordModuleList(LogFile);

@@ -559,7 +573,6 @@ int __cdecl RecordExceptionInfo(PEXCEPTION_POINTERS data, const char *Message)
 	// Return the magic value which tells Win32 that this handler didn't
 	// actually handle the exception - so that things will proceed as per
 	// normal.
-	if(safe_string[0])hprintf(LogFile, "\nlast safe point \n%s\n",safe_string);

 	return EXCEPTION_CONTINUE_SEARCH;
 }
@@ -9,13 +9,56 @@

 /*
 * $Logfile: /Freespace2/code/Fireball/FireBalls.cpp $
- * $Revision: 2.26 $
- * $Date: 2005-04-05 05:53:15 $
- * $Author: taylor $
+ * $Revision: 2.33.2.4 $
+ * $Date: 2007-09-02 02:07:39 $
+ * $Author: Goober5000 $
 *
 * Code to move, render and otherwise deal with fireballs.
 *
 * $Log: not supported by cvs2svn $
+ * Revision 2.33.2.3  2007/07/28 21:31:04  Goober5000
+ * this should really be capitalized
+ *
+ * Revision 2.33.2.2  2007/02/11 09:53:33  taylor
+ * support for tbl specified fireball explosion color ("$Light color:")
+ *
+ * Revision 2.33.2.1  2006/09/11 01:12:50  taylor
+ * fixes for stuff_string() bounds checking
+ * stict compiler build fixes
+ *
+ * Revision 2.33  2006/02/25 21:46:59  Goober5000
+ * spelling
+ *
+ * Revision 2.32  2006/02/13 00:20:45  Goober5000
+ * more tweaks, plus clarification of checks for the existence of files
+ * --Goober5000
+ *
+ * Revision 2.31  2006/01/20 07:10:33  Goober5000
+ * reordered #include files to quash Microsoft warnings
+ * --Goober5000
+ *
+ * Revision 2.30  2005/12/29 08:08:33  wmcoolmon
+ * Codebase commit, most notably including objecttypes.tbl
+ *
+ * Revision 2.29  2005/12/28 22:17:01  taylor
+ * deal with cf_find_file_location() changes
+ * add a central parse_modular_table() function which anything can use
+ * fix up weapon_expl so that it can properly handle modular tables and LOD count changes
+ * add support for for a fireball TBM (handled a little different than a normal TBM is since it only changes rather than adds)
+ *
+ * Revision 2.28  2005/12/01 07:45:21  Goober5000
+ * bypass annoying warnings when loading optional models
+ * --Goober5000
+ *
+ * Revision 2.27  2005/10/20 17:50:00  taylor
+ * fix player warpout
+ * basic code cleanup (that previous braces change did nothing for readability)
+ * spell "plyr" correctly
+ * tweak warp shrink time to better match WMC's other changes and avoid the skipping during shrink
+ *
+ * Revision 2.26  2005/04/05 05:53:15  taylor
+ * s/vector/vec3d/g, better support for different compilers (Jens Granseuer)
+ *
 * Revision 2.25  2005/03/19 18:02:33  bobboau
 * added new graphic functions for state blocks
 * also added a class formanageing a new effect
@@ -116,7 +159,7 @@
 * --Goober5000
 *
 * Revision 2.3  2002/12/07 01:37:41  bobboau
- * inital decals code, if you are worried a bug is being caused by the decals code it's only references are in,
+ * initial decals code, if you are worried a bug is being caused by the decals code it's only references are in,
 * collideshipweapon.cpp line 262, beam.cpp line 2771, and modelinterp.cpp line 2949.
 * it needs a better renderer, but is in prety good shape for now,
 * I also (think) I squashed a bug in the warpmodel code
@@ -435,8 +478,6 @@
 * $NoKeywords: $
 */

-#include <stdlib.h>
-
 #include "fireball/fireballs.h"
 #include "graphics/tmapper.h"
 #include "render/3d.h"
@@ -447,12 +488,21 @@
 #include "localization/localize.h"
 #include "cmdline/cmdline.h"
 #include "parse/parselo.h"
+#include "globalincs/pstypes.h"

+#include <stdlib.h>
+#include <vector>
+
+
+// make use of the LOD checker for tbl/tbm parsing (from weapons.cpp)
+extern std::vector<lod_checker> LOD_checker;
+
+static std::vector<color> LOD_color;

 int Warp_model;
 int Knossos_warp_ani_used;

-#define WARPHOLE_GROW_TIME		(2.5f)	// time for warphole to reach max size (also time to shrink to nothing once it begins to shrink)
+#define WARPHOLE_GROW_TIME		(2.35f)	// time for warphole to reach max size (also time to shrink to nothing once it begins to shrink)

 #define MAX_FIREBALL_LOD						4

@@ -464,8 +514,12 @@ fireball Fireballs[MAX_FIREBALLS];

 fireball_info Fireball_info[MAX_FIREBALL_TYPES];

+int fireball_used[MAX_FIREBALL_TYPES];
+
 int Num_fireballs = 0;

+int Num_fireball_types = 0;
+
 int fireballs_inited = 0;

 int Warp_glow_bitmap = -1;
@@ -488,7 +542,9 @@ void fireball_play_warphole_open_sound(int ship_class, fireball *fb)

 	sound_index = SND_WARP_IN;

-	if((ship_class >= 0) && (ship_class < Num_ship_types)){
+	if(fb->warp_open_sound_index > -1) {
+		sound_index = fb->warp_open_sound_index;
+	} else if((ship_class >= 0) && (ship_class < Num_ship_classes)){
 		if ( Ship_info[ship_class].flags & SIF_HUGE_SHIP ) {
 			sound_index = SND_CAPITAL_WARP_IN;
 			fb->flags |= FBF_WARP_CAPITAL_SIZE;
@@ -497,10 +553,6 @@ void fireball_play_warphole_open_sound(int ship_class, fireball *fb)
 			fb->flags |= FBF_WARP_CRUISER_SIZE;
 		}
 	}
-	else
-	{
-		sound_index = fb->warp_open_sound_index;
-	}

 	snd_play_3d(&Snds[sound_index], &fireball_objp->pos, &Eye_position, fireball_objp->radius, NULL, 0, 1.0f, SND_PRIORITY_DOUBLE_INSTANCE, NULL, range_multiplier); // play warp sound effect
 }
@@ -516,10 +568,10 @@ void fireball_play_warphole_close_sound(fireball *fb)

 	sound_index = SND_WARP_OUT;

-	if ( fb->flags & FBF_WARP_CAPITAL_SIZE ) {
-		sound_index = SND_CAPITAL_WARP_OUT;
-	} else if ( fb->flags & FBF_WARP_VIA_SEXP ) {
+	if ( fb->warp_close_sound_index > -1 ) {
 		sound_index = fb->warp_close_sound_index;
+	} else if ( fb->flags & FBF_WARP_CAPITAL_SIZE ) {
+		sound_index = SND_CAPITAL_WARP_OUT;
 	} else {
 		// AL 27-3-98: Decided that warphole closing is only required for capital ship sized warp effects.
 		return;
@@ -528,69 +580,204 @@ void fireball_play_warphole_close_sound(fireball *fb)
 	snd_play_3d(&Snds[sound_index], &fireball_objp->pos, &Eye_position, fireball_objp->radius); // play warp sound effect
 }

-void fireball_parse_tbl()
+// set default colors for each explosion type (original values from object.cpp)
+static void fireball_set_default_color(int idx)
 {
-	int	rval, idx;
-	char base_filename[256] = "";
+	Assert( (idx >= 0) && (idx < MAX_FIREBALL_TYPES) );
+
+	switch (idx)
+	{
+		case FIREBALL_EXPLOSION_LARGE1:
+		case FIREBALL_EXPLOSION_LARGE2:
+		case FIREBALL_EXPLOSION_MEDIUM:
+		case FIREBALL_ASTEROID:
+			Fireball_info[idx].exp_color[0] = 1.0f;
+			Fireball_info[idx].exp_color[1] = 0.5f;
+			Fireball_info[idx].exp_color[2] = 0.125f;
+			break;
+
+		case FIREBALL_WARP:
+			Fireball_info[idx].exp_color[0] = 0.75f;
+			Fireball_info[idx].exp_color[1] = 0.75f;
+			Fireball_info[idx].exp_color[2] = 1.0f;
+			break;
+
+
+		case FIREBALL_KNOSSOS:
+			Fireball_info[idx].exp_color[0] = 0.75f;
+			Fireball_info[idx].exp_color[1] = 1.0f;
+			Fireball_info[idx].exp_color[2] = 0.75f;
+			break;
+
+		default:
+			Fireball_info[idx].exp_color[0] = 1.0f;
+			Fireball_info[idx].exp_color[1] = 1.0f;
+			Fireball_info[idx].exp_color[2] = 1.0f;
+			break;
+	}
+}
+
+// NOTE: we can't be too trusting here so a tbm will only modify the LOD count, not add an entry
+void parse_fireball_tbl(char *filename)
+{
+	int rval;
+	lod_checker lod_check;
+	color fb_color;

 	// open localization
 	lcl_ext_open();

 	if ((rval = setjmp(parse_abort)) != 0) {
-		Error(LOCATION, "Unable to parse fireball.tbl!  Code = %i.\n", rval);
-	}
-	else {
-		read_file_text(NOX("fireball.tbl"));
-		reset_parse();		
+		mprintf(("TABLES: Unable to parse '%s'!  Error code = %i.\n", filename, rval));
+		lcl_ext_close();
+		return;
 	}

-	int ntypes = 0;
+	read_file_text(filename, CF_TYPE_TABLES);
+	reset_parse();
+
 	required_string("#Start");
-	while (required_string_either("#End","$Name:")) {
-		Assert( ntypes < MAX_FIREBALL_TYPES);
+
+	while (required_string_either("#End", "$Name:")) {
+		memset( &lod_check, 0, sizeof(lod_checker) );

 		// base filename
 		required_string("$Name:");
-		stuff_string(base_filename, F_NAME, NULL);
+		stuff_string(lod_check.filename, F_NAME, MAX_FILENAME_LEN);

-		// # of lod levels - make sure old fireball.tbl is compatible
-		Fireball_info[ntypes].lod_count = 1;
-		if(optional_string("$LOD:")){
-			stuff_int(&Fireball_info[ntypes].lod_count);
-		}
+		lod_check.override = -1;

-		// stuff default filename
-		strcpy(Fireball_info[ntypes].lod[0].filename, base_filename);
-
-		// stuff LOD level filenames
-		for(idx=1; idx<Fireball_info[ntypes].lod_count; idx++){
-			if(idx >= MAX_FIREBALL_LOD){
-				break;
+		// these entries should only be in TBMs, and it has to include at least one
+		if ( Parsing_modular_table ) {
+			if (optional_string("+Explosion_Medium")) {
+				lod_check.override = FIREBALL_EXPLOSION_MEDIUM;
+			} else if (optional_string("+Warp_Effect")) {
+				lod_check.override = FIREBALL_WARP;
+			} else if (optional_string("+Knossos_Effect")) {
+				lod_check.override = FIREBALL_KNOSSOS;
+			} else if (optional_string("+Asteroid")) {
+				lod_check.override = FIREBALL_ASTEROID;
+			} else if (optional_string("+Explosion_Large1")) {
+				lod_check.override = FIREBALL_EXPLOSION_LARGE1;
+			} else if (optional_string("+Explosion_Large2")){
+				lod_check.override = FIREBALL_EXPLOSION_LARGE2;
+			} else {
+				required_string("+Custom_Fireball");
+				stuff_int(&lod_check.override);
 			}
-
-			sprintf(Fireball_info[ntypes].lod[idx].filename, "%s_%d", base_filename, idx);
 		}

-		ntypes++;
+		lod_check.num_lods = 1;
+
+		// Do we have an LOD num
+		if (optional_string("$LOD:")) {
+			stuff_int(&lod_check.num_lods);
+		}
+
+		if (lod_check.num_lods > MAX_FIREBALL_LOD) {
+			lod_check.num_lods = MAX_FIREBALL_LOD;
+		}
+
+		// check for particular lighting color
+		if ( optional_string("$Light color:") ) {
+			int r, g, b;
+
+			stuff_int(&r);
+			stuff_int(&g);
+			stuff_int(&b);
+
+			CLAMP(r, 0, 255);
+			CLAMP(g, 0, 255);
+			CLAMP(b, 0, 255);
+
+			gr_init_color(&fb_color, r, g, b);
+		} else {
+			// to keep things simple, we just use 0 alpha to indicate that a default value should be used
+			memset( &fb_color, 0, sizeof(color) );
+		}
+
+		// we may use one filename for multiple entries so we'll have to handle dupes post parse
+		LOD_checker.push_back(lod_check);
+		LOD_color.push_back(fb_color);
 	}
+
 	required_string("#End");

 	// close localization
 	lcl_ext_close();
 }

+void fireball_parse_tbl()
+{
+	int i, j;
+
+	memset( &Fireball_info, 0, sizeof(fireball_info) * MAX_FIREBALL_TYPES );
+
+
+	parse_fireball_tbl("fireball.tbl");
+
+	// look for any modular tables
+	parse_modular_table(NOX("*-fbl.tbm"), parse_fireball_tbl);
+
+	// we've got our list so pass it off for final checking and loading.
+	// we assume that entries in fireball.tbl are in the correct order
+	for (i = 0; i < (int)LOD_checker.size(); i++) {
+		if ( (i < MAX_FIREBALL_TYPES) && (LOD_checker[i].override < 0) ) {
+			strcpy( Fireball_info[i].lod[0].filename, LOD_checker[i].filename );
+			Fireball_info[i].lod_count = LOD_checker[i].num_lods;
+			Num_fireball_types++;
+
+			if (LOD_color[i].alpha == 255) {
+				Fireball_info[i].exp_color[0] = (LOD_color[i].red / 255.0f);
+				Fireball_info[i].exp_color[1] = (LOD_color[i].green / 255.0f);
+				Fireball_info[i].exp_color[2] = (LOD_color[i].blue / 255.0f);
+			} else {
+				fireball_set_default_color(i);
+			}
+		}
+	}
+
+	// having to do this twice is less than optimal, but less error prone too.
+	// this handles (and should only have to handle) TBM related entries
+	for (i = 0; i < (int)LOD_checker.size(); i++) {
+		// try entry replacement
+		if ( (LOD_checker[i].override >= 0) && (LOD_checker[i].override < Num_fireball_types) ) {
+			strcpy( Fireball_info[LOD_checker[i].override].lod[0].filename, LOD_checker[i].filename );
+			Fireball_info[LOD_checker[i].override].lod_count = LOD_checker[i].num_lods;
+
+			if (LOD_color[i].alpha == 255) {
+				Fireball_info[LOD_checker[i].override].exp_color[0] = (LOD_color[i].red / 255.0f);
+				Fireball_info[LOD_checker[i].override].exp_color[1] = (LOD_color[i].green / 255.0f);
+				Fireball_info[LOD_checker[i].override].exp_color[2] = (LOD_color[i].blue / 255.0f);
+			} else {
+				fireball_set_default_color(LOD_checker[i].override);
+			}
+		}
+	}
+
+	// fill in extra LOD filenames
+	for (i = 0; i < Num_fireball_types; i++) {
+		for (j = 1; j < Fireball_info[i].lod_count; j++) {
+			sprintf( Fireball_info[i].lod[j].filename, "%s_%d", Fireball_info[i].lod[0].filename, j);
+		}
+	}
+
+	// done
+	LOD_checker.clear();
+}
+

 void fireball_load_data()
 {
 	int				i, idx;
 	fireball_info	*fd;

-	for ( i = 0; i < MAX_FIREBALL_TYPES; i++ ) {
+	for ( i = 0; i < Num_fireball_types; i++ ) {
 		fd = &Fireball_info[i];

 		for(idx=0; idx<fd->lod_count; idx++){
 			// we won't use a warp effect lod greater than MAX_WARP_LOD so don't load it either
-			if ( (i == FIREBALL_WARP_EFFECT) && (idx > MAX_WARP_LOD) )
+			if ( (i == FIREBALL_WARP) && (idx > MAX_WARP_LOD) )
 				continue;

 			fd->lod[idx].bitmap_id	= bm_load_animation( fd->lod[idx].filename, &fd->lod[idx].num_frames, &fd->lod[idx].fps, 1 );
@@ -639,15 +826,19 @@ void fireball_init()
 	// Goober5000 - reset Knossos warp flag
 	Knossos_warp_ani_used = 0;

-	mprintf(("loading warp model"));
+	mprintf(("Loading warp model\n"));
 	Warp_model = -1;
-	Warp_model = model_load("warp.pof", 0, NULL, 0);
+
+	// Goober5000 - check for existence of file before trying to load it
+	if (cf_exists_full("warp.pof", CF_TYPE_MODELS))
+	{
+		Warp_model = model_load("warp.pof", 0, NULL, 0);
+	}
+
 	mprintf((" %d\n", Warp_model));
-
-
 }

-MONITOR( NumFireballsRend );	
+MONITOR( NumFireballsRend )

 void fireball_render(object * obj)
 {
@@ -682,29 +873,20 @@ void fireball_render(object * obj)
 		g3_transfer_vertex(&p, &obj->pos);
 	}

-	switch( fb->fireball_info_index )	{
-	
-		case FIREBALL_EXPLOSION_MEDIUM:
+	switch( fb->fireball_render_type )	{
+
+		case FIREBALL_MEDIUM_EXPLOSION:
 			gr_set_bitmap(Fireballs[num].current_bitmap, GR_ALPHABLEND_FILTER, GR_BITBLT_MODE_NORMAL, 1.3f );
 			g3_draw_bitmap(&p, fb->orient, obj->radius, TMAP_FLAG_TEXTURED | TMAP_HTL_3D_UNLIT );
 			break;

-		case FIREBALL_EXPLOSION_LARGE1:
-		case FIREBALL_EXPLOSION_LARGE2:
-		// case FIREBALL_EXPLOSION_LARGE3:
-			/*
-			if (!tcache_hit(Fireballs[num].current_bitmap)) {
-				// if we're over 200k exp vram upload this frame, change to lower lod
-			}*/
-
-		case FIREBALL_ASTEROID:
+		case FIREBALL_LARGE_EXPLOSION:
 			// Make the big explosions rotate with the viewer.
 			gr_set_bitmap(Fireballs[num].current_bitmap, GR_ALPHABLEND_FILTER, GR_BITBLT_MODE_NORMAL, 1.3f );
 			g3_draw_rotated_bitmap(&p, (i2fl(fb->orient)*PI)/180.0f, obj->radius, TMAP_FLAG_TEXTURED | TMAP_HTL_3D_UNLIT);
 			break;

-		case FIREBALL_WARP_EFFECT:
-		case FIREBALL_KNOSSOS_EFFECT: {
+		case FIREBALL_WARP_EFFECT: {
 			
 				float percent_life = fb->time_elapsed / fb->total_time;

@@ -796,7 +978,7 @@ void fireball_set_framenum(int num)
 		return;
 	}

-	if ( fb->fireball_info_index == FIREBALL_WARP_EFFECT || fb->fireball_info_index == FIREBALL_KNOSSOS_EFFECT )	{
+	if ( fb->fireball_render_type == FIREBALL_WARP_EFFECT )	{
 		float total_time = i2fl(fl->num_frames) / fl->fps;	// in seconds

 		framenum = fl2i(fb->time_elapsed * fl->num_frames / total_time + 0.5);
@@ -839,10 +1021,10 @@ int fireball_is_perishable(object * obj)

 	fb = &Fireballs[num];

-	if ( fb->fireball_info_index == FIREBALL_EXPLOSION_MEDIUM )	
+	if ( fb->fireball_render_type == FIREBALL_MEDIUM_EXPLOSION )	
 		return 1;

-	if ( !((fb->fireball_info_index == FIREBALL_WARP_EFFECT) || (fb->fireball_info_index == FIREBALL_KNOSSOS_EFFECT)) )	{
+	if ( !(fb->fireball_render_type == FIREBALL_WARP_EFFECT) )	{
 		if ( !(obj->flags & OF_WAS_RENDERED))	{
 			return 1;
 		}
@@ -905,7 +1087,7 @@ int fireball_is_warp(object * obj)

 	fb = &Fireballs[num];

-	if ( fb->fireball_info_index == FIREBALL_WARP_EFFECT || fb->fireball_info_index == FIREBALL_KNOSSOS_EFFECT)	
+	if ( fb->fireball_render_type == FIREBALL_WARP_EFFECT)	
 		return 1;

 	return 0;
@@ -917,7 +1099,7 @@ void fireball_maybe_play_warp_close_sound(fireball *fb)
 	float life_left;

 	// If not a warphole fireball, do a quick out
-	if ( !(fb->fireball_info_index == FIREBALL_WARP_EFFECT || fb->fireball_info_index == FIREBALL_KNOSSOS_EFFECT)) {
+	if ( !(fb->fireball_render_type == FIREBALL_WARP_EFFECT)) {
 		return;
 	}

@@ -934,7 +1116,7 @@ void fireball_maybe_play_warp_close_sound(fireball *fb)
 	}
 }

-MONITOR( NumFireballs );	
+MONITOR( NumFireballs )

 void fireball_process_post(object * obj, float frame_time)
 {
@@ -1008,14 +1190,13 @@ int fireball_get_lod(vec3d *pos, fireball_info *fd, float size)
 	}

 	// start the frame
-	extern float Viewer_zoom;
 	extern int G3_count;

 	if(!G3_count){
 		g3_start_frame(1);
 		must_stop = 1;
 	}
-	g3_set_view_matrix(&Eye_position, &Eye_matrix, Viewer_zoom);
+	g3_set_view_matrix(&Eye_position, &Eye_matrix, Eye_fov);

 	// get extents of the rotated bitmap
 	g3_rotate_vertex(&v, pos);
@@ -1076,7 +1257,7 @@ int fireball_get_lod(vec3d *pos, fireball_info *fd, float size)
 }

 //	Create a fireball, return object index.
-int fireball_create( vec3d * pos, int fireball_type, int parent_obj, float size, int reverse, vec3d *velocity, float warp_lifetime, int ship_class, matrix *orient_override, int low_res, int extra_flags, int warp_open_sound, int warp_close_sound)
+int fireball_create( vec3d * pos, int fireball_type, int render_type, int parent_obj, float size, int reverse, vec3d *velocity, float warp_lifetime, int ship_class, matrix *orient_override, int low_res, int extra_flags, int warp_open_sound, int warp_close_sound)
 {
 	int				n, objnum, fb_lod;
 	object			*obj;
@@ -1085,17 +1266,21 @@ int fireball_create( vec3d * pos, int fireball_type, int parent_obj, float size,
 	fireball_lod	*fl;

 	Assert( fireball_type > -1 );
-	Assert( fireball_type < MAX_FIREBALL_TYPES );
+	Assert( fireball_type < Num_fireball_types );

 	fd = &Fireball_info[fireball_type];

+	// check to make sure this fireball type exists
+	if (!fd->lod_count)
+		return -1;
+
 	if ( !(Game_detail_flags & DETAIL_FLAG_FIREBALLS) )	{
-		if ( !((fireball_type == FIREBALL_WARP_EFFECT) || (fireball_type == FIREBALL_KNOSSOS_EFFECT)) )	{
+		if ( !((fireball_type == FIREBALL_WARP) || (fireball_type == FIREBALL_KNOSSOS)) )	{
 			return -1;
 		}
 	}

-	if ( (Num_fireballs >= MAX_FIREBALLS) || (num_objects >= MAX_OBJECTS) )	{
+	if ( (Num_fireballs >= MAX_FIREBALLS) || (Num_objects >= MAX_OBJECTS) )	{
 		// who cares if we don't create a spark.
 		// JAS - Should this code be in?  Is it better to remove an old spark
 		// and start a new one, or just not start the new one?
@@ -1134,7 +1319,7 @@ int fireball_create( vec3d * pos, int fireball_type, int parent_obj, float size,
 	}

 	// if this is a warpout fireball, never go higher than LOD 1
-	if(fireball_type == FIREBALL_WARP_EFFECT){
+	if(fireball_type == FIREBALL_WARP){
 		/*
 		if(fb_lod > 1){
 			fb_lod = 1;
@@ -1171,25 +1356,22 @@ int fireball_create( vec3d * pos, int fireball_type, int parent_obj, float size,
 	obj = &Objects[objnum];

 	fb->fireball_info_index = fireball_type;
+	fb->fireball_render_type = render_type;
 	fb->time_elapsed = 0.0f;
 	fb->objnum = objnum;
 	fb->current_bitmap = -1;
 	
-	switch( fb->fireball_info_index )	{
+	switch( fb->fireball_render_type )	{

-		case FIREBALL_EXPLOSION_MEDIUM:	
+		case FIREBALL_MEDIUM_EXPLOSION:	
 			fb->orient = (myrand()>>8) & 7;							// 0 - 7
 			break;

-		case FIREBALL_EXPLOSION_LARGE1:
-		case FIREBALL_EXPLOSION_LARGE2:
-		// case FIREBALL_EXPLOSION_LARGE3:
-		case FIREBALL_ASTEROID:
+		case FIREBALL_LARGE_EXPLOSION:
 			fb->orient = (myrand()>>8) % 360;						// 0 - 359
 			break;

 		case FIREBALL_WARP_EFFECT:
-		case FIREBALL_KNOSSOS_EFFECT:
 			// Play sound effect for warp hole opening up
 			fireball_play_warphole_open_sound(ship_class, fb);

@@ -1209,7 +1391,7 @@ int fireball_create( vec3d * pos, int fireball_type, int parent_obj, float size,
 			break;
 	}

-	if ( fb->fireball_info_index == FIREBALL_WARP_EFFECT || fb->fireball_info_index == FIREBALL_KNOSSOS_EFFECT )	{
+	if ( fb->fireball_render_type == FIREBALL_WARP_EFFECT )	{
 		Assert( warp_lifetime > 4.0f );		// Warp lifetime must be at least 4 seconds!
 		fb->total_time = warp_lifetime;	// in seconds
 	} else {
@@ -1266,23 +1448,67 @@ void fireballs_page_in()
 {
 	int				i, idx;
 	fireball_info	*fd;
-	
-	for ( i = 0; i < MAX_FIREBALL_TYPES ; i++ ) {
-		fd = &Fireball_info[i];

-		// if this is a Knossos ani, only load if Knossos_warp_ani_used is true
-		if ( (i == FIREBALL_KNOSSOS_EFFECT) && !Knossos_warp_ani_used)
-			continue;
+	for ( i = 0; i < Num_fireball_types; i++ ) {
+		if((i < NUM_DEFAULT_FIREBALLS) || fireball_used[i]){
+			fd = &Fireball_info[i];

-		for(idx=0; idx<fd->lod_count; idx++) {
-			// we won't use a warp effect lod greater than MAX_WARP_LOD so don't load it either
-			if ( (i == FIREBALL_WARP_EFFECT) && (idx > MAX_WARP_LOD) )
+			// if this is a Knossos ani, only load if Knossos_warp_ani_used is true
+			if ( (i == FIREBALL_KNOSSOS) && !Knossos_warp_ani_used)
 				continue;

-			bm_page_in_texture( fd->lod[idx].bitmap_id, fd->lod[idx].num_frames );
+			for(idx=0; idx<fd->lod_count; idx++) {
+				// we won't use a warp effect lod greater than MAX_WARP_LOD so don't load it either
+				if ( (i == FIREBALL_WARP) && (idx > MAX_WARP_LOD) )
+					continue;
+
+				bm_page_in_texture( fd->lod[idx].bitmap_id, fd->lod[idx].num_frames );
+			}
 		}
 	}

 	bm_page_in_texture( Warp_glow_bitmap );
+	bm_page_in_texture( Warp_ball_bitmap );
+}

+void fireball_get_color(int idx, float *red, float *green, float *blue)
+{
+	Assert( red && blue && green );
+
+	if ( (idx < 0) || (idx >= Num_fireball_types) ) {
+		Int3();
+		
+		*red = 1.0f;
+		*green = 1.0f;
+		*blue = 1.0f;
+
+		return;
+	}
+
+	fireball_info *fbi = &Fireball_info[idx];
+
+	*red = fbi->exp_color[0];
+	*green = fbi->exp_color[1];
+	*blue = fbi->exp_color[2];
+}
+
+int fireball_ship_explosion_type(ship_info *sip)
+{
+	Assert( sip != NULL );
+
+	int index = -1;
+	int ship_fireballs = (int)sip->explosion_bitmap_anims.size();
+	int objecttype_fireballs = -1;
+
+	if (sip->class_type >= 0) {
+		objecttype_fireballs = (int)Ship_types[sip->class_type].explosion_bitmap_anims.size();
+	}
+
+	if(ship_fireballs > 0){
+		index = sip->explosion_bitmap_anims[rand()%ship_fireballs];
+	} else if(objecttype_fireballs > 0){
+		index = Ship_types[sip->class_type].explosion_bitmap_anims[rand()%objecttype_fireballs];
+	}
+
+	return index;
 }
@@ -9,13 +9,20 @@

 /*
 * $Logfile: /Freespace2/code/Fireball/FireBalls.h $
- * $Revision: 2.14 $
- * $Date: 2005-07-13 02:50:52 $
- * $Author: Goober5000 $
+ * $Revision: 2.14.2.2 $
+ * $Date: 2007-11-22 05:02:28 $
+ * $Author: taylor $
 *
 * Prototypes for fireball functions
 *
 * $Log: not supported by cvs2svn $
+ * Revision 2.14.2.1  2007/02/11 09:53:33  taylor
+ * support for tbl specified fireball explosion color ("$Light color:")
+ *
+ * Revision 2.14  2005/07/13 02:50:52  Goober5000
+ * remove PreProcDefine #includes in FS2
+ * --Goober5000
+ *
 * Revision 2.13  2005/04/05 05:53:15  taylor
 * s/vector/vec3d/g, better support for different compilers (Jens Granseuer)
 *
@@ -215,19 +222,28 @@
 #include "globalincs/pstypes.h"

 struct object;
+struct ship_info;

-// these values correspond to the fireball.tbl entries
+// values correspond to the fireball render types
+#define FIREBALL_MEDIUM_EXPLOSION	0
+#define FIREBALL_LARGE_EXPLOSION	1
+#define FIREBALL_WARP_EFFECT		2
+
+// these values correspond to the fireball.tbl default entries
 #define FIREBALL_EXPLOSION_MEDIUM	0				// Used for the 4 little explosions before a ship explodes
-#define FIREBALL_WARP_EFFECT			1				// Used for the warp in / warp out effect
-#define FIREBALL_KNOSSOS_EFFECT		2				// Used for the KNOSSOS warp in / warp out effect
+#define FIREBALL_WARP			1				// Used for the warp in / warp out effect
+#define FIREBALL_KNOSSOS		2				// Used for the KNOSSOS warp in / warp out effect
 #define FIREBALL_ASTEROID				3
 #define FIREBALL_EXPLOSION_LARGE1	4				// Used for the big explosion when a ship breaks into pieces
 #define FIREBALL_EXPLOSION_LARGE2	5				// Used for the big explosion when a ship breaks into pieces
-// #define FIREBALL_EXPLOSION_LARGE3	6				// Used for the big explosion when a ship breaks into pieces
-#define MAX_FIREBALL_TYPES				6				// How many types there are
+
+#define MAX_FIREBALL_TYPES				32				// The maximum number of fireballs that can be defined
+#define NUM_DEFAULT_FIREBALLS			6

 #define FIREBALL_NUM_LARGE_EXPLOSIONS 2

+extern int fireball_used[MAX_FIREBALL_TYPES];
+
 // all this moved here by Goober5000 because it makes more sense in the H file
 typedef struct fireball_lod {
 	char	filename[MAX_FILENAME_LEN];
@@ -237,7 +253,8 @@ typedef struct fireball_lod {
 } fireball_lod;

 typedef struct fireball_info	{
-	int					lod_count;	
+	int					lod_count;
+	float				exp_color[3];
 	fireball_lod		lod[4];
 } fireball_info;

@@ -251,6 +268,7 @@ typedef struct fireball_info	{
 typedef struct fireball {					
 	int		objnum;					// If -1 this object is unused
 	int		fireball_info_index;	// Index into Fireball_info array
+	int		fireball_render_type;
 	int		current_bitmap;
 	int		orient;					// For fireballs, which orientation.  For warps, 0 is warpin, 1 is warpout
 	int		flags;					// see #define FBF_*
@@ -271,7 +289,7 @@ void fireball_process_post(object * obj, float frame_time);
 // reversed is for warp_in/out effects
 // Velocity: If not NULL, the fireball will move at a constant velocity.
 // warp_lifetime: If warp_lifetime > 0.0f then makes the explosion loop so it lasts this long.  Only works for warp effect
-int fireball_create(vec3d *pos, int fireball_type, int parent_obj, float size, int reversed=0, vec3d *velocity=NULL, float warp_lifetime=0.0f, int ship_class=-1, matrix *orient=NULL, int low_res=0, int extra_flags=0, int warp_open_sound=0, int warp_close_sound=0); 
+int fireball_create(vec3d *pos, int fireball_type, int render_type, int parent_obj, float size, int reversed=0, vec3d *velocity=NULL, float warp_lifetime=0.0f, int ship_class=-1, matrix *orient=NULL, int low_res=0, int extra_flags=0, int warp_open_sound=-1, int warp_close_sound=-1); 
 void fireball_render_plane(int plane);
 void fireball_close();
 void fireball_level_close();
@@ -289,10 +307,14 @@ float fireball_lifeleft( object *obj );
 // Returns life left of a fireball in percent
 float fireball_lifeleft_percent( object *obj );

+// returns the lighting color (in [0...1] range) to use for explosion
+void fireball_get_color(int idx, float *red, float *green, float *blue);
+
+// returns the index of the fireball bitmap for this ship. -1 if there is none.
+int fireball_ship_explosion_type(ship_info *sip);
+
 // internal function to draw warp grid.
 extern void warpin_render(object *obj, matrix *orient, vec3d *pos, int texture_bitmap_num, float radius, float life_percent, float max_radius, int warp_3d = 0 );
-extern int Warp_glow_bitmap;			// Internal
-extern int Warp_ball_bitmap;			// Internal

 extern int Warp_model;

@@ -9,13 +9,46 @@

 /* 
 * $Logfile: /Freespace2/code/Fireball/WarpInEffect.cpp $
- * $Revision: 2.30 $
- * $Date: 2005-08-25 22:40:02 $
+ * $Revision: 2.32.2.5 $
+ * $Date: 2007-11-22 05:02:28 $
 * $Author: taylor $
 *
 * Code for rendering the warp in effects for ships
 *
 * $Log: not supported by cvs2svn $
+ * Revision 2.32.2.4  2006/11/16 01:07:23  taylor
+ * do no culling on the warp effect model_render call properly (doesn't appear to break anything now that it actually set to not cull)
+ *
+ * Revision 2.32.2.3  2006/10/27 21:37:11  taylor
+ * more cleanup of warp_global crap
+ * scale render/detail box limits with detail level setting
+ * make sure that we reset culling and zbuffer after each model buffer that gets rendered
+ *
+ * Revision 2.32.2.2  2006/10/27 06:42:29  taylor
+ * rename set_warp_globals() to model_set_warp_globals()
+ * remove two old/unused MR flags (MR_ALWAYS_REDRAW, used for caching that doesn't work; MR_SHOW_DAMAGE, didn't do anything)
+ * add MR_FULL_DETAIL to render an object regardless of render/detail box setting
+ * change "model_current_LOD" to a global "Interp_detail_level" and the static "Interp_detail_level" to "Interp_detail_level_locked", a bit more descriptive
+ * minor bits of cleanup
+ * change a couple of vm_vec_scale_add2() calls to just vm_vec_add2() calls in ship.cpp, since that was the final result anyway
+ *
+ * Revision 2.32.2.1  2006/07/21 16:08:03  taylor
+ * little cleanup
+ *
+ * Revision 2.32  2006/03/31 10:20:01  wmcoolmon
+ * Prelim. BSG warpin effect stuff
+ *
+ * Revision 2.31  2005/09/21 03:55:32  Goober5000
+ * add option for warp flash; mess with the cmdlines a bit
+ * --Goober5000
+ *
+ * Revision 2.30  2005/08/25 22:40:02  taylor
+ * basic cleaning, removing old/useless code, sanity stuff, etc:
+ *  - very minor performance boost from not doing stupid things :)
+ *  - minor change to 3d shockwave sizing to better approximate 2d effect movements
+ *  - for shields, Gobal_tris was only holding half as many as the game can/will use, buffer is now set to full size to avoid possible rendering issues
+ *  - removed extra tcache_set on OGL spec map code, not sure how that slipped in
+ *
 * Revision 2.29  2005/07/25 05:24:17  Goober5000
 * cleaned up some command line and mission flag stuff
 * --Goober5000
@@ -242,28 +275,22 @@
 #include "nebula/neb.h"
 #include "globalincs/pstypes.h"
 #include "model/model.h"
+#include "ship/ship.h"
+#include "cmdline/cmdline.h"


 extern int Warp_model;
-extern int Cmdline_nohtl;
-extern int Cmdline_3dwarp;
+extern int Warp_glow_bitmap;
+extern int Warp_ball_bitmap;


-DCF(norm,"normalize a zero length vector")
-{
-	if ( Dc_command )	{
-		vec3d tmp = vmd_zero_vector;
-		vm_vec_normalize(&tmp);
-	}
-}
-
 void draw_face( vertex *v1, vertex *v2, vertex *v3 )
 {
 	vec3d norm;
 	vertex *vertlist[3];

-	vm_vec_perp(&norm,(vec3d *)&v1->x,(vec3d *)&v2->x,(vec3d *)&v3->x);
-	if ( vm_vec_dot(&norm,(vec3d *)&v1->x ) >= 0.0 )	{
+	vm_vec_perp(&norm,(vec3d *)&v1->x, (vec3d *)&v2->x, (vec3d *)&v3->x);
+	if ( vm_vec_dot(&norm, (vec3d *)&v1->x ) >= 0.0 ) {
 		vertlist[0] = v3;
 		vertlist[1] = v2;
 		vertlist[2] = v1;
@@ -277,146 +304,79 @@ void draw_face( vertex *v1, vertex *v2, vertex *v3 )

 }

-#define wSTUFF_VERTICES()	do { verts[0]->u = 0.5f; verts[0]->v = 0.0f;	verts[1]->u = 1.0f; verts[1]->v = 0.0f; verts[2]->u = 1.0f;	verts[2]->v = 1.0f; verts[3]->u = 0.5f; verts[3]->v = 1.0f; } while(0);
-#define wR_VERTICES()		do { g3_rotate_vertex(verts[0], &bottom1); g3_rotate_vertex(verts[1], &bottom2);	g3_rotate_vertex(verts[2], &top2); g3_rotate_vertex(verts[3], &top1); } while(0);
-#define wP_VERTICES()		do { for(idx=0; idx<4; idx++){ g3_project_vertex(verts[idx]); } } while(0);
-
 void warpin_render(object *obj, matrix *orient, vec3d *pos, int texture_bitmap_num, float radius, float life_percent, float max_radius, int warp_3d)
 {
-	static flash_ball warp_ball(20, .1f,.25f, &vmd_z_vector, &vmd_zero_vector, 4.0f, 0.5f);
-
-	int i;
-
+	vec3d center;
+	vec3d vecs[5];
+	vertex verts[5];
 	int saved_gr_zbuffering = gr_zbuffer_get();

-//	gr_zbuffering = 0;
-
-
-	float Grid_depth = radius/2.5f;
-
-	vec3d center;
+	gr_zbuffer_set(GR_ZBUFF_READ);

 	vm_vec_scale_add( &center, pos, &orient->vec.fvec, -(max_radius/2.5f)/3.0f );

-//	Warp_Map = texture_bitmap_num;//sets the warp map, and thus sets the interp flag for this being a warpin effect
-	vec3d vecs[5];
-	vertex verts[5];
-
-	vecs[4] = center;		//this is for the warp glow-Bobboau
-	verts[4].u = 0.5f; verts[4].v = 0.5f; 
-
-	if (Cmdline_nohtl) {
-		g3_rotate_vertex( &verts[4], &vecs[4] );
-	} else {
-		g3_transfer_vertex( &verts[4], &vecs[4] );
-	}
-
-	if ( Warp_glow_bitmap != -1 )	{
-		gr_set_bitmap( Warp_glow_bitmap, GR_ALPHABLEND_FILTER, GR_BITBLT_MODE_NORMAL, (The_mission.flags & MISSION_FLAG_FULLNEB)?(1.0f - neb2_get_fog_intensity(obj)):1.0f );

+	if (Warp_glow_bitmap >= 0) {
 		float r = radius;
+		bool render_it = true;

-		int render_it;
-		
 		#define OUT_PERCENT1 0.80f
 		#define OUT_PERCENT2 0.90f

 		#define IN_PERCENT1 0.10f
 		#define IN_PERCENT2 0.20f

-		if ( life_percent < IN_PERCENT1 )	{
-			// do nothing
-			render_it = 1;
-		} else if ( life_percent < IN_PERCENT2 )	{
-			r *= ( life_percent-IN_PERCENT1 ) / (IN_PERCENT2-IN_PERCENT1); 
-			render_it = 1;
-		} else if ( life_percent < OUT_PERCENT1 )	{
-			// do nothing
-			render_it = 1;
-		} else if ( life_percent < OUT_PERCENT2 )	{
-			r *= (OUT_PERCENT2 - life_percent) / (OUT_PERCENT2-OUT_PERCENT1);
-			render_it = 1;
-		} else {
-			// do nothing
-			render_it = 1;
+		if (Cmdline_warp_flash)
+		{
+			if ( (life_percent >= IN_PERCENT1) && (life_percent < IN_PERCENT2) ) {
+				r *= (life_percent - IN_PERCENT1) / (IN_PERCENT2 - IN_PERCENT1);
+				//render_it = true;
+			} else if ( (life_percent >= OUT_PERCENT1) && (life_percent < OUT_PERCENT2) ) {
+				r *= (OUT_PERCENT2 - life_percent) / (OUT_PERCENT2 - OUT_PERCENT1);
+				//render_it = true;
+			}
 		}

-		if (render_it)	{
-			int saved_gr_zbuffering = gr_zbuffer_get();
-			gr_zbuffer_set(GR_ZBUFF_READ);
-
+		if (render_it) {
 			// Add in noise 
-			//float Noise[NOISE_NUM_FRAMES] = { 
 			int noise_frame = fl2i(Missiontime/15.0f) % NOISE_NUM_FRAMES;

-			r *= (0.40f + Noise[noise_frame]*0.30f);
+			r *= (0.40f + Noise[noise_frame] * 0.30f);
+
+			// Bobboau's warp thingie, toggled by cmdline
+			if (Cmdline_warp_flash) {
+				r += powf((2.0f * life_percent) - 1.0f, 24.0f) * max_radius * 1.5f;
+			}
+
+			vecs[4] = center;
+			verts[4].u = 0.5f; verts[4].v = 0.5f; 
+
+			if (Cmdline_nohtl) {
+				g3_rotate_vertex( &verts[4], &vecs[4] );
+			} else {
+				g3_transfer_vertex( &verts[4], &vecs[4] );
+			}
+
+			float alpha = (The_mission.flags & MISSION_FLAG_FULLNEB) ? (1.0f - neb2_get_fog_intensity(obj)) : 1.0f;
+			gr_set_bitmap( Warp_glow_bitmap, GR_ALPHABLEND_FILTER, GR_BITBLT_MODE_NORMAL, alpha );

-			//Bobboau's warp thingie; this should be an option somewhere
-			//r += (float)pow((2.0f*life_percent) - 1.0f,24.0f)*max_radius*2.0f;
-			
 			g3_draw_bitmap( &verts[4], 0, r, TMAP_FLAG_TEXTURED | TMAP_HTL_3D_UNLIT );
-			gr_zbuffer_set(saved_gr_zbuffering);
 		}
 	}

-	if((Warp_model >= 0) && (warp_3d || Cmdline_3dwarp))
-	{
-		float model_Interp_scale_xyz = radius / 20.0f;
+	if ( (Warp_model >= 0) && (warp_3d || Cmdline_3dwarp) ) {
+		float scale = radius / 25.0f;
+		model_set_warp_globals(scale, scale, scale, texture_bitmap_num, (radius/max_radius) );

-		set_warp_globals(model_Interp_scale_xyz, model_Interp_scale_xyz, model_Interp_scale_xyz, texture_bitmap_num, (radius/max_radius) );
-		
 		float dist = vm_vec_dist_quick( pos, &Eye_position );
-
 		model_set_detail_level((int)(dist / (radius * 10.0f)));
-		gr_set_cull(0);
-		model_render( Warp_model, orient, pos, MR_NO_LIGHTING | MR_NORMAL | MR_NO_FOGGING);
-		gr_set_cull(1);

-//	Warp_Map = -1;//un sets the warp map
+		model_render( Warp_model, orient, pos, MR_LOCK_DETAIL | MR_NO_LIGHTING | MR_NORMAL | MR_NO_FOGGING | MR_NO_CULL );

-		set_warp_globals(1.0f, 1.0f, 1.0f, -1, -1.0f);
+		model_set_warp_globals();
+	} else {
+		float Grid_depth = radius/2.5f;

-/*
-//this is that half done effect that was pissing people off-Bobboau
-
-		gr_set_cull(0);
-
-		matrix m;
-		vec3d ray_dir;
-		vm_vector_2_matrix(&m, &orient->vec.fvec, NULL, NULL);//this is the beam things that will come outof the point-Bobboau
-		float angle = ANG_TO_RAD(135.0f);
-		if(life_percent < 0.2f){
-			angle = ANG_TO_RAD(135.0f * (life_percent * 5.0f));
-		}
-		for(int idx=0; idx<1; idx++){
-			vm_vec_random_cone(&ray_dir, &orient->vec.fvec, angle, &m);
-			mprintf(( "ray direction %f %f %f, orentation %f %f %f, angle %f\n",ray_dir.xyz.x, ray_dir.xyz.y, ray_dir.xyz.z, orient->vec.fvec.xyz.x, orient->vec.fvec.xyz.y, orient->vec.fvec.xyz.z, angle));
-			vec3d p_temp = *pos;
-			vm_vec_scale_add(&p_temp, pos, &ray_dir, (max_radius * 10 * frand_range(0.75f, 0.9f)));
-			mprintf(( "end %f %f %f",p_temp.xyz.x, p_temp.xyz.y, p_temp.xyz.z));
-			
-			vertex h1[4];				// halves of a beam section	
-			vertex *verts[4] = { &h1[0], &h1[1], &h1[2], &h1[3] };	
-			vec3d top1, bottom1, top2, bottom2;
-
-			beam_calc_facing_pts(&top1, &bottom1, &ray_dir, pos, 1.0f, 1.0f);	
-			beam_calc_facing_pts(&top2, &bottom2, &ray_dir, &p_temp, 1.0f, 1.0f);	
-			
-			mprintf(( "top1 %f %f %f, botom1 %f %f %f, \n",top1.xyz.x, top1.xyz.y, top1.xyz.z, bottom1.xyz.x, bottom1.xyz.y, bottom1.xyz.z));
-			mprintf(( "top2 %f %f %f, botom2 %f %f %f, \n",top2.xyz.x, top2.xyz.y, top2.xyz.z, bottom2.xyz.x, bottom2.xyz.y, bottom2.xyz.z));
-			wR_VERTICES();																// rotate and project the vertices
-			wP_VERTICES();						
-			wSTUFF_VERTICES();		// stuff the beam with creamy goodness (texture coords)
-
-			gr_set_bitmap(Warp_glow_bitmap, GR_ALPHABLEND_FILTER, GR_BITBLT_MODE_NORMAL, 0.9999f);		
-			g3_draw_poly( 4, verts, TMAP_FLAG_TILED | TMAP_FLAG_TEXTURED | TMAP_FLAG_CORRECT); // added TMAP_FLAG_TILED flag for beam texture tileing -Bobboau
-		}
-
-		gr_set_cull(1);
-*/
-
-
-	}else{
 		gr_set_bitmap( texture_bitmap_num, GR_ALPHABLEND_FILTER, GR_BITBLT_MODE_NORMAL, 1.0f );	

 		vm_vec_scale_add( &vecs[0], &center, &orient->vec.uvec, radius );
@@ -435,40 +395,52 @@ void warpin_render(object *obj, matrix *orient, vec3d *pos, int texture_bitmap_n
 		vm_vec_scale_add2( &vecs[3], &orient->vec.rvec, -radius );
 		vm_vec_scale_add2( &vecs[3], &orient->vec.fvec, Grid_depth );

-//	vm_vec_scale_add( &vecs[4], ¢er, &orient->vec.fvec, -Grid_depth );
+	//	vm_vec_scale_add( &vecs[4], ¢er, &orient->vec.fvec, -Grid_depth );
 		vecs[4] = center;
-			
+
 		verts[0].u = 0.01f; verts[0].v = 0.01f; 
 		verts[1].u = 0.99f; verts[1].v = 0.01f; 
 		verts[2].u = 0.99f; verts[2].v = 0.99f; 
 		verts[3].u = 0.01f; verts[3].v = 0.99f; 
 		verts[4].u = 0.5f; verts[4].v = 0.5f; 

-		for (i=0; i<5; i++ )	{
-			if (Cmdline_nohtl) {
-				g3_rotate_vertex( &verts[i], &vecs[i] );
-			} else {
-				g3_transfer_vertex( &verts[i], &vecs[i] );
-			}
+		if (Cmdline_nohtl) {
+			g3_rotate_vertex( &verts[0], &vecs[0] );
+			g3_rotate_vertex( &verts[1], &vecs[1] );
+			g3_rotate_vertex( &verts[2], &vecs[2] );
+			g3_rotate_vertex( &verts[3], &vecs[3] );
+			g3_rotate_vertex( &verts[4], &vecs[4] );
+		} else {
+			g3_transfer_vertex( &verts[0], &vecs[0] );
+			g3_transfer_vertex( &verts[1], &vecs[1] );
+			g3_transfer_vertex( &verts[2], &vecs[2] );
+			g3_transfer_vertex( &verts[3], &vecs[3] );
+			g3_transfer_vertex( &verts[4], &vecs[4] );
 		}

-		gr_set_cull(0); // fixes rendering problem in D3D - taylor
+		int cull = gr_set_cull(0); // fixes rendering problem in D3D - taylor
 		draw_face( &verts[0], &verts[4], &verts[1] );
 		draw_face( &verts[1], &verts[4], &verts[2] );
 		draw_face( &verts[4], &verts[3], &verts[2] );
 		draw_face( &verts[0], &verts[3], &verts[4] );
-		gr_set_cull(1);
+		gr_set_cull(cull);
 	}

-	if ( Warp_ball_bitmap > -1 ){
-			g3_start_instance_matrix(pos,orient, true);
-		gr_set_bitmap(Warp_ball_bitmap, GR_ALPHABLEND_FILTER, GR_BITBLT_MODE_NORMAL, 0.9999f);		
-		float adg = (2.0f*life_percent) - 1.0f;
-		float pct= (float)(pow(adg,4.0f)-pow(adg,128.0f))*4.0f;
-		if(pct > 0.00001f)
-		warp_ball.render(max_radius*pct/2.0f,adg*adg,adg*adg*6.0f);
+	if (Warp_ball_bitmap > -1 && Cmdline_warp_flash == 1) {
+		flash_ball warp_ball(20, .1f,.25f, &vmd_z_vector, &vmd_zero_vector, 4.0f, 0.5f);
+		float adg = (2.0f * life_percent) - 1.0f;
+		float pct = (powf(adg, 4.0f) - powf(adg, 128.0f)) * 4.0f;
+
+		if (pct > 0.00001f) {
+			g3_start_instance_matrix(pos, orient, true);
+
+			gr_set_bitmap(Warp_ball_bitmap, GR_ALPHABLEND_FILTER, GR_BITBLT_MODE_NORMAL, 0.9999f);		
+
+			warp_ball.render(max_radius * pct * 0.5f, adg * adg, adg * adg * 6.0f);
+
 			g3_done_instance(true);
+		}
 	}
+
 	gr_zbuffer_set( saved_gr_zbuffering );
 }
-
@@ -0,0 +1,288 @@
+/*
+ * Copyright (C) Volition, Inc. 1999.  All rights reserved.
+ *
+ * All source code herein is the property of Volition, Inc. You may not sell 
+ * or otherwise commercially exploit the source or things you created based on the 
+ * source.
+ *
+*/
+
+// AddVariableDlg.cpp : implementation file
+//
+
+#include "stdafx.h"
+#include "FRED.h"
+#include "AddVariableDlg.h"
+#include "parse/sexp.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+#define NO_RESET_FOCUS	0
+#define RESET_FOCUS		1
+
+/////////////////////////////////////////////////////////////////////////////
+// CAddVariableDlg dialog
+
+
+CAddVariableDlg::CAddVariableDlg(CWnd* pParent /*=NULL*/)
+	: CDialog(CAddVariableDlg::IDD, pParent)
+{
+	//{{AFX_DATA_INIT(CAddVariableDlg)
+	m_default_value = _T("");
+	m_variable_name = _T("");
+	//}}AFX_DATA_INIT
+}
+
+
+void CAddVariableDlg::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(CAddVariableDlg)
+	DDX_Text(pDX, IDC_ADD_VARIABLE_DEFAULT_VALUE, m_default_value);
+	DDV_MaxChars(pDX, m_default_value, 31);
+	DDX_Text(pDX, IDC_ADD_VARIABLE_NAME, m_variable_name);
+	DDV_MaxChars(pDX, m_variable_name, 31);
+	//}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(CAddVariableDlg, CDialog)
+	//{{AFX_MSG_MAP(CAddVariableDlg)
+	ON_BN_CLICKED(IDC_TYPE_NUMBER, OnTypeNumber)
+	ON_BN_CLICKED(IDC_TYPE_STRING, OnTypeString)
+	ON_BN_CLICKED(IDC_TYPE_CAMPAIGN_PERSISTENT, OnTypeCampaignPersistent)
+	ON_BN_CLICKED(IDC_TYPE_PLAYER_PERSISTENT, OnTypePlayerPersistent)
+	ON_BN_CLICKED(IDC_TYPE_NETWORK_VARIABLE, OnTypeNetworkVariable)
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// CAddVariableDlg message handlers
+
+void CAddVariableDlg::OnOK() 
+{
+	// validation name
+	validate_variable_name(RESET_FOCUS);
+
+	// validate data
+	if ( m_name_validated ) {
+		validate_data(RESET_FOCUS);
+	}
+
+	// both ok, then store results
+	if ( m_name_validated && m_data_validated ) {
+//		int sexp_add_variable(char *text, char*, int type);
+//		char temp_name[32];
+//		char temp_value[32];
+//		strcpy(temp_name, m_variable_name);
+//		strcpy(temp_value, m_default_value);
+		// SEXP_VARIABLE_NUMBER SEXP_VARIABLE_STRING
+//		int type;
+//
+//		if (m_type_number) {
+//			type = SEXP_VARIABLE_NUMBER;
+//		} else {
+//			type = SEXP_VARIABLE_STRING;
+//		}
+//
+//		// Goober5000
+//		if (m_type_player_persistent) {
+//			type |= SEXP_VARIABLE_PLAYER_PERSISTENT;
+//		} else if (m_type_campaign_persistent) {
+//			type |= SEXP_VARIABLE_CAMPAIGN_PERSISTENT;
+//		}
+//
+//		m_sexp_var_index = sexp_add_variable(temp_value, temp_name, type);
+//		this get done for free CDialog::OnOk() UpdateData(TRUE);
+		m_create = true;
+
+		CDialog::OnOK();
+	}
+}
+
+BOOL CAddVariableDlg::OnInitDialog() 
+{
+	CDialog::OnInitDialog();
+	
+	// TODO: Add extra initialization here
+	m_variable_name = "<Variable Name>";
+	m_default_value = "<Default Value>";
+
+	// Set variable type to number
+	m_type_number = true;
+	m_type_campaign_persistent = false;
+	m_type_player_persistent = false;
+	m_type_network_variable = false;
+	set_variable_type();
+
+	m_name_validated = false;
+	m_data_validated = false;
+	m_create = false;
+
+	// Send default name and values into dialog box
+	UpdateData(FALSE);
+	
+	return TRUE;  // return TRUE unless you set the focus to a control
+	              // EXCEPTION: OCX Property Pages should return FALSE
+}
+
+bool is_sexp_variable_name(const char* temp_name)
+{
+	for (int i=0; i<MAX_SEXP_VARIABLES; i++) {
+		if (Sexp_variables[i].type & SEXP_VARIABLE_SET) {
+			if ( !strcmp(Sexp_variables[i].text, temp_name) ) {
+				return false;
+			}
+		}
+	}
+	// name not found
+	return true;
+}
+
+
+// Check variable name (1) changed (2) > 0 length (3) does not already exist
+void CAddVariableDlg::validate_variable_name(int set_focus)
+{
+	CString temp_name;
+
+	CEdit *edit = (CEdit *) GetDlgItem(IDC_ADD_VARIABLE_NAME);
+	edit->GetWindowText(temp_name);
+
+	// Check if any change and not already in list
+	if ( stricmp(temp_name, "<Variable Name>") ) {
+		if ( (strlen(temp_name) > 0) && (get_index_sexp_variable_name(LPCTSTR(temp_name)) == -1) ) { //not already in list and length > 0 {
+			// Goober5000 - replace spaces with hyphens
+			if (strchr(temp_name, ' ') != NULL)
+			{
+				// display msg
+				MessageBox("Variable names cannot contain spaces.  Replacing with hyphens.");
+
+				// replace chars
+				//Modified to make the code build. - Thunderbird
+				temp_name.Replace((TCHAR) ' ', (TCHAR) '-');
+				//temp_name.Replace((TCHAR) ' ', (TCHAR) '-'));
+
+				// fix what's displayed
+				edit->SetFocus();
+				edit->SetWindowText(temp_name);
+				edit->SetSel(0, -1);
+			}
+
+			m_name_validated = true;
+		} else {
+			// conflicting variable name
+			if (strlen(temp_name) == 0) {
+				edit->SetWindowText("<Variable Name>");
+			}
+			m_name_validated = false;
+			if (set_focus == RESET_FOCUS) {
+				MessageBox("Conflicting variable name");
+				edit->SetFocus();
+				edit->SetSel(0, -1);
+			}
+		}
+	} else {
+		// name unchanged from default
+		m_name_validated = false;
+		if (set_focus == RESET_FOCUS) {
+			MessageBox("Invalid variable name");
+			edit->SetFocus();
+			edit->SetSel(0, -1);
+		}
+	}
+
+}
+
+void CAddVariableDlg::validate_data(int set_focus)
+{
+	CString temp_data;
+
+	CEdit *edit = (CEdit *) GetDlgItem(IDC_ADD_VARIABLE_DEFAULT_VALUE);
+	edit->GetWindowText(temp_data);
+
+	// check for 0 string length
+	if (strlen(temp_data) == 0) {
+		m_data_validated = false;
+	} else {
+		if (m_type_number) {
+			// verify valid number
+			int temp_num = atoi(temp_data);
+			char buf[TOKEN_LENGTH];
+			sprintf(buf, "%d", temp_num);
+
+			if ( stricmp(buf, temp_data) ) {
+				m_data_validated = false;
+			} else {
+				m_data_validated = true;
+			}
+		} else {
+			m_data_validated = true;
+		}
+	}
+
+	// Display message and reset focus
+	if ( (!m_data_validated) && (set_focus == RESET_FOCUS) ) {
+		MessageBox("Invalid Default Value.");
+		edit->SetFocus();
+		edit->SetSel(0, -1);
+	}
+}
+
+// Set type to number
+void CAddVariableDlg::OnTypeNumber() 
+{
+	m_type_number = true;
+	set_variable_type();
+}
+
+// Set type to string
+void CAddVariableDlg::OnTypeString() 
+{
+	m_type_number = false;
+	set_variable_type();
+}
+
+void CAddVariableDlg::OnTypePlayerPersistent()
+{
+	m_type_player_persistent = ((CButton *) GetDlgItem(IDC_TYPE_PLAYER_PERSISTENT))->GetCheck() ? true : false;
+
+	if (m_type_player_persistent)
+		m_type_campaign_persistent = false;
+
+	set_variable_type();
+}
+
+void CAddVariableDlg::OnTypeCampaignPersistent()
+{
+	m_type_campaign_persistent = ((CButton *) GetDlgItem(IDC_TYPE_CAMPAIGN_PERSISTENT))->GetCheck() ? true : false;
+
+	if (m_type_campaign_persistent)
+		m_type_player_persistent = false;
+
+	set_variable_type();
+}
+
+void CAddVariableDlg::OnTypeNetworkVariable()
+{
+	m_type_network_variable = ((CButton *) GetDlgItem(IDC_TYPE_NETWORK_VARIABLE))->GetCheck() ? true : false;
+	set_variable_type();
+}
+
+// Set type check boxes
+void CAddVariableDlg::set_variable_type()
+{
+
+	CButton *button_string = (CButton *) GetDlgItem(IDC_TYPE_STRING);
+	CButton *button_number = (CButton *) GetDlgItem(IDC_TYPE_NUMBER);
+
+	button_number->SetCheck( m_type_number);
+	button_string->SetCheck(!m_type_number);
+
+	((CButton *) GetDlgItem(IDC_TYPE_CAMPAIGN_PERSISTENT))->SetCheck(m_type_campaign_persistent);
+	((CButton *) GetDlgItem(IDC_TYPE_PLAYER_PERSISTENT))->SetCheck(m_type_player_persistent);
+	((CButton *) GetDlgItem(IDC_TYPE_NETWORK_VARIABLE))->SetCheck(m_type_network_variable);
+}
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) Volition, Inc. 1999.  All rights reserved.
+ *
+ * All source code herein is the property of Volition, Inc. You may not sell 
+ * or otherwise commercially exploit the source or things you created based on the 
+ * source.
+ *
+*/
+
+
+#if !defined(AFX_ADDVARIABLEDLG_H__0F668CB5_AAEE_11D2_A899_0060088FAE88__INCLUDED_)
+#define AFX_ADDVARIABLEDLG_H__0F668CB5_AAEE_11D2_A899_0060088FAE88__INCLUDED_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+// AddVariableDlg.h : header file
+//
+
+/////////////////////////////////////////////////////////////////////////////
+// CAddVariableDlg dialog
+
+class CAddVariableDlg : public CDialog
+{
+// Construction
+public:
+	CAddVariableDlg(CWnd* pParent = NULL);   // standard constructor
+
+// Dialog Data
+	//{{AFX_DATA(CAddVariableDlg)
+	enum { IDD = IDD_ADD_VARIABLE };
+	CString	m_default_value;
+	CString	m_variable_name;
+	bool		m_name_validated;
+	bool		m_data_validated;
+	bool		m_type_number;
+	bool		m_type_campaign_persistent;
+	bool		m_type_player_persistent;
+	bool		m_type_network_variable;
+	bool		m_create;
+	int		m_sexp_var_index;
+	//}}AFX_DATA
+
+
+// Overrides
+	// ClassWizard generated virtual function overrides
+	//{{AFX_VIRTUAL(CAddVariableDlg)
+	protected:
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	//}}AFX_VIRTUAL
+
+// Implementation
+protected:
+
+	// Generated message map functions
+	//{{AFX_MSG(CAddVariableDlg)
+	virtual void OnOK();
+	virtual BOOL OnInitDialog();
+	afx_msg void validate_variable_name(int set_focus);
+	afx_msg void validate_data(int set_focus);
+	afx_msg void OnTypeNumber();
+	afx_msg void OnTypeString();
+	afx_msg void OnTypePlayerPersistent();
+	afx_msg void OnTypeCampaignPersistent();
+	afx_msg void OnTypeNetworkVariable();
+	afx_msg void set_variable_type();
+	//}}AFX_MSG
+	DECLARE_MESSAGE_MAP()
+};
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_ADDVARIABLEDLG_H__0F668CB5_AAEE_11D2_A899_0060088FAE88__INCLUDED_)