Quick patch to optimize camera code, and fix it when being used by any camera which does not use the internal movement code.

git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4495 387891d4-d844-0410-90c0-e4c51a9137d3

AUTHORS

@@ -0,0 +1,29 @@
+Original source (Freespace 2) by Volition, Inc.; see "credits.tbl"
+
+Modifications by the FreeSpace Source Code Project (FSSCP)
+http://fs2source.warpcore.org
+
+FS2_OPEN STAFF:
+
+Project leader:
+Edward "Inquisitor" Gardner
+
+Programmers:
+"Bobboau"
+Dennis "DTP" Pedersen
+Ian "Goober5000" Warfield
+Joe "Righteous1" Dowd
+Mike "penguin" Harris
+"Mysterial"
+"PhReAk"
+Thomas "Random Tiger" Whittaker
+Will "Unknown PLayer" Rousnel
+"WMCoolmon"
+
+Web support:
+Icefire and the staff at Volitionwatch.com
+Alex "Thunder" Avery and the staff at Hard Light Productions
+
+Special thanks to:
+Volition for making FS2 such a great game
+Dave Baranec for giving us the code and keeping us sanity checked

COPYING

@@ -0,0 +1,14 @@
+Volition Copyright (applies to original FreeSpace2 source code
+developed and released by Volition):
+
+"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."
+
+
+Modifications by members of the FreeSpace Source Code Project are
+released under whatever terms the individual authors choose, but the
+above notice continues to apply to all fs2_open code.
+

CVSROOT/checkoutlist

@@ -1,15 +0,0 @@
-# The "checkoutlist" file is used to support additional version controlled
-# administrative files in $CVSROOT/CVSROOT, such as template files.
-#
-# The first entry on a line is a filename which will be checked out from
-# the corresponding RCS file in the $CVSROOT/CVSROOT directory.
-# The remainder of the line is an error message to use if the file cannot
-# be checked out.
-#
-# File format:
-#
-#	[<whitespace>]<filename><whitespace><error message><end-of-line>
-#
-# comment lines begin with '#'
-new_commit_prep	Error checking out/updating CVSROOT/new_commit_prep
-new_log_accum	Error checking out/updating CVSROOT/new_log_accum

CVSROOT/commitinfo

@@ -1,17 +0,0 @@
-# The "commitinfo" file is used to control pre-commit checks.
-# The filter on the right is invoked with the repository and a list 
-# of files to check.  A non-zero exit of the filter program will 
-# cause the commit to be aborted.
-#
-# The first entry on a line is a regular expression which is tested
-# against the directory that the change is being committed to, relative
-# to the $CVSROOT.  For the first match that is found, then the remainder
-# of the line is the name of the filter to run.
-#
-# If the repository name does not match any of the regular expressions in this
-# file, the "DEFAULT" line is used, if it is specified.
-#
-# If the name "ALL" appears as a regular expression it is always used
-# in addition to the first matching regex or "DEFAULT".
-DEFAULT	$CVSROOT/CVSROOT/new_commit_prep
-CVSROOT	$CVSROOT/CVSROOT/new_commit_prep

CVSROOT/config

@@ -1,14 +0,0 @@
-# Set this to "no" if pserver shouldn't check system users/passwords
-#SystemAuth=no
-
-# Put CVS lock files in this directory rather than directly in the repository.
-#LockDir=/var/lock/cvs
-
-# Set `TopLevelAdmin' to `yes' to create a CVS directory at the top
-# level of the new working directory when using the `cvs checkout'
-# command.
-#TopLevelAdmin=no
-
-# Set `LogHistory' to `all' or `TOFEWGCMAR' to log all transactions to the
-# history file, or a subset as needed (ie `TMAR' logs all write operations)
-#LogHistory=TOFEWGCMAR

CVSROOT/cvswrappers

@@ -1,23 +0,0 @@
-# This file affects handling of files based on their names.
-#
-# The -t/-f options allow one to treat directories of files
-# as a single file, or to transform a file in other ways on
-# its way in and out of CVS.
-#
-# The -m option specifies whether CVS attempts to merge files.
-#
-# The -k option specifies keyword expansion (e.g. -kb for binary).
-#
-# Format of wrapper file ($CVSROOT/CVSROOT/cvswrappers or .cvswrappers)
-#
-#  wildcard	[option value][option value]...
-#
-#  where option is one of
-#  -f		from cvs filter		value: path to filter
-#  -t		to cvs filter		value: path to filter
-#  -m		update methodology	value: MERGE or COPY
-#  -k		expansion mode		value: b, o, kkv, &c
-#
-#  and value is a single-quote delimited value.
-# For example:
-#*.gif -k 'b'

CVSROOT/editinfo

@@ -1,21 +0,0 @@
-# The "editinfo" file is used to allow verification of logging
-# information.  It works best when a template (as specified in the
-# rcsinfo file) is provided for the logging procedure.  Given a
-# template with locations for, a bug-id number, a list of people who
-# reviewed the code before it can be checked in, and an external
-# process to catalog the differences that were code reviewed, the
-# following test can be applied to the code:
-#
-#   Making sure that the entered bug-id number is correct.
-#   Validating that the code that was reviewed is indeed the code being
-#       checked in (using the bug-id number or a seperate review
-#       number to identify this particular code set.).
-#
-# If any of the above test failed, then the commit would be aborted.
-#
-# Actions such as mailing a copy of the report to each reviewer are
-# better handled by an entry in the loginfo file.
-#
-# One thing that should be noted is the the ALL keyword is not
-# supported.  There can be only one entry that matches a given
-# repository.

CVSROOT/loginfo

@@ -1,30 +0,0 @@
-# The "loginfo" file controls where "cvs commit" log information
-# is sent.  The first entry on a line is a regular expression which must match
-# the directory that the change is being made to, relative to the
-# $CVSROOT.  If a match is found, then the remainder of the line is a filter
-# program that should expect log information on its standard input.
-#
-# If the repository name does not match any of the regular expressions in this
-# file, the "DEFAULT" line is used, if it is specified.
-#
-# If the name ALL appears as a regular expression it is always used
-# in addition to the first matching regex or DEFAULT.
-#
-# You may specify a format string as part of the
-# filter.  The string is composed of a `%' followed
-# by a single format character, or followed by a set of format
-# characters surrounded by `{' and `}' as separators.  The format
-# characters are:
-#
-#   s = file name
-#   V = old version number (pre-checkin)
-#   v = new version number (post-checkin)
-#
-# For example:
-#DEFAULT (echo ""; id; echo %s; date; cat) >> $CVSROOT/CVSROOT/commitlog
-# or
-#DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog
-
-DEFAULT $CVSROOT/CVSROOT/new_log_accum -m [email protected] %{sVv}
-CVSROOT $CVSROOT/CVSROOT/new_log_accum -m [email protected] %{sVv}
-

CVSROOT/modules

@@ -1,26 +0,0 @@
-# Three different line formats are valid:
-#	key	-a    aliases...
-#	key [options] directory
-#	key [options] directory files...
-#
-# Where "options" are composed of:
-#	-i prog		Run "prog" on "cvs commit" from top-level of module.
-#	-o prog		Run "prog" on "cvs checkout" of module.
-#	-e prog		Run "prog" on "cvs export" of module.
-#	-t prog		Run "prog" on "cvs rtag" of module.
-#	-u prog		Run "prog" on "cvs update" of module.
-#	-d dir		Place module in directory "dir" instead of module name.
-#	-l		Top-level directory only -- do not recurse.
-#
-# NOTE:  If you change any of the "Run" options above, you'll have to
-# release and re-checkout any working directories of these modules.
-#
-# And "directory" is a path to a directory relative to $CVSROOT.
-#
-# The "-a" option specifies an alias.  An alias is interpreted as if
-# everything on the right of the "-a" had been typed on the command line.
-#
-# You can encode a module within a module by using the special '&'
-# character to interpose another module into the current module.  This
-# can be useful for creating a module that consists of many directories
-# spread out over the entire source repository.

CVSROOT/new_commit_prep

@@ -1,104 +0,0 @@
-#!/usr/bin/perl -w
-#
-# Copyright (C) 2000 by Kevin L. Mitchell <[email protected]>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-#
-# Script to store the last visited directory for newlogaccum.pl.
-#
-# $Id: new_commit_prep,v 1.1 2002-08-11 23:05:15 drevil Exp $
-
-use strict;
-
-# This routine removes everything in a directory
-sub clear_dir {
-    my ($dir) = @_;
-    my ($file);
-
-    opendir(DIR, $dir) || die "Cannot clear directory $dir: $!";
-    while ($file = readdir(DIR)) {
-	next
-	    if ($file eq "." || $file eq "..");
-
-	$file = "$dir/$file";
-
-	if (-d $file) {
-	    # It's a directory, recurse into it, then delete it.
-	    clear_dir($file);
-	    rmdir($file);
-	} else {
-	    # It's a file, delete it.
-	    unlink($file);
-	}
-    }
-    closedir(DIR);
-}
-
-# This routine prepares a temporary directory, hopefully in a secure
-# fashion; it uses the process group to make secondary programs be able
-# to find it.
-sub tmpdir (;$) {
-    my ($clear) = @_;
-    my ($pgrp, $own, $mode, $tmpdir);
-
-    $pgrp = getpgrp();
-
-    die "Don't run $0 setuid!"
-	unless ($< == $>);
-
-    # Decide on the directory name, using various environment variables
-    $tmpdir = ($ENV{TMPDIR} || $ENV{TMP} || $ENV{TEMP} || "/tmp") .
-	"/.#cvs.$pgrp";
-
-    # Doesn't exist, but we can't create it...
-    die "Can't create temporary directory $tmpdir: $!"
-	unless (-e $tmpdir || mkdir($tmpdir, 0700));
-
-    die "Temporary directory $tmpdir is not a directory"
-	unless (-d $tmpdir);
-
-    # Check ownership and permissions
-    (undef, undef, $mode, undef, $own, undef) = stat($tmpdir);
-
-    die "Temporary directory $tmpdir not owned by $< (owned by $own)"
-	unless ($own == $<);
-
-    die "Temporary directory $tmpdir group-writable"
-	if ($mode & 0020);
-    die "Temporary directory $tmpdir other-writable"
-	if ($mode & 0002);
-
-    # If we're supposed to clear the directory, do so...
-    clear_dir($tmpdir)
-	if ($clear);
-
-    return $tmpdir;
-}
-
-# This routine writes a single line to a file
-sub write_line ($$) {
-    my ($fname, $line) = @_;
-
-    open(FILE, ">$fname") || die "Cannot open file $fname for writing";
-    print FILE "$line\n";
-    close(FILE);
-}
-
-# Create and empty the temporary directory
-my ($tmpdir) = (tmpdir(1));
-
-# Store the directory name
-write_line("$tmpdir/lastdir", shift(@ARGV));

CVSROOT/new_log_accum

@@ -1,757 +0,0 @@
-#!/usr/bin/perl -w
-#
-# Copyright (C) 2000 by Kevin L. Mitchell <[email protected]>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-#
-# Script to accumulate log messages for an entire tree and send them along
-# with the diffs; deals correctly with all manner of branching (I hope)
-#
-# $Id: new_log_accum,v 1.1 2002-08-11 23:05:15 drevil Exp $
-#
-
-use strict;
-
-use vars qw($MAILER $CVS $debug $boundary);
-use MD5;
-
-# Set this to the full path of a mailer that takes a list
-# of email addresses as arguments...
-$MAILER = "/usr/sbin/sendmail -oi -oeq";
-
-# Set this to the path of the CVS binary responsible for this tree...
-$CVS = "/usr/bin/cvs";
-
-# Don't touch this; use the -d command line option
-$debug = 0;
-
-# This is initialized by build_mailheader()
-$boundary = '';
-
-use POSIX qw(setsid);
-
-# We have to dissociate from our parent, so that the CVS commit can
-# complete, before we try to extract the diffs
-sub daemonize {
-    defined(my $pid = fork()) || die "Can't fork: $!";
-    exit(0)
-	if $pid;
-    setsid() || die "Can't start a new session: $!";
-}
-
-# Debugging output
-sub debug (@) {
-    print STDERR @_
-	if ($debug);
-}
-
-# Constants used in the FSM below for parsing the log message
-sub STATE_NONE     { 0 }
-sub STATE_MODIFIED { 1 }
-sub STATE_ADDED    { 2 }
-sub STATE_REMOVED  { 3 }
-sub STATE_LOG1     { 4 }
-sub STATE_LOG2     { 5 }
-
-# This routine removes everything in a directory
-sub clear_dir {
-    my ($dir) = @_;
-    my ($file);
-
-    opendir(DIR, $dir) || die "Cannot clear directory $dir: $!";
-    while ($file = readdir(DIR)) {
-	next
-	    if ($file eq "." || $file eq "..");
-
-	$file = "$dir/$file";
-
-	if (-d $file) {
-	    # It's a directory, recurse into it, then delete it.
-	    clear_dir($file);
-	    rmdir($file);
-	} else {
-	    # It's a file, delete it.
-	    unlink($file);
-	}
-    }
-    closedir(DIR);
-}
-
-# This routine prepares a temporary directory, hopefully in a secure
-# fashion; it uses the process group to make secondary programs be able
-# to find it.
-sub tmpdir (;$) {
-    my ($clear) = @_;
-    my ($pgrp, $own, $mode, $tmpdir);
-
-    $pgrp = getpgrp();
-
-    die "Don't run $0 setuid!"
-	unless ($< == $>);
-
-    # Decide on the directory name, using various environment variables
-    $tmpdir = ($ENV{TMPDIR} || $ENV{TMP} || $ENV{TEMP} || "/tmp") .
-	"/.#cvs.$pgrp";
-
-    # Doesn't exist, but we can't create it...
-    die "Can't create temporary directory $tmpdir: $!"
-	unless (-e $tmpdir || mkdir($tmpdir, 0700));
-
-    die "Temporary directory $tmpdir is not a directory"
-	unless (-d $tmpdir);
-
-    # Check ownership and permissions
-    (undef, undef, $mode, undef, $own, undef) = stat($tmpdir);
-
-    die "Temporary directory $tmpdir not owned by $< (owned by $own)"
-	unless ($own == $<);
-
-    die "Temporary directory $tmpdir group-writable"
-	if ($mode & 0020);
-    die "Temporary directory $tmpdir other-writable"
-	if ($mode & 0002);
-
-    # If we're supposed to clear the directory, do so...
-    clear_dir($tmpdir)
-	if ($clear);
-
-    return $tmpdir;
-}
-
-# Routine to remove the temporary directory when done
-sub cleanup_dir ($) {
-    # If we're debugging, we may want to look at the contents...
-    return
-	if ($debug);
-
-    clear_dir($_[0]);
-    rmdir($_[0]);
-}
-
-# Retrieve a single line from a specified file
-sub get_line ($) {
-    my ($fname) = @_;
-
-    open(FILE, "<$fname") || die "Cannot open file $fname for reading";
-    my $line = <FILE>;
-    close(FILE);
-
-    # Chomp off the \n
-    chomp $line;
-
-    return $line;
-}
-
-# Routine that only allows one value to be pushed on the array;
-# implemented by making the first element of the array a hash-reference.
-# When we add a new value, we also increment the count of an element in
-# the hash with the key being the array value...
-sub push_once (\@@) {
-    my ($array, @values) = @_;
-
-    # If the array is empty, create our hash ref
-    push @{$array}, {}
-	if (@{$array} == 0);
-
-    foreach my $value (@values) {
-	push @{$array}, $value
-	    if (!exists($array->[0]{$value}));
-
-	$array->[0]{$value}++;
-    }
-
-    return @{$array} - 1;
-}
-
-# Filter //, /./, and remove leading ./ or / from filenames
-sub fname_filter ($) {
-    my ($fname) = @_;
-
-    $fname =~ s,//,/,g;
-    $fname =~ s,/\./,/,g;
-    $fname =~ s,^\.?/,,g;
-
-    return $fname;
-}
-
-# Store file data in a temporary file
-sub names_to_file ($$@) {
-    my ($fname, $dir, @names) = @_;
-
-    if (@names > 0) {
-	open(FILE, ">>$fname") || die "Cannot open file $fname for appending";
-
-	# Store the directory data
-	print FILE "D $dir\n";
-
-	foreach my $name (@names) {
-	    # Mark record as a file...
-	    print FILE "F ";
-
-	    # Store the tag, if there is one...
-	    print FILE "$name->{tag}"
-		if (defined($name->{tag}));
-
-	    # Then store old revision, new revision, and file name
-	    print FILE ":$name->{old}:$name->{new}:$name->{file}\n";
-	}
-
-	close(FILE);
-    }
-}
-
-# Retrieve file data from temporary file; updates branch tags with what it
-# reads
-sub file_to_names (\@$) {
-    my ($btags, $fname) = @_;
-    my ($dir) = (undef);
-    my (@names) = ();
-
-    debug "Reading file names from $fname...\n";
-
-    # We may not have, say, added a file in this subdirectory...
-    return ()
-	if (!-e $fname);
-
-    open(FILE, "<$fname");
-    while(<FILE>) {
-	chomp;
-
-	# Get record type...
-	my ($type, $data) = split(' ', $_, 2);
-
-	# ok, it's a directory, remember that...
-	if ($type eq "D") {
-	    $dir = $data;
-
-	    debug "Read directory $dir\n";
-
-	    next;
-	}
-
-	debug "Read file $data\n";
-
-	# Get all the information about the file
-	my ($tag, $old, $new, $file) = split(':', $data);
-
-	# and store it all
-	push(@names, { tag => $tag, old => $old, new => $new, file => $file,
-		       dir => $dir, name => fname_filter("$dir/$file") });
-
-	# Remember the tags...
-	push_once(@{$btags}, $tag)
-	    if (defined($tag) && $tag ne "");
-    }
-    close(FILE);
-
-    return @names;
-}
-
-# Create a text-formatted list of names
-sub name_to_list (\@@) {
-    my ($btags, @names) = @_;
-    my (@nlist, @nline) = ();
-
-    debug "Tags:", join(':', @{$btags}), "\n";
-
-    # We group them by tag
-    foreach my $tag ("", @{$btags}[1..$#{$btags}]) {
-	debug "Processing tag $tag...\n";
-
-	@nlist = ();
-
-	# Get a list of files by the tag...
-	foreach my $name (@names) {
-	    debug "Processing $name->{file}...\n";
-
-	    next
-		if ($name->{tag} ne $tag);
-
-	    debug "Pushing $name->{name} on \@nlist...\n";
-	    push(@nlist, $name->{name});
-	}
-
-	# If the tag is not the empty string, list the tag...
-	push(@nline, "  Tag: $tag", "    ")
-	    if ($tag ne "");
-
-	# Now list each file name
-	foreach my $name (@nlist) {
-	    # indent if we run past the end of line limit
-	    push(@nline, "    ")
-		if (@nline == 0 || ($nline[$#nline] ne "    " &&
-		    length($nline[$#nline]) + length($name) + 1 > 70));
-
-	    # add the file name to the list
-	    debug "Adding $name to \@nline...\n";
-	    $nline[$#nline] .= " $name";
-	}
-    }
-
-    return @nline;
-}
-
-# write the log message to a temporary file
-sub write_log ($@) {
-    my ($fname, @text) = @_;
-
-    open(FILE, ">$fname") || die "Cannot open file $fname for writing";
-    print FILE join("\n", @text), "\n";
-    close(FILE);
-}
-
-# Build the header of the commit message: CVSROOT, module name, any
-# branch tags, and the commit time
-sub build_header ($@) {
-	my ($module, $subject, $mailto, @branch_tags) = @_;
-	my (@text, @mailto);
-	my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = gmtime(time());
-	my ($user, $dummy);
-	my ($digest);
-
-	($user, $dummy, $dummy, $dummy, $dummy, $dummy, $dummy) = getpwuid($<);
-
-	@mailto = @{$mailto};
-
-	# generate a unique boundary by calculating the md5sum of the
-	# current time
-	$digest = new MD5;
-	$digest->reset();
-	$digest->add(time() . rand());
-	$boundary = "----=MIME." . unpack("H*", $digest->digest());
-	
-	# Build the mail header
-	push(@text, "From: $user");
-	push(@text, "To: " . join(' ', @mailto));
-	push(@text, "Subject: $subject");
-	push(@text, "MIME-Version: 1.0");
-	push(@text, "Content-Type: multipart/mixed; boundary=\"$boundary\"");
-	push(@text, "");
-	push(@text, "This is a multipart message as defined by RFC2049 (MIME)");
-	push(@text, "");
-	push(@text, "--$boundary");
-	push(@text, "Content-Type: text/plain; charset=us-ascii");
-	push(@text, "Content-Disposition: inline");
-	push(@text, "");
-
-	# Build the commit message header
-	push(@text, "Commiter   : $user");
-	push(@text, "CVSROOT    : $ENV{CVSROOT}");
-	push(@text, "Module     : $module");
-	push(@text, "Branch tags: " . join(' ', @branch_tags[1..$#branch_tags]))
-	if (@branch_tags > 0);
-		push(@text, sprintf("Commit time: %04d-%02d-%02d %02d:%02d:%02d UTC",
-			$year + 1900, $mon + 1, $mday, $hour, $min, $sec));
-
-	return @text, "";
-}
-
-# Send the mail message
-sub send_mail {
-    my ($mailto, $text) = @_;
-    my (@mailto, @text);
-    # I <heart> perl
-    @mailto = @{$mailto};
-    @text = @{$text};
-
-    open(MAIL, "|$MAILER " . join(' ', @mailto));
-    push(@text, "--$boundary--", "");
-    print MAIL join("\n", @text), "\n";
-    close(MAIL);
-}
-
-# Find the tmp directory
-my ($tmpdir) = (tmpdir());
-
-my (@mailto) = ();
-my (@files) = ();
-my (@path) = ();
-my ($modname, $repdir, $dir) = (undef, undef, undef);
-
-# Process command line arguments
-while (@ARGV > 0) {
-    my ($arg) = (shift(@ARGV));
-
-    if ($arg eq '-d') {
-	# Turn on debugging
-	$debug++;
-    } elsif ($arg eq '-M') {
-	# Module name explicitly set -- XXX Not tested, use at your own risk
-	die "Argument for -M missing"
-	    unless (@ARGV > 0);
-
-	$modname = shift(@ARGV);
-    } elsif ($arg eq '-m') {
-	# An address to mail the notification to
-	die "Argument for -m missing"
-	    unless (@ARGV > 0);
-
-	push(@mailto, shift(@ARGV));
-    } else {
-	# the list of filenames passed by CVS--you *must* use %{sVv}!
-	die "Too many arguments!"
-	    unless (@files == 0);
-
-	@files = split(" ", $arg);
-    }
-}
-
-die "Nobody to mail to"
-    unless (@mailto > 0);
-
-die "No files to process"
-    unless (@files > 1);
-
-# The repository directory
-$repdir = shift(@files);
-
-# break it appart...
-@path = split("/", $repdir);
-
-# Now we know the module name, if it wasn't explicitly set
-$modname = $path[0]
-    unless (defined($modname));
-
-# Figure out what our directory is
-if (@path == 1) {
-    $dir = ".";
-} else {
-    $dir = join("/", @path[1..$#path]);
-}
-
-# append a / to it...
-$dir .= "/";
-
-debug "module = $modname\n";
-debug "dir    = $dir\n";
-debug "path   = ", join(":", @path), "\n";
-debug "files  = ", join(":", @files), "\n";
-debug "tmpdir = $tmpdir\n";
-
-my (%fversions);
-
-# Unless its a new directory or imported sources, create file records
-unless (defined($files[1]) && defined($files[2]) &&
-	(($files[1] eq "New" && $files[2] eq "directory") ||
-	 ($files[1] eq "Imported" && $files[2] eq "sources"))) {
-
-    foreach my $fname (@files) {
-	# You *must* use %{sVv} in the call in loginfo!
-	die "Invalid filenames"
-	    unless ($fname =~ /^(.*),([0-9.]+|NONE),([0-9.]+|NONE)$/);
-
-	$fversions{$1} = {
-	    old => ($2 eq "NONE" ? "0" : $2),
-	    new => ($3 eq "NONE" ? "0" : $3),
-	};
-    }
-}
-
-# process log message
-my ($state, $tag) = (STATE_NONE, undef);
-
-my (@modified, @added, @removed, @log, @branch_tags) = ();
-
-while (<STDIN>) {
-    chomp;
-
-    debug "State $state, line:$_\n";
-
-    # Ignore empty space at the beginning of the log message
-    next
-	if ($state == STATE_LOG1 && /^\s*$/);
-
-    # We're done ignoring empty space
-    if ($state == STATE_LOG1) {
-	$state = STATE_LOG2;
-    }
-
-    if ($state == STATE_LOG2) {
-	# Don't modify the lines at all if we're processing the log message
-	push(@log, $_);
-	next;
-    } else {
-	# Strip out leading and trailing space
-	s/^\s*(.*?)\s*$/$1/;
-    }
-
-    if (/^Modified Files/) {
-	# Collect list of modified files
-	debug "State switching to STATE_MODIFIED\n";
-
-	$state = STATE_MODIFIED;
-	$tag = undef;
-
-	next;
-
-    } elsif (/^Added Files/) {
-	# Collect list of added files
-	debug "State switching to STATE_ADDED\n";
-
-	$state = STATE_ADDED;
-	$tag = undef;
-
-	next;
-
-    } elsif (/^Removed Files/) {
-	# Collect list of removed files
-	debug "State switching to STATE_REMOVED\n";
-
-	$state = STATE_REMOVED;
-	$tag = undef;
-
-	next;
-
-    } elsif (/^Log Message/) {
-	# Collect log message
-	debug "State switching to STATE_LOG1\n";
-
-	$state = STATE_LOG1;
-	$tag = undef;
-
-	next;
-
-    } elsif (/^Revision\/Branch/) {
-	# Parse old-style Revision/Branch field
-	debug "Found a branch tag\n";
-
-	/^[^:]+:\s*(.*)/;
-
-	push_once(@branch_tags, $1);
-
-	warn "Tag == $tag"
-	    if (defined($tag));
-
-	next;
-    }
-
-    # Ignore the stuff at the top of the commit report
-    next
-	if ($state == STATE_NONE);
-
-    if (/^Tag:\s*(.*)$/) {
-	# Remember the tag
-	debug "Setting tag to $1\n";
-	$tag = $1;
-	next;
-    }
-
-    my (@tfiles) = ();
-
-    # Find the file in our command line list of files
-    foreach my $file (split) {
-	die "Nothing known about file $file!"
-	    unless (exists($fversions{$file}));
-
-	push @tfiles, {
-	    file => $file,
-	    tag => $tag,
-	    old => $fversions{$file}{old},
-	    new => $fversions{$file}{new},
-	};
-    }
-
-    # Store the file list in the correct array
-    push(@modified, @tfiles)
-	if ($state == STATE_MODIFIED);
-
-    push(@added, @tfiles)
-	if ($state == STATE_ADDED);
-
-    push(@removed, @tfiles)
-	if ($state == STATE_REMOVED);
-}
-
-# Remove trailing blank lines from the log message
-while (@log > 0 && $log[$#log] =~ /^\s*$/) {
-    pop(@log);
-}
-
-# If a new directory was added, we're done...
-if (defined($files[1]) && defined($files[2]) &&
-    $files[1] eq "New" && $files[2] eq "directory") {
-
-    my (@text) = ();
-
-    # If there was a sticky tag for the directory, make it a branch tag
-    if ($log[$#log] =~ /^--> Using per-directory sticky tag \`(.*)\'$/) {
-	push_once(@branch_tags, $1);
-	pop(@log);
-    }
-
-    # Build the message...
-    push(@text, build_header($modname, "Module $modname: New directory $dir",
-	 \@mailto, @branch_tags));
-    push(@text, "Log message:", "", @log);
-
-    # and send it (synchronously)
-    send_mail(\@mailto, \@text);
-
-    # Clean up after ourselves and exit.
-    cleanup_dir($tmpdir);
-    exit(0);
-}
-
-# If an import was done, we're done...
-if (defined($files[1]) && defined($files[2]) &&
-    $files[1] eq "Imported" && $files[2] eq "sources") {
-
-    my (@text) = ();
-
-    # Build the message...
-    push(@text, build_header($modname, "Module $modname: Imported $dir",
-	\@mailto, @branch_tags));
-    push(@text, "Log message:", "", @log);
-
-    # and send it (synchronously)
-    send_mail(\@mailto, \@text);
-
-    # Clean up after ourselves and exit.
-    cleanup_dir($tmpdir);
-    exit(0);
-}
-
-debug "Searching for log file index...";
-
-my ($i);
-
-# Look for an empty log file or one that matches our current log message
-for ($i = 0; ; $i++) {
-    my (@text);
-
-    # found one that doesn't exist...
-    last
-	if (!-e "$tmpdir/logfile.$i");
-
-    # read in the log file
-    open(FILE, "<$tmpdir/logfile.$i");
-    while (<FILE>) {
-	chomp;
-	push(@text, $_);
-    }
-    close(FILE);
-
-    # If the log file was empty, use it
-    last
-	if (@text == 0);
-
-    # If the log messages are identical, use that
-    last
-	if (join(' ', @log) eq join(' ', @text));
-}
-
-debug "$tmpdir/logfile.$i\n";
-
-# Store modified, added, and removed file lists, along with the log message
-names_to_file("$tmpdir/modified.$i", $dir, @modified);
-names_to_file("$tmpdir/added.$i",    $dir, @added);
-names_to_file("$tmpdir/removed.$i",  $dir, @removed);
-write_log("$tmpdir/logfile.$i", @log);
-
-# Now check to see if we're at the end of our rope
-my ($lastdir) = (get_line("$tmpdir/lastdir"));
-
-debug "Checking $ENV{CVSROOT}/$repdir against lastdir $lastdir\n";
-
-# Nope, exit instead of sending a message
-exit(0)
-    if ($lastdir ne "$ENV{CVSROOT}/$repdir");
-
-debug "At last, we've reached the end\n";
-
-# We have to daemonize and sleep so that there isn't any lock hanging
-# around when we get to the cvs rdiff below...
-daemonize();
-sleep(10);
-
-# Build the mail message...
-my (@text) = ();
-@files = ();
-@branch_tags = ();
-
-for ($i = 0; ; $i++) {
-    # No more log files
-    last
-	if (!-e "$tmpdir/logfile.$i");
-
-    # read and insert the log message
-    open(FILE, "<$tmpdir/logfile.$i");
-    push(@text, "Log message:", "");
-    while (<FILE>) {
-	chomp;
-	push(@text, $_);
-    }
-    push(@text, "");
-    close(FILE);
-
-    # read modified list and list all modified files if non-empty
-    @modified = file_to_names(@branch_tags, "$tmpdir/modified.$i");
-    push(@text, "Modified files:", name_to_list(@branch_tags, @modified), "")
-	if (@modified > 0);
-
-    # read added list and list all added files if non-empty
-    @added = file_to_names(@branch_tags, "$tmpdir/added.$i");
-    push(@text, "Added files:", name_to_list(@branch_tags, @added), "")
-	if (@added > 0);
-
-    # read removed list and list all removed files if non-empty
-    @removed = file_to_names(@branch_tags, "$tmpdir/removed.$i");
-    push(@text, "Removed files:", name_to_list(@branch_tags, @removed), "")
-	if (@removed > 0);
-
-    # remember all the files we looked at
-    push(@files, @modified, @added, @removed);
-}
-
-# Now that name_to_list has rebuilt our list of branch tags, we can build the
-# header and prepend it to the message
-unshift(@text, build_header($modname, "Module $modname: Change committed",
-	\@mailto, @branch_tags));
-
-# sort the files out for our diff
-@files = sort { $a->{name} cmp $b->{name} } @files;
-
-my ($user, $filename);
-my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = gmtime(time());
-$user = getpwuid($<);
-
-$filename = sprintf("%s.%04d%02d%02d.%02d%02d%02d.%s.diff", $modname,
-	$year + 1900, $mon + 1, $mday, $hour, $min, $sec, $user);
-
-push(@text, "--$boundary");
-push(@text, "Content-Type: text/plain; name=\"$filename\"");
-push(@text, "Content-Disposition: attachment; filename=\"$filename\"");
-push(@text, "Content-Transfer-Encoding: 8bit");
-push(@text, "");
-
-foreach my $file (@files) {
-    debug "Diffing file $file->{name}...\n";
-
-    # Run cvs rdiff, extracting a diff between the old version and the new
-    open(DIFF, "$CVS -Q rdiff -u -r $file->{old} -r $file->{new} " .
-	 "$modname/$file->{name}|");
-    while (<DIFF>) {
-	chomp;
-	push(@text, $_);
-    }
-    close(DIFF);
-}
-
-# send the mail...
-send_mail(\@mailto, \@text);
-
-# and clean up after ourselves
-cleanup_dir($tmpdir);

CVSROOT/notify

@@ -1,12 +0,0 @@
-# The "notify" file controls where notifications from watches set by
-# "cvs watch add" or "cvs edit" are sent.  The first entry on a line is
-# a regular expression which is tested against the directory that the
-# change is being made to, relative to the $CVSROOT.  If it matches,
-# then the remainder of the line is a filter program that should contain
-# one occurrence of %s for the user to notify, and information on its
-# standard input.
-#
-# "ALL" or "DEFAULT" can be used in place of the regular expression.
-#
-# For example:
-#ALL mail %s -s "CVS notification"

CVSROOT/passwd

@@ -1,9 +0,0 @@
-drevil:f76FWdDTUBG5c:fs2source
-mysterial:f7nJUwoIhmSrg:fs2source
-wmcoolmon:f7JRB.js9Q1sE:fs2source
-inquisitor:f7BVkOvwjDlWk:fs2source
-penguin:Jh.dOjaiO2jHk:fs2source
-DTP:f7M92Z/6/uep.:fs2source
-unknownplayer:f79BgAn.IzJs6:fs2source
-phreak:f7WQyGiT/jzlM:fs2source
-anonymous:oIKtWP1q6GDt6:fs2source

CVSROOT/rcsinfo

@@ -1,13 +0,0 @@
-# The "rcsinfo" file is used to control templates with which the editor
-# is invoked on commit and import.
-#
-# The first entry on a line is a regular expression which is tested
-# against the directory that the change is being made to, relative to the
-# $CVSROOT.  For the first match that is found, then the remainder of the
-# line is the name of the file that contains the template.
-#
-# If the repository name does not match any of the regular expressions in this
-# file, the "DEFAULT" line is used, if it is specified.
-#
-# If the name "ALL" appears as a regular expression it is always used
-# in addition to the first matching regex or "DEFAULT".

CVSROOT/taginfo

@@ -1,20 +0,0 @@
-# The "taginfo" file is used to control pre-tag checks.
-# The filter on the right is invoked with the following arguments:
-#
-# $1 -- tagname
-# $2 -- operation "add" for tag, "mov" for tag -F, and "del" for tag -d
-# $3 -- repository
-# $4->  file revision [file revision ...]
-#
-# A non-zero exit of the filter program will cause the tag to be aborted.
-#
-# The first entry on a line is a regular expression which is tested
-# against the directory that the change is being committed to, relative
-# to the $CVSROOT.  For the first match that is found, then the remainder
-# of the line is the name of the filter to run.
-#
-# If the repository name does not match any of the regular expressions in this
-# file, the "DEFAULT" line is used, if it is specified.
-#
-# If the name "ALL" appears as a regular expression it is always used
-# in addition to the first matching regex or "DEFAULT".

CVSROOT/verifymsg

@@ -1,21 +0,0 @@
-# The "verifymsg" file is used to allow verification of logging
-# information.  It works best when a template (as specified in the
-# rcsinfo file) is provided for the logging procedure.  Given a
-# template with locations for, a bug-id number, a list of people who
-# reviewed the code before it can be checked in, and an external
-# process to catalog the differences that were code reviewed, the
-# following test can be applied to the code:
-#
-#   Making sure that the entered bug-id number is correct.
-#   Validating that the code that was reviewed is indeed the code being
-#       checked in (using the bug-id number or a seperate review
-#       number to identify this particular code set.).
-#
-# If any of the above test failed, then the commit would be aborted.
-#
-# Actions such as mailing a copy of the report to each reviewer are
-# better handled by an entry in the loginfo file.
-#
-# One thing that should be noted is the the ALL keyword is not
-# supported.  There can be only one entry that matches a given
-# repository.

CVSROOT/writers

@@ -1,4 +0,0 @@
-drevil
-inquisitor
-mysterial
-penguin

INSTALL

@@ -0,0 +1,29 @@
+This is still in pretty rough form.
+
+
+=== for people building fs2_open:
+
+Win32-MSVC:
+Use the Freespace2.dsw workspace and build within the IDE.
+
+
+Win32-MinGW:
+  make
+
+
+Linux and other unix variants (NOT YET COMPLETE)
+  ./configure [options]
+  make
+
+
+
+=== for the project maintainers (people who need to 
+=== keep the makefiles up to date) and those building
+=== from CVS:
+
+./autogen.sh (should only has to be done once)
+./configure [options]
+make
+
+automake v1.6.1+ and
+autoconf v2.54+ are required

Makefile.am

@@ -0,0 +1,86 @@
+# Makefile.am for fs2_open (top level)
+#
+# This file uses GNU Automake to generate makefiles
+
+SUBDIRS = libjpeg lua code
+
+
+EXTRA_DIST =	\
+	FS2OpenSCPReadMe.doc	\
+	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/MSVC_7/Freespace2.sln	\
+	projects/MSVC_7/Freespace2.vcproj	\
+	projects/MSVC_7/code.vcproj	\
+	projects/MSVC_7/fred2_open.vcproj	\
+	projects/MSVC_7/libjpeg.vcproj	\
+	projects/MSVC_7/lua.vcproj	\
+	projects/MSVC_7/wxFRED2.vcproj	\
+	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
+AM_CXXFLAGS = -I./code @D_CFLAGS@
+AM_LDFLAGS = @D_LDFLAGS@
+
+EXTRA_PROGRAMS = cfilearchiver cfileextractor cryptstring scramble
+
+###############################################################################
+##
+## Begin utilitites
+##
+
+# cfilearchiver -- to create VPs
+cfilearchiver_SOURCES =	\
+	code/cfilearchiver/cfilearchiver.cpp
+
+# cfileextractor -- to extract files from VPs
+cfileextractor_SOURCES = \
+	code/cfileextractor/cfileextractor.cpp
+
+# cryptstring -- to encrypt strings that are used as cheat codes
+cryptstring_SOURCES =	\
+	code/cryptstring/cryptstring.cpp
+
+# scramble -- to encrypt tables
+scramble_SOURCES =	\
+	code/parse/encrypt.cpp	\
+	code/scramble/scramble.cpp	\
+	code/scramble/scramble.h
+
+
+# catch all to build utilitites
+tools: cfilearchiver cfileextractor cryptstring scramble
+
+
+# cleaning
+clean-tools:
+	-test -z "$(EXTRA_PROGRAMS)" || rm -f $(EXTRA_PROGRAMS)
+
+##
+## End utilitites
+##
+###############################################################################
+
+
+# make sure we get this stuff cleaned up
+clean-generic: clean-tools
+

NEWS

@@ -0,0 +1,3 @@
+This file is required to keep autoconf/automake from complaining.
+
+See the ChangeLog for what's new.

README

@@ -0,0 +1,8 @@
+The "projects" directory contains ready projects for:
+Microsoft Visual C++ 6
+Microsoft Visual C++ 2005
+Anjuta 1 (please see README with project before using)
+
+
+See the ChangeLog to see what's new.
+See the INSTALL file for instructions on how to build fs2_open.

acinclude.m4

@@ -0,0 +1,714 @@
+# Configure paths for SDL
+# Sam Lantinga 9/21/99
+# stolen from Manish Singh
+# stolen back from Frank Belew
+# stolen from Manish Singh
+# Shamelessly stolen from Owen Taylor
+
+dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
+dnl
+AC_DEFUN([AM_PATH_SDL],
+[dnl 
+dnl Get the cflags and libraries from the sdl-config script
+dnl
+AC_ARG_WITH(sdl-prefix,[  --with-sdl-prefix=PFX   Prefix where SDL is installed (optional)],
+            sdl_prefix="$withval", sdl_prefix="")
+AC_ARG_WITH(sdl-exec-prefix,[  --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
+            sdl_exec_prefix="$withval", sdl_exec_prefix="")
+AC_ARG_ENABLE(sdltest, [  --disable-sdltest       Do not try to compile and run a test SDL program],
+		    , enable_sdltest=yes)
+
+  if test x$sdl_exec_prefix != x ; then
+     sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
+     if test x${SDL_CONFIG+set} != xset ; then
+        SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
+     fi
+  fi
+  if test x$sdl_prefix != x ; then
+     sdl_args="$sdl_args --prefix=$sdl_prefix"
+     if test x${SDL_CONFIG+set} != xset ; then
+        SDL_CONFIG=$sdl_prefix/bin/sdl-config
+     fi
+  fi
+
+  AC_REQUIRE([AC_CANONICAL_TARGET])
+  PATH="$prefix/bin:$prefix/usr/bin:$PATH"
+  AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
+  min_sdl_version=ifelse([$1], ,0.11.0,$1)
+  AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
+  no_sdl=""
+  if test "$SDL_CONFIG" = "no" ; then
+    no_sdl=yes
+  else
+    SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
+    SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
+
+    sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+    if test "x$enable_sdltest" = "xyes" ; then
+      ac_save_CFLAGS="$CFLAGS"
+      ac_save_CXXFLAGS="$CXXFLAGS"
+      ac_save_LIBS="$LIBS"
+      CFLAGS="$CFLAGS $SDL_CFLAGS"
+      CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
+      LIBS="$LIBS $SDL_LIBS"
+dnl
+dnl Now check if the installed SDL is sufficiently new. (Also sanity
+dnl checks the results of sdl-config to some extent
+dnl
+      rm -f conf.sdltest
+      AC_TRY_RUN([
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "SDL.h"
+
+char*
+my_strdup (char *str)
+{
+  char *new_str;
+  
+  if (str)
+    {
+      new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
+      strcpy (new_str, str);
+    }
+  else
+    new_str = NULL;
+  
+  return new_str;
+}
+
+int main (int argc, char *argv[])
+{
+  int major, minor, micro;
+  char *tmp_version;
+
+  /* This hangs on some systems (?)
+  system ("touch conf.sdltest");
+  */
+  { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
+
+  /* HP/UX 9 (%@#!) writes to sscanf strings */
+  tmp_version = my_strdup("$min_sdl_version");
+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_sdl_version");
+     exit(1);
+   }
+
+   if (($sdl_major_version > major) ||
+      (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
+      (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
+    {
+      return 0;
+    }
+  else
+    {
+      printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
+      printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
+      printf("*** best to upgrade to the required version.\n");
+      printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
+      printf("*** to point to the correct copy of sdl-config, and remove the file\n");
+      printf("*** config.cache before re-running configure\n");
+      return 1;
+    }
+}
+
+],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+       CFLAGS="$ac_save_CFLAGS"
+       CXXFLAGS="$ac_save_CXXFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+  fi
+  if test "x$no_sdl" = x ; then
+     AC_MSG_RESULT(yes)
+     ifelse([$2], , :, [$2])     
+  else
+     AC_MSG_RESULT(no)
+     if test "$SDL_CONFIG" = "no" ; then
+       echo "*** The sdl-config script installed by SDL could not be found"
+       echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
+       echo "*** your path, or set the SDL_CONFIG environment variable to the"
+       echo "*** full path to sdl-config."
+     else
+       if test -f conf.sdltest ; then
+        :
+       else
+          echo "*** Could not run SDL test program, checking why..."
+          CFLAGS="$CFLAGS $SDL_CFLAGS"
+          CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
+          LIBS="$LIBS $SDL_LIBS"
+          AC_TRY_LINK([
+#include <stdio.h>
+#include "SDL.h"
+
+int main(int argc, char *argv[])
+{ return 0; }
+#undef  main
+#define main K_and_R_C_main
+],      [ return 0; ],
+        [ echo "*** The test program compiled, but did not run. This usually means"
+          echo "*** that the run-time linker is not finding SDL or finding the wrong"
+          echo "*** version of SDL. If it is not finding SDL, 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 SDL was incorrectly installed"
+          echo "*** or that you have moved SDL since it was installed. In the latter case, you"
+          echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
+          CFLAGS="$ac_save_CFLAGS"
+          CXXFLAGS="$ac_save_CXXFLAGS"
+          LIBS="$ac_save_LIBS"
+       fi
+     fi
+     SDL_CFLAGS=""
+     SDL_LIBS=""
+     ifelse([$3], , :, [$3])
+  fi
+  AC_SUBST(SDL_CFLAGS)
+  AC_SUBST(SDL_LIBS)
+  rm -f conf.sdltest
+])
+
+
+dnl ---------------------------------------------------------------------------
+dnl Macros for wxWindows detection. Typically used in configure.in as:
+dnl
+dnl 	AC_ARG_ENABLE(...)
+dnl 	AC_ARG_WITH(...)
+dnl	...
+dnl	AM_OPTIONS_WXCONFIG
+dnl	...
+dnl	...
+dnl	AM_PATH_WXCONFIG(2.3.4, wxWin=1)
+dnl     if test "$wxWin" != 1; then
+dnl        AC_MSG_ERROR([
+dnl     	   wxWindows must be installed on your system
+dnl     	   but wx-config script couldn't be found.
+dnl     
+dnl     	   Please check that wx-config is in path, the directory
+dnl     	   where wxWindows libraries are installed (returned by
+dnl     	   'wx-config --libs' command) is in LD_LIBRARY_PATH or
+dnl     	   equivalent variable and wxWindows version is 2.3.4 or above.
+dnl        ])
+dnl     fi
+dnl     CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
+dnl     CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
+dnl     CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
+dnl     
+dnl     LDFLAGS="$LDFLAGS $WX_LIBS"
+dnl ---------------------------------------------------------------------------
+
+dnl ---------------------------------------------------------------------------
+dnl AM_OPTIONS_WXCONFIG
+dnl
+dnl adds support for --wx-prefix, --wx-exec-prefix and --wx-config 
+dnl command line options
+dnl ---------------------------------------------------------------------------
+
+AC_DEFUN([AM_OPTIONS_WXCONFIG],
+[
+   AC_ARG_WITH(wx-prefix, [  --with-wx-prefix=PREFIX   Prefix where wxWindows is installed (optional)],
+               wx_config_prefix="$withval", wx_config_prefix="")
+   AC_ARG_WITH(wx-exec-prefix,[  --with-wx-exec-prefix=PREFIX Exec prefix where wxWindows is installed (optional)],
+               wx_config_exec_prefix="$withval", wx_config_exec_prefix="")
+   AC_ARG_WITH(wx-config,[  --with-wx-config=CONFIG   wx-config script to use (optional)],
+               wx_config_name="$withval", wx_config_name="")
+])
+
+dnl ---------------------------------------------------------------------------
+dnl AM_PATH_WXCONFIG(VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+dnl
+dnl Test for wxWindows, and define WX_C*FLAGS, WX_LIBS and WX_LIBS_STATIC
+dnl (the latter is for static linking against wxWindows). Set WX_CONFIG_NAME
+dnl environment variable to override the default name of the wx-config script
+dnl to use. Set WX_CONFIG_PATH to specify the full path to wx-config - in this
+dnl case the macro won't even waste time on tests for its existence.
+dnl ---------------------------------------------------------------------------
+
+dnl
+dnl Get the cflags and libraries from the wx-config script
+dnl
+AC_DEFUN([AM_PATH_WXCONFIG],
+[
+  dnl do we have wx-config name: it can be wx-config or wxd-config or ...
+  if test x${WX_CONFIG_NAME+set} != xset ; then
+     WX_CONFIG_NAME=wx-config
+  fi
+  if test "x$wx_config_name" != x ; then
+     WX_CONFIG_NAME="$wx_config_name"
+  fi
+
+  dnl deal with optional prefixes
+  if test x$wx_config_exec_prefix != x ; then
+     wx_config_args="$wx_config_args --exec-prefix=$wx_config_exec_prefix"
+     WX_LOOKUP_PATH="$wx_config_exec_prefix/bin"
+  fi
+  if test x$wx_config_prefix != x ; then
+     wx_config_args="$wx_config_args --prefix=$wx_config_prefix"
+     WX_LOOKUP_PATH="$WX_LOOKUP_PATH:$wx_config_prefix/bin"
+  fi
+
+  dnl don't search the PATH if WX_CONFIG_NAME is absolute filename
+  if test -x "$WX_CONFIG_NAME" ; then
+     AC_MSG_CHECKING(for wx-config)
+     WX_CONFIG_PATH="$WX_CONFIG_NAME"
+     AC_MSG_RESULT($WX_CONFIG_PATH)
+  else
+     AC_PATH_PROG(WX_CONFIG_PATH, $WX_CONFIG_NAME, no, "$WX_LOOKUP_PATH:$PATH")
+  fi
+
+  if test "$WX_CONFIG_PATH" != "no" ; then
+    WX_VERSION=""
+    no_wx=""
+
+    min_wx_version=ifelse([$1], ,2.2.1,$1)
+    AC_MSG_CHECKING(for wxWindows version >= $min_wx_version)
+
+    WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args"
+
+    WX_VERSION=`$WX_CONFIG_WITH_ARGS --version`
+    wx_config_major_version=`echo $WX_VERSION | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    wx_config_minor_version=`echo $WX_VERSION | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    wx_config_micro_version=`echo $WX_VERSION | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+
+    wx_requested_major_version=`echo $min_wx_version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    wx_requested_minor_version=`echo $min_wx_version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    wx_requested_micro_version=`echo $min_wx_version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+
+    wx_ver_ok=""
+    if test $wx_config_major_version -gt $wx_requested_major_version; then
+      wx_ver_ok=yes
+    else
+      if test $wx_config_major_version -eq $wx_requested_major_version; then
+         if test $wx_config_minor_version -gt $wx_requested_minor_version; then
+            wx_ver_ok=yes
+         else
+            if test $wx_config_minor_version -eq $wx_requested_minor_version; then
+               if test $wx_config_micro_version -ge $wx_requested_micro_version; then
+                  wx_ver_ok=yes
+               fi
+            fi
+         fi
+      fi
+    fi
+
+    if test "x$wx_ver_ok" = x ; then
+      no_wx=yes
+    else
+      WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs`
+      WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs`
+
+      dnl starting with version 2.2.6 wx-config has --cppflags argument
+      wx_has_cppflags=""
+      if test $wx_config_major_version -gt 2; then
+        wx_has_cppflags=yes
+      else
+        if test $wx_config_major_version -eq 2; then
+           if test $wx_config_minor_version -gt 2; then
+              wx_has_cppflags=yes
+           else
+              if test $wx_config_minor_version -eq 2; then
+                 if test $wx_config_micro_version -ge 6; then
+                    wx_has_cppflags=yes
+                 fi
+              fi
+           fi
+        fi
+      fi
+
+      if test "x$wx_has_cppflags" = x ; then
+         dnl no choice but to define all flags like CFLAGS
+         WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags`
+         WX_CPPFLAGS=$WX_CFLAGS
+         WX_CXXFLAGS=$WX_CFLAGS
+
+         WX_CFLAGS_ONLY=$WX_CFLAGS
+         WX_CXXFLAGS_ONLY=$WX_CFLAGS
+      else
+         dnl we have CPPFLAGS included in CFLAGS included in CXXFLAGS
+         WX_CPPFLAGS=`$WX_CONFIG_WITH_ARGS --cppflags`
+         WX_CXXFLAGS=`$WX_CONFIG_WITH_ARGS --cxxflags`
+         WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags`
+
+         WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"`
+         WX_CXXFLAGS_ONLY=`echo $WX_CXXFLAGS | sed "s@^$WX_CFLAGS *@@"`
+      fi
+    fi
+
+    if test "x$no_wx" = x ; then
+       AC_MSG_RESULT(yes (version $WX_VERSION))
+       ifelse([$2], , :, [$2])
+    else
+       if test "x$WX_VERSION" = x; then
+	  dnl no wx-config at all
+	  AC_MSG_RESULT(no)
+       else
+	  AC_MSG_RESULT(no (version $WX_VERSION is not new enough))
+       fi
+
+       WX_CFLAGS=""
+       WX_CPPFLAGS=""
+       WX_CXXFLAGS=""
+       WX_LIBS=""
+       WX_LIBS_STATIC=""
+       ifelse([$3], , :, [$3])
+    fi
+  fi
+
+  AC_SUBST(WX_CPPFLAGS)
+  AC_SUBST(WX_CFLAGS)
+  AC_SUBST(WX_CXXFLAGS)
+  AC_SUBST(WX_CFLAGS_ONLY)
+  AC_SUBST(WX_CXXFLAGS_ONLY)
+  AC_SUBST(WX_LIBS)
+  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
+])

autogen.sh

@@ -0,0 +1,137 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+srcdir=`dirname $0`
+PKG_NAME="fs2_open"
+
+# check the version of a package
+check_version() {
+  COMMAND=$1
+  MAJOR=$2
+  MINOR=$3
+  MICRO=$4
+
+  ($COMMAND --version) </dev/null >/dev/null 2>&1 || return 1
+
+  ver=`$COMMAND --version|head -n 1|sed 's/^.*) //'|sed 's/ (.*)//'`
+  major=`echo $ver | cut -d. -f1 | sed s/[a-zA-Z\-].*//g`
+  minor=`echo $ver | cut -d. -f2 | sed s/[a-zA-Z\-].*//g`
+  micro=`echo $ver | cut -d. -f3 | sed s/[a-zA-Z\-].*//g`
+  test -z "$major" && major=0
+  test -z "$minor" && minor=0
+  test -z "$micro" && micro=0
+
+  fail=0
+  if [ ! "$major" -gt "$MAJOR" ]; then
+    if [ "$major" -lt "$MAJOR" ]; then
+      fail=1
+    elif [ ! "$minor" -gt "$MINOR" ]; then
+      if [ "$minor" -lt "$MINOR" ]; then
+        fail=1
+      elif [ "$micro" -lt "$MICRO" ]; then
+        fail=1
+      fi
+    fi
+  fi
+
+  return "$fail"
+}
+
+AUTOMAKE=
+ACLOCAL=
+DIE=0
+
+(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+  echo
+  echo "**Error**: You must have \`autoconf' installed to."
+  echo "Download the appropriate package for your distribution,"
+  echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
+  DIE=1
+}
+
+for AM in automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake; do
+  (check_version "$AM" 1 6 1) && {
+    AUTOMAKE="$AM"
+    break
+  }
+done
+
+if [ -z "$AUTOMAKE" ]; then
+  echo
+  echo "**Error**: You must have \`automake' version 1.6.1 or greater"
+  echo "installed to compile $PKG_NAME. Download the appropriate package"
+  echo "for your distribution, or get the source tarball at"
+  echo "ftp://ftp.gnu.org/pub/gnu/"
+  DIE=1
+fi
+
+# if no automake, don't bother testing for aclocal
+test -z "$AUTOMAKE" || {
+  for ACL in aclocal-1.9 aclocal-1.8 aclocal-1.7 aclocal-1.6 aclocal; do
+    (check_version "$ACL" 1 6 1) && {
+      ACLOCAL="$ACL"
+      break
+    }
+  done
+
+  if [ -z "$ACLOCAL" ]; then
+    echo
+    echo "**Error**: Missing \`aclocal'. The version of \`automake'"
+    echo "installed seems to be outdated. Get a recent package from"
+    echo "ftp://ftp.gnu.org/pub/gnu/"
+    DIE=1
+  fi
+}
+
+if test "$DIE" -eq 1; then
+  exit 1
+fi
+
+if test -z "$*"; then
+  echo "**Warning**: I am going to run \`configure' with no arguments."
+  echo "If you wish to pass any to it, please specify them on the"
+  echo \`$0\'" command line."
+  echo
+fi
+
+case $CC in
+xlc )
+  am_opt=--include-deps;;
+esac
+
+for coin in `find $srcdir -name configure.ac -print`
+do 
+  dr=`dirname $coin`
+  if test -f $dr/NO-AUTO-GEN; then
+    echo skipping $dr -- flagged as no auto-gen
+  else
+    echo processing $dr
+    macrodirs=`sed -n -e 's,AM_ACLOCAL_INCLUDE(\(.*\)),\1,gp' < $coin`
+    ( cd $dr
+      aclocalinclude="$ACLOCAL_FLAGS"
+      for k in $macrodirs; do
+  	if test -d $k; then
+          aclocalinclude="$aclocalinclude -I $k"
+  	##else 
+	##  echo "**Warning**: No such directory \`$k'.  Ignored."
+        fi
+      done
+      echo "Running $ACLOCAL $aclocalinclude ..."
+      "$ACLOCAL" $aclocalinclude
+      echo "Running $AUTOMAKE --add-missing --copy --foreign $am_opt ..."
+      "$AUTOMAKE" --add-missing --copy --foreign $am_opt
+      echo "Running autoconf..."
+      autoconf
+    )
+  fi
+done
+
+#conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c
+
+if test x$NOCONFIGURE = x; then
+  echo Running $srcdir/configure $conf_flags "$@" ...
+  $srcdir/configure $conf_flags "$@" \
+  && echo Now type \`make\' to compile $PKG_NAME.
+else
+  echo Skipping configure process.
+fi

code/Makefile.am

@@ -0,0 +1,851 @@
+## code/Makefile.am for fs2_open
+##
+## $Id: Makefile.am,v 1.42 2007-11-22 04:52:30 taylor Exp $
+
+
+EXTRA_DIST =	\
+	freespace2/app_icon.ico	\
+	freespace2/freespace.rc	\
+	freespace2/freespaceresource.h	\
+	freespace2/goal_com.bmp	\
+	freespace2/goal_fail.bmp	\
+	freespace2/goal_inc.bmp	\
+	freespace2/goal_none.bmp	\
+	freespace2/goal_ord.bmp	\
+	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@ -I../lua
+AM_LDFLAGS = @D_LDFLAGS@ @FS2_LDFLAGS@
+
+noinst_LIBRARIES = libcode.a
+noinst_PROGRAMS = @FS2_BINARY@
+
+EXTRA_PROGRAMS = fs2_open_r fs2_open_d wxFRED2_r wxFRED2_d
+
+###############################################################################
+##
+## Begin CORE library
+##
+
+FS2_SOURCES =	\
+	ai/ai.cpp	\
+	ai/ai.h	\
+	ai/aibig.cpp	\
+	ai/aibig.h	\
+	ai/aicode.cpp	\
+	ai/aigoals.cpp	\
+	ai/aigoals.h	\
+	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	\
+	anim/packunpack.h	\
+	asteroid/asteroid.cpp	\
+	asteroid/asteroid.h	\
+	autopilot/autopilot.cpp	\
+	autopilot/autopilot.h	\
+	bmpman/bm_internal.h	\
+	bmpman/bmpman.cpp	\
+	bmpman/bmpman.h	\
+	camera/camera.cpp	\
+	camera/camera.h	\
+	cfile/cfile.cpp	\
+	cfile/cfile.h	\
+	cfile/cfilearchive.cpp	\
+	cfile/cfilearchive.h	\
+	cfile/cfilelist.cpp	\
+	cfile/cfilesystem.cpp	\
+	cfile/cfilesystem.h	\
+	cmdline/cmdline.cpp	\
+	cmdline/cmdline.h	\
+	cmeasure/cmeasure.cpp	\
+	cmeasure/cmeasure.h	\
+	controlconfig/controlsconfig.cpp	\
+	controlconfig/controlsconfig.h	\
+	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	\
+	debris/debris.h	\
+	debugconsole/console.cpp	\
+	debugconsole/dbugfile.h	\
+	debugconsole/timerbar.cpp	\
+	debugconsole/timerbar.h	\
+	decals/decals.cpp	\
+	decals/decals.h	\
+	demo/demo.cpp	\
+	demo/demo.h	\
+	exceptionhandler/exceptionhandler.cpp	\
+	exceptionhandler/exceptionhandler.h	\
+	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	\
+	gamehelp/contexthelp.cpp	\
+	gamehelp/contexthelp.h	\
+	gamehelp/gameplayhelp.cpp	\
+	gamehelp/gameplayhelp.h	\
+	gamesequence/gamesequence.cpp	\
+	gamesequence/gamesequence.h	\
+	globalincs/alphacolors.cpp	\
+	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	\
+	globalincs/systemvars.cpp	\
+	globalincs/systemvars.h	\
+	globalincs/version.cpp	\
+	globalincs/version.h	\
+	graphics/2d.cpp	\
+	graphics/2d.h	\
+	graphics/font.cpp	\
+	graphics/font.h	\
+	graphics/generic.cpp	\
+	graphics/generic.h	\
+	graphics/grbatch.cpp	\
+	graphics/grbatch.h	\
+	graphics/grinternal.h	\
+	graphics/gropengl.cpp	\
+	graphics/gropengl.h	\
+	graphics/gropenglbmpman.cpp	\
+	graphics/gropenglbmpman.h	\
+	graphics/gropenglextension.cpp	\
+	graphics/gropenglextension.h	\
+	graphics/gropengllight.cpp	\
+	graphics/gropengllight.h	\
+	graphics/gropengltexture.cpp	\
+	graphics/gropengltexture.h	\
+	graphics/gropengltnl.cpp	\
+	graphics/gropengltnl.h	\
+	graphics/grstub.cpp	\
+	graphics/grstub.h	\
+	graphics/line.h	\
+	graphics/tmapper.h	\
+	hud/hud.cpp	\
+	hud/hud.h	\
+	hud/hudartillery.cpp	\
+	hud/hudartillery.h	\
+	hud/hudbrackets.cpp	\
+	hud/hudbrackets.h	\
+	hud/hudconfig.cpp	\
+	hud/hudconfig.h	\
+	hud/hudescort.cpp	\
+	hud/hudescort.h	\
+	hud/hudets.cpp	\
+	hud/hudets.h	\
+	hud/hudgauges.h	\
+	hud/hudlock.cpp	\
+	hud/hudlock.h	\
+	hud/hudmessage.cpp	\
+	hud/hudmessage.h	\
+	hud/hudnavigation.cpp	\
+	hud/hudnavigation.h	\
+	hud/hudobserver.cpp	\
+	hud/hudobserver.h	\
+	hud/hudparse.cpp	\
+	hud/hudparse.h	\
+	hud/hudresource.h	\
+	hud/hudreticle.cpp	\
+	hud/hudreticle.h	\
+	hud/hudshield.cpp	\
+	hud/hudshield.h	\
+	hud/hudsquadmsg.cpp	\
+	hud/hudsquadmsg.h	\
+	hud/hudtarget.cpp	\
+	hud/hudtarget.h	\
+	hud/hudtargetbox.cpp	\
+	hud/hudtargetbox.h	\
+	hud/hudwingmanstatus.cpp	\
+	hud/hudwingmanstatus.h	\
+	iff_defs/iff_defs.cpp	\
+	iff_defs/iff_defs.h	\
+	io/key.cpp	\
+	io/key.h	\
+	io/keycontrol.cpp	\
+	io/keycontrol.h	\
+	io/mouse.cpp	\
+	io/mouse.h	\
+	io/timer.cpp	\
+	io/timer.h	\
+	irc/irc.cpp	\
+	irc/irc.h	\
+	jpgutils/jpgutils.cpp	\
+	jpgutils/jpgutils.h	\
+	jumpnode/jumpnode.cpp	\
+	jumpnode/jumpnode.h	\
+	lab/lab.cpp	\
+	lab/lab.h	\
+	lab/wmcgui.cpp	\
+	lab/wmcgui.h	\
+	lighting/lighting.cpp	\
+	lighting/lighting.h	\
+	localization/fhash.cpp	\
+	localization/fhash.h	\
+	localization/localize.cpp	\
+	localization/localize.h	\
+	math/bitarray.h	\
+	math/fix.cpp	\
+	math/fix.h	\
+	math/floating.cpp	\
+	math/floating.h	\
+	math/fvi.cpp	\
+	math/fvi.h	\
+	math/spline.cpp	\
+	math/spline.h	\
+	math/staticrand.cpp	\
+	math/staticrand.h	\
+	math/vecmat.cpp	\
+	math/vecmat.h	\
+	menuui/barracks.cpp	\
+	menuui/barracks.h	\
+	menuui/credits.cpp	\
+	menuui/credits.h	\
+	menuui/fishtank.cpp	\
+	menuui/fishtank.h	\
+	menuui/mainhallmenu.cpp	\
+	menuui/mainhallmenu.h	\
+	menuui/mainhalltemp.cpp	\
+	menuui/mainhalltemp.h	\
+	menuui/optionsmenu.cpp	\
+	menuui/optionsmenu.h	\
+	menuui/optionsmenumulti.cpp	\
+	menuui/optionsmenumulti.h	\
+	menuui/playermenu.cpp	\
+	menuui/playermenu.h	\
+	menuui/readyroom.cpp	\
+	menuui/readyroom.h	\
+	menuui/snazzyui.cpp	\
+	menuui/snazzyui.h	\
+	menuui/storybook.cpp	\
+	menuui/storybook.h	\
+	menuui/techmenu.cpp	\
+	menuui/techmenu.h	\
+	menuui/trainingmenu.cpp	\
+	menuui/trainingmenu.h	\
+	mission/missionbriefcommon.cpp	\
+	mission/missionbriefcommon.h	\
+	mission/missioncampaign.cpp	\
+	mission/missioncampaign.h	\
+	mission/missiongoals.cpp	\
+	mission/missiongoals.h	\
+	mission/missiongrid.cpp	\
+	mission/missiongrid.h	\
+	mission/missionhotkey.cpp	\
+	mission/missionhotkey.h	\
+	mission/missionload.cpp	\
+	mission/missionload.h	\
+	mission/missionlog.cpp	\
+	mission/missionlog.h	\
+	mission/missionmessage.cpp	\
+	mission/missionmessage.h	\
+	mission/missionparse.cpp	\
+	mission/missionparse.h	\
+	mission/missiontraining.cpp	\
+	mission/missiontraining.h	\
+	missionui/chatbox.cpp	\
+	missionui/chatbox.h	\
+	missionui/fictionviewer.cpp	\
+	missionui/fictionviewer.h	\
+	missionui/missionbrief.cpp	\
+	missionui/missionbrief.h	\
+	missionui/missioncmdbrief.cpp	\
+	missionui/missioncmdbrief.h	\
+	missionui/missiondebrief.cpp	\
+	missionui/missiondebrief.h	\
+	missionui/missionloopbrief.cpp	\
+	missionui/missionloopbrief.h	\
+	missionui/missionpause.cpp	\
+	missionui/missionpause.h	\
+	missionui/missionrecommend.cpp	\
+	missionui/missionrecommend.h	\
+	missionui/missionscreencommon.cpp	\
+	missionui/missionscreencommon.h	\
+	missionui/missionshipchoice.cpp	\
+	missionui/missionshipchoice.h	\
+	missionui/missionstats.cpp	\
+	missionui/missionstats.h	\
+	missionui/missionweaponchoice.cpp	\
+	missionui/missionweaponchoice.h	\
+	missionui/redalert.cpp	\
+	missionui/redalert.h	\
+	model/model.h	\
+	model/modelanim.cpp	\
+	model/modelanim.h	\
+	model/modelcollide.cpp	\
+	model/modeldiff.cpp	\
+	model/modelinterp.cpp	\
+	model/modelsinc.h	\
+	model/modeloctant.cpp	\
+	model/modelread.cpp	\
+	nebula/neb.cpp	\
+	nebula/neb.h	\
+	nebula/neblightning.cpp	\
+	nebula/neblightning.h	\
+	network/fs2ox.cpp	\
+	network/fs2ox.h	\
+	network/multi.cpp	\
+	network/multi.h	\
+	network/multilag.cpp	\
+	network/multilag.h	\
+	network/multimsgs.cpp	\
+	network/multimsgs.h	\
+	network/multiteamselect.cpp	\
+	network/multiteamselect.h	\
+	network/multiui.cpp	\
+	network/multiui.h	\
+	network/multiutil.cpp	\
+	network/multiutil.h	\
+	network/multi_campaign.cpp	\
+	network/multi_campaign.h	\
+	network/multi_data.cpp	\
+	network/multi_data.h	\
+	network/multi_dogfight.cpp	\
+	network/multi_dogfight.h	\
+	network/multi_endgame.cpp	\
+	network/multi_endgame.h	\
+	network/multi_ingame.cpp	\
+	network/multi_ingame.h	\
+	network/multi_kick.cpp	\
+	network/multi_kick.h	\
+	network/multi_log.cpp	\
+	network/multi_log.h	\
+	network/multi_obj.cpp	\
+	network/multi_obj.h	\
+	network/multi_observer.cpp	\
+	network/multi_observer.h	\
+	network/multi_oo.h	\
+	network/multi_options.cpp	\
+	network/multi_options.h	\
+	network/multi_pause.cpp	\
+	network/multi_pause.h	\
+	network/multi_pinfo.cpp	\
+	network/multi_pinfo.h	\
+	network/multi_ping.cpp	\
+	network/multi_ping.h	\
+	network/multi_pmsg.cpp	\
+	network/multi_pmsg.h	\
+	network/multi_rate.cpp	\
+	network/multi_rate.h	\
+	network/multi_respawn.cpp	\
+	network/multi_respawn.h	\
+	network/multi_team.cpp	\
+	network/multi_team.h	\
+	network/multi_update.h	\
+	network/multi_voice.cpp	\
+	network/multi_voice.h	\
+	network/multi_xfer.cpp	\
+	network/multi_xfer.h	\
+	network/psnet.cpp	\
+	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/objectsort.cpp	\
+	object/objectshield.cpp	\
+	object/parseobjectdock.cpp	\
+	object/parseobjectdock.h	\
+	object/waypoint/waypoint.cpp	\
+	object/waypoint/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	\
+	particle/particle.h	\
+	pcxutils/pcxutils.cpp	\
+	pcxutils/pcxutils.h	\
+	physics/physics.cpp	\
+	physics/physics.h	\
+	playerman/managepilot.cpp	\
+	playerman/managepilot.h	\
+	playerman/player.h	\
+	playerman/playercontrol.cpp	\
+	popup/popup.cpp	\
+	popup/popup.h	\
+	popup/popupdead.cpp	\
+	popup/popupdead.h	\
+	radar/radar.cpp	\
+	radar/radar.h	\
+	radar/radarorb.cpp	\
+	radar/radarorb.h	\
+	radar/radarsetup.cpp	\
+	radar/radarsetup.h	\
+	render/3d.h	\
+	render/3dclipper.cpp	\
+	render/3ddraw.cpp	\
+	render/3dinternal.h	\
+	render/3dlaser.cpp	\
+	render/3dmath.cpp	\
+	render/3dsetup.cpp	\
+	ship/afterburner.cpp	\
+	ship/afterburner.h	\
+	ship/awacs.cpp	\
+	ship/awacs.h	\
+	ship/shield.cpp	\
+	ship/ship.cpp	\
+	ship/ship.h	\
+	ship/shipcontrails.cpp	\
+	ship/shipcontrails.h	\
+	ship/shipfx.cpp	\
+	ship/shipfx.h	\
+	ship/shiphit.cpp	\
+	ship/shiphit.h	\
+	ship/subsysdamage.h	\
+	species_defs/species_defs.cpp	\
+	species_defs/species_defs.h	\
+	starfield/nebula.cpp	\
+	starfield/nebula.h	\
+	starfield/starfield.cpp	\
+	starfield/starfield.h	\
+	starfield/supernova.cpp	\
+	starfield/supernova.h	\
+	stats/medals.cpp	\
+	stats/medals.h	\
+	stats/scoring.cpp	\
+	stats/scoring.h	\
+	stats/stats.cpp	\
+	stats/stats.h	\
+	tgautils/tgautils.cpp	\
+	tgautils/tgautils.h	\
+	ui/button.cpp	\
+	ui/checkbox.cpp	\
+	ui/gadget.cpp	\
+	ui/icon.cpp	\
+	ui/inputbox.cpp	\
+	ui/keytrap.cpp	\
+	ui/listbox.cpp	\
+	ui/radio.cpp	\
+	ui/scroll.cpp	\
+	ui/slider.cpp	\
+	ui/slider2.cpp	\
+	ui/ui.h	\
+	ui/uidefs.h	\
+	ui/uidraw.cpp	\
+	ui/uimouse.cpp	\
+	ui/window.cpp	\
+	weapon/beam.cpp	\
+	weapon/beam.h	\
+	weapon/corkscrew.cpp	\
+	weapon/corkscrew.h	\
+	weapon/emp.cpp	\
+	weapon/emp.h	\
+	weapon/flak.cpp	\
+	weapon/flak.h	\
+	weapon/muzzleflash.cpp	\
+	weapon/muzzleflash.h	\
+	weapon/shockwave.cpp	\
+	weapon/shockwave.h	\
+	weapon/swarm.cpp	\
+	weapon/swarm.h	\
+	weapon/trails.cpp	\
+	weapon/trails.h	\
+	weapon/weapons.cpp	\
+	weapon/weapon.h
+
+## conditional includes follow:
+
+## joystic support sources
+if FS2_OS_WIN32
+JOY_SOURCES =	\
+	io/joy.cpp	\
+	io/joy.h	\
+	io/joy_ff.cpp	\
+	io/joy_ff.h	\
+	io/sw_error.hpp	\
+	io/sw_force.h	\
+	io/sw_guid.hpp	\
+	io/swff_lib.cpp
+endif
+
+if FS2_OS_UNIX
+JOY_SOURCES =	\
+	io/joy.h	\
+	io/joy_ff.h	\
+	io/joy-unix.cpp
+endif
+
+## sound support sources
+if FS2_SOUND
+SOUND_SOURCES =	\
+	gamesnd/eventmusic.cpp	\
+	gamesnd/eventmusic.h	\
+	gamesnd/gamesnd.cpp	\
+	gamesnd/gamesnd.h	\
+	object/objectsnd.cpp	\
+	object/objectsnd.h	\
+	sound/ogg/ogg.cpp	\
+	sound/ogg/ogg.h	\
+	sound/audiostr-openal.cpp	\
+	sound/audiostr.cpp	\
+	sound/audiostr.h	\
+	sound/acm-openal.cpp	\
+	sound/acm.cpp	\
+	sound/acm.h	\
+	sound/ds.cpp	\
+	sound/ds.h	\
+	sound/ds3d.cpp	\
+	sound/ds3d.h	\
+	sound/dscap.cpp	\
+	sound/dscap.h	\
+	sound/midifile.cpp	\
+	sound/midifile.h	\
+	sound/midiseq.h	\
+	sound/rbaudio.cpp	\
+	sound/rbaudio.h	\
+	sound/rtvoice.cpp	\
+	sound/rtvoice.h	\
+	sound/sound.cpp	\
+	sound/sound.h	\
+	sound/winmidi.cpp	\
+	sound/winmidi.h	\
+	sound/winmidi_base.cpp	\
+	vcodec/codec1.cpp	\
+	vcodec/codec1.h	\
+	sound/fsspeech.cpp	\
+	sound/fsspeech.h	\
+	sound/speech.cpp	\
+	sound/speech.h	\
+	sound/voicerec.cpp	\
+	sound/voicerec.h
+endif
+
+## Win32-specific sources
+if FS2_OS_WIN32
+WIN32_SOURCES =	\
+	directx/dx8show.cpp	\
+	directx/dx8show.h	\
+	directx/vasync.h	\
+	directx/vd3dtypes.h	\
+	directx/vddraw.h	\
+	directx/vdinput.h	\
+	directx/vdplay.h	\
+	directx/vdplobby.h	\
+	directx/vdsetup.h	\
+	directx/vdsound.h	\
+	directx/vdvp.h	\
+	globalincs/windebug.cpp	\
+	graphics/gl/GLAUX.H	\
+	graphics/gl/GLU.H	\
+	graphics/gl/Gl.h	\
+	graphics/gl/Glext.h	\
+	graphics/gl/wglext.h	\
+	graphics/GrD3DStateBlock.cpp	\
+	graphics/GrD3DStateBlock.h	\
+	graphics/grd3d.cpp	\
+	graphics/grd3d.h	\
+	graphics/grd3dcalls.cpp	\
+	graphics/grd3dbmpman.cpp	\
+	graphics/grd3dbmpman.h	\
+	graphics/grd3dinternal.h	\
+	graphics/grd3dlight.cpp	\
+	graphics/grd3dlight.h	\
+	graphics/grd3drender.cpp	\
+	graphics/grd3dsetup.cpp	\
+	graphics/grd3dsetup.h	\
+	graphics/grd3dtexture.cpp	\
+	osapi/monopub.h	\
+	osapi/osapi.cpp	\
+	osapi/osapi.h	\
+	osapi/osregistry.cpp	\
+	osapi/osregistry.h	\
+	osapi/outwnd.cpp	\
+	osapi/outwnd.h
+endif
+
+## Unix-specific sources
+if FS2_OS_UNIX
+UNIX_SOURCES =	\
+	osapi/osapi_unix.cpp	\
+	osapi/osapi.h	\
+	osapi/osregistry_unix.cpp	\
+	osapi/osregistry.h	\
+	osapi/outwnd_unix.cpp	\
+	osapi/outwnd.h	\
+	windows_stub/stubs.cpp	\
+	windows_stub/config.h
+endif
+
+
+## libcode.a
+libcode_a_SOURCES = ${FS2_SOURCES} ${JOY_SOURCES} ${SOUND_SOURCES}	\
+	${WIN32_SOURCES} ${UNIX_SOURCES}
+
+##
+## End CODE library
+##
+###############################################################################
+
+###############################################################################
+##
+## Begin MAIN fs2 binary
+##
+
+FS2OPEN_SOURCES = \
+	freespace2/freespace.cpp	\
+	freespace2/freespace.h	\
+	freespace2/levelpaging.cpp	\
+	freespace2/levelpaging.h
+
+fs2_open_d_SOURCES =	\
+	${FS2OPEN_SOURCES}
+
+fs2_open_r_SOURCES =	\
+	${FS2OPEN_SOURCES}
+
+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
+##
+###############################################################################
+
+###############################################################################
+##
+## Begin wxFRED2 binary
+##
+
+wxFRED_SOURCES = \
+	wxfred2/wxfred2.cpp	\
+	wxfred2/wxfred2.h	\
+	wxfred2/fredframe.cpp	\
+	wxfred2/fredframe.h	\
+	wxfred2/wxfred_xrc.cpp	\
+	wxfred2/wxfred_xrc.h
+
+wxFRED2_d_SOURCES = \
+	${wxFRED_SOURCES}
+
+wxFRED2_r_SOURCES =	\
+	${wxFRED_SOURCES}
+
+wxFRED2_d_LDADD = libcode.a ../libjpeg/libjpeg.a
+wxFRED2_r_LDADD = libcode.a ../libjpeg/libjpeg.a
+
+##
+## End wxFRED2 binary
+##
+###############################################################################

code/ai/ai.cpp

@@ -11,17 +11,11 @@
 // ai slots and linking them to ships.
 // See AiCode.cpp for the actual AI code.
 
-#include "globalincs/pstypes.h"
+#include "ai/ai.h"
 #include "object/object.h"
-#include "physics/physics.h"
-#include "math/vecmat.h"
 #include "ship/ship.h"
-#include "model/model.h"
-#include "graphics/2d.h"
-#include "render/3d.h"
-#include "ship/ai.h"
-#include "math/floating.h"
-#include "ship/ailocal.h"
+
+
 
 int Total_goal_ship_names = 0;
 char Goal_ship_names[MAX_GOAL_SHIP_NAMES][NAME_LENGTH];

code/ai/ai.h

@@ -9,11 +9,135 @@
 
 /*
  * $Logfile: /Freespace2/code/Ship/ai.h $
- * $Revision: 2.8 $
- * $Date: 2003-01-19 22:20:22 $
+ * $Revision: 1.19 $
+ * $Date: 2007-08-11 16:52:02 $
  * $Author: Goober5000 $
  *
  * $Log: not supported by cvs2svn $
+ * Revision 1.18  2007/02/18 06:16:46  Goober5000
+ * revert Bobboau's commits for the past two months; these will be added in later in a less messy/buggy manner
+ *
+ * Revision 1.17  2007/02/11 21:26:34  Goober5000
+ * massive shield infrastructure commit
+ *
+ * Revision 1.16  2007/01/14 14:03:31  bobboau
+ * ok, something aparently went wrong, last time, so I'm commiting again
+ * hopefully it should work this time
+ * damnit WORK!!!
+ *
+ * Revision 1.15  2007/01/07 01:00:18  Goober5000
+ * convert a mission variable to a mission flag
+ *
+ * Revision 1.14  2006/12/28 00:59:18  wmcoolmon
+ * WMC codebase commit. See pre-commit build thread for details on changes.
+ *
+ * Revision 1.13  2006/06/04 01:01:52  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
+ * have to to review)
+ * --Goober5000
+ *
+ * Revision 1.5  2005/07/24 20:12:55  Goober5000
+ * cleaned up some rotating submodel code
+ * --Goober5000
+ *
+ * Revision 1.4  2005/07/22 09:19:39  wmcoolmon
+ * Dynamic AI Class number commit. KNOWN BUG: When AI_CLASS_INCREMENT is hit and vm_realloc is called, memory corruption seems to
+ * result. Not at all sure what causes this; if this can't be resolved soon, we can always treat _INCREMENT like _MAX
+ *
+ * Revision 1.3  2005/07/13 02:50:48  Goober5000
+ * remove PreProcDefine #includes in FS2
+ * --Goober5000
+ *
+ * Revision 1.2  2005/04/05 05:53:13  taylor
+ * s/vector/vec3d/g, better support for different compilers (Jens Granseuer)
+ *
+ * Revision 1.1  2005/03/25 06:45:12  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.
+ *
+ * Revision 2.21  2005/02/20 23:13:00  wmcoolmon
+ * Trails stuff, moved ship docking func declaration so FRED could get to it.
+ *
+ * Revision 2.20  2005/01/28 09:01:04  Goober5000
+ * finished implementing docking to a rotating submodel
+ * --Goober5000
+ *
+ * Revision 2.19  2005/01/27 11:26:23  Goober5000
+ * dock points on rotating submodels is *almost* working
+ * --Goober5000
+ *
+ * Revision 2.18  2005/01/13 03:33:07  Goober5000
+ * hmm, rolled back one of my clarifications since it caused things to get messed up
+ * --Goober5000
+ *
+ * Revision 2.17  2005/01/11 21:38:48  Goober5000
+ * multiple ship docking :)
+ * don't tell anyone yet... check the SCP internal
+ * --Goober500
+ *
+ * Revision 2.16  2004/08/11 05:06:33  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
+ *
+ * Revision 2.15  2004/07/25 00:31:30  Kazan
+ * i have absolutely nothing to say about that subject
+ *
+ * Revision 2.14  2004/03/05 09:01:51  Goober5000
+ * Uber pass at reducing #includes
+ * --Goober5000
+ *
+ * Revision 2.13  2004/01/26 23:07:43  phreak
+ * bumped MAX_AI_CLASSES to 30 if INF_BUILD is defined
+ *
+ * Revision 2.12  2003/11/11 02:15:40  Goober5000
+ * ubercommit - basically spelling and language fixes with some additional
+ * warnings disabled
+ * --Goober5000
+ *
+ * Revision 2.11  2003/09/13 06:02:03  Goober5000
+ * clean rollback of all of argv's stuff
+ * --Goober5000
+ *
+ * Revision 2.9  2003/03/30 04:34:37  Goober5000
+ * preliminary work on ai facing sexp
+ * --Goober5000
+ *
+ * Revision 2.8  2003/01/19 22:20:22  Goober5000
+ * fixed a bunch of bugs -- the support ship sexp, the "no-subspace-drive" flag,
+ * and departure into hangars should now all work properly
+ * --Goober5000
+ *
  * Revision 2.7  2003/01/19 07:02:15  Goober5000
  * fixed a bunch of bugs - "no-subspace-drive" should now work properly for
  * all ships, and all ships who have their departure anchor set to a capital ship
@@ -39,7 +163,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 sheild 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
@@ -190,43 +314,45 @@
 #define _AI_H
 
 #include "globalincs/pstypes.h"
-#include "object/object.h"
-#include "parse/parselo.h"
-#include "cfile/cfile.h"
+#include "globalincs/globals.h"
 #include "globalincs/systemvars.h"
 
+struct ship_weapon;
+struct ship_subsys;
+struct object;
+
 #define	AI_DEFAULT_CLASS 3  // default AI class for new ships (Fred)
 
-#define	AIF_FORMATION_WING					(1 << 0)		//	Fly in formation as part of wing.
-#define	AIF_AWAITING_REPAIR					(1 << 1)		//	Awaiting a repair ship.
-#define	AIF_BEING_REPAIRED					(1 << 2)		//	Currently docked with repair ship.
-#define	AIF_REPAIRING							(1 << 3)		//	Repairing a ship (or going to repair a ship)
-#define	AIF_DOCKED								(1 << 4)		// this object docked with something else
-#define	AIF_SEEK_LOCK							(1 << 5)		//	set if should focus on gaining aspect lock, not hitting with lasers
-#define	AIF_FORMATION_OBJECT					(1 << 6)		//	Fly in formation off a specific object.
-#define	AIF_TEMPORARY_IGNORE					(1 << 7)		//	Means current ignore_objnum is only temporary, not an order from the player.
-#define	AIF_USE_EXIT_PATH						(1	<< 8)		// Used by path code, to flag path as an exit path
-#define	AIF_USE_STATIC_PATH					(1	<< 9)		// Used by path code, use fixed path, don't try to recreate
-#define	AIF_TARGET_COLLISION					(1 << 10)	//	Collided with aip->target_objnum last frame.  Avoid that ship for half a second or so.
-#define	AIF_UNLOAD_SECONDARIES				(1 << 11)	//	Fire secondaries as fast as possible!
-#define	AIF_ON_SUBSYS_PATH					(1	<<	12)	// Current path leads to a subsystem
-#define	AIF_AVOID_SHOCKWAVE_SHIP			(1 << 13)	//	Avoid an existing shockwave from a ship.
-#define	AIF_AVOID_SHOCKWAVE_WEAPON			(1 << 14)	//	Avoid an expected shockwave from a weapon.  shockwave_object field contains object index.
-#define	AIF_AVOID_SHOCKWAVE_STARTED		(1 << 15)	//	Already started avoiding shockwave, don't keep deciding whether to avoid.
-#define	AIF_ATTACK_SLOWLY						(1 << 16)	//	Move slowly while attacking.
-#define	AIF_REPAIR_OBSTRUCTED				(1 << 17)	//	Ship wants to be repaired, but path is obstructed.
-#define	AIF_KAMIKAZE							(1 << 18)	//	Crash into target
-#define	AIF_NO_DYNAMIC							(1 << 19)	//	Not allowed to get dynamic goals
-#define	AIF_AVOIDING_SMALL_SHIP				(1 << 20)	//	Avoiding a player ship.
-#define	AIF_AVOIDING_BIG_SHIP				(1 << 21)	//	Avoiding a large ship.
-#define	AIF_BIG_SHIP_COLLIDE_RECOVER_1	(1 << 22)	//	Collided into a big ship.  Recovering by flying away.
-#define	AIF_BIG_SHIP_COLLIDE_RECOVER_2	(1 << 23)	//	Collided into a big ship.  Fly towards big ship sphere perimeter.
-#define	AIF_STEALTH_PURSUIT					(1 << 24)	// Ai is trying to fight stealth ship
+#define	AIF_FORMATION_WING					(1 << 0)	//	Fly in formation as part of wing.
+#define	AIF_AWAITING_REPAIR					(1 << 1)	//	Awaiting a repair ship.
+#define	AIF_BEING_REPAIRED					(1 << 2)	//	Currently docked with repair ship.
+#define	AIF_REPAIRING						(1 << 3)	//	Repairing a ship (or going to repair a ship)
+#define	AIF_SEEK_LOCK						(1 << 4)	//	set if should focus on gaining aspect lock, not hitting with lasers
+#define	AIF_FORMATION_OBJECT				(1 << 5)	//	Fly in formation off a specific object.
+#define	AIF_TEMPORARY_IGNORE				(1 << 6)	//	Means current ignore_objnum is only temporary, not an order from the player.
+#define	AIF_USE_EXIT_PATH					(1 << 7)	// Used by path code, to flag path as an exit path
+#define	AIF_USE_STATIC_PATH					(1 << 8)	// Used by path code, use fixed path, don't try to recreate
+#define	AIF_TARGET_COLLISION				(1 << 9)	//	Collided with aip->target_objnum last frame.  Avoid that ship for half a second or so.
+#define	AIF_UNLOAD_SECONDARIES				(1 << 10)	//	Fire secondaries as fast as possible!
+#define	AIF_ON_SUBSYS_PATH					(1 << 11)	// Current path leads to a subsystem
+#define	AIF_AVOID_SHOCKWAVE_SHIP			(1 << 12)	//	Avoid an existing shockwave from a ship.
+#define	AIF_AVOID_SHOCKWAVE_WEAPON			(1 << 13)	//	Avoid an expected shockwave from a weapon.  shockwave_object field contains object index.
+#define	AIF_AVOID_SHOCKWAVE_STARTED			(1 << 14)	//	Already started avoiding shockwave, don't keep deciding whether to avoid.
+#define	AIF_ATTACK_SLOWLY					(1 << 15)	//	Move slowly while attacking.
+#define	AIF_REPAIR_OBSTRUCTED				(1 << 16)	//	Ship wants to be repaired, but path is obstructed.
+#define	AIF_KAMIKAZE						(1 << 17)	//	Crash into target
+#define	AIF_NO_DYNAMIC						(1 << 18)	//	Not allowed to get dynamic goals
+#define	AIF_AVOIDING_SMALL_SHIP				(1 << 19)	//	Avoiding a player ship.
+#define	AIF_AVOIDING_BIG_SHIP				(1 << 20)	//	Avoiding a large ship.
+#define	AIF_BIG_SHIP_COLLIDE_RECOVER_1		(1 << 21)	//	Collided into a big ship.  Recovering by flying away.
+#define	AIF_BIG_SHIP_COLLIDE_RECOVER_2		(1 << 22)	//	Collided into a big ship.  Fly towards big ship sphere perimeter.
+#define	AIF_STEALTH_PURSUIT					(1 << 23)	// Ai is trying to fight stealth ship
 
 // Goober5000
-#define	AIF_UNLOAD_PRIMARIES				(1 << 25)	//	Fire primaries as fast as possible!
+#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_AVOID_SHOCKWAVE		(AIF_AVOID_SHOCKWAVE_SHIP | AIF_AVOID_SHOCKWAVE_WEAPON)
 #define	AIF_FORMATION			(AIF_FORMATION_WING | AIF_FORMATION_OBJECT)
 
 //	dock_orient_and_approach() modes.
@@ -242,14 +368,14 @@
 #define	AIDO_DOCK_NOW	2		//	Immediately move into dock position.  For ships that start mission docked.
 #define	AIDO_UNDOCK		3		//	Set goal of undocking with object.
 
-#define MAX_AI_GOALS	5
-
 //	Submodes for seeking safety.
 #define	AISS_1	41				//	Pick a spot to fly to.
 #define	AISS_2	42				//	Flying to spot.
 #define	AISS_3	43				// Gotten near spot, fly about there.
 #define	AISS_1a	44				//	Pick a new nearby spot because we are endangered, then go to AISS_2
 
+#define MAX_AI_GOALS	5
+
 // types of ai goals -- tyese types will help us to determination on which goals should
 // have priority over others (i.e. when a player issues a goal to a wing, then a seperate
 // goal to a ship in that wing).  We would probably use this type in conjunction with
@@ -261,26 +387,27 @@
 #define AIG_TYPE_DYNAMIC			5		// created on the fly
 
 // flags for AI_GOALS
-#define AIGF_DOCKER_NAME_VALID	(1<<0)	// when set, name field for docker is valid
-#define AIGF_DOCKEE_NAME_VALID	(1<<1)	// when set, name field for dockee is valid
+#define AIGF_DOCKER_INDEX_VALID		(1<<0)	// when set, index field for docker is valid
+#define AIGF_DOCKEE_INDEX_VALID		(1<<1)	// when set, index field for dockee is valid
 #define AIGF_GOAL_ON_HOLD			(1<<2)	// when set, this goal cannot currently be satisfied, although it could be in the future
-#define AIGF_SUBSYS_NAME_VALID	(1<<3)	// when set, the subsystem name (for a destroy subsystem goal) is valid, and stored in docker.name field!!
+#define AIGF_SUBSYS_NEEDS_FIXUP		(1<<3)	// when set, the subsystem index (for a destroy subsystem goal) is invalid and must be gotten from the subsys name stored in docker.name field!!
 #define AIGF_GOAL_OVERRIDE			(1<<4)	// paired with AIG_TYPE_DYNAMIC to mean this goal overrides any other goal
 #define AIGF_PURGE					(1<<5)	// purge this goal next time we process
 #define AIGF_GOALS_PURGED			(1<<6)	// this goal has already caused other goals to get purged
+#define AIGF_DOCK_SOUND_PLAYED		(1<<7)	// Goober5000 - replacement for AL's hack ;)
+
+#define AIGF_DOCK_INDEXES_VALID		(AIGF_DOCKER_INDEX_VALID|AIGF_DOCKEE_INDEX_VALID)
 
 //	Flags to ai_turn_towards_vector().
 #define	AITTV_FAST					(1<<0)	//	Turn fast, not slowed down based on skill level.
+#define AITTV_VIA_SEXP				(1<<1)	//	Goober5000 - via sexp
+#define AITTV_IGNORE_BANK			(1<<2)	//	Goober5000 - ignore bank when turning
 
 #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_goals {
+typedef struct ai_goal {
 	int	signature;			//	Unique identifier.  All goals ever created (per mission) have a unique signature.
 	int	ai_mode;				// one of the AIM_* modes for this goal
 	int	ai_submode;			// maybe need a submode
@@ -293,14 +420,9 @@ typedef struct ai_goals {
 	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
 	union {
 		char	*name;
 		int	index;
@@ -313,9 +435,6 @@ typedef struct ai_goals {
 
 } ai_goal;
 
-#include "ship/ship.h"  // ai_goal must be declared before including this.
-
-#define	MAX_AI_CLASSES		10
 #define	MAX_GOAL_SHIP_NAMES	100
 
 #define	AIM_CHASE				0
@@ -339,23 +458,12 @@ typedef struct ai_goals {
 #define	AIM_BAY_DEPART			18		// Departing to a fighter bay, following path to do so
 #define	AIM_SENTRYGUN			19		// AI mode for sentry guns only (floating turrets)
 #define	AIM_WARP_OUT			20		//	Commence warp out sequence.  Point in legal direction.  Then call John's code.
+#define AIM_FLY_TO_SHIP			21		// [Kazan] Fly to a ship, doesn't matter if it's hostile or friendly -- for Autopilot usage
 
-#define	MAX_AI_BEHAVIORS		21	//	Number of AIM_xxxx types
+#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];
-	vector	waypoints[MAX_WAYPOINTS_PER_LIST];
-} waypoint_list;
-
 #define AI_GOAL_NONE				-1
 
 #define	AI_ACTIVE_GOAL_DYNAMIC	999
@@ -393,7 +501,7 @@ typedef struct ai_class {
 #define	AIS_DOCK_1		22
 #define	AIS_DOCK_2		23
 #define	AIS_DOCK_3		24
-#define	AIS_DOCK_3A		25
+//#define	AIS_DOCK_3A		25
 #define	AIS_DOCK_4		26			//	Only for rearm/repair.
 #define	AIS_DOCK_4A		27			//	Only for not rearm/repair.  MK, 7/15/97
 #define	AIS_UNDOCK_0	30
@@ -437,7 +545,7 @@ typedef struct ai_class {
 //	This hook is used to extract information on the point such as whether it is
 //	protected by turrets.
 typedef struct pnode {
-	vector	pos;
+	vec3d	pos;
 	int		path_num;			//	path number from polymodel, ie in polymodel, paths[path_num]
 	int		path_index;			//	index in original model path of point, ie in model_path, use verts[path_index]
 } pnode;
@@ -446,13 +554,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.
@@ -463,14 +574,15 @@ typedef struct ai_info {
 	int		stealth_last_cheat_visible_stamp;	// when within 100m, always update pos and velocity, with error increasing for increasing time from last legal visible
 	int		stealth_last_visible_stamp;
 	float		stealth_sweep_box_size;
-	vector	stealth_last_pos;
-	vector	stealth_velocity;
+	vec3d	stealth_last_pos;
+	vec3d	stealth_velocity;
 
 	float		previous_dot_to_enemy;	//	dot(fvec, vec_to_enemy) last frame
 	float		target_time;			//	Amount of time continuously targeting this ship.
 
 	int		enemy_wing;				//	When picking an enemy wing, only allow to be in enemy_wing, unless == -1, in which case don't care.
 	int		attacker_objnum;
+
 	int		goal_objnum;			//	mode specific goal.  In DOCK, ship to dock with.
 	int		goal_signature;
 
@@ -481,6 +593,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.
@@ -499,7 +615,7 @@ typedef struct ai_info {
 	int		path_objnum;			//	Object of interest.  It's model contains the path.
 	int		path_goal_obj_hash;	//	Hash value of goal object when global path created.
 	fix		path_next_create_time;	//	Next time at which we'll create a global path.
-	vector	path_create_pos;		//	Object's position at time of global path creation.
+	vec3d	path_create_pos;		//	Object's position at time of global path creation.
 	matrix	path_create_orient;	//	Object's orientation at time of global path creation.
 	int		mp_index;				//	Model path index.  Index in polymodel:model_paths
 	fix		path_next_check_time;	//	Last time checked to see if would collide with model.
@@ -520,7 +636,7 @@ typedef struct ai_info {
 	int		active_goal;			//	index of active goal, -1 if none, AI_ACTIVE_GOAL_DYNAMIC if dynamic (runtime-created) goal
 	int		goal_check_time;		// timer used for processing goals for this ai object
 
-	vector	last_predicted_enemy_pos;		//	Where he thought enemy was last time.
+	vec3d	last_predicted_enemy_pos;		//	Where he thought enemy was last time.
 	float		time_enemy_in_range;				//	Amount of time enemy continuously in "sight", near crosshair.
 	fix		last_attack_time;					//	Missiontime of last time this ship attacked its enemy.
 	fix		last_hit_time;						//	Missiontime of last time this ship was hit by anyone.
@@ -531,8 +647,8 @@ typedef struct ai_info {
 	fix		resume_goal_time;					//	Time at which to resume interrupted goal, if nothing else intervenes.
 	float		prev_accel;							//	Acceleration last frame.
 	float		prev_dot_to_goal;					//	dot of fvec to goal last frame, used to see if making progress towards goal.
-	vector	goal_point;							//	Used in AIM_SAFETY, AIM_STILL and in circling.
-	vector	prev_goal_point;					//	Previous location of goal point, used at least for evading.
+	vec3d	goal_point;							//	Used in AIM_SAFETY, AIM_STILL and in circling.
+	vec3d	prev_goal_point;					//	Previous location of goal point, used at least for evading.
 	float		ai_accuracy, ai_evasion, ai_courage, ai_patience;
 	union {
 	float		lead_scale;							//	Amount to lead current opponent by.
@@ -547,15 +663,15 @@ typedef struct ai_info {
 
 //	ship_subsys	*targeted_subobject;			//	subsystem to attack
 //	int		attack_subsystem_parent;		//	objnum of the object containing the attack_subsystem
-	int		dock_index;							// index of docking point to use when docking.
-	int		dockee_index;						//	index of dock point on other ship.
-	int		dock_path_index;					// index of docking path to use when docking.
-	int		dock_objnum;						// objnum of ship we are docked with.
-	int		dock_signature;					//	Signature of repair object.
+
+	// Goober5000
+	int		support_ship_objnum;			// objnum of support ship docking with us, or (if we're a support ship) object we're docking to
+	int		support_ship_signature;			// signature of the same
+
 	int		danger_weapon_objnum;			//	Closest objnum of weapon fired at this ship.
 	int		danger_weapon_signature;		//	Signature of object danger_weapon_objnum.
 
-	vector	guard_vec;							//	vector to object being guarded, only used in AIS_GUARD_STATIC submode
+	vec3d	guard_vec;							//	vector to object being guarded, only used in AIS_GUARD_STATIC submode
 	int		nearest_locked_object;			//	Nearest locked object.
 	float		nearest_locked_distance;		//	Distance to nearest locked object.
 
@@ -594,19 +710,19 @@ typedef struct ai_info {
 	int		ok_to_target_timestamp;			//	Time at which this ship can dynamically target.
 
 	float		kamikaze_damage;					// some damage value used to produce a shockwave from a kamikaze ship
-	vector	big_attack_point;					//	Global point this ship is attacking on a big ship.
-	vector	big_attack_surface_normal;		// Surface normal at ship at big_attack_point;
+	vec3d	big_attack_point;					//	Global point this ship is attacking on a big ship.
+	vec3d	big_attack_surface_normal;		// Surface normal at ship at big_attack_point;
 	int		pick_big_attack_point_timestamp; //	timestamp at which to pick a new point to attack on a big ship.
 
 	//	Note: These three avoid_XX terms are shared between the code that avoids small (only player now) and large ships
 	//	The bits in ai_flags determine which is occurring.  AIF_AVOID_SMALL_SHIP, AIF_AVOID_BIG_SHIP
 	int		avoid_ship_num;					//	object index of small ship to avoid
-	vector	avoid_goal_point;					//	point to aim at when avoiding a ship
+	vec3d	avoid_goal_point;					//	point to aim at when avoiding a ship
 	fix		avoid_check_timestamp;			//	timestamp at which to next check for having to avoid ship
 
-	vector	big_collision_normal;			// Global normal of collision with big ship.  Helps find direction to fly away from big ship.  Set for each collision.
-	vector	big_recover_pos_1;				//	Global point to fly towards when recovering from collision with a big ship, stage 1.
-	vector	big_recover_pos_2;				//	Global point to fly towards when recovering from collision with a big ship, stage 2.
+	vec3d	big_collision_normal;			// Global normal of collision with big ship.  Helps find direction to fly away from big ship.  Set for each collision.
+	vec3d	big_recover_pos_1;				//	Global point to fly towards when recovering from collision with a big ship, stage 1.
+	vec3d	big_recover_pos_2;				//	Global point to fly towards when recovering from collision with a big ship, stage 2.
 	int		big_recover_timestamp;			//	timestamp at which it's OK to re-enter stage 1.
 
 	int		abort_rearm_timestamp;			//	time at which this rearm should be aborted in a multiplayer game.
@@ -615,7 +731,7 @@ typedef struct ai_info {
 	int		artillery_objnum;					// object currently being targeted for artillery lock/attack
 	int		artillery_sig;						// artillery object signature
 	float		artillery_lock_time;				// how long we've been locked onto this guy
-	vector	artillery_lock_pos;				// base position of the lock point on (in model's frame of reference)
+	vec3d	artillery_lock_pos;				// base position of the lock point on (in model's frame of reference)
 	float		lethality;							// measure of how dangerous ship is to enemy BIG|HUGE ships (likelyhood of targeting)
 } ai_info;
 
@@ -630,7 +746,6 @@ typedef struct ai_info {
 #define MAX_BURST_DAMAGE	20		// max damage that can be done in BURST_DURATION
 #define BURST_DURATION		500	// decay time over which Player->damage_this_burst falls from MAX_BURST_DAMAGE to 0
 
-extern int Mission_all_attack;	//	!0 means all teams attack all teams.
 extern int Total_goal_ship_names;
 extern char Goal_ship_names[MAX_GOAL_SHIP_NAMES][NAME_LENGTH];
 
@@ -644,14 +759,13 @@ extern ai_info *Player_ai;
 
 extern int Waypoints_created;	// externed since needed for save/restore
 
-extern ai_class Ai_classes[];
-extern char *Ai_class_names[];
+extern ai_class *Ai_classes;
+extern char** Ai_class_names;
 
 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
@@ -679,22 +793,19 @@ 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_attack_object(object *attacker, object *attacked, int priority, ship_subsys *ssp);
 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_ignore_object(object *ignorer, object *ignored, int priority, int ignore_new);
 extern void ai_ignore_wing(object *ignorer, int wingnum, int priority);
-extern void ai_dock_with_object(object *docker, object *dockee, int priority, int dock_type, int docker_index, int dockee_index);
-extern void ai_stay_still(object *still_objp, vector *view_pos);
+extern void ai_dock_with_object(object *docker, int docker_index, object *dockee, int dockee_index, int priority, 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);
 extern void ai_start_waypoints(object *objp, int waypoint_list_index, int wp_flags);
-extern void ai_ship_hit(object *objp_ship, object *hit_objp, vector *hitpos, int shield_quadrant, vector *hit_normal);
+extern void ai_ship_hit(object *objp_ship, object *hit_objp, vec3d *hitpos, int quadrant_num, vec3d *hit_normal);
 extern void ai_ship_destroy(int shipnum, int method);
-extern void ai_turn_towards_vector(vector *dest, object *objp, float frametime, float turn_time, vector *slide_vec, vector *rel_pos, float bank_override, int flags, vector *rvec = NULL);
+extern void ai_turn_towards_vector(vec3d *dest, object *objp, float frametime, float turn_time, vec3d *slide_vec, vec3d *rel_pos, float bank_override, int flags, vec3d *rvec = NULL, int sexp_flags = 0);
 extern void init_ai_object(int objnum);
 extern void ai_init(void);				//	Call this one to parse ai.tbl.
 extern void ai_level_init(void);		//	Call before each level to reset AI
@@ -703,29 +814,27 @@ extern int ai_set_attack_subsystem(object *objp, int subnum);
 extern int ai_issue_rearm_request(object *requester_objp);		//	Object requests rearm/repair.
 extern int ai_abort_rearm_request(object *requester_objp);		//	Object aborts rearm/repair.
 extern void ai_do_repair_frame(object *objp, ai_info *aip, float frametime);		//	Repair a ship object, player or AI.
-extern float dock_orient_and_approach(object *objp, object *dobjp, int dock_mode);	//	Move to a position relative to a dock bay using thrusters.
 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( vector *result_pos, object *leader_objp, int wing_index, int formation_object_flag);
+extern void get_absolute_wing_pos( 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, vector *vp);
+extern void ai_warp_out(object *objp, vec3d *vp);
 extern void ai_attack_wing(object *attacker, int wingnum, int priority);
 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.
-extern object *ai_find_docked_object( object *objp );	// returns object that objp is docked to
 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, object *goal_objp, int priority, int docker_index, int dockee_index );
+extern void ai_rearm_repair( object *objp, int docker_index, object *goal_objp, int dockee_index, int priority );
 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);
 
@@ -733,15 +842,15 @@ 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, vector *pos, vector *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, vector *player_pos, vector *enemy_pos);
+extern void ai_set_positions(object *pl_objp, object *en_objp, ai_info *aip, vec3d *player_pos, vec3d *enemy_pos);
 extern void accelerate_ship(ai_info *aip, float accel);
-extern void turn_away_from_point(object *objp, vector *point, float bank_override);
+extern void turn_away_from_point(object *objp, vec3d *point, float bank_override);
 extern float ai_endangered_by_weapon(ai_info *aip);
-extern void update_aspect_lock_information(ai_info *aip, vector *vec_to_enemy, float dist_to_enemy, float enemy_radius);
+extern void update_aspect_lock_information(ai_info *aip, vec3d *vec_to_enemy, float dist_to_enemy, float enemy_radius);
 extern void ai_chase_ct();
 extern void ai_find_path(object *pl_objp, int objnum, int path_num, int exit_flag, int subsys_path=0);
 extern float ai_path();
@@ -750,22 +859,21 @@ extern int might_collide_with_ship(object *obj1, object *obj2, float dot_to_enem
 extern int ai_fire_primary_weapon(object *objp);	//changed to return weather it fired-Bobboau
 extern int ai_fire_secondary_weapon(object *objp, int priority1 = -1, int priority2 = -1);
 extern float ai_get_weapon_dist(ship_weapon *swp);
-extern void turn_towards_point(object *objp, vector *point, vector *slide_vec, float bank_override);
+extern void turn_towards_point(object *objp, vec3d *point, vec3d *slide_vec, float bank_override);
 extern int ai_maybe_fire_afterburner(object *objp, ai_info *aip);
-extern void set_predicted_enemy_pos(vector *predicted_enemy_pos, object *pobjp, object *eobjp, 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(vector *predicted_enemy_pos, vector *gun_pos, object *pobjp, vector *enemy_pos, vector *enemy_vel, float weapon_speed, float time_enemy_in_range);
-void ai_turret_select_default_weapon(ship_subsys *turret);
+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);
 
 // function to change rearm status for ai ships (called from sexpression code)
 extern void ai_set_rearm_status( int team, int new_status );
 extern void ai_good_secondary_time( int team, int weapon_index, int num_weapons, char *shipname );
 
-extern void ai_do_objects_docked_stuff( object *docker, object *dockee );
+extern void ai_do_objects_docked_stuff(object *docker, int docker_point, object *dockee, int dockee_point);
 extern void ai_do_objects_undocked_stuff( object *docker, object *dockee );
 extern void ai_do_objects_repairing_stuff( object *repaired_obj, object *repair_obj, int how );
 
@@ -774,9 +882,16 @@ 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);
 
+// added by kazan
+void ai_start_fly_to_ship(object *objp, int shipnum);
+void ai_fly_to_ship();
+
+//Moved declaration here for player ship -WMC
+void process_subobjects(int objnum);
+
 #endif

code/ai/ai_profiles.cpp

@@ -0,0 +1,397 @@
+/*
+ * 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.22 $
+ * $Date: 2007-09-02 02:10:23 $
+ * $Author: Goober5000 $
+ *
+ * $Log: not supported by cvs2svn $
+ * Revision 1.21  2007/07/19 03:19:32  turey
+ * Made Backslash's change to dampening tied to an ai_profiles flag, as it does affect
+ *  retail behavior, and significantly affects gameplay in the BtRL Demo.
+ * Also, fixed a typo.
+ *
+ * Revision 1.20  2007/07/15 02:45:17  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.19  2007/02/27 01:44:48  Goober5000
+ * add two features for WCS: specifyable shield/weapon recharge rates, and removal of linked fire penalty
+ *
+ * Revision 1.18  2006/12/28 00:59:18  wmcoolmon
+ * WMC codebase commit. See pre-commit build thread for details on changes.
+ *
+ * Revision 1.17  2006/09/11 06:49:38  taylor
+ * fixes for stuff_string() bounds checking
+ *
+ * Revision 1.16  2006/07/12 04:59:03  taylor
+ * fix the endless-loop fix ;)  (this is what broke shield recharging btw)
+ *
+ * Revision 1.15  2006/07/06 18:19:59  Goober5000
+ * fix dumb endless loop bug
+ * --Goober5000
+ *
+ * Revision 1.14  2006/07/02 03:39:55  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);
+
+	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("$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);
+
+			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, "$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);
+
+			// 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");
+
+	// 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_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;
+}

code/ai/ai_profiles.h

@@ -0,0 +1,132 @@
+/*
+ * 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.9 $
+ * $Date: 2007-07-28 22:04:46 $
+ * $Author: Goober5000 $
+ *
+ * $Log: not supported by cvs2svn $
+ * Revision 1.8  2007/07/19 03:19:32  turey
+ * Made Backslash's change to dampening tied to an ai_profiles flag, as it does affect
+ *  retail behavior, and significantly affects gameplay in the BtRL Demo.
+ * Also, fixed a typo.
+ *
+ * Revision 1.7  2007/07/15 02:45:17  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.6  2007/02/27 01:44:48  Goober5000
+ * add two features for WCS: specifyable shield/weapon recharge rates, and removal of linked fire penalty
+ *
+ * Revision 1.5  2006/07/02 03:39:55  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 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];
+
+} 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

code/ai/aibig.cpp

@@ -9,15 +9,102 @@
 
 /*
  * $Logfile: /Freespace2/code/Ship/AiBig.cpp $
- * $Revision: 2.3 $
- * $Date: 2003-01-15 07:09:09 $
+ * $Revision: 1.14 $
+ * $Date: 2007-07-15 04:19:24 $
  * $Author: Goober5000 $
  *
  * C module for AI code related to large ships
  *
  * $Log: not supported by cvs2svn $
+ * Revision 1.13  2007/02/20 04:20:10  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
+ *
+ * Revision 1.4  2005/07/25 05:23:33  Goober5000
+ * whoops
+ * --Goober5000
+ *
+ * Revision 1.3  2005/07/25 03:13:23  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
+ * have to to review)
+ * --Goober5000
+ *
+ * Revision 1.2  2005/04/05 05:53:13  taylor
+ * s/vector/vec3d/g, better support for different compilers (Jens Granseuer)
+ *
+ * Revision 1.1  2005/03/25 06:45:12  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.
+ *
+ * Revision 2.12  2005/03/10 08:00:14  taylor
+ * change min/max to MIN/MAX to fix GCC problems
+ * add lab stuff to Makefile
+ * build unbreakage for everything that's not MSVC++ 6
+ * lots of warning fixes
+ * fix OpenGL rendering problem with ship insignias
+ * no Warnings() in non-debug mode for Linux (like Windows)
+ * some campaign savefile fixage to stop reverting everyones data
+ *
+ * Revision 2.11  2004/11/27 10:49:14  taylor
+ * make sure the old behavior still applies to everything that's not a beam
+ *
+ * Revision 2.10  2004/07/26 20:47:50  Kazan
+ * remove MCD complete
+ *
+ * Revision 2.9  2004/07/12 16:33:04  Kazan
+ * MCD - define _MCD_CHECK to use memory tracking
+ *
+ * Revision 2.8  2004/03/05 09:01:51  Goober5000
+ * Uber pass at reducing #includes
+ * --Goober5000
+ *
+ * Revision 2.7  2003/11/11 02:15:40  Goober5000
+ * ubercommit - basically spelling and language fixes with some additional
+ * warnings disabled
+ * --Goober5000
+ *
+ * Revision 2.6  2003/06/25 03:16:32  phreak
+ * changed around ai code to take into account a limited lock range for local ssms
+ *
+ * Revision 2.5  2003/06/11 03:03:16  phreak
+ * the ai can now use local ssms. they are able to use them at *very* long range
+ *
+ * Revision 2.4  2003/03/20 08:24:45  unknownplayer
+ * Modified the command line options so they are all in lower-case characters.
+ * Made a slight AI adjustment to how ships choose to attack turrets (they now have a 25% chance of attacking a beam turret which has fired at them from another ship)
+ *
+ * Revision 2.3  2003/01/15 07:09:09  Goober5000
+ * changed most references to modelnum to use ship instead of ship_info --
+ * this will help with the change-model sexp and any other instances of model
+ * changing
+ * --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 sheild 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
@@ -343,38 +430,18 @@
  * $NoKeywords: $
  */
 
-#include "globalincs/pstypes.h"
-#include "math/fix.h"
+#include "ai/aibig.h"
 #include "globalincs/linklist.h"
 #include "object/object.h"
-#include "physics/physics.h"
-#include "math/vecmat.h"
 #include "ship/ship.h"
-#include "model/model.h"
-#include "graphics/2d.h"
-#include "render/3d.h"
-#include "ship/ai.h"
-#include "ship/aibig.h"
-#include "math/floating.h"
-#include "playerman/player.h"
+#include "ship/afterburner.h"
 #include "freespace2/freespace.h"
 #include "weapon/weapon.h"
-#include "mission/missiongoals.h"
-#include "mission/missionlog.h"
 #include "io/timer.h"
-#include "sound/sound.h"
-#include "ship/aigoals.h"
-#include "gamesnd/gamesnd.h"
-#include "hud/hudmessage.h"
-#include "mission/missionmessage.h"
-#include "cmeasure/cmeasure.h"
-#include "math/staticrand.h"
-#include "network/multimsgs.h"
-#include "ship/afterburner.h"
-#include "hud/hudets.h"
-#include "ship/shipfx.h"
-#include "ship/shiphit.h"
 #include "mission/missionparse.h"
+#include "iff_defs/iff_defs.h"
+
+
 
 #pragma optimize("", off)
 #pragma auto_inline(off)
@@ -407,13 +474,13 @@
 
 // forward declarations
 void	ai_big_evade_ship();
-void	ai_big_chase_attack(ai_info *aip, ship_info *sip, vector *enemy_pos, float dist_to_enemy, int modelnum);
+void	ai_big_chase_attack(ai_info *aip, ship_info *sip, vec3d *enemy_pos, float dist_to_enemy, int modelnum);
 void	ai_big_avoid_ship();
 int	ai_big_maybe_follow_subsys_path(int do_dot_check=1);
 
-extern int model_which_octant_distant_many( vector *pnt, int model_num,matrix *model_orient, vector * model_pos, polymodel **pm, int *octs);
-extern void compute_desired_rvec(vector *rvec, vector *goal_pos, vector *cur_pos);
-extern void big_ship_collide_recover_start(object *objp, object *big_objp, vector *collide_pos, vector *collision_normal);
+extern int model_which_octant_distant_many( vec3d *pnt, int model_num,matrix *model_orient, vec3d * model_pos, polymodel **pm, int *octs);
+extern void compute_desired_rvec(vec3d *rvec, vec3d *goal_pos, vec3d *cur_pos);
+extern void big_ship_collide_recover_start(object *objp, object *big_objp, vec3d *collide_pos, vec3d *collision_normal);
 
 
 //	Called by ai_big_pick_attack_point.
@@ -421,20 +488,21 @@ extern void big_ship_collide_recover_start(object *objp, object *big_objp, vecto
 //	If truly_random flag set (haha), then generate a pretty random number.  Otherwise, generate a static rand which
 //	tends to not change from frame to frame.
 //	Try four times and choose nearest point to increase chance of getting a good point.
-void ai_bpap(object *objp, vector *attacker_objp_pos, vector *attacker_objp_fvec, vector *attack_point, vector *local_attack_point, float fov, float weapon_travel_dist, vector *surface_normal)
+void ai_bpap(object *objp, vec3d *attacker_objp_pos, vec3d *attacker_objp_fvec, vec3d *attack_point, vec3d *local_attack_point, float fov, float weapon_travel_dist, vec3d *surface_normal)
 {
 	float		nearest_dist;
-	vector	result_point, best_point;
-	vector	rel_point;
+	vec3d	result_point, best_point;
+	vec3d	rel_point;
 	int		num_tries;
 	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);
 
@@ -465,7 +533,7 @@ void ai_bpap(object *objp, vector *attacker_objp_pos, vector *attacker_objp_fvec
 			for (i=0; i<num_tries; i++) {
 				int	index;
 				float	dist, dot;
-				vector	v2p;
+				vec3d	v2p;
 
 				index = (int) (frand() * (octp->nverts));
 
@@ -498,7 +566,7 @@ done_1:
 	// If no collision, cast to (0,0,0) [center of big ship]**  [best_point initialized to 000]
 
 	// do in world coords to get attack point, then translate to local for local_attack_point
-	vector attack_dir, end_point, temp;
+	vec3d attack_dir, end_point, temp;
 	float dist;
 	dist = vm_vec_normalized_dir(&attack_dir, attack_point, attacker_objp_pos);
 
@@ -509,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;
@@ -539,14 +607,14 @@ done_1:
 //
 //	Note: Default value for fov is 1.0f  1.0f means don't use fov parameter.
 //	If fov != 1.0f, try up to four times to find a point that's in the field of view.
-void ai_big_pick_attack_point_turret(object *objp, ship_subsys *ssp, vector *gpos, vector *gvec, vector *attack_point, float fov, float weapon_travel_dist)
+void ai_big_pick_attack_point_turret(object *objp, ship_subsys *ssp, vec3d *gpos, vec3d *gvec, vec3d *attack_point, float fov, float weapon_travel_dist)
 {
 	if (!timestamp_elapsed(ssp->turret_pick_big_attack_point_timestamp)) {
-		vector	result_point;
+		vec3d	result_point;
 		vm_vec_unrotate(&result_point, &ssp->turret_big_attack_point, &objp->orient);
 		vm_vec_add(attack_point, &result_point, &objp->pos);
 	} else {
-		vector	local_attack_point;
+		vec3d	local_attack_point;
 		ssp->turret_pick_big_attack_point_timestamp = timestamp(2000 + (int) (frand()*500.0f));
 		ai_bpap(objp, gpos, gvec, attack_point, &local_attack_point, fov, weapon_travel_dist, NULL);
 		ssp->turret_big_attack_point = local_attack_point;
@@ -559,19 +627,19 @@ void ai_big_pick_attack_point_turret(object *objp, ship_subsys *ssp, vector *gpo
 //	Note: Default value for fov is 1.0f  1.0f means don't use fov parameter.
 //	If fov != 1.0f, try up to four times to find a point that's in the field of view.
 //	Note, attacker_objp can be a ship or a weapon.
-void ai_big_pick_attack_point(object *objp, object *attacker_objp, vector *attack_point, float fov)
+void ai_big_pick_attack_point(object *objp, object *attacker_objp, vec3d *attack_point, float fov)
 {
 	Assert(objp->instance > -1);
 	Assert(objp->type == OBJ_SHIP);
 
-	vector	local_attack_point;
+	vec3d	local_attack_point;
 
 	switch (attacker_objp->type) {
 	case OBJ_SHIP: {
 		ai_info	*attacker_aip;
 		attacker_aip = &Ai_info[Ships[attacker_objp->instance].ai_index];
 		if (!timestamp_elapsed(attacker_aip->pick_big_attack_point_timestamp)) {
-			vector	result_point;
+			vec3d	result_point;
 
 			vm_vec_unrotate(&result_point, &attacker_aip->big_attack_point, &objp->orient);
 			vm_vec_add(attack_point, &result_point, &objp->pos);
@@ -586,7 +654,7 @@ void ai_big_pick_attack_point(object *objp, object *attacker_objp, vector *attac
 		weapon	*wp = &Weapons[attacker_objp->instance];
 
 		if (!timestamp_elapsed(wp->pick_big_attack_point_timestamp)) {
-			vector	result_point;
+			vec3d	result_point;
 
 			vm_vec_unrotate(&result_point, &wp->big_attack_point, &objp->orient);
 			vm_vec_add(attack_point, &result_point, &objp->pos);
@@ -600,7 +668,7 @@ void ai_big_pick_attack_point(object *objp, object *attacker_objp, vector *attac
 	}
 
 	// checks valid line to target
-	vector surface_normal;
+	vec3d surface_normal;
 	ai_bpap(objp, &attacker_objp->pos, &attacker_objp->orient.vec.fvec, attack_point, &local_attack_point, fov, 99999.9f, &surface_normal);
 
 	switch (attacker_objp->type) {
@@ -630,11 +698,11 @@ void ai_big_pick_attack_point(object *objp, object *attacker_objp, vector *attac
 // Handler for SM_EVADE submode ( called from ai_big_chase() )
 void ai_big_evade_ship()
 {
-	vector	player_pos, enemy_pos;
+	vec3d	player_pos, enemy_pos;
 	float		dist;
 	ship		*shipp = &Ships[Pl_objp->instance];
 	ai_info	*aip = &Ai_info[shipp->ai_index];
-	vector	randvec, semi_enemy_pos;
+	vec3d	randvec, semi_enemy_pos;
 
 	ai_set_positions(Pl_objp, En_objp, aip, &player_pos, &enemy_pos);
 
@@ -651,7 +719,7 @@ void ai_big_evade_ship()
 	turn_away_from_point(Pl_objp, &semi_enemy_pos, 0.0f);
 
 	float box_dist;
-	vector box_vec;
+	vec3d box_vec;
 	int is_inside;
 	box_dist = get_world_closest_box_point_with_delta(&box_vec, En_objp, &player_pos, &is_inside, EVADE_BOX_BASE_DISTANCE);
 	if (box_dist > EVADE_BOX_BASE_DISTANCE) {
@@ -711,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
@@ -720,14 +788,14 @@ int ai_big_maybe_follow_subsys_path(int do_dot_check)
 		// only check for subsystem sight every N milliseconds
 		checked_sight = 0;
 		if ( timestamp_elapsed(aip->path_subsystem_next_check) ) {
-			vector		geye, gsubpos;
+			vec3d		geye, gsubpos;
 			eye			*ep;
 
 			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);
@@ -737,7 +805,7 @@ int ai_big_maybe_follow_subsys_path(int do_dot_check)
 
 			// Calc dot between subsys normal (based on using path info), and subsys_to_eye vector.  This is
 			// useful later when we want to decide whether we have a realistic line-of-sight to the subsystem.
-			vector subsys_normal, subsys_to_eye;
+			vec3d subsys_normal, subsys_to_eye;
 			if ( do_dot_check ) {
 				if ( !ship_return_subsys_path_normal(&Ships[target_objp->instance], aip->targeted_subsys, &gsubpos, &subsys_normal) ) {
 					vm_vec_normalized_dir(&subsys_to_eye, &geye, &gsubpos);
@@ -806,6 +874,7 @@ int ai_big_maybe_follow_subsys_path(int do_dot_check)
 							aip->previous_mode = aip->mode;
 							aip->mode = AIM_NONE;
 							aip->submode = -1;
+							aip->submode_start_time = Missiontime;
 							return 1;
 						}
 						ai_path();
@@ -848,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 ) {
@@ -865,7 +934,7 @@ int ai_big_maybe_start_strafe(ai_info *aip, ship_info *sip)
 }
 
 //	ATTACK submode handler for chase mode.
-void ai_big_chase_attack(ai_info *aip, ship_info *sip, vector *enemy_pos, float dist_to_enemy, int modelnum)
+void ai_big_chase_attack(ai_info *aip, ship_info *sip, vec3d *enemy_pos, float dist_to_enemy, int modelnum)
 {
 	int		start_bank;
 	float		dot_to_enemy, time_to_hit;
@@ -881,9 +950,9 @@ void ai_big_chase_attack(ai_info *aip, ship_info *sip, vector *enemy_pos, float
 		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) {
-						vector	in_vec;
+						vec3d	in_vec;
 						float		dist;
 
 						vm_vec_sub(&in_vec, &objp->pos, &Pl_objp->pos);
@@ -922,7 +991,7 @@ void ai_big_chase_attack(ai_info *aip, ship_info *sip, vector *enemy_pos, float
 			return;
 		}
 
-		vector	*rel_pos, vec_to_enemy;
+		vec3d	*rel_pos, vec_to_enemy;
 		float		weapon_travel_dist;
 
 		start_bank = Ships[aip->shipnum].weapons.current_primary_bank;
@@ -935,7 +1004,7 @@ void ai_big_chase_attack(ai_info *aip, ship_info *sip, vector *enemy_pos, float
 		dist_to_enemy = vm_vec_normalized_dir(&vec_to_enemy, enemy_pos, &Pl_objp->pos);
 		dot_to_enemy = vm_vec_dot(&vec_to_enemy, &Pl_objp->orient.vec.fvec);
 
-		vector	rvec_vec, *rvec = &rvec_vec;
+		vec3d	rvec_vec, *rvec = &rvec_vec;
 
 		if (dist_to_enemy > 500.0f)
 			compute_desired_rvec(rvec, enemy_pos, &Pl_objp->pos);
@@ -952,7 +1021,7 @@ void ai_big_chase_attack(ai_info *aip, ship_info *sip, vector *enemy_pos, float
 				accelerate_ship(aip, 1.0f);
 			else {
 				// AL 12-31-97: Move at least as quickly as your target is moving...
-				accelerate_ship(aip, max(1.0f - dot_to_enemy, Objects[aip->target_objnum].phys_info.fspeed/sip->max_speed));
+				accelerate_ship(aip, MAX(1.0f - dot_to_enemy, Objects[aip->target_objnum].phys_info.fspeed/sip->max_speed));
 			}
 
 		} else {
@@ -990,7 +1059,7 @@ void ai_big_chase_ct()
 extern void ai_select_secondary_weapon(object *objp, ship_weapon *swp, int priority1 = -1, int priority2 = -1);
 extern float set_secondary_fire_delay(ai_info *aip, ship *shipp, weapon_info *swip);
 extern void ai_choose_secondary_weapon(object *objp, ai_info *aip, object *en_objp);
-extern int maybe_avoid_big_ship(object *objp, object *ignore_objp, ai_info *aip, vector *goal_point, float delta_time);
+extern int maybe_avoid_big_ship(object *objp, object *ignore_objp, ai_info *aip, vec3d *goal_point, float delta_time);
 
 extern void maybe_cheat_fire_synaptic(object *objp, ai_info *aip);
 
@@ -999,7 +1068,7 @@ extern void maybe_cheat_fire_synaptic(object *objp, ai_info *aip);
 // dist_to_enemy	=>		distance (in m) to attack point on current target
 // dot_to_enemy	=>		dot product between fvec of Pl_objp and vector from Pl_objp to attack point
 //
-void ai_big_maybe_fire_weapons(float dist_to_enemy, float dot_to_enemy, vector *firing_pos, vector *enemy_pos, vector *enemy_vel)
+void ai_big_maybe_fire_weapons(float dist_to_enemy, float dot_to_enemy, vec3d *firing_pos, vec3d *enemy_pos, vec3d *enemy_vel)
 {
 	ai_info		*aip;
 	ship_weapon	*swp;
@@ -1008,12 +1077,12 @@ void ai_big_maybe_fire_weapons(float dist_to_enemy, float dot_to_enemy, vector *
 	aip = &Ai_info[Ships[Pl_objp->instance].ai_index];
 	swp = &Ships[Pl_objp->instance].weapons;
 
-	if (dot_to_enemy > 0.95f - 0.5f * En_objp->radius/max(1.0f, En_objp->radius + dist_to_enemy)) {
+	if (dot_to_enemy > 0.95f - 0.5f * En_objp->radius/MAX(1.0f, En_objp->radius + dist_to_enemy)) {
 		aip->time_enemy_in_range += flFrametime;
 		
 		//	Chance of hitting ship is based on dot product of firing ship's forward vector with vector to ship
 		//	and also the size of the target relative to distance to target.
-		if (dot_to_enemy > max(0.5f, 0.90f + aip->ai_accuracy/10.0f - En_objp->radius/max(1.0f,dist_to_enemy))) {
+		if (dot_to_enemy > MAX(0.5f, 0.90f + aip->ai_accuracy/10.0f - En_objp->radius/MAX(1.0f,dist_to_enemy))) {
 
 			ship *temp_shipp;
 			temp_shipp = &Ships[Pl_objp->instance];
@@ -1023,7 +1092,7 @@ void ai_big_maybe_fire_weapons(float dist_to_enemy, float dot_to_enemy, vector *
 				Assert(tswp->current_primary_bank < tswp->num_primary_banks);
 				weapon_info	*wip = &Weapon_info[tswp->primary_bank_weapons[tswp->current_primary_bank]];
 
-				if (dist_to_enemy < wip->max_speed * wip->lifetime){
+				if (dist_to_enemy < MIN((wip->max_speed * wip->lifetime), wip->weapon_range)){
 					has_fired = 1;
 					if(! ai_fire_primary_weapon(Pl_objp)){
 						has_fired = -1;
@@ -1058,8 +1127,11 @@ void ai_big_maybe_fire_weapons(float dist_to_enemy, float dot_to_enemy, vector *
 						}
 
 						if (timestamp_elapsed(swp->next_secondary_fire_stamp[current_bank])) {
-
-							float firing_range = swip->max_speed * swip->lifetime;
+							float firing_range;
+							if (swip->wi_flags2 & WIF2_LOCAL_SSM)
+								firing_range=swip->lssm_lock_range;
+							else
+								firing_range = MIN((swip->max_speed * swip->lifetime), swip->weapon_range);
 							// reduce firing range of secondaries in nebula
 							extern int Nebula_sec_range;
 							if ((The_mission.flags & MISSION_FLAG_FULLNEB) && Nebula_sec_range) {
@@ -1109,18 +1181,18 @@ void ai_big_switch_to_chase_mode(ai_info *aip)
 	aip->submode_start_time = Missiontime;
 }
 
-extern int ai_big_strafe_maybe_retreat(float dist, vector *target_pos);
+extern int ai_big_strafe_maybe_retreat(float dist, vec3d *target_pos);
 
 // Make object Pl_objp chase object En_objp, which is a big ship, not a small ship.
 void ai_big_chase()
 {
 	float			dist_to_enemy, dot_to_enemy;
-	vector		player_pos, enemy_pos, vec_to_enemy;
+	vec3d		player_pos, enemy_pos, vec_to_enemy;
 	ship_info	*sip = &Ship_info[Ships[Pl_objp->instance].ship_info_index];
 	ship			*shipp = &Ships[Pl_objp->instance];	
 	ai_info		*aip = &Ai_info[shipp->ai_index];
 	int			enemy_ship_type;
-	vector		predicted_enemy_pos;
+	vec3d		predicted_enemy_pos;
 
 	Assert(aip->mode == AIM_CHASE);
 
@@ -1151,8 +1223,9 @@ void ai_big_chase()
 	if (aip->ai_flags & AIF_TARGET_COLLISION) {
 		if ( ai_big_strafe_maybe_retreat(dist_to_enemy, &enemy_pos) ) {
 			aip->mode = AIM_STRAFE;
-			aip->submode = AIS_STRAFE_AVOID;
 			aip->submode_parm0 = Missiontime;	// use parm0 as time strafe mode entered
+			aip->submode = AIS_STRAFE_AVOID;
+			aip->submode_start_time = Missiontime;
 			return;
 		}
 	}
@@ -1180,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;
 		}
@@ -1218,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:
@@ -1236,6 +1309,7 @@ void ai_big_chase()
 	default:
 		aip->last_attack_time = Missiontime;
 		aip->submode = SM_ATTACK;
+		aip->submode_start_time = Missiontime;
 		break;
 	}
 
@@ -1269,9 +1343,9 @@ void ai_big_chase()
 //			mprintf(("normal dist; %.1f, time: %.1f\n", dist_normal_to_enemy, time_to_enemy));
 //		}
 		
-		// since we're not in strafe and we may get a bad normal, cap dist_normal_to_enemy as min(0.3*dist_to_enemy, self)
+		// since we're not in strafe and we may get a bad normal, cap dist_normal_to_enemy as MIN(0.3*dist_to_enemy, self)
 		// this will allow us to get closer on a bad normal
-		dist_normal_to_enemy = max(0.3f*dist_to_enemy, dist_normal_to_enemy);
+		dist_normal_to_enemy = MAX(0.3f*dist_to_enemy, dist_normal_to_enemy);
 
 		if (dist_to_enemy < ATTACK_COLLIDE_BASE_DIST) {
 			// within 50m or 1sec
@@ -1292,7 +1366,7 @@ void ai_big_chase()
 				}
 			}
 
-			float speed_dist = max(0.0f, (Pl_objp->phys_info.speed-50) * 2);
+			float speed_dist = MAX(0.0f, (Pl_objp->phys_info.speed-50) * 2);
 			if ((dist_normal_to_enemy < ATTACK_COLLIDE_AVOID_DIST + speed_dist) || (time_to_enemy < ATTACK_COLLIDE_AVOID_TIME) ) {
 				// get away, simulate crsh recovery (don't use avoid)
 //				accelerate_ship(aip, -1.0f);
@@ -1351,8 +1425,8 @@ void ai_big_chase()
 		
 		if (box_dist > 300) {
 			aip->submode = SM_ATTACK;
-			aip->last_attack_time = Missiontime;
 			aip->submode_start_time = Missiontime;
+			aip->last_attack_time = Missiontime;
 		}
 		}
 		break;
@@ -1364,8 +1438,8 @@ void ai_big_chase()
 				aip->submode_start_time = Missiontime;
 			} else {
 				aip->submode = SM_ATTACK;
-				aip->last_attack_time = Missiontime;
 				aip->submode_start_time = Missiontime;
+				aip->last_attack_time = Missiontime;
 			}
 		}
 
@@ -1381,8 +1455,8 @@ void ai_big_chase()
 
 	default:
 		aip->submode = SM_ATTACK;
-		aip->last_attack_time = Missiontime;
 		aip->submode_start_time = Missiontime;
+		aip->last_attack_time = Missiontime;
 	}
 
 	//
@@ -1411,9 +1485,9 @@ void ai_big_ship(object *objp)
 // dist	=>		distance from Pl_objp front to attack point
 // dot	=>		dot of Pl_objp fvec and vector to attack point
 //	fire_pos =>	world pos from which firing
-void ai_big_attack_get_data(vector *enemy_pos, float *dist_to_enemy, float *dot_to_enemy)
+void ai_big_attack_get_data(vec3d *enemy_pos, float *dist_to_enemy, float *dot_to_enemy)
 {
-	vector		player_pos, vec_to_enemy, predicted_enemy_pos;	
+	vec3d		player_pos, vec_to_enemy, predicted_enemy_pos;	
 	ship			*shipp = &Ships[Pl_objp->instance];	
 	ai_info		*aip = &Ai_info[shipp->ai_index];
 	ship_info	*esip = &Ship_info[Ships[En_objp->instance].ship_info_index];
@@ -1448,8 +1522,8 @@ void ai_big_attack_get_data(vector *enemy_pos, float *dist_to_enemy, float *dot_
 	if ((*dot_to_enemy < 0.25f) || (aip->target_time < 1.0f) || (aip->ai_flags & AIF_SEEK_LOCK)) {
 		predicted_enemy_pos=*enemy_pos;
 	} else {
-		vector	gun_pos, pnt;
-		polymodel *po = model_get( shipp->modelnum );
+		vec3d	gun_pos, pnt;
+		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.
@@ -1470,12 +1544,12 @@ void ai_big_attack_get_data(vector *enemy_pos, float *dist_to_enemy, float *dot_
 
 // check to see if Pl_objp has gotten too close to attacking point.. if so, break off by entering
 // AIS_STRAFE_RETREAT
-int ai_big_strafe_maybe_retreat(float dist, vector *target_pos)
+int ai_big_strafe_maybe_retreat(float dist, vec3d *target_pos)
 {
 	ai_info	*aip;
 	aip = &Ai_info[Ships[Pl_objp->instance].ai_index];
 
-	vector vec_to_target;
+	vec3d vec_to_target;
 	vm_vec_sub(&vec_to_target, target_pos, &Pl_objp->pos);
 
 	float dist_to_target, dist_normal_to_target, time_to_target;
@@ -1486,11 +1560,11 @@ int ai_big_strafe_maybe_retreat(float dist, vector *target_pos)
 		dist_normal_to_target = 0.2f * vm_vec_mag_quick(&vec_to_target);
 	}
 
-	dist_normal_to_target = max(0.2f*dist_to_target, dist_normal_to_target);
+	dist_normal_to_target = MAX(0.2f*dist_to_target, dist_normal_to_target);
 	time_to_target = dist_normal_to_target / Pl_objp->phys_info.speed;
 
 	// add distance penalty for going too fast
-	float speed_to_dist_penalty = max(0.0f, (Pl_objp->phys_info.speed-50));
+	float speed_to_dist_penalty = MAX(0.0f, (Pl_objp->phys_info.speed-50));
 
 	//if ((dot_to_enemy > 1.0f - 0.1f * En_objp->radius/(dist_to_enemy + 1.0f)) && (Pl_objp->phys_info.speed > dist_to_enemy/5.0f))
 
@@ -1508,7 +1582,7 @@ int ai_big_strafe_maybe_retreat(float dist, vector *target_pos)
 
 			float box_dist;
 			int is_inside;
-			vector goal_point;
+			vec3d goal_point;
 			box_dist = get_world_closest_box_point_with_delta(&goal_point, En_objp, &Pl_objp->pos, &is_inside, STRAFE_RETREAT_BOX_DIST);
 
 			// set goal point
@@ -1530,8 +1604,8 @@ int ai_big_strafe_maybe_retreat(float dist, vector *target_pos)
 void ai_big_strafe_attack()
 {
 	ai_info	*aip;
-	vector	target_pos;
-	vector	rand_vec;
+	vec3d	target_pos;
+	vec3d	rand_vec;
 	float		target_dist, target_dot, accel, t;
 	object	*target_objp;
 
@@ -1633,7 +1707,7 @@ void ai_big_strafe_attack()
 void ai_big_strafe_avoid()
 {
 	ai_info	*aip;
-	vector	target_pos;
+	vec3d	target_pos;
 	float		target_dist, target_dot;
 	fix		mode_time;
 
@@ -1660,7 +1734,7 @@ void ai_big_strafe_retreat1()
 {
 	float dist;
 	ai_info	*aip;
-	vector	rand_vec;
+	vec3d	rand_vec;
 
 	aip = &Ai_info[Ships[Pl_objp->instance].ai_index];
 
@@ -1906,15 +1980,27 @@ void ai_big_strafe_maybe_attack_turret(object *ship_objp, object *weapon_objp)
 		return;
 	}
 
-	// Only attack turret if it sits on current target
 	Assert(weapon_objp->parent >= 0 && weapon_objp->parent < MAX_OBJECTS);
 	parent_objp = &Objects[weapon_objp->parent];
-	if ( (parent_objp->signature != weapon_objp->parent_sig) || (parent_objp->type != OBJ_SHIP) ) {
-		return;
-	}
+	
+	// UnknownPlayer : Decide whether or not this weapon was a beam, in which case it might be a good
+	// idea to go after it even if its not on the current target. This is randomized so
+	// 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.
 
-	if ( aip->target_objnum != OBJ_INDEX(parent_objp) ) {
-		return;
+	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
+	if ( !attack_turret_on_different_ship )
+	{
+		if ( (parent_objp->signature != weapon_objp->parent_sig) || (parent_objp->type != OBJ_SHIP) ) {
+			return;
+		}
+		
+		if ( aip->target_objnum != OBJ_INDEX(parent_objp) ) {
+			return;
+		}
 	}
 
 	// attack the turret

code/ai/aibig.h

@@ -9,13 +9,29 @@
 
 /*
  * $Logfile: /Freespace2/code/Ship/AiBig.h $
- * $Revision: 2.0 $
- * $Date: 2002-06-03 04:02:28 $
- * $Author: penguin $
+ * $Revision: 1.3 $
+ * $Date: 2005-07-13 02:50:48 $
+ * $Author: Goober5000 $
  *
  * Header file for AI code related to large ships
  *
  * $Log: not supported by cvs2svn $
+ * Revision 1.2  2005/04/05 05:53:13  taylor
+ * s/vector/vec3d/g, better support for different compilers (Jens Granseuer)
+ *
+ * Revision 1.1  2005/03/25 06:45:12  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.
+ *
+ * Revision 2.2  2004/08/11 05:06:34  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
+ *
+ * Revision 2.1  2004/03/05 09:01:51  Goober5000
+ * Uber pass at reducing #includes
+ * --Goober5000
+ *
+ * Revision 2.0  2002/06/03 04:02:28  penguin
+ * Warpcore CVS sync
+ *
  * Revision 1.1  2002/05/02 18:03:12  mharris
  * Initial checkin - converted filenames and includes to lower case
  *
@@ -67,10 +83,14 @@
  * $NoKeywords: $
  */
 
-
 #ifndef __AIBIG_H__
 #define __AIBIG_H__
 
+struct object;
+struct ai_info;
+struct vec3d;
+struct ship_subsys;
+
 void	ai_big_ship(object *objp);
 void	ai_big_chase();
 void	ai_big_subsys_path_cleanup(ai_info *aip);
@@ -79,8 +99,8 @@ void	ai_big_subsys_path_cleanup(ai_info *aip);
 void	ai_big_strafe();
 int	ai_big_maybe_enter_strafe_mode(object *objp, int weapon_objnum, int consider_target_only=0);
 void	ai_big_strafe_maybe_attack_turret(object *ship_objp, object *weapon_objp);
-void ai_big_pick_attack_point(object *objp, object *attacker_objp, vector *attack_point, float fov=1.0f);
-void ai_big_pick_attack_point_turret(object *objp, ship_subsys *ssp, vector *gpos, vector *gvec, vector *attack_point, float weapon_travel_dist, float fov=1.0f);
+void ai_big_pick_attack_point(object *objp, object *attacker_objp, vec3d *attack_point, float fov=1.0f);
+void ai_big_pick_attack_point_turret(object *objp, ship_subsys *ssp, vec3d *gpos, vec3d *gvec, vec3d *attack_point, float weapon_travel_dist, float fov=1.0f);
 
 
 #endif

code/ai/aigoals.h

@@ -9,13 +9,45 @@
 
 /*
  * $Logfile: /Freespace2/code/Ship/AiGoals.h $
- * $Revision: 2.3 $
- * $Date: 2003-01-07 20:06:44 $
+ * $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.
+ *
+ * Revision 2.6  2004/08/11 05:06:34  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
+ *
+ * Revision 2.5  2004/07/25 00:31:31  Kazan
+ * i have absolutely nothing to say about that subject
+ *
+ * Revision 2.4  2004/03/05 09:01:52  Goober5000
+ * Uber pass at reducing #includes
+ * --Goober5000
+ *
+ * Revision 2.3  2003/01/07 20:06:44  Goober5000
+ * added ai-chase-any-except sexp
+ * --Goober5000
+ *
  * Revision 2.2  2003/01/06 21:52:58  Goober5000
  * allowed fighters and bombers to accept the stay-near-ship and
  * keep-safe-distance orders
@@ -132,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.
@@ -150,8 +182,12 @@
 #ifndef _AIGOALS_H
 #define _AIGOALS_H
 
-#include "ship/ai.h"
-#include "cfile/cfile.h"
+#include "globalincs/globals.h"
+#include "globalincs/pstypes.h"
+
+struct wing;
+struct ai_info;
+struct ai_goal;
 
 // macros for goals which get set via sexpressions in the mission code
 
@@ -159,6 +195,7 @@
 // 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)
@@ -181,38 +218,41 @@
 #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<<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_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 )
-#define AI_GOAL_ACCEPT_BOMBER			( AI_GOAL_ACCEPT_FIGHTER )
-#define AI_GOAL_ACCEPT_STEALTH		( AI_GOAL_ACCEPT_FIGHTER )
-#define AI_GOAL_ACCEPT_TRANSPORT		( 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)
-#define AI_GOAL_ACCEPT_FREIGHTER		( AI_GOAL_ACCEPT_TRANSPORT )
-#define AI_GOAL_ACCEPT_CRUISER		( AI_GOAL_ACCEPT_FREIGHTER )
-#define AI_GOAL_ACCEPT_CORVETTE		( AI_GOAL_ACCEPT_CRUISER )
-#define AI_GOAL_ACCEPT_GAS_MINER		( AI_GOAL_ACCEPT_CRUISER )
-#define AI_GOAL_ACCEPT_AWACS			( AI_GOAL_ACCEPT_CRUISER )
-#define AI_GOAL_ACCEPT_CAPITAL		( AI_GOAL_ACCEPT_CRUISER & ~(AI_GOAL_DOCK | AI_GOAL_UNDOCK) )
-#define AI_GOAL_ACCEPT_SUPERCAP		( AI_GOAL_ACCEPT_CAPITAL )
-#define AI_GOAL_ACCEPT_SUPPORT		( 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_ACCEPT_TRANSPORT )
+//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 )
+#define AI_GOAL_ACCEPT_FREIGHTER		( AI_GOAL_FLY_TO_SHIP | AI_GOAL_ACCEPT_TRANSPORT | AI_GOAL_STAY_NEAR_SHIP )
+#define AI_GOAL_ACCEPT_CRUISER		( AI_GOAL_FLY_TO_SHIP | AI_GOAL_ACCEPT_FREIGHTER | AI_GOAL_STAY_NEAR_SHIP )
+#define AI_GOAL_ACCEPT_CORVETTE		( AI_GOAL_FLY_TO_SHIP | AI_GOAL_ACCEPT_CRUISER | AI_GOAL_STAY_NEAR_SHIP )
+#define AI_GOAL_ACCEPT_GAS_MINER		( AI_GOAL_FLY_TO_SHIP | AI_GOAL_ACCEPT_CRUISER | AI_GOAL_STAY_NEAR_SHIP )
+#define AI_GOAL_ACCEPT_AWACS			( AI_GOAL_FLY_TO_SHIP | AI_GOAL_ACCEPT_CRUISER | AI_GOAL_STAY_NEAR_SHIP )
+#define AI_GOAL_ACCEPT_CAPITAL		( AI_GOAL_FLY_TO_SHIP | AI_GOAL_ACCEPT_CRUISER & ~(AI_GOAL_DOCK | AI_GOAL_UNDOCK) | AI_GOAL_STAY_NEAR_SHIP )
+#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];
 

code/ai/aiinternal.h

@@ -0,0 +1,31 @@
+/*
+ * 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.
+ *
+*/
+
+#ifndef _AIINTERNAL_H
+#define _AIINTERNAL_H
+
+//Returns true if the specified object is a stealth ship, false if not
+bool is_object_stealth_ship(object* objp);
+
+//Number of live turrets on the object attacking
+int num_turrets_attacking(object *turret_parent, int target_objnum);
+
+//Determine whether an object is targetable within a nebula (checks for stealth)
+int object_is_targetable(object *target, ship *viewer);
+
+//Returns the number of enemy fighters within threshold of pos.
+int num_nearby_fighters(int enemy_team_mask, vec3d *pos, float threshold);
+
+//Returns true if OK for *aip to fire its current weapon at its current target.
+int check_ok_to_fire(int objnum, int target_objnum, weapon_info *wip);
+
+//Does all the stuff needed to aim and fire a turret.
+void ai_fire_from_turret(ship *shipp, ship_subsys *ss, int parent_objnum);
+
+#endif

code/anim/animplay.cpp

@@ -9,13 +9,117 @@
 
 /*
  * $Logfile: /Freespace2/code/Anim/AnimPlay.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
- * $Author: penguin $
+ * $Revision: 2.22 $
+ * $Date: 2006-12-28 00:59:19 $
+ * $Author: wmcoolmon $
  *
  * C module for playing back anim files
  *
  * $Log: not supported by cvs2svn $
+ * Revision 2.21  2006/09/11 06:45:39  taylor
+ * various small compiler warning and strict compiling fixes
+ *
+ * Revision 2.20  2006/06/27 05:07:48  taylor
+ * fix various compiler warnings and things that Valgrind complained 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
+ *
+ * Revision 2.15  2005/05/12 17:49:10  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.14  2005/01/30 12:50:08  taylor
+ * merge with Linux/OSX tree - p0130
+ *
+ * Revision 2.13  2004/12/20 20:18:30  fryday
+ * Commented out ATL dependencies (And changed one macro to an swprintf instead)
+ * Tiny change in animplay ( pow(2.0, ...) instead of pow(2, ...)) because VS2K5
+ * throws an ambiguity error over that.
+ *
+ * Revision 2.12  2004/10/09 17:58:48  taylor
+ * one more try to fix the memory leak and end-of-mission crash for talking head anis
+ *
+ * Revision 2.11  2004/07/26 20:47:23  Kazan
+ * remove MCD complete
+ *
+ * Revision 2.10  2004/07/17 18:46:06  taylor
+ * various OGL and memory leak fixes
+ *
+ * Revision 2.9  2004/07/12 16:32:41  Kazan
+ * MCD - define _MCD_CHECK to use memory tracking
+ *
+ * Revision 2.8  2004/03/05 09:01:52  Goober5000
+ * Uber pass at reducing #includes
+ * --Goober5000
+ *
+ * Revision 2.7  2004/02/16 11:47:31  randomtiger
+ * Removed a lot of files that we dont need anymore.
+ * Changed htl to be on by default, command now -nohtl
+ * Changed D3D to use a 2D vertex for 2D operations which should cut down on redundant data having to go though the system.
+ * Added small change to all -start_mission flag to take you to any mission by filename, very useful for testing.
+ * Removed old dshow code and took away timerbar compile flag condition since it uses a runtime flag now.
+ *
+ * Revision 2.6  2004/02/14 00:18:29  randomtiger
+ * Please note that from now on OGL will only run with a registry set by Launcher v4. See forum for details.
+ * OK, these changes effect a lot of file, I suggest everyone updates ASAP:
+ * Removal of many files from project.
+ * Removal of meanless Gr_bitmap_poly variable.
+ * Removal of glide, directdraw, software modules all links to them, and all code specific to those paths.
+ * Removal of redundant Fred paths that arent needed for Fred OGL.
+ * Have seriously tidied the graphics initialisation code and added generic non standard mode functionality.
+ * Fixed many D3D non standard mode bugs and brought OGL up to the same level.
+ * Removed texture section support for D3D8, voodoo 2 and 3 cards will no longer run under fs2_open in D3D, same goes for any card with a maximum texture size less than 1024.
+ *
+ * Revision 2.5  2003/12/08 22:30:02  randomtiger
+ * Put render state and other direct D3D calls repetition check back in, provides speed boost.
+ * Fixed bug that caused fullscreen only crash with DXT textures
+ * Put dithering back in for tgas and jpgs
+ *
+ * Revision 2.4  2003/11/29 10:52:08  randomtiger
+ * Turned off D3D file mapping, its using too much memory which may be hurting older systems and doesnt seem to be providing much of a speed benifit.
+ * Added stats command for ingame stats on memory usage.
+ * Trys to play intro.mve and intro.avi, just to be safe since its not set by table.
+ * Added fix for fonts wrapping round in non standard hi res modes.
+ * Changed D3D mipmapping to a good value to suit htl mode.
+ * Added new fog colour method which makes use of the bitmap, making this htl feature backcompatible again.
+ *
+ * Revision 2.3  2003/11/11 02:15:41  Goober5000
+ * ubercommit - basically spelling and language fixes with some additional
+ * warnings disabled
+ * --Goober5000
+ *
+ * Revision 2.2  2003/03/18 10:07:00  unknownplayer
+ * 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.1.2.3  2002/11/04 21:24:59  randomtiger
+ *
+ * When running in D3D all ani's are memory mapped for speed, this takes up more memory but stops gametime locking of textures which D3D8 hates.
+ * Added new command line tag Cmdline_d3dlowmem for people who dont want to make use of this because they have no memory.
+ * Cleaned up some more texture stuff enabled console debug for D3D.
+ *
+ * Revision 2.1.2.2  2002/09/28 22:13:42  randomtiger
+ * Sorted out some bits and pieces. The background nebula blends now which is nice. – RT
+ *
+ * Revision 2.1.2.1  2002/09/24 18:56:40  randomtiger
+ * DX8 branch commit
+ *
+ * This is the scub of UP's previous code with the more up to date RT code.
+ * For full details check previous dev e-mails
+ *
+ * Revision 2.1  2002/08/01 01:41:04  penguin
+ * The big include file move
+ *
  * Revision 2.0  2002/06/03 04:02:21  penguin
  * Warpcore CVS sync
  *
@@ -66,7 +170,7 @@
  * 34    4/27/98 3:36p Dave
  * 
  * 33    3/25/98 8:43p Hoffoss
- * Changed anim_play() to not be so damn complex when you try and call it.
+ * Changed anim_play() to not be so complex when you try and call it.
  * 
  * 32    2/05/98 9:21p John
  * Some new Direct3D code.   Added code to monitor a ton of stuff in the
@@ -187,10 +291,12 @@
 #include "bmpman/bmpman.h"
 #include "graphics/2d.h"
 #include "render/3d.h"
-#include "graphics/grinternal.h"
 #include "pcxutils/pcxutils.h"
 #include "anim/packunpack.h"
 #include "cfile/cfile.h"
+#include "cmdline/cmdline.h"
+
+
 
 static color Color_xparent;
 
@@ -277,7 +383,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().
@@ -363,8 +469,9 @@ anim_instance *anim_play(anim_play_struct *aps)
 	if ( anim_instance_is_streamed(instance) ) {
 		instance->file_offset = instance->parent->file_offset;
 	}
-	instance->frame = (ubyte *) malloc(instance->parent->width * instance->parent->height * 2);
+	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;
@@ -448,6 +555,7 @@ anim_instance *anim_play(anim_play_struct *aps)
 //	input:	instance		=>		pointer to animation instance
 //				frametime	=>		time elapsed since last call, in seconds
 //
+
 int anim_show_next_frame(anim_instance *instance, float frametime)
 {
 	int		bitmap_id, bitmap_flags=0, new_frame_num, frame_diff=0, i, n_frames=0,frame_save;
@@ -465,6 +573,7 @@ int anim_show_next_frame(anim_instance *instance, float frametime)
 		n_frames = instance->stop_at - instance->start_at + 1;
 	else if(instance->direction == ANIM_DIRECT_REVERSE)
 		n_frames = instance->start_at - instance->stop_at + 1;
+
 	time = n_frames / i2fl(instance->parent->fps);
 
 	percent_through = instance->time_elapsed / time;
@@ -609,12 +718,10 @@ int anim_show_next_frame(anim_instance *instance, float frametime)
 			}
 
 			ubyte *temp = NULL;
-			int temp_file_offset = 0;			
+			int temp_file_offset = -1;			
 
 			// if we're using bitmap polys
-			if(Gr_bitmap_poly){
-				BM_SELECT_TEX_FORMAT();
-			}
+			BM_SELECT_TEX_FORMAT();
 
 			if ( anim_instance_is_streamed(instance) ) {
 				if ( instance->xlate_pal ){
@@ -633,6 +740,14 @@ int anim_show_next_frame(anim_instance *instance, float frametime)
 			// always go back to screen format
 			BM_SELECT_SCREEN_FORMAT();
 
+			// see if we had an error during decode (corrupted anim stream)
+			if ( (temp == NULL) && (temp_file_offset < 0) ) {
+				mprintf(("ANI: Fatal ERROR at frame %i!!  Aborting playback of \"%s\"...\n", instance->frame_num, instance->parent->name));
+
+				// return -1 to end all playing of this anim instanc
+				return -1;
+			}
+
 			if(instance->direction == ANIM_DIRECT_FORWARD){
 				if ( anim_instance_is_streamed(instance) ) {
 					instance->file_offset = temp_file_offset;
@@ -693,9 +808,9 @@ int anim_show_next_frame(anim_instance *instance, float frametime)
 		else {
 			g3_rotate_vertex(&image_vertex,instance->world_pos);
 			Assert(instance->radius != 0.0f);
-			g3_draw_bitmap(&image_vertex, 0, instance->radius*1.5f, TMAP_FLAG_TEXTURED );
+			g3_draw_bitmap(&image_vertex, 0, instance->radius*1.5f, TMAP_FLAG_TEXTURED | TMAP_HTL_2D);
 		}
-
+									  
 		//bm_release(bitmap_id);
 		instance->last_bitmap = bitmap_id;
 	}
@@ -734,8 +849,10 @@ int anim_stop_playing(anim_instance* instance)
 void anim_release_render_instance(anim_instance* instance)
 {
 	Assert( instance != NULL );
-	Assert(instance->frame);
-	free(instance->frame);
+
+	if (instance->frame != NULL)
+		vm_free(instance->frame);
+
 	instance->frame = NULL;
 	instance->parent->instance_count--;
 
@@ -794,7 +911,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
@@ -832,7 +949,6 @@ void anim_read_header(anim *ptr, CFILE *fp)
 	}
 	
 	ptr->height = cfread_short(fp);
-
 #ifndef NDEBUG
 	// get size of ani compared to power of 2
 	int r, floor_pow;
@@ -844,7 +960,7 @@ void anim_read_header(anim *ptr, CFILE *fp)
 		floor_pow++;
 	}
 
-	int floor_size = (int) pow(2, floor_pow);
+	int floor_size = (int) pow(2.0, floor_pow);
 	int diff = ptr->height - floor_size;
 	float waste = 100.0f * float((floor_size - diff))/(2.0f *(float)floor_size);
 
@@ -856,7 +972,7 @@ void anim_read_header(anim *ptr, CFILE *fp)
 #endif
 
 	ptr->total_frames = cfread_short(fp);
-	cfread(&ptr->packer_code, 1, 1, fp);
+	ptr->packer_code = cfread_ubyte(fp);
 	cfread(&ptr->palette, 256, 3, fp);
 	ptr->num_keys = cfread_short(fp);
 
@@ -891,8 +1007,6 @@ anim *anim_load(char *real_filename, int file_mapped)
 	int			count,idx;
 	char name[_MAX_PATH];
 
-//	file_mapped = 0;
-
 	Assert ( real_filename != NULL );
 
 	strcpy( name, real_filename );
@@ -915,7 +1029,7 @@ anim *anim_load(char *real_filename, int file_mapped)
 		if ( !fp )
 			return NULL;
 
-		ptr = (anim *) malloc(sizeof(anim));
+		ptr = (anim *) vm_malloc(sizeof(anim));
 		Assert(ptr);
 
 		ptr->flags = 0;
@@ -933,7 +1047,7 @@ anim *anim_load(char *real_filename, int file_mapped)
 		anim_read_header(ptr, fp);
 
 		if(ptr->num_keys > 0){
-			ptr->keys = (key_frame*)malloc(sizeof(key_frame) * ptr->num_keys);
+			ptr->keys = (key_frame*)vm_malloc(sizeof(key_frame) * ptr->num_keys);
 			Assert(ptr->keys != NULL);
 		} 			
 
@@ -944,12 +1058,14 @@ anim *anim_load(char *real_filename, int file_mapped)
 			ptr->keys[idx].frame_num = 0;
 			cfread(&ptr->keys[idx].frame_num, 2, 1, fp);
 			cfread(&ptr->keys[idx].offset, 4, 1, fp);
+			ptr->keys[idx].frame_num = INTEL_INT( ptr->keys[idx].frame_num );
+			ptr->keys[idx].offset = INTEL_INT( ptr->keys[idx].offset );
 		}
 
 		/*prev_keyp = &ptr->keys;
 		count = ptr->num_keys;
 		while (count--) {
-			keyp = (key_frame *) malloc(sizeof(key_frame));
+			keyp = (key_frame *) vm_malloc(sizeof(key_frame));
 			keyp->next = *prev_keyp;
 			*prev_keyp = keyp;
 			prev_keyp = &keyp->next;
@@ -959,10 +1075,11 @@ anim *anim_load(char *real_filename, int file_mapped)
 			cfread(&keyp->offset, 4, 1, fp);
 		}*/
 		cfread(&count, 4, 1, fp);	// size of compressed data
+		count = INTEL_INT( count );
 
 		ptr->cfile_ptr = NULL;
 
-		if ( 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);
@@ -989,7 +1106,7 @@ anim *anim_load(char *real_filename, int file_mapped)
 			if ( ptr->flags & ANF_STREAMED ) {
 				ptr->data = NULL;
 				ptr->cache_file_offset = ptr->file_offset;
-				ptr->cache = (ubyte*)malloc(ANI_STREAM_CACHE_SIZE+2);
+				ptr->cache = (ubyte*)vm_malloc(ANI_STREAM_CACHE_SIZE+2);
 				Assert(ptr->cache);
 				cfseek(ptr->cfile_ptr, offset, CF_SEEK_SET);
 				cfread(ptr->cache, ANI_STREAM_CACHE_SIZE, 1, ptr->cfile_ptr);
@@ -1000,7 +1117,7 @@ anim *anim_load(char *real_filename, int file_mapped)
 			// Not a memory mapped file (or streamed)
 			ptr->flags &= ~ANF_MEM_MAPPED;
 			ptr->flags &= ~ANF_STREAMED;
-			ptr->data = (ubyte *) malloc(count);
+			ptr->data = (ubyte *) vm_malloc(count);
 			ptr->file_offset = -1;
 			cfread(ptr->data, count, 1, fp);
 		}
@@ -1036,7 +1153,7 @@ int anim_free(anim *ptr)
 	}
 
 	if ( !list )
-		return -1;
+		return -2;
 
 	// only free when ref_count is 0
 	ptr->ref_count--;
@@ -1048,23 +1165,27 @@ int anim_free(anim *ptr)
 		return -1;
 
 	if(ptr->keys != NULL){
-		free(ptr->keys);
+		vm_free(ptr->keys);
 		ptr->keys = NULL;
 	}
 
 	if ( ptr->flags & (ANF_MEM_MAPPED|ANF_STREAMED) ) {
 		cfclose(ptr->cfile_ptr);
 		if ( ptr->cache ) {
-			free(ptr->cache);
+			vm_free(ptr->cache);
+			ptr->cache = NULL;
 		}
 	}
 	else {
 		Assert(ptr->data);
-		free(ptr->data);
+		if ( ptr->data ) {
+			vm_free(ptr->data);
+			ptr->data = NULL;
+		}
 	}
 
 	*prev_anim = ptr->next;
-	free(ptr);
+	vm_free(ptr);
 	return 0;
 }
 
@@ -1132,7 +1253,7 @@ int anim_write_frames_out(char *filename)
 
 	ai = init_anim_instance(source_anim, 16);
 
-	row_data = (ubyte**)malloc((source_anim->height+1) * 4);
+	row_data = (ubyte**)vm_malloc((source_anim->height+1) * 4);
 
 	for ( i = 0; i < source_anim->total_frames; i++ ) {
 		anim_get_next_raw_buffer(ai, 0, 0, 16);
@@ -1155,7 +1276,7 @@ int anim_write_frames_out(char *filename)
 
 	}
 	printf("\n");
-	free(row_data);
+	vm_free(row_data);
 	return 0;
 }
 
@@ -1188,7 +1309,7 @@ void anim_display_info(char *real_filename)
 
 	anim_read_header(&A, fp);
 	// read the keyframe frame nums and offsets
-	key_frame_nums = (int*)malloc(sizeof(int)*A.num_keys);
+	key_frame_nums = (int*)vm_malloc(sizeof(int)*A.num_keys);
 	Assert(key_frame_nums != NULL);
 	for ( i = 0; i < A.num_keys; i++ ) {
 		key_frame_nums[i] = 0;
@@ -1229,7 +1350,7 @@ void anim_display_info(char *real_filename)
 	printf("ac version:                %d\n", A.version);
 
 	if ( key_frame_nums != NULL ) {
-		free(key_frame_nums);
+		vm_free(key_frame_nums);
 	}
 
 	cfclose(fp);

code/anim/animplay.h

@@ -9,13 +9,36 @@
 
 /*
  * $Logfile: /Freespace2/code/Anim/AnimPlay.h $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
- * $Author: penguin $
+ * $Revision: 2.7 $
+ * $Date: 2006-09-08 06:20:14 $
+ * $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)
+ *
+ * Revision 2.4  2004/08/11 05:06:18  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
+ *
+ * Revision 2.3  2003/12/08 22:30:02  randomtiger
+ * Put render state and other direct D3D calls repetition check back in, provides speed boost.
+ * Fixed bug that caused fullscreen only crash with DXT textures
+ * Put dithering back in for tgas and jpgs
+ *
+ * Revision 2.2  2003/11/11 02:15:41  Goober5000
+ * ubercommit - basically spelling and language fixes with some additional
+ * warnings disabled
+ * --Goober5000
+ *
+ * Revision 2.1  2002/08/01 01:41:04  penguin
+ * The big include file move
+ *
  * Revision 2.0  2002/06/03 04:02:21  penguin
  * Warpcore CVS sync
  *
@@ -41,7 +64,7 @@
  * 10    4/27/98 3:36p Dave
  * 
  * 9     3/25/98 8:43p Hoffoss
- * Changed anim_play() to not be so damn complex when you try and call it.
+ * Changed anim_play() to not be so complex when you try and call it.
  * 
  * 8     12/24/97 8:57p Lawrance
  * Added anim_ignore_next_frametime()
@@ -117,7 +140,7 @@ typedef struct {
 	int start_at;
 	int stop_at;
 	int screen_id;
-	vector *world_pos;
+	vec3d *world_pos;
 	float radius;
 	int framerate_independent;
 	void *color;
@@ -126,6 +149,13 @@ typedef struct {
 	int ping_pong;
 } anim_play_struct;
 
+enum
+{
+	PAGE_FROM_MEM		  = 0,
+	PAGE_FROM_DISK		  = 1,
+	PAGE_FROM_DISK_FORCED = 2
+};
+
 extern int Anim_paused;
 
 void				anim_init();
@@ -140,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 = 0);
+anim			  *anim_load(char *name, int file_mapped = PAGE_FROM_MEM);
 int				anim_free(anim *ptr);
 int				anim_playing(anim_instance *ai);
 int				anim_write_frames_out(char *filename);

code/anim/packunpack.cpp

@@ -9,15 +9,82 @@
 
 /*
  * $Logfile: /Freespace2/code/Anim/PackUnpack.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
- * $Author: penguin $
+ * $Revision: 2.14 $
+ * $Date: 2006-06-27 05:07:48 $
+ * $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.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
+ *
+ * Revision 2.8  2005/05/12 17:49:10  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  2004/07/26 20:47:23  Kazan
+ * remove MCD complete
+ *
+ * Revision 2.6  2004/07/12 16:32:41  Kazan
+ * MCD - define _MCD_CHECK to use memory tracking
+ *
+ * Revision 2.5  2004/03/05 09:01:53  Goober5000
+ * Uber pass at reducing #includes
+ * --Goober5000
+ *
+ * Revision 2.4  2004/02/14 00:18:29  randomtiger
+ * Please note that from now on OGL will only run with a registry set by Launcher v4. See forum for details.
+ * OK, these changes effect a lot of file, I suggest everyone updates ASAP:
+ * Removal of many files from project.
+ * Removal of meanless Gr_bitmap_poly variable.
+ * Removal of glide, directdraw, software modules all links to them, and all code specific to those paths.
+ * Removal of redundant Fred paths that arent needed for Fred OGL.
+ * Have seriously tidied the graphics initialisation code and added generic non standard mode functionality.
+ * Fixed many D3D non standard mode bugs and brought OGL up to the same level.
+ * Removed texture section support for D3D8, voodoo 2 and 3 cards will no longer run under fs2_open in D3D, same goes for any card with a maximum texture size less than 1024.
+ *
+ * Revision 2.3  2003/10/24 17:35:04  randomtiger
+ * Implemented support for 32bit TGA and JPG for D3D
+ * Also 32 bit PCX, but it still has some bugs to be worked out
+ * Moved convert_24_to_16 out of the bitmap pfunction structures and into packunpack.cpp because thats the only place that uses it.
+ *
+ * Revision 2.2  2003/03/18 10:07:00  unknownplayer
+ * 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.1.2.1  2002/11/04 03:02:27  randomtiger
+ *
+ * I have made some fairly drastic changes to the bumpman system. Now functionality can be engine dependant.
+ * This is so D3D8 can call its own loading code that will allow good efficient loading and use of textures that it desparately needs without
+ * turning bumpman.cpp into a total hook infested nightmare. Note the new bumpman code is still relying on a few of the of the old functions and all of the old bumpman arrays.
+ *
+ * I have done this by adding to the gr_screen list of function pointers that are set up by the engines init functions.
+ * I have named the define calls the same name as the original 'bm_' functions so that I havent had to change names all through the code.
+ *
+ * Rolled back to an old version of bumpman and made a few changes.
+ * Added new files: grd3dbumpman.cpp and .h
+ * Moved the bitmap init function to after the 3D engine is initialised
+ * Added includes where needed
+ * Disabled (for now) the D3D8 TGA loading - RT
+ *
+ * Revision 2.1  2002/08/01 01:41:04  penguin
+ * The big include file move
+ *
  * Revision 2.0  2002/06/03 04:02:21  penguin
  * Warpcore CVS sync
  *
@@ -152,15 +219,16 @@
  * $NoKeywords: $
  */
 
-#include "graphics/grinternal.h"
+#include "anim/packunpack.h"
 #include "bmpman/bmpman.h"
-#include "palman/palman.h"
 #include "graphics/2d.h"
 #include "anim/animplay.h"
-#include "anim/packunpack.h"
 
-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 ) {
@@ -191,7 +259,7 @@ anim_instance *init_anim_instance(anim *ptr, int bpp)
 	}
 
 	ptr->instance_count++;
-	inst = (anim_instance *) malloc(sizeof(anim_instance));
+	inst = (anim_instance *) vm_malloc(sizeof(anim_instance));
 	Assert(inst);
 	inst->frame_num = -1;
 	inst->last_frame_num = -1;
@@ -201,25 +269,24 @@ anim_instance *init_anim_instance(anim *ptr, int bpp)
 	inst->stop_now = FALSE;
 	inst->aa_color = NULL;
 
-	if(bpp == 16){
-		inst->frame = (ubyte *) malloc(inst->parent->width * inst->parent->height * 2);
-	} else {
-		inst->frame = (ubyte *) 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;
 }
 
 void free_anim_instance(anim_instance *inst)
 {
 	Assert(inst->frame);
-	free(inst->frame);
+	vm_free(inst->frame);
 	inst->frame = NULL;
 	inst->parent->instance_count--;	
 	inst->parent = NULL;
 	inst->data = NULL;
 	inst->file_offset = -1;
 
-	free(inst);	
+	vm_free(inst);	
 }
 
 int anim_get_next_frame(anim_instance *inst)
@@ -260,10 +327,7 @@ int anim_get_next_frame(anim_instance *inst)
 
 	anim_check_for_palette_change(inst);
 
-	// if we're using bitmap polys
-	if(Gr_bitmap_poly){
-		BM_SELECT_TEX_FORMAT();
-	}
+	BM_SELECT_TEX_FORMAT();
 
 	if ( anim_instance_is_streamed(inst) ) {
 		inst->file_offset = unpack_frame_from_file(inst, inst->frame, inst->parent->width*inst->parent->height, inst->parent->palette_translation, aabitmap, bpp);
@@ -775,6 +839,15 @@ int pack_frame(ubyte *frame, ubyte *frame2, ubyte *save, long size, long max, in
 	return packed_size;
 }
 
+// convert a 24 bit value to a 16 bit value
+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);
+}
+
 // unpack a pixel given the passed index and the anim_instance's palette, return bytes stuffed
 int unpack_pixel(anim_instance *ai, ubyte *data, ubyte pix, int aabitmap, int bpp)
 {
@@ -783,8 +856,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){
@@ -801,31 +875,57 @@ 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
-			bm_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
@@ -837,6 +937,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);	
 
@@ -855,34 +956,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
-			bm_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
@@ -893,7 +1015,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;
@@ -954,6 +1076,9 @@ ubyte	*unpack_frame(anim_instance *ai, ubyte *ptr, ubyte *frame, int size, ubyte
 				count = value & (~STD_RLE_CODE);
 				value = *ptr++;
 
+				if (count > size)
+					count = size;
+
 				size -= count;
 				Assert(size >= 0);
 
@@ -1040,6 +1165,9 @@ ubyte	*unpack_frame(anim_instance *ai, ubyte *ptr, ubyte *frame, int size, ubyte
 				count = value & (~STD_RLE_CODE);
 				value = *ptr++;
 
+				if (count > size)
+					count = size;
+
 				size -= count;
 				Assert(size >= 0);
 
@@ -1058,7 +1186,8 @@ ubyte	*unpack_frame(anim_instance *ai, ubyte *ptr, ubyte *frame, int size, ubyte
 		}
 	}
 	else {
-		Assert(0);  // unknown packing method
+	//	Assert(0);  // unknown packing method
+		return NULL;
 	}
 
 	return ptr;
@@ -1073,7 +1202,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;
@@ -1140,6 +1269,9 @@ int unpack_frame_from_file(anim_instance *ai, ubyte *frame, int size, ubyte *pal
 				value = anim_instance_get_byte(ai,offset);
 				offset++;
 
+				if (count > size)
+					count = size;
+
 				size -= count;
 				Assert(size >= 0);
 
@@ -1230,6 +1362,9 @@ int unpack_frame_from_file(anim_instance *ai, ubyte *frame, int size, ubyte *pal
 				value = anim_instance_get_byte(ai,offset);
 				offset++;
 
+				if (count > size)
+					count = size;
+
 				size -= count;
 				Assert(size >= 0);
 
@@ -1248,7 +1383,8 @@ int unpack_frame_from_file(anim_instance *ai, ubyte *frame, int size, ubyte *pal
 		}
 	}
 	else {
-		Int3();  // unknown packing method
+	//	Int3();  // unknown packing method
+		return -1;
 	}
 
 	return ai->file_offset + offset;

code/anim/packunpack.h

@@ -9,15 +9,32 @@
 
 /*
  * $Logfile: /Freespace2/code/Anim/PackUnpack.h $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
- * $Author: penguin $
+ * $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)
+ *
+ * Revision 2.3  2004/08/11 05:06:18  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
+ *
+ * Revision 2.2  2004/03/05 09:01:53  Goober5000
+ * Uber pass at reducing #includes
+ * --Goober5000
+ *
+ * Revision 2.1  2002/08/01 01:41:04  penguin
+ * The big include file move
+ *
  * Revision 2.0  2002/06/03 04:02:21  penguin
  * Warpcore CVS sync
  *
@@ -201,7 +218,7 @@ typedef struct anim {
 	int			file_offset;	// file offset to start of frame data
 	int			cache_file_offset;
 	ubyte			*cache;
-} anim_t;
+} anim;
 
 // the direction to play the anim (forwards or backwards)
 #define ANIM_DIRECT_FORWARD 0
@@ -210,7 +227,7 @@ typedef struct anim {
 typedef struct anim_instance {
 	anim_instance *next, *prev;
 	int		x,y;				// coordinates anim is played at (top left corner of anim)
-	vector	*world_pos;		// world (x,y,z) position of explosion
+	vec3d	*world_pos;		// world (x,y,z) position of explosion
 	float		radius;			// radius of image, needed for scaling
 	int		frame_num;		// current frame, or last frame if between frames (first frame is 0)
 	int		last_frame_num;// last frame rendered
@@ -233,9 +250,7 @@ typedef struct anim_instance {
 	int      paused;        // pause the anim
 	int		file_offset;	// current offset into frame (like data, put offset into file)
 	int		loop_count;		// starts at 0, and is incremented each time it loops
-} anim_instance_t;
-
-extern int packer_code;
+} anim_instance;
 
 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);

code/asteroid/asteroid.h

@@ -9,13 +9,63 @@
 
 /*
  * $Logfile: /Freespace2/code/Asteroid/Asteroid.h $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
- * $Author: penguin $
+ * $Revision: 2.16 $
+ * $Date: 2007-11-23 23:49:32 $
+ * $Author: wmcoolmon $
  *
  * Header file for asteroids
  *
  * $Log: not supported by cvs2svn $
+ * Revision 2.15  2006/11/16 00:53:12  taylor
+ * various bits of little cleanup
+ * get rid of some more compiler warnings
+ *
+ * Revision 2.14  2006/09/11 06:49:38  taylor
+ * fixes for stuff_string() bounds checking
+ *
+ * Revision 2.13  2006/09/11 06:08:08  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
+ *
+ * Revision 2.7  2005/07/13 00:44:20  Goober5000
+ * improved species support and removed need for #define
+ * --Goober5000
+ *
+ * Revision 2.6  2005/04/05 05:53:14  taylor
+ * s/vector/vec3d/g, better support for different compilers (Jens Granseuer)
+ *
+ * Revision 2.5  2004/08/11 05:06:18  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
+ *
+ * Revision 2.4  2004/03/05 09:01:53  Goober5000
+ * Uber pass at reducing #includes
+ * --Goober5000
+ *
+ * Revision 2.3  2003/10/15 22:03:23  Kazan
+ * Da Species Update :D
+ *
+ * Revision 2.2  2003/04/29 01:03:22  Goober5000
+ * implemented the custom hitpoints mod
+ * --Goober5000
+ *
+ * Revision 2.1  2002/08/01 01:41:04  penguin
+ * The big include file move
+ *
  * Revision 2.0  2002/06/03 04:02:21  penguin
  * Warpcore CVS sync
  *
@@ -125,8 +175,10 @@
 #ifndef __ASTEROID_H__
 #define __ASTEROID_H__
 
-#include "ship/ship.h"
-#include "parse/parselo.h"		// for NAME_LENGTH
+#include "globalincs/pstypes.h"
+#include "globalincs/globals.h"		// for NAME_LENGTH
+
+#include <vector>
 
 struct object;
 struct polymodel;
@@ -134,29 +186,24 @@ struct collision_info_struct;
 
 #define	MAX_ASTEROIDS			256
 
-// DEBRIS TYPES
-#define	MAX_DEBRIS_TYPES			12
+#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	DEBRIS_TERRAN_SMALL		3
-#define	DEBRIS_TERRAN_MEDIUM		4
-#define	DEBRIS_TERRAN_LARGE		5
-//
-#define	DEBRIS_VASUDAN_SMALL		6
-#define	DEBRIS_VASUDAN_MEDIUM	7
-#define	DEBRIS_VASUDAN_LARGE		8
-//
-#define	DEBRIS_SHIVAN_SMALL		9
-#define	DEBRIS_SHIVAN_MEDIUM		10
-#define	DEBRIS_SHIVAN_LARGE		11
-// END DEBRIS TYPES
+#define	ASTEROID_TYPE_MEDIUM	1
+#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)
+// 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
 
-typedef struct debris_struct {
-	int index;
-	char *name;
-} debris_struct;
 
 // Data structure to track the active asteroids
 typedef struct asteroid_obj {
@@ -166,45 +213,41 @@ typedef struct asteroid_obj {
 extern asteroid_obj Asteroid_obj_list;
 
 
-extern debris_struct Field_debris_info[];
-
-#define	MAX_ASTEROID_POFS			3				// Max number of POFs per asteroid type
-
-#define	AF_USED					(1<<0)			//	Set means used.
-
 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_SHIP_DETAIL_LEVELS];		// distance to change detail levels at
+	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_hull_strength;								// starting strength of asteroid
-	polymodel	*modelp[MAX_ASTEROID_POFS];
-	int			model_num[MAX_ASTEROID_POFS];
+	float			initial_asteroid_strength;								// starting strength of asteroid
+	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
 	int		collide_objnum;		// set to objnum that asteroid will be impacting soon
 	int		collide_objsig;		// object signature corresponding to collide_objnum
-	vector	death_hit_pos;			// hit pos that caused death
+	vec3d	death_hit_pos;			// hit pos that caused death
 	int		target_objnum;			//	Yes, hah!  Asteroids can have targets.  See asteroid_aim_at_target().
 } asteroid;
 
-// TYPEDEF FOR SPECIES OF DEBRIS - BITFIELD
-#define DS_TERRAN		0x01
-#define DS_VASUDAN	0x02
-#define DS_SHIVAN		0x04
 
 // TYPEDEF FOR DEBRIS TYPE
 typedef enum {
@@ -218,15 +261,13 @@ typedef enum {
 	FT_PASSIVE
 } field_type_t;
 
-#define	MAX_ACTIVE_DEBRIS_TYPES	3
-
 typedef	struct asteroid_field {
-	vector	min_bound;						//	Minimum range of field.
-	vector	max_bound;						//	Maximum range of field.
+	vec3d	min_bound;						//	Minimum range of field.
+	vec3d	max_bound;						//	Maximum range of field.
 	int		has_inner_bound;
-	vector	inner_min_bound;
-	vector	inner_max_bound;
-	vector	vel;								//	Average asteroid moves at this velocity.
+	vec3d	inner_min_bound;
+	vec3d	inner_max_bound;
+	vec3d	vel;								//	Average asteroid moves at this velocity.
 	float		speed;							// Average speed of field
 	int		num_initial_asteroids;		//	Number of asteroids at creation.
 	field_type_t		field_type;			// active throws and wraps, passive does not
@@ -234,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;
 
@@ -250,17 +290,17 @@ void	asteroid_render( object *asteroid_objp );
 void	asteroid_delete( object *asteroid_objp );
 void	asteroid_process_pre( object *asteroid_objp, float frame_time);
 void	asteroid_process_post( object *asteroid_objp, float frame_time);
-int	asteroid_check_collision( object *asteroid_objp, object * other_obj, vector * hitpos, collision_info_struct *asteroid_hit_info=NULL );
-void	asteroid_hit( object *asteroid_objp, object *other_objp, vector *hitpos, float damage );
+int	asteroid_check_collision( object *asteroid_objp, object * other_obj, vec3d * hitpos, collision_info_struct *asteroid_hit_info=NULL );
+void	asteroid_hit( object *asteroid_objp, object *other_objp, vec3d *hitpos, float damage );
 int	asteroid_count();
 int	asteroid_collide_objnum(object *asteroid_objp);
 float asteroid_time_to_impact(object *asteroid_objp);
 void	asteroid_show_brackets();
 void	asteroid_target_closest_danger();
-int	asteroid_get_random_in_cone(vector *pos, vector *dir, float ang, int danger = 0);
+int	asteroid_get_random_in_cone(vec3d *pos, vec3d *dir, float ang, int danger = 0);
 
 // need to extern for multiplayer
-void asteroid_sub_create(object *parent_objp, int asteroid_type, vector *relvec);
+void asteroid_sub_create(object *parent_objp, int asteroid_type, vec3d *relvec);
 
 void asteroid_frame();
 

code/autopilot/autopilot.h

@@ -0,0 +1,189 @@
+// Autopilot.h
+// Derek Meek
+// 4-30-2004
+
+/*
+ * $Logfile: /Freespace2/code/Autopilot/Autopilot.h $
+ * $Revision: 1.12 $
+ * $Date: 2007-09-02 02:10:24 $
+ * $Author: Goober5000 $
+ *
+ * $Log: not supported by cvs2svn $
+ * Revision 1.11  2007/07/24 20:17:36  Kazan
+ * Make asteroid/debris fields interrupt autopilot, add "hazards near" message to autopilot.tbl, add use-nav-cinematics sexp, fix mantis #1441
+ *
+ * Revision 1.10  2007/07/23 15:16:48  Kazan
+ * Autopilot upgrades as described, MSVC2005 project fixes
+ *
+ * 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)
+ *
+ * Revision 1.6  2004/08/11 05:06:18  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
+ *
+ * Revision 1.5  2004/07/27 18:52:10  Kazan
+ * squished another
+ *
+ * Revision 1.4  2004/07/25 19:27:51  Kazan
+ * only disable afterburning during AIM_WAYPOINTS and AIM_FLY_TO_SHIP while AutoPilotEngaged
+ *
+ * Revision 1.3  2004/07/25 00:31:27  Kazan
+ * i have absolutely nothing to say about that subject
+ *
+ * Revision 1.2  2004/07/01 16:38:18  Kazan
+ * working on autonav
+ *
+ * Revision 1.1  2004/05/07 23:50:14  Kazan
+ * Sorry Guys!
+ *
+ *
+ *
+ *
+ */
+
+#if !defined(_AUTOPILOT_H_)
+#define _AUTOPILOT_H_
+
+#include "globalincs/pstypes.h"
+
+// milliseconds between updates
+#define NPS_TICKRATE	125
+
+#define MAX_NAVPOINTS	8
+
+#define NP_WAYPOINT		0x0001 // Nav Point is bound to the poistion of a single node of a waypoint path
+#define NP_SHIP			0x0002 // Nav Point is bound to the poisiton of a certain ship 
+#define NP_HIDDEN		0x0004 // Nav Point doesn't show on map and isn't selectable
+#define NP_NOACCESS		0x0008 // Nav Point isn't selectable
+#define NP_VISITED		0x0100 // Whether we've been within 1,000 meters of this waypoint
+
+#define NP_NOSELECT		( NP_HIDDEN | NP_NOACCESS )
+#define NP_VALIDTYPE	( NP_WAYPOINT | NP_SHIP )
+
+struct NavPoint 
+{
+	char NavName[32];
+	int flags;
+
+	void *target_obj;
+	int waypoint_num; //only used when flags & NP_WAYPOINT
+
+	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;
+
+// Cycles through the NavPoint List
+bool Sel_NextNav();
+
+
+// Tell us is autopilot is allow
+// This needs:
+//        * Nav point selected
+//        * No enemies within 5,000 meters
+//        * Destination > 1,000 meters away
+bool CanAutopilot(bool send_msg=false);
+bool CanAutopilotPos(vec3d targetPos);
+
+// Engages autopilot
+// This does:
+//        * Control switched from player to AI
+//        * Time compression to 32x
+//        * Tell AI to fly to targetted Nav Point (for all nav-status wings/ships)
+//		  * Sets max waypoint speed to the best-speed of the slowest ship tagged
+void StartAutopilot();
+
+// Checks if autopilot should automatically die
+// Returns true if:
+//         * Targetted waypoint < 1,000 meters away
+//         * Enemy < 5,000 meters
+bool Autopilot_AutoDiable();
+
+// Disengages autopilot
+// this does:
+//         * Time compression to 1x
+//         * Delete AI nav goal
+//         * Control switched from AI to player
+void EndAutoPilot();
+
+
+// Checks for changes every NPS_TICKRATE milliseconds
+// Checks:
+//			* if we've gotten close enough to a nav point for it to be counted as "Visited"
+//			* If we're current AutoNavigating it checks if we need to autodisengage
+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);
+
+// Set A Nav point to "ZERO"
+void ZeroNav(int i);
+
+// Removes a Nav
+bool DelNavPoint(char *Nav);
+bool DelNavPoint(int nav);
+
+// adds a Nav
+bool AddNav_Ship(char *Nav, char *TargetName, int flags); 
+bool AddNav_Waypoint(char *Nav, char *WP_Path, int node, int flags);
+
+//Change Flags
+bool Nav_Alt_Flags(char *Nav, int flags);
+
+// Sexp Accessors
+bool Nav_Set_Flag(char *Nav, int flag);
+bool Nav_UnSet_Flag(char *Nav, int flag);
+
+bool Nav_Set_Hidden(char *Nav);
+bool Nav_Set_NoAccess(char *Nav);
+bool Nav_Set_Visited(char *Nav);
+
+bool Nav_UnSet_Hidden(char *Nav);
+bool Nav_UnSet_NoAccess(char *Nav);
+bool Nav_UnSet_Visited(char *Nav);
+
+// Useful functions
+unsigned int DistanceTo(char *nav);
+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
+

code/bmpman/bm_internal.h

@@ -0,0 +1,185 @@
+/*
+ * 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/bmpman/bm_internal.h $
+ * $Revision: 2.7 $
+ * $Date: 2007-01-10 01:40:06 $
+ * $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.
+ *
+ * Revision 2.1  2004/11/23 00:10:06  taylor
+ * try and protect the bitmap_entry stuff a bit better
+ * fix the transparent support ship, again, but correctly this time
+ *
+ * 
+ * $NoKeywords: $
+ */
+
+
+#ifndef __BM_INTERNAL_H__
+#define __BM_INTERNAL_H__
+
+
+// extra check to make sure this stuff doesn't end up in normal files
+// don't use any of this unless BMPMAN_INTERNAL is defined
+#ifdef BMPMAN_INTERNAL
+
+#include "globalincs/pstypes.h"
+#include "bmpman/bmpman.h"
+
+
+// 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_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 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
+
+		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;
+} bm_extra_info;
+
+
+typedef struct bitmap_entry	{
+	// identification
+	char		filename[MAX_FILENAME_LEN];			// filename for this bitmap
+
+	uint		signature;									// a unique signature identifying the data
+	uint		palette_checksum;							// checksum used to be sure bitmap is in current palette
+	int		handle;										// Handle = id*MAX_BITMAPS + bitmapnum
+	int		last_used;									// When this bitmap was last used
+
+	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)
+
+	// compressed bitmap stuff (.dds) - RT please take a look at this and tell me if we really need it
+	int		mem_taken;									// How much memory does this bitmap use? - UnknownPlayer
+	int		num_mipmaps;								// number of mipmap levels, we need to read all of them
+
+	// Stuff to keep track of usage
+	ubyte		preloaded;									// If set, then this was loaded from the lst file
+	int			preload_count;								// how many times this gets used in game, for unlocking
+	ubyte		used_flags;									// What flags it was accessed thru
+	int			load_count;
+
+	// Bitmap info
+	bitmap	bm;
+
+	// Data for animations and user bitmaps
+	bm_extra_info	info;		
+
+#ifdef BMPMAN_NDEBUG
+	// bookeeping
+	ubyte		used_last_frame;							// If set, then it was used last frame
+	ubyte		used_this_frame;							// If set, then it was used this frame
+	int		data_size;									// How much data this bitmap uses
+	int		used_count;									// How many times it was accessed
+#endif
+} bitmap_entry;
+
+extern bitmap_entry bm_bitmaps[MAX_BITMAPS];
+
+
+// image specific lock functions
+void bm_lock_ani( int handle, int bitmapnum, bitmap_entry *be, bitmap *bmp, ubyte bpp, ubyte flags );
+void bm_lock_dds( int handle, int bitmapnum, bitmap_entry *be, bitmap *bmp, ubyte bpp, ubyte flags );
+void bm_lock_jpg( int handle, int bitmapnum, bitmap_entry *be, bitmap *bmp, ubyte bpp, ubyte flags );
+void bm_lock_pcx( int handle, int bitmapnum, bitmap_entry *be, bitmap *bmp, ubyte bpp, ubyte flags );
+void bm_lock_tga( int handle, int bitmapnum, bitmap_entry *be, bitmap *bmp, ubyte bpp, ubyte flags );
+void bm_lock_user( int handle, int bitmapnum, bitmap_entry *be, bitmap *bmp, ubyte bpp, ubyte flags );
+
+
+#endif // BMPMAN_INTERNAL
+
+#endif // __BM_INTERNAL_H__

code/bmpman/bmpman.h

@@ -0,0 +1,710 @@
+/*
+ * 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/Bmpman/BmpMan.h $
+ *
+ * $Revision: 2.44 $
+ * $Date: 2007-03-22 20:13:23 $
+ * $Author: taylor $
+ *
+ * Prototypes for Bitmap Manager functions
+ *
+ * $Log: not supported by cvs2svn $
+ * Revision 2.43  2007/01/10 01:40:07  taylor
+ * remove the non-dark stuff, it only works on PCX files and stuff to use it has already been ripped out
+ * per earlier discussions: remove -jpgtga and -pcx32, set image load order to DDS->TGA->JPG->PCX
+ * some debug log cleanup
+ * remove bitmap data from system memory once it's in API memory
+ *
+ * Revision 2.42  2007/01/07 12:32:06  taylor
+ * fix bm_page_in_texture() so that it will load all frames of an animation (caused slowdowns in-game with it)
+ *
+ * Revision 2.41  2006/12/28 00:59:19  wmcoolmon
+ * WMC codebase commit. See pre-commit build thread for details on changes.
+ *
+ * Revision 2.40  2006/07/05 23:41:43  Goober5000
+ * spelling
+ *
+ * Revision 2.39  2006/07/05 23:35:42  Goober5000
+ * cvs comment tweaks
+ *
+ * Revision 2.38  2006/06/27 04:52:50  taylor
+ * fix various things that Valgrind complained about
+ * comp_type for DDS images will always be set to something, an 'uncompressed' type at the least
+ *
+ * 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
+ *
+ * Revision 2.23  2005/06/19 02:28:55  taylor
+ * add a _fast version of bm_unload() to be used in modelinterp and future graphics API code
+ * clean up some modelinterp code to not use memcpy() everywhere so it's more platform compatible and matches old code (Jens Granseuer)
+ * NaN check to catch shards-of-death and prevent hitting an Assert() (Jens Granseuer)
+ * fix jumpnode code to catch model errors and close a memory leak
+ * make the call to bm_unload_all() after model_free_all() since we will get bmpman screwups otherwise
+ * don't show hardware sound RAM when using OpenAL build, it will always be 0
+ * print top-right memory figures in debug builds slighly further over when 1024+ res
+ *
+ * Revision 2.22  2005/04/24 12:56:42  taylor
+ * really are too many changes here:
+ *  - remove all bitmap section support and fix problems with previous attempt
+ *  ( code/bmpman/bmpman.cpp, code/bmpman/bmpman.h, code/globalincs/pstypes.h,
+ *    code/graphics/2d.cpp, code/graphics/2d.h code/graphics/grd3dbmpman.cpp,
+ *    code/graphics/grd3dinternal.h, code/graphics/grd3drender.cpp, code/graphics/grd3dtexture.cpp,
+ *    code/graphics/grinternal.h, code/graphics/gropengl.cpp, code/graphics/gropengl.h,
+ *    code/graphics/gropengllight.cpp, code/graphics/gropengltexture.cpp, code/graphics/gropengltexture.h,
+ *    code/graphics/tmapper.h, code/network/multi_pinfo.cpp, code/radar/radarorb.cpp
+ *    code/render/3ddraw.cpp )
+ *  - use CLAMP() define in gropengl.h for gropengllight instead of single clamp() function
+ *  - remove some old/outdated code from gropengl.cpp and gropengltexture.cpp
+ *
+ * Revision 2.21  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.20  2005/03/07 13:10:19  bobboau
+ * commit of render target code, d3d should be totaly functional,
+ * OGL still needs implementation.
+ *
+ * Revision 2.19  2005/02/10 14:38:50  taylor
+ * fix an issue with bm_set_components()
+ * abs is for ints fabsf is for floats (camera.cpp)
+ * make the in-cockpit stuff OGL friendly
+ *
+ * Revision 2.18  2004/11/23 00:10:06  taylor
+ * try and protect the bitmap_entry stuff a bit better
+ * fix the transparent support ship, again, but correctly this time
+ *
+ * Revision 2.17  2004/11/21 15:59:45  Kazan
+ * conflict res
+ *
+ * Revision 2.16  2004/10/31 21:26:27  taylor
+ * bmpman merge, EFF animation support, better page in stuff, dozen or so smaller fixes and cleanup
+ *
+ * Revision 2.15  2004/10/06 22:02:54  Kazan
+ * interface corruption fix - thanks taylor (MAX_BITMAPS upped to 7000)
+ *
+ * Revision 2.14  2004/08/11 05:06:18  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
+ *
+ * Revision 2.13  2004/05/06 22:35:26  taylor
+ * DDS mipmap reading, remove unneeded bm_unlock() during page in
+ *
+ * Revision 2.12  2004/04/01 15:31:20  taylor
+ * don't use interface anis as ship textures
+ *
+ * Revision 2.11  2004/03/05 09:01:54  Goober5000
+ * Uber pass at reducing #includes
+ * --Goober5000
+ *
+ * Revision 2.10  2003/12/04 20:39:08  randomtiger
+ * Added DDS image support for D3D
+ * Added new command flag '-ship_choice_3d' to activate 3D models instead of ani's in ship choice, feature now off by default
+ * Hopefully have fixed D3D text batching bug that caused old values to appear
+ * Added Hud_target_object_factor variable to control 3D object sizes of zoom in HUD target
+ * Fixed jump nodes not showing
+ *
+ * Revision 2.9  2003/11/19 20:37:22  randomtiger
+ * Almost fully working 32 bit pcx, use -pcx32 flag to activate.
+ * Made some commandline variables fit the naming standard.
+ * Changed timerbar system not to run pushes and pops if its not in use.
+ * Put in a note about not uncommenting asserts.
+ * Fixed up a lot of missing POP's on early returns?
+ * Perhaps the motivation for Assert functionality getting commented out?
+ * Fixed up some bad asserts.
+ * Changed nebula poofs to render in 2D in htl, it makes it look how it used to in non htl. (neb.cpp,1248)
+ * Before the poofs were creating a nasty stripe effect where they intersected with ships hulls.
+ * Put in a special check for the signs of that D3D init bug I need to lock down.
+ *
+ * Revision 2.8  2003/11/07 18:31:01  randomtiger
+ * Fixed a nohtl call to htl funcs (crash with NULL pointer)
+ * Fixed a bug with 32bit PCX code.
+ * Fixed a bug in the d3d_string batch system that was messing up screen shaking.
+ * Added a couple of checks to try and stop timerbar push and pop overloads, check returns missing pops if you use the system.
+ * Put in a higher res icon until we get something better sorted out.
+ *
+ * Revision 2.7  2003/10/24 17:35:04  randomtiger
+ * Implemented support for 32bit TGA and JPG for D3D
+ * Also 32 bit PCX, but it still has some bugs to be worked out
+ * Moved convert_24_to_16 out of the bitmap pfunction structures and into packunpack.cpp because thats the only place that uses it.
+ *
+ * Revision 2.6  2003/08/16 03:52:22  bobboau
+ * update for the specmapping code includeing
+ * suport for seperate specular levels on lights and
+ * optional strings for the stars table
+ * code has been made more organised,
+ * though there seems to be a bug in the state selecting code
+ * resulting in the HUD being rendered incorectly
+ * and specmapping failing ocasionaly
+ *
+ * Revision 2.5  2003/08/12 03:18:32  bobboau
+ * Specular 'shine' mapping;
+ * useing a phong lighting model I have made specular highlights
+ * that are mapped to the model,
+ * rendering them is still slow, but they look real purdy
+ *
+ * also 4 new (untested) comand lines, the XX is a floating point value
+ * -spec_exp XX
+ * the n value, you can set this from 0 to 200 (actualy more than that, but this is the recomended range), it will make the highlights bigger or smaller, defalt is 16.0 so start playing around there
+ * -spec_point XX
+ * -spec_static XX
+ * -spec_tube XX
+ * these are factors for the three diferent types of lights that FS uses, defalt is 1.0,
+ * static is the local stars,
+ * point is weapons/explosions/warp in/outs,
+ * tube is beam weapons,
+ * for thouse of you who think any of these lights are too bright you can configure them you're self for personal satisfaction
+ *
+ * Revision 2.4  2003/03/18 10:07:00  unknownplayer
+ * 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 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
+ *
+ * Revision 2.1  2003/01/05 23:41:50  bobboau
+ * disabled decals (for now), removed the warp ray thingys,
+ * made some better error mesages while parseing weapons and ships tbls,
+ * and... oh ya, added glow mapping
+ *
+ * Revision 2.0.2.10  2002/11/04 21:24:59  randomtiger
+ *
+ * When running in D3D all ani's are memory mapped for speed, this takes up more memory but stops gametime locking of textures which D3D8 hates.
+ * Added new command line tag Cmdline_d3dlowmem for people who dont want to make use of this because they have no memory.
+ * Cleaned up some more texture stuff enabled console debug for D3D.
+ *
+ * Revision 2.0.2.9  2002/11/04 16:04:20  randomtiger
+ *
+ * Tided up some bumpman stuff and added a few function points to gr_screen. - RT
+ *
+ * Revision 2.0.2.8  2002/11/04 03:02:28  randomtiger
+ *
+ * I have made some fairly drastic changes to the bumpman system. Now functionality can be engine dependant.
+ * This is so D3D8 can call its own loading code that will allow good efficient loading and use of textures that it desparately needs without
+ * turning bumpman.cpp into a total hook infested nightmare. Note the new bumpman code is still relying on a few of the of the old functions and all of the old bumpman arrays.
+ *
+ * I have done this by adding to the gr_screen list of function pointers that are set up by the engines init functions.
+ * I have named the define calls the same name as the original 'bm_' functions so that I havent had to change names all through the code.
+ *
+ * Rolled back to an old version of bumpman and made a few changes.
+ * Added new files: grd3dbumpman.cpp and .h
+ * Moved the bitmap init function to after the 3D engine is initialised
+ * Added includes where needed
+ * Disabled (for now) the D3D8 TGA loading - RT
+ *
+ * Revision 2.0.2.7  2002/10/26 01:24:22  randomtiger
+ * Fixed debug bitmap compiling bug.
+ * Fixed tga bug. - RT
+ *
+ * Revision 2.0.2.6  2002/10/22 17:46:17  randomtiger
+ * Fixed new TGA code texturing bug. - RT
+ *
+ * Revision 2.0.2.5  2002/10/21 16:33:40  randomtiger
+ * Added D3D only 32 bit TGA functionality. Will load a texture as big as your graphics card allows. Code not finished yet and will forge the beginnings of the new texture system. - RT
+ *
+ * Revision 2.0.2.4  2002/10/19 23:56:39  randomtiger
+ * Changed generic bitmap code to allow maximum dimensions to be determined by 3D's engines maximum texture size query.
+ * Defaults to 256 as it was before. Also added base code for reworking the texture code to be more efficient. - RT
+ *
+ * Revision 2.0.2.3  2002/10/02 11:40:19  randomtiger
+ * Bmpmap has been reverted to an old non d3d8 version.
+ * All d3d8 code is now in the proper place.
+ * PCX code is now working to an extent. Problems with alpha though.
+ * Ani's work slowly with alpha problems.
+ * Also I have done a bit of tidying - RT
+ *
+ * Revision 2.0  2002/06/03 04:02:21  penguin
+ * Warpcore CVS sync
+ *
+ * Revision 1.1  2002/05/02 18:03:04  mharris
+ * Initial checkin - converted filenames and includes to lower case
+ *
+ * 
+ * 16    8/10/99 6:54p Dave
+ * Mad optimizations. Added paging to the nebula effect.
+ * 
+ * 15    8/06/99 1:52p Dave
+ * Bumped up MAX_BITMAPS for the demo.
+ * 
+ * 14    7/15/99 9:20a Andsager
+ * FS2_DEMO initial checkin
+ * 
+ * 13    7/13/99 1:15p Dave
+ * 32 bit support. Whee!
+ * 
+ * 12    6/29/99 10:35a Dave
+ * Interface polygon bitmaps! Whee!
+ * 
+ * 11    6/16/99 4:06p Dave
+ * New pilot info popup. Added new draw-bitmap-as-poly function.
+ * 
+ * 10    5/05/99 9:02p Dave
+ * Fixed D3D aabitmap rendering. Spiffed up nebula effect a bit (added
+ * rotations, tweaked values, made bitmap selection more random). Fixed
+ * D3D beam weapon clipping problem. Added D3d frame dumping.
+ * 
+ * 9     2/08/99 5:07p Dave
+ * FS2 chat server support. FS2 specific validated missions.
+ * 
+ * 8     2/05/99 12:52p Dave
+ * Fixed Glide nondarkening textures.
+ * 
+ * 7     2/03/99 11:44a Dave
+ * Fixed d3d transparent textures.
+ * 
+ * 6     12/06/98 2:36p Dave
+ * Drastically improved nebula fogging.
+ * 
+ * 5     12/01/98 4:46p Dave
+ * Put in targa bitmap support (16 bit).
+ * 
+ * 4     12/01/98 8:06a Dave
+ * Temporary checkin to fix some texture transparency problems in d3d.
+ * 
+ * 3     11/30/98 1:07p Dave
+ * 16 bit conversion, first run.
+ * 
+ * 2     10/07/98 10:52a Dave
+ * Initial checkin.
+ * 
+ * 1     10/07/98 10:48a Dave
+ * 
+ * 32    4/16/98 6:31p Hoffoss
+ * Added function to get filename of a bitmap handle, which we don't have
+ * yet and I need.
+ * 
+ * 31    4/02/98 11:40a Lawrance
+ * check for #ifdef DEMO instead of #ifdef DEMO_RELEASE
+ * 
+ * 30    3/30/98 4:02p John
+ * Made machines with < 32 MB of RAM use every other frame of certain
+ * bitmaps.   Put in code to ke7ep track of how much RAM we've malloc'd.
+ * 
+ * 29    3/29/98 4:05p John
+ * New paging code that loads everything necessary at level startup.
+ * 
+ * 28    3/26/98 5:21p John
+ * Added new code to preload all bitmaps at the start of a level.
+ * Commented it out, though.
+ * 
+ * 27    3/24/98 6:18p John
+ * Hacked MAX_BITMAPS up to 3500
+ * 
+ * 26    3/10/98 4:18p John
+ * Cleaned up graphics lib.  Took out most unused gr functions.   Made D3D
+ * & Glide have popups and print screen.  Took out all >8bpp software
+ * support.  Made Fred zbuffer.  Made zbuffer allocate dynamically to
+ * support Fred.  Made zbuffering key off of functions rather than one
+ * global variable.
+ * 
+ * 25    3/02/98 6:46p John
+ * Upped MAX_BITMAPS to 2000
+ * 
+ * 24    3/02/98 6:00p John
+ * Moved MAX_BITMAPS into BmpMan.h so the stuff in the graphics code that
+ * is dependent on it won't break if it changes.   Made ModelCache slots
+ * be equal to MAX_OBJECTS which is what it is.
+ * 
+ * 23    2/06/98 8:25p John
+ * Added code for new bitmaps since last frame
+ * 
+ * 22    2/06/98 8:10p John
+ * Added code to show amout of texture usage each frame.
+ * 
+ * 21    1/29/98 11:48a John
+ * Added new counter measure rendering as model code.   Made weapons be
+ * able to have impact explosion.
+ * 
+ * 20    1/11/98 2:14p John
+ * Changed a lot of stuff that had to do with bitmap loading.   Made cfile
+ * not do callbacks, I put that in global code.   Made only bitmaps that
+ * need to load for a level load.
+ * 
+ * 19    9/03/97 4:19p John
+ * changed bmpman to only accept ani and pcx's.  made passing .pcx or .ani
+ * to bm_load functions not needed.   Made bmpman keep track of palettes
+ * for bitmaps not mapped into game palettes.
+ * 
+ * 18    8/25/97 11:14p Lawrance
+ * added support for .ani files in bm_load_animation()
+ * 
+ * 17    7/16/97 3:07p John
+ * 
+ * 16    6/17/97 8:58p Lawrance
+ * fixed bug with not nulling bm.data with USER bitmaps
+ * 
+ * 15    6/12/97 2:44a Lawrance
+ * changed bm_unlock() to take an index into bm_bitmaps().  Added
+ * ref_count to bitmap_entry struct
+ * 
+ * 14    5/20/97 10:36a John
+ * Fixed problem with user bitmaps and direct3d caching.
+ * 
+ * 13    3/24/97 3:25p John
+ * Cleaned up and restructured model_collide code and fvi code.  In fvi
+ * made code that finds uvs work..  Added bm_get_pixel to BmpMan.
+ * 
+ * 12    2/17/97 5:18p John
+ * Added a bunch of RCS headers to a bunch of old files that don't have
+ * them.
+ *
+ * $NoKeywords: $
+ */
+
+#ifndef _BMPMAN_H
+#define _BMPMAN_H
+
+#include "globalincs/pstypes.h"
+#include "cfile/cfile.h"
+
+#ifndef NDEBUG
+#define BMPMAN_NDEBUG
+#endif
+
+
+// this is causing problems - let's UP IT -- Kazan
+// bumped from 3500 to 4500 2004/09/21 - taylor
+// bumped to 4750 2005/02/03 - taylor
+//#define MAX_BITMAPS 3500			// How many bitmaps the game can handle
+#define MAX_BITMAPS 4750			// How many bitmaps the game can handle
+// NOTE:  MAX_BITMAPS shouldn't need to be bumped again.  With the fixed bm_release() and it's
+// proper use even the largest missions should stay under this number.  With the largest retail
+// missions and wasteful content we should still have about 20% of the slots free.  If it still
+// goes over then it's something the artists need to fix.  For instance the Terran Mara fighter,
+// with -spec and -glow and using the Shinepack, needs 117 bitmap slots alone.  111 of those is
+// just for the glowmaps.  This number can be greatly reduced if the number of ani frames for
+// another LOD than LOD0 has fewer or no ani frames.  A 37 frame glow ani for LOD2 is little
+// more than a waste of resources.  Future reports of texture corruption should be initially
+// approached with content as the cause and not code.  If anything we could/should reduce
+// MAX_BITMAPS in the future.  Where it's at now should accomidate even the largest mods.
+//  --  Taylor
+
+
+#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_paging;
+
+void bm_init();
+
+void bm_close();
+
+int bm_get_cache_slot( int bitmap_id, int separate_ani_frames );
+
+int bm_get_next_handle();
+
+void *bm_malloc(int n, int size);
+
+void bm_update_memory_used(int n, int size);
+
+// how many bytes of textures are used.
+extern int bm_texture_ram;
+
+// This loads a bitmap 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.
+int bm_load(char * filename);
+
+// special load function. basically allows you to load a bitmap which already exists (by filename). 
+// this is useful because in some cases we need to have a bitmap which is locked in screen format
+// _and_ texture format, such as pilot pics and squad logos
+int bm_load_duplicate(char *filename);
+
+// Creates a bitmap that exists in RAM somewhere, instead
+// of coming from a disk file.  You pass in a pointer to a
+// block of data.  The data can be in the following formats:
+// 8 bpp (mapped into game palette)
+// 32 bpp
+// 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 = 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, 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, 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.
+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 = 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
+// a bitmap when you need it!  This will convert it into the 
+// appropriate format also.
+extern bitmap * bm_lock( int bitmapnum, ubyte bpp, ubyte flags );
+
+// The signature is a field that gets filled in with 
+// a unique signature for each bitmap.  The signature for each bitmap
+// will also change when the bitmap's data changes.
+extern uint bm_get_signature( int bitmapnum);
+
+// Unlocks a bitmap
+extern void bm_unlock( int bitmapnum );
+
+//WMC - Needed this for scripting
+extern int bm_is_valid(int handle);
+
+// Gets info.   w,h,or flags,nframes or fps can be NULL if you don't care.
+//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);	 
+
+// resyncs all the bitmap palette
+extern void bm_update();
+
+// call to load all data for all bitmaps that have been requested to be loaded
+extern void bm_gfx_load_all();
+extern void bm_unload_all();
+
+// call to get the palette for a bitmap
+void bm_get_palette(int n, ubyte *pal, char *name);
+
+// Hacked function to get a pixel from a bitmap.
+// Only works good in 8bpp mode.
+void bm_gfx_get_pixel( int bitmap, float u, float v, ubyte *r, ubyte *g, ubyte *b );
+
+// Returns number of bytes of bitmaps locked this frame
+// ntotal = number of bytes of bitmaps locked this frame
+// nnew = number of bytes of bitmaps locked this frame that weren't locked last frame
+void bm_get_frame_usage(int *ntotal, int *nnew);
+
+/* 
+ * Example on using bm_create
+ * 
+	{
+		static int test_inited = 0;
+		static int test_bmp;
+		static uint test_bmp_data[128*64];
+
+		if ( !test_inited )	{
+			test_inited = 1;
+			// Create the new bitmap and fill in its data.
+			// When you're done with it completely, call
+			// bm_release to free up the bitmap handle
+			test_bmp = bm_create( 32, 128, 64, test_bmp_data );
+			int i,j;
+			for (i=0; i<64; i++ )	{
+				for (j=0; j<64; j++ )	{
+					uint r=i*4;
+					test_bmp_data[j+i*128] = r;
+				}
+			}
+		}
+
+		bm_unload(test_bmp);	// this pages out the data, so that the
+									// next bm_lock will convert the new data to the
+									// correct bpp
+
+		// put in new data
+		int x,y;
+		gr_reset_clip();
+		for (y=0; y<64; y++)
+			for (x=0; x<128; x++ )
+				test_bmp_data[y*128+x] = 15;
+
+		// Draw the bitmap to upper left corner
+		gr_set_bitmap(test_bmp);
+		gr_bitmap( 0,0 );
+	}
+*/
+
+
+//============================================================================
+// Paging stuff
+//============================================================================
+
+void bm_page_in_start();
+void bm_page_in_stop();
+
+// Paging code in a library should call these functions
+// in its page in function.
+
+// 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 = 0 );
+
+// marks a texture as being a transparent textyre used for this level
+// Marks a texture as being used for this level
+// If num_frames is passed, assume this is an animation
+void bm_page_in_xparent_texture( int bitmapnum, int num_frames=1 );
+
+// Marks an aabitmap as being used for this level
+// If num_frames is passed, assume this is an animation
+void bm_page_in_aabitmap( int bitmapnum, int num_frames=1 );
+
+// unload a texture that was paged in
+int bm_page_out( int handle );
+
+// 
+// Mode: 0 = High memory
+//       1 = Low memory ( every other frame of ani's)
+//       2 = Debug low memory ( only use first frame of each ani )
+void bm_set_low_mem( int mode );
+
+char *bm_get_filename(int handle);
+
+void BM_SELECT_SCREEN_FORMAT();
+void BM_SELECT_TEX_FORMAT();
+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_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);
+void bm_set_components_argb_d3d_32_tex(ubyte *pixel, ubyte *r, ubyte *g, ubyte *b, ubyte *a);
+
+// 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 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 BUMPMAP;	//blah blah bumpmapping
+
+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 width, int height, int flags );
+int bm_is_render_target(int bitmap_id);
+int bm_set_render_target(int handle, int face = -1);
+
+#endif

code/camera/camera.cpp

@@ -0,0 +1,971 @@
+#include "camera/camera.h"
+#include "math/vecmat.h"
+#include "graphics/2d.h"
+#include "globalincs/alphacolors.h"
+#include "parse/parselo.h"
+#include "physics/physics.h" //apply_physics
+#include "globalincs/systemvars.h" //VM_FREECAMERA etc
+#include "hud/hud.h" //hud_get_draw
+#include "model/model.h" //polymodel, model_get
+#include "playerman/player.h" //player_get_padlock_orient
+#include "ship/ship.h" //compute_slew_matrix
+
+//*************************IMPORTANT GLOBALS*************************
+float VIEWER_ZOOM_DEFAULT = 0.75f;			//	Default viewer zoom, 0.625 as per multi-lateral agreement on 3/24/97
+warp_camera Warp_camera;
+
+//*************************OTHER STUFF*************************
+//Some global vars
+std::vector<subtitle> Subtitles;
+std::vector<camera*> Cameras;
+//Preset cameras
+camid Current_camera;
+
+//*************************INTERNAL FUNCS*************************
+//static avd_camera *cam_upgrade_to_avd(camera *cam);
+
+//*************************CLASS: camera*************************
+//This is where the camera class beings! :D
+camera::camera(char *in_name, int in_signature)
+{
+	set_name(in_name);
+	sig = in_signature;
+//	flags = CAM_DEFAULT_FLAGS;
+
+	reset();
+}
+
+camera::~camera()
+{
+	//Check if this is in use
+	if(Current_camera.getSignature() == this->sig)
+	{
+		Current_camera = camid();
+	}
+}
+
+void camera::clear()
+{
+	strcpy(name, "");
+	sig = -1;
+	reset();
+}
+
+void camera::reset()
+{
+	flags = CAM_DEFAULT_FLAGS;
+
+	object_self = object_target = object_h();
+	object_self_submodel = object_target_submodel = -1;
+
+	c_fov = VIEWER_ZOOM_DEFAULT;
+	c_pos = vmd_zero_vector;
+	c_ori = vmd_identity_matrix;
+
+	func_custom_position = NULL;
+	func_custom_orientation = NULL;
+
+	fov.clear();
+	fov.set(VIEWER_ZOOM_DEFAULT);
+
+	pos_x.clear();
+	pos_y.clear();
+	pos_z.clear();
+
+	ori_p.clear();
+	ori_b.clear();
+	ori_h.clear();
+	/*
+	flags = CAM_DEFAULT_FLAGS;
+
+	desired_position = position = vmd_zero_vector;
+	
+	translation_velocity = translation_vel_limit = translation_acc_limit = vmd_zero_vector;
+
+	vm_set_identity(&orientation);
+	vm_set_identity(&desired_orientation);
+	rotation_rate = rotation_vel_limit = rotation_acc_limit = vmd_zero_vector;
+	*/
+}
+
+void camera::set_name(char *in_name)
+{
+	if(name != NULL)
+		strncpy(name, in_name, NAME_LENGTH-1);
+}
+
+void camera::set_fov(float in_fov, float in_fov_time, float in_fov_acceleration_time)
+{
+	if(in_fov_time == 0.0f && in_fov_acceleration_time == 0.0f)
+	{
+		flags |= CAM_STATIONARY_FOV;
+		c_fov = in_fov;
+		return;
+	}
+
+	flags &= ~CAM_STATIONARY_FOV;
+	if(in_fov <= 0.0f)
+	{
+		fov.setVD(in_fov_time, in_fov_acceleration_time, 0.0f);
+	}
+
+	fov.setAVD(in_fov, in_fov_time, in_fov_acceleration_time, in_fov_acceleration_time, 0.0f);
+}
+
+void camera::set_object_self(object *objp, int n_object_self_submodel)
+{
+	if(objp == NULL)
+		object_self = object_h();
+
+	object_self = object_h(objp);
+	object_self_submodel = n_object_self_submodel;
+}
+
+void camera::set_object_target(object *objp, int n_object_target_submodel)
+{
+	if(objp == NULL)
+		object_target = object_h();
+
+	object_target = object_h(objp);
+	object_target_submodel = n_object_target_submodel;
+}
+
+//Custom function receives the already-modified current position value.
+//It should be replaced or added to as the custom function modifier sees fit.
+void camera::set_custom_position_function(void (*n_func_custom_position)(camera *cam, vec3d *camera_pos))
+{
+	func_custom_position = n_func_custom_position;
+}
+
+//Custom function receives the already-modified current orientation value.
+//It should be replaced or added to as the custom function modifier sees fit.
+void camera::set_custom_orientation_function(void (*n_func_custom_orientation)(camera *cam, matrix *camera_ori))
+{
+	func_custom_orientation = n_func_custom_orientation;
+}
+
+void camera::set_position(vec3d *in_position, float in_translation_time, float in_translation_acceleration_time)
+{
+	if(in_translation_time == 0.0f && in_translation_acceleration_time == 0.0f)
+	{
+		c_pos = *in_position;
+		flags |= CAM_STATIONARY_POS;
+		return;
+	}
+
+	flags &= ~CAM_STATIONARY_POS;
+	if(in_position == NULL)
+	{
+		pos_x.setVD(in_translation_time, in_translation_acceleration_time, 0.0f);
+		pos_y.setVD(in_translation_time, in_translation_acceleration_time, 0.0f);
+		pos_z.setVD(in_translation_time, in_translation_acceleration_time, 0.0f);
+		return;
+	}
+
+	pos_x.setAVD(in_position->xyz.x, in_translation_time, in_translation_acceleration_time, in_translation_acceleration_time, 0.0f);
+	pos_y.setAVD(in_position->xyz.y, in_translation_time, in_translation_acceleration_time, in_translation_acceleration_time, 0.0f);
+	pos_z.setAVD(in_position->xyz.z, in_translation_time, in_translation_acceleration_time, in_translation_acceleration_time, 0.0f);
+}
+
+void camera::set_translation_velocity(vec3d *in_velocity, float in_acceleration_time)
+{
+	pos_x.setVD(in_acceleration_time, in_acceleration_time, in_velocity->xyz.x);
+	pos_y.setVD(in_acceleration_time, in_acceleration_time, in_velocity->xyz.y);
+	pos_z.setVD(in_acceleration_time, in_acceleration_time, in_velocity->xyz.z);
+}
+
+void camera::set_rotation(matrix *in_orientation, float in_rotation_time, float in_rotation_acceleration_time)
+{
+	if(in_rotation_time == 0.0f && in_rotation_acceleration_time == 0.0f)
+	{
+		c_ori = *in_orientation;
+		flags |= CAM_STATIONARY_ORI;
+		return;
+	}
+
+	angles a;
+	vm_extract_angles_matrix(&a, in_orientation);
+	this->set_rotation(&a, in_rotation_time, in_rotation_acceleration_time);
+	//c_ori = *in_orientation;
+}
+
+void camera::set_rotation(angles *in_angles, float in_rotation_time, float in_rotation_acceleration_time)
+{
+	if(in_angles == NULL)
+	{
+		ori_p.setVD(in_rotation_time, in_rotation_acceleration_time, 0.0f);
+		ori_b.setVD(in_rotation_time, in_rotation_acceleration_time, 0.0f);
+		ori_h.setVD(in_rotation_time, in_rotation_acceleration_time, 0.0f);
+		return;
+	}
+
+	ori_p.setAVD(in_angles->p, in_rotation_time, in_rotation_acceleration_time, in_rotation_acceleration_time, 0.0f);
+	ori_b.setAVD(in_angles->b, in_rotation_time, in_rotation_acceleration_time, in_rotation_acceleration_time, 0.0f);
+	ori_h.setAVD(in_angles->h, in_rotation_time, in_rotation_acceleration_time, in_rotation_acceleration_time, 0.0f);
+}
+
+void camera::set_rotation_facing(vec3d *in_target, float in_rotation_time, float in_rotation_acceleration_time)
+{
+	matrix temp_matrix = IDENTITY_MATRIX;
+
+	if(in_target != NULL)
+	{
+		vec3d position = vmd_zero_vector;
+		this->get_info(&position, NULL);
+
+		if(in_target->xyz.x == position.xyz.x && in_target->xyz.y == position.xyz.y && in_target->xyz.z == position.xyz.z)
+		{
+			Warning(LOCATION, "Camera tried to point to self");
+			return;
+		}
+
+		vec3d targetvec;
+		vm_vec_normalized_dir(&targetvec, in_target, &position);
+		vm_vector_2_matrix(&temp_matrix, &targetvec, NULL, NULL);
+	}
+
+	set_rotation(&temp_matrix, in_rotation_time, in_rotation_acceleration_time);
+}
+
+void camera::set_rotation_velocity(angles *in_rotation_rate, float in_acceleration_time)
+{
+	ori_p.setVD(in_acceleration_time, in_acceleration_time, in_rotation_rate->p);
+	ori_b.setVD(in_acceleration_time, in_acceleration_time, in_rotation_rate->b);
+	ori_h.setVD(in_acceleration_time, in_acceleration_time, in_rotation_rate->h);
+
+	/*if(in_rotation_rate == NULL)
+	{
+		rotation_rate.p = rotation_rate.b = rotation_rate.h = 0.0f;
+
+		rotation_rate_delta_time = rotation_rate_delta_time_left = in_rotation_acceleration_time = 0.0f;
+		rotation_rate_decel_time_til = -1.0f;
+		return;
+	}
+
+	rotation_rate_delta_time = rotation_rate_delta_time_left = in_rotation_acceleration_time;
+	rotation_rate_decel_time_til = -1.0f;
+
+	rotation_rate_delta.p = in_rotation_rate->p / in_rotation_acceleration_time;
+	rotation_rate_delta.b = in_rotation_rate->b / in_rotation_acceleration_time;
+	rotation_rate_delta.h = in_rotation_rate->h / in_rotation_acceleration_time;*/
+}
+
+void camera::do_frame(float in_frametime)
+{
+
+}
+
+object *camera::get_object_self()
+{
+	if(object_self.IsValid())
+		return object_self.objp;
+	else
+		return NULL;
+}
+
+object *camera::get_object_target()
+{
+	if(object_target.IsValid())
+		return object_target.objp;
+	else
+		return NULL;
+}
+
+float camera::get_fov()
+{
+	if(!(flags & CAM_STATIONARY_FOV))
+	{
+		fov.get(&c_fov, NULL);
+	}
+
+	return c_fov;
+}
+
+void camera::get_info(vec3d *position, matrix *orientation)
+{
+	//WTF?
+	if(position == NULL && orientation == NULL)
+		return;
+
+	//POSITION
+	if(!(flags & CAM_STATIONARY_POS))
+	{
+		c_pos = vmd_zero_vector;
+
+		if(object_self.IsValid())
+		{
+			object *objp = object_self.objp;
+			int model_num = object_get_model(objp);
+			polymodel *pm = NULL;
+			
+			if(model_num > -1)
+			{
+				pm = model_get(model_num);
+			}
+
+			if(object_self_submodel < 0 || pm == NULL)
+			{
+				c_pos = objp->pos;
+			}
+			else
+			{
+				model_find_world_point( &c_pos, &vmd_zero_vector, pm->id, object_self_submodel, &objp->orient, &objp->pos );
+			}
+		}
+
+		//Do custom position stuff, if needed
+		if(func_custom_position != NULL)
+		{
+			func_custom_position(this, &c_pos);
+		}
+
+		vec3d pt;
+		pos_x.get(&pt.xyz.x, NULL);
+		pos_y.get(&pt.xyz.y, NULL);
+		pos_z.get(&pt.xyz.z, NULL);
+
+		vm_vec_add2(&c_pos, &pt);
+	}
+
+	if(position != NULL)
+		*position = c_pos;
+
+	//ORIENTATION
+	if(orientation != NULL)
+	{
+		if(!(flags & CAM_STATIONARY_ORI))
+		{
+			if(object_target.IsValid())
+			{
+				object *objp = object_target.objp;
+				int model_num = object_get_model(objp);
+				polymodel *pm = NULL;
+				vec3d target_pos = vmd_zero_vector;
+				
+				//See if we can get the model
+				if(model_num > -1)
+				{
+					pm = model_get(model_num);
+				}
+
+				//If we don't have a submodel or don't have the model use object pos
+				//Otherwise, find the submodel pos as it is rotated
+				if(object_self_submodel < 0 || pm == NULL)
+				{
+					target_pos = objp->pos;
+				}
+				else
+				{
+					model_find_world_point( &target_pos, &vmd_zero_vector, pm->id, object_target_submodel, &objp->orient, &objp->pos );
+				}
+
+				vec3d targetvec;
+				vm_vec_normalized_dir(&targetvec, &target_pos, &c_pos);
+				vm_vector_2_matrix(&c_ori, &targetvec, NULL, NULL);
+			}
+			else if(object_self.IsValid())
+			{
+				c_ori = object_self.objp->orient;
+			}
+			else
+			{
+				c_ori = vmd_identity_matrix;
+			}
+
+			//Do human interaction
+			//WMC - Nevermind for now, maybe toggleable later.
+			/*
+			if ( Viewer_obj == object_self.objp || Viewer_mode & VM_CHASE ) {
+				if ( Viewer_mode & VM_PADLOCK_ANY ) {
+					player_get_padlock_orient(&c_ori);
+				} else {
+					compute_slew_matrix(&c_ori, &Viewer_slew_angles);
+				}
+			}*/
+
+			//Do custom orientation stuff, if needed
+			if(func_custom_orientation != NULL)
+			{
+				func_custom_orientation(this, &c_ori);
+			}
+
+			angles a;
+			ori_p.get(&a.p, NULL);
+			ori_b.get(&a.b, NULL);
+			ori_h.get(&a.h, NULL);
+
+			//vm_rotate_matrix_by_angles(&c_ori, &a);
+			vm_angles_2_matrix(&c_ori, &a);
+		}
+		*orientation = c_ori;
+	}
+}
+//*************************warp_camera*************************
+warp_camera::warp_camera()
+{
+	this->reset();
+}
+warp_camera::warp_camera(object *objp)
+{
+	this->reset();
+
+	vec3d object_pos = objp->pos;
+	matrix tmp;
+	ship_get_eye(&object_pos, &tmp, objp);
+	/*
+	//matrix tmp_m = vmd_identity_matrix;
+	camid cid = ship_get_eye( objp );
+	if(cid.isValid())
+	{
+		camera *cam = cid.getCamera();
+		cam->get_info(&player_pos, NULL);
+		//tmp_m = *cam->get_orientation();
+	}
+	*/
+	vm_vec_scale_add2( &object_pos, &Player_obj->orient.vec.rvec, 0.0f );
+	vm_vec_scale_add2( &object_pos, &Player_obj->orient.vec.uvec, 0.952f );
+	vm_vec_scale_add2( &object_pos, &Player_obj->orient.vec.fvec, -1.782f );
+
+	vec3d tmp_vel = { { { 0.0f, 5.1919f, 14.7f } } };
+
+	this->set_position( &object_pos );
+	this->set_rotation( &objp->orient );
+	this->set_velocity( &tmp_vel, true);
+}
+
+void warp_camera::reset()
+{
+	c_pos = c_vel = c_desired_vel = vmd_zero_vector;
+	c_ori = vmd_identity_matrix;
+	c_damping = 1.0f;
+	c_time = 0.0f;
+}
+
+void warp_camera::set_position( vec3d *in_pos )
+{
+	c_pos = *in_pos;
+}
+
+void warp_camera::set_rotation( matrix *in_ori )
+{
+	c_ori = *in_ori;
+}
+
+void warp_camera::set_velocity( vec3d *in_vel, bool instantaneous )
+{
+	c_desired_vel.xyz.x = 0.0f;
+	c_desired_vel.xyz.y = 0.0f;
+	c_desired_vel.xyz.z = 0.0f;
+
+	vm_vec_scale_add2( &c_desired_vel, &c_ori.vec.rvec, in_vel->xyz.x );
+	vm_vec_scale_add2( &c_desired_vel, &c_ori.vec.uvec, in_vel->xyz.y );
+	vm_vec_scale_add2( &c_desired_vel, &c_ori.vec.fvec, in_vel->xyz.z );
+
+	if ( instantaneous )	{
+		c_vel = c_desired_vel;
+	}
+
+}
+
+//
+void warp_camera::do_frame(float in_frametime)
+{
+	vec3d new_vel, delta_pos;
+
+	apply_physics( c_damping, c_desired_vel.xyz.x, c_vel.xyz.x, in_frametime, &new_vel.xyz.x, &delta_pos.xyz.x );
+	apply_physics( c_damping, c_desired_vel.xyz.y, c_vel.xyz.y, in_frametime, &new_vel.xyz.y, &delta_pos.xyz.y );
+	apply_physics( c_damping, c_desired_vel.xyz.z, c_vel.xyz.z, in_frametime, &new_vel.xyz.z, &delta_pos.xyz.z );
+
+	c_vel = new_vel;
+
+//	mprintf(( "Camera velocity = %.1f,%.1f, %.1f\n", Camera_velocity.xyz.x, Camera_velocity.xyz.y, Camera_velocity.xyz.z ));
+
+	vm_vec_add2( &c_pos, &delta_pos );
+
+	float ot = c_time+0.0f;
+
+	c_time += in_frametime;
+
+	if ( (ot < 0.667f) && ( c_time >= 0.667f ) )	{
+		vec3d tmp;
+		
+		tmp.xyz.z = 4.739f;		// always go this fast forward.
+
+		// pick x and y velocities so they are always on a 
+		// circle with a 25 m radius.
+
+		float tmp_angle = frand()*PI2;
+	
+		tmp.xyz.x = 22.0f * (float)sin(tmp_angle);
+		tmp.xyz.y = -22.0f * (float)cos(tmp_angle);
+
+		//mprintf(( "Angle = %.1f, vx=%.1f, vy=%.1f\n", tmp_angle, tmp.xyz.x, tmp.xyz.y ));
+
+		//mprintf(( "Changing velocity!\n" ));
+		this->set_velocity( &tmp, 0 );
+	}
+
+	if ( (ot < 3.0f ) && ( c_time >= 3.0f ) )	{
+		vec3d tmp = ZERO_VECTOR;
+		this->set_velocity( &tmp, 0 );
+	}
+	
+}
+
+void warp_camera::get_info(vec3d *position, matrix *orientation)
+{
+	if(position != NULL)
+		*position = c_pos;
+
+	if(orientation != NULL)
+		*orientation = c_ori;
+}
+
+//*************************subtitle*************************
+
+#define MAX_SUBTITLE_LINES		64
+subtitle::subtitle(int in_x_pos, int in_y_pos, char* in_text, float in_display_time, char* in_imageanim, float in_fade_time, color *in_text_color, bool center_x, bool center_y, int in_width)
+{
+	// basic init, this always has to be done
+	memset( imageanim, 0, sizeof(imageanim) );
+	image_id = -1;
+
+	if ( ((in_text != NULL) && (strlen(in_text) <= 0)) && ((in_imageanim != NULL) && (strlen(in_imageanim) <= 0)) )
+		return;
+
+
+	int num_text_lines = 0;
+	char *text_line_ptrs[MAX_SUBTITLE_LINES];
+	int text_line_lens[MAX_SUBTITLE_LINES];
+
+	//Setup text
+	if ( (in_text != NULL) && (strlen(in_text) > 0) ) {
+		num_text_lines = split_str(in_text, in_width, text_line_lens, text_line_ptrs, MAX_SUBTITLE_LINES);
+		std::string temp_str;
+		for(int i = 0; i < num_text_lines; i++)
+		{
+			temp_str.assign(text_line_ptrs[i], text_line_lens[i]);
+			text_lines.push_back(temp_str);
+		}
+	}
+
+	//Setup text color
+	if(in_text_color)
+		text_color = *in_text_color;
+	else
+		gr_init_alphacolor(&text_color, 255, 255, 255, 255);
+
+	//Setup display and fade time
+	display_time = fl_abs(in_display_time);
+	fade_time = fl_abs(in_fade_time);
+
+	//Setup image
+	if ( (in_imageanim != NULL) && (strlen(in_imageanim) > 0) )
+	{
+		image_id = bm_load(in_imageanim);
+
+		if (image_id >= 0)
+			strncpy(imageanim, in_imageanim, sizeof(imageanim) - 1);
+	}
+
+	//Setup pos
+	int w=0, h=0, tw=0, th=0;
+	float deltax, deltay;
+	image_pos[0] = 0;
+	image_pos[1] = 0;
+	if(center_x || center_y)
+	{
+		//Get text size
+		for(int i = 0; i < num_text_lines; i++)
+		{
+			gr_get_string_size(&w, &h, text_line_ptrs[i], text_line_lens[i]);
+
+			if(w > tw)
+				tw = w;
+
+			th += h;
+		}
+
+		//Get image size
+		if(image_id != -1)
+		{
+			bm_get_info(image_id, &w, &h);
+			tw += w;
+			if(h > th)
+				th = h;
+		}
+
+		//Center it?
+		if(center_x)
+			image_pos[0] = (gr_screen.max_w - tw)/2;
+		if(center_y)
+			image_pos[1] = (gr_screen.max_h - th)/2;
+	}
+	if(in_x_pos < 0 && !center_x)
+		image_pos[0] += gr_screen.max_w + in_x_pos;
+	else if(!center_x)
+		image_pos[0] += in_x_pos;
+
+	if(in_y_pos < 0 && !center_y)
+		image_pos[1] += gr_screen.max_h + in_y_pos;
+	else if(!center_y)
+		image_pos[1] += in_y_pos;
+
+	if(image_id != -1)
+	{
+		text_pos[0] = image_pos[0] + w;	//Still set from bm_get_info call
+		deltax = text_pos[0] / 1024.0f;	//MikeStar;
+		text_pos[0] = gr_screen.max_w * deltax;	//MikeStar;
+	}
+	else
+	{
+		text_pos[0] = image_pos[0];
+		deltax = text_pos[0] / 1024.0f;	//MikeStar;
+		text_pos[0] = gr_screen.max_w * deltax;	//MikeStar;
+	}
+	text_pos[1] = image_pos[1];
+	deltay = text_pos[1] / 768.0f;	//MikeStar;
+	text_pos[1] = gr_screen.max_h * deltay;	//MikeStar;
+
+	time_displayed = 0.0f;
+	time_displayed_end = 2.0f*fade_time + display_time;
+}
+
+void subtitle::do_frame(float frametime)
+{
+	//Figure out how much alpha
+	if(time_displayed < fade_time)
+	{
+		text_color.alpha = (ubyte)fl2i(255.0f*(time_displayed/fade_time));
+	}
+	else if(time_displayed > time_displayed_end)
+	{
+		//We're finished
+		return;
+	}
+	else if((time_displayed - fade_time) > display_time)
+	{
+		text_color.alpha = (ubyte)fl2i(255.0f*(1-(time_displayed - fade_time - display_time)/fade_time));
+	}
+	else
+	{
+		text_color.alpha = 255;
+	}
+
+	gr_set_color_fast(&text_color);
+
+	int font_height = gr_get_font_height();
+	int y = text_pos[1];
+
+	for(unsigned int i = 0; i < text_lines.size(); i++)
+	{
+		gr_string(text_pos[0], y, (char*)text_lines[i].c_str(), false);
+		y += font_height;
+	}
+
+	if(image_id != -1)
+	{
+		gr_set_bitmap(image_id, GR_ALPHABLEND_FILTER, GR_BITBLT_MODE_NORMAL, text_color.alpha/255.0f);
+		gr_bitmap(image_pos[0], image_pos[1], false);
+	}
+
+	time_displayed += frametime;
+}
+
+subtitle::~subtitle()
+{
+	if (image_id != -1) {
+		if ( bm_release(image_id) ) {
+			image_id = -1;
+		}
+	}
+}
+
+void subtitle::clone(const subtitle &sub)
+{
+	uint i = 0;
+
+	for (i = 0; i < sub.text_lines.size(); i++) {
+		text_lines.push_back(sub.text_lines[i]);
+	}
+
+	text_pos[0] = sub.text_pos[0];
+	text_pos[1] = sub.text_pos[1];
+
+	display_time = sub.display_time;
+	fade_time = sub.fade_time;
+	memcpy( &text_color, &sub.text_color, sizeof(color) );
+
+	if ( strlen(sub.imageanim) ) {
+		memcpy( imageanim, sub.imageanim, MAX_FILENAME_LEN );
+		// we bm_load() again here to kick the refcount up
+		image_id = bm_load(imageanim);
+	} else {
+		memset( imageanim, 0, MAX_FILENAME_LEN );
+		image_id = -1;
+	}
+
+	image_pos[0] = sub.image_pos[0];
+	image_pos[1] = sub.image_pos[1];
+
+	time_displayed = sub.time_displayed;
+	time_displayed_end = sub.time_displayed_end;
+}
+
+const subtitle &subtitle::operator=(const subtitle &sub)
+{
+	if (this != &sub) {
+		if (image_id != -1) {
+			if ( bm_release(image_id) ) {
+				image_id = -1;
+			}
+		}
+
+		clone(sub);
+	}
+
+	return *this;
+}
+
+camid::camid()
+{
+	idx = 0;
+	sig = -1;
+}
+
+camid::camid(int n_idx, int n_sig)
+{
+	idx = n_idx;
+	sig = n_sig;
+}
+
+camera* camid::getCamera()
+{
+	if(!isValid())
+		return NULL;
+
+	return Cameras[idx];
+}
+
+uint camid::getIndex()
+{
+	return idx;
+}
+
+int camid::getSignature()
+{
+	return sig;
+}
+
+bool camid::isValid()
+{
+	if(idx < 0 || idx >= Cameras.size())
+		return false;
+
+	if(Cameras[idx] == NULL)
+		return false;
+	
+	if(Cameras[idx]->get_signature() != this->sig)
+		return false;
+
+	return true;
+}
+
+void cam_init()
+{
+	//Nothing now
+}
+
+void cam_close()
+{
+	//Set Current_camera to nothing
+	Current_camera = camid();
+	for(unsigned int i = 0; i < Cameras.size(); i++)
+	{
+		if(Cameras[i] != NULL)
+		{
+			delete Cameras[i];
+			Cameras[i] = NULL;
+		}
+	}
+	Cameras.clear();
+}
+
+int cam_get_next_sig()
+{
+	static int next_sig = 0;
+	return next_sig++;
+}
+
+camid cam_create(char *n_name, vec3d *n_pos, vec3d *n_norm, object *n_object, int n_object_self_submodel)
+{
+	matrix ori;
+	vm_vector_2_matrix_norm(&ori, n_norm);
+	return cam_create(n_name, n_pos, &ori, n_object, n_object_self_submodel);
+}
+
+camid cam_create(char *n_name, vec3d *n_pos, matrix *n_ori, object *n_object, int n_object_self_submodel)
+{
+	camera *cam = NULL;
+	camid cid;
+
+	//Get signature
+	int sig = cam_get_next_sig();
+
+	//Get name
+	char buf[NAME_LENGTH] = {'\0'};
+	if(n_name == NULL)
+		sprintf(buf, "Camera %d", cid.getSignature());
+	else
+		strncpy(buf, n_name, NAME_LENGTH-1);
+
+	//Find a free slot
+	for(uint i = 0; i < Cameras.size(); i++)
+	{
+		if(Cameras[i] == NULL)
+		{
+			cam = new camera(buf, sig);
+			cid = camid(i, sig);
+			Cameras[i] = cam;
+			break;
+		}
+		else if(Cameras[i]->is_empty())
+		{
+			delete Cameras[i];
+			cam = new camera(buf, sig);
+			cid = camid(i, sig);
+			Cameras[i] = cam;
+		}
+	}
+	if(cam == NULL)
+	{
+		cam = new camera(buf, sig);
+		cid = camid(Cameras.size(), sig);
+		Cameras.push_back(cam);
+	}
+
+	//Set attributes
+	if(n_pos != NULL)
+		cam->set_position(n_pos);
+	if(n_ori != NULL)
+		cam->set_rotation(n_ori);
+	if(n_object != NULL)
+		cam->set_object_self(n_object, n_object_self_submodel);
+
+	return cid;
+}
+
+void cam_delete(camid cid)
+{
+	if(cid.isValid())
+	{
+		cid.getCamera()->clear();
+	}
+}
+
+void cam_do_frame(float frametime)
+{
+	unsigned int i,size=Cameras.size();
+	for(i = 0; i < size; i++)
+	{
+		if(Cameras[i] != NULL)
+			Cameras[i]->do_frame(frametime);
+	}
+}
+
+camid cam_get_camera(uint idx)
+{
+	if(idx < 0 || idx >= Cameras.size())
+		return camid();
+
+	return camid(idx, Cameras[idx]->get_signature());
+}
+
+camid cam_get_current()
+{
+	return Current_camera;
+}
+
+uint cam_get_num()
+{
+	return Cameras.size();
+}
+
+//Looks up camera by name, returns -1 on failure
+camid cam_lookup(char *name)
+{
+	unsigned int i,size=Cameras.size();
+	for(i = 0; i < size; i++)
+	{
+		if(Cameras[i] != NULL && !stricmp(Cameras[i]->get_name(), name))
+			return camid(i, Cameras[i]->get_signature());
+	}
+
+	return camid();
+}
+
+static int Camera_hud_draw_saved = 0;
+
+bool cam_set_camera(camid cid)
+{
+	if(!cid.isValid())
+	{
+		return false;
+	}
+
+	Viewer_mode |= VM_FREECAMERA;
+	Current_camera = cid;
+
+	Camera_hud_draw_saved = hud_get_draw();
+	hud_set_draw(0);
+	return true;
+}
+
+void cam_reset_camera()
+{
+	Viewer_mode &= ~VM_FREECAMERA;
+	hud_set_draw(Camera_hud_draw_saved);
+}
+
+//Functions must delete the original camera after calling this function.
+//Note that due to the esoteric nature of this function, it should not
+//be used outside camera.cpp
+/*
+static avd_camera *cam_upgrade_to_avd(camera *cam)
+{
+	for(uint i = 0; i < Cameras.size(); i++)
+	{
+		if(Cameras[i] == cam)
+			break;
+	}
+
+	if(i == Cameras.size())
+		return NULL;
+
+	avd_camera *avdcam = new avd_camera(cam);
+
+	//Make the switch
+	Cameras[i] = avdcam;
+
+	return avdcam;
+}
+*/
+
+void subtitles_init()
+{
+	//Do nothing!!
+}
+
+void subtitles_close()
+{
+	Subtitles.clear();
+}
+
+void subtitles_do_frame(float frametime)
+{
+	unsigned int i,size=Subtitles.size();
+	for(i = 0; i < size; i++)
+	{
+		Subtitles[i].do_frame(frametime);
+	}
+}

code/camera/camera.h

@@ -0,0 +1,172 @@
+
+
+#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_self;
+	int object_self_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;
+
+	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_self(object *objp, int n_object_self_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);
+
+	void set_position(vec3d *in_position = NULL, float in_translation_time = 0.0f, float in_translation_acceleration_time = 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);
+	void set_rotation(angles *in_angles, float in_rotation_time = 0.0f, float in_rotation_acceleration_time = 0.0f);
+	void set_rotation_facing(vec3d *in_target, float in_rotation_time = 0.0f, float in_rotation_acceleration_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_self();
+	object *get_object_target();
+	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;
+
+//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

code/cfile/cfile.h

@@ -9,13 +9,85 @@
 
 /*
  * $Logfile: /Freespace2/code/CFile/cfile.h $
- * $Revision: 2.6 $
- * $Date: 2002-11-10 16:29:53 $
- * $Author: DTP $
+ * $Revision: 2.22 $
+ * $Date: 2007-11-21 07:28:37 $
+ * $Author: Goober5000 $
  *
  * <insert description of file here>
  *
  * $Log: not supported by cvs2svn $
+ * Revision 2.21  2007/04/11 18:24:27  taylor
+ * cleanup of chksum 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.20  2007/03/22 20:22:24  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.19  2007/02/11 09:31:11  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.18  2006/09/11 05:49:05  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)
+ *
+ * Revision 2.10  2005/01/30 12:50:08  taylor
+ * merge with Linux/OSX tree - p0130
+ *
+ * Revision 2.9  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
+ *
+ * Revision 2.8  2004/05/26 21:02:26  wmcoolmon
+ * Added weapons_expl modular table, updated cfilesystem to work with modular tables, fixed loading order, fixed ship loading error messages
+ *
+ * Revision 2.7  2003/08/20 08:12:08  wmcoolmon
+ * Made cfile_delete return 0 on failure, 1 on success
+ *
+ * Revision 2.6  2002/11/10 16:29:53  DTP
+ * -DTP reworked mod support,
+ *
  * Revision 2.5  2002/11/02 23:06:59  DTP
  * DOh,uhmm, define error again, this is getting to me.
  *
@@ -356,19 +428,10 @@
 #ifndef __CFILE_H__
 #define __CFILE_H__
 
+
 #include <time.h>
 #include "globalincs/pstypes.h"
 
-#if defined _WIN32
-  #define DIR_SEPARATOR_CHAR '\\'
-  #define DIR_SEPARATOR_STR  "\\"
-#elif defined unix
-  #define DIR_SEPARATOR_CHAR '/'
-  #define DIR_SEPARATOR_STR  "/"
-#else
-  #error unknown OS
-#endif
-
 #define CF_EOF (-1)
 
 #define CF_SEEK_SET (0)
@@ -396,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
@@ -441,6 +505,7 @@ typedef struct {
 #define CF_SORT_NONE	0
 #define CF_SORT_NAME 1
 #define CF_SORT_TIME 2
+#define CF_SORT_REVERSE 3
 
 #define cfread_fix(file) (fix)cfread_int(file)
 #define cfwrite_fix(i,file) cfwrite_int(i,file)
@@ -452,6 +517,9 @@ extern int (*Get_file_list_filter)(char *filename);
 // cfile directory. valid after cfile_init() returns successfully
 #define CFILE_ROOT_DIRECTORY_LEN			256
 extern char Cfile_root_dir[CFILE_ROOT_DIRECTORY_LEN];
+#ifdef SCP_UNIX
+extern char Cfile_user_dir[CFILE_ROOT_DIRECTORY_LEN];
+#endif
 
 //================= LOW-LEVEL FUNCTIONS ==================
 // Call this once at the beginning of the program
@@ -472,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);
 
@@ -479,14 +551,22 @@ int cflush(CFILE *cfile);
 // open a file.  Once set, you can use minimum version numbers with the read functions.
 void cf_set_version( CFILE * cfile, int version );
 
-// Deletes a file.
-void cf_delete( char *filename, int dir_type );
+// Deletes a file. Returns 0 on error, 1 if successful
+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();
@@ -545,13 +625,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 ------------------------------------------
 
@@ -583,7 +665,7 @@ ushort cfread_ushort(CFILE *file, int ver = 0, ushort deflt = 0);
 int cfread_int(CFILE *file, int ver = 0, int deflt = 0);
 uint cfread_uint(CFILE *file, int ver = 0, uint deflt = 0);
 float cfread_float(CFILE *file, int ver = 0, float deflt = 0.0f);
-void cfread_vector(vector *vec, CFILE *file, int ver = 0, vector *deflt = NULL);
+void cfread_vector(vec3d *vec, CFILE *file, int ver = 0, vec3d *deflt = NULL);
 void cfread_angles(angles *ang, CFILE *file, int ver = 0, angles *deflt = NULL);
 
 // Reads variable length, null-termined string.   Will only read up
@@ -601,7 +683,7 @@ int cfwrite_uint(uint i, CFILE *file);
 int cfwrite_short(short s, CFILE *file);
 int cfwrite_ushort(ushort s, CFILE *file);
 int cfwrite_ubyte(ubyte u, CFILE *file);
-int cfwrite_vector(vector *vec, CFILE *file);
+int cfwrite_vector(vec3d *vec, CFILE *file);
 int cfwrite_angles(angles *ang, CFILE *file);
 
 // writes variable length, null-termined string.
@@ -619,11 +701,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);

code/cfile/cfilearchive.cpp

@@ -9,14 +9,34 @@
 
 /*
  * $Logfile: /Freespace2/code/CFile/CfileArchive.cpp $
- * $Revision: 2.2 $
- * $Date: 2002-08-01 01:41:04 $
- * $Author: penguin $
+ * $Revision: 2.8 $
+ * $Date: 2006-12-28 00:59:19 $
+ * $Author: wmcoolmon $
  *
  * Low-level code for reading data out of large archive files or normal files.  All
  * reads/seeks come through here.
  *
  * $Log: not supported by cvs2svn $
+ * Revision 2.7  2005/07/24 18:31:17  taylor
+ * little 64-bit strangeness (longs are 64-bit here rather than 32)
+ *
+ * Revision 2.6  2004/07/26 20:47:25  Kazan
+ * remove MCD complete
+ *
+ * Revision 2.5  2004/07/12 16:32:42  Kazan
+ * MCD - define _MCD_CHECK to use memory tracking
+ *
+ * Revision 2.4  2004/03/05 09:01:54  Goober5000
+ * Uber pass at reducing #includes
+ * --Goober5000
+ *
+ * Revision 2.3  2003/03/19 09:05:25  Goober5000
+ * more housecleaning, this time for debug warnings
+ * --Goober5000
+ *
+ * Revision 2.2  2002/08/01 01:41:04  penguin
+ * The big include file move
+ *
  * Revision 2.1  2002/07/29 19:17:21  penguin
  * added #ifdef _WIN32 around windows-specific system headers
  *
@@ -93,9 +113,11 @@
 #include <winbase.h>		/* needed for memory mapping of file functions */
 #endif
 
-#include "globalincs/pstypes.h"
 #include "cfile/cfile.h"
 #include "cfile/cfilearchive.h"
+#include "luaconf.h"
+
+
 
 #define CHECK_POSITION
 
@@ -119,7 +141,8 @@ void cf_init_lowlevel_read_code( CFILE * cfile, int offset, int size )
 		}
 
 		#if defined(CHECK_POSITION) && !defined(NDEBUG)
-			int raw_position = ftell(cb->fp) - cb->lib_offset;
+			int raw_position;
+			raw_position = ftell(cb->fp) - cb->lib_offset;
 			Assert(raw_position == cb->raw_position);
 		#endif
 	}
@@ -151,8 +174,9 @@ int cfeof(CFILE *cfile)
 	Assert(cb->fp != NULL);
 
 	#if defined(CHECK_POSITION) && !defined(NDEBUG)
-	int raw_position = ftell(cb->fp) - cb->lib_offset;
-	Assert(raw_position == cb->raw_position);
+		int raw_position;
+		raw_position = ftell(cb->fp) - cb->lib_offset;
+		Assert(raw_position == cb->raw_position);
 	#endif
 		
 	if (cb->raw_position >= cb->size ) {
@@ -182,8 +206,9 @@ int cftell( CFILE * cfile )
 	Assert(cb->fp != NULL);
 
 	#if defined(CHECK_POSITION) && !defined(NDEBUG)
-	int raw_position = ftell(cb->fp) - cb->lib_offset;
-	Assert(raw_position == cb->raw_position);
+		int raw_position;
+		raw_position = ftell(cb->fp) - cb->lib_offset;
+		Assert(raw_position == cb->raw_position);
 	#endif
 
 	return cb->raw_position;
@@ -231,7 +256,8 @@ int cfseek( CFILE *cfile, int offset, int where )
 	cb->raw_position = goal_position - cb->lib_offset;
 
 	#if defined(CHECK_POSITION) && !defined(NDEBUG)
-		int tmp_offset = ftell(cb->fp) - cb->lib_offset;
+		int tmp_offset;
+		tmp_offset = (int)ftell(cb->fp) - cb->lib_offset;
 		Assert(tmp_offset==cb->raw_position);
 	#endif
 
@@ -277,7 +303,8 @@ int cfread(void *buf, int elsize, int nelem, CFILE *cfile)
 	}		
 
 	#if defined(CHECK_POSITION) && !defined(NDEBUG)
-		int tmp_offset = ftell(cb->fp) - cb->lib_offset;
+		int tmp_offset;
+		tmp_offset = ftell(cb->fp) - cb->lib_offset;
 		Assert(tmp_offset==cb->raw_position);
 	#endif
 
@@ -285,3 +312,29 @@ int cfread(void *buf, int elsize, int nelem, CFILE *cfile)
 
 }
 
+int cfread_lua_number(double *buf, 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);
+
+	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;
+
+}

code/cfile/cfilearchive.h

@@ -9,14 +9,20 @@
 
 /*
  * $Logfile: /Freespace2/code/CFile/CfileArchive.h $
- * $Revision: 2.1 $
- * $Date: 2002-07-07 19:55:58 $
- * $Author: penguin $
+ * $Revision: 2.3 $
+ * $Date: 2005-07-13 02:50:49 $
+ * $Author: Goober5000 $
  *
  * External def's for CfileArchive.cpp.  This should only be used 
  * internally by cfile stuff.
  *
  * $Log: not supported by cvs2svn $
+ * 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
+ *
+ * Revision 2.1  2002/07/07 19:55:58  penguin
+ * Back-port to MSVC
+ *
  * Revision 2.0  2002/06/03 04:02:21  penguin
  * Warpcore CVS sync
  *

code/cfile/cfilelist.cpp

@@ -9,13 +9,31 @@
 
 /*
  * $Logfile: /Freespace2/code/CFile/CfileList.cpp $
- * $Revision: 2.2 $
- * $Date: 2002-08-01 01:41:04 $
- * $Author: penguin $
+ * $Revision: 2.8 $
+ * $Date: 2007-05-20 02:51:08 $
+ * $Author: taylor $
  *
  * Code for doing directory lists and sorts
  *
  * $Log: not supported by cvs2svn $
+ * Revision 2.7  2006/08/20 00:45:10  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
+ *
+ * Revision 2.4  2004/07/17 09:26:00  taylor
+ * add CF_SORT_REVERSE to real sort routine, makes CF_SORT_TIME work again
+ *
+ * Revision 2.3  2004/07/12 16:32:42  Kazan
+ * MCD - define _MCD_CHECK to use memory tracking
+ *
+ * Revision 2.2  2002/08/01 01:41:04  penguin
+ * The big include file move
+ *
  * Revision 2.1  2002/07/29 19:37:21  penguin
  * added #ifdef _WIN32 around windows-specific system headers
  *
@@ -74,6 +92,9 @@
 #include "globalincs/pstypes.h"
 #include "cfile/cfile.h"
 
+
+
+
 // Sorts a list of filenames using the specified sorting method (CF_SORT_*).
 //   n = number of filenames in list to sort
 //   list = list of filenames to be sorted
@@ -141,6 +162,30 @@ void cf_sort_filenames( int n, char **list, int sort, file_list_info *info )
 			incr /= 2;
 		}
 
+		return;
+
+	} 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 (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;
+				}
+			}
+		}
+
 		return;
 	}
 
@@ -148,6 +193,8 @@ void cf_sort_filenames( int n, char **list, int sort, file_list_info *info )
 }
 
 
+#if (0) // these aren't used anywhere now
+
 //	cf_compress - Do Run Length Compression on a block of data. Targa format.
 //
 //	Usage:
@@ -317,6 +364,8 @@ int cf_decompress(char *out, char *in )
 			
 }
 
+#endif // 0
+
 
 // cfread() reads from a file and decompresses it
 //
@@ -329,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;
@@ -342,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;
 				}

code/cfile/cfilesystem.h

@@ -9,9 +9,9 @@
 
 /*
  * $Logfile: /Freespace2/code/CFile/CfileSystem.h $
- * $Revision: 2.0 $
- * $Date: 2002-06-03 04:02:21 $
- * $Author: penguin $
+ * $Revision: 2.5 $
+ * $Date: 2006-04-20 06:32:00 $
+ * $Author: Goober5000 $
  *
  * Functions to keep track of and find files that can exist
  * on the harddrive, cd-rom, or in a pack file on either of those.
@@ -20,6 +20,23 @@
  * 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
+ *
+ * Revision 2.1  2004/03/05 09:01:54  Goober5000
+ * Uber pass at reducing #includes
+ * --Goober5000
+ *
+ * Revision 2.0  2002/06/03 04:02:21  penguin
+ * Warpcore CVS sync
+ *
  * Revision 1.1  2002/05/02 18:03:04  mharris
  * Initial checkin - converted filenames and includes to lower case
  *
@@ -46,6 +63,8 @@
 #ifndef _CFILESYSTEM_H
 #define _CFILESYSTEM_H
 
+#include "cfile/cfile.h"
+
 // Builds a list of all the files
 void cf_build_secondary_filelist( char *cdrom_path );
 void cf_free_secondary_filelist();
@@ -53,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;
@@ -67,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

code/cfilearchiver/cfilearchiver.cpp

@@ -0,0 +1,455 @@
+/*
+ * 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/Cfilearchiver/CfileArchiver.cpp $
+ * $Revision: 2.5 $
+ * $Date: 2007-05-11 03:09:09 $
+ * $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
+ *
+ * Revision 2.1  2003/11/16 09:42:37  Goober5000
+ * clarified and pruned debug spew messages
+ * --Goober5000
+ *
+ * Revision 2.0  2002/06/03 04:02:21  penguin
+ * Warpcore CVS sync
+ *
+ * Revision 1.1  2002/05/02 18:03:04  mharris
+ * Initial checkin - converted filenames and includes to lower case
+ *
+ * 
+ * 2     10/23/98 6:15p Dave
+ *
+ * $NoKeywords: $
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#ifdef _WIN32
+#include <direct.h>
+#include <io.h>
+#include <conio.h>
+#else
+#include <dirent.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#endif
+
+#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;
+FILE *fp_out_hdr = NULL;
+
+typedef struct vp_header {
+	char id[4];
+	int version;
+	int index_offset;
+	int num_files;
+} vp_header;
+
+//vp_header Vp_header;
+
+char archive_dat[1024];
+char archive_hdr[1024];
+
+#define BLOCK_SIZE (1024*1024)
+#define VERSION_NUMBER 2;
+
+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);
+	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 = 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;
+}
+
+void pack_file( char *filespec, char *filename, int filesize, _fs_time_t time_write )
+{
+	char path[1024];
+
+	if ( strstr( filename, ".vp" ))	{
+		// Don't pack yourself!!
+		return;
+	}
+
+	if ( strstr( filename, ".hdr" ))	{
+		// Don't pack yourself!!
+		return;
+	}
+
+	if ( filesize == 0 ) {
+		// Don't pack 0 length files, screws up directory structure!
+		return;
+	}
+
+	if ( strlen(filename) > 31 )	{
+		printf( "Filename '%s' too long\n", filename );
+		exit(1);
+	}
+
+	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 );
+	fswrite_int( (int*)&time_write, fp_out_hdr );
+
+	Total_size += filesize;
+	Num_files++;
+
+	printf( "Packing %s%s%s...", filespec, DIR_SEPARATOR_STR, filename );
+
+	sprintf( path, "%s%s%s", filespec, DIR_SEPARATOR_STR, filename );
+
+
+	FILE *fp = fopen( path, "rb" );
+	
+	if ( fp == NULL )	{
+		printf( "Error opening '%s'\n", path );
+		exit(1);
+	}
+
+	int nbytes, nbytes_read=0;
+
+	do	{
+		nbytes = fread( tmp_data, 1, BLOCK_SIZE, fp );
+		if ( nbytes > 0 )	{
+			fwrite( tmp_data, 1, nbytes, fp_out );
+			nbytes_read += nbytes;
+
+		}
+	} while( nbytes > 0 );
+
+	fclose(fp);
+
+	printf( " %d bytes\n", nbytes_read );
+}
+
+// This function adds a directory marker to the header file
+void add_directory( char * dirname)
+{
+	char path[256];
+	char *pathptr = path;
+	char *tmpptr;
+	int i = 0;
+
+	strcpy(path, dirname);
+
+	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 ) {
+		pathptr = tmpptr+1;
+	}
+
+	fwrite(pathptr, 1, 32, fp_out_hdr);
+	fswrite_int( &i, fp_out_hdr); // timestamp = 0
+
+	Num_files++;
+}
+
+void pack_directory( char * filespec)
+{
+#ifdef _WIN32
+	int find_handle;
+	_finddata_t find;
+#endif
+	char tmp[512];
+	char tmp1[512];
+	char *ts;
+
+	// strip trailing slash
+	ts = filespec + (strlen(filespec) - 1);
+	while ( (*ts == DIR_SEPARATOR_CHAR) && (ts > filespec) )
+		*ts = '\0';
+
+	strcpy( tmp1, filespec );
+
+	add_directory(filespec);
+	strcat( tmp1, DIR_SEPARATOR_STR"*.*" );
+	
+	printf( "In dir '%s'\n", tmp1 );
+
+#ifdef _WIN32
+	find_handle = _findfirst( tmp1, &find );
+	if( find_handle != -1 )	{
+		if ( find.attrib & _A_SUBDIR )	{
+			if (strcmp( "..", find.name) && strcmp( ".", find.name))	{
+				strcpy( tmp, filespec );
+				strcat( tmp, "\\" );
+				strcat( tmp, find.name );
+				pack_directory(tmp);
+			}
+		} else {
+			pack_file( filespec, find.name, find.size, find.time_write );
+		}
+
+		while( !_findnext( find_handle, &find ) )	{
+			if ( find.attrib & _A_SUBDIR )	{
+				if (strcmp( "..", find.name) && strcmp( ".", find.name))	{
+					strcpy( tmp, filespec );
+					strcat( tmp, "\\" );
+					strcat( tmp, find.name );
+					pack_directory(tmp);
+
+				}
+			} else {
+				pack_file( filespec, find.name, find.size, find.time_write );
+			}
+		}
+	}
+#else
+	DIR *dirp;
+	struct dirent *dir;
+
+	dirp = opendir (filespec);
+	if ( dirp ) {
+		while ((dir = readdir(dirp)) != NULL) {
+
+			char fn[MAX_PATH];
+			snprintf(fn, MAX_PATH-1, "%s/%s", filespec, dir->d_name);
+			fn[MAX_PATH-1] = 0;
+			
+			struct stat buf;
+			if (stat(fn, &buf) == -1) {
+				continue;
+			}
+
+			if ( (strcmp(dir->d_name, ".") == 0) || (strcmp(dir->d_name, "..") == 0) ) {
+				continue;
+			}
+
+			if (S_ISDIR(buf.st_mode)) {
+				strcpy( tmp, filespec );
+				strcat( tmp, "/" );
+				strcat( tmp, dir->d_name );
+				pack_directory(tmp);
+			} else {
+				pack_file( filespec, dir->d_name, buf.st_size, buf.st_mtime );
+			}
+		}
+		closedir(dirp);
+	} else {
+		printf("Error: Source directory does not exist!\n");
+		no_dir = 1;
+	}
+#endif
+	add_directory("..");
+}
+
+int verify_directory( char *filespec )
+{
+	char *ts;
+	char *dd;
+
+	// strip trailing '/'
+	ts = filespec+(strlen(filespec)-1);
+	while ( (*ts == DIR_SEPARATOR_CHAR) && (ts > filespec) )
+		*ts = '\0';
+
+	// make sure last directory is named "data", ignoring case
+	dd = filespec + (strlen(filespec) - 4);
+	if ( stricmp( dd, "data" ) )
+		data_error = 1;
+	
+	return data_error;
+}
+
+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( "Directory structure options:\n" );
+	printf( "   Effects                   (.ani .pcx .neb .tga)\n" );
+	printf( "   Fonts                     (.vf)\n" );
+	printf( "   Hud                       (.ani .pcx .tga\n" );
+	printf( "   Interface                 (.pcx .ani .tga)\n" );
+	printf( "   Maps                      (.pcx .ani .tga)\n" );
+	printf( "   Missions                  (.ntl .ssv), FS1(.fsm .fsc), FS2(.fs2 .fc2)\n" );
+	printf( "   Models                    (.pof)\n" );
+	printf( "   Music                     (.wav)\n" );
+	printf( "   Sounds/8b22k              (.wav)\n" );
+	printf( "   Sounds/16b11k             (.wav)\n" );
+	printf( "   Tables                    (.tbl)\n" );
+	printf( "   Voice/Briefing            (.wav)\n" );
+	printf( "   Voice/Command briefings   (.wav)\n" );
+	printf( "   Voice/Debriefing          (.wav)\n" );
+	printf( "   Voice/Personas            (.wav)\n" );
+	printf( "   Voice/Special             (.wav)\n" );
+	printf( "   Voice/Training            (.wav)\n" );
+
+	exit(0);
+}
+
+// we end up #include'ing SDL.h which on Windows and Mac will redfine main() which is something
+// that we don't want since we don't actually link against SDL, this solves the problem...
+#ifdef main
+#undef main
+#endif
+
+int main(int argc, char *argv[] )
+{
+	char archive[1024];
+	char *p;
+
+	if ( argc < 3 )	{
+#ifdef _WIN32
+		printf( "Usage: %s archive_name src_dir\n", argv[0] );
+		printf( "Example: %s freespace c:\\freespace\\data\n", argv[0] );
+		printf( "Creates an archive named freespace out of the\nfreespace data tree\n" );
+		printf( "Press any key to exit...\n" );
+		getch();
+		return 1;
+#else
+		print_instructions();
+#endif
+	}
+
+	strcpy( archive, argv[1] );
+	p = strchr( archive, '.' );
+	if (p) *p = 0;		// remove extension	
+
+	strcpy( archive_dat, archive );
+	strcat( archive_dat, ".vp" );
+
+	strcpy( archive_hdr, archive );
+	strcat( archive_hdr, ".hdr" );
+
+	fp_out = fopen( archive_dat, "wb" );
+	if ( !fp_out )	{
+		printf( "Couldn't open '%s'!\n", archive_dat );
+#ifdef _WIN32
+		printf( "Press any key to exit...\n" );
+		getch();
+		return 1;
+#else
+		exit(1);
+#endif
+	}
+
+	fp_out_hdr = fopen( archive_hdr, "wb" );
+	if ( !fp_out_hdr )	{
+		printf( "Couldn't open '%s'!\n", archive_hdr );
+#ifdef _WIN32
+		printf( "Press any key to exit...\n" );
+		getch();
+		return 1;
+#else
+		exit(2);
+#endif
+	}
+
+	if ( verify_directory( argv[2] ) != 0 ) {
+		printf("Warning! Last directory must be named \"data\" (not case sensitive)\n");
+		exit(3);
+	}
+
+	write_header();
+
+	pack_directory( argv[2] );
+
+	// in case the directory doesn't exist
+	if ( no_dir )
+		exit(4);
+
+	write_header();
+
+	fclose(fp_out);
+	fclose(fp_out_hdr);
+
+	printf( "Data files written, appending index...\n" );
+
+	if (!write_index(archive_hdr, archive_dat)) {
+		printf("Error appending index!\n");
+#ifdef _WIN32
+		printf("Press any key to exit...\n");
+		getch();
+#endif
+		return 1;
+	}
+	
+	printf( "%d total KB.\n", Total_size/1024 );
+	return 0;
+}

code/cfileextractor/cfileextractor.cpp

@@ -0,0 +1,537 @@
+/*
+ * Copyright (C) 2005  Taylor Richards
+ *
+*/
+
+/*
+ * $Logfile: /Freespace2/code/cfileextractor/cfileextractor.cpp $
+ * $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
+ *
+ * Revision 1.4  2005/05/24 20:52:10  taylor
+ * make sure that we recursively create directories for Linux/OSX
+ * replace older recursive mkdir method in cfileextractor with new method
+ *
+ * Revision 1.3  2005/05/24 03:12:27  taylor
+ * get command sanity check right, fixes lowercase on extract too
+ *
+ * Revision 1.2  2005/05/18 01:57:54  taylor
+ * a few help text adjustments and fix some compiler warnings
+ *
+ * Revision 1.1  2005/05/17 21:00:57  taylor
+ * Initial import of cfileextractor, still needs some work but does what it needs to
+ *
+ *
+ * $NoKeywords: $
+ */
+
+#include "cfile/cfile.h"
+#include "globalincs/pstypes.h"
+
+#include <vector>
+#include <iostream>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
+#include <ctime>
+
+#ifdef _WIN32
+#include <direct.h>
+#else
+#include <unistd.h>
+#endif
+
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <errno.h>
+
+
+// /////////////////////////////////////////////////////////////////////////////
+//
+//  GLOBAL FUNCTIONS AND VARIABLES
+//
+
+// 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
+
+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
+
+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_PATH_TOO_LONG	5
+
+typedef struct vp_header {
+	char id[4];  // 'VPVP'
+	int version;
+	int index_offset;  // offset where the file index starts, also a total file data size count
+	int num_files;	// number of files, including each step in the directory structure
+} vp_header;
+
+vp_header VP_Header;
+
+typedef struct vp_fileinfo {
+	// stuff that is actually written to the VP
+	int offset;		// offset of where this file is in the VP
+	int file_size;	// size of file
+	char file_name[CF_MAX_FILENAME_LENGTH];		// filename
+	_fs_time_t write_time;	// date/time in _fs_time_t type (a 32-bit version of time_t)
+
+	// not in the VP
+	char file_path[CF_MAX_PATHNAME_LENGTH];	// file path, generated here and not actually in the VP on a per file basis
+
+   vp_fileinfo() {
+		offset = 0;
+		file_size = 0;
+		file_name[0] = '\0';
+		file_path[0] = '\0';
+		write_time = 0;
+	}
+
+   ~vp_fileinfo() {}
+} vp_fileinfo;
+
+std::vector<vp_fileinfo> VP_FileInfo;
+
+// just like strlwr() but without actually including it here
+void lowercase(char *s)
+{
+	if (s == NULL)
+		return;
+
+	while (*s) {
+		*s = tolower(*s);
+		s++;
+	}
+}
+
+//
+// /////////////////////////////////////////////////////////////////////////////
+
+// /////////////////////////////////////////////////////////////////////////////
+//
+// The useful stuff...
+//
+
+void print_error(int err)
+{
+	switch (err) {
+		case ERR_NO_FP_IN:
+			printf("ERROR: The input file (fp_in) is NULL!  Exiting...\n");
+			break;
+		case ERR_NO_FP_OUT:
+			printf("ERROR: The output file (fp_out) is NULL!  Exiting...\n");
+			break;
+		case ERR_INVALID_VP:
+			printf("ERROR: The specified VP file is invalid!  Exiting...\n");
+			break;
+		case ERR_NO_INDEX:
+			printf("ERROR: No file index is available!  Exiting...\n");
+			break;
+		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;
+	}
+
+	exit(1);
+}
+
+void read_header()
+{
+	fseek(fp_in, 0, SEEK_SET);
+	fread(&VP_Header.id, 1, 4, fp_in);
+	fread(&VP_Header.version, 1, sizeof(int), fp_in);
+	fread(&VP_Header.index_offset, 1, sizeof(int), fp_in);
+	fread(&VP_Header.num_files, 1, sizeof(int), fp_in);
+
+	VP_Header.version = INT_SWAP(VP_Header.version);
+	VP_Header.index_offset = INT_SWAP(VP_Header.index_offset);
+	VP_Header.num_files = INT_SWAP(VP_Header.num_files);
+
+	// check for a valid id (VPVP)
+	if ( (VP_Header.id[0] != 'V') && (VP_Header.id[1] != 'P') && (VP_Header.id[2] != 'V') && (VP_Header.id[3] != 'P') )
+		print_error(ERR_INVALID_VP);
+
+	// the index_offset needs to be greater than the size of vp_header at the very least and there should be at least one file
+	if ( !(VP_Header.index_offset > (int)sizeof(vp_header)) || !(VP_Header.num_files > 1) )
+		print_error(ERR_INVALID_VP);
+
+	
+	have_header = 1;
+}
+
+void read_index(int lc = 0)
+{
+	if (fp_in == NULL)
+		print_error(ERR_NO_FP_IN);
+	else if (!have_header)
+		print_error(ERR_NO_HEADER);
+
+	int i;
+	char path[CF_MAX_PATHNAME_LENGTH];
+
+	fseek(fp_in, VP_Header.index_offset, SEEK_SET);
+
+	memset(path, 0, CF_MAX_PATHNAME_LENGTH);
+
+	for ( i = 0; i < VP_Header.num_files; i++) {
+		vp_fileinfo vpinfo;
+
+		fread(&vpinfo.offset, 1, sizeof(int), fp_in);
+		fread(&vpinfo.file_size, 1, sizeof(int), fp_in);
+		fread(&vpinfo.file_name, 1, CF_MAX_FILENAME_LENGTH, fp_in);
+		fread(&vpinfo.write_time, 1, sizeof(_fs_time_t), fp_in);
+
+		vpinfo.offset = INT_SWAP(vpinfo.offset);
+		vpinfo.file_size = INT_SWAP(vpinfo.file_size);
+		vpinfo.write_time = INT_SWAP(vpinfo.write_time);
+
+		// check if it's a directory and if so then create a path to use for files
+		if (vpinfo.file_size == 0) {
+			// if we get a ".." then drop down in the path
+			if (!strcmp(vpinfo.file_name, "..")) {
+				char *s = strrchr(path, DIR_SEPARATOR_CHAR);
+
+				if (s)
+					*s = '\0';
+
+				// skip, we don't want to add the ".." to the path
+				continue;
+			}
+
+			// don't add the very first directory separator character, easier to clean later
+			if (path[0] != 0)
+				strcat( path, DIR_SEPARATOR_STR );
+
+			// always make directory names lower case for ease of use
+			lowercase( vpinfo.file_name );
+
+			strcat( path, vpinfo.file_name );
+		} // it's a file then
+		else {
+			// lowercase the filename if wanted
+			if (lc == 1)
+				lowercase( vpinfo.file_name );
+
+			strcpy( vpinfo.file_path, path );
+			VP_FileInfo.push_back(vpinfo);
+		}
+	}
+
+	have_index = 1;
+}
+
+void extract_all_files(char *file)
+{
+	if (fp_in == NULL)
+		print_error(ERR_NO_FP_IN);
+	else if (!have_header)
+		print_error(ERR_NO_HEADER);
+	else if (!have_index)
+		print_error(ERR_NO_INDEX);
+
+	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;
+
+	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
+		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];
+
+		while (c++) {
+			c = strchr(c, DIR_SEPARATOR_CHAR);
+
+			if (c) {
+				*c = '\0';	// NULL at DIR_SEP char
+
+#ifdef _WIN32
+				status = _mkdir(path);
+#else
+				status = mkdir(path, 0777);
+#endif
+
+				m_error = errno;
+
+				if (status && (m_error != EEXIST) ) {
+					printf("Cannot mkdir %s: %s\n", VP_FileInfo[i].file_path, strerror(m_error));
+					continue;
+				}
+
+				*c = DIR_SEPARATOR_CHAR;  // replace DIR_SEP char
+			}
+		}
+
+		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);
+
+		// 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);
+
+		if (fp_out == NULL) {
+			printf("can't create file!\n");
+			continue;
+		}
+
+		nbytes_remaining = VP_FileInfo[i].file_size;
+
+		while ( nbytes_remaining > 0 ) {
+			nbytes = fread( tmp_data, 1, MIN(BLOCK_SIZE, nbytes_remaining), fp_in );
+
+			if (nbytes > 0) {
+				fwrite( tmp_data, 1, nbytes, fp_out );
+				nbytes_remaining -= nbytes;
+			}
+		}
+
+		printf("done!\n");
+
+		fclose(fp_out);
+		fp_out = NULL;
+	}
+
+	printf("\n");
+}
+
+// TODO: the formatting of this is a bit loco but I don't care enough to make it better...
+void list_all_files(char *file)
+{
+	char out_time[20];
+	float one_k = 1024.0f;
+	float one_m = 1048576.0f;
+	char m;
+	float div_by;
+	time_t plat_time;
+
+	// if we don't have an index then bail
+	if (!have_index)
+		print_error(ERR_NO_INDEX);
+
+	
+	printf("VP file extractor - version 0.6\n");
+	printf("\n");
+	printf("%s:\n", file);
+	printf("\n");
+
+	printf("  Name                          Size     Offset      Date/Time         Path\n");
+	printf("-------------------------------------------------------------------------------\n");
+	for (uint i = 0; i < VP_FileInfo.size(); i++) {
+		plat_time = VP_FileInfo[i].write_time;  // gets rid of some platform strangeness this way
+		strftime(out_time, 32, "%F %H:%M", localtime(&plat_time)); // YYYY-mm-dd HH:mm  (ISO 8601 date format, 24-hr time)
+
+		if (VP_FileInfo[i].file_size > (int)one_m) {
+			m = 'M';
+			div_by = one_m;
+		} else {
+			m = 'K';
+			div_by = one_k;
+		}
+
+		int len = strlen( VP_FileInfo[i].file_name );
+		printf("%s  %*.1f%c %10i %18s %3s%s\n", VP_FileInfo[i].file_name, 33 - len, (float)VP_FileInfo[i].file_size/div_by, m, VP_FileInfo[i].offset, out_time, DIR_SEPARATOR_STR, VP_FileInfo[i].file_path);
+	}
+
+	printf("\n");
+
+	// we use the vector size here since VP_Header.num_files would include each entry
+	// in the directory tree as well as individual files and that artificially inflates
+	// the number of files that we show or would extract
+	printf("Total files: %i\n", (int)VP_FileInfo.size());
+
+	// yeah, I'm just that cheap
+	if (VP_Header.index_offset > (int)one_m) {
+		m = 'M';
+		div_by = one_m;
+	} else {
+		m = 'K';
+		div_by = one_k;
+	}
+
+	printf("Total size:  %.1f%c\n", (float)VP_Header.index_offset/div_by, m);
+
+	printf("\n");
+}
+
+void help()
+{
+	printf("VP file extractor - version 0.6\n");
+	printf("\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");
+	printf("  -l | --list           List all files in VP archive.\n");
+	printf("  -h | --help           Show this help text.\n");
+	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");
+}
+
+// we end up #include'ing SDL.h which on Windows and Mac will redfine main() which is something
+// that we don't want since we don't actually link against SDL, this solves the problem...
+#ifdef main
+#undef main
+#endif
+
+int main(int argc, char *argv[])
+{
+	int extract = 0, lc = 0, list = 0;
+
+	if (argc < 2) {
+		help();
+		return 0;
+	}
+
+	if (!strcmp(argv[1], "-h") || !strcmp(argv[1], "--help")) {
+		help();
+		return 0;
+	}
+
+	// the last option should always be the VP file that we want
+	fp_in = fopen(argv[argc-1], "rb");
+
+	if (fp_in == NULL)
+		print_error(ERR_NO_FP_IN);
+
+	// 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")) {
+			if (list) {
+				help();
+				exit(0);
+			}
+			extract = 1;
+		} else if (!strcmp(argv[i], "-L") || !strcmp(argv[i], "--lowercase")) {
+			lc = 1;
+		} else if (!strcmp(argv[i], "-l") || !strcmp(argv[i], "--list")) {
+			if (extract) {
+				help();
+				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;
+		}
+	}
+
+	// read the file index, make all filenames lowercase if wanted
+	read_index( lc );
+
+	if (extract) {
+		extract_all_files( argv[argc-1] );
+		return 0;
+	} else if (list) {
+		list_all_files( argv[argc-1] );
+		return 0;
+	} else {
+		// if only -L is specified or no command is specified then just list files
+		list_all_files( argv[argc-1] );
+		return 0;
+	}
+
+	return 0;
+}

code/cmdline/cmdline.h

@@ -0,0 +1,724 @@
+/*
+ * 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/Cmdline/cmdline.h $
+
+ * $Revision: 2.95 $
+ * $Date: 2007-04-11 18:24:27 $
+ * $Author: taylor $
+ *
+ * $Log: not supported by cvs2svn $
+ * Revision 2.94  2007/01/10 01:40:43  taylor
+ * little bit of cleanup
+ * per earlier discussions: remove -jpgtga and -pcx32
+ *
+ * Revision 2.93  2006/11/16 00:50:00  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.92  2006/07/08 18:11:33  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.91  2006/06/27 04:55:53  taylor
+ * add -disable_fbo to troubleshoot crappy ATI drivers
+ * remove the temporary -alpha_alpha_blend option
+ * tack on an extra byte to the flags.lch file so that the launcher can easily detect if it's an OpenAL build or not
+ *
+ * Revision 2.90  2006/06/15 00:37:11  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
+ *
+ * Revision 2.71  2005/07/07 16:32:33  taylor
+ * compiler warning fixes
+ * add -noibx troubleshooting cmdline option to disable use of IBX files
+ * don't try to set thuster object number is only one thruster bank is specified (default method should go into affect)
+ *
+ * Revision 2.70  2005/06/29 18:46:13  taylor
+ * add option to not scale up movies to fit window/screen, default is to scale
+ * (arguably not a bug but I said I would get it in before 3.6.5 and forgot)
+ *
+ * Revision 2.69  2005/03/13 23:07:35  taylor
+ * enable 32-bit to 16-bit TGA conversion with -tga16 cmdline option (experimental)
+ * fix crash when upgrading from original campaign stats file to current
+ *
+ * Revision 2.68  2005/02/16 10:00:13  wmcoolmon
+ * "-ingame" command line option
+ *
+ * Revision 2.67  2005/01/30 12:50:08  taylor
+ * merge with Linux/OSX tree - p0130
+ *
+ * Revision 2.66  2005/01/29 16:30:46  phreak
+ * smart shield command line stuff.  this will be changed in the future, but i want people to test it.
+ * -phreak
+ *
+ * Revision 2.65  2005/01/21 08:29:04  taylor
+ * add -rlm cmdline option to switch to local viewpoint lighting calculations (OGL only for now)
+ *
+ * Revision 2.64  2004/12/24 19:36:12  Goober5000
+ * resorted command-line options and added an option for WMC's ballistic gauge
+ * --Goober5000
+ *
+ * Revision 2.63  2004/11/23 19:29:13  taylor
+ * fix 2d warp in D3D, add cmdline option for 3d warp
+ *
+ * Revision 2.62  2004/09/10 13:51:20  et1
+ * Command line option for TBP for warp stuff, "-tbpwarpeffects"
+ *
+ * Revision 2.61  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
+ *
+ * Revision 2.60  2004/08/02 22:40:59  phreak
+ * added -orbradar to enable orb rendering for the radar
+ *
+ * Revision 2.59  2004/08/01 02:31:18  phreak
+ * -phreak command line changed to -dualscanlines
+ *
+ * Revision 2.58  2004/07/25 18:46:28  Kazan
+ * -fred_no_warn has become -no_warn and applies to both fred and fs2
+ * added new ai directive (last commit) and disabled afterburners while performing AIM_WAYPOINTS or AIM_FLY_TO_SHIP
+ * fixed player ship speed bug w/ player-use-ai, now stays in formation correctly and manages speed
+ * made -radar_reduce ignore itself if no parameter is given (ignoring launcher bug)
+ *
+ * Revision 2.57  2004/07/05 05:09:15  bobboau
+ * FVF code, only the data that is needed is sent off to the card,,
+ * OGL can take advantage of this if they want but it won't break
+ * anything if they don't. also state block code has been implemented,
+ * that's totaly internal to D3D no high level code is involved.
+ *
+ * Revision 2.56  2004/06/19 22:15:48  wmcoolmon
+ * Added -nomotion debris command line option; also re-ordered categories.
+ *
+ * Revision 2.55  2004/06/06 12:25:19  randomtiger
+ * Added new compression option -pcx32dds, build posted in RSB forum.
+ * Changed flag because of launcher bug, have fixed launcher bug, will distribute later.
+ * Also removed experimental flag from launcher flag list, stupid people were reporting bugs on unfinished code.
+ *
+ * Revision 2.54  2004/04/26 18:23:47  Kazan
+ * -no_fps_capping
+ *
+ * Revision 2.53  2004/04/26 00:23:26  taylor
+ * novbo and snd_preload cmdline options, fix moddir getting appended space
+ *
+ * Revision 2.52  2004/04/18 19:39:12  randomtiger
+ * Added -2d_poof command which allows access to 2D poof rendering
+ * Added -radar_reduce to launcher flag description structure
+ *
+ * Revision 2.51  2004/04/03 18:11:20  Kazan
+ * FRED fixes
+ *
+ * Revision 2.50  2004/03/20 14:47:12  randomtiger
+ * Added base for a general dynamic batching solution.
+ * Fixed NO_DSHOW_CODE code path bug.
+ *
+ * Revision 2.49  2004/03/19 14:51:54  randomtiger
+ * New command line parameter: -d3d_lesstmem causes D3D to bypass V's secondry texture system.
+ *
+ * Revision 2.48  2004/03/19 11:44:04  randomtiger
+ * Removed -d3d_notmanaged param.
+ * Tided D3D texture code. Merged remaining section code into the rest of the system.
+ * Prepared for removal of code causing waste of memory for secondry store of textures.
+ *
+ * Revision 2.47  2004/02/27 04:09:55  bobboau
+ * fixed a Z buffer error in HTL submodel rendering,
+ * and glow points,
+ * and other stuff
+ *
+ * Revision 2.46  2004/02/16 11:47:31  randomtiger
+ * Removed a lot of files that we dont need anymore.
+ * Changed htl to be on by default, command now -nohtl
+ * Changed D3D to use a 2D vertex for 2D operations which should cut down on redundant data having to go though the system.
+ * Added small change to all -start_mission flag to take you to any mission by filename, very useful for testing.
+ * Removed old dshow code and took away timerbar compile flag condition since it uses a runtime flag now.
+ *
+ * Revision 2.45  2004/01/29 01:34:00  randomtiger
+ * Added malloc montoring system, use -show_mem_usage, debug exes only to get an ingame list of heap usage.
+ * Also added -d3d_notmanaged flag to activate non managed D3D path, in experimental stage.
+ *
+ * Revision 2.44  2004/01/24 14:31:27  randomtiger
+ * Added the D3D particle code, its not bugfree but works perfectly on my card and helps with the framerate.
+ * Its optional and off by default, use -d3d_particle to activiate.
+ * Also bumped up D3D ambient light setting, it was way too dark.
+ * Its now set to something similar to the original game.
+ *
+ * Revision 2.43  2003/12/08 22:30:02  randomtiger
+ * Put render state and other direct D3D calls repetition check back in, provides speed boost.
+ * Fixed bug that caused fullscreen only crash with DXT textures
+ * Put dithering back in for tgas and jpgs
+ *
+ * Revision 2.42  2003/12/04 20:39:09  randomtiger
+ * Added DDS image support for D3D
+ * Added new command flag '-ship_choice_3d' to activate 3D models instead of ani's in ship choice, feature now off by default
+ * Hopefully have fixed D3D text batching bug that caused old values to appear
+ * Added Hud_target_object_factor variable to control 3D object sizes of zoom in HUD target
+ * Fixed jump nodes not showing
+ *
+ * Revision 2.41  2003/12/03 19:27:00  randomtiger
+ * Changed -t32 flag to -jpgtga
+ * Added -query_flag to identify builds with speech not compiled and other problems
+ * Now loads up launcher if videocard reg entry not found
+ * Now offers to go online to download launcher if its not present
+ * Changed target view not to use lower res texture, hi res one is already chached so might as well use it
+ *
+ * Revision 2.40  2003/11/29 10:52:09  randomtiger
+ * Turned off D3D file mapping, its using too much memory which may be hurting older systems and doesnt seem to be providing much of a speed benifit.
+ * Added stats command for ingame stats on memory usage.
+ * Trys to play intro.mve and intro.avi, just to be safe since its not set by table.
+ * Added fix for fonts wrapping round in non standard hi res modes.
+ * Changed D3D mipmapping to a good value to suit htl mode.
+ * Added new fog colour method which makes use of the bitmap, making this htl feature backcompatible again.
+ *
+ * Revision 2.39  2003/11/19 20:37:23  randomtiger
+ * Almost fully working 32 bit pcx, use -pcx32 flag to activate.
+ * Made some commandline variables fit the naming standard.
+ * Changed timerbar system not to run pushes and pops if its not in use.
+ * Put in a note about not uncommenting asserts.
+ * Fixed up a lot of missing POP's on early returns?
+ * Perhaps the motivation for Assert functionality getting commented out?
+ * Fixed up some bad asserts.
+ * Changed nebula poofs to render in 2D in htl, it makes it look how it used to in non htl. (neb.cpp,1248)
+ * Before the poofs were creating a nasty stripe effect where they intersected with ships hulls.
+ * Put in a special check for the signs of that D3D init bug I need to lock down.
+ *
+ * Revision 2.38  2003/11/15 18:09:33  randomtiger
+ * Put TGA and JPG stuff on -t32 flag
+ * Put 32 bit PCX stuff on -pcx32 (still has bugs)
+ * Added multisample checking on device initialisation
+ * Changed unrecognised parameter message (as requested) to be more user friendly
+ * Speech now chooses voice based on reg value set by launcher v3.1
+ *
+ * Revision 2.37  2003/11/09 06:31:38  Kazan
+ * a couple of htl functions being called in nonhtl (ie NULL functions) problems fixed
+ * conflicts in cmdline and timerbar.h log entries
+ * cvs stopped acting like it was on crack obviously
+ *
+ * Revision 2.36  2003/11/09 04:09:18  Goober5000
+ * edited for language
+ * --Goober5000
+ *
+ * Revision 2.35  2003/11/08 22:25:47  Kazan
+ * Timerbar was enabled in both release and debug - so i made it a command line option "-timerbar"
+ * DONT MESS WITH OTHER PEOPLES INCLUDE PATHS
+ * DONT MESS WITH EXEC NAMES (leave it fs2_open_r and fs2_open_d) or paths!
+ *
+ * Revision 2.34  2003/11/03 18:07:26  randomtiger
+ * Added -d3d_no_vsync command to make turning off vsync optional.
+ * Removed 32bit command, it doesnt do anything.
+ * Made aa multisample reg check safe.
+ *
+ * Revision 2.33  2003/10/27 23:04:20  randomtiger
+ * Added -no_set_gamma flags
+ * Fixed up some more non standard res stuff
+ * Improved selection of device type, this includes using a pure device when allowed which means dev should not use Get* functions in D3D
+ * Made fade in credits work
+ * Stopped a call to gr_reser_lighting() in non htl mode when the pointer was NULL, was causing a crash loading a fogged level
+ * Deleted directx8 directory content, has never been needed.
+ *
+ * Revision 2.32  2003/10/24 17:35:04  randomtiger
+ * Implemented support for 32bit TGA and JPG for D3D
+ * Also 32 bit PCX, but it still has some bugs to be worked out
+ * Moved convert_24_to_16 out of the bitmap pfunction structures and into packunpack.cpp because thats the only place that uses it.
+ *
+ * Revision 2.31  2003/10/17 17:18:42  randomtiger
+ * Big restructure for D3D and new modules grd3dlight and grd3dsetup
+ *
+ * Revision 2.30  2003/10/12 03:41:37  Kazan
+ * #Kazan# FS2NetD client code gone multithreaded, some Fred2 Open -mod stuff [obvious code.lib] including a change in cmdline.cpp, changed Stick's "-nohtl" to "-htl" - HTL is _OFF_ by default here (Bobboau and I decided this was a better idea for now)
+ *
+ * Revision 2.29  2003/09/25 21:12:22  Kazan
+ * ##Kazan## FS2NetD Completed!  Just needs some thorough bug checking (i don't think there are any serious bugs)
+ * Also D3D8 Screenshots work now.
+ *
+ * Revision 2.28  2003/09/23 02:42:52  Kazan
+ * ##KAZAN## - FS2NetD Support! (FS2 Open PXO) -- Game Server Listing, and mission validation completed - stats storing to come - needs fs2open_pxo.cfg file [VP-able]
+ *
+ * Revision 2.27  2003/09/14 19:00:02  wmcoolmon
+ * Changed "nospec" and "cell" to "Cmdline_nospec" and "Cmdline_cell"
+ *
+ * Revision 2.26  2003/09/14 18:32:24  wmcoolmon
+ * Added "-safeloading" command line parameter, which uses old fs2_retail-style loading code -C
+ *
+ * Revision 2.25  2003/09/13 06:02:05  Goober5000
+ * clean rollback of all of argv's stuff
+ * --Goober5000
+ *
+ * Revision 2.23  2003/08/22 07:35:08  bobboau
+ * specular code should be bugless now,
+ * cell shadeing has been added activated via the comand line '-cell',
+ * 3D shockwave models, and a transparency method I'm calling edge and center alpha that could be usefull for other things, ask for details
+ *
+ * Revision 2.22  2003/08/21 20:54:37  randomtiger
+ * Fixed switching - RT
+ *
+ * Revision 2.21  2003/08/12 03:18:33  bobboau
+ * Specular 'shine' mapping;
+ * useing a phong lighting model I have made specular highlights
+ * that are mapped to the model,
+ * rendering them is still slow, but they look real purdy
+ *
+ * also 4 new (untested) comand lines, the XX is a floating point value
+ * -spec_exp XX
+ * the n value, you can set this from 0 to 200 (actualy more than that, but this is the recomended range), it will make the highlights bigger or smaller, defalt is 16.0 so start playing around there
+ * -spec_point XX
+ * -spec_static XX
+ * -spec_tube XX
+ * these are factors for the three diferent types of lights that FS uses, defalt is 1.0,
+ * static is the local stars,
+ * point is weapons/explosions/warp in/outs,
+ * tube is beam weapons,
+ * for thouse of you who think any of these lights are too bright you can configure them you're self for personal satisfaction
+ *
+ * Revision 2.20  2003/08/09 06:07:23  bobboau
+ * slightly better implementation of the new zbuffer thing, it now checks only three diferent formats defalting to the 16 bit if neither the 24 or 32 bit versions are suported
+ *
+ * Revision 2.19  2003/03/29 09:42:05  Goober5000
+ * made beams default shield piercing again
+ * also added a beam no pierce command line flag
+ * and fixed something else which I forgot :P
+ * --Goober5000
+ *
+ * Revision 2.18  2003/03/18 10:07:00  unknownplayer
+ * 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.17  2003/02/22 04:13:17  wmcoolmon
+ * Added "-dshowvid" command-line option, which must be set in order for movies to play.
+ *
+ * Revision 2.16  2002/12/21 13:39:25  DTP
+ * did bit more house keeping. modfied Phreaks fps cmdline a bit, so that we dont have to specific build code.libs for fred, but can use the same code.lib for both fs2_open.exe and fred2_open.exe
+ *
+ * Revision 2.15  2002/12/17 03:08:18  DTP
+ * fix to Show_framerate. seems it will call an unresolved external error during fred builds. modified my ifndefs a bit, dsw modified to include preprocessor tag FRED.
+ *
+ * Revision 2.14  2002/12/17 02:22:34  DTP
+ * wrong name :)
+ *
+ * Revision 2.13  2002/12/17 02:21:06  DTP
+ * cleaned up after phreak :). it will make a mess in debug builds. added a couple of ifndef _debugs.
+ *
+ * Revision 2.12  2002/11/10 16:30:53  DTP
+ * -DTP reworked mod support,
+ *
+ * Revision 2.11  2002/10/31 21:14:16  DTP
+ * DTP Quickly added something needed to cmdline.h, since otherwise we can not compile the code as it misses some externals. Thought a rollback rolled all back.
+ *
+ * Revision 2.10  2002/10/30 20:22:30  inquisitor
+ * Bad Committ, Rolling back
+ *
+ * Revision 2.7  2002/10/22 23:02:39  randomtiger
+ * Made Phreaks alternative scanning style optional under the command line tag "-phreak"
+ * Fixed bug that changes HUD colour when targetting debris in a full nebula. - RT
+ *
+ * Revision 2.6  2002/10/19 03:50:28  randomtiger
+ * Added special pause mode for easier action screenshots.
+ * Added new command line parameter for accessing all single missions in tech room. - RT
+ *
+ * Revision 2.5  2002/08/27 13:38:57  penguin
+ * Moved DirectX8 stuff to directx8 branch; reverted to previous
+ *
+ * Revision 2.3.2.4  2002/11/10 11:32:29  randomtiger
+ *
+ * Made D3D8 mipmapping optional on command line flag -d3dmipmip, off by default.
+ * When on is now less blury. - RT
+ *
+ * Revision 2.3.2.3  2002/11/04 23:53:24  randomtiger
+ *
+ * Added new command line parameter -d3dlauncher which brings up the launcher.
+ * This is needed since FS2 DX8 now stores the last successful details in the registry and
+ * uses them to choose the adapter and mode to run in unless its windowed or they are not set.
+ * Added some code for Antialiasing but it messes up the font but hopefully that can be fixed later. - RT
+ *
+ * Revision 2.3.2.2  2002/11/04 21:24:59  randomtiger
+ *
+ * When running in D3D all ani's are memory mapped for speed, this takes up more memory but stops gametime locking of textures which D3D8 hates.
+ * Added new command line tag Cmdline_d3dlowmem for people who dont want to make use of this because they have no memory.
+ * Cleaned up some more texture stuff enabled console debug for D3D.
+ *
+ * Revision 2.3.2.1  2002/08/27 13:19:02  penguin
+ * Moved to directx8 branch
+ *
+ * Revision 2.4  2002/08/18 19:48:28  randomtiger
+ * Added new lib files: strmiids and ddraw to get dshow working
+ * Added new command line parameter to active direct show movie play: -dshowvid
+ * Uncommented movie_play calls and includes
+ *
+ * Revision 2.3  2002/08/07 00:44:13  DTP
+ * Implented -GF4FIX commandline switch
+ *
+ * Revision 2.2  2002/07/29 06:35:15  DTP
+ * added -almission commandline arguement, will autoload mission i.e fs2_open.exe -almission kickass will autoload kickass.fs2 which should be a multiplayer mission.
+ *
+ * Revision 2.1  2002/07/07 19:55:58  penguin
+ * Back-port to MSVC
+ *
+ * Revision 2.0  2002/06/03 04:02:21  penguin
+ * Warpcore CVS sync
+ *
+ * Revision 1.2  2002/05/08 17:29:17  mharris
+ * more port tweaks
+ *
+ * Revision 1.1  2002/05/02 18:03:04  mharris
+ * Initial checkin - converted filenames and includes to lower case
+ *
+ * 
+ * 8     8/26/99 8:51p Dave
+ * Gave multiplayer TvT messaging a heavy dose of sanity. Cheat codes.
+ * 
+ * 7     7/15/99 3:07p Dave
+ * 32 bit detection support. Mouse coord commandline.
+ * 
+ * 6     7/13/99 1:15p Dave
+ * 32 bit support. Whee!
+ * 
+ * 5     6/22/99 9:37p Dave
+ * Put in pof spewing.
+ * 
+ * 4     1/12/99 5:45p Dave
+ * Moved weapon pipeline in multiplayer to almost exclusively client side.
+ * Very good results. Bandwidth goes down, playability goes up for crappy
+ * connections. Fixed object update problem for ship subsystems.
+ * 
+ * 3     11/17/98 11:12a Dave
+ * Removed player identification by address. Now assign explicit id #'s.
+ * 
+ * 2     10/07/98 10:52a Dave
+ * Initial checkin.
+ * 
+ * 1     10/07/98 10:48a Dave
+ * 
+ * 27    9/15/98 4:04p Allender
+ * added back in the -ip_addr command line switch because it needs to be
+ * in the standalone server only executable
+ * 
+ * 26    9/14/98 11:28a Allender
+ * support for server bashing of address when received from client.  Added
+ * a cmdline.cfg file to process command line arguments from a file
+ * 
+ * 25    9/08/98 2:20p Allender
+ * temporary code to force IP address to a specific value.
+ * 
+ * 24    8/20/98 5:30p Dave
+ * Put in handy multiplayer logfile system. Now need to put in useful
+ * applications of it all over the code.
+ * 
+ * 23    8/07/98 10:40a Allender
+ * new command line flags for starting netgames.  Only starting currently
+ * works, and PXO isn't implemented yet
+ * 
+ * 22    7/24/98 11:14a Allender
+ * start of new command line options for version 1.04
+ * 
+ * 21    5/21/98 1:50a Dave
+ * Remove obsolete command line functions. Reduce shield explosion packets
+ * drastically. Tweak PXO screen even more. Fix file xfer system so that
+ * we can guarantee file uniqueness.
+ * 
+ * 20    5/18/98 9:10p Dave
+ * Put in many new PXO features. Fixed skill level bashing in multiplayer.
+ * Removed several old command line options. Put in network config files.
+ * 
+ * 19    5/09/98 7:16p Dave
+ * Put in CD checking. Put in standalone host password. Made pilot into
+ * popup scrollable.
+ * 
+ * 18    4/23/98 8:27p Allender
+ * basic support for cutscene playback.  Into movie code in place.  Tech
+ * room can view cutscenes stored in CDROM_dir variable
+ * 
+ * 17    3/14/98 2:48p Dave
+ * Cleaned up observer joining code. Put in support for file xfers to
+ * ingame joiners (observers or not). Revamped and reinstalled pseudo
+ * lag/loss system.
+ * 
+ * 16    1/31/98 4:32p Dave
+ * Put in new support for VMT player validation, game logging in and game
+ * logging out.
+ * 
+ * 15    12/10/97 4:45p Dave
+ * Added in more detailed support for multiplayer packet lag/loss. Fixed
+ * some multiplayer stuff. Added some controls to the standalone.
+ * 
+ * 14    12/09/97 6:14p Lawrance
+ * add -nomusic flag
+ * 
+ * 13    11/28/97 7:04p Dave
+ * Emergency checkin due to big system crash.
+ * 
+ * 12    11/28/97 5:06p Dave
+ * Put in facilities for simulating multiplayer lag.
+ * 
+ * 11    11/24/97 5:42p Dave
+ * Fixed a file xfer buffer free/malloc problem. Lengthened command line
+ * switch string parse length.
+ * 
+ * 10    11/12/97 4:39p Dave
+ * Put in multiplayer campaign support parsing, loading and saving. Made
+ * command-line variables better named. Changed some things on the initial
+ * pilot select screen.
+ * 
+ * 9     11/11/97 4:54p Dave
+ * Put in support for single vs. multiplayer pilots. Put in initial player
+ * selection screen (no command line option yet). Started work on
+ * multiplayer campaign file save gaming.
+ * 
+ * 8     9/18/97 10:13p Dave
+ * Added -gimmemedals, which gives the current pilot all the medals in the
+ * game (debug)
+ * 
+ * 7     9/18/97 9:20a Dave
+ * Minor modifications
+ * 
+ * 6     9/15/97 11:40p Lawrance
+ * remove demo granularity switch
+ * 
+ * 5     9/03/97 5:03p Lawrance
+ * add support for -nosound command line parm
+ * 
+ * 4     8/21/97 4:55p Dave
+ * Added a switch for multiplayer chat streaming. Added a section for
+ * global command line vars.
+ * 
+ * 3     8/06/97 2:26p Dave
+ * Made the command line parse more robust. Made it easier to add and
+ * process new command-line switches.
+ * 
+ * 2     8/04/97 3:13p Dave
+ * Added command line functions. See cmdline.cpp for directions on adding
+ * new switches
+ * 
+ * 1     8/04/97 9:58a Dave
+ * 
+ * $NoKeywords: $
+ */
+#ifndef FS_CMDLINE_HEADER_FILE
+#define FS_CMDLINE_HEADER_FILE
+
+
+int parse_cmdline(char *cmdline);
+
+int fred2_parse_cmdline(int argc, char *argv[]);
+// COMMAND LINE SETTINGS
+// This section is for reference by all the *_init() functions. For example, the multiplayer init function
+// could check to see if (int Cmdline_multi_stream_chat_to_file) has been set by the command line parser.
+//
+// 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
+
+
+// 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 int Cmdline_cd_check;
+extern int Cmdline_client_dodamage;
+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_use_last_pilot;
+extern int Cmdline_window;
+
+
+// FSO OPTIONS -------------------------------------------------
+
+// Graphics related
+extern double specular_exponent_value;
+extern float Cmdline_clip_dist;
+extern float Cmdline_fov;
+extern float Cmdline_ogl_spec;
+extern float static_light_factor;
+extern float static_point_factor;
+extern float static_tube_factor;
+extern int Cmdline_2d_poof;
+extern int Cmdline_alpha_env;
+extern int Cmdline_ambient_factor;
+extern int Cmdline_cell;
+extern int Cmdline_decals;
+extern int Cmdline_env;
+extern int Cmdline_mipmap;
+extern int Cmdline_missile_lighting;
+extern int Cmdline_noglow;
+extern int Cmdline_nomotiondebris;
+extern int Cmdline_noscalevid;	// disables fit-to-window for movies - taylor
+extern int Cmdline_nospec;
+
+// 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_warp_flash;
+
+// 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 int Cmdline_SpewMission_CRCs;
+extern int Cmdline_SpewTable_CRCs;
+
+// Troubleshooting
+extern int Cmdline_d3d_lesstmem;
+extern int Cmdline_FRED2_htl;
+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_verify_vps;
+
+// 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;
+#ifdef SCP_UNIX
+extern int Cmdline_no_grab;
+#endif
+
+
+
+//extern char FreeSpace_Directory[]; // allievating a cfilesystem problem caused by fred -- Kazan
+#endif

code/cmeasure/cmeasure.cpp

@@ -9,13 +9,46 @@
 
 /*
  * $Logfile: /Freespace2/code/CMeasure/CMeasure.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
- * $Author: penguin $
+ * $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
+ *
+ * Revision 2.4  2004/07/12 16:32:43  Kazan
+ * MCD - define _MCD_CHECK to use memory tracking
+ *
+ * Revision 2.3  2004/03/05 09:01:57  Goober5000
+ * Uber pass at reducing #includes
+ * --Goober5000
+ *
+ * Revision 2.2  2003/03/18 10:07:00  unknownplayer
+ * 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.1.2.1  2002/09/24 18:56:41  randomtiger
+ * DX8 branch commit
+ *
+ * This is the scub of UP's previous code with the more up to date RT code.
+ * For full details check previous dev e-mails
+ *
+ * Revision 2.1  2002/08/01 01:41:04  penguin
+ * The big include file move
+ *
  * Revision 2.0  2002/06/03 04:02:21  penguin
  * Warpcore CVS sync
  *
@@ -208,62 +241,38 @@
  * $NoKeywords: $
  */
 
-#include "globalincs/pstypes.h"
-#include "globalincs/systemvars.h"
 #include "cmeasure/cmeasure.h"
-#include "freespace2/freespace.h"
-#include "math/vecmat.h"
-#include "graphics/2d.h"
-#include "render/3d.h"
-#include "model/model.h"
-#include "physics/physics.h"
-#include "math/floating.h"
-#include "model/model.h"
+//#include "freespace2/freespace.h"
+//#include "model/model.h"
 #include "ship/ship.h"
-#include "io/timer.h"
-#include "fireball/fireballs.h"
-#include "radar/radar.h"
-#include "mission/missionparse.h"		// For MAX_SPECIES_NAMES
-#include "gamesnd/gamesnd.h"
-#include "object/objectsnd.h"
-#include "sound/sound.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];
 
-int	Num_cmeasure_types = 0;
-int	Num_cmeasures = 0;
-int	Cmeasure_inited = 0;
+//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	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;
 
-	if ( !Cmeasure_inited ) {
+	if ( !Cmeasure_inited )
 		Cmeasure_inited = 1;
 
-/*		// Do all the processing that happens only once
-		if ( Debris_model < 0 )		{
-			if (Debris_model>-1)	{
-				polymodel * pm;
-				pm = model_get(Debris_model);
-				Debris_num_submodels = pm->n_models;
-			}
-		}
-
-		for (i=0; i<MAX_SPECIES_NAMES; 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] );
-			}
-		}
-*/	
-	}
-
 	// Reset everything between levels
 	Num_cmeasures = 0;
 
@@ -271,8 +280,8 @@ void cmeasure_init()
 		Cmeasures[i].subtype = CMEASURE_UNUSED;
 	}
 		
-}
-
+}*/
+/*
 void cmeasure_render(object * objp)
 {
 	// JAS TODO: Replace with proper fireball
@@ -286,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);
@@ -303,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;
@@ -347,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;
@@ -372,14 +340,13 @@ 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, vector * pos, int cm_type, int rand_val )
+/*
+int cmeasure_create( object * source_obj, vec3d * pos, int cm_type, int rand_val )
 {
 	int		n, objnum, parent_objnum, arand;
 	object	* obj;
@@ -387,11 +354,6 @@ int cmeasure_create( object * source_obj, vector * pos, int cm_type, int rand_va
 	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);
@@ -430,7 +392,7 @@ int cmeasure_create( object * source_obj, vector * pos, int cm_type, int rand_va
 
 	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);
 
@@ -449,47 +411,105 @@ int cmeasure_create( object * source_obj, vector * pos, int cm_type, int rand_va
 	
 	Num_cmeasures++;
 
-	vector vel, rand_vec;
+	//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 );
+	}
+}

code/cmeasure/cmeasure.h

@@ -9,13 +9,30 @@
 
 /*
  * $Logfile: /Freespace2/code/CMeasure/CMeasure.h $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
- * $Author: penguin $
+ * $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)
+ *
+ * Revision 2.3  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
+ *
+ * Revision 2.2  2004/03/05 09:01:57  Goober5000
+ * Uber pass at reducing #includes
+ * --Goober5000
+ *
+ * Revision 2.1  2002/08/01 01:41:04  penguin
+ * The big include file move
+ *
  * Revision 2.0  2002/06/03 04:02:21  penguin
  * Warpcore CVS sync
  *
@@ -115,30 +132,33 @@
 #ifndef _CMEASURE_H
 #define _CMEASURE_H
 
-#include "parse/parselo.h"
-#include "object/object.h"
+#include "globalincs/globals.h"
+#include "globalincs/systemvars.h"
 
-#define MAX_CMEASURES 64
+struct object;
+//struct vec3d;
+
+//#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.
@@ -155,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, vector *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

code/controlconfig/controlsconfig.cpp

@@ -9,13 +9,89 @@
 
 /*
  * $Logfile: /Freespace2/code/ControlConfig/ControlsConfig.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
- * $Author: penguin $
+ * $Revision: 2.20 $
+ * $Date: 2007-11-23 23:08:32 $
+ * $Author: wmcoolmon $
  *
  * C module for keyboard, joystick and mouse configuration
  *
  * $Log: not supported by cvs2svn $
+ * Revision 2.19  2007/06/04 00:04:21  Backslash
+ * Backslash's HEAD-only controls commit:
+ * -Lateral thruster axes
+ * -Slide_when_pressed
+ * -Placeholders for glide_when_pressed and more controls, to give us a little breathing room while we wait for the real pilot file code
+ *
+ * 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
+ *
+ * Revision 2.15  2005/07/07 16:36:57  taylor
+ * various compiler warning fixes (some of these from dizzy)
+ *
+ * Revision 2.14  2005/07/02 19:42:14  taylor
+ * ton of non-standard resolution fixes
+ *
+ * Revision 2.13  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.12  2005/04/28 05:29:28  wmcoolmon
+ * Removed FS2_DEMO defines that looked like they wouldn't cause the universe to collapse
+ *
+ * Revision 2.11  2005/04/17 05:38:28  taylor
+ * updated Linux joystick code that's a bit less insane speed wise
+ * remove ability to build without joystick support, no reason to keep it around
+ * fix unusable warning flag with libjpeg building
+ *
+ * Revision 2.10  2005/03/02 21:24:43  taylor
+ * more network/inferno goodness for Windows, takes care of a few warnings too
+ *
+ * Revision 2.9  2004/07/29 19:37:50  Kazan
+ * unbug the JS bug i caused --- kazan
+ *
+ * Revision 2.8  2004/07/26 20:47:26  Kazan
+ * remove MCD complete
+ *
+ * Revision 2.7  2004/07/25 00:31:28  Kazan
+ * i have absolutely nothing to say about that subject
+ *
+ * Revision 2.6  2004/07/12 16:32:43  Kazan
+ * MCD - define _MCD_CHECK to use memory tracking
+ *
+ * Revision 2.5  2004/03/05 09:01:58  Goober5000
+ * Uber pass at reducing #includes
+ * --Goober5000
+ *
+ * Revision 2.4  2003/11/11 02:15:43  Goober5000
+ * ubercommit - basically spelling and language fixes with some additional
+ * warnings disabled
+ * --Goober5000
+ *
+ * Revision 2.3  2003/04/05 11:09:21  Goober5000
+ * fixed some fiddly bits with scrolling and ui stuff
+ * --Goober5000
+ *
+ * Revision 2.2  2003/03/18 10:07:00  unknownplayer
+ * 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.1.2.1  2002/09/24 18:56:41  randomtiger
+ * DX8 branch commit
+ *
+ * This is the scub of UP's previous code with the more up to date RT code.
+ * For full details check previous dev e-mails
+ *
+ * Revision 2.1  2002/08/01 01:41:04  penguin
+ * The big include file move
+ *
  * Revision 2.0  2002/06/03 04:02:21  penguin
  * Warpcore CVS sync
  *
@@ -108,7 +184,7 @@
  * 
  * 51    5/19/98 12:56p Hoffoss
  * Added some code to help prevent triple-clicking for binding the mouse
- * button to an action (why the hell people triple click is beyond me,
+ * button to an action (why people triple click is beyond me,
  * though).
  * 
  * 50    5/19/98 11:11a Lawrance
@@ -303,35 +379,33 @@
  *
 */
 
+
 #include "freespace2/freespace.h"
 #include "controlconfig/controlsconfig.h"
 #include "gamesequence/gamesequence.h"
-#include "playerman/player.h"
-#include "graphics/2d.h"
 #include "hud/hudsquadmsg.h"
 #include "io/key.h"
 #include "io/timer.h"
-#include "math.h"
-#include "io/mouse.h"
 #include "ui/ui.h"
 #include "io/joy.h"
-#include "bmpman/bmpman.h"
-#include "sound/sound.h"
 #include "gamesnd/gamesnd.h"
 #include "missionui/missionscreencommon.h"
 #include "graphics/font.h"
-#include "hud/hud.h"
 #include "playerman/managepilot.h"
 #include "gamehelp/contexthelp.h"
 #include "popup/popup.h"
 #include "ui/uidefs.h"
 #include "globalincs/alphacolors.h"
-
-#ifndef NO_NETWORK
 #include "network/multi_pmsg.h"
 #include "network/multiutil.h"
+
+
+#ifndef NDEBUG
+#include "hud/hud.h"
 #endif
 
+
+
 #define NUM_SYSTEM_KEYS			14
 #define NUM_BUTTONS				19
 #define NUM_TABS					4
@@ -415,7 +489,7 @@ int Conflict_warning_coords[GR_NUM_RESOLUTIONS][2] = {
 int Conflict_stamp = -1;
 int Conflict_bright = 0;
 
-#define LIST_BUTTONS_MAX	40
+#define LIST_BUTTONS_MAX	42
 #define JOY_AXIS				0x80000
 
 static int Num_cc_lines;
@@ -440,8 +514,8 @@ config_item Control_config_backup[CCFG_MAX];
 int Axis_map_to[] = { JOY_X_AXIS, JOY_Y_AXIS, JOY_RX_AXIS, JOY_Z_AXIS, -1 };
 int Axis_map_to_defaults[] = { JOY_X_AXIS, JOY_Y_AXIS, JOY_RX_AXIS, JOY_Z_AXIS, -1 };
 #else
-int Axis_map_to[] = { JOY_X_AXIS, JOY_Y_AXIS, JOY_RX_AXIS, -1, -1 };
-int Axis_map_to_defaults[] = { JOY_X_AXIS, JOY_Y_AXIS, JOY_RX_AXIS, -1, -1 };
+int Axis_map_to[NUM_JOY_AXIS_ACTIONS] = { JOY_X_AXIS, JOY_Y_AXIS, JOY_RX_AXIS, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
+int Axis_map_to_defaults[NUM_JOY_AXIS_ACTIONS] = { JOY_X_AXIS, JOY_Y_AXIS, JOY_RX_AXIS, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
 #endif
 
 // all this stuff is localized/externalized
@@ -685,6 +759,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++) {
@@ -695,11 +770,25 @@ 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;
 }
 
 int control_config_valid_action(int n)
 {
+//WMC - Invalid_demo_keys is never even filled!!
+/*
 #ifdef FS2_DEMO
 	int i;
 
@@ -707,7 +796,7 @@ int control_config_valid_action(int n)
 		if (n == Invalid_demo_keys[i])
 			return 0;
 #endif
-
+*/
 	return 1;
 }
 
@@ -813,7 +902,13 @@ void control_config_list_prepare()
 		if ((Control_config[z].tab == Tab) && control_config_valid_action(z)) {
 			k = Control_config[z].key_id;
 			j = Control_config[z].joy_id;
-			Cc_lines[Num_cc_lines].label = XSTR(Control_config[z].text, CONTROL_CONFIG_XSTR + z);
+
+			if (Control_config[z].hasXSTR)
+				Cc_lines[Num_cc_lines].label = XSTR(Control_config[z].text, CONTROL_CONFIG_XSTR + z);
+			else
+				Cc_lines[Num_cc_lines].label = Control_config[z].text;
+
+
 			Cc_lines[Num_cc_lines].cc_index = z;
 			Cc_lines[Num_cc_lines++].y = y;
 			y += font_height + 2;
@@ -853,16 +948,16 @@ config_item_undo *get_undo_block(int size)
 {
 	config_item_undo *ptr;
 
-	ptr = (config_item_undo *) malloc( sizeof(config_item_undo) );
+	ptr = (config_item_undo *) vm_malloc( sizeof(config_item_undo) );
 	Assert(ptr);
 	ptr->next = Config_item_undo;
 	Config_item_undo = ptr;
 
 	ptr->size = size;
 	if (size) {
-		ptr->index = (int *) malloc( sizeof(int) * size );
+		ptr->index = (int *) vm_malloc( sizeof(int) * size );
 		Assert(ptr->index);
-		ptr->list = (config_item *) malloc( sizeof(config_item) * size );
+		ptr->list = (config_item *) vm_malloc( sizeof(config_item) * size );
 		Assert(ptr->list);
 
 	} else {
@@ -884,11 +979,11 @@ void free_undo_block()
 
 	Config_item_undo = ptr->next;
 	if (ptr->size) {
-		free(ptr->list);
-		free(ptr->index);
+		vm_free(ptr->list);
+		vm_free(ptr->index);
 	}
 
-	free(ptr);
+	vm_free(ptr);
 }
 
 // undo the most recent binding changes
@@ -947,8 +1042,9 @@ void control_config_save_axis_undo(int axis)
 	config_item_undo *ptr;
 	config_item item;
 
+	memset( &item, 0, sizeof(config_item) );
+
 	item.joy_id = (short) Axis_map_to[axis];
-	item.used = 0;
 	item.used = Invert_axis[axis];
 
 	ptr = get_undo_block(1);
@@ -1064,6 +1160,8 @@ int control_config_clear_other()
 		ptr = get_undo_block(total);
 		for (i=j=0; i<NUM_JOY_AXIS_ACTIONS; i++)
 			if ((Axis_map_to[i] == Axis_map_to[z]) && (i != z)) {
+				memset( &item, 0, sizeof(config_item) );
+
 				item.joy_id = (short) Axis_map_to[i];
 				item.used = Invert_axis[i];
 
@@ -1152,15 +1250,12 @@ int control_config_clear_all()
 	return 0;
 }
 
-#ifndef NO_JOYSTICK
 extern Joy_info joystick;
-#endif
 
 int control_config_axis_default(int axis)
 {
 	Assert(axis >= 0);
 
-#ifndef NO_JOYSTICK
 	if ( axis > 1 ) {
 		if (Axis_map_to_defaults[axis] < 0)
 			return -1;
@@ -1170,9 +1265,6 @@ int control_config_axis_default(int axis)
 	}
 
 	return Axis_map_to_defaults[axis];
-#else
-	return -1;
-#endif
 }
 
 int control_config_do_reset()
@@ -1207,6 +1299,8 @@ int control_config_do_reset()
 
 	for (i=0; i<NUM_JOY_AXIS_ACTIONS; i++)
 		if ((Axis_map_to[i] != control_config_axis_default(i)) || (Invert_axis[i] != Invert_axis_defaults[i])) {
+			memset( &item, 0, sizeof(config_item) );
+
 			item.joy_id = (short) Axis_map_to[i];
 			item.used = Invert_axis[i];
 
@@ -1544,7 +1638,7 @@ void control_config_init()
 		Control_config_backup[i] = Control_config[i];
 
 	common_set_interface_palette(NOX("ControlConfigPalette"));  // set the interface palette
-	Ui_window.create(0, 0, gr_screen.max_w, gr_screen.max_h, 0);
+	Ui_window.create(0, 0, gr_screen.max_w_unscaled, gr_screen.max_h_unscaled, 0);
 	Ui_window.set_mask_bmap(Conflict_background_bitmap_mask_fname[gr_screen.res]);
 	Ui_window.tooltip_handler = control_config_tooltip_handler;
 
@@ -1609,26 +1703,28 @@ void control_config_init()
 	control_config_conflict_check();
 
 	// setup strings					
-	Joy_axis_action_text[0] = strdup(XSTR("Turn (Yaw) Axis", 1016));
-	Joy_axis_action_text[1] = strdup(XSTR("Pitch Axis", 1017));
-	Joy_axis_action_text[2] = strdup(XSTR("Bank Axis", 1018));
-	Joy_axis_action_text[3] = strdup(XSTR("Absolute Throttle Axis", 1019));
-	Joy_axis_action_text[4] = strdup(XSTR("Relative Throttle Axis", 1020));
-	Joy_axis_text[0] = strdup(XSTR("Joystick/Mouse X Axis", 1021));
-	Joy_axis_text[1] = strdup(XSTR("Joystick/Mouse Y Axis", 1022));
-	Joy_axis_text[2] = strdup(XSTR("Joystick Z Axis", 1023));
-	Joy_axis_text[3] = strdup(XSTR("Joystick rX Axis", 1024));
-	Joy_axis_text[4] = strdup(XSTR("Joystick rY Axis", 1025));
-	Joy_axis_text[5] = strdup(XSTR("Joystick rZ Axis", 1026));
-	Mouse_button_text[0] = strdup("");
-	Mouse_button_text[1] = strdup(XSTR("Left Button", 1027));
-	Mouse_button_text[2] = strdup(XSTR("Right Button", 1028));
-	Mouse_button_text[3] = strdup(XSTR("Mid Button", 1029));
-	Mouse_button_text[4] = strdup("");
-	Mouse_axis_text[0] = strdup(XSTR("L/R", 1030));
-	Mouse_axis_text[1] = strdup(XSTR("U/B", 1031));
-	Invert_text[0] = strdup(XSTR("N", 1032));
-	Invert_text[1] = strdup(XSTR("Y", 1033));
+	Joy_axis_action_text[0] = vm_strdup(XSTR("Turn (Yaw) Axis", 1016));
+	Joy_axis_action_text[1] = vm_strdup(XSTR("Pitch Axis", 1017));
+	Joy_axis_action_text[2] = vm_strdup(XSTR("Bank Axis", 1018));
+	Joy_axis_action_text[3] = vm_strdup(XSTR("Absolute Throttle Axis", 1019));
+	Joy_axis_action_text[4] = vm_strdup(XSTR("Relative Throttle Axis", 1020));
+	Joy_axis_action_text[5] = vm_strdup("Horizontal Lateral (Slide) Axis");
+	Joy_axis_action_text[6] = vm_strdup("Vertical Lateral (Slide) Axis");
+	Joy_axis_text[0] = vm_strdup(XSTR("Joystick/Mouse X Axis", 1021));
+	Joy_axis_text[1] = vm_strdup(XSTR("Joystick/Mouse Y Axis", 1022));
+	Joy_axis_text[2] = vm_strdup(XSTR("Joystick Z Axis", 1023));
+	Joy_axis_text[3] = vm_strdup(XSTR("Joystick rX Axis", 1024));
+	Joy_axis_text[4] = vm_strdup(XSTR("Joystick rY Axis", 1025));
+	Joy_axis_text[5] = vm_strdup(XSTR("Joystick rZ Axis", 1026));
+	Mouse_button_text[0] = vm_strdup("");
+	Mouse_button_text[1] = vm_strdup(XSTR("Left Button", 1027));
+	Mouse_button_text[2] = vm_strdup(XSTR("Right Button", 1028));
+	Mouse_button_text[3] = vm_strdup(XSTR("Mid Button", 1029));
+	Mouse_button_text[4] = vm_strdup("");
+	Mouse_axis_text[0] = vm_strdup(XSTR("L/R", 1030));
+	Mouse_axis_text[1] = vm_strdup(XSTR("U/B", 1031));
+	Invert_text[0] = vm_strdup(XSTR("N", 1032));
+	Invert_text[1] = vm_strdup(XSTR("Y", 1033));
 
 	control_config_list_prepare();
 }
@@ -1645,7 +1741,7 @@ void control_config_close()
 	help_overlay_unload(CONTROL_CONFIG_OVERLAY);
 	
 	if (Background_bitmap){
-		bm_unload(Background_bitmap);
+		bm_release(Background_bitmap);
 	}
 
 	Ui_window.destroy();
@@ -1657,31 +1753,31 @@ void control_config_close()
 	// free strings	
 	for(idx=0; idx<NUM_JOY_AXIS_ACTIONS; idx++){
 		if(Joy_axis_action_text[idx] != NULL){
-			free(Joy_axis_action_text[idx]);
+			vm_free(Joy_axis_action_text[idx]);
 			Joy_axis_action_text[idx] = NULL;
 		}
 	}
 	for(idx=0; idx<NUM_AXIS_TEXT; idx++){
 		if(Joy_axis_text[idx] != NULL){
-			free(Joy_axis_text[idx]);
+			vm_free(Joy_axis_text[idx]);
 			Joy_axis_text[idx] = NULL;
 		}
 	}
 	for(idx=0; idx<NUM_MOUSE_TEXT; idx++){
 		if(Mouse_button_text[idx] != NULL){
-			free(Mouse_button_text[idx]);
+			vm_free(Mouse_button_text[idx]);
 			Mouse_button_text[idx] = NULL;
 		}
 	}
 	for(idx=0; idx<NUM_MOUSE_AXIS_TEXT; idx++){
 		if(Mouse_axis_text[idx] != NULL){
-			free(Mouse_axis_text[idx]);
+			vm_free(Mouse_axis_text[idx]);
 			Mouse_axis_text[idx] = NULL;
 		}
 	}
 	for(idx=0; idx<NUM_INVERT_TEXT; idx++){
 		if(Invert_text[idx] != NULL){
-			free(Invert_text[idx]);
+			vm_free(Invert_text[idx]);
 			Invert_text[idx] = NULL;
 		}
 	}
@@ -1782,8 +1878,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]) {
@@ -2176,7 +2272,11 @@ void control_config_do_frame(float frametime)
 		gr_get_string_size(&w, NULL, str);
 		gr_printf(x - w / 2, y - font_height, str);
 
-		strcpy(buf, XSTR(Control_config[i].text, CONTROL_CONFIG_XSTR + i));
+		if (Control_config[i].hasXSTR)
+			strcpy(buf, XSTR(Control_config[i].text, CONTROL_CONFIG_XSTR + i));
+		else
+			strcpy(buf, Control_config[i].text);
+
 		gr_force_fit_string(buf, 255, Conflict_wnd_coords[gr_screen.res][CONTROL_W_COORD]);
 		gr_get_string_size(&w, NULL, buf);
 		gr_printf(x - w / 2, y, buf);
@@ -2399,12 +2499,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)) {
@@ -2448,6 +2546,7 @@ int check_control(int id, int key)
 	}
 
 	if ((Control_config[id].key_id == key) || joy_down_count(Control_config[id].joy_id, 1) || mouse_down_count(1 << Control_config[id].joy_id)) {
+		//mprintf(("Key used %d", key));
 		control_used(id);
 		return 1;
 	}
@@ -2456,43 +2555,28 @@ int check_control(int id, int key)
 }
 
 // get heading, pitch, bank, throttle abs. and throttle rel. values.
-void control_get_axes_readings(int *h, int *p, int *b, int *ta, int *tr)
+void control_get_axes_readings(int *axis)
 {
 	int axes_values[JOY_NUM_AXES];
 
 	joystick_read_raw_axis(JOY_NUM_AXES, axes_values);
 
 	//	joy_get_scaled_reading will return a value represents the joystick pos from -1 to +1 (fixed point)
-	*h = 0;
-	if (Axis_map_to[0] >= 0)
-		*h = joy_get_scaled_reading(axes_values[Axis_map_to[0]], Axis_map_to[0]);
-
-	*p = 0;
-	if (Axis_map_to[1] >= 0)
-		*p = joy_get_scaled_reading(axes_values[Axis_map_to[1]], Axis_map_to[1]);
-
-	*b = 0;
-	if (Axis_map_to[2] >= 0)
-		*b = joy_get_scaled_reading(axes_values[Axis_map_to[2]], Axis_map_to[2]);
-
-	*ta = 0;
-	if (Axis_map_to[3] >= 0)
-		*ta = joy_get_unscaled_reading(axes_values[Axis_map_to[3]], Axis_map_to[3]);
-
-	*tr = 0;
-	if (Axis_map_to[4] >= 0)
-		*tr = joy_get_scaled_reading(axes_values[Axis_map_to[4]], Axis_map_to[4]);
-
-	if (Invert_axis[0])
-		*h = -(*h);
-	if (Invert_axis[1])
-		*p = -(*p);
-	if (Invert_axis[2])
-		*b = -(*b);
-	if (Invert_axis[3])
-		*ta = F1_0 - *ta;
-	if (Invert_axis[4])
-		*tr = -(*tr);
+	for (int i = 0; i < NUM_JOY_AXIS_ACTIONS; i++) {
+		if (Axis_map_to[i] >= 0) {
+			if (i == 3) {
+				//Backslash -- this is to handle the absolute throttle.
+				//I hate this hardcoding!  but what can we do but follow precedent?  Corrections welcome.
+				axis[i] = joy_get_unscaled_reading(axes_values[Axis_map_to[i]], Axis_map_to[i]);
+				if (Invert_axis[i])
+					axis[i] = F1_0 - axis[i];
+			} else {
+				axis[i] = joy_get_scaled_reading(axes_values[Axis_map_to[i]], Axis_map_to[i]);
+				if (Invert_axis[i])
+					axis[i] = -(axis[i]);
+			}
+		}
+	}
 
 	return;
 }

code/controlconfig/controlsconfig.h

@@ -9,18 +9,72 @@
 
 /*
  * $Logfile: /Freespace2/code/ControlConfig/ControlsConfig.h $
- * $Revision: 2.4 $
- * $Date: 2002-12-02 23:52:02 $
- * $Author: Goober5000 $
+ * $Revision: 2.19 $
+ * $Date: 2007-12-22 09:36:17 $
+ * $Author: Backslash $
  *
  * Header file for keyboard, joystick and mouse configuration
  *
  * $Log: not supported by cvs2svn $
+ * Revision 2.18  2007/06/04 00:04:21  Backslash
+ * Backslash's HEAD-only controls commit:
+ * -Lateral thruster axes
+ * -Slide_when_pressed
+ * -Placeholders for glide_when_pressed and more controls, to give us a little breathing room while we wait for the real pilot file code
+ *
+ * Revision 2.17  2006/08/01 04:26:02  Kazan
+ * commented out glide_while_pressed changes until taylor deems them safe
+ *
+ * Revision 2.16  2006/07/31 23:57:48  Kazan
+ * glide while pressed
+ *
+ * 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
+ *
+ * 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"
+ *
+ * Revision 2.10  2005/01/16 22:39:08  wmcoolmon
+ * Added VM_TOPDOWN view; Added 2D mission mode, add 16384 to mission +Flags to use.
+ *
+ * Revision 2.9  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
+ *
+ * Revision 2.8  2004/07/25 00:31:28  Kazan
+ * i have absolutely nothing to say about that subject
+ *
+ * Revision 2.7  2004/05/03 21:22:19  Kazan
+ * Abandon strdup() usage for mod list processing - it was acting odd and causing crashing on free()
+ * Fix condition where alt_tab_pause() would flipout and trigger failed assert if game minimizes during startup (like it does a lot during debug)
+ * Nav Point / Auto Pilot code (All disabled via #ifdefs)
+ *
+ * Revision 2.6  2004/04/06 03:09:01  phreak
+ * added a control config option for the wireframe hud targetbox i enabled ages ago
+ *
+ * Revision 2.5  2003/11/11 02:15:43  Goober5000
+ * ubercommit - basically spelling and language fixes with some additional
+ * warnings disabled
+ * --Goober5000
+ *
+ * Revision 2.4  2002/12/02 23:52:02  Goober5000
+ * fixed misspelling
+ *
  * Revision 2.3  2002/12/02 20:47:28  Goober5000
  * 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 sheild 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
@@ -287,13 +341,15 @@
 #define JOY_RY_AXIS	4
 #define JOY_RZ_AXIS	5
 
-#define NUM_JOY_AXIS_ACTIONS	5
+#define NUM_JOY_AXIS_ACTIONS	12	//5
 
 #define JOY_HEADING_AXIS		0
 #define JOY_PITCH_AXIS			1
 #define JOY_BANK_AXIS			2
 #define JOY_ABS_THROTTLE_AXIS	3
 #define JOY_REL_THROTTLE_AXIS	4
+#define JOY_SIDEWAYS_AXIS       5
+#define JOY_VERTICAL_AXIS       6
 
 // --------------------------------------------------
 // different types of controls that can be assigned 
@@ -306,6 +362,7 @@ typedef struct config_item {
 	short key_default;  // default key bound to action
 	short joy_default;  // default joystick button bound to action
 	char tab;				// what tab (category) it belongs in
+	bool hasXSTR;			// whether we should translate this with an XSTR
 	char *text;				// describes the action in the config screen
 	char type;				// manner control should be checked in
 	short key_id;  // actual key bound to action
@@ -322,28 +379,28 @@ typedef struct config_item {
 
 #define TARGET_NEXT										0
 #define TARGET_PREV										1
-#define TARGET_NEXT_CLOSEST_HOSTILE					2
-#define TARGET_PREV_CLOSEST_HOSTILE					3
+#define TARGET_NEXT_CLOSEST_HOSTILE						2
+#define TARGET_PREV_CLOSEST_HOSTILE						3
 #define TOGGLE_AUTO_TARGETING							4
-#define TARGET_NEXT_CLOSEST_FRIENDLY				5
-#define TARGET_PREV_CLOSEST_FRIENDLY				6
-#define TARGET_SHIP_IN_RETICLE						7
-#define TARGET_CLOSEST_SHIP_ATTACKING_TARGET		8
-#define TARGET_LAST_TRANMISSION_SENDER				9
-#define STOP_TARGETING_SHIP							10
+#define TARGET_NEXT_CLOSEST_FRIENDLY					5
+#define TARGET_PREV_CLOSEST_FRIENDLY					6
+#define TARGET_SHIP_IN_RETICLE							7
+#define TARGET_CLOSEST_SHIP_ATTACKING_TARGET			8
+#define TARGET_LAST_TRANMISSION_SENDER					9
+#define STOP_TARGETING_SHIP								10
 
 // targeting a ship's subsystem
-#define TARGET_SUBOBJECT_IN_RETICLE					11
+#define TARGET_SUBOBJECT_IN_RETICLE						11
 #define TARGET_NEXT_SUBOBJECT							12
 #define TARGET_PREV_SUBOBJECT							13	
 #define STOP_TARGETING_SUBSYSTEM						14
 
 // speed matching 
 #define MATCH_TARGET_SPEED								15
-#define TOGGLE_AUTO_MATCH_TARGET_SPEED				16
+#define TOGGLE_AUTO_MATCH_TARGET_SPEED					16
 
 // weapons
-#define FIRE_PRIMARY										17
+#define FIRE_PRIMARY									17
 #define FIRE_SECONDARY									18
 #define CYCLE_NEXT_PRIMARY								19
 #define CYCLE_PREV_PRIMARY								20
@@ -354,19 +411,19 @@ typedef struct config_item {
 // controls
 #define FORWARD_THRUST									24
 #define REVERSE_THRUST									25
-#define BANK_LEFT											26
+#define BANK_LEFT										26
 #define BANK_RIGHT										27
 #define PITCH_FORWARD									28
 #define PITCH_BACK										29
-#define YAW_LEFT											30
-#define YAW_RIGHT											31
+#define YAW_LEFT										30
+#define YAW_RIGHT										31
 
 // throttle control
 #define ZERO_THROTTLE									32
-#define MAX_THROTTLE										33
+#define MAX_THROTTLE									33
 #define ONE_THIRD_THROTTLE								34
-#define TWO_THIRDS_THROTTLE							35
-#define PLUS_5_PERCENT_THROTTLE						36
+#define TWO_THIRDS_THROTTLE								35
+#define PLUS_5_PERCENT_THROTTLE							36
 #define MINUS_5_PERCENT_THROTTLE						37
 
 // squadmate messaging keys
@@ -376,27 +433,27 @@ typedef struct config_item {
 #define ATTACK_SUBSYSTEM_MESSAGE						41
 #define CAPTURE_MESSAGE									42
 #define ENGAGE_MESSAGE									43
-#define FORM_MESSAGE										44
+#define FORM_MESSAGE									44
 #define IGNORE_MESSAGE									45
 #define PROTECT_MESSAGE									46
 #define COVER_MESSAGE									47
-#define WARP_MESSAGE										48
+#define WARP_MESSAGE									48
 #define REARM_MESSAGE									49
 
-#define TARGET_CLOSEST_SHIP_ATTACKING_SELF		50
+#define TARGET_CLOSEST_SHIP_ATTACKING_SELF				50
 
 // Views
 #define VIEW_CHASE										51
 #define VIEW_EXTERNAL									52
-#define VIEW_EXTERNAL_TOGGLE_CAMERA_LOCK			53
-#define VIEW_SLEW											54
+#define VIEW_EXTERNAL_TOGGLE_CAMERA_LOCK				53
+#define VIEW_SLEW										54
 #define VIEW_OTHER_SHIP									55
 #define VIEW_DIST_INCREASE								56
 #define VIEW_DIST_DECREASE								57
 #define VIEW_CENTER										58
 #define PADLOCK_UP										59
-#define PADLOCK_DOWN										60
-#define PADLOCK_LEFT										61
+#define PADLOCK_DOWN									60
+#define PADLOCK_LEFT									61
 #define PADLOCK_RIGHT									62
 
 
@@ -413,60 +470,76 @@ typedef struct config_item {
 #define DECREASE_SHIELD									72
 #define INCREASE_ENGINE									73
 #define DECREASE_ENGINE									74
-#define ETS_EQUALIZE										75
+#define ETS_EQUALIZE									75
 #define SHIELD_EQUALIZE									76
 #define SHIELD_XFER_TOP									77
 #define SHIELD_XFER_BOTTOM								78
 #define SHIELD_XFER_LEFT								79
 #define SHIELD_XFER_RIGHT								80
 
-#define XFER_SHIELD                             81
+#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 SLIDE_WHEN_PRESSED								83
+//Backslash -- this was a convenient place for Slide When Pressed, since Show Damage Popup isn't used
 #define BANK_WHEN_PRESSED								84
 #define SHOW_NAVMAP										85
 #define ADD_REMOVE_ESCORT								86
-#define ESCORT_CLEAR										87
-#define TARGET_NEXT_ESCORT_SHIP						88
+#define ESCORT_CLEAR									87
+#define TARGET_NEXT_ESCORT_SHIP							88
 
-#define TARGET_CLOSEST_REPAIR_SHIP					89
-#define TARGET_NEXT_UNINSPECTED_CARGO				90
-#define TARGET_PREV_UNINSPECTED_CARGO				91
+#define TARGET_CLOSEST_REPAIR_SHIP						89
+#define TARGET_NEXT_UNINSPECTED_CARGO					90
+#define TARGET_PREV_UNINSPECTED_CARGO					91
 #define TARGET_NEWEST_SHIP								92
-#define TARGET_NEXT_LIVE_TURRET						93
-#define TARGET_PREV_LIVE_TURRET						94
+#define TARGET_NEXT_LIVE_TURRET							93
+#define TARGET_PREV_LIVE_TURRET							94
 
 #define TARGET_NEXT_BOMB								95
 #define TARGET_PREV_BOMB								96
 
 // multiplayer messaging keys
 #define MULTI_MESSAGE_ALL								97
-#define MULTI_MESSAGE_FRIENDLY						98
+#define MULTI_MESSAGE_FRIENDLY							98
 #define MULTI_MESSAGE_HOSTILE							99
 #define MULTI_MESSAGE_TARGET							100
 
 // multiplayer misc keys
-#define MULTI_OBSERVER_ZOOM_TO						101
+#define MULTI_OBSERVER_ZOOM_TO							101
 
 #define TIME_SPEED_UP									102
 #define TIME_SLOW_DOWN									103
 
-#define TOGGLE_HUD_CONTRAST							104
+#define TOGGLE_HUD_CONTRAST								104
 
 #define MULTI_TOGGLE_NETINFO							105
 
-#define MULTI_SELF_DESTRUCT							106
+#define MULTI_SELF_DESTRUCT								106
 
-#define TOGGLE_HUD							107
-#define RIGHT_SLIDE_THRUST									108
-#define LEFT_SLIDE_THRUST									109
+#define TOGGLE_HUD										107
+#define RIGHT_SLIDE_THRUST								108
+#define LEFT_SLIDE_THRUST								109
 #define UP_SLIDE_THRUST									110
-#define DOWN_SLIDE_THRUST									111
+#define DOWN_SLIDE_THRUST								111
+#define HUD_TARGETBOX_TOGGLE_WIREFRAME					112
+#define VIEW_TOPDOWN									113
+#define VIEW_TRACK_TARGET								114
 
+//AutoPilot - Kazan
+#define AUTO_PILOT_TOGGLE								115
+#define NAV_CYCLE										116
+
+//Gliding
+#define TOGGLE_GLIDING									117
+#define GLIDE_WHEN_PRESSED								118
+#define VIEW_UP											119
+#define VIEW_DOWN										120
+#define VIEW_LEFT										121
+#define VIEW_RIGHT										122
 
 // this should be the total number of control action defines above (or last define + 1)
-#define CCFG_MAX 112
+#define CCFG_MAX 128	//118
 
 extern int Failed_key_index;
 extern int Invert_heading;
@@ -499,7 +572,7 @@ char *translate_key(char *key);
 char *textify_scancode(int code);
 float check_control_timef(int id);
 int check_control(int id, int key = -1);
-void control_get_axes_readings(int *h, int *p, int *b, int *ta, int *tr);
+void control_get_axes_readings(int *axis);
 void control_used(int id);
 void control_config_clear();
 void clear_key_binding(short key);

code/controlconfig/controlsconfigcommon.cpp

@@ -9,13 +9,73 @@
 
 /*
  * $Logfile: /Freespace2/code/ControlConfig/ControlsConfigCommon.cpp $
- * $Revision: 2.3 $
- * $Date: 2002-10-19 19:29:27 $
- * $Author: bobboau $
+ * $Revision: 2.20 $
+ * $Date: 2007-12-22 09:36:16 $
+ * $Author: Backslash $
  *
  * C module for keyboard, joystick and mouse configuration common stuff (between Fred and FreeSpace)
  *
  * $Log: not supported by cvs2svn $
+ * Revision 2.19  2007/06/04 00:04:21  Backslash
+ * Backslash's HEAD-only controls commit:
+ * -Lateral thruster axes
+ * -Slide_when_pressed
+ * -Placeholders for glide_when_pressed and more controls, to give us a little breathing room while we wait for the real pilot file code
+ *
+ * Revision 2.18  2006/08/01 04:26:02  Kazan
+ * commented out glide_while_pressed changes until taylor deems them safe
+ *
+ * Revision 2.17  2006/08/01 01:56:44  Goober5000
+ * proper phrase case
+ *
+ * Revision 2.16  2006/07/31 23:57:48  Kazan
+ * glide while pressed
+ *
+ * Revision 2.15  2006/07/20 01:51:17  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"
+ *
+ * Revision 2.10  2005/01/16 22:39:08  wmcoolmon
+ * Added VM_TOPDOWN view; Added 2D mission mode, add 16384 to mission +Flags to use.
+ *
+ * Revision 2.9  2004/07/26 20:47:26  Kazan
+ * remove MCD complete
+ *
+ * Revision 2.8  2004/07/25 00:31:28  Kazan
+ * i have absolutely nothing to say about that subject
+ *
+ * Revision 2.7  2004/07/12 16:32:43  Kazan
+ * MCD - define _MCD_CHECK to use memory tracking
+ *
+ * Revision 2.6  2004/05/03 21:22:19  Kazan
+ * Abandon strdup() usage for mod list processing - it was acting odd and causing crashing on free()
+ * Fix condition where alt_tab_pause() would flipout and trigger failed assert if game minimizes during startup (like it does a lot during debug)
+ * Nav Point / Auto Pilot code (All disabled via #ifdefs)
+ *
+ * Revision 2.5  2004/04/06 03:09:01  phreak
+ * added a control config option for the wireframe hud targetbox i enabled ages ago
+ *
+ * Revision 2.4  2003/11/11 02:15:43  Goober5000
+ * ubercommit - basically spelling and language fixes with some additional
+ * warnings disabled
+ * --Goober5000
+ *
+ * Revision 2.3  2002/10/19 19:29:27  bobboau
+ * 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
  * So I've added a new key to the bind list and made use of already existing hud removal code.
@@ -37,7 +97,7 @@
  * minor key name change in german
  * 
  * 12    10/29/99 6:10p Jefff
- * squashed the damned y/z german issues once and for all
+ * squashed the y/z german issues once and for all
  * 
  * 11    10/28/99 11:16p Jefff
  * Changed some german key names.  Made key translations always use the
@@ -387,6 +447,7 @@
 #include "io/joy.h"
 #include "localization/localize.h"
 
+
 #define TARGET_TAB			0
 #define SHIP_TAB				1
 #define WEAPON_TAB			2
@@ -401,156 +462,179 @@ int Alt_is_modifier;
 
 int Axis_enabled[JOY_NUM_AXES] = { 1, 1, 1, 0, 0, 0 };
 int Axis_enabled_defaults[JOY_NUM_AXES] = { 1, 1, 1, 0, 0, 0 };
-int Invert_axis[JOY_NUM_AXES] = { 0, 0, 0, 0, 0, 0 };
-int Invert_axis_defaults[JOY_NUM_AXES] = { 0, 0, 0, 0, 0, 0 };
+int Invert_axis[NUM_JOY_AXIS_ACTIONS] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+int Invert_axis_defaults[NUM_JOY_AXIS_ACTIONS] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 
 // arrays which hold the key mappings.  The array index represents a key-independent action.
 //
 //XSTR:OFF
 config_item Control_config[CCFG_MAX + 1] = {
 	// targeting a ship
-	{                           KEY_T,				-1, TARGET_TAB,	"Target Next Ship" },
-	{             KEY_SHIFTED | KEY_T,				-1, TARGET_TAB,	"Target Previous Ship" },
-	{                           KEY_H,				2,  TARGET_TAB,	"Target Next Closest Hostile Ship" },
-	{	           KEY_SHIFTED | KEY_H,				-1, TARGET_TAB,	"Target Previous Closest Hostile Ship" },
-	{ KEY_ALTED |               KEY_H,				-1, TARGET_TAB,	"Toggle Auto Targeting" },
-	{                           KEY_F,				-1, TARGET_TAB,	"Target Next Closest Friendly Ship" },
-	{             KEY_SHIFTED | KEY_F,				-1, TARGET_TAB,	"Target Previous Closest Friendly Ship" },
-	{                           KEY_Y,				4,  TARGET_TAB,	"Target Ship in Reticle" },
-	{                           KEY_G,				-1, TARGET_TAB,	"Target Target's Nearest Attacker" },
-	{ KEY_ALTED	|					 KEY_Y,				-1, TARGET_TAB,	"Target Last Ship to Send Transmission" },
-	{ KEY_ALTED |               KEY_T,				-1, TARGET_TAB,	"Turn Off Auto-Targeting" },
+	{                           KEY_T,				-1, TARGET_TAB,	true, "Target Next Ship" },
+	{             KEY_SHIFTED | KEY_T,				-1, TARGET_TAB,	true, "Target Previous Ship" },
+	{                           KEY_H,				2,  TARGET_TAB,	true, "Target Next Closest Hostile Ship" },
+	{	           KEY_SHIFTED | KEY_H,				-1, TARGET_TAB,	true, "Target Previous Closest Hostile Ship" },
+	{ KEY_ALTED |               KEY_H,				-1, TARGET_TAB,	true, "Toggle Auto Targeting" },
+	{                           KEY_F,				-1, TARGET_TAB,	true, "Target Next Closest Friendly Ship" },
+	{             KEY_SHIFTED | KEY_F,				-1, TARGET_TAB,	true, "Target Previous Closest Friendly Ship" },
+	{                           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 Targeting" },
 
 	// targeting a ship's subsystem
-	{                           KEY_V,				-1, TARGET_TAB,	"Target Subsystem in Reticle" },
-	{                           KEY_S,				-1, TARGET_TAB,	"Target Next Subsystem" },
-	{             KEY_SHIFTED | KEY_S,				-1, TARGET_TAB,	"Target Previous Subsystem" },
-	{ KEY_ALTED |               KEY_S,				-1, TARGET_TAB,	"Turn Off Auto-Targeting of Subsystems" },
+	{                           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 Targeting of Subsystems" },
 
 	// matching speed
-	{                           KEY_M,				-1, COMPUTER_TAB,	"Match Target Speed" },
-	{ KEY_ALTED |               KEY_M,				-1, COMPUTER_TAB,	"Toggle Auto Speed Matching" },
+	{                           KEY_M,				-1, COMPUTER_TAB,	true, "Match Target Speed" },
+	{ KEY_ALTED |               KEY_M,				-1, COMPUTER_TAB,	true, "Toggle Auto Speed Matching" },
 
 	// weapons
-	{                           KEY_LCTRL,			0,	 WEAPON_TAB,	"Fire Primary Weapon", CC_TYPE_CONTINUOUS },
-	{                           KEY_SPACEBAR,		1,  WEAPON_TAB,	"Fire Secondary Weapon", CC_TYPE_CONTINUOUS },
-	{                           KEY_PERIOD,		-1, WEAPON_TAB,	"Cycle Forward Primary Weapon" },
-	{                           KEY_COMMA,			-1, WEAPON_TAB,	"Cycle Backward Primary Weapon" },
-	{                           KEY_DIVIDE,		-1, WEAPON_TAB,	"Cycle Secondary Weapon Bank" },
-	{             KEY_SHIFTED | KEY_DIVIDE,		-1, WEAPON_TAB,	"Cycle Secondary Weapon Firing Rate" },
-	{                           KEY_X,				3,	 WEAPON_TAB,	"Launch Countermeasure" },
+	{                           KEY_LCTRL,			0,	 WEAPON_TAB,	true, "Fire Primary Weapon", CC_TYPE_CONTINUOUS },
+	{                           KEY_SPACEBAR,		1,  WEAPON_TAB,	true, "Fire Secondary Weapon", CC_TYPE_CONTINUOUS },
+	{                           KEY_PERIOD,			-1, WEAPON_TAB,	true, "Cycle Forward Primary Weapon" },
+	{                           KEY_COMMA,			-1, WEAPON_TAB,	true, "Cycle Backward Primary Weapon" },
+	{                           KEY_DIVIDE,			-1, WEAPON_TAB,	true, "Cycle Secondary Weapon Bank" },
+	{             KEY_SHIFTED | KEY_DIVIDE,			-1, WEAPON_TAB,	true, "Cycle Secondary Weapon Firing Rate" },
+	{                           KEY_X,				3,	 WEAPON_TAB,	true, "Launch Countermeasure" },
 
 	// controls
-	{                           KEY_A,				-1, SHIP_TAB,		"Forward Thrust", CC_TYPE_CONTINUOUS },
-	{                           KEY_Z,				-1, SHIP_TAB,		"Reverse Thrust", CC_TYPE_CONTINUOUS },
-	{                           KEY_PAD7,			-1, SHIP_TAB,		"Bank Left", CC_TYPE_CONTINUOUS },
-	{                           KEY_PAD9,			-1, SHIP_TAB,		"Bank Right", CC_TYPE_CONTINUOUS },
-	{                           KEY_PAD8,			-1, SHIP_TAB,		"Pitch Forward", CC_TYPE_CONTINUOUS },
-	{                           KEY_PAD2,			-1, SHIP_TAB,		"Pitch Backward", CC_TYPE_CONTINUOUS },
-	{                           KEY_PAD4,			-1, SHIP_TAB,		"Turn Left", CC_TYPE_CONTINUOUS },
-	{                           KEY_PAD6,			-1, SHIP_TAB,		"Turn Right", CC_TYPE_CONTINUOUS },
+	{                           KEY_A,				-1, SHIP_TAB,		true, "Forward Thrust", CC_TYPE_CONTINUOUS },
+	{                           KEY_Z,				-1, SHIP_TAB,		true, "Reverse Thrust", CC_TYPE_CONTINUOUS },
+	{                           KEY_PAD7,			-1, SHIP_TAB,		true, "Bank Left", CC_TYPE_CONTINUOUS },
+	{                           KEY_PAD9,			-1, SHIP_TAB,		true, "Bank Right", CC_TYPE_CONTINUOUS },
+	{                           KEY_PAD8,			-1, SHIP_TAB,		true, "Pitch Forward", CC_TYPE_CONTINUOUS },
+	{                           KEY_PAD2,			-1, SHIP_TAB,		true, "Pitch Backward", CC_TYPE_CONTINUOUS },
+	{                           KEY_PAD4,			-1, SHIP_TAB,		true, "Turn Left", CC_TYPE_CONTINUOUS },
+	{                           KEY_PAD6,			-1, SHIP_TAB,		true, "Turn Right", CC_TYPE_CONTINUOUS },
 
 	// throttle controls
-	{                           KEY_BACKSP,		-1, SHIP_TAB,		"Set Throttle to Zero" },
-	{                           KEY_SLASH,			-1, SHIP_TAB,		"Set Throttle to Max" },
-	{                           KEY_LBRACKET,		-1, SHIP_TAB,		"Set Throttle to One-Third" },
-	{                           KEY_RBRACKET,		-1, SHIP_TAB,		"Set Throttle to Two-Thirds" },
-	{                           KEY_EQUAL,			-1, SHIP_TAB,		"Increase Throttle 5 Percent" },
-	{                           KEY_MINUS,			-1, SHIP_TAB,		"Decrease Throttle 5 Percent" },
+	{                           KEY_BACKSP,			-1, SHIP_TAB,		true, "Set Throttle to Zero" },
+	{                           KEY_SLASH,			-1, SHIP_TAB,		true, "Set Throttle to Max" },
+	{                           KEY_LBRACKET,		-1, SHIP_TAB,		true, "Set Throttle to One-Third" },
+	{                           KEY_RBRACKET,		-1, SHIP_TAB,		true, "Set Throttle to Two-Thirds" },
+	{                           KEY_EQUAL,			-1, SHIP_TAB,		true, "Increase Throttle 5 Percent" },
+	{                           KEY_MINUS,			-1, SHIP_TAB,		true, "Decrease Throttle 5 Percent" },
 
 	// squadmate messaging
-	{             KEY_SHIFTED | KEY_A,				-1, COMPUTER_TAB,	"Attack My Target" },
-	{             KEY_SHIFTED | KEY_Z,				-1, COMPUTER_TAB,	"Disarm My Target" },
-	{             KEY_SHIFTED | KEY_D,				-1, COMPUTER_TAB,	"Disable My Target" },
-	{             KEY_SHIFTED | KEY_V,				-1, COMPUTER_TAB,	"Attack my Subsystem" },
-	{             KEY_SHIFTED | KEY_X,				-1, COMPUTER_TAB,	"Capture My Target" },
-	{             KEY_SHIFTED | KEY_E,				-1, COMPUTER_TAB,	"Engage Enemy" },
-	{             KEY_SHIFTED | KEY_W,				-1, COMPUTER_TAB,	"Form on my Wing" },
-	{             KEY_SHIFTED | KEY_I,				-1, COMPUTER_TAB,	"Ignore my Target" },
-	{             KEY_SHIFTED | KEY_P,				-1, COMPUTER_TAB,	"Protect my Target" },
-	{             KEY_SHIFTED | KEY_C,				-1, COMPUTER_TAB,	"Cover me" },
-	{             KEY_SHIFTED | KEY_J,				-1, COMPUTER_TAB,	"Return to base" },
-	{				  KEY_SHIFTED | KEY_R,				-1, COMPUTER_TAB, "Rearm me" },
+	{             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_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_R,				6,  TARGET_TAB,	"Target Closest Attacking Ship" },
+	{									 KEY_R,		6,  TARGET_TAB,	true, "Target Closest Attacking Ship" },
 
 	// Views
-	{                           KEY_PADMULTIPLY,	-1, COMPUTER_TAB,	"Chase View" },
-	{                           KEY_PADPERIOD,	-1, COMPUTER_TAB,	"External View"},
-	{                           KEY_PADENTER,		-1, COMPUTER_TAB,	"Toggle External Camera Lock"},
-	{                           KEY_PAD0,			-1, COMPUTER_TAB,	"Free Look View", CC_TYPE_CONTINUOUS },
-	{                           KEY_PADDIVIDE,	-1, COMPUTER_TAB,	"Current Target View" },
-	{                           KEY_PADPLUS,		-1, COMPUTER_TAB,	"Increase View Distance", CC_TYPE_CONTINUOUS },
-	{                           KEY_PADMINUS,		-1, COMPUTER_TAB,	"Decrease View Distance", CC_TYPE_CONTINUOUS },
-	{                           KEY_PAD5,			-1, COMPUTER_TAB,	"Center View", CC_TYPE_CONTINUOUS },
-	{									 -1,					33, COMPUTER_TAB, "View Up", CC_TYPE_CONTINUOUS },
-	{									 -1,					32, COMPUTER_TAB, "View Rear", CC_TYPE_CONTINUOUS },
-	{									 -1,					34, COMPUTER_TAB, "View Left", CC_TYPE_CONTINUOUS },
-	{									 -1,					35, COMPUTER_TAB, "View Right", CC_TYPE_CONTINUOUS },
+	{                           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" }, // (Swifty) No longer used
+	{                           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 },
+	{                           KEY_PAD5,			-1, COMPUTER_TAB,	true, "Center View", CC_TYPE_CONTINUOUS },
+	{							-1,					33, COMPUTER_TAB, true, "View Up", CC_TYPE_CONTINUOUS },
+	{							-1,					32, COMPUTER_TAB, true, "View Rear", CC_TYPE_CONTINUOUS },
+	{							-1,					34, COMPUTER_TAB, true, "View Left", CC_TYPE_CONTINUOUS },
+	{							-1,					35, COMPUTER_TAB, true, "View Right", CC_TYPE_CONTINUOUS },
 
-	{                           KEY_RAPOSTRO,		-1, COMPUTER_TAB,	"Cycle Radar Range" },
-	{                           KEY_C,				-1, COMPUTER_TAB, "Communications Menu" },
-	{                           -1,					-1, -1,				"Show Objectives" },
-	{ KEY_ALTED |               KEY_J,				-1, COMPUTER_TAB,	"Enter Subspace (End Mission)" },
-	{                           KEY_J,				-1, TARGET_TAB,	"Target Target's Target" },
-	{                           KEY_TAB,			5,  SHIP_TAB,		"Afterburner", CC_TYPE_CONTINUOUS },
+	{                           KEY_RAPOSTRO,		-1, COMPUTER_TAB,	true, "Cycle Radar Range" },
+	{                           KEY_C,				-1, COMPUTER_TAB, true, "Communications Menu" },
+	{                           -1,					-1, -1,				true, "Show Objectives" },
+	{ KEY_ALTED |               KEY_J,				-1, COMPUTER_TAB,	true, "Enter Subspace (End Mission)" },
+	{                           KEY_J,				-1, TARGET_TAB,	true, "Target Target's Target" },
+	{                           KEY_TAB,			5,  SHIP_TAB,		true, "Afterburner", CC_TYPE_CONTINUOUS },
 	
-	{                           KEY_INSERT,		-1, COMPUTER_TAB,	"Increase Weapon Energy" },
-	{                           KEY_DELETE,		-1, COMPUTER_TAB,	"Decrease Weapon Energy" },
-	{                           KEY_HOME,			-1, COMPUTER_TAB,	"Increase Shield Energy" },
-	{                           KEY_END,			-1, COMPUTER_TAB,	"Decrease Shield Energy" },
-	{                           KEY_PAGEUP,		-1, COMPUTER_TAB,	"Increase Engine Energy" },
-	{                           KEY_PAGEDOWN,		-1, COMPUTER_TAB,	"Decrease Engine Energy" },
-	{ KEY_ALTED |               KEY_D,				-1, COMPUTER_TAB, "Equalize Energy Settings" },
+	{                           KEY_INSERT,		-1, COMPUTER_TAB,	true, "Increase Weapon Energy" },
+	{                           KEY_DELETE,		-1, COMPUTER_TAB,	true, "Decrease Weapon Energy" },
+	{                           KEY_HOME,			-1, COMPUTER_TAB,	true, "Increase Shield Energy" },
+	{                           KEY_END,			-1, COMPUTER_TAB,	true, "Decrease Shield Energy" },
+	{                           KEY_PAGEUP,		-1, COMPUTER_TAB,	true, "Increase Engine Energy" },
+	{                           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,	"Equalize Shield" },
-	{                           KEY_UP,				-1, COMPUTER_TAB,	"Augment Forward Shield" },
-	{                           KEY_DOWN,			-1, COMPUTER_TAB,	"Augment Rear Shield" },
-	{                           KEY_LEFT,			-1, COMPUTER_TAB,	"Augment Left Shield" },
-	{                           KEY_RIGHT,			-1, COMPUTER_TAB,	"Augment Right Shield" },
-	{                           KEY_SCROLLOCK,	-1, COMPUTER_TAB,	"Transfer Energy Laser->Shield" },
-	{             KEY_SHIFTED | KEY_SCROLLOCK,	-1, COMPUTER_TAB,	"Transfer Energy Shield->Laser" },
-	{                           -1,					-1, -1,				"Show Damage Popup Window" },	
+	{                           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, SHIP_TAB,		"Bank When Pressed", CC_TYPE_CONTINUOUS },
-	{									 -1,					-1, -1,				"Show NavMap" },
-	{ KEY_ALTED |	             KEY_E,				-1, COMPUTER_TAB,	"Add or Remove Escort" },
-	{ KEY_ALTED | KEY_SHIFTED | KEY_E,				-1, COMPUTER_TAB,	"Clear Escort List" },
-	{					             KEY_E,				-1, TARGET_TAB,	"Target Next Escort Ship" },
-	{ KEY_ALTED	|					 KEY_R,				-1, TARGET_TAB,	"Target Closest Repair Ship" },
+	{							-1,					-1, SHIP_TAB,		false, "Slide When Pressed", CC_TYPE_CONTINUOUS },
+//Backslash -- this was a convenient place for Slide 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 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" },
+	{ KEY_ALTED	|					 KEY_R,				-1, TARGET_TAB,	true, "Target Closest Repair Ship" },
 
-	{                           KEY_U,				-1, TARGET_TAB,	"Target Next Uninspected Cargo" },
-	{             KEY_SHIFTED | KEY_U,				-1, TARGET_TAB,	"Target Previous Uninspected Cargo" },
-	{									 KEY_N,				-1, TARGET_TAB,	"Target Newest Ship In Area" },
-	{                           KEY_K,				-1, TARGET_TAB,	"Target Next Live Turret" },
-	{             KEY_SHIFTED | KEY_K,				-1, TARGET_TAB,	"Target Previous Live Turret" },
+	{                           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_K,				-1, TARGET_TAB,	true, "Target Next Live Turret" },
+	{             KEY_SHIFTED | KEY_K,				-1, TARGET_TAB,	true, "Target Previous Live Turret" },
 
-	{									 KEY_B,				-1, TARGET_TAB,	"Target Next Hostile Bomb or Bomber" },
-	{             KEY_SHIFTED | KEY_B,				-1, TARGET_TAB,	"Target Previous Hostile Bomb or Bomber" },
+	{									 KEY_B,		-1, TARGET_TAB,	true, "Target Next Hostile Bomb or Bomber" },
+	{             KEY_SHIFTED | KEY_B,				-1, TARGET_TAB,	true, "Target Previous Hostile Bomb or Bomber" },
 
 	// multiplayer messaging keys
-	{									 KEY_1,				-1, COMPUTER_TAB,	"(Multiplayer) Message All", CC_TYPE_CONTINUOUS },
-	{									 KEY_2,				-1, COMPUTER_TAB, "(Multiplayer) Message Friendly", CC_TYPE_CONTINUOUS },
-	{									 KEY_3,				-1, COMPUTER_TAB, "(Multiplayer) Message Hostile", CC_TYPE_CONTINUOUS },
-	{									 KEY_4,				-1, COMPUTER_TAB, "(Multiplayer) Message Target", CC_TYPE_CONTINUOUS },
-	{ KEY_ALTED	|					 KEY_X,				-1, COMPUTER_TAB, "(Multiplayer) Observer zoom to target"},	
+	{									 KEY_1,				-1, COMPUTER_TAB, true, "(Multiplayer) Message All", CC_TYPE_CONTINUOUS },
+	{									 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,	"Increase time compression" },
-	{             KEY_SHIFTED | KEY_COMMA,			-1, COMPUTER_TAB,	"Decrease time compression" },
+	{             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, "Toggle high HUD contrast" },	
+	{									 KEY_L,				-1, COMPUTER_TAB, true, "Toggle High HUD Contrast" },	
 
-	{				  KEY_SHIFTED | KEY_N,				-1, COMPUTER_TAB, "(Multiplayer) Toggle network info"},
-	{				  KEY_SHIFTED | KEY_END,			-1, COMPUTER_TAB, "(Multiplayer) Self destruct"},
+	{				  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, "Toggle HUD"},
-	{				  KEY_SHIFTED | KEY_3,			-1, SHIP_TAB, "Right Thrust", CC_TYPE_CONTINUOUS},
-	{				  KEY_SHIFTED | KEY_1,			-1, SHIP_TAB, "Left Thrust", CC_TYPE_CONTINUOUS},
-	{				  KEY_SHIFTED | KEY_PADPLUS,	-1, SHIP_TAB, "Up Thrust", CC_TYPE_CONTINUOUS},
-	{				  KEY_SHIFTED | KEY_PADENTER,	-1, SHIP_TAB, "Down Thrust", CC_TYPE_CONTINUOUS},
+	{				  KEY_SHIFTED | KEY_O,			-1, COMPUTER_TAB, true, "Toggle HUD"},
+	{				  KEY_SHIFTED | KEY_3,			-1, SHIP_TAB, true, "Right Thrust", CC_TYPE_CONTINUOUS},
+	{				  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 Target View"},
+	{							-1,					-1,	COMPUTER_TAB, false, "Top-Down View"},
+	{							-1,					-1, COMPUTER_TAB, false, "Target Padlock View"}, // (Swifty) Toggle for VM_TRACK
 
-	{                           -1,					-1, -1,				"" }
+	// 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, SHIP_TAB, false, "Glide When Pressed", CC_TYPE_CONTINUOUS},
+ 	// (Swifty) The four new free looking commands.
+ 	{							-1,					-1,	COMPUTER_TAB, false, "Free Look Up", CC_TYPE_CONTINUOUS},
+ 	{							-1,					-1,	COMPUTER_TAB, false, "Free Look Down", CC_TYPE_CONTINUOUS},
+ 	{							-1,					-1,	COMPUTER_TAB, false, "Free Look Left", CC_TYPE_CONTINUOUS},
+ 	{							-1,					-1,	COMPUTER_TAB, false, "Free Look Right", CC_TYPE_CONTINUOUS},
+
+	{                           -1,					-1, -1,				false, "MultiTarget Wing" },
+	{                           -1,					-1, -1,				false, "Placeholder" },
+	{                           -1,					-1, -1,				false, "Placeholder" },
+	{                           -1,					-1, -1,				false, "Placeholder" },
+	{                           -1,					-1, -1,				false, "Placeholder" },
+
+	{                           -1,					-1, -1,			 false,	"" }
 };
 
 char *Scan_code_text_german[] = {

code/cryptstring/cryptstring.cpp

@@ -9,13 +9,16 @@
 
 /*
  * $Logfile: /Freespace2/code/Cryptstring/cryptstring.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
- * $Author: penguin $
+ * $Revision: 2.2 $
+ * $Date: 2005-09-08 00:09:32 $
+ * $Author: taylor $
  *
  * Applet for crypting strings.
  *
  * $Log: not supported by cvs2svn $
+ * Revision 2.1  2002/08/01 01:41:04  penguin
+ * The big include file move
+ *
  * Revision 2.0  2002/06/03 04:02:21  penguin
  * Warpcore CVS sync
  *
@@ -33,6 +36,13 @@
 #include <string.h>
 #include "globalincs/crypt.h"
 
+
+// we end up #include'ing SDL.h which on Windows and Mac will redfine main() which is something
+// that we don't want since we don't actually link against SDL, this solves the problem...
+#ifdef main
+#undef main
+#endif
+
 int main(int argc, char **argv)
 {
 	int i;

code/cutscene/cutscenes.cpp

@@ -9,13 +9,104 @@
 
 /*
  * $Logfile: /Freespace2/code/Cutscene/Cutscenes.cpp $
- * $Revision: 2.4 $
- * $Date: 2002-08-27 13:38:57 $
- * $Author: penguin $
+ * $Revision: 2.23 $
+ * $Date: 2007-09-02 02:10:24 $
+ * $Author: Goober5000 $
+ * $Revision: 2.23 $
+ * $Date: 2007-09-02 02:10:24 $
+ * $Author: Goober5000 $
  *
  * Code for the cutscenes viewer screen
  *
  * $Log: not supported by cvs2svn $
+ * Revision 2.22  2007/03/22 20:53:43  taylor
+ * give a better msg when movies can't play because they are user-disabled with the cmdline option
+ *
+ * Revision 2.21  2007/02/09 23:58:52  taylor
+ * add the "show all" hotkey to the cutscene viewer
+ *
+ * Revision 2.20  2006/12/28 00:59:19  wmcoolmon
+ * WMC codebase commit. See pre-commit build thread for details on changes.
+ *
+ * Revision 2.19  2006/09/11 06:49:38  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
+ *
+ * Revision 2.15  2005/02/23 04:51:55  taylor
+ * some bm_unload() -> bm_release() changes to save bmpman slots
+ *
+ * Revision 2.14  2005/01/31 23:27:51  taylor
+ * merge with Linux/OSX tree - p0131-2
+ *
+ * Revision 2.13  2004/07/26 20:47:26  Kazan
+ * remove MCD complete
+ *
+ * Revision 2.12  2004/07/12 16:32:43  Kazan
+ * MCD - define _MCD_CHECK to use memory tracking
+ *
+ * Revision 2.11  2004/04/26 13:11:11  taylor
+ * mark view cutscenes ignoring extension and file case
+ *
+ * Revision 2.10  2004/03/05 09:01:58  Goober5000
+ * Uber pass at reducing #includes
+ * --Goober5000
+ *
+ * Revision 2.9  2004/02/20 04:29:53  bobboau
+ * pluged memory leaks,
+ * 3D HTL lasers (they work perfictly)
+ * and posably fixed Turnsky's shinemap bug
+ *
+ * Revision 2.8  2004/01/24 15:52:25  randomtiger
+ * I have submitted the new movie playing code despite the fact in D3D it sometimes plays behind the main window.
+ * In OGL it works perfectly and in both API's it doesnt switch to the desktop anymore so hopefully people will not experience the crashes etc that the old system used to suffer from.
+ *
+ * Revision 2.7  2003/08/21 20:54:38  randomtiger
+ * Fixed switching - RT
+ *
+ * Revision 2.6  2003/07/15 02:58:08  phreak
+ * the cutscene section in the techroom does not append *.mve onto a filename
+ *
+ * Revision 2.5  2003/03/18 10:07:01  unknownplayer
+ * 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.4  2002/08/27 13:38:57  penguin
+ * Moved DirectX8 stuff to directx8 branch; reverted to previous
+ *
+ * Revision 2.2.2.4  2002/09/24 18:56:41  randomtiger
+ * DX8 branch commit
+ *
+ * This is the scub of UP's previous code with the more up to date RT code.
+ * For full details check previous dev e-mails
+ *
+ * Revision 2.2.2.3  2002/08/28 21:47:02  randomtiger
+ * Tiny change to DX branch to keep movie code optional (default off)
+ *
+ * Revision 2.2.2.2  2002/08/28 12:39:35  randomtiger
+ * OK, this should be a commit to the DX branch or Im going to be in a lot of trouble.
+ * The movie and dx8show files have been cleaned up big time.
+ * My debug system is in but has NO EFFECT at all unless a compiler flag is turned on, check h file for details.
+ * Aside from that a few changes to help the movie code work properly.
+ * Works on most things including GF4 and Voodoo 3. However may not work properly on a voodoo 2.
+ * Im going to leave this as a bug for now, serves you right for buying voodoo!
+ *
+ * Revision 2.2.2.1  2002/08/27 13:19:26  penguin
+ * Moved to directx8 branch
+ *
+ * Revision 2.3  2002/08/18 19:48:29  randomtiger
+ * Added new lib files: strmiids and ddraw to get dshow working
+ * Added new command line parameter to active direct show movie play: -dshowvid
+ * Uncommented movie_play calls and includes
+ *
  * Revision 2.2  2002/08/01 01:41:04  penguin
  * The big include file move
  *
@@ -155,17 +246,20 @@
 
 #include "cutscene/cutscenes.h"
 #include "ui/ui.h"
-#include "cfile/cfile.h"
 #include "gamesnd/gamesnd.h"
 #include "gamesequence/gamesequence.h"
 #include "freespace2/freespace.h"
 #include "io/key.h"
-#include "bmpman/bmpman.h"
-// #include "movie.h"
+#include "movie.h"
 #include "popup/popup.h"
 #include "menuui/mainhallmenu.h"
 #include "globalincs/alphacolors.h"
 #include "localization/localize.h"
+#include "parse/parselo.h"
+
+
+extern int Cmdline_nomovies;
+
 
 char *Cutscene_bitmap_name[GR_NUM_RESOLUTIONS] = {
 	"ViewFootage",
@@ -176,44 +270,55 @@ char *Cutscene_mask_name[GR_NUM_RESOLUTIONS] = {
 	"2_ViewFootage-m"
 };
 
-int Num_cutscenes;
+int Num_cutscenes = 0;
 int Cutscenes_viewable;
 int Description_index;
 cutscene_info Cutscenes[MAX_CUTSCENES];
 
 //extern int All_movies_enabled;		//	If set, all movies may be viewed.  Keyed off cheat code.
+void cutscene_close(){
+	for(int i = 0; i<MAX_CUTSCENES; i++)
+	{
+		if(Cutscenes[i].description != NULL) {
+			vm_free(Cutscenes[i].description);
+		}
+	}
+}
 
 // initialization stuff for cutscenes
 void cutscene_init()
 {
+	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);
-	} 
-
 	// open localization
 	lcl_ext_open();
 
+	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");
 	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 );
 		required_string("$Filename:");
-		stuff_string( Cutscenes[Num_cutscenes].filename, F_PATHNAME, NULL );
+		stuff_string( Cutscenes[Num_cutscenes].filename, F_PATHNAME, MAX_FILENAME_LEN );
 		required_string("$Name:");
-		stuff_string( Cutscenes[Num_cutscenes].name, F_NAME, NULL );
+		stuff_string( Cutscenes[Num_cutscenes].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 = strdup(buf);
+		Cutscenes[Num_cutscenes].description = vm_strdup(buf);
 		required_string("$cd:");
 		stuff_int( &Cutscenes[Num_cutscenes].cd );
 
@@ -232,7 +337,6 @@ void cutscene_init()
 // returns -1 on failure.
 int cutscenes_get_cd_num( char *filename )
 {
-#ifdef _WIN32
 #if defined(OEM_BUILD)
 	return 0;				// only 1 cd for OEM
 #else
@@ -246,18 +350,34 @@ int cutscenes_get_cd_num( char *filename )
 
 	return -1;
 #endif // defined(OEM_BUILD)
-#else  // !WIN32
-   return -1;
-#endif // ifdef WIN32
 }
 
 // marks a cutscene as viewable
 void cutscene_mark_viewable(char *filename)
 {
 	int i;
+	char cut_file[MAX_FILENAME_LEN];
+	char file[MAX_FILENAME_LEN];
+
+	Assert(filename);
+
+	// strip off extension
+	strcpy( file, filename );
+	char *p = strchr( file, '.' );
+	if ( p ) {
+		*p = 0;
+	}
+
+	// change to lower case
+	strlwr(file);
 
 	for (i = 0; i < Num_cutscenes; i++ ) {
-		if ( !stricmp(Cutscenes[i].filename, filename) ) {
+		// change the cutscene file name to lower case
+		strcpy(cut_file, Cutscenes[i].filename);
+		strlwr(cut_file);
+
+		// see if the stripped filename matches the cutscene filename
+		if ( strstr(cut_file, file) != NULL ) {
 			Cutscenes_viewable |= (1<<i);
 			return;
 		}
@@ -278,7 +398,7 @@ void cutscene_mark_viewable(char *filename)
 
 static int Num_files;
 static int Cutscene_list[MAX_CUTSCENES];
-static int Stats_scroll_offset;
+//static int Stats_scroll_offset;  // not used - taylor
 static int Selected_line = 0;  // line that is currently selected for binding
 static int Scroll_offset;
 static int Background_bitmap;
@@ -287,8 +407,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
 
@@ -298,7 +418,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
@@ -366,7 +486,6 @@ static char *Text_lines[MAX_TEXT_LINES];
 
 int cutscenes_validate_cd(char *mve_name, int prompt_for_cd)
 {
-#ifdef _WIN32
 	int cd_present = 0;
 	int cd_drive_num;
 	int cd_mve_is_on;
@@ -425,7 +544,7 @@ int cutscenes_validate_cd(char *mve_name, int prompt_for_cd)
 		if ( num_attempts++ > 5 ) {
 			cd_present = 0;
 			break;
-		}
+		}													   
 #else
 		cd_present = 0;
 		break;
@@ -433,33 +552,35 @@ int cutscenes_validate_cd(char *mve_name, int prompt_for_cd)
 
 	}
 
-	return cd_present;
-#else  // !WIN32
-	return 0;
-#endif // ifdef WIN32
+	return cd_present;   
 }
 
 void cutscenes_screen_play()
 {
-	char name[MAX_FILENAME_LEN], *full_name;
+	char name[MAX_FILENAME_LEN]; // *full_name 
 	int which_cutscene;
 
 	Assert( (Selected_line >= 0) && (Selected_line < Num_files) );
 	which_cutscene = Cutscene_list[Selected_line];
 
 	strcpy(name, Cutscenes[which_cutscene].filename );
-	full_name = cf_add_ext(name, NOX(".mve"));
+//	full_name = cf_add_ext(name, NOX(".mve"));
+
+	main_hall_stop_music();
+	int rval = movie_play(name);
+	main_hall_start_music();
 
-	// no soup for you!
-	/*
-	int rval = movie_play(full_name);
 	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 );
 	}
-	*/
+	
 }
 
 void cutscenes_screen_scroll_line_up()
@@ -573,7 +694,7 @@ void cutscenes_screen_init()
 	int i;
 	ui_button_info *b;
 
-	Ui_window.create(0, 0, gr_screen.max_w, gr_screen.max_h, 0);
+	Ui_window.create(0, 0, gr_screen.max_w_unscaled, gr_screen.max_h_unscaled, 0);
 	Ui_window.set_mask_bmap(Cutscene_mask_name[gr_screen.res]);
 
 	for (i=0; i<NUM_BUTTONS; i++) {
@@ -626,7 +747,7 @@ void cutscenes_screen_init()
 void cutscenes_screen_close()
 {
 	if (Background_bitmap)
-		bm_unload(Background_bitmap);
+		bm_release(Background_bitmap);
 
 	Ui_window.destroy();
 }
@@ -672,6 +793,18 @@ 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;
+			for (i = 0; i < Num_cutscenes; i++) {
+				Cutscene_list[Num_files] = i;
+				Num_files++;
+			}
+
+			break;
+		}
 	}	// end switch
 
 	for (i=0; i<NUM_BUTTONS; i++){

code/cutscene/cutscenes.h

@@ -9,13 +9,27 @@
 
 /*
  * $Logfile: /Freespace2/code/Cutscene/Cutscenes.h $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
- * $Author: penguin $
+ * $Revision: 2.5 $
+ * $Date: 2006-12-28 00:59:19 $
+ * $Author: wmcoolmon $
  *
  * Code for the cutscenes viewer screen
  *
  * $Log: not supported by cvs2svn $
+ * Revision 2.4  2005/07/13 02:50:50  Goober5000
+ * remove PreProcDefine #includes in FS2
+ * --Goober5000
+ *
+ * Revision 2.3  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
+ *
+ * Revision 2.2  2004/03/05 09:01:58  Goober5000
+ * Uber pass at reducing #includes
+ * --Goober5000
+ *
+ * Revision 2.1  2002/08/01 01:41:04  penguin
+ * The big include file move
+ *
  * Revision 2.0  2002/06/03 04:02:21  penguin
  * Warpcore CVS sync
  *
@@ -53,7 +67,8 @@
 #ifndef _FREESPACE_CUTSCENES_SCREEN_HEADER_FILE
 #define _FREESPACE_CUTSCENES_SCREEN_HEADER_FILE
 
-#include "parse/parselo.h"
+#include "globalincs/globals.h"
+#include "globalincs/pstypes.h"
 
 #define MAX_CUTSCENES	10
 
@@ -66,6 +81,7 @@ typedef struct cutscene_info
 	char		name[NAME_LENGTH];
 	char		*description;
 	int		cd;
+	cutscene_info(){memset(this, 0, sizeof(cutscene_info));}
 } cutscene_info;
 
 extern cutscene_info Cutscenes[MAX_CUTSCENES];

code/cutscene/decoder16.cpp

@@ -0,0 +1,669 @@
+/*
+ * $Logfile: /Freespace2/src/cutscene/decoder16.cpp $
+ * $Revision: 2.2 $
+ * $Date: 2006-08-20 00:44:36 $
+ * $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;
+}

code/cutscene/decoder8.cpp

@@ -0,0 +1,545 @@
+/*
+ * $Logfile: /Freespace2/src/cutscene/decoder8.cpp $
+ * $Revision: 2.1 $
+ * $Date: 2006-08-20 00:44:36 $
+ * $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;
+	}
+}

code/cutscene/movie.cpp

@@ -0,0 +1,247 @@
+/*
+ * 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.40 $
+ * $Date: 2007-01-07 12:29:43 $
+ * $Author: taylor $
+ *
+ * movie player code
+ * 
+ * $Log: not supported by cvs2svn $
+ * Revision 2.39  2006/12/28 00:59:19  wmcoolmon
+ * WMC codebase commit. See pre-commit build thread for details on changes.
+ *
+ * Revision 2.38  2006/11/16 00:50:38  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.37  2006/09/11 05:54:37  taylor
+ * switch to using cf_find_file_location_ext() when looking for movies
+ *
+ * Revision 2.36  2006/09/09 21:28:19  taylor
+ * be sure to reset color and clear color before MVE playback (fix for Mantis bug #1041)
+ *
+ * Revision 2.35  2006/08/20 00:44:36  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.34  2006/08/15 00:26:07  Backslash
+ * add .ogg to the list of recognized movie file extensions
+ *
+ * Revision 2.33  2006/07/13 22:15:02  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.32  2006/06/27 05:07:48  taylor
+ * fix various compiler warnings and things that Valgrind complained about
+ *
+ * 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"
+#include "menuui/mainhallmenu.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 = strchr(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;
+
+	rc = movie_find(name, full_name);
+
+	if (rc == MOVIE_NONE) {
+		mprintf(("MOVIE ERROR: Unable to open movie file '%s' in any supported format.\n", name));
+		return false;
+	}
+
+	// kill all background sounds
+	main_hall_pause();
+
+	// 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, and unpause the mainhall music
+	Mouse_hidden--;
+	main_hall_unpause();
+
+	return true;
+}
+
+void movie_play_two(char *name1, char *name2)
+{
+	if ( movie_play(name1) )
+		movie_play(name2);
+}

code/cutscene/movie.h

@@ -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.7 $
+ * $Date: 2007-01-07 12:29:43 $
+ * $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

code/cutscene/mve_audio.cpp

@@ -0,0 +1,82 @@
+/*
+ * $Logfile: /Freespace2/src/cutscene/mve_audio.cpp $
+ * $Revision: 2.2 $
+ * $Date: 2007-01-15 01:37:37 $
+ * $Author: wmcoolmon $
+ *
+ * Handles compressed audio data in MVE files
+ *
+ * $Log: not supported by cvs2svn $
+ * Revision 2.1  2006/05/13 06:59:48  taylor
+ * MVE player (audio only works with OpenAL builds!)
+ *
+ * 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)++ = (short)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 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

code/cutscene/mvelib.cpp

@@ -0,0 +1,385 @@
+/*
+ * $Logfile: /Freespace2/src/cutscene/mvelib.cpp $
+ * $Revision: 2.2 $
+ * $Date: 2006-08-20 00:44:36 $
+ * $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;
+}

code/cutscene/mvelib.h

@@ -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 */

code/cutscene/mveplayer.cpp

@@ -0,0 +1,855 @@
+/*
+ * $Logfile: /Freespace2/code/cutscene/mveplayer.cpp $
+ * $Revision: 2.5 $
+ * $Date: 2007-02-10 00:02:18 $
+ * $Author: taylor $
+ *
+ * MVE movie playing routines
+ *
+ * $Log: not supported by cvs2svn $
+ * Revision 2.4  2007/01/15 01:37:37  wmcoolmon
+ * Fix CVS & correct various warnings under MSVC 2003
+ *
+ * Revision 2.3  2007/01/07 12:29:43  taylor
+ * add Theora player
+ * remove DirectShow support from movie player
+ * fix triple-buffer page flipping problem (Mantis bug #1190)
+ *
+ * Revision 2.2  2006/08/20 00:44:36  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 "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);
+#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); /* 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;
+
+			if (GL_texture_target == GL_TEXTURE_RECTANGLE_ARB) {
+				gl_screenU = (GLfloat)g_width;
+				gl_screenV = (GLfloat)g_height;
+			} else {
+				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) {
+		glBindTexture(GL_texture_target, GLtex);
+
+		glTexSubImage2D(GL_texture_target, 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) {
+		// set the appropriate texture target
+		if ( Is_Extension_Enabled(OGL_ARB_TEXTURE_RECTANGLE) && !Is_Extension_Enabled(OGL_ARB_TEXTURE_NON_POWER_OF_TWO) )
+			opengl_set_texture_target( GL_TEXTURE_RECTANGLE_ARB );
+
+		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;
+		}
+
+		// disable everything but what we need
+		opengl_switch_arb(-1, 0);
+		opengl_switch_arb(0, 1);
+
+		gr_set_lighting(false, false);
+	
+		glBindTexture(GL_texture_target, GLtex);
+	
+		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		glDepthFunc(GL_ALWAYS);
+		glDepthMask(GL_FALSE);
+		glDisable(GL_DEPTH_TEST);
+		glTexParameteri(GL_texture_target, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+		glTexParameteri(GL_texture_target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+		glTexParameteri(GL_texture_target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+		glTexParameteri(GL_texture_target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+
+		// NOTE: using NULL instead of pixelbuf crashes some drivers, but then so does pixelbuf
+		glTexImage2D(GL_texture_target, 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();
+		}
+
+		glBindTexture(GL_texture_target, 0);
+		glDeleteTextures(1, &GLtex);
+		GLtex = 0;
+
+		opengl_switch_arb(-1, 0);
+		opengl_set_texture_target();
+	}
+
+	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();
+}

code/cutscene/oggplayer.cpp

@@ -0,0 +1,978 @@
+/*
+ * $Logfile: /Freespace2/code/cutscene/oggplayer.cpp $
+ * $Revision: 2.5 $
+ * $Date: 2007-04-11 14:50:01 $
+ * $Author: taylor $
+ *
+ * movie player code
+ * 
+ * $Log: not supported by cvs2svn $
+ * Revision 2.4  2007/03/22 20:23:42  taylor
+ * fix stupidness that screwed up RGB values (Mantis #1307)
+ *
+ * Revision 2.3  2007/02/10 00:02:18  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 2.2  2007/01/14 10:26:37  wmcoolmon
+ * Attempt to remove various warnings under MSVC 2003, mostly related to casting, but also some instances of inaccessible code.
+ *
+ * Revision 2.1  2007/01/07 12:29:43  taylor
+ * add Theora player
+ * remove DirectShow support from movie player
+ * fix triple-buffer page flipping problem (Mantis bug #1190)
+ *
+ * Revision 1.0  2006/12/25 21:44:11  taylor
+ *
+ * $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/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;
+
+
+	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 (gr_screen.mode == GR_OPENGL) {
+		// set the appropriate texture target
+		if ( Is_Extension_Enabled(OGL_ARB_TEXTURE_RECTANGLE) && !Is_Extension_Enabled(OGL_ARB_TEXTURE_NON_POWER_OF_TWO) )
+			opengl_set_texture_target( GL_TEXTURE_RECTANGLE_ARB );
+
+		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;
+		}
+
+		// disable everything but what we need
+		opengl_switch_arb(-1, 0);
+		opengl_switch_arb(0, 1);
+
+		gr_set_lighting(false, false);
+	
+		glBindTexture(GL_texture_target, GLtex);
+	
+		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		glDepthFunc(GL_ALWAYS);
+		glDepthMask(GL_FALSE);
+		glDisable(GL_DEPTH_TEST);
+		glTexParameteri(GL_texture_target, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+		glTexParameteri(GL_texture_target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+		glTexParameteri(GL_texture_target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+		glTexParameteri(GL_texture_target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+
+		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;
+		}
+
+		// NOTE: using NULL instead of pixelbuf crashes some drivers, but then so does pixelbuf
+		glTexImage2D(GL_texture_target, 0, GL_RGB8, wp2, hp2, 0, GL_BGR, GL_UNSIGNED_BYTE, 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
+
+	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;
+
+		if (GL_texture_target == GL_TEXTURE_RECTANGLE_ARB) {
+			gl_screenU = (GLfloat)wp2;
+			gl_screenV = (GLfloat)hp2;
+		} else {
+			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();
+		}
+
+		opengl_switch_arb(-1, 0);
+
+		glBindTexture(GL_texture_target, 0);
+		glDeleteTextures(1, &GLtex);
+		GLtex = 0;
+
+		opengl_set_texture_target();
+
+		glEnable(GL_DEPTH_TEST);
+	}
+
+	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) {
+		glBindTexture(GL_texture_target, GLtex);
+
+		glTexSubImage2D(GL_texture_target, 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();
+	} else {
+		// TODO:  FIXME!!!!
+	}
+
+	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 {
+			int 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;
+	}
+
+	if ( (movie->tinfo.frame_width > 640) || (movie->tinfo.frame_height > 480) ) {
+		mprintf(("Theora ERROR:  Movies must be no larger than 640x480!\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;
+
+	// 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++] = (short)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();
+}

code/cutscene/oggplayer.h

@@ -0,0 +1,55 @@
+/*
+ * $Logfile: /Freespace2/src/cutscene/oggplayer.h $
+ * $Revision: 2.1 $
+ * $Date: 2007-01-07 12:29:43 $
+ * $Author: taylor $
+ *
+ * main lib for using Theora movies
+ *
+ * $Log: not supported by cvs2svn $
+ * 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: $
+ *
+ */
+
+#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

code/ddsutils/ddsutils.cpp

@@ -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 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");
+
+	// 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:
+			break;
+	}
+
+	//get a warning otherwise
+	return "Abort, retry, fail?";
+}

code/ddsutils/ddsutils.h

@@ -0,0 +1,157 @@
+//header file to load .dds files
+//these use dxtc texture compression
+
+#ifndef __DDS_H
+#define __DDS_H
+
+#include "globalincs/pstypes.h"
+
+
+struct CFILE;
+
+#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);
+
+// 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

code/debris/debris.cpp

@@ -9,13 +9,126 @@
 
 /*
  * $Logfile: /Freespace2/code/Debris/Debris.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
- * $Author: penguin $
+ * $Revision: 2.32 $
+ * $Date: 2007-03-22 21:55:01 $
+ * $Author: taylor $
  *
  * Code for the pieces of exploding object debris.
  *
  * $Log: not supported by cvs2svn $
+ * Revision 2.31  2007/02/20 04:20:10  Goober5000
+ * the great big duplicate model removal commit
+ *
+ * Revision 2.30  2007/02/11 09:22:29  taylor
+ * remove NO_SOUND
+ * fix debris recycling
+ *
+ * Revision 2.29  2006/12/28 00:59:19  wmcoolmon
+ * WMC codebase commit. See pre-commit build thread for details on changes.
+ *
+ * Revision 2.28  2006/09/11 06:45:39  taylor
+ * various small compiler warning and strict compiling fixes
+ *
+ * Revision 2.27  2006/09/11 06:08:08  taylor
+ * make Species_info[] and Asteroid_info[] dynamic
+ *
+ * Revision 2.26  2006/08/20 00:46:02  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.25  2006/07/06 04:06:03  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.24  2006/07/04 07:42:48  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
+ *
+ * Revision 2.15  2005/07/13 02:01:28  Goober5000
+ * fixed a bunch of "issues" caused by me with the species stuff
+ * --Goober5000
+ *
+ * Revision 2.14  2005/07/13 00:44:21  Goober5000
+ * improved species support and removed need for #define
+ * --Goober5000
+ *
+ * Revision 2.13  2005/04/05 05:53:15  taylor
+ * s/vector/vec3d/g, better support for different compilers (Jens Granseuer)
+ *
+ * Revision 2.12  2005/03/27 12:28:32  Goober5000
+ * clarified max hull/shield strength names and added ship guardian thresholds
+ * --Goober5000
+ *
+ * Revision 2.11  2005/03/02 21:24:43  taylor
+ * more network/inferno goodness for Windows, takes care of a few warnings too
+ *
+ * Revision 2.10  2005/01/30 09:27:39  Goober5000
+ * nitpicked some boolean tests, and fixed two small bugs
+ * --Goober5000
+ *
+ * Revision 2.9  2004/07/26 20:47:26  Kazan
+ * remove MCD complete
+ *
+ * Revision 2.8  2004/07/12 16:32:44  Kazan
+ * MCD - define _MCD_CHECK to use memory tracking
+ *
+ * Revision 2.7  2004/07/01 01:52:20  phreak
+ * function pointer radar update.
+ * will enable us to make different radar styles that we can switch between
+ *
+ * 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
+ * to indicate which warnings were being disabled
+ * --Goober5000
+ *
+ * Revision 2.5  2004/03/05 09:01:59  Goober5000
+ * Uber pass at reducing #includes
+ * --Goober5000
+ *
+ * Revision 2.4  2003/10/15 22:03:24  Kazan
+ * Da Species Update :D
+ *
+ * Revision 2.3  2003/04/29 01:03:22  Goober5000
+ * implemented the custom hitpoints mod
+ * --Goober5000
+ *
+ * Revision 2.2  2003/03/19 12:29:01  unknownplayer
+ * Woohoo! Killed two birds with one stone!
+ * Fixed the 'black screen around dialog boxes' problem and also the much more serious freezing problem experienced by Goober5000. It wasn't a crash, just an infinite loop. DX8 merge is GO! once again :)
+ *
+ * Revision 2.1  2002/08/01 01:41:04  penguin
+ * The big include file move
+ *
  * Revision 2.0  2002/06/03 04:02:21  penguin
  * Warpcore CVS sync
  *
@@ -220,34 +333,35 @@
  * $NoKeywords: $
  */
 
-#include "render/3d.h"
-#include "bmpman/bmpman.h"
-#include "object/object.h"
+
 #include "debris/debris.h"
+#include "render/3d.h"
 #include "fireball/fireballs.h"
 #include "radar/radar.h"
-#include "mission/missionparse.h"		// For MAX_SPECIES_NAMES
 #include "gamesnd/gamesnd.h"
 #include "object/objectsnd.h"
 #include "globalincs/linklist.h"
-#include "globalincs/systemvars.h"
 #include "particle/particle.h"
 #include "freespace2/freespace.h"
 #include "object/objcollide.h"
 #include "io/timer.h"
-
-#ifndef NO_NETWORK
+#include "species_defs/species_defs.h"
+#include "ship/ship.h"
+#include "radar/radarsetup.h"
 #include "network/multi.h"
 #include "network/multimsgs.h"
 #include "network/multiutil.h"
-#endif
+
+
+
 
 #define MAX_LIFE									10.0f
 #define MIN_RADIUS_FOR_PERSISTANT_DEBRIS	50		// ship radius at which debris from it becomes persistant
 #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
 
@@ -259,13 +373,6 @@ int Debris_inited = 0;
 int Debris_model = -1;
 int Debris_vaporize_model = -1;
 int Debris_num_submodels = 0;
-char * Debris_texture_files[MAX_SPECIES_NAMES] = { 
-	NOX("debris01a"),	// Terran
-	NOX("debris01b"),	// Species B
-	NOX("debris01c"),	// Shivan
-	};
-
-int Debris_textures[MAX_SPECIES_NAMES];
 
 #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.
@@ -274,7 +381,7 @@ int Debris_textures[MAX_SPECIES_NAMES];
 #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()
@@ -285,10 +392,8 @@ 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);
@@ -335,10 +440,10 @@ 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>-1)	{
+	if (Debris_model >= 0)	{
 		polymodel * pm;
 		pm = model_get(Debris_model);
 		Debris_num_submodels = pm->n_models;
@@ -346,19 +451,25 @@ void debris_page_in()
 
 	Debris_vaporize_model = model_load( NOX("debris02.pof"), 0, NULL );
 
-	for (i=0; i<MAX_SPECIES_NAMES; 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()
@@ -375,19 +486,19 @@ 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);
 
 	// Swap in a different texture depending on the species
-	if ( (db->species > -1) && (db->species < MAX_SPECIES_NAMES) )	{
-
+	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];
+			swapped = pm->maps[0].base_map.texture;
+			pm->maps[0].base_map.texture = Species_info[db->species].debris_texture.bitmap_id;
 		}
 	}
 
@@ -411,7 +522,7 @@ void debris_render(object * obj)
 	}
 
 	if ((swapped!=-1) && pm)	{
-		pm->textures[0] = swapped;
+		pm->maps[0].base_map.texture = swapped;
 	}
 }
 
@@ -460,16 +571,23 @@ void maybe_delete_debris(debris *db)
 {
 	object	*objp;
 
-	if (timestamp_elapsed(db->next_distance_check)) {
-		if (!(Game_mode & GM_MULTIPLAYER)) {		//	In single player game, just check against player.
+	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;
 			else
 				db->next_distance_check = timestamp(DEBRIS_DISTANCE_CHECK_TIME);
-		} else {
-			for ( objp = GET_FIRST(&obj_used_list); objp !=END_OF_LIST(&obj_used_list); objp = GET_NEXT(objp) ) {
-				if (objp->flags & OF_PLAYER_SHIP) {
-					if (vm_vec_dist_quick(&objp->pos, &Objects[db->objnum].pos) < MAX_DEBRIS_DIST) {
+		}
+		else
+		{
+			for ( objp = GET_FIRST(&obj_used_list); objp !=END_OF_LIST(&obj_used_list); objp = GET_NEXT(objp) )
+			{
+				if (objp->flags & OF_PLAYER_SHIP)
+				{
+					if (vm_vec_dist_quick(&objp->pos, &Objects[db->objnum].pos) < MAX_DEBRIS_DIST)
+					{
 						db->next_distance_check = timestamp(DEBRIS_DISTANCE_CHECK_TIME);
 						return;
 					}
@@ -486,8 +604,8 @@ void debris_process_pre( object *objp, float frame_time)
 {
 }
 
-MONITOR(NumSmallDebris);
-MONITOR(NumHullDebris);
+MONITOR(NumSmallDebris)
+MONITOR(NumHullDebris)
 
 // ---------------------------------------------------------------------------------------
 // debris_process_post()
@@ -512,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 {
@@ -547,7 +663,7 @@ void debris_process_post(object * obj, float frame_time)
 
 			int n, n_arcs = ((rand()>>5) % 3)+1;		// Create 1-3 sparks
 
-			vector v1, v2, v3, v4;
+			vec3d v1, v2, v3, v4;
 			submodel_get_two_random_points( db->model_num, db->submodel_num, &v1, &v2 );
 			submodel_get_two_random_points( db->model_num, db->submodel_num, &v3, &v4 );
 
@@ -590,7 +706,7 @@ void debris_process_post(object * obj, float frame_time)
 	
 			// rotate v2 out of local coordinates into world.
 			// Use v2 since it is used in every bolt.  See above switch().
-			vector snd_pos;
+			vec3d snd_pos;
 			vm_vec_unrotate(&snd_pos, &v2, &obj->orient);
 			vm_vec_add2(&snd_pos, &obj->pos );
 
@@ -627,7 +743,7 @@ void debris_process_post(object * obj, float frame_time)
 				// Maybe move a vertex....  20% of the time maybe?
 				int mr = myrand();
 				if ( mr < RAND_MAX/5 )	{
-					vector v1, v2;
+					vec3d v1, v2;
 					submodel_get_two_random_points( db->model_num, db->submodel_num, &v1, &v2 );
 					db->arc_pts[i][mr % 2] = v1;
 				}
@@ -663,7 +779,7 @@ int debris_find_oldest()
 }
 
 #define	DEBRIS_ROTVEL_SCALE	5.0f
-void calc_debris_physics_properties( physics_info *pi, vector *min, vector *max );
+void calc_debris_physics_properties( physics_info *pi, vec3d *min, vec3d *max );
 // ---------------------------------------------------------------------------------------
 // debris_create()
 //
@@ -671,20 +787,23 @@ void calc_debris_physics_properties( physics_info *pi, vector *min, vector *max
 //
 //	exp_force:	Explosion force, used to assign velocity to pieces.
 //					1.0f assigns velocity like before.  2.0f assigns twice as much to non-inherited part of velocity
-object *debris_create(object *source_obj, int model_num, int submodel_num, vector *pos, vector *exp_center, int hull_flag, float exp_force)
+object *debris_create(object *source_obj, int model_num, int submodel_num, vec3d *pos, vec3d *exp_center, int hull_flag, float exp_force)
 {
 	int		i, n, objnum, parent_objnum;
 	object	*obj;
 	ship		*shipp;
 	debris	*db;	
 	polymodel *pm;
+	physics_info *pi;
 	int vaporize;
+	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 )	{
@@ -712,26 +831,58 @@ object *debris_create(object *source_obj, int model_num, int submodel_num, vecto
 			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;
+		}
+
+		// increase lifetime for vaporized debris
+		if (vaporize) {
+			db->lifeleft *= 3.0f;
+		}
 	}
 
-	// increase lifetime for vaporized debris
-	if (vaporize) {
-		db->lifeleft *= 3.0f;
+	//WMC - Oh noes, we may need to change lifeleft
+	if(hull_flag)
+	{
+		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;
+		}
+
+		if(sip->debris_max_lifetime >= 0.0f)
+		{
+			if(db->lifeleft > sip->debris_max_lifetime)
+				db->lifeleft = sip->debris_max_lifetime;
+		}
 	}
 	db->flags |= DEBRIS_USED;
 	db->is_hull = hull_flag;
@@ -746,12 +897,12 @@ object *debris_create(object *source_obj, int model_num, int submodel_num, vecto
 
 	for (i=0; i<MAX_DEBRIS_ARCS; i++ )	{
 		db->arc_timestamp[i] = timestamp(-1);
-		//	vector	arc_pts[MAX_DEBRIS_ARCS][2];		// The endpoints of each arc
+		//	vec3d	arc_pts[MAX_DEBRIS_ARCS][2];		// The endpoints of each arc
 	}
 
 	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;
@@ -790,26 +941,26 @@ object *debris_create(object *source_obj, int model_num, int submodel_num, vecto
 	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!
 
 	if (source_obj->type == OBJ_SHIP) {
-		obj->hull_strength = Ship_info[Ships[source_obj->instance].ship_info_index].initial_hull_strength/8.0f;
+		obj->hull_strength = Ships[source_obj->instance].ship_max_hull_strength/8.0f;
 	} else
 		obj->hull_strength = 10.0f;
 
 	Num_debris_pieces++;
 
-	vector rotvel, radial_vel, to_center;
+	vec3d rotvel, radial_vel, to_center;
 
 	if ( exp_center )
 		vm_vec_sub( &to_center,pos, exp_center );
@@ -825,7 +976,7 @@ object *debris_create(object *source_obj, int model_num, int submodel_num, vecto
 
 		// set up physics mass and I_inv for hull debris pieces
 		pm = model_get(model_num);
-		vector *min, *max;
+		vec3d *min, *max;
 		min = &pm->submodel[submodel_num].min;
 		max = &pm->submodel[submodel_num].max;
 		calc_debris_physics_properties( &obj->phys_info, min, max );
@@ -864,40 +1015,15 @@ object *debris_create(object *source_obj, int model_num, int submodel_num, vecto
 	// DA: here we need to vel_from_rot = w x to_center, where w is world is unrotated to world coords and offset is the 
 	// displacement fromt the center of the parent object to the center of the debris piece
 
-	vector world_rotvel, vel_from_rotvel;
+	vec3d world_rotvel, vel_from_rotvel;
 	vm_vec_unrotate ( &world_rotvel, &source_obj->phys_info.rotvel, &source_obj->orient );
 	vm_vec_crossprod ( &vel_from_rotvel, &world_rotvel, &to_center );
 	vm_vec_scale ( &vel_from_rotvel, DEBRIS_ROTVEL_SCALE);
 
-	vm_vec_add (&obj->phys_info.vel, &radial_vel, &source_obj->phys_info.vel);
-	vm_vec_add2(&obj->phys_info.vel, &vel_from_rotvel);
+	vm_vec_add (&pi->vel, &radial_vel, &source_obj->phys_info.vel);
+	vm_vec_add2(&pi->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);
+//	vm_vec_scale_add(&pi->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));
 
 // make sure rotational velocity does not get too high
@@ -910,26 +1036,81 @@ object *debris_create(object *source_obj, int model_num, int submodel_num, vecto
 	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)
+	{
+		if(sip->debris_min_speed >= 0.0f && sip->debris_max_speed >= 0.0f)
+		{
+			float debris_speed = (( sip->debris_max_speed - sip->debris_min_speed ) * frand()) + sip->debris_min_speed;
+			float scale = debris_speed / vm_vec_mag(&pi->vel);
+			vm_vec_scale(&pi->vel, scale);
+		}
+		else if(sip->debris_min_speed >= 0.0f)
+		{
+			float curspeed = vm_vec_mag(&pi->vel);
+			if(curspeed < sip->debris_min_speed)
+			{
+				float scale = sip->debris_min_speed / curspeed;
+				vm_vec_scale(&pi->vel, scale);
+			}
+		}
+		else if(sip->debris_max_speed >= 0.0f)
+		{
+			float curspeed = vm_vec_mag(&pi->vel);
+			if(curspeed > sip->debris_max_speed)
+			{
+				float scale = sip->debris_max_speed / curspeed;
+				vm_vec_scale(&pi->vel, scale);
+			}
+		}
+
+		//WMC - Rotational velocity user cap
+		if(sip->debris_min_rotspeed >= 0.0f && sip->debris_max_rotspeed >= 0.0f)
+		{
+			float debris_rotspeed = (( sip->debris_max_rotspeed - sip->debris_min_rotspeed ) * frand()) + sip->debris_min_rotspeed;
+			float scale = debris_rotspeed / vm_vec_mag(&pi->rotvel);
+			vm_vec_scale(&pi->rotvel, scale);
+		}
+		else if(sip->debris_min_rotspeed >= 0.0f)
+		{
+			float curspeed = vm_vec_mag(&pi->rotvel);
+			if(curspeed < sip->debris_min_rotspeed)
+			{
+				float scale = sip->debris_min_rotspeed / curspeed;
+				vm_vec_scale(&pi->rotvel, scale);
+			}
+		}
+		else if(sip->debris_max_rotspeed >= 0.0f)
+		{
+			float curspeed = vm_vec_mag(&pi->rotvel);
+			if(curspeed > sip->debris_max_rotspeed)
+			{
+				float scale = sip->debris_max_rotspeed / curspeed;
+				vm_vec_scale(&pi->rotvel, scale);
+			}
+		}
+	}
+
 
 	// 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) );
+	Assert( !vm_is_vec_nan(&pi->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;
@@ -941,7 +1122,7 @@ object *debris_create(object *source_obj, int model_num, int submodel_num, vecto
 //	Alas, poor debris_obj got whacked.  Fortunately, we know who did it, where and how hard, so we
 //	can do something about it.
 //
-void debris_hit(object *debris_obj, object *other_obj, vector *hitpos, float damage)
+void debris_hit(object *debris_obj, object *other_obj, vec3d *hitpos, float damage)
 {
 	debris	*debris_p = &Debris[debris_obj->instance];
 
@@ -953,7 +1134,7 @@ void debris_hit(object *debris_obj, object *other_obj, vector *hitpos, float dam
 		pe.pos = *hitpos;								// Where the particles emit from
 		pe.vel = debris_obj->phys_info.vel;		// Initial velocity of all the particles
 
-		vector tmp_norm;
+		vec3d tmp_norm;
 		vm_vec_sub( &tmp_norm, hitpos, &debris_obj->pos );
 		vm_vec_normalize_safe(&tmp_norm);
 			
@@ -970,15 +1151,14 @@ void debris_hit(object *debris_obj, object *other_obj, vector *hitpos, float dam
 		pe.max_vel = 10.0f;				// How fast the fastest particle can move
 		pe.min_life = 0.25f;			// How long the particles live
 		pe.max_life = 0.75f;			// How long the particles live
-		particle_emit( &pe, PARTICLE_FIRE, 0 );
+		pe.texture_id = particle_get_fire_id();
+		particle_emit( &pe );
 	}
 
-#ifndef NO_NETWORK
 	// multiplayer clients bail here
 	if(MULTIPLAYER_CLIENT){
 		return;
 	}
-#endif
 
 	if ( damage < 0.0f ) {
 		damage = 0.0f;
@@ -990,11 +1170,9 @@ void debris_hit(object *debris_obj, object *other_obj, vector *hitpos, float dam
 		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
 	}
 }
 
@@ -1005,9 +1183,7 @@ void debris_hit(object *debris_obj, object *other_obj, vector *hitpos, float dam
 // 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 )
-int debris_check_collision(object *pdebris, object *other_obj, vector *hitpos, collision_info_struct *debris_hit_info)
+int debris_check_collision(object *pdebris, object *other_obj, vec3d *hitpos, collision_info_struct *debris_hit_info)
 {
 	mc_info	mc;
 	int		num;
@@ -1048,7 +1224,7 @@ int debris_check_collision(object *pdebris, object *other_obj, vector *hitpos, c
 	object *heavy_obj = heavy;
 	object *light_obj = light;
 
-	vector zero, p0, p1;
+	vec3d zero, p0, p1;
 	vm_vec_zero(&zero);
 	vm_vec_sub(&p0, &light->last_pos, &heavy->last_pos);
 	vm_vec_sub(&p1, &light->pos, &heavy->pos);
@@ -1058,7 +1234,7 @@ int debris_check_collision(object *pdebris, object *other_obj, vector *hitpos, c
 	mc.p1 = &p1;									// Point 2 of ray to check
 
 	// find the light object's position in the heavy object's reference frame at last frame and also in this frame.
-	vector p0_temp, p0_rotated;
+	vec3d p0_temp, p0_rotated;
 		
 	// Collision detection from rotation enabled if at rotaion is less than 30 degree in frame
 	// This should account for all ships
@@ -1078,14 +1254,14 @@ int debris_check_collision(object *pdebris, object *other_obj, vector *hitpos, c
 	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);
 
 		// copy important data
 		int copy_flags = mc.flags;  // make a copy of start end positions of sphere in  big ship RF
-		vector copy_p0, copy_p1;
+		vec3d copy_p0, copy_p1;
 		copy_p0 = *mc.p0;
 		copy_p1 = *mc.p1;
 
@@ -1109,7 +1285,7 @@ int debris_check_collision(object *pdebris, object *other_obj, vector *hitpos, c
 				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;
@@ -1156,7 +1332,7 @@ int debris_check_collision(object *pdebris, object *other_obj, vector *hitpos, c
 							}
 
 							// find position in submodel RF of light object at collison
-							vector int_light_pos, diff;
+							vec3d int_light_pos, diff;
 							vm_vec_sub(&diff, mc.p1, mc.p0);
 							vm_vec_scale_add(&int_light_pos, mc.p0, &diff, mc.hit_dist);
 							model_find_world_point(&debris_hit_info->light_collision_cm_pos, &int_light_pos, mc.model_num, mc.hit_submodel, &heavy_obj->orient, &zero);
@@ -1188,7 +1364,7 @@ int debris_check_collision(object *pdebris, object *other_obj, vector *hitpos, c
 					}
 
 					// find position in submodel RF of light object at collison
-					vector diff;
+					vec3d diff;
 					vm_vec_sub(&diff, mc.p1, mc.p0);
 					vm_vec_scale_add(&debris_hit_info->light_collision_cm_pos, mc.p0, &diff, mc.hit_dist);
 
@@ -1204,7 +1380,7 @@ int debris_check_collision(object *pdebris, object *other_obj, vector *hitpos, c
 		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);
@@ -1220,7 +1396,7 @@ int debris_check_collision(object *pdebris, object *other_obj, vector *hitpos, c
 			}
 
 			// find position in submodel RF of light object at collison
-			vector diff;
+			vec3d diff;
 			vm_vec_sub(&diff, mc.p1, mc.p0);
 			vm_vec_scale_add(&debris_hit_info->light_collision_cm_pos, mc.p0, &diff, mc.hit_dist);
 
@@ -1254,8 +1430,6 @@ int debris_check_collision(object *pdebris, object *other_obj, vector *hitpos, c
 		return 0;
 	}
 }
-#pragma warning ( pop )
-
 
 // ---------------------------------------------------------------------------------------
 // debris_get_team()
@@ -1270,7 +1444,7 @@ int debris_get_team(object *objp)
 }
 
 // fills in debris physics properties when created, specifically mass and moment of inertia
-void calc_debris_physics_properties( physics_info *pi, vector *mins, vector *maxs )
+void calc_debris_physics_properties( physics_info *pi, vec3d *mins, vec3d *maxs )
 {
 	float dx, dy, dz, mass;
 	dx = maxs->xyz.x - mins->xyz.x;
@@ -1293,5 +1467,3 @@ void calc_debris_physics_properties( physics_info *pi, vector *mins, vector *max
 	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));
 }
-
-

code/debris/debris.h

@@ -9,13 +9,33 @@
 
 /*
  * $Logfile: /Freespace2/code/Debris/Debris.h $
- * $Revision: 2.0 $
- * $Date: 2002-06-03 04:02:21 $
- * $Author: penguin $
+ * $Revision: 2.6 $
+ * $Date: 2006-12-28 00:59:19 $
+ * $Author: wmcoolmon $
  *
  * Code for the pieces of exploding object debris.
  *
  * $Log: not supported by cvs2svn $
+ * Revision 2.5  2005/07/13 02:50:51  Goober5000
+ * remove PreProcDefine #includes in FS2
+ * --Goober5000
+ *
+ * Revision 2.4  2005/04/28 05:29:29  wmcoolmon
+ * Removed FS2_DEMO defines that looked like they wouldn't cause the universe to collapse
+ *
+ * Revision 2.3  2005/04/05 05:53:15  taylor
+ * s/vector/vec3d/g, better support for different compilers (Jens Granseuer)
+ *
+ * Revision 2.2  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
+ *
+ * Revision 2.1  2004/03/05 09:01:59  Goober5000
+ * Uber pass at reducing #includes
+ * --Goober5000
+ *
+ * Revision 2.0  2002/06/03 04:02:21  penguin
+ * Warpcore CVS sync
+ *
  * Revision 1.1  2002/05/02 18:03:04  mharris
  * Initial checkin - converted filenames and includes to lower case
  *
@@ -141,6 +161,8 @@
 #ifndef _DEBRIS_H
 #define _DEBRIS_H
 
+#include "globalincs/pstypes.h"
+
 struct object;
 struct CFILE;
 
@@ -155,6 +177,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
@@ -165,7 +188,7 @@ typedef struct debris {
 	fix		time_started;		// time when debris was created
 	int		next_distance_check;	//	timestamp to determine whether to delete this piece of debris.
 
-	vector	arc_pts[MAX_DEBRIS_ARCS][2];		// The endpoints of each arc
+	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
 	
@@ -177,11 +200,7 @@ typedef struct debris {
 #define	DEBRIS_EXPIRE			(1<<1)	// debris can expire (ie hull chunks from small ships)
 
 
-#ifdef FS2_DEMO
-	#define	MAX_DEBRIS_PIECES	48
-#else
-	#define	MAX_DEBRIS_PIECES	64
-#endif
+#define	MAX_DEBRIS_PIECES	64
 
 extern	debris Debris[MAX_DEBRIS_PIECES];
 
@@ -194,9 +213,9 @@ void debris_render( object * obj );
 void debris_delete( object * obj );
 void debris_process_pre( object * obj, float frame_time);
 void debris_process_post( object * obj, float frame_time);
-object *debris_create( object * source_obj, int model_num, int submodel_num, vector *pos, vector *exp_center, int hull_flag, float exp_force );
-int debris_check_collision( object * obj, object * other_obj, vector * hitpos, collision_info_struct *debris_hit_info=NULL );
-void debris_hit( object * debris_obj, object * other_obj, vector * hitpos, float damage );
+object *debris_create( object * source_obj, int model_num, int submodel_num, vec3d *pos, vec3d *exp_center, int hull_flag, float exp_force );
+int debris_check_collision( object * obj, object * other_obj, vec3d * hitpos, collision_info_struct *debris_hit_info=NULL );
+void debris_hit( object * debris_obj, object * other_obj, vec3d * hitpos, float damage );
 int debris_get_team(object *objp);
 void debris_clear_expired_flag(debris *db);
 

code/debugconsole/console.cpp

@@ -9,13 +9,41 @@
 
 /*
  * $Logfile: /Freespace2/code/DebugConsole/Console.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
- * $Author: penguin $
+ * $Revision: 2.8 $
+ * $Date: 2007-02-18 21:26:50 $
+ * $Author: Goober5000 $
  *
  * Routines for managing the debug console window.
  *
  * $Log: not supported by cvs2svn $
+ * Revision 2.7  2006/09/08 06:20:14  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
+ *
+ * Revision 2.4  2004/07/12 16:32:44  Kazan
+ * MCD - define _MCD_CHECK to use memory tracking
+ *
+ * Revision 2.3  2004/03/05 09:01:58  Goober5000
+ * Uber pass at reducing #includes
+ * --Goober5000
+ *
+ * Revision 2.2  2003/03/18 10:07:01  unknownplayer
+ * 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.1.2.1  2002/09/24 18:56:41  randomtiger
+ * DX8 branch commit
+ *
+ * This is the scub of UP's previous code with the more up to date RT code.
+ * For full details check previous dev e-mails
+ *
+ * Revision 2.1  2002/08/01 01:41:04  penguin
+ * The big include file move
+ *
  * Revision 2.0  2002/06/03 04:02:21  penguin
  * Warpcore CVS sync
  *
@@ -105,13 +133,13 @@
 #include <string.h>
 
 #include "globalincs/pstypes.h"
-#include "freespace2/freespace.h"
 #include "graphics/font.h"
 #include "io/timer.h"
-#include "graphics/2d.h"
 #include "io/key.h"
 #include "globalincs/alphacolors.h"
 #include "osapi/osapi.h"
+#include "debugconsole/dbugfile.h"
+
 
 #define MAX_COMMANDS 300
 
@@ -191,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;
 
 
@@ -454,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 );
@@ -610,7 +643,7 @@ void debug_output( char c )
 
 void dc_printf(char *format, ...)
 {
-	char tmp[DCOLS*2];
+	char tmp[DCOLS*DROWS];
 	va_list args;
 	
 	va_start(args, format);
@@ -618,7 +651,7 @@ void dc_printf(char *format, ...)
 	va_end(args);
 
 	char *p = tmp;
-	while( *p )	{
+	while( *p != '\0' )	{
 		debug_output(*p);
 		p++;
 	} 

code/debugconsole/dbugfile.cpp

@@ -1,3 +1,6 @@
+#include "dbugfile.h"
+#include "globalincs/pstypes.h"
+
 #ifdef _WIN32
 #include <windows.h>
 #endif
@@ -7,8 +10,8 @@
 #include <sys/types.h>
 #include <sys/timeb.h>
 
-#include "dbugfile.h"
 
+int  dbugfile_counters[MAX_COUNTERS];
 bool dbugfile_init_var = false;
 
 char dbugfile_filename[512];
@@ -29,15 +32,38 @@ void dbugfile_output(char *buffer)
 	}
 
 	fwrite(buffer, sizeof(char) * strlen(buffer), 1, fp);
+	
 	fclose(fp);
 }
 
 void dbugfile_init()
 {
+	// Clear the counters
+	memset(dbugfile_counters, 0, sizeof(int) * MAX_COUNTERS);
+
 	char big_buffer[1000];
 	char temp_buff[512];
 
-	strcpy(dbugfile_filename, "DBUG-");
+	dbugfile_filename[0] = '\0';
+
+#ifdef _WIN32
+
+	char path[MAX_PATH];
+
+	GetCurrentDirectory(MAX_PATH, path);
+
+	int path_len = strlen(path);
+	if(path[path_len - 1] != '\\')
+	{
+	 	path[path_len] = '\\';
+		path[path_len + 1] = '\0';
+	}
+
+ 	strcpy(dbugfile_filename, path);
+
+#endif
+
+	strcat(dbugfile_filename, "DBUG-");
 	strcpy(big_buffer, "DBUGFILE Active: ");
 
 #ifdef _WIN32
@@ -56,14 +82,15 @@ void dbugfile_init()
     _tzset();
 
     // Display operating system-style date and time.
-    _strtime( temp_buff);
-	strcat(dbugfile_filename, "(");
+	_strdate( temp_buff);
+	strcat(dbugfile_filename, "D(");
 	strcat(dbugfile_filename,temp_buff);
 	strcat(big_buffer,temp_buff);
 
-	strcat(dbugfile_filename, ")-(");
+	strcat(dbugfile_filename, ") T(");
 	strcat(big_buffer, " ");
-    _strdate( temp_buff);
+
+    _strtime( temp_buff);
 	strcat(dbugfile_filename,temp_buff);
 	strcat(big_buffer,temp_buff);
 
@@ -72,7 +99,7 @@ void dbugfile_init()
 
 	// Remove invalid slash chars
 	int len = strlen(dbugfile_filename);
-	while(len >= 0)
+	while(len >= 2)
 	{
 		if(dbugfile_filename[len] == '/' || dbugfile_filename[len] == ':')
 		{
@@ -82,6 +109,8 @@ void dbugfile_init()
 	}
 
 	// open file
+	// Uncomment this to see where the file is going
+  	//MessageBox(NULL, dbugfile_filename, "das", MB_OK); 
 	FILE *fp = fopen(dbugfile_filename, "w");
 
 	if(fp == NULL)
@@ -141,11 +170,18 @@ void dbugfile_init()
 #else
 		release_type = "Release";
 #endif
-		sprintf(big_buffer, "OS: %s %s\n", version, release_type);
+		sprintf(big_buffer, "OS: %s %s, ", version, release_type);
 	}				  
 
 	fwrite(big_buffer, sizeof(char) * strlen(big_buffer), 1, fp);
 
+	char exe_name[MAX_PATH];
+
+	GetModuleFileName(NULL, exe_name, MAX_PATH);
+	strcat(exe_name, "\n");
+	fwrite(exe_name, sizeof(char) * strlen(exe_name), 1, fp);
+
+
 #endif
 
 	fclose(fp);
@@ -251,4 +287,120 @@ void dbugfile_sprintf(int line, char *file, const char *format, ...)
 	dbugfile_output(buffer);
 }
 
+void dbugfile_print_matrix_4x4(int line, char *file, float *matrix, char *text)
+{
+	if(dbugfile_init_var == false)
+	{
+		return;
+	}
+
+	if(matrix == NULL)
+	{
+		return;
+	}
+
+	// find last slash (for PC) to crop file path
+	char *ptr = strrchr(file, '\\');
+
+	if(ptr == NULL)
+	{
+		ptr = file;
+	}
+	else
+	{
+		ptr++;
+	}
+
+	if(text == NULL)
+	{
+		text = "";
+	}
+
+	char buffer[1000];
+
+	sprintf(buffer,"[%s,%4d] Matrix %s:\n"
+			"%f %f %f %f\n"
+		    "%f %f %f %f\n"
+		    "%f %f %f %f\n"
+		    "%f %f %f %f\n",
+			 ptr,line, text,
+			 matrix[0],
+			 matrix[1],
+			 matrix[2],
+			 matrix[3],
+			 matrix[4],
+			 matrix[5],
+			 matrix[6],
+			 matrix[7],
+			 matrix[8],
+			 matrix[9],
+			 matrix[10],
+			 matrix[11],
+			 matrix[12],
+			 matrix[13],
+			 matrix[14],
+			 matrix[15]);
+
+ 	dbugfile_output(buffer);
+}
+
+void dbugfile_print_matrix_3x3(int line, char *file, float *matrix, char *text)
+{
+	if(dbugfile_init_var == false)
+	{
+		return;
+	}
+
+	if(matrix == NULL)
+	{
+		return;
+	}
+
+	// find last slash (for PC) to crop file path
+	char *ptr = strrchr(file, '\\');
+
+	if(ptr == NULL)
+	{
+		ptr = file;
+	}
+	else
+	{
+		ptr++;
+	}
+
+	if(text == NULL)
+	{
+		text = "";
+	}
+
+	char buffer[1000];
+
+	sprintf(buffer,"[%s,%4d] Matrix %s:\n"
+			"%f %f %f\n"
+		    "%f %f %f\n"
+		    "%f %f %f\n",
+			 ptr,line, text,
+			 matrix[0],
+			 matrix[1],
+			 matrix[2],
+			 matrix[3],
+			 matrix[4],
+			 matrix[5],
+			 matrix[6],
+			 matrix[7],
+			 matrix[8]);
+
+ 	dbugfile_output(buffer);
+}
+
+void dbugfile_print_counter(int line, char *file, int counter_num, char *string)
+{
+	char buffer[1000];
+	strcpy(buffer, string); 
+	strcat(buffer, " %d"); 
+
+	dbugfile_sprintf(line, file, buffer, dbugfile_counters[counter_num]);
+}
+
+
 

code/debugconsole/dbugfile.h

@@ -1,9 +1,15 @@
+
 #ifndef _DBUGFILE_HEADER_
 #define _DBUGFILE_HEADER_
 
+#define MAX_COUNTERS 10
+
 void dbugfile_init();
 void dbugfile_deinit();
 void dbugfile_sprintf(int line, char *file, const char *format, ...);
+void dbugfile_print_matrix_3x3(int line, char *file, float *matrix, char *text);
+void dbugfile_print_matrix_4x4(int line, char *file, float *matrix, char *text);
+void dbugfile_print_counter(int line, char *file, int counter_num, char *string);
 
 #ifdef DBUGFILE_ACTIVE 
 
@@ -16,9 +22,19 @@ void dbugfile_sprintf(int line, char *file, const char *format, ...);
 #define DBUGFILE_OUTPUT_3(t,a,b,c) dbugfile_sprintf(__LINE__, __FILE__, t,a,b,c);
 #define DBUGFILE_OUTPUT_4(t,a,b,c,d) dbugfile_sprintf(__LINE__, __FILE__, t,a,b,c,d);
 #define DBUGFILE_OUTPUT_5(t,a,b,c,d,e) dbugfile_sprintf(__LINE__, __FILE__, t,a,b,c,d,e);
-#define DBUGFILE_OUTPUT_6(t,a,b,c,d,e,f) dbugfile_sprintf(__LINE__, __FILE__, t,a,b,c,d,e,f;
+#define DBUGFILE_OUTPUT_6(t,a,b,c,d,e,f) dbugfile_sprintf(__LINE__, __FILE__, t,a,b,c,d,e,f);
 #define DBUGFILE_OUTPUT_7(t,a,b,c,d,e,f,g) dbugfile_sprintf(__LINE__, __FILE__, t,a,b,c,d,e,f,g);
-#define DBUGFILE_OUTPUT_9(t,a,b,c,d,e,f,g,h) dbugfile_sprintf(__LINE__, __FILE__, t,a,b,c,d,e,f,g,h);
+#define DBUGFILE_OUTPUT_8(t,a,b,c,d,e,f,g,h) dbugfile_sprintf(__LINE__, __FILE__, t,a,b,c,d,e,f,g,h);
+#define DBUGFILE_OUTPUT_9(t,a,b,c,d,e,f,g,h,i) dbugfile_sprintf(__LINE__, __FILE__, t,a,b,c,d,e,f,g,h,i);
+
+#define DBUGFILE_OUTPUT_MATRIX_3X3(m,t) dbugfile_print_matrix_3x3(__LINE__, __FILE__, m,t);
+#define DBUGFILE_OUTPUT_MATRIX_4X4(m,t) dbugfile_print_matrix_4x4(__LINE__, __FILE__, m,t);
+
+extern int dbugfile_counters[MAX_COUNTERS];
+#define DBUGFILE_INC_COUNTER(n) if(n < MAX_COUNTERS) dbugfile_counters[n]++;
+#define DBUGFILE_DEC_COUNTER(n) if(n < MAX_COUNTERS) dbugfile_counters[n]--;
+
+#define DBUGFILE_OUTPUT_COUNTER(n,s)	dbugfile_print_counter(__LINE__, __FILE__, n, s);
 
 #else
 
@@ -33,7 +49,16 @@ void dbugfile_sprintf(int line, char *file, const char *format, ...);
 #define DBUGFILE_OUTPUT_5(t,a,b,c,d,e) ;
 #define DBUGFILE_OUTPUT_6(t,a,b,c,d,e,f) ;
 #define DBUGFILE_OUTPUT_7(t,a,b,c,d,e,f,g) ;
-#define DBUGFILE_OUTPUT_9(t,a,b,c,d,e,f,g,h) ;
+#define DBUGFILE_OUTPUT_8(t,a,b,c,d,e,f,g,h) ;
+#define DBUGFILE_OUTPUT_9(t,a,b,c,d,e,f,g,h,i) ;
+
+#define DBUGFILE_OUTPUT_MATRIX_3X3(m,t) ;
+#define DBUGFILE_OUTPUT_MATRIX_4X4(m,t) ;
+
+#define DBUGFILE_INC_COUNTER(n) ;
+#define DBUGFILE_DEC_COUNTER(n) ;
+
+#define DBUGFILE_OUTPUT_COUNTER(n,s) ;
 
 #endif
 

code/debugconsole/timerbar.cpp

@@ -0,0 +1,226 @@
+/*
+ * 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.
+ *
+*/ 
+
+/*
+ * This module is intended as a debug tool to measure the speed of blocks of code and display
+ * that information as coloured bars across the top of the screen.
+ *
+ * This allows interactive measuring of components of the code, very useful for optimisztion.
+ */
+
+#ifdef _WIN32
+#include <windows.h>
+#include <winbase.h>
+#endif
+
+#include "timerbar.h"
+#include "globalincs/pstypes.h"
+
+
+// Internal structure for handling frame data
+typedef	struct 
+{
+	LARGE_INTEGER start_value;
+	LARGE_INTEGER total_value;
+
+	LARGE_INTEGER average;
+	LARGE_INTEGER frame_total;
+
+} timerbar_profile;
+
+timerbar_profile profiles[MAX_NUM_TIMERBARS];
+int timerbar_current_profile = 0;
+
+LARGE_INTEGER timerbar_ultimate_start_value;
+LARGE_INTEGER timerbar_last_start_value;
+
+// Data needed for push and pop functionality
+const int MAX_TB_STACK_SIZE = 100;
+
+int timerbar_stack[MAX_TB_STACK_SIZE];
+int timerbar_current_stack_layer = 0;
+
+/*
+ *
+ *
+ *
+ */
+void timerbar_push(int value)
+{
+	if(timerbar_current_stack_layer >= MAX_TB_STACK_SIZE)
+	{
+		// To many pushs, this must be a bug
+		// Someone is letting code miss the pops, check for early retuns
+		Assert(!(timerbar_current_stack_layer >= MAX_TB_STACK_SIZE));
+		return;
+	}
+
+	timerbar_stack[timerbar_current_stack_layer] = timerbar_current_profile;
+	timerbar_current_stack_layer++;
+
+	timerbar_switch_type(value);
+}
+
+/*
+ *
+ *
+ *
+ */
+void timerbar_pop()
+{
+	timerbar_current_stack_layer--;
+	if(timerbar_current_stack_layer < 0)
+	{
+		Assert(!(timerbar_current_stack_layer < 0));
+		timerbar_current_stack_layer = 0;
+		return;
+	}
+
+	timerbar_switch_type(timerbar_stack[timerbar_current_stack_layer]);
+}
+
+// This pointer holds the draw function to use or NULL
+void (*draw_func_ptr)(int colour, float x, float y, float w, float h) = NULL;
+
+void timerbar_start_frame()
+{
+	timerbar_current_stack_layer = 0;
+	timerbar_current_profile     = 0;
+
+	if(QueryPerformanceCounter(&timerbar_ultimate_start_value) == FALSE)
+	{
+//		DBUGFILE_OUTPUT_0("QueryPerformanceCounter not supported by hardware");
+		draw_func_ptr = NULL;
+	}
+
+	timerbar_last_start_value = timerbar_ultimate_start_value;
+
+}
+
+// Constants need for timerbar_conv_and_draw calculations
+const int WIDTH = 480;
+const float WIDTHF = ((float) WIDTH) * 1.01f;
+
+/**
+ * Internal conversion function to convert draw data into bars for the screen
+ *
+ * @param int colour - colour index (>=0)
+ * @param int xpos   - x position to start bar on
+ * @param int xwidth - width of bar
+ * @param int yrow	 - Index of row bar belongs to
+ */
+void timerbar_conv_and_draw(int colour, int xpos, int xwidth, int yrow)
+{
+	float fxpos  = (float) xpos;
+	float fxwidth = (float) xwidth;
+		   
+	draw_func_ptr(colour, 
+		fxpos / WIDTHF,
+		yrow * 0.01f,
+		fxwidth / WIDTHF,
+		0.005f);
+}
+
+void timerbar_end_frame()
+{
+	// Now we want to draw the bars
+	if(draw_func_ptr == NULL)
+	{
+		// we have not been given a draw function so we are going to have to quit
+		return;
+	}
+
+	timerbar_switch_type(-1);
+
+	int last_xpos = 0;
+	int y_pos     = 0;
+
+
+	for(int i = 0; i < MAX_NUM_TIMERBARS; i++)
+	{		
+		// Nothing to render this frame	 
+		if(profiles[i].frame_total.QuadPart == 0)
+		{
+			continue;
+		}
+
+		int xsize = (int) profiles[i].frame_total.QuadPart / 90;
+
+		// break condition in else
+		while(1)
+		{
+			// if bar runs over
+			if(last_xpos + xsize > WIDTH)
+			{
+				int rem_len = WIDTH - last_xpos;
+
+				// Draw from current position to the end of the bar
+				timerbar_conv_and_draw(i, last_xpos, rem_len, y_pos);
+
+				xsize -= rem_len;
+				last_xpos = 0;
+				y_pos++;
+			}
+			else
+			{
+				// Draw whats left and break for the next bar
+				timerbar_conv_and_draw(i,last_xpos, xsize, y_pos);
+
+				last_xpos += xsize;
+				break;
+			}
+		}
+
+		// reset for next frame
+		profiles[i].frame_total.QuadPart = 0;
+	}
+}
+
+void timerbar_switch_type(int num)
+{
+	if(num >= MAX_NUM_TIMERBARS)
+	{
+		return;
+	}
+
+	// Calculate old profile's total
+	LARGE_INTEGER now;
+	if(QueryPerformanceCounter(&now) == FALSE)
+	{
+//		DBUGFILE_OUTPUT_0("QueryPerformanceCounter not supported by hardware");
+	}
+
+	profiles[timerbar_current_profile].frame_total.QuadPart += 
+		(now.QuadPart - timerbar_last_start_value.QuadPart);  
+
+	if(num != -1)
+	{
+		// Switch to new profile
+		timerbar_current_profile = num; 
+	}
+
+	// Update time to count from
+	if(QueryPerformanceCounter(&timerbar_last_start_value) == FALSE)
+	{
+//		DBUGFILE_OUTPUT_0("QueryPerformanceCounter not supported by hardware");
+	}
+}
+
+/**
+ * @param void (*new_draw_func_ptr)(int colour, float x, float y, float w, float h) - pointer to draw function
+ *
+ * Sets the draw function used to output the timer data, designed to be generic allowing any API
+ * to take advantage of this module. Set to NULL to disable drawing.
+ *
+ * By default the draw function is set to NULL
+ */
+void timerbar_set_draw_func(void (*new_draw_func_ptr)(int colour, float x, float y, float w, float h))
+{
+  	draw_func_ptr = new_draw_func_ptr;
+}
+

code/debugconsole/timerbar.h

@@ -0,0 +1,87 @@
+/*
+ * 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.
+ *
+*/ 
+
+/*
+ * $Logfile: /Freespace2/code/debugconsole/timerbar.h $
+ * $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
+ *
+ * Revision 1.8  2004/02/16 11:47:31  randomtiger
+ * Removed a lot of files that we dont need anymore.
+ * Changed htl to be on by default, command now -nohtl
+ * Changed D3D to use a 2D vertex for 2D operations which should cut down on redundant data having to go though the system.
+ * Added small change to all -start_mission flag to take you to any mission by filename, very useful for testing.
+ * Removed old dshow code and took away timerbar compile flag condition since it uses a runtime flag now.
+ *
+ * Revision 1.7  2003/11/19 20:37:23  randomtiger
+ * Almost fully working 32 bit pcx, use -pcx32 flag to activate.
+ * Made some commandline variables fit the naming standard.
+ * Changed timerbar system not to run pushes and pops if its not in use.
+ * Put in a note about not uncommenting asserts.
+ * Fixed up a lot of missing POP's on early returns?
+ * Perhaps the motivation for Assert functionality getting commented out?
+ * Fixed up some bad asserts.
+ * Changed nebula poofs to render in 2D in htl, it makes it look how it used to in non htl. (neb.cpp,1248)
+ * Before the poofs were creating a nasty stripe effect where they intersected with ships hulls.
+ * Put in a special check for the signs of that D3D init bug I need to lock down.
+ *
+ * Revision 1.6  2003/11/09 06:31:39  Kazan
+ * a couple of htl functions being called in nonhtl (ie NULL functions) problems fixed
+ * conflicts in cmdline and timerbar.h log entries
+ * cvs stopped acting like it was on crack obviously
+ *
+ * Revision 1.5  2003/11/09 04:09:17  Goober5000
+ * edited for language
+ * --Goober5000
+ *
+ * Revision 1.4  2003/11/08 22:25:47  Kazan
+ * Timerbar was enabled in both release and debug - so i made it a command line option "-timerbar"
+ * DONT MESS WITH OTHER PEOPLES INCLUDE PATHS
+ * DONT MESS WITH EXEC NAMES (leave it fs2_open_r and fs2_open_d) or paths!
+ *
+ *
+ * $NoKeywords: $
+ */
+
+#ifndef _TIMERBAR_HEADER_
+#define _TIMERBAR_HEADER_
+
+const int MAX_NUM_TIMERBARS = 20;
+
+#include "cmdline/cmdline.h"
+
+// These functions should never be used directly, always use macros below
+void timerbar_start_frame();
+void timerbar_end_frame();
+void timerbar_set_draw_func(void (*new_draw_func_ptr)(int colour, float x, float y, float w, float h));
+
+void timerbar_push(int value);
+void timerbar_pop();
+
+// This function shouldnt not be used any more or it will break push and pop calls
+void timerbar_switch_type(int num);
+
+#define TIMERBAR_SET_DRAW_FUNC(f) if (Cmdline_timerbar) timerbar_set_draw_func(f);
+#define TIMERBAR_START_FRAME()    if (Cmdline_timerbar) timerbar_start_frame();
+#define TIMERBAR_END_FRAME()      if (Cmdline_timerbar) timerbar_end_frame();
+#define TIMERBAR_SWITCH_TYPE(n)   if (Cmdline_timerbar) timerbar_switch_type(n);
+
+#define TIMERBAR_PUSH(v) if (Cmdline_timerbar) timerbar_push(v);
+#define TIMERBAR_POP()   if (Cmdline_timerbar) timerbar_pop();
+
+#endif
+

code/decals/decals.h

@@ -0,0 +1,129 @@
+//header file for making decals-Bobboau
+ 
+
+#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
+#define MAX_DECAL_DEFPOINTS 10000
+#define MAX_DECAL_POINT 10
+#define MAX_SHIP_DECALS 25
+#define MAX_GLOBAL_DECAL_POLYS 11000
+#define QUICKFIND_SUBDIVISION 100
+#define QUICKFIND_SEGMENT_LENGTH (MAX_GLOBAL_DECAL_POLYS/QUICKFIND_SUBDIVISION)
+#define MAX_GLOBAL_DECALS 5000
+
+#define DP_EOF 			0
+#define DP_DEFPOINTS 	1
+#define DP_FLATPOLY		2
+#define DP_TMAPPOLY		3
+#define DP_SORTNORM		4
+#define DP_BOUNDBOX		5
+
+#endif	// ENABLE_DECALS
+
+struct decal;
+struct decal_list;
+struct decal_list_controle;
+
+struct decal_poly{
+	vec3d norm[3];
+	vertex point[3];
+	decal_poly *next;
+	decal* parent;
+	int idx;
+};
+
+struct decal{
+	int n_poly;
+	int timestamp;	//when this decal was created
+	int burn_time;	//how long it takes for the glow texture to fade
+	int vertex_buffer_start;	//were is the start of this decal's polys in the vertex buffer
+	decal_poly* poly;
+	decal_poly* add_poly();
+	decal_poly* get_last_poly();
+	void remove_last_poly();
+	decal_list_controle *parent;
+};
+
+struct decal_list{
+	decal dec;
+	decal_list *next;
+};
+
+struct decal_item{
+	decal_list dec;
+	bool used;
+};
+
+struct decal_list_controle{
+	int n_decals;
+	int buffer;
+	int texture;
+	int n_poly;
+	int burn_texture;
+	int glow_texture;
+	bool modifyed;
+	decal_list *d_list;
+	decal_list *end;
+	decal_list *add_new();
+	void trim();
+	void clear();
+	~decal_list_controle();
+	decal_list_controle();
+};
+
+struct decal_system{
+	decal_list_controle *decals;
+	int n_decal_textures;
+	bool decals_modified;
+	int max_decals;
+	decal_system():decals(NULL),n_decal_textures(0),decals_modified(false){};
+};
+
+
+//this is used to give all the data to the generation data to the functions that make them
+
+struct decal_point{
+	vec3d pnt;
+	matrix orient;
+	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
+
+void decal_render_all(object * obj);	//renders all decals
+
+int decal_create_sub(void *model_ptr);
+
+void clear_decals(decal_system	*system);
+
+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

code/demo/demo.cpp

@@ -9,12 +9,40 @@
 
 /*
  * $Logfile: /Freespace2/code/Demo/Demo.cpp $
- * $Revision: 2.2 $
- * $Date: 2002-08-01 01:41:04 $
- * $Author: penguin $
+ * $Revision: 2.11 $
+ * $Date: 2007-09-02 18:53:22 $
+ * $Author: Goober5000 $
  *
  *
  * $Log: not supported by cvs2svn $
+ * Revision 2.10  2006/07/09 01:55:41  Goober5000
+ * consolidate the "for reals" crap into a proper ship flag; also move the limbo flags over to SF2_*; etc.
+ * this should fix Mantis #977
+ * --Goober5000
+ *
+ * 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)
+ *
+ * Revision 2.6  2005/01/31 23:27:52  taylor
+ * merge with Linux/OSX tree - p0131-2
+ *
+ * Revision 2.5  2004/07/26 20:47:27  Kazan
+ * remove MCD complete
+ *
+ * Revision 2.4  2004/07/12 16:32:45  Kazan
+ * MCD - define _MCD_CHECK to use memory tracking
+ *
+ * Revision 2.3  2004/03/05 09:01:59  Goober5000
+ * Uber pass at reducing #includes
+ * --Goober5000
+ *
+ * Revision 2.2  2002/08/01 01:41:04  penguin
+ * The big include file move
+ *
  * Revision 2.1  2002/07/07 19:55:58  penguin
  * Back-port to MSVC
  *
@@ -47,21 +75,21 @@
  * $NoKeywords: $
  */
 
-#include "globalincs/pstypes.h"
 #include "demo/demo.h"
-#include "mission/missionload.h"
 #include "ship/ship.h"
+#include "weapon/weapon.h"
 #include "globalincs/linklist.h"
 #include "freespace2/freespace.h"
 #include "object/object.h"
 #include "io/timer.h"
 #include "gamesequence/gamesequence.h"
-#include "globalincs/systemvars.h"
-#include "cfile/cfile.h"
 #include "mission/missionmessage.h"
 #include "mission/missionparse.h"
 #include "ship/shipfx.h"
 #include "ship/shiphit.h"
+#include "cfile/cfile.h"
+
+
 
 // -----------------------------------------------------------------------------------------------------------------------------
 // DEMO DEFINES/VARS
@@ -138,7 +166,7 @@ int Demo_error = DEMO_ERROR_NONE;
 #define DEMO_BYTE(vl)					do { DEMO_DATA(vl, sizeof(char)); } while(0)
 #define DEMO_UBYTE(vl)					do { DEMO_DATA(vl, sizeof(ubyte)); } while(0)
 #define DEMO_FLOAT(vl)					do { DEMO_DATA(vl, sizeof(float)); } while(0)
-#define DEMO_VECTOR(vl)					do { DEMO_DATA(vl, sizeof(vector)); } while(0)
+#define DEMO_VECTOR(vl)					do { DEMO_DATA(vl, sizeof(vec3d)); } while(0)
 #define DEMO_MATRIX(vl)					do { DEMO_DATA(vl, sizeof(matrix)); } while(0)
 #define DEMO_STRING(vl)					do { int stlen; if(Game_mode & GM_DEMO_RECORD){ stlen = strlen(vl); if(stlen <= 0){ break; }	DEMO_DATA(stlen, sizeof(ushort)); DEMO_DATA(*vl, strlen(vl)); } else { ushort len = 0; DEMO_USHORT(len); DEMO_DATA(*vl, len); vl[len] = '\0'; } } while(0)
 		
@@ -285,7 +313,7 @@ int demo_start_record(char *file)
 	char full_name[MAX_FILENAME_LEN] = "";	
 
 	// try and allocate the buffer
-	Demo_buf = (char*)malloc(DEMO_BUF_SIZE);
+	Demo_buf = (char*)vm_malloc(DEMO_BUF_SIZE);
 	if(Demo_buf == NULL){
 		DEMO_ERROR(DEMO_ERROR_DISK_ACCESS);
 		return 0;
@@ -329,7 +357,7 @@ int demo_start_playback(char *file)
 	char full_name[MAX_FILENAME_LEN] = "";
 
 	// try and allocate the buffer
-	Demo_buf = (char*)malloc(DEMO_BUF_SIZE);
+	Demo_buf = (char*)vm_malloc(DEMO_BUF_SIZE);
 	if(Demo_buf == NULL){		
 		DEMO_ERROR(DEMO_ERROR_DISK_ACCESS);
 		return 0;
@@ -379,7 +407,7 @@ void demo_close()
 
 	// free the buffer
 	if(Demo_buf != NULL){
-		free(Demo_buf);
+		vm_free(Demo_buf);
 		Demo_buf = NULL;
 	}
 
@@ -817,7 +845,7 @@ int demo_playback_seek_sub(int frame_size)
 			ushort obj_count = 0;
 			int obj_sig = 0;
 			ubyte team = 0;
-			vector obj_pos = vmd_zero_vector;
+			vec3d obj_pos = vmd_zero_vector;
 			matrix obj_orient = vmd_identity_matrix;
 			float obj_fthrust = 0;
 			int ship_index = 0;
@@ -982,7 +1010,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;

code/demo/demo.h

@@ -9,12 +9,22 @@
 
 /*
  * $Logfile: /Freespace2/code/Demo/Demo.h $
- * $Revision: 2.0 $
- * $Date: 2002-06-03 04:02:21 $
- * $Author: penguin $
+ * $Revision: 2.4 $
+ * $Date: 2006-07-09 01:55:41 $
+ * $Author: Goober5000 $
  *
  *
  * $Log: not supported by cvs2svn $
+ * Revision 2.2  2005/07/13 02:50:51  Goober5000
+ * remove PreProcDefine #includes in FS2
+ * --Goober5000
+ *
+ * Revision 2.1  2004/08/11 05:06:21  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
+ *
+ * Revision 2.0  2002/06/03 04:02:21  penguin
+ * Warpcore CVS sync
+ *
  * Revision 1.1  2002/05/02 18:03:04  mharris
  * Initial checkin - converted filenames and includes to lower case
  *
@@ -31,6 +41,7 @@
  * $NoKeywords: $
  */
 
+
 #ifndef _FS2_DEMO_SYSTEM_HEADER_FILE
 #define _FS2_DEMO_SYSTEM_HEADER_FILE
 

code/directx/vasync.h

@@ -5,6 +5,7 @@
  *  File:       async.h
  *  Content:    AsyncData object include file
  ***************************************************************************/
+
 #ifndef __ASYNC_INCLUDED__
 #define __ASYNC_INCLUDED__
 

code/directx/vd3dtypes.h

@@ -305,6 +305,14 @@ typedef struct _D3DTLVERTEX {
 	D3DVALUE    tv;
 	D3DVALUE    dvTV;
     };
+    union {
+	D3DVALUE    env_u;             /* Texture coordinates */
+	D3DVALUE    dvenv_U;
+    };
+    union {
+	D3DVALUE    env_v;
+	D3DVALUE    dvenv_V;
+    };
 #if (defined __cplusplus) && (defined D3D_OVERLOADS)
     _D3DTLVERTEX() { }
     _D3DTLVERTEX(const D3DVECTOR& v, float _rhw,
@@ -320,6 +328,7 @@ typedef struct _D3DTLVERTEX {
 /*
  * Untransformed/lit vertices
  */
+//(D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_SPECULAR | D3DFVF_TEX1)
 typedef struct _D3DLVERTEX {
     union {
 	D3DVALUE     x;             /* Homogeneous coordinates */
@@ -399,12 +408,21 @@ typedef struct _D3DVERTEX {
 	D3DVALUE     tv;
 	D3DVALUE     dvTV;
     };
+    union {
+	D3DVALUE     tu2;            /* Texture coordinates */
+	D3DVALUE     dvTU2;
+    };
+    union {
+	D3DVALUE     tv2;
+	D3DVALUE     dvTV2;
+    };
 #if (defined __cplusplus) && (defined D3D_OVERLOADS)
     _D3DVERTEX() { }
-    _D3DVERTEX(const D3DVECTOR& v, const D3DVECTOR& n, float _tu, float _tv)
+    _D3DVERTEX(const D3DVECTOR& v, const D3DVECTOR& n, float _tu, float _tv, float _tu2=_tu, float _tv2=_tv)
         { x = v.x; y = v.y; z = v.z;
           nx = n.x; ny = n.y; nz = n.z;
           tu = _tu; tv = _tv;
+          tu2 = _tu2; tv2 = _tv2;
         }
 #endif
 } D3DVERTEX, *LPD3DVERTEX;