revert the directory move

'volition_import'.

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

fs2_open/Freespace2.dsp

@@ -1,148 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Freespace2" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=Freespace2 - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "Freespace2.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "Freespace2.mak" CFG="Freespace2 - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "Freespace2 - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "Freespace2 - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""$/Freespace2", RHWBAAAA"
-# PROP Scc_LocalPath "."
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "Freespace2 - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release\Profile"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /G5 /MT /W4 /GX /Zi /Ot /Ow /Og /Oi /Oy /I "code" /D "_MBCS" /D "NDEBUG" /D "_WINDOWS" /D "WIN32" /D "USE_OPENGL" /U "_DEBUG" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib vfw32.lib msacm32.lib comctl32.lib code.lib /nologo /subsystem:windows /map /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcd.lib" /out:"c:\games\freespace2\fs2_open.exe" /libpath:"release"
-
-!ELSEIF  "$(CFG)" == "Freespace2 - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug\Profile"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /G5 /MTd /W4 /Gm /Gi /GX /ZI /Od /I "code" /D "WIN32" /D "_WINDOWS" /D "_DEBUG" /D "NO_CD_CHECK" /D "USE_DX81" /D "USE_OPENGL" /U "NDEBUG" /Fr /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo /o"debug/profile/Freespace2.bsc" "./debug/profile/*.sbr"
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib vfw32.lib msacm32.lib comctl32.lib code.lib /nologo /subsystem:windows /debug /debugtype:both /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcd.lib" /out:"debug\fs2_open_debug.exe" /libpath:"debug"
-# SUBTRACT LINK32 /pdb:none /incremental:no /map
-# Begin Custom Build - Copying $(InputPath) to c:\games\freespace2
-InputPath=.\debug\fs2_open_debug.exe
-SOURCE="$(InputPath)"
-
-"c:\games\freespace2\fs2_open.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy $(InputPath) c:\games\freespace2
-
-# End Custom Build
-
-!ENDIF 
-
-# Begin Target
-
-# Name "Freespace2 - Win32 Release"
-# Name "Freespace2 - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\code\FREESPACE2\app_icon.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\code\FREESPACE2\FreeSpace.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\code\FREESPACE2\FreeSpace.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\code\FREESPACE2\FreeSpace.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\code\FREESPACE2\FreespaceResource.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\code\freespace2\goal_com.bmp
-# End Source File
-# Begin Source File
-
-SOURCE=.\code\freespace2\goal_fail.bmp
-# End Source File
-# Begin Source File
-
-SOURCE=.\code\freespace2\goal_inc.bmp
-# End Source File
-# Begin Source File
-
-SOURCE=.\code\freespace2\goal_none.bmp
-# End Source File
-# Begin Source File
-
-SOURCE=.\code\freespace2\goal_ord.bmp
-# End Source File
-# Begin Source File
-
-SOURCE=.\code\FREESPACE2\LevelPaging.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\code\FREESPACE2\LevelPaging.h
-# End Source File
-# End Target
-# End Project

fs2_open/Freespace2.dsw

@@ -1,44 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "Freespace2"=".\Freespace2.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name code
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "code"=".\code\code.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-

fs2_open/code/Makefile

@@ -1,700 +1,285 @@
-TARGET  = fs2
+TARGET = libcode.a
 
-ifeq ($(USE_SOUND), 1)
-SOUND_DEF=
-SOUND_OBJS= \
- gamesnd/eventmusic.o \
- gamesnd/gamesnd.o \
- object/objectsnd.o \
- sound/acm.o \
- sound/audiostr.o \
- sound/ds.o \
- sound/ds3d.o \
- sound/dscap.o \
- sound/midifile.o \
- sound/rbaudio.o \
- sound/rtvoice.o \
- sound/sound.o \
- sound/winmidi.o \
- sound/winmidi_base.o \
- vcodec/codec1.o
-else
-SOUND_DEF=-DNO_SOUND
-SOUND_OBJS=
-endif # USE_SOUND
+CXXFLAGS =  -DWIN32 -D_DEBUG \
+ -Iwindows_stub \
+ -IAnim -IAsteroid -IBmpman -ICFile -ICmdline -ICMeasure -IControlConfig \
+ -ICutscene -IDebris -IDebugConsole -IDirectX -IFireball -IGameHelp -IFREESPACE2 \
+ -IGameSequence -IGamesnd -IGlide -IGlobalIncs -IGraphics -IHud -IIo -IJumpNode \
+ -ILighting -IMath -IMenuUI -IMission -IMissionUI -IModel -INetwork -IObject \
+ -IObserver -IOsApi -IPalman -IParse -IParticle -IPcxUtils -IPhysics -IPlayerman \
+ -IPopup -IRadar -IRender -IShip -ISound -IStarfield -IStats -ITgaUtils -IUI -IVCodec \
+ -IWeapon -ILocalization -INebula -IDemo -IInetfile -IExceptionHandler \
+ -D_DEBUG -DNO_CD_CHECK -UNDEBUG
 
+# removed from OBJFILES
+# CFile/cfile.o \
+# CFile/CfileArchive.o \
+# CFile/CfileList.o \
+# CFile/CfileSystem.o \
 
-ifeq ($(USE_JOYSTICK), 1)
-JOYSTICK_DEF=
-JOYSTICK_OBJS= \
- io/joy.o \
- io/joy_ff.o \
- io/swff_lib.o
-else
-JOYSTICK_DEF=-DNO_JOYSTICK
-JOYSTICK_OBJS=
-endif # USE_JOYSTICK
-
-
-ifeq ($(USE_NETWORK), 1)
-# no support for standalone server yet... (UI is Win32 specific)
-NETWORK_DEF=-DNO_STANDALONE
-NETWORK_OBJS= \
- hud/hudobserver.o \
- network/multi.o \
- network/multimsgs.o \
- network/multiteamselect.o \
- network/multiui.o \
- network/multiutil.o \
- network/multi_campaign.o \
- network/multi_data.o \
- network/multi_dogfight.o \
- network/multi_endgame.o \
- network/multi_ingame.o \
- network/multi_kick.o \
- network/multi_log.o \
- network/multi_obj.o \
- network/multi_observer.o \
- network/multi_options.o \
- network/multi_pause.o \
- network/multi_pinfo.o \
- network/multi_ping.o \
- network/multi_pmsg.o \
- network/multi_rate.o \
- network/multi_respawn.o \
- network/multi_team.o \
- network/multi_voice.o \
- network/multi_xfer.o \
- network/psnet.o \
- network/psnet2.o \
- menuui/optionsmenumulti.o \
- missionui/chatbox.o
-#
-# Network/stand_gui.o
-#
-else
-NETWORK_DEF=-DNO_NETWORK -DNO_STANDALONE
-NETWORK_OBJS=
-endif # USE_NETWORK
-
-
-ifeq ($(USE_OPENGL), 0)
-OPENGL_DEF=
-else
-OPENGL_DEF=-DUSE_OPENGL
-endif # USE_OPENGL
-
-
-LDFLAGS = -g
-LDLIBS = -L/usr/X11R6/lib -lSDL -lGL -lGLU -lpthread
-
-CXXFLAGS = \
- -g \
- -I/usr/local/include/SDL \
- -I. \
- -fno-exceptions \
- -D_DEBUG -DNO_CD_CHECK -UNDEBUG \
- -DNO_DIRECT3D $(SOUND_DEF) $(JOYSTICK_DEF) $(NETWORK_DEF) $(OPENGL_DEF)
-
-ANIM_OBJFILES = \
- anim/animplay.o \
- anim/packunpack.o
-
-ASTEROID_OBJFILES = \
- asteroid/asteroid.o
-
-BMPMAN_OBJFILES = \
- bmpman/bmpman.o
-
-CFILE_OBJFILES = \
- cfile/cfile.o \
- cfile/cfilearchive.o \
- cfile/cfilelist.o \
- cfile/cfilesystem.o
-
-CMDLINE_OBJFILES = \
- cmdline/cmdline.o
-
-CMEASURE_OBJFILES = \
- cmeasure/cmeasure.o
-
-CONTROLCONFIG_OBJFILES = \
- controlconfig/controlsconfig.o \
- controlconfig/controlsconfigcommon.o
-
-CUTSCENE_OBJFILES = \
- cutscene/cutscenes.o
-
-DEBRIS_OBJFILES = \
- debris/debris.o
-
-DEBUGCONSOLE_OBJFILES = \
- debugconsole/console.o
-
-DEMO_OBJFILES = \
- demo/demo.o
-
-EXCEPTIONHANDLER_OBJFILES = \
- exceptionhandler/exceptionhandler.o
-
-FIREBALL_OBJFILES = \
- fireball/fireballs.o \
- fireball/warpineffect.o
-
-GAMEHELP_OBJFILES = \
- gamehelp/contexthelp.o \
- gamehelp/gameplayhelp.o
-
-GAMESEQUENCE_OBJFILES = \
- gamesequence/gamesequence.o
-
-# gamesnd/eventmusic.o
-# gamesnd/gamesnd.o
-GAMESND_OBJFILES =
-
-# glide/glide.o
-GLIDE_OBJFILES = 
-
-# globalincs/windebug.o
-GLOBALINCS_OBJFILES = \
- globalincs/alphacolors.o \
- globalincs/crypt.o \
- globalincs/systemvars.o \
- globalincs/version.o
-
-# graphics/grd3d.o
-# graphics/grd3drender.o
-# graphics/grd3dtexture.o
-# graphics/grdirectdraw.o
-# graphics/grglide.o
-# graphics/grglidetexture.o
-# graphics/grsoft.o 
-# graphics/scaler.o 
-# graphics/tmapgenericscans.o 
-# graphics/tmapscantiled128x128.o 
-# graphics/tmapscantiled16x16.o 
-# graphics/tmapscantiled256x256.o 
-# graphics/tmapscantiled32x32.o 
-# graphics/tmapscantiled64x64.o
-# graphics/tmapscanline.o
-# graphics/tmapper.o
-GRAPHICS_OBJFILES = \
- graphics/2d.o \
- graphics/aaline.o \
- graphics/bitblt.o \
- graphics/circle.o \
- graphics/colors.o \
- graphics/font.o \
- graphics/gradient.o \
- graphics/gropengl.o \
- graphics/grzbuffer.o \
- graphics/line.o \
- graphics/pixel.o \
- graphics/rect.o \
- graphics/shade.o
-
-# hud/hudobserver.o 
-HUD_OBJFILES = \
- hud/hud.o \
- hud/hudartillery.o \
- hud/hudbrackets.o \
- hud/hudconfig.o \
- hud/hudescort.o \
- hud/hudets.o \
- hud/hudlock.o \
- hud/hudmessage.o \
- hud/hudreticle.o \
- hud/hudshield.o \
- hud/hudsquadmsg.o \
- hud/hudtarget.o \
- hud/hudtargetbox.o \
- hud/hudwingmanstatus.o
-
-INETFILE_OBJFILES = \
- inetfile/cftp.o \
- inetfile/chttpget.o \
- inetfile/inetgetfile.o
-
-# io/joy.o
-# io/joy_ff.o
-# io/swff_lib.o
-IO_OBJFILES = \
- io/key.o \
- io/keycontrol.o \
- io/mouse.o \
- io/timer.o \
- io/xmouse.o
-
-JUMPNODE_OBJFILES = \
- jumpnode/jumpnode.o
-
-LIGHTING_OBJFILES = \
- lighting/lighting.o
-
-LOCALIZATION_OBJFILES = \
- localization/fhash.o \
- localization/localize.o
-
-MATH_OBJFILES = \
- math/fix.o \
- math/floating.o \
- math/fvi.o \
- math/spline.o \
- math/staticrand.o \
- math/vecmat.o
-
-# menuui/optionsmenumulti.o 
-MENUUI_OBJFILES = \
- menuui/barracks.o \
- menuui/credits.o \
- menuui/fishtank.o \
- menuui/mainhallmenu.o \
- menuui/mainhalltemp.o \
- menuui/optionsmenu.o \
- menuui/playermenu.o \
- menuui/readyroom.o \
- menuui/snazzyui.o \
- menuui/techmenu.o \
- menuui/trainingmenu.o
-
-MISSION_OBJFILES = \
- mission/missionbriefcommon.o \
- mission/missioncampaign.o \
- mission/missiongoals.o \
- mission/missiongrid.o \
- mission/missionhotkey.o \
- mission/missionload.o \
- mission/missionlog.o \
- mission/missionmessage.o \
- mission/missionparse.o \
- mission/missiontraining.o
-
-# missionui/chatbox.o
-MISSIONUI_OBJFILES = \
- missionui/missionbrief.o \
- missionui/missioncmdbrief.o \
- missionui/missiondebrief.o \
- missionui/missionloopbrief.o \
- missionui/missionpause.o \
- missionui/missionrecommend.o \
- missionui/missionscreencommon.o \
- missionui/missionshipchoice.o \
- missionui/missionstats.o \
- missionui/missionweaponchoice.o \
- missionui/redalert.o
-
-MODEL_OBJFILES = \
- model/modelcollide.o \
- model/modelinterp.o \
- model/modeloctant.o \
- model/modelread.o
-
-NEBULA_OBJFILES = \
- nebula/neb.o \
- nebula/neblightning.o
-
-# network/multi.o
-# network/multi_campaign.o
-# network/multi_data.o
-# network/multi_dogfight.o
-# network/multi_endgame.o
-# network/multi_ingame.o
-# network/multi_kick.o
-# network/multi_log.o
-# network/multimsgs.o
-# network/multi_obj.o
-# network/multi_observer.o
-# network/multi_oo.o
-# network/multi_options.o
-# network/multi_pause.o
-# network/multi_pinfo.o
-# network/multi_ping.o
-# network/multi_pmsg.o
-# network/multi_rate.o
-# network/multi_respawn.o
-# network/multi_team.o
-# network/multi_update.o
-# network/multi_voice.o
-# network/multi_xfer.o
-# network/multilag.o
-# network/multiteamselect.o
-# network/multiui.o
-# network/psnet.o
-# network/psnet2.o
-# network/stand_gui.o
-NETWORK_OBJFILES = \
- network/multiutil.o
-
-# object/objectsnd.o 
-OBJECT_OBJFILES = \
- object/collidedebrisship.o \
- object/collidedebrisweapon.o \
- object/collideshipship.o \
- object/collideshipweapon.o \
- object/collideweaponweapon.o \
- object/objcollide.o \
- object/object.o \
- object/objectsort.o
-
-OBSERVER_OBJFILES = \
- observer/observer.o
-
-OSAPI_OBJFILES = \
- osapi/osapi_unix.o \
- osapi/osregistry_unix.o \
- osapi/outwnd_unix.o
-
-PALMAN_OBJFILES = \
- palman/palman.o
-
-PARSE_OBJFILES = \
- parse/encrypt.o \
- parse/parselo.o \
- parse/sexp.o
-
-PARTICLE_OBJFILES = \
- particle/particle.o
-
-PCXUTILS_OBJFILES = \
- pcxutils/pcxutils.o
-
-PHYSICS_OBJFILES = \
- physics/physics.o
-
-PLAYERMAN_OBJFILES = \
- playerman/managepilot.o \
- playerman/playercontrol.o
-
-POPUP_OBJFILES = \
- popup/popup.o \
- popup/popupdead.o
-
-RADAR_OBJFILES = \
- radar/radar.o
-
-RENDER_OBJFILES = \
- render/3dclipper.o \
- render/3ddraw.o \
- render/3dlaser.o \
- render/3dmath.o \
- render/3dsetup.o
-
-SHIP_OBJFILES = \
- ship/afterburner.o \
- ship/ai.o \
- ship/aibig.o \
- ship/aicode.o \
- ship/aigoals.o \
- ship/awacs.o \
- ship/shield.o \
- ship/ship.o \
- ship/shipcontrails.o \
- ship/shipfx.o \
- ship/shiphit.o
-
-SOUND_OBJFILES = \
- sound/acm.o \
- sound/audiostr.o \
- sound/ds.o \
- sound/ds3d.o \
- sound/dscap.o \
- sound/midifile.o \
- sound/rbaudio.o \
- sound/rtvoice.o \
- sound/sound.o \
- sound/winmidi.o \
- sound/winmidi_base.o
-
-STARFIELD_OBJFILES = \
- starfield/nebula.o \
- starfield/starfield.o \
- starfield/supernova.o
-
-STATS_OBJFILES = \
- stats/medals.o \
- stats/scoring.o \
- stats/stats.o
-
-TGAUTILS_OBJFILES = \
- tgautils/tgautils.o
-
-UI_OBJFILES = \
- ui/button.o \
- ui/checkbox.o \
- ui/gadget.o \
- ui/icon.o \
- ui/inputbox.o \
- ui/keytrap.o \
- ui/listbox.o \
- ui/radio.o \
- ui/scroll.o \
- ui/slider.o \
- ui/slider2.o \
- ui/uidraw.o \
- ui/uimouse.o \
- ui/window.o
-
-VCODEC_OBJFILES = \
- vcodec/codec1.o
-
-WEAPON_OBJFILES = \
- weapon/beam.o \
- weapon/corkscrew.o \
- weapon/emp.o \
- weapon/flak.o \
- weapon/muzzleflash.o \
- weapon/shockwave.o \
- weapon/swarm.o \
- weapon/trails.o \
- weapon/weapons.o
-
-# SOUND_OBJFILES  
-# INETFILE_OBJFILES  
-# EXCEPTIONHANDLER_OBJFILES 
 OBJFILES = \
- ANIM_OBJFILES  \
- ASTEROID_OBJFILES  \
- BMPMAN_OBJFILES  \
- CFILE_OBJFILES \
- CMDLINE_OBJFILES  \
- CMEASURE_OBJFILES  \
- CONTROLCONFIG_OBJFILES  \
- CUTSCENE_OBJFILES  \
- DEBRIS_OBJFILES  \
- DEBUGCONSOLE_OBJFILES  \
- FIREBALL_OBJFILES  \
- GAMEHELP_OBJFILES  \
- GAMESEQUENCE_OBJFILES  \
- GAMESND_OBJFILES  \
- GLIDE_OBJFILES  \
- GLOBALINCS_OBJFILES  \
- GRAPHICS_OBJFILES  \
- HUD_OBJFILES  \
- IO_OBJFILES \
- JUMPNODE_OBJFILES  \
- LIGHTING_OBJFILES  \
- MATH_OBJFILES  \
- MENUUI_OBJFILES  \
- MISSION_OBJFILES  \
- MISSIONUI_OBJFILES  \
- MODEL_OBJFILES  \
- NETWORK_OBJFILES \
- OBJECT_OBJFILES  \
- OBSERVER_OBJFILES  \
- OSAPI_OBJFILES \
- PALMAN_OBJFILES  \
- PARSE_OBJFILES  \
- PARTICLE_OBJFILES  \
- PCXUTILS_OBJFILES  \
- PHYSICS_OBJFILES  \
- PLAYERMAN_OBJFILES  \
- POPUP_OBJFILES  \
- RADAR_OBJFILES  \
- RENDER_OBJFILES  \
- SHIP_OBJFILES  \
- STARFIELD_OBJFILES  \
- STATS_OBJFILES  \
- UI_OBJFILES  \
- VCODEC_OBJFILES  \
- WEAPON_OBJFILES  \
- NEBULA_OBJFILES  \
- LOCALIZATION_OBJFILES  \
- TGAUTILS_OBJFILES  \
- DEMO_OBJFILES
+ Anim/animplay.o \
+ Anim/packunpack.o \
+ Asteroid/asteroid.o \
+ Bmpman/bmpman.o \
+ Cmdline/cmdline.o \
+ CMeasure/cmeasure.o \
+ ControlConfig/controlsconfig.o \
+ ControlConfig/controlsconfigcommon.o \
+ Cutscene/cutscenes.o \
+ Debris/debris.o \
+ DebugConsole/console.o \
+ Fireball/fireballs.o \
+ Fireball/warpineffect.o \
+ GameHelp/contexthelp.o \
+ GameHelp/gameplayhelp.o \
+ GameSequence/gamesequence.o \
+ Gamesnd/eventmusic.o \
+ Gamesnd/gamesnd.o \
+ Glide/glide.o \
+ GlobalIncs/alphacolors.o \
+ GlobalIncs/crypt.o \
+ GlobalIncs/systemvars.o \
+ GlobalIncs/version.o \
+ GlobalIncs/windebug.o \
+ Graphics/2d.o \
+ Graphics/aaline.o \
+ Graphics/bitblt.o \
+ Graphics/circle.o \
+ Graphics/colors.o \
+ Graphics/font.o \
+ Graphics/gradient.o \
+ Graphics/grd3d.o \
+ Graphics/grd3drender.o \
+ Graphics/grd3dtexture.o \
+ Graphics/grdirectdraw.o \
+ Graphics/grglide.o \
+ Graphics/grglidetexture.o \
+ Graphics/gropengl.o \
+ Graphics/grsoft.o \
+ Graphics/grzbuffer.o \
+ Graphics/line.o \
+ Graphics/pixel.o \
+ Graphics/rect.o \
+ Graphics/scaler.o \
+ Graphics/shade.o \
+ Graphics/tmapgenericscans.o \
+ Graphics/tmapper.o \
+ Graphics/tmapscanline.o \
+ Graphics/tmapscantiled128x128.o \
+ Graphics/tmapscantiled16x16.o \
+ Graphics/tmapscantiled256x256.o \
+ Graphics/tmapscantiled32x32.o \
+ Graphics/tmapscantiled64x64.o \
+ Hud/hud.o \
+ Hud/hudartillery.o \
+ Hud/hudbrackets.o \
+ Hud/hudconfig.o \
+ Hud/hudescort.o \
+ Hud/hudets.o \
+ Hud/hudlock.o \
+ Hud/hudmessage.o \
+ Hud/hudobserver.o \
+ Hud/hudreticle.o \
+ Hud/hudshield.o \
+ Hud/hudsquadmsg.o \
+ Hud/hudtarget.o \
+ Hud/hudtargetbox.o \
+ Hud/hudwingmanstatus.o \
+ Io/joy.o \
+ Io/joy_ff.o \
+ Io/key.o \
+ Io/keycontrol.o \
+ Io/mouse.o \
+ Io/swff_lib.o \
+ Io/timer.o \
+ JumpNode/jumpnode.o \
+ Lighting/lighting.o \
+ Math/fix.o \
+ Math/floating.o \
+ Math/fvi.o \
+ Math/spline.o \
+ Math/staticrand.o \
+ Math/vecmat.o \
+ MenuUI/barracks.o \
+ MenuUI/credits.o \
+ MenuUI/fishtank.o \
+ MenuUI/mainhallmenu.o \
+ MenuUI/mainhalltemp.o \
+ MenuUI/optionsmenu.o \
+ MenuUI/optionsmenumulti.o \
+ MenuUI/playermenu.o \
+ MenuUI/readyroom.o \
+ MenuUI/snazzyui.o \
+ MenuUI/techmenu.o \
+ MenuUI/trainingmenu.o \
+ Mission/missionbriefcommon.o \
+ Mission/missioncampaign.o \
+ Mission/missiongoals.o \
+ Mission/missiongrid.o \
+ Mission/missionhotkey.o \
+ Mission/missionload.o \
+ Mission/missionlog.o \
+ Mission/missionmessage.o \
+ Mission/missionparse.o \
+ Mission/missiontraining.o \
+ MissionUI/chatbox.o \
+ MissionUI/missionbrief.o \
+ MissionUI/missioncmdbrief.o \
+ MissionUI/missiondebrief.o \
+ MissionUI/missionloopbrief.o \
+ MissionUI/missionpause.o \
+ MissionUI/missionrecommend.o \
+ MissionUI/missionscreencommon.o \
+ MissionUI/missionshipchoice.o \
+ MissionUI/missionstats.o \
+ MissionUI/missionweaponchoice.o \
+ MissionUI/redalert.o \
+ Model/modelcollide.o \
+ Model/modelinterp.o \
+ Model/modeloctant.o \
+ Model/modelread.o \
+ Object/collidedebrisship.o \
+ Object/collidedebrisweapon.o \
+ Object/collideshipship.o \
+ Object/collideshipweapon.o \
+ Object/collideweaponweapon.o \
+ Object/objcollide.o \
+ Object/object.o \
+ Object/objectsnd.o \
+ Object/objectsort.o \
+ Observer/observer.o \
+ OsApi/osapi.o \
+ OsApi/osregistry.o \
+ OsApi/outwnd.o \
+ Palman/palman.o \
+ Parse/encrypt.o \
+ Parse/parselo.o \
+ Parse/sexp.o \
+ Particle/particle.o \
+ PcxUtils/pcxutils.o \
+ Physics/physics.o \
+ Playerman/managepilot.o \
+ Playerman/playercontrol.o \
+ Popup/popup.o \
+ Popup/popupdead.o \
+ Radar/radar.o \
+ Render/3dclipper.o \
+ Render/3ddraw.o \
+ Render/3dlaser.o \
+ Render/3dmath.o \
+ Render/3dsetup.o \
+ Ship/afterburner.o \
+ Ship/ai.o \
+ Ship/aibig.o \
+ Ship/aicode.o \
+ Ship/aigoals.o \
+ Ship/awacs.o \
+ Ship/shield.o \
+ Ship/ship.o \
+ Ship/shipcontrails.o \
+ Ship/shipfx.o \
+ Ship/shiphit.o \
+ Sound/acm.o \
+ Sound/audiostr.o \
+ Sound/ds.o \
+ Sound/ds3d.o \
+ Sound/dscap.o \
+ Sound/midifile.o \
+ Sound/rbaudio.o \
+ Sound/rtvoice.o \
+ Sound/sound.o \
+ Sound/winmidi.o \
+ Sound/winmidi_base.o \
+ Starfield/nebula.o \
+ Starfield/starfield.o \
+ Starfield/supernova.o \
+ Stats/medals.o \
+ Stats/scoring.o \
+ Stats/stats.o \
+ UI/button.o \
+ UI/checkbox.o \
+ UI/gadget.o \
+ UI/icon.o \
+ UI/inputbox.o \
+ UI/keytrap.o \
+ UI/listbox.o \
+ UI/radio.o \
+ UI/scroll.o \
+ UI/slider.o \
+ UI/slider2.o \
+ UI/uidraw.o \
+ UI/uimouse.o \
+ UI/window.o \
+ VCodec/codec1.o \
+ Weapon/beam.o \
+ Weapon/corkscrew.o \
+ Weapon/emp.o \
+ Weapon/flak.o \
+ Weapon/muzzleflash.o \
+ Weapon/shockwave.o \
+ Weapon/swarm.o \
+ Weapon/trails.o \
+ Weapon/weapons.o \
+ Nebula/neb.o \
+ Nebula/neblightning.o \
+ Localization/fhash.o \
+ Localization/localize.o \
+ TgaUtils/tgautils.o \
+ Demo/demo.o \
+ Inetfile/cftp.o \
+ Inetfile/chttpget.o \
+ Inetfile/inetgetfile.o \
+ ExceptionHandler/exceptionhandler.o \
+ Network/multi.o \
+ Network/multi_campaign.o \
+ Network/multi_data.o \
+ Network/multi_dogfight.o \
+ Network/multi_endgame.o \
+ Network/multi_ingame.o \
+ Network/multi_kick.o \
+ Network/multi_log.o \
+ Network/multi_obj.o \
+ Network/multi_observer.o \
+ Network/multi_oo.o \
+ Network/multi_options.o \
+ Network/multi_pause.o \
+ Network/multi_pinfo.o \
+ Network/multi_ping.o \
+ Network/multi_pmsg.o \
+ Network/multi_rate.o \
+ Network/multi_respawn.o \
+ Network/multi_team.o \
+ Network/multi_update.o \
+ Network/multi_voice.o \
+ Network/multi_xfer.o \
+ Network/multilag.o \
+ Network/multimsgs.o \
+ Network/multiteamselect.o \
+ Network/multiui.o \
+ Network/multiutil.o \
+ Network/psnet.o \
+ Network/psnet2.o \
+ Network/stand_gui.o
 
-# SOUND_OBJFILES  
-# INETFILE_OBJFILES  
-# EXCEPTIONHANDLER_OBJFILES 
-LIB_OBJFILES = \
- $(ANIM_OBJFILES)  \
- $(ASTEROID_OBJFILES)  \
- $(BMPMAN_OBJFILES)  \
- $(CFILE_OBJFILES) \
- $(CMDLINE_OBJFILES)  \
- $(CMEASURE_OBJFILES)  \
- $(CONTROLCONFIG_OBJFILES)  \
- $(CUTSCENE_OBJFILES)  \
- $(DEBRIS_OBJFILES)  \
- $(DEBUGCONSOLE_OBJFILES)  \
- $(FIREBALL_OBJFILES)  \
- $(GAMEHELP_OBJFILES)  \
- $(GAMESEQUENCE_OBJFILES)  \
- $(GAMESND_OBJFILES)  \
- $(GLIDE_OBJFILES)  \
- $(GLOBALINCS_OBJFILES)  \
- $(GRAPHICS_OBJFILES)  \
- $(HUD_OBJFILES)  \
- $(IO_OBJFILES) \
- $(JUMPNODE_OBJFILES)  \
- $(LIGHTING_OBJFILES)  \
- $(MATH_OBJFILES)  \
- $(MENUUI_OBJFILES)  \
- $(MISSION_OBJFILES)  \
- $(MISSIONUI_OBJFILES)  \
- $(MODEL_OBJFILES)  \
- $(NETWORK_OBJFILES) \
- $(OBJECT_OBJFILES)  \
- $(OBSERVER_OBJFILES)  \
- $(OSAPI_OBJFILES) \
- $(PALMAN_OBJFILES)  \
- $(PARSE_OBJFILES)  \
- $(PARTICLE_OBJFILES)  \
- $(PCXUTILS_OBJFILES)  \
- $(PHYSICS_OBJFILES)  \
- $(PLAYERMAN_OBJFILES)  \
- $(POPUP_OBJFILES)  \
- $(RADAR_OBJFILES)  \
- $(RENDER_OBJFILES)  \
- $(SHIP_OBJFILES)  \
- $(STARFIELD_OBJFILES)  \
- $(STATS_OBJFILES)  \
- $(UI_OBJFILES)  \
- $(VCODEC_OBJFILES)  \
- $(WEAPON_OBJFILES)  \
- $(NEBULA_OBJFILES)  \
- $(LOCALIZATION_OBJFILES)  \
- $(TGAUTILS_OBJFILES)  \
- $(DEMO_OBJFILES) \
- $(SOUND_OBJS) \
- $(JOYSTICK_OBJS) \
- $(NETWORK_OBJS)
-
-FREESPACE2_OBJFILES = \
- freespace2/freespace.o \
- freespace2/levelpaging.o
-
-STUB_OBJFILES = \
- windows_stub/stubs.o
 
 # ==============================
-.PHONY: all clean code \
- ANIM_OBJFILES  \
- ASTEROID_OBJFILES  \
- BMPMAN_OBJFILES  \
- CMDLINE_OBJFILES  \
- CMEASURE_OBJFILES  \
- CONTROLCONFIG_OBJFILES  \
- CUTSCENE_OBJFILES  \
- DEBRIS_OBJFILES  \
- DEBUGCONSOLE_OBJFILES  \
- FIREBALL_OBJFILES  \
- GAMEHELP_OBJFILES  \
- GAMESEQUENCE_OBJFILES  \
- GAMESND_OBJFILES  \
- GLIDE_OBJFILES  \
- GLOBALINCS_OBJFILES  \
- GRAPHICS_OBJFILES  \
- HUD_OBJFILES  \
- IO_OBJFILES  \
- JUMPNODE_OBJFILES  \
- LIGHTING_OBJFILES  \
- MATH_OBJFILES  \
- MENUUI_OBJFILES  \
- MISSION_OBJFILES  \
- MISSIONUI_OBJFILES  \
- MODEL_OBJFILES  \
- OBJECT_OBJFILES  \
- OBSERVER_OBJFILES  \
- OSAPI_OBJFILES  \
- PALMAN_OBJFILES  \
- PARSE_OBJFILES  \
- PARTICLE_OBJFILES  \
- PCXUTILS_OBJFILES  \
- PHYSICS_OBJFILES  \
- PLAYERMAN_OBJFILES  \
- POPUP_OBJFILES  \
- RADAR_OBJFILES  \
- RENDER_OBJFILES  \
- SHIP_OBJFILES  \
- SOUND_OBJFILES  \
- STARFIELD_OBJFILES  \
- STATS_OBJFILES  \
- UI_OBJFILES  \
- VCODEC_OBJFILES  \
- WEAPON_OBJFILES  \
- NEBULA_OBJFILES  \
- LOCALIZATION_OBJFILES  \
- TGAUTILS_OBJFILES  \
- DEMO_OBJFILES  \
- INETFILE_OBJFILES  \
- EXCEPTIONHANDLER_OBJFILES  \
- NETWORK_OBJFILES
+.PHONY: all clean code
 
 .cpp.o:	
-	$(CXX) $(CXXFLAGS) -c -o $@ $<
+	$(CXX) $(CXXFLAGS) -E $< > $@
+#	$(CXX) $(CXXFLAGS) -c $<
 
 
 all:	$(TARGET)
 
 clean:
-	rm -f $(TARGET) libcode.a core *.o *~
+	rm -f $(TARGET) core *.o *~
 	find -name *.o -exec rm {} \;
 	find -name *~ -exec rm {} \;
 
-code:	libcode.a
+code:	$(TARGET)
 
 
 # ==============================
-libcode.a:	$(LIB_OBJFILES)
-	$(AR) -r $@ $(LIB_OBJFILES)
-#	$(CXX) -o $@ $(LIB_OBJFILES)
-
-fs2:	libcode.a $(FREESPACE2_OBJFILES) $(STUB_OBJFILES)
-	$(CXX) $(LDFLAGS) -o $@ $(FREESPACE2_OBJFILES) $(STUB_OBJFILES) $(LDLIBS) -L. -lcode
-
-
-# exceptions to the rule...
-freespace2/freespace.o:	freespace2/freespace.cpp
-	$(CXX) $(CXXFLAGS) -fexceptions -c -o $@ $<
-
-ANIM_OBJFILES:  $(ANIM_OBJFILES)
-ASTEROID_OBJFILES:  $(ASTEROID_OBJFILES)
-BMPMAN_OBJFILES:  $(BMPMAN_OBJFILES)
-CMDLINE_OBJFILES:  $(CMDLINE_OBJFILES)
-CMEASURE_OBJFILES:  $(CMEASURE_OBJFILES)
-CONTROLCONFIG_OBJFILES:  $(CONTROLCONFIG_OBJFILES)
-CUTSCENE_OBJFILES:  $(CUTSCENE_OBJFILES)
-DEBRIS_OBJFILES:  $(DEBRIS_OBJFILES)
-DEBUGCONSOLE_OBJFILES:  $(DEBUGCONSOLE_OBJFILES)
-FIREBALL_OBJFILES:  $(FIREBALL_OBJFILES)
-GAMEHELP_OBJFILES:  $(GAMEHELP_OBJFILES)
-GAMESEQUENCE_OBJFILES:  $(GAMESEQUENCE_OBJFILES)
-GAMESND_OBJFILES:  $(GAMESND_OBJFILES)
-GLIDE_OBJFILES:  $(GLIDE_OBJFILES)
-GLOBALINCS_OBJFILES:  $(GLOBALINCS_OBJFILES)
-GRAPHICS_OBJFILES:  $(GRAPHICS_OBJFILES)
-HUD_OBJFILES:  $(HUD_OBJFILES)
-IO_OBJFILES:  $(IO_OBJFILES)
-JUMPNODE_OBJFILES:  $(JUMPNODE_OBJFILES)
-LIGHTING_OBJFILES:  $(LIGHTING_OBJFILES)
-MATH_OBJFILES:  $(MATH_OBJFILES)
-MENUUI_OBJFILES:  $(MENUUI_OBJFILES)
-MISSION_OBJFILES:  $(MISSION_OBJFILES)
-MISSIONUI_OBJFILES:  $(MISSIONUI_OBJFILES)
-MODEL_OBJFILES:  $(MODEL_OBJFILES)
-OBJECT_OBJFILES:  $(OBJECT_OBJFILES)
-OBSERVER_OBJFILES:  $(OBSERVER_OBJFILES)
-OSAPI_OBJFILES:  $(OSAPI_OBJFILES)
-PALMAN_OBJFILES:  $(PALMAN_OBJFILES)
-PARSE_OBJFILES:  $(PARSE_OBJFILES)
-PARTICLE_OBJFILES:  $(PARTICLE_OBJFILES)
-PCXUTILS_OBJFILES:  $(PCXUTILS_OBJFILES)
-PHYSICS_OBJFILES:  $(PHYSICS_OBJFILES)
-PLAYERMAN_OBJFILES:  $(PLAYERMAN_OBJFILES)
-POPUP_OBJFILES:  $(POPUP_OBJFILES)
-RADAR_OBJFILES:  $(RADAR_OBJFILES)
-RENDER_OBJFILES:  $(RENDER_OBJFILES)
-SHIP_OBJFILES:  $(SHIP_OBJFILES)
-SOUND_OBJFILES:  $(SOUND_OBJFILES)
-STARFIELD_OBJFILES:  $(STARFIELD_OBJFILES)
-STATS_OBJFILES:  $(STATS_OBJFILES)
-UI_OBJFILES:  $(UI_OBJFILES)
-VCODEC_OBJFILES:  $(VCODEC_OBJFILES)
-WEAPON_OBJFILES:  $(WEAPON_OBJFILES)
-NEBULA_OBJFILES:  $(NEBULA_OBJFILES)
-LOCALIZATION_OBJFILES:  $(LOCALIZATION_OBJFILES)
-TGAUTILS_OBJFILES:  $(TGAUTILS_OBJFILES)
-DEMO_OBJFILES:  $(DEMO_OBJFILES)
-INETFILE_OBJFILES:  $(INETFILE_OBJFILES)
-EXCEPTIONHANDLER_OBJFILES:  $(EXCEPTIONHANDLER_OBJFILES)
-NETWORK_OBJFILES:  $(NETWORK_OBJFILES)
+libcode.a:	$(OBJFILES)

fs2_open/code/anim/animplay.cpp

@@ -9,16 +9,13 @@
 
 /*
  * $Logfile: /Freespace2/code/Anim/AnimPlay.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:56 $
  * $Author: penguin $
  *
  * C module for playing back anim files
  *
  * $Log: not supported by cvs2svn $
- * 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
  *
@@ -181,16 +178,16 @@
  * $NoKeywords: $
  */
 
-#include "anim/animplay.h"
-#include "globalincs/linklist.h"
-#include "io/timer.h"
-#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 "animplay.h"
+#include "linklist.h"
+#include "timer.h"
+#include "bmpman.h"
+#include "2d.h"
+#include "3d.h"
+#include "grinternal.h"
+#include "pcxutils.h"
+#include "packunpack.h"
+#include "cfile.h"
 
 static color Color_xparent;
 

fs2_open/code/anim/animplay.h

@@ -9,19 +9,13 @@
 
 /*
  * $Logfile: /Freespace2/code/Anim/AnimPlay.h $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:56 $
  * $Author: penguin $
  *
  * Header file for playing back anim files
  *
  * $Log: not supported by cvs2svn $
- * Revision 2.0  2002/06/03 04:02:21  penguin
- * Warpcore CVS sync
- *
- * Revision 1.2  2002/05/03 22:07:07  mharris
- * got some stuff to compile
- *
  * Revision 1.1  2002/05/02 18:03:04  mharris
  * Initial checkin - converted filenames and includes to lower case
  *
@@ -102,8 +96,6 @@
 #ifndef __ANIMPLAY_H__
 #define __ANIMPLAY_H__
 
-#include "globalincs/pstypes.h"
-
 struct anim;
 struct anim_info;
 struct anim_instance;

fs2_open/code/anim/packunpack.cpp

@@ -9,8 +9,8 @@
 
 /*
  * $Logfile: /Freespace2/code/Anim/PackUnpack.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:56 $
  * $Author: penguin $
  *
  * Code for handling packing and unpacking in Hoffoss's RLE format, used for
@@ -18,9 +18,6 @@
  * utilizing an Anim), and getting getting frames of the Anim.
  *
  * $Log: not supported by cvs2svn $
- * 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
  *
@@ -152,12 +149,12 @@
  * $NoKeywords: $
  */
 
-#include "graphics/grinternal.h"
-#include "bmpman/bmpman.h"
-#include "palman/palman.h"
-#include "graphics/2d.h"
-#include "anim/animplay.h"
-#include "anim/packunpack.h"
+#include "grinternal.h"
+#include "bmpman.h"
+#include "palman.h"
+#include "2d.h"
+#include "animplay.h"
+#include "packunpack.h"
 
 int packer_code = PACKER_CODE;
 int transparent_code = 254;

fs2_open/code/anim/packunpack.h

@@ -9,8 +9,8 @@
 
 /*
  * $Logfile: /Freespace2/code/Anim/PackUnpack.h $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:56 $
  * $Author: penguin $
  *
  * Code for handling packing and unpacking in Hoffoss's RLE format, used for
@@ -18,12 +18,6 @@
  * utilizing an Anim), and getting getting frames of the Anim.
  *
  * $Log: not supported by cvs2svn $
- * Revision 2.0  2002/06/03 04:02:21  penguin
- * Warpcore CVS sync
- *
- * Revision 1.2  2002/05/03 22:07:07  mharris
- * got some stuff to compile
- *
  * Revision 1.1  2002/05/02 18:03:04  mharris
  * Initial checkin - converted filenames and includes to lower case
  *
@@ -151,7 +145,7 @@
 #ifndef __PACKUNPACK_H__
 #define __PACKUNPACK_H__
 
-#include "globalincs/pstypes.h"
+#include "pstypes.h"
 
 struct CFILE;
 
@@ -201,7 +195,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
@@ -233,7 +227,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;
+} anim_instance;
 
 extern int packer_code;
 

fs2_open/code/asteroid/asteroid.cpp

@@ -9,22 +9,13 @@
 
 /*
  * $Logfile: /Freespace2/code/Asteroid/Asteroid.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:56 $
  * $Author: penguin $
  *
  * C module for asteroid code
  *
  * $Log: not supported by cvs2svn $
- * Revision 2.0  2002/06/03 04:02:21  penguin
- * Warpcore CVS sync
- *
- * Revision 1.3  2002/05/10 20:42:43  mharris
- * use "ifndef NO_NETWORK" all over the place
- *
- * Revision 1.2  2002/05/03 22:07:08  mharris
- * got some stuff to compile
- *
  * Revision 1.1  2002/05/02 18:03:04  mharris
  * Initial checkin - converted filenames and includes to lower case
  *
@@ -266,30 +257,25 @@
  * $NoKeywords: $
  */
 
-#include "asteroid/asteroid.h"
-#include "object/object.h"
-#include "object/objcollide.h"
-#include "freespace2/freespace.h"
-#include "io/timer.h"
-#include "render/3d.h"
-#include "fireball/fireballs.h"
-#include "gamesnd/gamesnd.h"
-#include "bmpman/bmpman.h"
-#include "particle/particle.h"
-#include "globalincs/linklist.h"
-#include "hud/hudescort.h"
-#include "ship/shiphit.h"
-#include "math/staticrand.h"
-#include "globalincs/systemvars.h"
-#include "localization/localize.h"
-#include "stats/scoring.h"
-#include "hud/hudtarget.h"
-
-#ifndef NO_NETWORK
-#include "network/multiutil.h"
-#include "network/multimsgs.h"
-#include "network/multi.h"
-#endif
+#include "asteroid.h"
+#include "object.h"
+#include "objcollide.h"
+#include "freespace.h"
+#include "timer.h"
+#include "3d.h"
+#include "fireballs.h"
+#include "gamesnd.h"
+#include "bmpman.h"
+#include "particle.h"
+#include "linklist.h"
+#include "hudescort.h"
+#include "shiphit.h"
+#include "multiutil.h"
+#include "staticrand.h"
+#include "multimsgs.h"
+#include "systemvars.h"
+#include "localize.h"
+#include "multi.h"
 
 #ifndef FS2_DEMO
 
@@ -429,15 +415,15 @@ int asteroid_in_inner_bound_with_axes(asteroid_field *asfieldp, vector *pos, flo
 	Assert(asfieldp->has_inner_bound);
 
 	int rval = 0;
-	if ( (pos->xyz.x > asfieldp->inner_min_bound.xyz.x - delta) && (pos->xyz.x < asfieldp->inner_max_bound.xyz.x + delta) ) {
+	if ( (pos->x > asfieldp->inner_min_bound.x - delta) && (pos->x < asfieldp->inner_max_bound.x + delta) ) {
 		rval += 1;
 	}
 
-	if ( (pos->xyz.y > asfieldp->inner_min_bound.xyz.y - delta) && (pos->xyz.y < asfieldp->inner_max_bound.xyz.y + delta) ) {
+	if ( (pos->y > asfieldp->inner_min_bound.y - delta) && (pos->y < asfieldp->inner_max_bound.y + delta) ) {
 		rval += 2;
 	}
 
-	if ( (pos->xyz.z > asfieldp->inner_min_bound.xyz.z - delta) && (pos->xyz.z < asfieldp->inner_max_bound.xyz.z + delta) ) {
+	if ( (pos->z > asfieldp->inner_min_bound.z - delta) && (pos->z < asfieldp->inner_max_bound.z + delta) ) {
 		rval += 4;
 	}
 
@@ -550,9 +536,9 @@ object *asteroid_create(asteroid_field *asfieldp, int asteroid_type, int asteroi
 	signature = 0;
 	rand_base = 0;
 	if ( Game_mode & GM_NORMAL ) {
-		pos.xyz.x = asfieldp->min_bound.xyz.x + delta_bound.xyz.x * frand();
-		pos.xyz.y = asfieldp->min_bound.xyz.y + delta_bound.xyz.y * frand();
-		pos.xyz.z = asfieldp->min_bound.xyz.z + delta_bound.xyz.z * frand();
+		pos.x = asfieldp->min_bound.x + delta_bound.x * frand();
+		pos.y = asfieldp->min_bound.y + delta_bound.y * frand();
+		pos.z = asfieldp->min_bound.z + delta_bound.z * frand();
 
 		inner_bound_pos_fixup(asfieldp, &pos);
 		// vm_set_identity(&orient);
@@ -560,20 +546,18 @@ object *asteroid_create(asteroid_field *asfieldp, int asteroid_type, int asteroi
 		angs.b = frand() * 2*PI;
 		angs.h = frand() * 2*PI;
 	} else {
-#ifndef NO_NETWORK
 		signature = multi_assign_network_signature( MULTI_SIG_ASTEROID );
 		rand_base = signature;
 
-		pos.xyz.x = asfieldp->min_bound.xyz.x + delta_bound.xyz.x * static_randf( rand_base++ );
-		pos.xyz.y = asfieldp->min_bound.xyz.y + delta_bound.xyz.y * static_randf( rand_base++ );
-		pos.xyz.z = asfieldp->min_bound.xyz.z + delta_bound.xyz.z * static_randf( rand_base++ );
+		pos.x = asfieldp->min_bound.x + delta_bound.x * static_randf( rand_base++ );
+		pos.y = asfieldp->min_bound.y + delta_bound.y * static_randf( rand_base++ );
+		pos.z = asfieldp->min_bound.z + delta_bound.z * static_randf( rand_base++ );
 
 		inner_bound_pos_fixup(asfieldp, &pos);
 		// vm_set_identity(&orient);
 		angs.p = static_randf( rand_base++ ) * 2*PI;
 		angs.b = static_randf( rand_base++ ) * 2*PI;
 		angs.h = static_randf( rand_base++ ) * 2*PI;
-#endif
 	}
 
 	vm_angles_2_matrix(&orient, &angs);
@@ -636,14 +620,14 @@ object *asteroid_create(asteroid_field *asfieldp, int asteroid_type, int asteroi
 	// Fill in the max_vel field, so the collision pair stuff knows
 	// how fast this can move maximum in order to throw out collisions.
 	// This is in local coordinates, so Z is forward velocity.
-	objp->phys_info.max_vel.xyz.x = 0.0f;
-	objp->phys_info.max_vel.xyz.y = 0.0f;
-	objp->phys_info.max_vel.xyz.z = vm_vec_mag(&objp->phys_info.desired_vel);
+	objp->phys_info.max_vel.x = 0.0f;
+	objp->phys_info.max_vel.y = 0.0f;
+	objp->phys_info.max_vel.z = vm_vec_mag(&objp->phys_info.desired_vel);
 	
 	objp->phys_info.mass = asip->modelp[asteroid_subtype]->rad * 700.0f;
-	objp->phys_info.I_body_inv.vec.rvec.xyz.x = 1.0f / (objp->phys_info.mass*asip->modelp[asteroid_subtype]->rad);
-	objp->phys_info.I_body_inv.vec.uvec.xyz.y = objp->phys_info.I_body_inv.vec.rvec.xyz.x;
-	objp->phys_info.I_body_inv.vec.fvec.xyz.z = objp->phys_info.I_body_inv.vec.rvec.xyz.x;
+	objp->phys_info.I_body_inv.rvec.x = 1.0f / (objp->phys_info.mass*asip->modelp[asteroid_subtype]->rad);
+	objp->phys_info.I_body_inv.uvec.y = objp->phys_info.I_body_inv.rvec.x;
+	objp->phys_info.I_body_inv.fvec.z = objp->phys_info.I_body_inv.rvec.x;
 	objp->hull_strength = asip->initial_hull_strength * (0.8f + (float)Game_skill_level/NUM_SKILL_LEVELS)/2.0f;
 
 	// ensure vel is valid
@@ -668,11 +652,9 @@ void asteroid_sub_create(object *parent_objp, int asteroid_type, vector *relvec)
 	if (new_objp == NULL)
 		return;
 
-#ifndef NO_NETWORK
 	if ( MULTIPLAYER_MASTER ){
 		send_asteroid_create( new_objp, parent_objp, asteroid_type, relvec );
 	}
-#endif
 
 	//	Now, bash some values.
 	vm_vec_scale_add(&new_objp->pos, &parent_objp->pos, relvec, 0.5f * parent_objp->radius);
@@ -877,40 +859,38 @@ void asteroid_level_init()
 // 0 from this function.  We will force a wrap on the clients when server tells us
 int asteroid_should_wrap(object *objp, asteroid_field *asfieldp)
 {
-#ifndef NO_NETWORK
 	if ( MULTIPLAYER_CLIENT )
 		return 0;
-#endif
 
-	if (objp->pos.xyz.x < asfieldp->min_bound.xyz.x) {
+	if (objp->pos.x < asfieldp->min_bound.x) {
 		return 1;
 	}
 
-	if (objp->pos.xyz.y < asfieldp->min_bound.xyz.y) {
+	if (objp->pos.y < asfieldp->min_bound.y) {
 		return 1;
 	}
 
-	if (objp->pos.xyz.z < asfieldp->min_bound.xyz.z) {
+	if (objp->pos.z < asfieldp->min_bound.z) {
 		return 1;
 	}
 
-	if (objp->pos.xyz.x > asfieldp->max_bound.xyz.x) {
+	if (objp->pos.x > asfieldp->max_bound.x) {
 		return 1;
 	}
 
-	if (objp->pos.xyz.y > asfieldp->max_bound.xyz.y) {
+	if (objp->pos.y > asfieldp->max_bound.y) {
 		return 1;
 	}
 
-	if (objp->pos.xyz.z > asfieldp->max_bound.xyz.z) {
+	if (objp->pos.z > asfieldp->max_bound.z) {
 		return 1;
 	}
 
 	// check against inner bound
 	if (asfieldp->has_inner_bound) {
-		if ( (objp->pos.xyz.x > asfieldp->inner_min_bound.xyz.x) && (objp->pos.xyz.x < asfieldp->inner_max_bound.xyz.x)
-		  && (objp->pos.xyz.y > asfieldp->inner_min_bound.xyz.y) && (objp->pos.xyz.y < asfieldp->inner_max_bound.xyz.y)
-		  && (objp->pos.xyz.z > asfieldp->inner_min_bound.xyz.z) && (objp->pos.xyz.z < asfieldp->inner_max_bound.xyz.z) ) {
+		if ( (objp->pos.x > asfieldp->inner_min_bound.x) && (objp->pos.x < asfieldp->inner_max_bound.x)
+		  && (objp->pos.y > asfieldp->inner_min_bound.y) && (objp->pos.y < asfieldp->inner_max_bound.y)
+		  && (objp->pos.z > asfieldp->inner_min_bound.z) && (objp->pos.z < asfieldp->inner_max_bound.z) ) {
 
 			return 1;
 		}
@@ -922,28 +902,28 @@ int asteroid_should_wrap(object *objp, asteroid_field *asfieldp)
 // Wrap an asteroid from one end of the asteroid field to the other
 void asteroid_wrap_pos(object *objp, asteroid_field *asfieldp)
 {
-	if (objp->pos.xyz.x < asfieldp->min_bound.xyz.x) {
-		objp->pos.xyz.x = asfieldp->max_bound.xyz.x + (objp->pos.xyz.x - asfieldp->min_bound.xyz.x);
+	if (objp->pos.x < asfieldp->min_bound.x) {
+		objp->pos.x = asfieldp->max_bound.x + (objp->pos.x - asfieldp->min_bound.x);
 	}
 
-	if (objp->pos.xyz.y < asfieldp->min_bound.xyz.y) {
-		objp->pos.xyz.y = asfieldp->max_bound.xyz.y + (objp->pos.xyz.y - asfieldp->min_bound.xyz.y);
+	if (objp->pos.y < asfieldp->min_bound.y) {
+		objp->pos.y = asfieldp->max_bound.y + (objp->pos.y - asfieldp->min_bound.y);
 	}
 	
-	if (objp->pos.xyz.z < asfieldp->min_bound.xyz.z) {
-		objp->pos.xyz.z = asfieldp->max_bound.xyz.z + (objp->pos.xyz.z - asfieldp->min_bound.xyz.z);
+	if (objp->pos.z < asfieldp->min_bound.z) {
+		objp->pos.z = asfieldp->max_bound.z + (objp->pos.z - asfieldp->min_bound.z);
 	}
 
-	if (objp->pos.xyz.x > asfieldp->max_bound.xyz.x) {
-		objp->pos.xyz.x = asfieldp->min_bound.xyz.x + (objp->pos.xyz.x - asfieldp->max_bound.xyz.x);
+	if (objp->pos.x > asfieldp->max_bound.x) {
+		objp->pos.x = asfieldp->min_bound.x + (objp->pos.x - asfieldp->max_bound.x);
 	}
 
-	if (objp->pos.xyz.y > asfieldp->max_bound.xyz.y) {
-		objp->pos.xyz.y = asfieldp->min_bound.xyz.y + (objp->pos.xyz.y - asfieldp->max_bound.xyz.y);
+	if (objp->pos.y > asfieldp->max_bound.y) {
+		objp->pos.y = asfieldp->min_bound.y + (objp->pos.y - asfieldp->max_bound.y);
 	}
 
-	if (objp->pos.xyz.z > asfieldp->max_bound.xyz.z) {
-		objp->pos.xyz.z = asfieldp->min_bound.xyz.z + (objp->pos.xyz.z - asfieldp->max_bound.xyz.z);
+	if (objp->pos.z > asfieldp->max_bound.z) {
+		objp->pos.z = asfieldp->min_bound.z + (objp->pos.z - asfieldp->max_bound.z);
 	}
 
 	// wrap on inner bound, check all 3 axes as needed, use of rand ok for multiplayer with send_asteroid_throw()
@@ -982,9 +962,9 @@ void asteroid_aim_at_target(object *objp, object *asteroid_objp, float delta_tim
 	vm_vec_rand_vec_quick(&rand_vec);
 	vm_vec_scale_add2(&predicted_center_pos, &rand_vec, objp->radius/2.0f);
 
-	vm_vec_add2(&rand_vec, &objp->orient.vec.fvec);
+	vm_vec_add2(&rand_vec, &objp->orient.fvec);
 	if (vm_vec_mag_quick(&rand_vec) < 0.1f)
-		vm_vec_add2(&rand_vec, &objp->orient.vec.rvec);
+		vm_vec_add2(&rand_vec, &objp->orient.rvec);
 	vm_vec_normalize(&rand_vec);
 
 	speed = Asteroid_info[0].max_speed * (frand()/2.0f + 0.5f);
@@ -1037,11 +1017,9 @@ void maybe_throw_asteroid(int count)
 					// this line gives too many collision pairs.
 					// asteroid_update_collide(objp);
 
-#ifndef NO_NETWORK
 					if ( MULTIPLAYER_MASTER ) {
 						send_asteroid_throw( objp );
 					}
-#endif
 				}
 			}
 
@@ -1093,7 +1071,7 @@ void asteroid_maybe_reposition(object *objp, asteroid_field *asfieldp)
 
 			// only wrap if player won't see asteroid disappear/reverse direction
 			dist = vm_vec_normalized_dir(&vec_to_asteroid, &objp->pos, &Eye_position);
-			dot = vm_vec_dot(&Eye_matrix.vec.fvec, &vec_to_asteroid);
+			dot = vm_vec_dot(&Eye_matrix.fvec, &vec_to_asteroid);
 			
 			if ((dot < 0.7f) || (dist > 3000.0f)) {
 				if (Num_asteroids > MAX_ASTEROIDS-10) {
@@ -1104,7 +1082,7 @@ void asteroid_maybe_reposition(object *objp, asteroid_field *asfieldp)
 					Asteroids[objp->instance].target_objnum = -1;
 
 					vm_vec_normalized_dir(&vec_to_asteroid, &objp->pos, &Eye_position);
-					dot = vm_vec_dot(&Eye_matrix.vec.fvec, &vec_to_asteroid);
+					dot = vm_vec_dot(&Eye_matrix.fvec, &vec_to_asteroid);
 					dist = vm_vec_dist_quick(&objp->pos, &Eye_position);
 					
 					if (( dot > 0.7f) && (dist < 3000.0f)) {
@@ -1120,10 +1098,8 @@ void asteroid_maybe_reposition(object *objp, asteroid_field *asfieldp)
 
 					asteroid_update_collide(objp);
 
-#ifndef NO_NETWORK
 					if ( MULTIPLAYER_MASTER )
 						send_asteroid_throw( objp );
-#endif
 				}
 			}
 		}
@@ -1143,12 +1119,12 @@ void asteroid_process_pre( object *objp, float frame_time)
 		v = &objp->phys_info.vel;
 		vv = &objp->phys_info.desired_vel;
 
-		//nprintf(("AI", "Frm %i: Obj #%2i: Hull: %5.1f Vel: %5.1f %5.1f %5.1f Des: %5.1f %5.1f %5.1f\n", Framecount, objp-Objects, objp->hull_strength, v->xyz.x, v->xyz.y, v->xyz.z, vv->xyz.x, vv->xyz.y, vv->xyz.z));
+		//nprintf(("AI", "Frm %i: Obj #%2i: Hull: %5.1f Vel: %5.1f %5.1f %5.1f Des: %5.1f %5.1f %5.1f\n", Framecount, objp-Objects, objp->hull_strength, v->x, v->y, v->z, vv->x, vv->y, vv->z));
 
 		//	Make vel chase desired_vel
-		lerp(&objp->phys_info.vel.xyz.x, objp->phys_info.vel.xyz.x, objp->phys_info.desired_vel.xyz.x, flFrametime);
-		lerp(&objp->phys_info.vel.xyz.y, objp->phys_info.vel.xyz.y, objp->phys_info.desired_vel.xyz.y, flFrametime);
-		lerp(&objp->phys_info.vel.xyz.z, objp->phys_info.vel.xyz.z, objp->phys_info.desired_vel.xyz.z, flFrametime);
+		lerp(&objp->phys_info.vel.x, objp->phys_info.vel.x, objp->phys_info.desired_vel.x, flFrametime);
+		lerp(&objp->phys_info.vel.y, objp->phys_info.vel.y, objp->phys_info.desired_vel.y, flFrametime);
+		lerp(&objp->phys_info.vel.z, objp->phys_info.vel.z, objp->phys_info.desired_vel.z, flFrametime);
 	}
 }
 
@@ -1268,8 +1244,7 @@ int asteroid_check_collision(object *pasteroid, object *other_obj, vector *hitpo
 				pm = model_get(Ships[heavy_obj->instance].modelnum);
 
 				// turn off all rotating submodels and test for collision
-				int i;
-				for (i=0; i<num_rotating_submodels; i++) {
+				for (int i=0; i<num_rotating_submodels; i++) {
 					pm->submodel[submodel_list[i]].blown_off = 1;
 				}
 
@@ -1586,11 +1561,9 @@ void asteroid_hit( object * asteroid_obj, object * other_obj, vector * hitpos, f
 		return;
 	}
 
-#ifndef NO_NETWORK
 	if ( MULTIPLAYER_MASTER ){
 		send_asteroid_hit( asteroid_obj, other_obj, hitpos, damage );
 	}
-#endif
 
 	asteroid_obj->hull_strength -= damage;
 
@@ -1725,9 +1698,8 @@ void asteroid_maybe_break_up(object *asteroid_obj)
 
 		// multiplayer clients won't go through the following code.  asteroid_sub_create will send
 		// a create packet to the client in the above named function
-#ifndef NO_NETWORK
 		if ( !MULTIPLAYER_CLIENT ) {
-#endif
+
 			switch (asp->type) {
 			case ASTEROID_TYPE_SMALL:
 				break;
@@ -1774,9 +1746,7 @@ void asteroid_maybe_break_up(object *asteroid_obj)
 			default:
 				Int3();
 			}
-#ifndef NO_NETWORK
 		}
-#endif
 
 		asp->final_death_time = timestamp(-1);
 	}
@@ -1880,12 +1850,10 @@ void asteroid_update_collide_flag(object *asteroid_objp)
 	asp->collide_objnum = -1;
 	asp->collide_objsig = -1;
 
-#ifndef NO_NETWORK
 	// multiplayer dogfight
 	if((Game_mode & GM_MULTIPLAYER) && (Netgame.type_flags & NG_TYPE_DOGFIGHT)){
 		return;
 	}
-#endif
 
 	num_escorts = hud_escort_num_ships_on_list();
 
@@ -2102,12 +2070,12 @@ int set_asteroid_throw_objnum()
 		float		radius = ship_objp->radius*2.0f;
 
 		if (Ship_info[Ships[ship_objp->instance].ship_info_index].flags & (SIF_HUGE_SHIP | SIF_BIG_SHIP)) {
-			if (ship_objp->pos.xyz.x + radius > Asteroid_field.min_bound.xyz.x)
-				if (ship_objp->pos.xyz.y + radius > Asteroid_field.min_bound.xyz.y)
-				if (ship_objp->pos.xyz.z + radius > Asteroid_field.min_bound.xyz.z)
-				if (ship_objp->pos.xyz.x - radius < Asteroid_field.max_bound.xyz.x)
-				if (ship_objp->pos.xyz.y - radius < Asteroid_field.max_bound.xyz.y)
-				if (ship_objp->pos.xyz.z - radius < Asteroid_field.max_bound.xyz.z)
+			if (ship_objp->pos.x + radius > Asteroid_field.min_bound.x)
+				if (ship_objp->pos.y + radius > Asteroid_field.min_bound.y)
+				if (ship_objp->pos.z + radius > Asteroid_field.min_bound.z)
+				if (ship_objp->pos.x - radius < Asteroid_field.max_bound.x)
+				if (ship_objp->pos.y - radius < Asteroid_field.max_bound.y)
+				if (ship_objp->pos.z - radius < Asteroid_field.max_bound.z)
 				if (!asteroid_in_inner_bound(&Asteroid_field, &ship_objp->pos, radius))
 					return so->objnum;
 		}

fs2_open/code/asteroid/asteroid.h

@@ -9,19 +9,13 @@
 
 /*
  * $Logfile: /Freespace2/code/Asteroid/Asteroid.h $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:56 $
  * $Author: penguin $
  *
  * Header file for asteroids
  *
  * $Log: not supported by cvs2svn $
- * Revision 2.0  2002/06/03 04:02:21  penguin
- * Warpcore CVS sync
- *
- * Revision 1.2  2002/05/03 22:07:08  mharris
- * got some stuff to compile
- *
  * Revision 1.1  2002/05/02 18:03:04  mharris
  * Initial checkin - converted filenames and includes to lower case
  *
@@ -125,8 +119,8 @@
 #ifndef __ASTEROID_H__
 #define __ASTEROID_H__
 
-#include "ship/ship.h"
-#include "parse/parselo.h"		// for NAME_LENGTH
+#include "ship.h"
+#include "parselo.h"		// for NAME_LENGTH
 
 struct object;
 struct polymodel;
@@ -210,13 +204,13 @@ typedef	struct asteroid {
 typedef enum {
 	DG_ASTEROID,
 	DG_SHIP
-} debris_genre_t;
+} debris_genre;
 
 // TYPEDEF FOR FIELD TYPE
 typedef enum {
 	FT_ACTIVE,
 	FT_PASSIVE
-} field_type_t;
+} field_type;
 
 #define	MAX_ACTIVE_DEBRIS_TYPES	3
 
@@ -229,8 +223,8 @@ typedef	struct asteroid_field {
 	vector	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
-	debris_genre_t	debris_genre;		// type of debris (ship or asteroid)  [generic type]
+	field_type		field_type;			// active throws and wraps, passive does not
+	debris_genre	debris_genre;		// type of debris (ship or asteroid)  [generic type]
 	int				field_debris_type[MAX_ACTIVE_DEBRIS_TYPES];	// one of the debris type defines above
 } asteroid_field;
 

fs2_open/code/bmpman/bmpman.cpp

@@ -9,57 +9,13 @@
 
 /*
  * $Logfile: /Freespace2/code/Bmpman/BmpMan.cpp $
- * $Revision: 2.11 $
- * $Date: 2003-01-19 01:07:41 $
- * $Author: bobboau $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:56 $
+ * $Author: penguin $
  *
  * Code to load and manage all bitmaps for the game
  *
  * $Log: not supported by cvs2svn $
- * Revision 2.10  2003/01/18 19:55:16  phreak
- * fixed around the bmpman system to now accept compressed textures
- *
- * Revision 2.9  2003/01/09 22:23:38  inquisitor
- * Rollback to 2.7 to fix glow code issue that phreak noticed.
- * -Quiz
- *
- * Revision 2.7  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.6  2002/12/02 23:26:08  Goober5000
- * fixed misspelling
- *
- * Revision 2.5  2002/12/02 20:46:41  Goober5000
- * fixed misspelling of "category" as "catagory"
- *
- * Revision 2.4  2002/11/22 20:55:27  phreak
- * changed around some page-in functions to work with opengl
- * changed bm_set_components_opengl
- * -phreak
- *
- * Revision 2.3  2002/11/18 21:27:13  phreak
- * added bm_select_components functions for OpenGL -phreak
- *
- * 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
- *
- * Revision 2.0  2002/06/03 04:02:21  penguin
- * Warpcore CVS sync
- *
- * Revision 1.4  2002/05/21 15:36:25  mharris
- * Added ifdef WIN32
- *
- * Revision 1.3  2002/05/09 13:49:30  mharris
- * Added ifndef NO_DIRECT3D
- *
- * Revision 1.2  2002/05/03 22:07:08  mharris
- * got some stuff to compile
- *
  * Revision 1.1  2002/05/02 18:03:04  mharris
  * Initial checkin - converted filenames and includes to lower case
  *
@@ -279,7 +235,7 @@
  * Added code to print the number of bitmap slots in use between levels.
  * 
  * 82    2/16/98 3:54p John
- * Changed a bunch of mprintfs to categorize to BmpInfo
+ * Changed a bunch of mprintfs to catagorize to BmpInfo
  * 
  * 81    2/13/98 5:00p John
  * Made user bitmaps not get wrote to level cache file.
@@ -505,32 +461,25 @@
  * $NoKeywords: $
  */
 
-#include <ctype.h>
-#include "globalincs/pstypes.h"
-#include "pcxutils/pcxutils.h"
-#include "bmpman/bmpman.h"
-#include "palman/palman.h"
-#include "graphics/2d.h"
-#include "anim/animplay.h"
-#include "io/timer.h"
-#include "globalincs/systemvars.h"
-#include "io/key.h"
-#include "anim/packunpack.h"
-#include "cfile/cfile.h"
-#include "graphics/grinternal.h"
-#include "tgautils/tgautils.h"
-#include "ship/ship.h"
-#include "ddsutils/ddsutils.h"
+#include "pstypes.h"
+#include "pcxutils.h"
+#include "bmpman.h"
+#include "palman.h"
+#include "2d.h"
+#include "animplay.h"
+#include "timer.h"
+#include "systemvars.h"
+#include "key.h"
+#include "packunpack.h"
+#include "cfile.h"
+#include "grinternal.h"
+#include "tgautils.h"
+#include "ship.h"
 
 #ifndef NDEBUG
 #define BMPMAN_NDEBUG
 #endif
 
-extern int Texture_compression_enabled;
-
-int GLOWMAP = -1;
-
-
 // keep this defined to use per-ship nondarkening pixels
 #define BMPMAN_SPECIAL_NONDARK
 
@@ -541,9 +490,6 @@ int bm_inited = 0;
 #define	BM_TYPE_USER		2
 #define	BM_TYPE_ANI			3		// in-house ANI format
 #define	BM_TYPE_TGA			4		// 16 bit targa
-#define BM_TYPE_DXT1		5		// 24 bit with switchable alpha		(compressed)
-#define BM_TYPE_DXT3		6		// 32 bit with 4 bit alpha			(compressed)
-#define BM_TYPE_DXT5		7		// 32 bit with 8 bit alpha			(compressed)
 
 typedef union bm_extra_info	{
 	struct {
@@ -582,7 +528,6 @@ typedef struct bitmap_entry	{
 	// Data for animations and user bitmaps
 	bm_extra_info	info;		
 
-	int mem_taken;											//how much memory it takes up
 #ifdef BMPMAN_NDEBUG
 	// bookeeping
 	ubyte		used_last_frame;							// If set, then it was used last frame
@@ -790,6 +735,8 @@ void bm_init()
 		#endif
 		bm_free_data(i);  	// clears flags, bbp, data, etc
 	}
+
+
 }
 
 #ifdef BMPMAN_NDEBUG
@@ -884,10 +831,10 @@ int bm_create( int bpp, int w, int h, void * data, int flags )
 	bm_bitmaps[n].type = BM_TYPE_USER;
 	bm_bitmaps[n].palette_checksum = 0;
 
-	bm_bitmaps[n].bm.w = (short) w;
-	bm_bitmaps[n].bm.h = (short) h;
-	bm_bitmaps[n].bm.rowsize = (short) w;
-	bm_bitmaps[n].bm.bpp = (unsigned char) bpp;
+	bm_bitmaps[n].bm.w = short(w);
+	bm_bitmaps[n].bm.h = short(h);
+	bm_bitmaps[n].bm.rowsize = short(w);
+	bm_bitmaps[n].bm.bpp = unsigned char(bpp);
 	bm_bitmaps[n].bm.flags = 0;
 	bm_bitmaps[n].bm.flags |= flags;
 	bm_bitmaps[n].bm.data = 0;
@@ -936,15 +883,16 @@ int bm_load_sub(char *real_filename, char *ext, int *handle)
 	}
 
 	// try and find the file
+	/*
 	CFILE *test = cfopen(filename, "rb");
 	if(test != NULL){
 		cfclose(test);
 		return 0;
 	}
-	
+	*/
 
 	// could not be found
-	return -1;
+	return 0;
 }
 
 // This loads a bitmap so we can draw with it later.
@@ -958,10 +906,8 @@ int bm_load( char * real_filename )
 	int w, h, bpp;
 	char filename[MAX_FILENAME_LEN];
 	int tga = 0;
-	int dds = 0;
 	int handle;
 	int found = 0;
-	unsigned char type;
 
 	if ( !bm_inited ) bm_init();
 
@@ -978,51 +924,23 @@ int bm_load( char * real_filename )
 		//Int3();
 		*p = 0;
 	}
-	
-	// try and find a compressed tex first	
-	// unless we're cant do so
-	if (Texture_compression_enabled)
-	{
-		switch(bm_load_sub(filename, ".dds", &handle)){
-		// error
-		case -1:
-			break;
-
-		// found as a file
-		case 0:
-			found = 1;
-			dds=1;
-			strcat(filename, ".dds");
-			break;
-
-		// found as pre-existing
-		case 1:
-			found = 1;
-			return handle;		
-		}
-	}
 	 
-	if (!found)
-	{
+	// try and find the pcx file		
+	switch(bm_load_sub(filename, ".pcx", &handle)){
+	// error
+	case -1:
+		break;
 
-		// try and find the pcx file		
-		switch(bm_load_sub(filename, ".pcx", &handle)){
-		// error
-		case -1:
-			break;
-	
-		// found as a file
-		case 0:
-			found = 1;
-			strcat(filename, ".pcx");
-			break;
+	// found as a file
+	case 0:
+		found = 1;
+		strcat(filename, ".pcx");
+		break;
 
-
-			// found as pre-existing
+	// found as pre-existing
 	case 1:
 		found = 1;
 		return handle;		
-		}
 	}
 
 	if(!found){
@@ -1045,45 +963,13 @@ int bm_load( char * real_filename )
 		}
 	}
 
-	
-	if (dds)
-	{
-		int ct;
-		int dds_error=dds_read_header ( filename, &w,  &h, &bpp, &ct);
-		if (dds_error != DDS_ERROR_NONE)
-		{
-			mprintf(("Couldn't open '%s -- error description %s\n", filename, dds_error_string(dds_error)));
-			return -1;
-		}
-		mprintf(("Found a .dds file! %s\n", filename));
-		switch (ct)
-		{
-			case DDS_DXT1:
-				type=BM_TYPE_DXT1;
-				break;
-
-			case DDS_DXT3:
-				type=BM_TYPE_DXT3;
-				break;
-
-			case DDS_DXT5:
-				type=BM_TYPE_DXT5;
-				break;
-
-			default:
-				Error(LOCATION, "bad DDS file compression.  Not using DXT1,3,5 %s", filename);
-				return -1;
-		}
-	}
-
 	// if its a tga file
-	else if(tga){
+	if(tga){
 		int tga_error=targa_read_header( filename, &w, &h, &bpp, NULL );
 		if ( tga_error != TARGA_ERROR_NONE )	{
 			mprintf(( "Couldn't open '%s'\n", filename ));
 			return -1;
 		}
-		type = BM_TYPE_TGA;
 	}
 	// if its a pcx file
 	else {
@@ -1092,7 +978,6 @@ int bm_load( char * real_filename )
 			mprintf(( "Couldn't open '%s'\n", filename ));
 			return -1;
 		}
-		type=BM_TYPE_PCX;
 	}
 
 	// Error( LOCATION, "Unknown bitmap type %s\n", filename );
@@ -1118,7 +1003,7 @@ int bm_load( char * real_filename )
 	
 	// Mark the slot as filled, because cf_read might load a new bitmap
 	// into this slot.
-	bm_bitmaps[n].type = type;
+	bm_bitmaps[n].type = tga ? (ubyte)BM_TYPE_TGA : (ubyte)BM_TYPE_PCX;
 	bm_bitmaps[n].signature = Bm_next_signature++;
 	Assert ( strlen(filename) < MAX_FILENAME_LEN );
 	strncpy(bm_bitmaps[n].filename, filename, MAX_FILENAME_LEN-1 );
@@ -1427,7 +1312,7 @@ static void bm_convert_format( int bitmapnum, bitmap *bmp, ubyte bpp, ubyte flag
 					g /= Gr_t_green.scale;
 					b /= Gr_t_blue.scale;
 					a /= Gr_t_alpha.scale;
-					((ushort*)bmp->data)[idx] = (unsigned short)((a<<Gr_t_alpha.shift) | (r << Gr_t_red.shift) | (g << Gr_t_green.shift) |	(b << Gr_t_blue.shift));
+					((ushort*)bmp->data)[idx] = unsigned short((a<<Gr_t_alpha.shift) | (r << Gr_t_red.shift) | (g << Gr_t_green.shift) |	(b << Gr_t_blue.shift));
 					break;
 				default:
 					Int3();
@@ -1769,35 +1654,6 @@ void bm_lock_tga( int handle, int bitmapnum, bitmap_entry *be, bitmap *bmp, ubyt
 	bm_convert_format( bitmapnum, bmp, bpp, flags );
 }
 
-//lock a dds file
-void bm_lock_dds( int handle, int bitmapnum, bitmap_entry *be, bitmap *bmp, ubyte bpp, ubyte flags )
-{
-	uint data;
-	int size;
-	int error;
-
-	Assert(Texture_compression_enabled);
-	Assert(&be->bm == bmp);
-	#ifdef BMPMAN_NDEBUG
-	Assert( be->data_size > 0 );
-	#endif
-
-	//data is malloc'ed in the function
-	error=dds_read_bitmap( be->filename, &size, &data );
-	if (error != DDS_ERROR_NONE)
-	{
-		Error(LOCATION, "error loading %s -- %s", be->filename, dds_error_string(error));
-	}
-
-	bmp->bpp=bpp;
-	bmp->data=data;
-	bmp->flags =0;
-	be->mem_taken=size;
-
-}
-
-
-
 MONITOR( NumBitmapPage );
 MONITOR( SizeBitmapPage );
 
@@ -1831,19 +1687,9 @@ bitmap * bm_lock( int handle, ubyte bpp, ubyte flags )
 		} else {
 			if(flags & BMP_AABITMAP){
 				Assert( bpp == 8 );
-			} else if ((flags & BMP_TEX_NONCOMP) && (!(flags & BMP_TEX_COMP))) {
+			} else {
 				Assert( bpp == 16 );
 			}
-			else if (flags & BMP_TEX_DXT1){
-				Assert(bpp==24);
-			}
-			else if (flags & (BMP_TEX_DXT3 | BMP_TEX_DXT5)){
-				Assert(bpp==32);
-			}
-			else
-			{
-				Assert(0);		//?
-			}
 		}
 	}
 
@@ -1872,11 +1718,11 @@ bitmap * bm_lock( int handle, ubyte bpp, ubyte flags )
 	int pal_changed = 0;
 	int rle_changed = 0;
 	int fake_xparent_changed = 0;	
-	if ( (bmp->data == 0) || (bpp != bmp->bpp) || pal_changed || rle_changed || fake_xparent_changed ) {
+	if ( (bmp->data == NULL) || (bpp != bmp->bpp) || pal_changed || rle_changed || fake_xparent_changed ) {
 		Assert(be->ref_count == 1);
 
 		if ( be->type != BM_TYPE_USER ) {
-			if ( bmp->data == 0 ) {
+			if ( bmp->data == NULL ) {
 				nprintf (("BmpMan","Loading %s for the first time.\n", be->filename));
 			} else if ( bpp != bmp->bpp ) {
 				nprintf (("BmpMan","Reloading %s from bitdepth %d to bitdepth %d\n", be->filename, bmp->bpp, bpp));
@@ -1926,12 +1772,6 @@ bitmap * bm_lock( int handle, ubyte bpp, ubyte flags )
 			bm_lock_tga( handle, bitmapnum, be, bmp, bpp, flags );
 			break;
 
-		case BM_TYPE_DXT1:
-		case BM_TYPE_DXT3:
-		case BM_TYPE_DXT5:
-			bm_lock_dds( handle, bitmapnum, be, bmp, bpp, flags );
-			break;
-
 		default:
 			Warning(LOCATION, "Unsupported type in bm_lock -- %d\n", be->type );
 			return NULL;
@@ -2194,8 +2034,6 @@ DCF(bmpman,"Shows/changes bitmap caching parameters and usage")
 	}
 }
 
-extern int OGL_inited;
-
 // Marks a texture as being used for this level
 void bm_page_in_texture( int bitmapnum, int nframes )
 {
@@ -2205,27 +2043,7 @@ void bm_page_in_texture( int bitmapnum, int nframes )
 
 		bm_bitmaps[n+i].preloaded = 1;
 
-		//check if its compressed
-		if (OGL_inited)
-		{
-			switch (bm_bitmaps[n+i].type)
-			{
-				case BM_TYPE_DXT1:
-					bm_bitmaps[n+i].used_flags = BMP_TEX_DXT1;
-					continue;
-				
-				case BM_TYPE_DXT3:
-					bm_bitmaps[n+i].used_flags = BMP_TEX_DXT3;
-					continue;
-
-				case BM_TYPE_DXT5:
-					bm_bitmaps[n+i].used_flags = BMP_TEX_DXT5;
-					continue;
-				
-			}
-
-		}
-		if ( D3D_enabled || OGL_inited )	{
+		if ( D3D_enabled )	{
 			bm_bitmaps[n+i].used_flags = BMP_TEX_OTHER;
 		} else {			
 			bm_bitmaps[n+i].used_flags = 0;
@@ -2243,7 +2061,7 @@ void bm_page_in_nondarkening_texture( int bitmapnum, int nframes )
 
 		bm_bitmaps[n+i].preloaded = 4;
 
-		if ( D3D_enabled || OGL_inited )	{			
+		if ( D3D_enabled )	{			
 			bm_bitmaps[n+i].used_flags = BMP_TEX_NONDARK;
 		} else {
 			bm_bitmaps[n+i].used_flags = 0;
@@ -2262,26 +2080,7 @@ void bm_page_in_xparent_texture( int bitmapnum, int nframes)
 
 		bm_bitmaps[n+i].preloaded = 3;
 
-		//check if its compressed
-		if (OGL_inited)
-		{
-			switch (bm_bitmaps[n+i].type)
-			{
-				case BM_TYPE_DXT1:
-					bm_bitmaps[n+i].used_flags = BMP_TEX_DXT1;
-					continue;
-					
-				case BM_TYPE_DXT3:
-					bm_bitmaps[n+i].used_flags = BMP_TEX_DXT3;
-					continue;
-
-				case BM_TYPE_DXT5:
-					bm_bitmaps[n+i].used_flags = BMP_TEX_DXT5;
-					continue;
-			}
-
-		}
-		if ( D3D_enabled || OGL_inited )	{
+		if ( D3D_enabled )	{
 			// bm_bitmaps[n+i].used_flags = BMP_NO_PALETTE_MAP;
 			bm_bitmaps[n+i].used_flags = BMP_TEX_XPARENT;
 		} else {
@@ -2300,7 +2099,7 @@ void bm_page_in_aabitmap( int bitmapnum, int nframes )
 
 		bm_bitmaps[n+i].preloaded = 2;
 	
-		if ( D3D_enabled || OGL_inited )	{
+		if ( D3D_enabled )	{
 			bm_bitmaps[n+i].used_flags = BMP_AABITMAP;
 		} else {
 			bm_bitmaps[n+i].used_flags = 0;
@@ -2331,10 +2130,8 @@ void bm_page_in_start()
 
 }
 
-#ifndef NO_DIRECT3D
 extern void gr_d3d_preload_init();
 extern int gr_d3d_preload(int bitmap_num, int is_aabitmap );
-#endif
 
 void bm_page_in_stop()
 {	
@@ -2350,10 +2147,9 @@ void bm_page_in_stop()
 	Bm_ram_freed = 0;
 	#endif
 
-#ifndef NO_DIRECT3D
 	int d3d_preloading = 1;
+
 	gr_d3d_preload_init();
-#endif
 
 	for (i = 0; i < MAX_BITMAPS; i++)	{
 		if ( bm_bitmaps[i].type != BM_TYPE_NONE )	{
@@ -2381,14 +2177,12 @@ void bm_page_in_stop()
 				}
 				bm_unlock( bm_bitmaps[i].handle );
 
-#ifndef NO_DIRECT3D
 				if ( d3d_preloading )	{
 					if ( !gr_d3d_preload(bm_bitmaps[i].handle, (bm_bitmaps[i].preloaded==2) ) )	{
 						mprintf(( "Out of VRAM.  Done preloading.\n" ));
 						d3d_preloading = 0;
 					}
 				}
-#endif
 
 				n++;
 				#ifdef BMPMAN_NDEBUG
@@ -2423,10 +2217,7 @@ int bm_get_cache_slot( int bitmap_id, int separate_ani_frames )
 {
 	int n = bitmap_id % MAX_BITMAPS;
 
-	if( bm_bitmaps[n].handle != bitmap_id ){//this should rightfully squash the invalid bitmap handel bug for the glow mapping
-		mprintf(("bitmap handel %d is not equil to bitmap id %d",bm_bitmaps[n].handle,bitmap_id));
-		return -1;		// INVALID BITMAP HANDLE
-	}
+	Assert( bm_bitmaps[n].handle == bitmap_id );		// INVALID BITMAP HANDLE
 
 	bitmap_entry	*be = &bm_bitmaps[n];
 
@@ -2447,9 +2238,7 @@ void bm_24_to_16(int bit_24, ushort *bit_16)
 	bm_set_components((ubyte*)bit_16, (ubyte*)&pixel[0], (ubyte*)&pixel[1], (ubyte*)&pixel[2], &alpha);	
 }
 
-#ifndef NO_DIRECT3D
 extern int D3D_32bit;
-#endif
 
 void (*bm_set_components)(ubyte *pixel, ubyte *r, ubyte *g, ubyte *b, ubyte *a) = NULL;
 
@@ -2522,22 +2311,6 @@ void bm_set_components_argb_d3d_32_tex(ubyte *pixel, ubyte *rv, ubyte *gv, ubyte
 	}
 }
 
-void bm_set_components_opengl(ubyte *pixel, ubyte *rv, ubyte *gv, ubyte *bv, ubyte *av)
-{
-	// rgba 
-	*((ushort*)pixel) |= (ushort)(( (int)*rv / Gr_current_red->scale ) << Gr_current_red->shift);
-	*((ushort*)pixel) |= (ushort)(( (int)*gv / Gr_current_green->scale ) << Gr_current_green->shift);
-	*((ushort*)pixel) |= (ushort)(( (int)*bv / Gr_current_blue->scale ) << Gr_current_blue->shift);
-	*((ushort*)pixel) &= ~(0x8000);
-	if (*((ushort*)pixel) == (ushort)Gr_current_green->mask) {
-		*((ushort*)pixel) = 0;
-	} else {
-		if(*av){
-			*((ushort*)pixel) |= 0x8000;
-		}
-	}
-}
-
 // for selecting pixel formats
 void BM_SELECT_SCREEN_FORMAT()
 {
@@ -2547,34 +2320,19 @@ void BM_SELECT_SCREEN_FORMAT()
 	Gr_current_alpha = &Gr_alpha;
 
 	// setup pointers
-#ifdef _WIN32
 	if(gr_screen.mode == GR_GLIDE){
 		bm_set_components = bm_set_components_argb;
 	} else if(gr_screen.mode == GR_DIRECT3D){
 		if(Bm_pixel_format == BM_PIXEL_FORMAT_D3D){
 			bm_set_components = bm_set_components_d3d;
 		} else {
-#ifndef NO_DIRECT3D
 			if(D3D_32bit){
 				bm_set_components = bm_set_components_argb_d3d_32_screen;
 			} else {
 				bm_set_components = bm_set_components_argb_d3d_16_screen;
 			}
-#else
-			bm_set_components = bm_set_components_argb_d3d_16_screen;
-#endif  // ifndef NO_DIRECT3D
 		}
 	}
-
-#ifdef USE_OPENGL
-	else if (gr_screen.mode == GR_OPENGL)
-	{
-		bm_set_components = bm_set_components_opengl;
-	}
-#endif	
-#else
-	bm_set_components = bm_set_components_argb_d3d_16_screen;
-#endif  // ifdef WIN32
 }
 
 void BM_SELECT_TEX_FORMAT()
@@ -2585,33 +2343,19 @@ void BM_SELECT_TEX_FORMAT()
 	Gr_current_alpha = &Gr_t_alpha;
 
 	// setup pointers
-#ifdef _WIN32
 	if(gr_screen.mode == GR_GLIDE){
 		bm_set_components = bm_set_components_argb;
 	} else if(gr_screen.mode == GR_DIRECT3D){
 		if(Bm_pixel_format == BM_PIXEL_FORMAT_D3D){
 			bm_set_components = bm_set_components_d3d;
 		} else {
-#ifndef NO_DIRECT3D
 			if(D3D_32bit){
 				bm_set_components = bm_set_components_argb_d3d_32_tex;
 			} else {
 				bm_set_components = bm_set_components_argb_d3d_16_tex;
 			}
-#else
-			bm_set_components = bm_set_components_argb_d3d_16_tex;
-#endif
 		}
 	}
-#ifdef USE_OPENGL
-	else if (gr_screen.mode == GR_OPENGL)
-	{
-		bm_set_components = bm_set_components_opengl;
-	}
-#endif	
-#else
-	bm_set_components = bm_set_components_argb_d3d_16_tex;
-#endif  // ifdef WIN32
 }
 
 void BM_SELECT_ALPHA_TEX_FORMAT()
@@ -2622,33 +2366,19 @@ void BM_SELECT_ALPHA_TEX_FORMAT()
 	Gr_current_alpha = &Gr_ta_alpha;
 
 	// setup pointers
-#ifdef _WIN32
 	if(gr_screen.mode == GR_GLIDE){
 		bm_set_components = bm_set_components_argb;
 	} else if(gr_screen.mode == GR_DIRECT3D){
 		if(Bm_pixel_format == BM_PIXEL_FORMAT_D3D){
 			bm_set_components = bm_set_components_d3d;
 		} else {
-#ifndef NO_DIRECT3D
 			if(D3D_32bit){
 				bm_set_components = bm_set_components_argb_d3d_32_tex;
 			} else {
 				bm_set_components = bm_set_components_argb_d3d_16_tex;
 			}
-#else
-			bm_set_components = bm_set_components_argb_d3d_16_tex;
-#endif
 		}
 	}
-#ifdef USE_OPENGL
-	else if (gr_screen.mode == GR_OPENGL)
-	{
-		bm_set_components = bm_set_components_opengl;
-	}
-#endif	
-#else
-	bm_set_components = bm_set_components_argb_d3d_16_tex;
-#endif  // ifdef WIN32
 }
 
 // set the rgba components of a pixel, any of the parameters can be -1
@@ -2730,12 +2460,10 @@ void bm_get_components(ubyte *pixel, ubyte *r, ubyte *g, ubyte *b, ubyte *a)
 {
 	int bit_32 = 0;
 
-#ifndef NO_DIRECT3D
 	// pick a byte size - 32 bits only if 32 bit mode d3d and screen format
 	if(D3D_32bit && (Gr_current_red == &Gr_red)){
 		bit_32 = 1;
 	}
-#endif
 
 	if(r != NULL){
 		if(bit_32){
@@ -2834,38 +2562,3 @@ void bm_get_section_size(int bitmapnum, int sx, int sy, int *w, int *h)
 	*w = sx < (sections->num_x - 1) ? MAX_BMAP_SECTION_SIZE : bw - sections->sx[sx];
 	*h = sy < (sections->num_y - 1) ? MAX_BMAP_SECTION_SIZE : bh - sections->sy[sy];										
 }
-
-int bm_is_compressed(int num)
-{
-	int n=num % MAX_BITMAPS;
-
-	//duh
-	if (!Texture_compression_enabled)
-		return 0;
-
-	Assert(num==bm_bitmaps[n].handle);
-
-	switch (bm_bitmaps[n].type)
-	{
-		case BM_TYPE_DXT1:
-			return 1;
-		case BM_TYPE_DXT3:
-			return 2;
-		case BM_TYPE_DXT5:
-			return 3;
-	}
-	return 0;
-}
-
-//needed only for compressed bitmaps
-int bm_get_size(int num)
-{
-	int n=num % MAX_BITMAPS;
-
-	if (!bm_is_compressed(num))
-		return 0;
-
-	Assert(num==bm_bitmaps[n].handle);
-
-	return bm_bitmaps[n].mem_taken;
-}

fs2_open/code/bmpman/bmpman.h

@@ -9,24 +9,13 @@
 
 /*
  * $Logfile: /Freespace2/code/Bmpman/BmpMan.h $
- * $Revision: 2.3 $
- * $Date: 2003-01-19 01:07:41 $
- * $Author: bobboau $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:56 $
+ * $Author: penguin $
  *
  * Prototypes for Bitmap Manager functions
  *
  * $Log: not supported by cvs2svn $
- * 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  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
  *
@@ -362,9 +351,4 @@ void bm_get_components(ubyte *pixel, ubyte *r, ubyte *g, ubyte *b, ubyte *a);
 // given a bitmap and a section, return the size (w, h)
 void bm_get_section_size(int bitmapnum, int sx, int sy, int *w, int *h);
 
-extern int GLOWMAP;	//this holds a reference to a map that is a fully lit version of it's index -Bobboau
-
-int bm_is_compressed(int num);
-int bm_get_size(int num);
-
 #endif

fs2_open/code/cfile/cfile.cpp

@@ -9,53 +9,13 @@
 
 /*
  * $Logfile: /Freespace2/code/CFile/cfile.cpp $
- * $Revision: 2.7 $
- * $Date: 2002-11-10 16:29:53 $
- * $Author: DTP $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:56 $
+ * $Author: penguin $
  *
  * Utilities for operating on files
  *
  * $Log: not supported by cvs2svn $
- * Revision 2.6  2002/11/04 08:32:38  DTP
- * Made sure, that VP and Plain files dont get added twice to the search order. Side-effect of Mod support.
- *
- * Revision 2.5  2002/10/30 06:31:05  DTP
- * doh!, used upper case in include, dont know how much it matters for *nix systems, but here it is
- *
- * Revision 2.4  2002/10/27 23:59:28  DTP
- * DTP; started basic implementation of mod-support
- * plain files only for now. fs2_open.exe -mod X will look for files in fs2/ X /all-legal-subdirectories. no checking/creating dirs yet. directories must be there.
- *
- * Revision 2.3  2002/08/01 01:41:04  penguin
- * The big include file move
- *
- * Revision 2.2  2002/07/29 19:04:48  penguin
- * added #ifdef _WIN32 around windows-specific system headers
- *
- * 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.7  2002/05/21 15:37:14  mharris
- * Cosmetics - reformat Pathtypes to line up again
- *
- * Revision 1.6  2002/05/17 06:45:53  mharris
- * More porting tweaks.  It links!  but segfaults...
- *
- * Revision 1.5  2002/05/17 02:56:19  mharris
- * first crack at unix compatibity
- *
- * Revision 1.4  2002/05/16 06:03:29  mharris
- * Unix port changes
- *
- * Revision 1.3  2002/05/09 22:58:08  mharris
- * Added ifdef WIN32 around change-drive functions
- *
- * Revision 1.2  2002/05/07 13:23:17  mharris
- * Port tweaks
- *
  * Revision 1.1  2002/05/02 18:03:04  mharris
  * Initial checkin - converted filenames and includes to lower case
  *
@@ -204,31 +164,21 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include <errno.h>
-
-#ifdef _WIN32
 #include <io.h>
 #include <direct.h>
+#include <errno.h>
 #include <windows.h>
 #include <winbase.h>		/* needed for memory mapping of file functions */
-#endif
 
-#ifdef unix
-#include <sys/stat.h>
-#include <glob.h>
-#include <sys/mman.h>
-#endif
-
-#include "cmdline/cmdline.h"
-#include "globalincs/pstypes.h"
-#include "cfile/cfile.h"
-#include "parse/encrypt.h"
+#include "pstypes.h"
+#include "cfile.h"
+#include "encrypt.h"
 //#include "outwnd.h"
 //#include "vecmat.h"
 //#include "timer.h"
-#include "cfile/cfilesystem.h"
-#include "cfile/cfilearchive.h"
-#include "osapi/osapi.h"
+#include "cfilesystem.h"
+#include "cfilearchive.h"
+#include "osapi.h"
 
 char Cfile_root_dir[CFILE_ROOT_DIRECTORY_LEN] = "";
 
@@ -236,47 +186,45 @@ char Cfile_root_dir[CFILE_ROOT_DIRECTORY_LEN] = "";
 // Each path must have a valid parent that can be tracable all the way back to the root 
 // so that we can create directories when we need to.
 //
-// Please make sure extensions are all lower-case, or we'll break unix compatibility
-//
 cf_pathtype Pathtypes[CF_MAX_PATH_TYPES]  = {
-	// What type this is          Path																									Extensions              Parent type
-	{ CF_TYPE_INVALID,				NULL,																									NULL,							CF_TYPE_INVALID },
+	// What type this is          Path                             Extensions              Parent type
+	{ CF_TYPE_INVALID,				NULL,										NULL,							CF_TYPE_INVALID },
 	// Root must be index 1!!	
-	{ CF_TYPE_ROOT,					"",																									".mve",						CF_TYPE_ROOT	},
-	{ CF_TYPE_DATA,					"data",																								".cfg .log .txt",			CF_TYPE_ROOT	},
-	{ CF_TYPE_MAPS,					"data" DIR_SEPARATOR_STR "maps",																".pcx .ani .tga",			CF_TYPE_DATA	},
-	{ CF_TYPE_TEXT,					"data" DIR_SEPARATOR_STR "text",																".txt .net",				CF_TYPE_DATA	},
-	{ CF_TYPE_MISSIONS,				"data" DIR_SEPARATOR_STR "missions",														".fs2 .fc2 .ntl .ssv",	CF_TYPE_DATA	},
-	{ CF_TYPE_MODELS,					"data" DIR_SEPARATOR_STR "models",															".pof",						CF_TYPE_DATA	},
-	{ CF_TYPE_TABLES,					"data" DIR_SEPARATOR_STR "tables",															".tbl",						CF_TYPE_DATA	},
-	{ CF_TYPE_SOUNDS,					"data" DIR_SEPARATOR_STR "sounds",															".wav",						CF_TYPE_DATA	},
-	{ CF_TYPE_SOUNDS_8B22K,			"data" DIR_SEPARATOR_STR "sounds" DIR_SEPARATOR_STR "8b22k",						".wav",						CF_TYPE_SOUNDS	},
-	{ CF_TYPE_SOUNDS_16B11K,		"data" DIR_SEPARATOR_STR "sounds" DIR_SEPARATOR_STR "16b11k",						".wav",						CF_TYPE_SOUNDS	},
-	{ CF_TYPE_VOICE,					"data" DIR_SEPARATOR_STR "voice",															"",							CF_TYPE_DATA	},
-	{ CF_TYPE_VOICE_BRIEFINGS,		"data" DIR_SEPARATOR_STR "voice" DIR_SEPARATOR_STR "briefing",						".wav",						CF_TYPE_VOICE	},
-	{ CF_TYPE_VOICE_CMD_BRIEF,		"data" DIR_SEPARATOR_STR "voice" DIR_SEPARATOR_STR "command_briefings",			".wav",						CF_TYPE_VOICE	},
-	{ CF_TYPE_VOICE_DEBRIEFINGS,	"data" DIR_SEPARATOR_STR "voice" DIR_SEPARATOR_STR "debriefing",					".wav",						CF_TYPE_VOICE	},
-	{ CF_TYPE_VOICE_PERSONAS,		"data" DIR_SEPARATOR_STR "voice" DIR_SEPARATOR_STR "personas",						".wav",						CF_TYPE_VOICE	},
-	{ CF_TYPE_VOICE_SPECIAL,		"data" DIR_SEPARATOR_STR "voice" DIR_SEPARATOR_STR "special",						".wav",						CF_TYPE_VOICE	},
-	{ CF_TYPE_VOICE_TRAINING,		"data" DIR_SEPARATOR_STR "voice" DIR_SEPARATOR_STR "training",						".wav",						CF_TYPE_VOICE	},
-	{ CF_TYPE_MUSIC,					"data" DIR_SEPARATOR_STR "music",															".wav",						CF_TYPE_VOICE	},
-	{ CF_TYPE_MOVIES,					"data" DIR_SEPARATOR_STR "movies",															".mve .msb",				CF_TYPE_DATA	},
-	{ CF_TYPE_INTERFACE,				"data" DIR_SEPARATOR_STR "interface",														".pcx .ani .tga",			CF_TYPE_DATA	},
-	{ CF_TYPE_FONT,					"data" DIR_SEPARATOR_STR "fonts",															".vf",						CF_TYPE_DATA	},
-	{ CF_TYPE_EFFECTS,				"data" DIR_SEPARATOR_STR "effects",															".ani .pcx .neb .tga",	CF_TYPE_DATA	},
-	{ CF_TYPE_HUD,						"data" DIR_SEPARATOR_STR "hud",																".ani .pcx .tga",			CF_TYPE_DATA	},
-	{ CF_TYPE_PLAYER_MAIN,			"data" DIR_SEPARATOR_STR "players",															"",							CF_TYPE_DATA	},
-	{ CF_TYPE_PLAYER_IMAGES_MAIN,	"data" DIR_SEPARATOR_STR "players" DIR_SEPARATOR_STR "images",						".pcx",						CF_TYPE_PLAYER_MAIN	},
-	{ CF_TYPE_CACHE,					"data" DIR_SEPARATOR_STR "cache",															".clr .tmp",				CF_TYPE_DATA	}, 	//clr=cached color
-	{ CF_TYPE_PLAYERS,				"data" DIR_SEPARATOR_STR "players",															".hcf",						CF_TYPE_DATA	},	
-	{ CF_TYPE_SINGLE_PLAYERS,		"data" DIR_SEPARATOR_STR "players" DIR_SEPARATOR_STR "single",						".plr .csg .css",			CF_TYPE_PLAYERS	},
- 	{ CF_TYPE_MULTI_PLAYERS,		"data" DIR_SEPARATOR_STR "players" DIR_SEPARATOR_STR "multi",						".plr",						CF_TYPE_DATA	},
-	{ CF_TYPE_MULTI_CACHE,			"data" DIR_SEPARATOR_STR "multidata",														".pcx .fs2",				CF_TYPE_DATA	},
-	{ CF_TYPE_CONFIG,					"data" DIR_SEPARATOR_STR "config",															".cfg",						CF_TYPE_DATA	},
-	{ CF_TYPE_SQUAD_IMAGES_MAIN,	"data" DIR_SEPARATOR_STR "players" DIR_SEPARATOR_STR "squads",						".pcx",						CF_TYPE_DATA	},
-	{ CF_TYPE_DEMOS,					"data" DIR_SEPARATOR_STR "demos",															".fsd",						CF_TYPE_DATA	},
-	{ CF_TYPE_CBANIMS,				"data" DIR_SEPARATOR_STR "cbanims",															".ani",						CF_TYPE_DATA	},
-	{ CF_TYPE_INTEL_ANIMS,			"data" DIR_SEPARATOR_STR "intelanims",														".ani",						CF_TYPE_DATA	},
+	{ CF_TYPE_ROOT,					"",										".mve",							CF_TYPE_ROOT	},
+	{ CF_TYPE_DATA,					"Data",									".cfg .log .txt",			CF_TYPE_ROOT	},
+	{ CF_TYPE_MAPS,					"Data\\Maps",							".pcx .ani .tga",			CF_TYPE_DATA	},
+	{ CF_TYPE_TEXT,					"Data\\Text",							".txt .net",				CF_TYPE_DATA	},
+	{ CF_TYPE_MISSIONS,				"Data\\Missions",						".fs2 .fc2 .ntl .ssv",	CF_TYPE_DATA	},
+	{ CF_TYPE_MODELS,					"Data\\Models",						".pof",						CF_TYPE_DATA	},
+	{ CF_TYPE_TABLES,					"Data\\Tables",						".tbl",						CF_TYPE_DATA	},
+	{ CF_TYPE_SOUNDS,					"Data\\Sounds",						".wav",						CF_TYPE_DATA	},
+	{ CF_TYPE_SOUNDS_8B22K,			"Data\\Sounds\\8b22k",				".wav",						CF_TYPE_SOUNDS	},
+	{ CF_TYPE_SOUNDS_16B11K,		"Data\\Sounds\\16b11k",				".wav",						CF_TYPE_SOUNDS	},
+	{ CF_TYPE_VOICE,					"Data\\Voice",							"",							CF_TYPE_DATA	},
+	{ CF_TYPE_VOICE_BRIEFINGS,		"Data\\Voice\\Briefing",			".wav",						CF_TYPE_VOICE	},
+	{ CF_TYPE_VOICE_CMD_BRIEF,		"Data\\Voice\\Command_briefings",".wav",						CF_TYPE_VOICE	},
+	{ CF_TYPE_VOICE_DEBRIEFINGS,	"Data\\Voice\\Debriefing",			".wav",						CF_TYPE_VOICE	},
+	{ CF_TYPE_VOICE_PERSONAS,		"Data\\Voice\\Personas",			".wav",						CF_TYPE_VOICE	},
+	{ CF_TYPE_VOICE_SPECIAL,		"Data\\Voice\\Special",				".wav",						CF_TYPE_VOICE	},
+	{ CF_TYPE_VOICE_TRAINING,		"Data\\Voice\\Training",			".wav",						CF_TYPE_VOICE	},
+	{ CF_TYPE_MUSIC,					"Data\\Music",							".wav",						CF_TYPE_VOICE	},
+	{ CF_TYPE_MOVIES,					"Data\\Movies",						".mve .msb",				CF_TYPE_DATA	},
+	{ CF_TYPE_INTERFACE,				"Data\\Interface",					".pcx .ani .tga",			CF_TYPE_DATA	},
+	{ CF_TYPE_FONT,					"Data\\Fonts",							".vf",						CF_TYPE_DATA	},
+	{ CF_TYPE_EFFECTS,				"Data\\Effects",						".ani .pcx .neb .tga",	CF_TYPE_DATA	},
+	{ CF_TYPE_HUD,						"Data\\Hud",							".ani .pcx .tga",			CF_TYPE_DATA	},
+	{ CF_TYPE_PLAYER_MAIN,			"Data\\Players",						"",							CF_TYPE_DATA	},
+	{ CF_TYPE_PLAYER_IMAGES_MAIN,	"Data\\Players\\Images",			".pcx",						CF_TYPE_PLAYER_MAIN	},
+	{ CF_TYPE_CACHE,					"Data\\Cache",							".clr .tmp",				CF_TYPE_DATA	}, 	//clr=cached color
+	{ CF_TYPE_PLAYERS,				"Data\\Players",						".hcf",						CF_TYPE_DATA	},	
+	{ CF_TYPE_SINGLE_PLAYERS,		"Data\\Players\\Single",			".plr .csg .css",			CF_TYPE_PLAYERS	},
+ 	{ CF_TYPE_MULTI_PLAYERS,		"Data\\Players\\Multi",				".plr",						CF_TYPE_DATA	},
+	{ CF_TYPE_MULTI_CACHE,			"Data\\MultiData",					".pcx .fs2",				CF_TYPE_DATA	},
+	{ CF_TYPE_CONFIG,					"Data\\Config",						".cfg",						CF_TYPE_DATA	},
+	{ CF_TYPE_SQUAD_IMAGES_MAIN,	"Data\\Players\\Squads",			".pcx",						CF_TYPE_DATA	},
+	{ CF_TYPE_DEMOS,					"Data\\Demos",							".fsd",						CF_TYPE_DATA	},
+	{ CF_TYPE_CBANIMS,				"Data\\CBAnims",						".ani",						CF_TYPE_DATA	},
+	{ CF_TYPE_INTEL_ANIMS,			"Data\\IntelAnims",					".ani",						CF_TYPE_DATA	},
 };
 
 
@@ -298,13 +246,7 @@ char *Cfile_cdrom_dir = NULL;
 int cfget_cfile_block();
 CFILE *cf_open_fill_cfblock(FILE * fp, int type);
 CFILE *cf_open_packed_cfblock(FILE *fp, int type, int offset, int size);
-
-#if defined _WIN32
 CFILE *cf_open_mapped_fill_cfblock(HANDLE hFile, int type);
-#elif defined unix
-CFILE *cf_open_mapped_fill_cfblock(FILE *fp, int type);
-#endif
-
 void cf_chksum_long_init();
 
 void cfile_close()
@@ -329,13 +271,13 @@ int cfile_in_root_dir(char *exe_path)
 	strncpy(path_copy, exe_path, 2047);
 
 	// count how many slashes there are in the path
-	tok = strtok(path_copy, DIR_SEPARATOR_STR);
+	tok = strtok(path_copy, "\\");
 	if(tok == NULL){
 		return 1;
 	}	
 	do {
 		token_count++;
-		tok = strtok(NULL, DIR_SEPARATOR_STR);
+		tok = strtok(NULL, "\\");
 	} while(tok != NULL);
 		
 	// root directory if we have <= 1 slash
@@ -369,16 +311,12 @@ int cfile_init(char *exe_dir, char *cdrom_dir)
 
 		// are we in a root directory?		
 		if(cfile_in_root_dir(buf)){
-#if defined _WIN32
 			MessageBox((HWND)NULL, "Freespace2/Fred2 cannot be run from a drive root directory!", "Error", MB_OK);
-#elif defined unix
-			fprintf(stderr, "Error: Freespace2/Fred2 cannot be run from a drive root directory!\n");
-#endif
 			return 1;
 		}		
 
 		while (i--) {
-			if (buf[i] == DIR_SEPARATOR_CHAR){
+			if (buf[i] == '\\'){
 				break;
 			}
 		}						
@@ -387,11 +325,7 @@ int cfile_init(char *exe_dir, char *cdrom_dir)
 			buf[i] = 0;						
 			cfile_chdir(buf);
 		} else {
-#if defined _WIN32
 			MessageBox((HWND)NULL, "Error trying to determine executable root directory!", "Error", MB_OK);
-#elif defined unix
-			fprintf(stderr, "Error trying to determine executable root directory!\n");
-#endif
 			return 1;
 		}
 
@@ -423,7 +357,6 @@ void cfile_refresh()
 }
 
 
-#ifdef _WIN32
 // Changes to a drive if valid.. 1=A, 2=B, etc
 // If flag, then changes to it.
 // Returns 0 if not-valid, 1 if valid.
@@ -448,7 +381,6 @@ int cfile_chdrive( int DriveNum, int flag )
 
 	return Valid;
 }
-#endif  // ifdef WIN32
 
 // push current directory on a 'stack' (so we can restore it) and change the directory
 int cfile_push_chdir(int type)
@@ -465,16 +397,14 @@ int cfile_push_chdir(int type)
 
 	cf_create_default_path_string( dir, type, NULL );
 	_strlwr(dir);
-
 	Drive = strchr(dir, ':');
 
 	if (Drive) {
-	   #ifdef _WIN32
 		if (!cfile_chdrive( *(Drive - 1) - 'a' + 1, 1))
 			return 1;
 
 		Path = Drive+1;
-		#endif
+
 	} else {
 		Path = dir;
 	}
@@ -486,9 +416,7 @@ int cfile_push_chdir(int type)
 	// This chdir might get a critical error!
 	e = _chdir( Path );
 	if (e) {
-		#ifdef _WIN32
 		cfile_chdrive( OriginalDirectory[0] - 'a' + 1, 1 );
-		#endif
 		return 2;
 	}
 
@@ -508,12 +436,11 @@ int cfile_chdir(char *dir)
 
 	Drive = strchr(dir, ':');
 	if (Drive)	{
-		#ifdef _WIN32
 		if (!cfile_chdrive( *(Drive - 1) - 'a' + 1, 1))
 			return 1;
 
 		Path = Drive+1;
-		#endif
+
 	} else {
 		Path = dir;
 	}
@@ -525,9 +452,7 @@ int cfile_chdir(char *dir)
 	// This chdir might get a critical error!
 	e = _chdir( Path );
 	if (e) {
-		#ifdef _WIN32
 		cfile_chdrive( OriginalDirectory[0] - 'a' + 1, 1 );
-		#endif
 		return 2;
 	}
 
@@ -547,6 +472,7 @@ int cfile_flush_dir(int dir_type)
 {
 	int find_handle;
 	int del_count;
+	_finddata_t find;
 
 	Assert( CF_TYPE_SPECIFIED(dir_type) );
 
@@ -556,10 +482,8 @@ int cfile_flush_dir(int dir_type)
 	}
 
 	// proceed to delete the files
-	del_count = 0;
-#if defined _WIN32
-	_finddata_t find;
 	find_handle = _findfirst( "*", &find );
+	del_count = 0;
 	if (find_handle != -1) {
 		do {			
 			if (!(find.attrib & _A_SUBDIR) && !(find.attrib & _A_RDONLY)) {
@@ -572,27 +496,6 @@ int cfile_flush_dir(int dir_type)
 		} while (!_findnext(find_handle, &find));
 		_findclose( find_handle );
 	}
-#elif defined unix
-	glob_t globinfo;
-	memset(&globinfo, 0, sizeof(globinfo));
-	int status = glob("*", 0, NULL, &globinfo);
-	if (status == 0) {
-		for (unsigned int i = 0;  i < globinfo.gl_pathc;  i++) {
-			// Determine if this is a regular file
-			struct stat statbuf;
-			memset(&statbuf, 0, sizeof(statbuf));
-			stat(globinfo.gl_pathv[i], &statbuf);
-			if (S_ISREG(statbuf.st_mode)) {
-				// delete the file
-				cf_delete(globinfo.gl_pathv[i], dir_type);				
-
-				// increment the deleted count
-				del_count++;				
-			}
-		}
-		globfree(&globinfo);
-	}
-#endif
 
 	// pop the directory back
 	cfile_pop_dir();
@@ -674,7 +577,6 @@ int cf_exist( char *filename, int dir_type )
 	return 0;
 }
 
-#ifdef _WIN32
 void cf_attrib(char *filename, int set, int clear, int dir_type)
 {
 	char longname[MAX_PATH_LEN];
@@ -692,7 +594,6 @@ void cf_attrib(char *filename, int set, int clear, int dir_type)
 	}
 
 }
-#endif
 
 int cf_rename(char *old_name, char *name, int dir_type)
 {
@@ -845,7 +746,6 @@ CFILE *cfopen(char *file_path, char *mode, int type, int dir_type, bool localize
 		
 			// Can't open memory mapped files out of pack files
 			if ( offset == 0 )	{
-#if defined _WIN32
 				HANDLE hFile;
 
 				hFile = CreateFile(longname, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
@@ -853,12 +753,6 @@ CFILE *cfopen(char *file_path, char *mode, int type, int dir_type, bool localize
 				if (hFile != INVALID_HANDLE_VALUE)	{
 					return cf_open_mapped_fill_cfblock(hFile, dir_type);
 				}
-#elif defined unix
-				FILE *fp = fopen( longname, "rb" );
-				if (fp) {
-					return cf_open_mapped_fill_cfblock(fp, dir_type);
-				}
-#endif
 			} 
 
 		} else {
@@ -948,7 +842,6 @@ int cfclose( CFILE * cfile )
 	result = 0;
 	if ( cb->data ) {
 		// close memory mapped file
-#if defined _WIN32
 		result = UnmapViewOfFile((void*)cb->data);
 		Assert(result);
 		result = CloseHandle(cb->hInFile);		
@@ -956,10 +849,6 @@ int cfclose( CFILE * cfile )
 		result = CloseHandle(cb->hMapFile);		
 		Assert(result);	// Ensure file handle is closed properly
 		result = 0;
-#elif defined unix
-		result = munmap(cb->data, cb->data_length);
-		Assert(result);
-#endif
 
 	} else if ( cb->fp != NULL )	{
 		Assert(cb->fp != NULL);
@@ -999,13 +888,7 @@ CFILE *cf_open_fill_cfblock(FILE *fp, int type)
 		cfbp->fp = fp;
 		cfbp->dir_type = type;
 		
-#if defined _WIN32
 		cf_init_lowlevel_read_code(cfp,0,filelength(fileno(fp)) );
-#elif defined unix
-		struct stat statbuf;
-		fstat(fileno(fp), &statbuf);
-		cf_init_lowlevel_read_code(cfp, 0, statbuf.st_size );
-#endif
 
 		return cfp;
 	}
@@ -1052,11 +935,7 @@ CFILE *cf_open_packed_cfblock(FILE *fp, int type, int offset, int size)
 //
 // returns:   ptr CFILE structure.  
 //
-#if defined _WIN32
 CFILE *cf_open_mapped_fill_cfblock(HANDLE hFile, int type)
-#elif defined unix
-CFILE *cf_open_mapped_fill_cfblock(FILE *fp, int type)
-#endif
 {
 	int cfile_block_index;
 
@@ -1072,13 +951,11 @@ CFILE *cf_open_mapped_fill_cfblock(FILE *fp, int type)
 		cfp = &Cfile_list[cfile_block_index];
 		cfp->id = cfile_block_index;
 		cfbp->fp = NULL;
-#if defined _WIN32
 		cfbp->hInFile = hFile;
-#endif
 		cfbp->dir_type = type;
 
 		cf_init_lowlevel_read_code(cfp,0 , 0 );
-#if defined _WIN32
+
 		cfbp->hMapFile = CreateFileMapping(cfbp->hInFile, NULL, PAGE_READONLY, 0, 0, NULL);
 		if (cfbp->hMapFile == NULL) { 
 			nprintf(("Error", "Could not create file-mapping object.\n")); 
@@ -1087,17 +964,6 @@ CFILE *cf_open_mapped_fill_cfblock(FILE *fp, int type)
 	
 		cfbp->data = (ubyte*)MapViewOfFile(cfbp->hMapFile, FILE_MAP_READ, 0, 0, 0);
 		Assert( cfbp->data != NULL );		
-#elif defined unix
-		cfbp->fp = fp;
-		cfbp->data = mmap(NULL,						// start
-								cfbp->data_length,	// length
-								PROT_READ,				// prot
-								MAP_SHARED,				// flags
-								fileno(fp),				// fd
-								0);						// offset
-		Assert( cfbp->data != NULL );		
-#endif
-
 		return cfp;
 	}
 }
@@ -1225,14 +1091,14 @@ void cfread_vector(vector *vec, CFILE *file, int ver, vector *deflt)
 		if (deflt)
 			*vec = *deflt;
 		else
-			vec->xyz.x = vec->xyz.y = vec->xyz.z = 0.0f;
+			vec->x = vec->y = vec->z = 0.0f;
 
 		return;
 	}
 
-	vec->xyz.x = cfread_float(file, ver, deflt ? deflt->xyz.x : 0.0f);
-	vec->xyz.y = cfread_float(file, ver, deflt ? deflt->xyz.y : 0.0f);
-	vec->xyz.z = cfread_float(file, ver, deflt ? deflt->xyz.z : 0.0f);
+	vec->x = cfread_float(file, ver, deflt ? deflt->x : NULL);
+	vec->y = cfread_float(file, ver, deflt ? deflt->y : NULL);
+	vec->z = cfread_float(file, ver, deflt ? deflt->z : NULL);
 }
 	
 void cfread_angles(angles *ang, CFILE *file, int ver, angles *deflt)
@@ -1246,9 +1112,9 @@ void cfread_angles(angles *ang, CFILE *file, int ver, angles *deflt)
 		return;
 	}
 
-	ang->p = cfread_float(file, ver, deflt ? deflt->p : 0.0f);
-	ang->b = cfread_float(file, ver, deflt ? deflt->b : 0.0f);
-	ang->h = cfread_float(file, ver, deflt ? deflt->h : 0.0f);
+	ang->p = cfread_float(file, ver, deflt ? deflt->p : NULL);
+	ang->b = cfread_float(file, ver, deflt ? deflt->b : NULL);
+	ang->h = cfread_float(file, ver, deflt ? deflt->h : NULL);
 }
 
 char cfread_char(CFILE *file, int ver, char deflt)
@@ -1327,13 +1193,13 @@ int cfwrite_ubyte(ubyte b, CFILE *file)
 
 int cfwrite_vector(vector *vec, CFILE *file)
 {
-	if(!cfwrite_float(vec->xyz.x, file)){
+	if(!cfwrite_float(vec->x, file)){
 		return 0;
 	}
-	if(!cfwrite_float(vec->xyz.y, file)){
+	if(!cfwrite_float(vec->y, file)){
 		return 0;
 	}
-	return cfwrite_float(vec->xyz.z, file);
+	return cfwrite_float(vec->z, file);
 }
 
 int cfwrite_angles(angles *ang, CFILE *file)
@@ -1782,4 +1648,3 @@ int cflush(CFILE *cfile)
 
 
 
-

fs2_open/code/cfile/cfile.h

@@ -9,38 +9,13 @@
 
 /*
  * $Logfile: /Freespace2/code/CFile/cfile.h $
- * $Revision: 2.6 $
- * $Date: 2002-11-10 16:29:53 $
- * $Author: DTP $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:56 $
+ * $Author: penguin $
  *
  * <insert description of file here>
  *
  * $Log: not supported by cvs2svn $
- * Revision 2.5  2002/11/02 23:06:59  DTP
- * DOh,uhmm, define error again, this is getting to me.
- *
- * Revision 2.4  2002/11/02 23:04:46  DTP
- * DOh, fixed that define, learn to count DTP :)
- *
- * Revision 2.3  2002/10/27 23:59:28  DTP
- * DTP; started basic implementation of mod-support
- * plain files only for now. fs2_open.exe -mod X will look for files in fs2/ X /all-legal-subdirectories. no checking/creating dirs yet. directories must be there.
- *
- * 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
- *
- * Revision 2.0  2002/06/03 04:02:21  penguin
- * Warpcore CVS sync
- *
- * Revision 1.3  2002/05/16 06:03:29  mharris
- * Unix port changes
- *
- * Revision 1.2  2002/05/09 22:58:08  mharris
- * Added ifdef WIN32 around change-drive functions
- *
  * Revision 1.1  2002/05/02 18:03:04  mharris
  * Initial checkin - converted filenames and includes to lower case
  *
@@ -357,17 +332,7 @@
 #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
+#include "pstypes.h"
 
 #define CF_EOF (-1)
 
@@ -391,45 +356,44 @@ typedef struct {
 
 #define CF_TYPE_ANY						-1		// Used to check in any directory
 
-#define CF_TYPE_INVALID				0
-#define CF_TYPE_ROOT				1			// Root must be 1!!
-#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_INVALID					0
+#define CF_TYPE_ROOT						1			// Root must be 1!!
+#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_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_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_CACHE					26
+#define CF_TYPE_PLAYERS					27
 #define CF_TYPE_SINGLE_PLAYERS		28
-#define CF_TYPE_MULTI_PLAYERS		29
+#define CF_TYPE_MULTI_PLAYERS			29
 #define CF_TYPE_MULTI_CACHE			30
-#define CF_TYPE_CONFIG				31
+#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_DEMOS					33
+#define CF_TYPE_CBANIMS					34
 #define CF_TYPE_INTEL_ANIMS			35
 
-#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				36			// Can be as high as you'd like
 
 // TRUE if type is specified and valid
 #define CF_TYPE_SPECIFIED(path_type) (((path_type)>CF_TYPE_INVALID) && ((path_type)<CF_MAX_PATH_TYPES))
@@ -627,10 +591,7 @@ int cf_find_file_location( char *filespec, int pathtype, char *pack_filename, in
 
 // Functions to change directories
 int cfile_chdir(char *dir);
-
-#ifdef _WIN32
 int cfile_chdrive(int DriveNum, int flag);
-#endif
 
 // push current directory on a 'stack' (so we can restore it) and change the directory
 int cfile_push_chdir(int type);

fs2_open/code/cfile/cfilearchive.cpp

@@ -9,20 +9,14 @@
 
 /*
  * $Logfile: /Freespace2/code/CFile/CfileArchive.cpp $
- * $Revision: 2.2 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:56 $
  * $Author: penguin $
  *
  * 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.1  2002/07/29 19:17:21  penguin
- * added #ifdef _WIN32 around windows-specific system headers
- *
- * 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
  *
@@ -85,17 +79,17 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-
-#ifdef _WIN32
 #include <io.h>
 #include <direct.h>
 #include <windows.h>
 #include <winbase.h>		/* needed for memory mapping of file functions */
-#endif
 
-#include "globalincs/pstypes.h"
-#include "cfile/cfile.h"
-#include "cfile/cfilearchive.h"
+#include "pstypes.h"
+#include "cfile.h"
+//#include "outwnd.h"
+//#include "vecmat.h"
+//#include "timer.h"
+#include "cfilearchive.h"
 
 #define CHECK_POSITION
 

fs2_open/code/cfile/cfilearchive.h

@@ -9,20 +9,14 @@
 
 /*
  * $Logfile: /Freespace2/code/CFile/CfileArchive.h $
- * $Revision: 2.1 $
- * $Date: 2002-07-07 19:55:58 $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:56 $
  * $Author: penguin $
  *
  * External def's for CfileArchive.cpp.  This should only be used 
  * internally by cfile stuff.
  *
  * $Log: not supported by cvs2svn $
- * Revision 2.0  2002/06/03 04:02:21  penguin
- * Warpcore CVS sync
- *
- * Revision 1.2  2002/05/17 02:56:19  mharris
- * first crack at unix compatibity
- *
  * Revision 1.1  2002/05/02 18:03:04  mharris
  * Initial checkin - converted filenames and includes to lower case
  *
@@ -66,13 +60,8 @@ typedef struct Cfile_block {
 	int		dir_type;		// directory location
 	FILE		*fp;				// File pointer if opening an individual file
 	void		*data;			// Pointer for memory-mapped file access.  NULL if not mem-mapped.
-#ifdef _WIN32
 	HANDLE	hInFile;			// Handle from CreateFile()
 	HANDLE	hMapFile;		// Handle from CreateFileMapping()
-#else
-//	int		fd;				// file descriptor
-	size_t	data_length;	// length of data for mmap
-#endif
 	int		lib_offset;
 	int		raw_position;
 	int		size;				// for packed files

fs2_open/code/cfile/cfilelist.cpp

@@ -9,19 +9,13 @@
 
 /*
  * $Logfile: /Freespace2/code/CFile/CfileList.cpp $
- * $Revision: 2.2 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:56 $
  * $Author: penguin $
  *
  * Code for doing directory lists and sorts
  *
  * $Log: not supported by cvs2svn $
- * Revision 2.1  2002/07/29 19:37:21  penguin
- * added #ifdef _WIN32 around windows-specific system headers
- *
- * 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
  *
@@ -63,16 +57,16 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-
-#ifdef _WIN32
 #include <io.h>
 #include <direct.h>
 #include <windows.h>
 #include <winbase.h>		/* needed for memory mapping of file functions */
-#endif
 
-#include "globalincs/pstypes.h"
-#include "cfile/cfile.h"
+#include "pstypes.h"
+#include "cfile.h"
+//#include "outwnd.h"
+//#include "vecmat.h"
+//#include "timer.h"
 
 // Sorts a list of filenames using the specified sorting method (CF_SORT_*).
 //   n = number of filenames in list to sort

fs2_open/code/cfile/cfilesystem.cpp

@@ -9,9 +9,9 @@
 
 /*
  * $Logfile: /Freespace2/code/CFile/CfileSystem.cpp $
- * $Revision: 2.6 $
- * $Date: 2002-11-10 16:28:08 $
- * $Author: DTP $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:56 $
+ * $Author: penguin $
  *
  * 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,39 +20,6 @@
  * all those locations, inherently enforcing precedence orders.
  *
  * $Log: not supported by cvs2svn $
- * Revision 2.5  2002/10/30 06:29:45  DTP
- * doh!, used upper case in include, dont know how much it matters for *nix systems, but here it is
- *
- * Revision 2.4  2002/10/30 06:26:11  DTP
- * DTP Implemented basic VP files handling. mission and campaign files inside VP files found in mod dir still not supported, cheking / creating directories not implented either
- *
- * Revision 2.3  2002/08/01 01:41:04  penguin
- * The big include file move
- *
- * Revision 2.2  2002/07/29 19:52:48  penguin
- * added #ifdef _WIN32 around windows-specific system headers
- *
- * 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.6  2002/05/24 16:44:10  mharris
- * Fix unix "find files" operations so they return relative path
- *
- * Revision 1.5  2002/05/21 15:38:00  mharris
- * Unix glob changes -- still needs some work as we are getting full pathnames
- *
- * Revision 1.4  2002/05/17 23:38:33  mharris
- * Fixed silly bug in unix find-files code
- *
- * Revision 1.3  2002/05/16 06:03:29  mharris
- * Unix port changes
- *
- * Revision 1.2  2002/05/07 13:22:52  mharris
- * Added errno.h include
- *
  * Revision 1.1  2002/05/02 18:03:04  mharris
  * Initial checkin - converted filenames and includes to lower case
  *
@@ -118,25 +85,19 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include <errno.h>
-
-#ifdef _WIN32
 #include <io.h>
 #include <direct.h>
 #include <windows.h>
 #include <winbase.h>		/* needed for memory mapping of file functions */
-#endif
 
-#ifdef unix
-#include <glob.h>
-#include <sys/stat.h>
-#endif
+#include "pstypes.h"
+//#include "outwnd.h"
+//#include "vecmat.h"
+//#include "timer.h"
+#include "cfile.h"
+#include "cfilesystem.h"
+#include "localize.h"
 
-#include "cmdline/cmdline.h"
-#include "globalincs/pstypes.h"
-#include "cfile/cfile.h"
-#include "cfile/cfilesystem.h"
-#include "localization/localize.h"
 
 #define CF_ROOTTYPE_PATH 0
 #define CF_ROOTTYPE_PACK 1
@@ -258,14 +219,12 @@ int cf_get_packfile_count(cf_root *root)
 	packfile_count = 0;
 	for (i=CF_TYPE_ROOT; i<CF_MAX_PATH_TYPES; i++ )	{
 		strcpy( filespec, root->path );
-		
-			if(strlen(Pathtypes[i].path)) { 
-				strcat( filespec, Pathtypes[i].path );
-				strcat( filespec, DIR_SEPARATOR_STR );
-		//	}
+
+		if(strlen(Pathtypes[i].path)){
+			strcat( filespec, Pathtypes[i].path );
+			strcat( filespec, "\\" );
 		}
 
-#if defined _WIN32
 		strcat( filespec, "*.vp" );
 
 		int find_handle;
@@ -283,26 +242,7 @@ int cf_get_packfile_count(cf_root *root)
 
 			_findclose( find_handle );
 		}	
-#elif defined unix
-		strcat( filespec, "*.[vV][pP]" );
-
-		glob_t globinfo;
-		memset(&globinfo, 0, sizeof(globinfo));
-		int status = glob(filespec, 0, NULL, &globinfo);
-		if (status == 0) {
-			for (unsigned int j = 0;  j < globinfo.gl_pathc;  j++) {
-				// Determine if this is a regular file
-				struct stat statbuf;
-				memset(&statbuf, 0, sizeof(statbuf));
-				stat(globinfo.gl_pathv[j], &statbuf);
-				if (S_ISREG(statbuf.st_mode)) {
-					packfile_count++;
-				}
-			}
-			globfree(&globinfo);
-		}
-#endif
-	}
+	}	
 
 	return packfile_count;
 }
@@ -348,15 +288,11 @@ void cf_build_pack_list( cf_root *root )
 	root_index = 0;
 	for (i=CF_TYPE_ROOT; i<CF_MAX_PATH_TYPES; i++ )	{
 		strcpy( filespec, root->path );
-		
-		if(strlen(Pathtypes[i].path)) {
-			strcat( filespec, Pathtypes[i].path );
-			strcat( filespec, DIR_SEPARATOR_STR );
+
+		if(strlen(Pathtypes[i].path)){
+			strcat( filespec, Pathtypes[i].path );		
+			strcat( filespec, "\\" );
 		}
-		
-
-
-#if defined _WIN32
 		strcat( filespec, "*.vp" );
 
 		int find_handle;
@@ -375,13 +311,12 @@ void cf_build_pack_list( cf_root *root )
 
 					// fill in all the proper info
 					strcpy(rptr_sort->path, root->path);
-					
-					if(strlen(Pathtypes[i].path)) {
 
-						strcat(rptr_sort->path, Pathtypes[i].path );
-						strcat(rptr_sort->path, DIR_SEPARATOR_STR);
+					if(strlen(Pathtypes[i].path)){
+						strcat(rptr_sort->path, Pathtypes[i].path );					
+						strcat(rptr_sort->path, "\\");
 					}
-					
+
 					strcat(rptr_sort->path, find.name );
 					rptr_sort->roottype = CF_ROOTTYPE_PACK;
 					rptr_sort->cf_type = i;
@@ -391,32 +326,6 @@ void cf_build_pack_list( cf_root *root )
 
 			_findclose( find_handle );
 		}	
-#elif defined unix
-		strcat( filespec, "*.[vV][pP]" );
-		glob_t globinfo;
-		memset(&globinfo, 0, sizeof(globinfo));
-		int status = glob(filespec, 0, NULL, &globinfo);
-		if (status == 0) {
-			for (unsigned int j = 0;  j < globinfo.gl_pathc;  j++) {
-				// Determine if this is a regular file
-				struct stat statbuf;
-				memset(&statbuf, 0, sizeof(statbuf));
-				stat(globinfo.gl_pathv[j], &statbuf);
-				if (S_ISREG(statbuf.st_mode)) {
-					Assert(root_index < temp_root_count);
-
-					// get a temp pointer
-					rptr_sort = &temp_roots_sort[root_index++];
-
-					// fill in all the proper info
-					strcpy(rptr_sort->path, globinfo.gl_pathv[j] );
-					rptr_sort->roottype = CF_ROOTTYPE_PACK;
-					rptr_sort->cf_type = i;
-				}
-			}
-			globfree(&globinfo);
-		}
-#endif
 	}	
 
 	// these should always be the same
@@ -448,27 +357,20 @@ void cf_build_root_list(char *cdrom_dir)
 
 	cf_root	*root;
 
-	if(Cmdline_mod) {
-		strcat(Cmdline_mod, DIR_SEPARATOR_STR);
-		cf_root *modroot;
-		modroot = cf_create_root();
-		strcpy(modroot->path,Cmdline_mod);
-		modroot->roottype = CF_ROOTTYPE_PATH;
-		cf_build_pack_list(modroot);
-	}
+   //======================================================
+	// First, check the current directory.
+	// strcpy( root->path, "d:\\projects\\freespace\\" );
 
 	root = cf_create_root();
-	
+
 	if ( !_getcwd(root->path, CF_MAX_PATHNAME_LENGTH ) ) {
 		Error(LOCATION, "Can't get current working directory -- %d", errno );
 	}
 
 	// do we already have a slash? as in the case of a root directory install
-	if(strlen(root->path) && (root->path[strlen(root->path)-1] != DIR_SEPARATOR_CHAR)){
-		strcat(root->path, DIR_SEPARATOR_STR);		// put trailing backslash on for easier path construction
+	if(strlen(root->path) && (root->path[strlen(root->path)-1] != '\\')){
+		strcat(root->path, "\\");		// put trailing backslash on for easier path construction
 	}
-
-	   
 	root->roottype = CF_ROOTTYPE_PATH;
 
    //======================================================
@@ -521,12 +423,11 @@ void cf_search_root_path(int root_index)
 
 		strcpy( search_path, root->path );
 
-		if(strlen(Pathtypes[i].path)) {
+		if(strlen(Pathtypes[i].path)){
 			strcat( search_path, Pathtypes[i].path );
-			strcat( search_path, DIR_SEPARATOR_STR );
+			strcat( search_path, "\\" );
 		} 
 
-#if defined _WIN32
 		strcat( search_path, "*.*" );
 
 		int find_handle;
@@ -562,39 +463,7 @@ void cf_search_root_path(int root_index)
 
 			_findclose( find_handle );
 		}
-#elif defined unix
-		strcat( search_path, "*" );
-		glob_t globinfo;
-		memset(&globinfo, 0, sizeof(globinfo));
-		int status = glob(search_path, 0, NULL, &globinfo);
-		if (status == 0) {
-			for (unsigned int j = 0;  j < globinfo.gl_pathc;  j++) {
-				// Determine if this is a regular file
-				struct stat statbuf;
-				memset(&statbuf, 0, sizeof(statbuf));
-				stat(globinfo.gl_pathv[j], &statbuf);
-				if (S_ISREG(statbuf.st_mode)) {
-					char *ext = strchr(globinfo.gl_pathv[j], '.' );
-					if ( ext )	{
-						if ( is_ext_in_list( Pathtypes[i].extensions, ext ) )	{
-							// Found a file!!!!
-							cf_file *file = cf_create_file();
-							
-							strcpy( file->name_ext, globinfo.gl_pathv[j] );
-							file->root_index = root_index;
-							file->pathtype_index = i;
-							file->write_time = statbuf.st_mtime;
-							file->size = statbuf.st_size;
-							file->pack_offset = 0;			// Mark as a non-packed file
-							
-							//mprintf(( "Found file '%s'\n", file->name_ext ));
-						}
-					}
-				}
-			}
-			globfree(&globinfo);
-		}
-#endif
+
 	}
 }
 
@@ -614,7 +483,9 @@ typedef struct VP_FILE {
 } VP_FILE;
 
 void cf_search_root_pack(int root_index)
-{	
+{
+	int i;
+
 	cf_root *root = cf_get_root(root_index);
 
 	//mprintf(( "Searching root pack '%s'\n", root->path ));
@@ -640,7 +511,6 @@ void cf_search_root_pack(int root_index)
 	strcpy( search_path, "" );
 	
 	// Go through all the files
-	int i;
 	for (i=0; i<VP_header.num_files; i++ )	{
 		VP_FILE find;
 
@@ -650,13 +520,13 @@ void cf_search_root_pack(int root_index)
 			if ( !stricmp( find.filename, ".." ))	{
 				int l = strlen(search_path);
 				char *p = &search_path[l-1];
-				while( (p > search_path) && (*p != DIR_SEPARATOR_CHAR) )	{
+				while( (p > search_path) && (*p != '\\') )	{
 					p--;
 				}
 				*p = 0;
 			} else {
 				if ( strlen(search_path)	)	{
-					strcat( search_path,	DIR_SEPARATOR_STR );
+					strcat( search_path,	"\\" );
 				}
 				strcat( search_path, find.filename );
 			}
@@ -664,35 +534,38 @@ void cf_search_root_pack(int root_index)
 			//mprintf(( "Current dir = '%s'\n", search_path ));
 		} else {
 	
-			int j;			
-							
+			int j;
 			for (j=CF_TYPE_ROOT; j<CF_MAX_PATH_TYPES; j++ )	{
-				
+
 				if ( !stricmp( search_path, Pathtypes[j].path ))	{
+
 					char *ext = strchr( find.filename, '.' );
 					if ( ext )	{
 						if ( is_ext_in_list( Pathtypes[j].extensions, ext ) )	{
 							// Found a file!!!!
 							cf_file *file = cf_create_file();
+							
 							strcpy( file->name_ext, find.filename );
 							file->root_index = root_index;
 							file->pathtype_index = j;
 							file->write_time = find.write_time;
 							file->size = find.size;
-							file->pack_offset = find.offset;			// Mark as a packed file
+							file->pack_offset = find.offset;			// Mark as a non-packed file
+
 							//mprintf(( "Found pack file '%s'\n", file->name_ext ));
 						}
 					}
+					
+
 				}
 			}
+
 		}
 	}
 	fclose(fp);
-	
 }
 
 
-
 void cf_build_file_list()
 {
 	int i;
@@ -722,12 +595,10 @@ void cf_build_secondary_filelist(char *cdrom_dir)
 
 	// Init the path types
 	for (i=0; i<CF_MAX_PATH_TYPES; i++ )	{
-		//Assert( Pathtypes[i].index == i );
-		// [mharris]  can't modify constant strings, why do this anyhow???
-		// just need to make sure exts are all lc in the definition...
-//  		if ( Pathtypes[i].extensions )	{
-//  			strlwr(Pathtypes[i].extensions);
-//  		}
+		Assert( Pathtypes[i].index == i );
+		if ( Pathtypes[i].extensions )	{
+			strlwr(Pathtypes[i].extensions);
+		}
 	}
 	
 	// Init the root blocks
@@ -798,15 +669,7 @@ int cf_find_file_location( char *filespec, int pathtype, char *pack_filename, in
 	if ( strpbrk(filespec,"/\\:")  ) {		// do we have a full path already?
 		FILE *fp = fopen(filespec, "rb" );
 		if (fp)	{
-			if ( size ) {
-#if defined _WIN32
-				*size = filelength(fileno(fp));
-#elif defined unix
-				struct stat statbuf;
-				fstat(fileno(fp), &statbuf);
-				*size = statbuf.st_size;
-#endif
-			}
+			if ( size ) *size = filelength(fileno(fp));
 			if ( offset ) *offset = 0;
 			if ( pack_filename ) {
 				strcpy( pack_filename, filespec );
@@ -839,15 +702,7 @@ int cf_find_file_location( char *filespec, int pathtype, char *pack_filename, in
 
 		FILE *fp = fopen(longname, "rb" );
 		if (fp)	{
-			if ( size ) {
-#if defined _WIN32
-				*size = filelength(fileno(fp));
-#elif defined unix
-				struct stat statbuf;
-				fstat(fileno(fp), &statbuf);
-				*size = statbuf.st_size;
-#endif
-			}
+			if ( size ) *size = filelength(fileno(fp));
 			if ( offset ) *offset = 0;
 			if ( pack_filename ) {
 				strcpy( pack_filename, longname );
@@ -882,11 +737,11 @@ int cf_find_file_location( char *filespec, int pathtype, char *pack_filename, in
 						strcpy( pack_filename, r->path );
 						if ( f->pack_offset < 1 )	{
 							strcat( pack_filename, Pathtypes[f->pathtype_index].path );
-							strcat( pack_filename, DIR_SEPARATOR_STR );
+							strcat( pack_filename, "\\" );
 							strcat( pack_filename, f->name_ext );
 						}
-					}
-					return 1;
+					}				
+					return 1;		
 				}
 				// restore original filespec
 				strcpy(filespec, temp);
@@ -904,18 +759,17 @@ int cf_find_file_location( char *filespec, int pathtype, char *pack_filename, in
 
 						if(strlen(Pathtypes[f->pathtype_index].path)){
 							strcat( pack_filename, Pathtypes[f->pathtype_index].path );
-							strcat( pack_filename, DIR_SEPARATOR_STR );
+							strcat( pack_filename, "\\" );
 						}
 
 						strcat( pack_filename, f->name_ext );
 					}
-				}
-				
-				return 1;
+				}				
+				return 1;		
 			}
 		}
-		
-		return 0;
+	
+	return 0;
 }
 
 
@@ -968,10 +822,10 @@ int cf_get_file_list( int max, char **list, int pathtype, char *filter, int sort
 {
 	char *ptr;
 	int i, l, find_handle, num_files = 0, own_flag = 0;
+	_finddata_t find;
 
 	if (max < 1) {
 		Get_file_list_filter = NULL;
-
 		return 0;
 	}
 
@@ -986,13 +840,10 @@ int cf_get_file_list( int max, char **list, int pathtype, char *filter, int sort
 
 	cf_create_default_path_string( filespec, pathtype, filter );
 
-#if defined _WIN32
-	_finddata_t find;
 	find_handle = _findfirst( filespec, &find );
 	if (find_handle != -1) {
 		do {
 			if (num_files >= max)
-
 				break;
 
 			if (!(find.attrib & _A_SUBDIR)) {
@@ -1018,43 +869,6 @@ int cf_get_file_list( int max, char **list, int pathtype, char *filter, int sort
 		_findclose( find_handle );
 	}
 
-#elif defined unix
-	char base_filespec[MAX_PATH_LEN];
-	cf_create_default_path_string( base_filespec, pathtype );
-	int base_filespec_len = strlen(base_filespec);
-	glob_t globinfo;
-	memset(&globinfo, 0, sizeof(globinfo));
-	int status = glob(filespec, 0, NULL, &globinfo);
-	if (status == 0) {
-		for (unsigned int i = 0;  i < globinfo.gl_pathc;  i++) {
-			// Determine if this is a regular file
-			struct stat statbuf;
-			memset(&statbuf, 0, sizeof(statbuf));
-			stat(globinfo.gl_pathv[i], &statbuf);
-			if (S_ISREG(statbuf.st_mode)) {
-				if ( !Get_file_list_filter || (*Get_file_list_filter)(globinfo.gl_pathv[i]) ) {
-					char *found_file = globinfo.gl_pathv[i];
-					Assert(strncmp(found_file, base_filespec, base_filespec_len) == 0);
-					found_file += base_filespec_len;
-					ptr = strrchr(found_file, '.');
-					if (ptr)
-						l = ptr - found_file;
-					else
-						l = strlen(found_file);
-					
-					list[num_files] = (char *)malloc(l + 1);
-					strncpy(list[num_files], found_file, l);
-					list[num_files][l] = 0;
-					if (info)
-						info[num_files].write_time = statbuf.st_mtime;
-					
-					num_files++;
-				}
-			}
-			globfree(&globinfo);
-		}
-	}
-#endif
 
 	// Search all the packfiles and CD.
 	if ( !Skip_packfile_search )	{
@@ -1067,9 +881,8 @@ int cf_get_file_list( int max, char **list, int pathtype, char *filter, int sort
 			}
 
 			if (num_files >= max)
-
 				break;
-			
+
 			if ( !cf_matches_spec( filter,f->name_ext))	{
 				continue;
 			}
@@ -1112,7 +925,6 @@ int cf_get_file_list( int max, char **list, int pathtype, char *filter, int sort
 	}
 
 	Get_file_list_filter = NULL;
-
 	return num_files;
 }
 
@@ -1146,7 +958,6 @@ int cf_get_file_list_preallocated( int max, char arr[][MAX_FILENAME_LEN], char *
 
 	if (max < 1) {
 		Get_file_list_filter = NULL;
-
 		return 0;
 	}
 
@@ -1166,18 +977,15 @@ int cf_get_file_list_preallocated( int max, char arr[][MAX_FILENAME_LEN], char *
 	char filespec[MAX_PATH_LEN];
 
 	cf_create_default_path_string( filespec, pathtype, filter );
-	mprintf(("cf_get_file_list_preallocated looking for type=%d, filter=\"%s\"\n",
-				pathtype, filter));
 
 	// Search the default directories
-#if defined _WIN32
 	int find_handle;
 	_finddata_t find;
 	
 	find_handle = _findfirst( filespec, &find );
 	if (find_handle != -1) {
 		do {
-			if (num_files >= max)			
+			if (num_files >= max)
 				break;
 
 			if (!(find.attrib & _A_SUBDIR)) {
@@ -1202,44 +1010,7 @@ int cf_get_file_list_preallocated( int max, char arr[][MAX_FILENAME_LEN], char *
 
 		_findclose( find_handle );
 	}
-
-#elif defined unix
-	char base_filespec[MAX_PATH_LEN];
-	cf_create_default_path_string( base_filespec, pathtype );
-	int base_filespec_len = strlen(base_filespec);
-	glob_t globinfo;
-	memset(&globinfo, 0, sizeof(globinfo));
-	int status = glob(filespec, 0, NULL, &globinfo);
-	if (status == 0) {
-		for (unsigned int i = 0;  i < globinfo.gl_pathc;  i++) {
-			// Determine if this is a regular file
-			struct stat statbuf;
-			memset(&statbuf, 0, sizeof(statbuf));
-			stat(globinfo.gl_pathv[i], &statbuf);
-			if (S_ISREG(statbuf.st_mode)) {
-				if ( !Get_file_list_filter || (*Get_file_list_filter)(globinfo.gl_pathv[i]) ) {
-					
-					char *found_file = globinfo.gl_pathv[i];
-					Assert(strncmp(found_file, base_filespec, base_filespec_len) == 0);
-					found_file += base_filespec_len;
-
-					strncpy(arr[num_files], found_file, MAX_FILENAME_LEN - 1 );
-					char *ptr = strrchr(arr[num_files], '.');
-					if ( ptr ) {
-						*ptr = 0;
-					}
-
-					if (info)	{
-						info[num_files].write_time = statbuf.st_mtime;
-					}
-					
-					num_files++;
-				}
-			}
-		}
-		globfree(&globinfo);
-	}
-#endif
+		
 
 	// Search all the packfiles and CD.
 	if ( !Skip_packfile_search )	{
@@ -1252,7 +1023,6 @@ int cf_get_file_list_preallocated( int max, char arr[][MAX_FILENAME_LEN], char *
 			}
 
 			if (num_files >= max)
-						
 				break;
 
 			if ( !cf_matches_spec( filter,f->name_ext))	{
@@ -1293,7 +1063,6 @@ int cf_get_file_list_preallocated( int max, char arr[][MAX_FILENAME_LEN], char *
 	}
 
 	Get_file_list_filter = NULL;
-
 	return num_files;
 }
 
@@ -1326,7 +1095,7 @@ void cf_create_default_path_string( char *path, int pathtype, char *filename, bo
 
 		// Don't add slash for root directory
 		if (Pathtypes[pathtype].path[0] != '\0') {
-		strcat(path, DIR_SEPARATOR_STR);
+			strcat(path, "\\");
 		}
 
 		// add filename

fs2_open/code/cfile/cfilesystem.h

@@ -9,8 +9,8 @@
 
 /*
  * $Logfile: /Freespace2/code/CFile/CfileSystem.h $
- * $Revision: 2.0 $
- * $Date: 2002-06-03 04:02:21 $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:56 $
  * $Author: penguin $
  *
  * Functions to keep track of and find files that can exist

fs2_open/code/cfilearchiver/cfilearchiver.cpp

@@ -9,8 +9,8 @@
 
 /*
  * $Logfile: /Freespace2/code/Cfilearchiver/CfileArchiver.cpp $
- * $Revision: 2.0 $
- * $Date: 2002-06-03 04:02:21 $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:56 $
  * $Author: penguin $
  *
  * Program to create an archive file for use with cfile stuff

fs2_open/code/cmdline/cmdline.cpp

@@ -9,69 +9,11 @@
 
 /*
  * $Logfile: /Freespace2/code/Cmdline/cmdline.cpp $
- * $Revision: 2.17 $
- * $Date: 2003-02-22 04:13:17 $
- * $Author: wmcoolmon $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:56 $
+ * $Author: penguin $
  *
  * $Log: not supported by cvs2svn $
- * 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/12/14 17:09:08  phreak
- * added a command line that displays frames per second when enabled.
- * use "-fps"
- *
- * Revision 2.11  2002/11/10 16:32:42  DTP
- * -DTP reworked mod support,
- *
- * Revision 2.10  2002/11/10 16:30:53  DTP
- * -DTP reworked mod support,
- *
- * Revision 2.9  2002/10/27 23:55:36  DTP
- * DTP; started basic implementation of mod-support
- * plain files only for now. fs2_open.exe -mod X will look for files in fs2/ X /all-legal-subdirectories. no checking/creating dirs yet. directories must be there.
- *
- * Revision 2.8  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.7  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.6  2002/08/27 13:38:57  penguin
- * Moved DirectX8 stuff to directx8 branch; reverted to previous
- *
- * Revision 2.4  2002/08/07 00:44:13  DTP
- * Implented -GF4FIX commandline switch
- *
- * Revision 2.3  2002/08/01 01:41:04  penguin
- * The big include file move
- *
- * 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.3  2002/05/08 17:29:17  mharris
- * more port tweaks
- *
- * Revision 1.2  2002/05/07 13:22:14  mharris
- * added pstypes.h include
- *
  * Revision 1.1  2002/05/02 18:03:04  mharris
  * Initial checkin - converted filenames and includes to lower case
  *
@@ -248,12 +190,11 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include "globalincs/pstypes.h"
-#include "cmdline/cmdline.h"
-#include "globalincs/linklist.h"
-#include "globalincs/systemvars.h"
-#include "network/multi.h"
-#include "cfile/cfile.h"
+#include "cmdline.h"
+#include "linklist.h"
+#include "systemvars.h"
+#include "multi.h"
+#include "cfile.h"
 
 // variables
 class cmdline_parm {
@@ -293,13 +234,6 @@ cmdline_parm d3d_32bit("-32bit", NULL);
 cmdline_parm mouse_coords("-coords", NULL);
 cmdline_parm timeout("-timeout", NULL);
 cmdline_parm d3d_window("-window", NULL);
-cmdline_parm almission_arg("-almission", NULL); //DTP for autoload Multi mission
-cmdline_parm gf4fix_arg("-GF4FIX", NULL); //DTP for random tigers GF4fix
-cmdline_parm allslev_arg("-ALLSLEV", NULL); //Give access to all single player missions
-cmdline_parm phreak_arg("-phreak", NULL); // Change to phreaks options including new targetting code
-cmdline_parm dshowvid_arg("-dshowvid", NULL); // Allows video streaming
-cmdline_parm mod_arg("-mod", NULL); //DTP modsupport
-cmdline_parm fps_arg("-fps", NULL);
 
 int Cmdline_multi_stream_chat_to_file = 0;
 int Cmdline_freespace_no_sound = 0;
@@ -317,8 +251,6 @@ char *Cmdline_game_password = NULL;
 char *Cmdline_rank_above= NULL;
 char *Cmdline_rank_below = NULL;
 char *Cmdline_connect_addr = NULL;
-char *Cmdline_almission = NULL;	//DTP for autoload multi mission.
-char *Cmdline_mod = NULL; //DTP for mod arguement
 int Cmdline_multi_log = 0;
 int Cmdline_server_firing = 0;
 int Cmdline_client_dodamage = 0;
@@ -328,14 +260,6 @@ int Cmdline_mouse_coords = 0;
 int Cmdline_timeout = -1;
 
 int Cmdline_window = 0;
-int Cmdline_gf4fix = 0; // DTP for randomstigers GF4 fix.
-int Cmdline_allslev = 0;
-int Cmdline_phreak	= 0;
-int Cmdline_dshowvid = 0;
-int Cmdline_show_fps = 0;
-
-
-
 
 static cmdline_parm Parm_list(NULL, NULL);
 static int Parm_list_inited = 0;
@@ -484,8 +408,10 @@ void os_init_cmdline(char *cmdline)
 	}
 
 
+
 	os_parse_parms(cmdline);
 	os_validate_parms(cmdline);
+
 }
 
 
@@ -551,39 +477,9 @@ char *cmdline_parm::str()
 }
 
 // external entry point into this modules
-#ifdef _WIN32
 int parse_cmdline(char *cmdline)
-#else
-int parse_cmdline(int argc, char *argv[])
-#endif
 {
-   #ifdef _WIN32
 	os_init_cmdline(cmdline);
-   #else
-	if (argc > 1) {
-		// kind of silly -- combine arg list into single string for parsing,
-		// but it fits with the win32-centric existing code.
-		char *cmdline = NULL;
-		unsigned int arglen = 0;
-		int i;
-		for (i = 1;  i < argc;  i++)
-			arglen += strlen(argv[i]);
-		if (argc > 2)
-			arglen += argc - 2; // leave room for the separators
-		cmdline = new char [arglen+1];
-		i = 1;
-		strcpy(cmdline, argv[i]);
-		for ( ; i < argc;  i++) {
-			strcat(cmdline, " ");
-			strcat(cmdline, argv[i]);
-		}
-		os_init_cmdline(cmdline);
-		delete [] cmdline;
-	} else {
-		// no cmdline args
-		os_init_cmdline("");
-	}
-   #endif
 
 	// is this a standalone server??
 	if (standalone_arg.found()) {
@@ -694,37 +590,6 @@ int parse_cmdline(int argc, char *argv[])
 	if(d3d_window.found()){
 		Cmdline_window = 1;
 	}
-	if(almission_arg.found()){//DTP for autoload mission // developer oritentated
-		Cmdline_almission = almission_arg.str();
-		Cmdline_use_last_pilot = 1;
-		Cmdline_start_netgame = 1;
-	}
-	if (gf4fix_arg.found() ) {
-		Cmdline_gf4fix = 1;
-	}
-
-	if (allslev_arg.found() ) {
-		Cmdline_allslev = 1;
-	}
-
-	if(phreak_arg.found() ) {
-		Cmdline_phreak = 1;
-	}
-
-	if(dshowvid_arg.found() ) {
-		Cmdline_dshowvid = 1;
-	}
-
-	if(mod_arg.found() ) {
-		Cmdline_mod = mod_arg.str();
-	}
-
-
-	if (fps_arg.found())
-	{
-		Cmdline_show_fps = 1;
-	}
 
 	return 1;
 }
-

fs2_open/code/cmdline/cmdline.h

@@ -5,63 +5,15 @@
  * or otherwise commercially exploit the source or things you created based on the 
  * source.
  *
-
 */ 
 
 /*
  * $Logfile: /Freespace2/code/Cmdline/cmdline.h $
- * $Revision: 2.17 $
- * $Date: 2003-02-22 04:13:17 $
- * $Author: wmcoolmon $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:56 $
+ * $Author: penguin $
  *
  * $Log: not supported by cvs2svn $
- * 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  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
  *
@@ -199,11 +151,7 @@
 #ifndef FS_CMDLINE_HEADER_FILE
 #define FS_CMDLINE_HEADER_FILE
 
-#ifdef _WIN32
 int parse_cmdline(char *cmdline);
-#else
-int parse_cmdline(int argc, char *argv[]);
-#endif
 
 // COMMAND LINE SETTINGS
 // This section is for reference by all the *_init() functions. For example, the multiplayer init function
@@ -236,14 +184,5 @@ extern int Cmdline_mouse_coords;
 extern int Cmdline_timeout;
 
 extern int Cmdline_window;
-extern char *Cmdline_almission;	//DTP for autoload mission
-extern int Cmdline_gf4fix;	//DTP for Random tigers GF4fix.
-extern int Cmdline_allslev;
-extern int Cmdline_phreak;
-extern int Cmdline_dshowvid;	//WMC Toggles movie playing support
-extern char *Cmdline_mod; //DTP for mod support
-extern int Cmdline_show_fps;//DTP moved here because it is the correct place for it to be.
-
-
 
 #endif

fs2_open/code/cmeasure/cmeasure.cpp

@@ -9,19 +9,13 @@
 
 /*
  * $Logfile: /Freespace2/code/CMeasure/CMeasure.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:56 $
  * $Author: penguin $
  *
  * Counter measures.  Created by Mike Kulas, May 12, 1997.
  *
  * $Log: not supported by cvs2svn $
- * Revision 2.0  2002/06/03 04:02:21  penguin
- * Warpcore CVS sync
- *
- * Revision 1.2  2002/05/03 22:07:08  mharris
- * got some stuff to compile
- *
  * Revision 1.1  2002/05/02 18:03:04  mharris
  * Initial checkin - converted filenames and includes to lower case
  *
@@ -208,26 +202,26 @@
  * $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 "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 "pstypes.h"
+#include "systemvars.h"
+#include "cmeasure.h"
+#include "freespace.h"
+#include "vecmat.h"
+#include "2d.h"
+#include "3d.h"
+#include "model.h"
+#include "physics.h"
+#include "floating.h"
+#include "model.h"
+#include "ship.h"
+#include "timer.h"
+#include "fireballs.h"
+#include "radar.h"
+#include "missionparse.h"		// For MAX_SPECIES_NAMES
+#include "gamesnd.h"
+#include "objectsnd.h"
+#include "sound.h"
+#include "staticrand.h"
 
 cmeasure_info Cmeasure_info[MAX_CMEASURE_TYPES];
 cmeasure Cmeasures[MAX_CMEASURES];
@@ -451,7 +445,7 @@ int cmeasure_create( object * source_obj, vector * pos, int cm_type, int rand_va
 
 	vector vel, rand_vec;
 
-	vm_vec_scale_add(&vel, &source_obj->phys_info.vel, &source_obj->orient.vec.fvec, -25.0f);
+	vm_vec_scale_add(&vel, &source_obj->phys_info.vel, &source_obj->orient.fvec, -25.0f);
 
 	static_randvec(arand+1, &rand_vec);
 
@@ -466,8 +460,8 @@ int cmeasure_create( object * source_obj, vector * pos, int cm_type, int rand_va
 	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 );
+	obj->phys_info.max_vel.z = -25.0f;
+	vm_vec_copy_scale(&obj->phys_info.desired_vel, &obj->orient.fvec, obj->phys_info.max_vel.z );
 
 	vm_vec_zero(&obj->phys_info.max_rotvel);	// make so he can't change speed on his own VOLITION anymore.
 

fs2_open/code/cmeasure/cmeasure.h

@@ -9,16 +9,13 @@
 
 /*
  * $Logfile: /Freespace2/code/CMeasure/CMeasure.h $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:56 $
  * $Author: penguin $
  *
  * Counter measures.  Created by Mike Kulas, May 12, 1997.
  *
  * $Log: not supported by cvs2svn $
- * 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
  *
@@ -115,8 +112,8 @@
 #ifndef _CMEASURE_H
 #define _CMEASURE_H
 
-#include "parse/parselo.h"
-#include "object/object.h"
+#include "parselo.h"
+#include "object.h"
 
 #define MAX_CMEASURES 64
 

fs2_open/code/controlconfig/controlsconfig.cpp

@@ -9,25 +9,13 @@
 
 /*
  * $Logfile: /Freespace2/code/ControlConfig/ControlsConfig.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:56 $
  * $Author: penguin $
  *
  * C module for keyboard, joystick and mouse configuration
  *
  * $Log: not supported by cvs2svn $
- * Revision 2.0  2002/06/03 04:02:21  penguin
- * Warpcore CVS sync
- *
- * Revision 1.4  2002/05/16 06:06:23  mharris
- * ifndef NO_JOYSTICK
- *
- * Revision 1.3  2002/05/10 20:42:43  mharris
- * use "ifndef NO_NETWORK" all over the place
- *
- * Revision 1.2  2002/05/10 06:08:08  mharris
- * Porting... added ifndef NO_SOUND
- *
  * Revision 1.1  2002/05/02 18:03:04  mharris
  * Initial checkin - converted filenames and includes to lower case
  *
@@ -303,34 +291,31 @@
  *
 */
 
-#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 "freespace.h"
+#include "controlsconfig.h"
+#include "gamesequence.h"
+#include "player.h"
+#include "2d.h"
+#include "hudsquadmsg.h"
+#include "key.h"
+#include "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"
-#endif
+#include "mouse.h"
+#include "ui.h"
+#include "joy.h"
+#include "bmpman.h"
+#include "sound.h"
+#include "gamesnd.h"
+#include "missionscreencommon.h"
+#include "font.h"
+#include "hud.h"
+#include "managepilot.h"
+#include "multi_pmsg.h"
+#include "contexthelp.h"
+#include "popup.h"
+#include "uidefs.h"
+#include "multiutil.h"
+#include "alphacolors.h"
 
 #define NUM_SYSTEM_KEYS			14
 #define NUM_BUTTONS				19
@@ -1152,15 +1137,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 +1152,6 @@ int control_config_axis_default(int axis)
 	}
 
 	return Axis_map_to_defaults[axis];
-#else
-	return -1;
-#endif
 }
 
 int control_config_do_reset()
@@ -1349,7 +1328,7 @@ void control_config_do_bind()
 	CC_Buttons[gr_screen.res][CANCEL_BUTTON].button.set_hotkey(KEY_ESC);
 
 	for (i=0; i<JOY_TOTAL_BUTTONS; i++){
-		joy_down_count(i, 1);  // clear checking status of all joystick buttons
+		joy_down_count(i);  // clear checking status of all joystick buttons
 	}
 
 	control_config_detect_axis_reset();
@@ -1377,7 +1356,7 @@ void control_config_do_search()
 	CC_Buttons[gr_screen.res][CANCEL_BUTTON].button.set_hotkey(KEY_ESC);
 
 	for (i=0; i<JOY_TOTAL_BUTTONS; i++){
-		joy_down_count(i, 1);  // clear checking status of all joystick buttons
+		joy_down_count(i);  // clear checking status of all joystick buttons
 	}
 
 	Binding_mode = 0;
@@ -1725,7 +1704,7 @@ void control_config_do_frame(float frametime)
 					bind = 1;
 
 				for (i=0; i<JOY_TOTAL_BUTTONS; i++)
-					if (joy_down_count(i, 1))
+					if (joy_down_count(i))
 						bind = 1;
 
 				if (bind) {
@@ -1806,7 +1785,7 @@ void control_config_do_frame(float frametime)
 				}
 
 				for (i=0; i<JOY_TOTAL_BUTTONS; i++)
-					if (joy_down_count(i, 1)) {
+					if (joy_down_count(i)) {
 						z = Cc_lines[Selected_line].cc_index;
 						Assert(!(z & JOY_AXIS));
 						control_config_bind_joy(z, i);
@@ -1891,7 +1870,7 @@ void control_config_do_frame(float frametime)
 			}
 
 			for (i=0; i<JOY_TOTAL_BUTTONS; i++)
-				if (joy_down_count(i, 1)) {
+				if (joy_down_count(i)) {
 					j = i;
 					for (i=0; i<CCFG_MAX; i++)
 						if (Control_config[i].joy_id == j) {
@@ -2399,15 +2378,13 @@ 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)) {
+		if (joy_down(Control_config[id].joy_id) || joy_down_count(Control_config[id].joy_id)) {
 			control_used(id);
 			return 1;
 		}
@@ -2447,7 +2424,7 @@ int check_control(int id, int key)
 		return 0;
 	}
 
-	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)) {
+	if ((Control_config[id].key_id == key) || joy_down_count(Control_config[id].joy_id) || mouse_down_count(1 << Control_config[id].joy_id)) {
 		control_used(id);
 		return 1;
 	}

fs2_open/code/controlconfig/controlsconfig.h

@@ -9,26 +9,13 @@
 
 /*
  * $Logfile: /Freespace2/code/ControlConfig/ControlsConfig.h $
- * $Revision: 2.4 $
- * $Date: 2002-12-02 23:52:02 $
- * $Author: Goober5000 $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:56 $
+ * $Author: penguin $
  *
  * Header file for keyboard, joystick and mouse configuration
  *
  * $Log: not supported by cvs2svn $
- * 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
- *
- * Revision 2.1  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.
- *
- * 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
  *
@@ -305,7 +292,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
+	char tab;				// what tab (catagory) it belongs in
 	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
@@ -458,15 +445,8 @@ typedef struct config_item {
 
 #define MULTI_SELF_DESTRUCT							106
 
-#define TOGGLE_HUD							107
-#define RIGHT_SLIDE_THRUST									108
-#define LEFT_SLIDE_THRUST									109
-#define UP_SLIDE_THRUST									110
-#define DOWN_SLIDE_THRUST									111
-
-
 // this should be the total number of control action defines above (or last define + 1)
-#define CCFG_MAX 112
+#define CCFG_MAX 107
 
 extern int Failed_key_index;
 extern int Invert_heading;

fs2_open/code/controlconfig/controlsconfigcommon.cpp

@@ -9,23 +9,13 @@
 
 /*
  * $Logfile: /Freespace2/code/ControlConfig/ControlsConfigCommon.cpp $
- * $Revision: 2.3 $
- * $Date: 2002-10-19 19:29:27 $
- * $Author: bobboau $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:56 $
+ * $Author: penguin $
  *
  * C module for keyboard, joystick and mouse configuration common stuff (between Fred and FreeSpace)
  *
  * $Log: not supported by cvs2svn $
- * 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.
- *
- * 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
- *
  * Revision 1.1  2002/05/02 18:03:04  mharris
  * Initial checkin - converted filenames and includes to lower case
  *
@@ -382,10 +372,10 @@
  *
 */
 
-#include "controlconfig/controlsconfig.h"
-#include "io/key.h"
-#include "io/joy.h"
-#include "localization/localize.h"
+#include "controlsconfig.h"
+#include "key.h"
+#include "joy.h"
+#include "localize.h"
 
 #define TARGET_TAB			0
 #define SHIP_TAB				1
@@ -543,13 +533,6 @@ config_item Control_config[CCFG_MAX + 1] = {
 	{				  KEY_SHIFTED | KEY_N,				-1, COMPUTER_TAB, "(Multiplayer) Toggle network info"},
 	{				  KEY_SHIFTED | KEY_END,			-1, COMPUTER_TAB, "(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},
-
 	{                           -1,					-1, -1,				"" }
 };
 

fs2_open/code/cryptstring/cryptstring.cpp

@@ -9,16 +9,13 @@
 
 /*
  * $Logfile: /Freespace2/code/Cryptstring/cryptstring.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:56 $
  * $Author: penguin $
  *
  * Applet for crypting strings.
  *
  * $Log: not supported by cvs2svn $
- * 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,7 +28,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "globalincs/crypt.h"
+#include "crypt.h"
 
 int main(int argc, char **argv)
 {

fs2_open/code/cutscene/cutscenes.cpp

@@ -9,31 +9,13 @@
 
 /*
  * $Logfile: /Freespace2/code/Cutscene/Cutscenes.cpp $
- * $Revision: 2.4 $
- * $Date: 2002-08-27 13:38:57 $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:56 $
  * $Author: penguin $
  *
  * Code for the cutscenes viewer screen
  *
  * $Log: not supported by cvs2svn $
- * 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
- *
- * Revision 2.0  2002/06/03 04:02:21  penguin
- * Warpcore CVS sync
- *
- * Revision 1.4  2002/05/16 00:39:47  mharris
- * Added ifdef WIN32 around cd stuff
- *
- * Revision 1.3  2002/05/13 21:43:37  mharris
- * A little more network and sound cleanup
- *
- * Revision 1.2  2002/05/07 02:57:33  mharris
- * make Buttons[] static
- *
  * Revision 1.1  2002/05/02 18:03:04  mharris
  * Initial checkin - converted filenames and includes to lower case
  *
@@ -153,19 +135,19 @@
  * $NoKeywords: $
  */
 
-#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 "cutscenes.h"
+#include "ui.h"
+#include "cfile.h"
+#include "gamesnd.h"
+#include "gamesequence.h"
+#include "freespace.h"
+#include "key.h"
+#include "bmpman.h"
 // #include "movie.h"
-#include "popup/popup.h"
-#include "menuui/mainhallmenu.h"
-#include "globalincs/alphacolors.h"
-#include "localization/localize.h"
+#include "popup.h"
+#include "mainhallmenu.h"
+#include "alphacolors.h"
+#include "localize.h"
 
 char *Cutscene_bitmap_name[GR_NUM_RESOLUTIONS] = {
 	"ViewFootage",
@@ -181,7 +163,7 @@ 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.
+extern int All_movies_enabled;		//	If set, all movies may be viewed.  Keyed off cheat code.
 
 // initialization stuff for cutscenes
 void cutscene_init()
@@ -232,7 +214,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,9 +227,6 @@ 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
@@ -285,7 +263,7 @@ static int Background_bitmap;
 static UI_BUTTON List_region;
 static UI_WINDOW Ui_window;
 
-static ui_button_info Buttons[GR_NUM_RESOLUTIONS][NUM_BUTTONS] = {
+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
@@ -366,7 +344,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;
@@ -434,9 +411,6 @@ int cutscenes_validate_cd(char *mve_name, int prompt_for_cd)
 	}
 
 	return cd_present;
-#else  // !WIN32
-	return 0;
-#endif // ifdef WIN32
 }
 
 void cutscenes_screen_play()
@@ -611,8 +585,8 @@ void cutscenes_screen_init()
 	//Cutscenes_viewable = 0xffffffff;			// makes all cutscenes viewble.
 #endif
 
-//  	if (All_movies_enabled)
-//  		Cutscenes_viewable = 0xffffffff;		//	Cheat code enables all movies.
+	if (All_movies_enabled)
+		Cutscenes_viewable = 0xffffffff;		//	Cheat code enables all movies.
 
 	Num_files = 0;
 	for ( i = 0; i < Num_cutscenes; i++ ) {

fs2_open/code/cutscene/cutscenes.h

@@ -9,16 +9,13 @@
 
 /*
  * $Logfile: /Freespace2/code/Cutscene/Cutscenes.h $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:56 $
  * $Author: penguin $
  *
  * Code for the cutscenes viewer screen
  *
  * $Log: not supported by cvs2svn $
- * 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
  *
@@ -53,7 +50,7 @@
 #ifndef _FREESPACE_CUTSCENES_SCREEN_HEADER_FILE
 #define _FREESPACE_CUTSCENES_SCREEN_HEADER_FILE
 
-#include "parse/parselo.h"
+#include "parselo.h"
 
 #define MAX_CUTSCENES	10
 

fs2_open/code/cutscene/movie.cpp

@@ -1,150 +0,0 @@
-#include <windows.h>
-
-#include "movie.h"
-#include "directx/dx8show.h"
-#include "osapi/osapi.h"
-#include "cmdline/cmdline.h"	
-#include "graphics/2d.h"
-#include "debugconsole/dbugfile.h" 
-
-bool movie_shutdown_fgx = false;
-
-void movie_set_shutdown_fgx(bool state)
-{
-	movie_shutdown_fgx = state;
-}
-
-bool movie_play(char *name, int unknown_value)
-{
-	// This should not be uncommented
- 	if(!Cmdline_dshowvid)
-	{
-  		return true;
-	}
-
-	/*
-	** Check file exists
-	*/
-	FILE *fp = fopen(name,"rb");
-	DBUGFILE_OUTPUT_1("About to play: %s",name);
-		
-	if(fp == NULL)
-	{
-		DBUGFILE_OUTPUT_0("MOVIE ERROR: Cant open movie file");
-		return true;
-	}
-
-	fclose(fp);
-
-	if(movie_shutdown_fgx == true)
-	{
-		gr_activate(0);
-	}
-
-#ifdef _WIN32
-	 os_app_activate_set(false);
-
-	dx8show_set_hwnd((void *) os_get_window());
-
- //		ShowWindow((HWND) os_get_window(),SW_HIDE);
- // 	ShowWindow((HWND) os_get_window(),SW_MINIMIZE);
-
-  	dx8show_play_cutscene(name);
-
- //		ShowWindow((HWND) os_get_window(),SW_RESTORE);
- //		ShowWindow((HWND) os_get_window(),SW_SHOW);
-
-	os_app_activate_set(true);
-
-	/*
-	// Comment this back in if the freespace window isnt coming back after the movie ends
-
-	if((HWND) os_get_window() != NULL)
-	{
-		if(GetForegroundWindow() != (HWND) os_get_window())
-		{
-			DBUGFILE_OUTPUT_0("Using SetForegroundWindow last");
- 			SetForegroundWindow((HWND) os_get_window());
-		}
-	}
-	*/
- 
-#endif // _WIN32
-
-	if(movie_shutdown_fgx == true)
-	{
-		gr_activate(1);
-	}
-
-	return true;
-}
-
-bool movie_play_two(char *name1, char *name2, int unknown_value)
-{
-	bool result = true;
-
-	// This should not be uncommented
- 	if(!Cmdline_dshowvid)
-	{
-  		return true;
-	}
-
-	/*
-	** Check file exists
-	*/
-	FILE *fp = fopen(name1,"rb");
-	DBUGFILE_OUTPUT_1("About to play: %s",name1);
-		
-	if(fp == NULL)
-	{
-		DBUGFILE_OUTPUT_0("MOVIE ERROR: Cant open movie file");
-		
-		/*
-		** Check second file exists
-		*/
-		FILE *fp2 = fopen(name2,"rb");
-		DBUGFILE_OUTPUT_1("About to play: %s",name2);
-		
-		if(fp2 == NULL)
-		{
-			DBUGFILE_OUTPUT_0("MOVIE ERROR: Cant open movie file");
-			return true;
-		}
-
-		fclose(fp2);
-	}
-
-	fclose(fp);
-
-	if(movie_shutdown_fgx == true)
-	{
-		gr_activate(0);
-	}
-
-#ifdef _WIN32
-	 os_app_activate_set(false);
-		 
-  	dx8show_play_cutscene(name1);
-
-	{
-		MSG msg;
-   		while(PeekMessage(&msg, (HWND) os_get_window(), 0, 0, PM_REMOVE))
-   		{
-   			TranslateMessage(&msg);
-   			DispatchMessage(&msg);
-   		}
-	}
-
-	dx8show_play_cutscene(name2);
-
-	os_app_activate_set(true);
-#endif
-
-	if(movie_shutdown_fgx == true)
-	{
-		gr_activate(1);
-	}
-
-	return result;
-}
-

fs2_open/code/cutscene/movie.h

@@ -1,8 +0,0 @@
-#ifndef _MOVIE_HEADER_FILE
-#define _MOVIE_HEADER_FILE
-
-void movie_set_shutdown_fgx(bool state);
-bool movie_play(char *name, int unknown_value = 0);
-bool movie_play_two(char *name1, char *name2, int unknown_value = 0);
-
-#endif

fs2_open/code/ddsutils/ddsutils.cpp

@@ -1,175 +0,0 @@
-#include "ddsutils/ddsutils.h"
-#include "cfile/cfile.h"
-
-int Texture_compression_enabled=0;
-
-static int dds_read_header_internal(LPDDSURFACEDESC2 lpddsd, char *filename, int *width, int *height, int *bpp, int *compression_type)
-{
-	char code[5];
-	CFILE *ddsfile;
-	char real_name[MAX_FILENAME_LEN];
-	char *p;
-	int retval=DDS_ERROR_NONE;
-	int ct;
-	int bits=0;
-
-	//this better not happen.. ever
-	Assert(filename!=NULL);
-
-	//make sure there is an extension
-	strcpy(real_name, filename);
-	p=strchr(real_name, '.');
-	if (p) *p=0;
-	strcat(real_name, ".dds");
-
-	memset(code,0,sizeof(code));
-	//try to open the file
-	ddsfile = cfopen(real_name, "rb");
-
-	//file not found
-	if (!ddsfile)
-	{
-		return DDS_ERROR_INVALID_FILENAME;
-	}
-
-	//read the code
-	cfread(code,1,4,ddsfile);
-	code[4]=0;
-
-	//check it
-	if (strncmp(code,DDS_FILECODE,4)!=0)
-	{
-		return DDS_ERROR_BAD_HEADER;
-	}
-
-	//read the header
-	cfread(lpddsd,sizeof(DDSURFACEDESC2),1,ddsfile);
-
-	//stuff important info
-	if (width) *width=lpddsd->dwWidth;
-	if (height) *height=lpddsd->dwHeight;
-	
-	switch(lpddsd->ddpfPixelFormat.dwFourCC)
-	{
-		case FOURCC_DXT1:
-			bits=24;
-			ct=DDS_DXT1;
-			break;
-
-		case FOURCC_DXT3:
-			bits=32;
-			ct=DDS_DXT3;
-			break;
-
-		case FOURCC_DXT5:
-			bits=32;
-			ct=DDS_DXT5;
-			break;
-
-		//dxt2 and dxt4 aren't supported
-		case FOURCC_DXT2:
-		case FOURCC_DXT4:
-			retval=DDS_ERROR_INVALID_FORMAT;
-			ct=DDS_DXT_INVALID;
-			break;
-
-		//none of the above
-		default:
-			retval=DDS_ERROR_UNCOMPRESSED;
-			ct=DDS_DXT_INVALID;
-			break;
-	}
-
-	if (bpp) *bpp=bits;
-	if (compression_type) *compression_type=ct;
-
-	//close file and return
-	cfclose(ddsfile);
-	return retval;
-}
-
-int dds_read_header(char *filename, int *width, int *height, int *bpp, int *compression_type)
-{
-	DDSURFACEDESC2 ddsd;
-	return dds_read_header_internal(&ddsd, filename, width, height, bpp, compression_type);
-}
-
-//reads pixel info from a dds file
-int dds_read_bitmap(char *filename, int *size, uint* data)
-{
-	int retval;
-	DDSURFACEDESC2 ddsd;
-	int w,h,ct,bpp;
-	CFILE *cfp;
-	ubyte* tmp;
-
-	//this must be set
-	Assert(size!=NULL);
-	
-	//read the header -- if its at this stage, it should be legal.
-	retval=dds_read_header_internal(&ddsd, filename, &w, &h, &bpp, &ct);
-	Assert(retval==DDS_ERROR_NONE);
-
-	//get some more info from the surface
-	*size=ddsd.dwMipMapCount > 1 ? ddsd.dwLinearSize * 2 : ddsd.dwLinearSize;
-
-	//open it up and go to the data section
-	cfp=cfopen(filename,"rb");
-	cfseek(cfp,DDS_OFFSET, CF_SEEK_SET);
-
-	//get the data
-	tmp=(ubyte*)malloc(*size);
-	
-	if (!tmp)
-	{
-		cfclose(cfp);
-		return DDS_ERROR_NO_MEM;		//barf
-	}
-
-	cfread(tmp,1,*size,cfp);
-
-	*data=(uint)tmp;
-	//we look done here
-	cfclose(cfp);
-	return DDS_ERROR_NONE;
-}
-
-//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_NO_MEM:
-			return "Insufficient memory";
-
-		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 "File was compressed, but it was DXT2 or DXT4";
-			
-		case DDS_ERROR_UNCOMPRESSED:
-			return "*.DDS files must be compressed and use DXT1, DXT3, or DXT5 compression";
-
-		default:
-			return "Abort, retry, fail?";
-	}
-
-	//get a warning otherwise
-	return "Abort, retry, fail?";
-}
-
-
-	
-
-
-
-
-
-

fs2_open/code/ddsutils/ddsutils.h

@@ -1,119 +0,0 @@
-//header file to load .dds files
-//these use dxtc texture compression
-
-#ifndef __DDS_H
-#define __DDS_H
-
-#include "globalincs/pstypes.h"
-#include "directx/vddraw.h"
-
-#define DDS_ERROR_NONE					0		//everything went fine
-#define DDS_ERROR_INVALID_FILENAME		1		//bad filename
-#define DDS_ERROR_NO_MEM				2		//not enough mem to load
-#define DDS_ERROR_UNCOMPRESSED			3		//not using dxtc compression		
-#define DDS_ERROR_INVALID_FORMAT		4		//can only use dxtc1, dxtc3, dxtc5
-#define DDS_ERROR_BAD_HEADER			5		//header was not "DDS "
-
-
-#define DDS_DXT_INVALID				-1
-#define DDS_DXT1						1
-#define DDS_DXT3						3
-#define DDS_DXT5						5
-
-#ifndef MAKEFOURCC
-    #define MAKEFOURCC(ch0, ch1, ch2, ch3)                              \
-                ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) |   \
-                ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(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					"DDS "
-
-#ifndef DUMMYUNIONNAMEN
-#if defined(__cplusplus) || !defined(NONAMELESSUNION)
-#define DUMMYUNIONNAMEN(n)
-#else
-#define DUMMYUNIONNAMEN(n)      u##n
-#endif
-#endif
-
-
-//these structures are the headers for a dds file
-typedef struct _DDSCAPS2
-{
-    DWORD       dwCaps;         // capabilities of surface wanted
-    DWORD       dwCaps2;
-    DWORD       dwCaps3;
-    union
-    {
-        DWORD       dwCaps4;
-        DWORD       dwVolumeDepth;
-    } DUMMYUNIONNAMEN(1);
-} DDSCAPS2;
-
-typedef struct _DDSURFACEDESC2
-{
-    DWORD               dwSize;                 // size of the DDSURFACEDESC structure
-    DWORD               dwFlags;                // determines what fields are valid
-    DWORD               dwHeight;               // height of surface to be created
-    DWORD               dwWidth;                // width of input surface
-    union
-    {
-        LONG            lPitch;                 // distance to start of next line (return value only)
-        DWORD           dwLinearSize;           // Formless late-allocated optimized surface size
-    } DUMMYUNIONNAMEN(1);
-    union
-    {
-        DWORD           dwBackBufferCount;      // number of back buffers requested
-        DWORD           dwDepth;                // the depth if this is a volume texture 
-    } DUMMYUNIONNAMEN(5);
-    union
-    {
-        DWORD           dwMipMapCount;          // number of mip-map levels requestde
-                                                // dwZBufferBitDepth removed, use ddpfPixelFormat one instead
-        DWORD           dwRefreshRate;          // refresh rate (used when display mode is described)
-        DWORD           dwSrcVBHandle;          // The source used in VB::Optimize
-    } DUMMYUNIONNAMEN(2);
-    DWORD               dwAlphaBitDepth;        // depth of alpha buffer requested
-    DWORD               dwReserved;             // reserved
-    LPVOID              lpSurface;              // pointer to the associated surface memory
-    union
-    {
-        DDCOLORKEY      ddckCKDestOverlay;      // color key for destination overlay use
-        DWORD           dwEmptyFaceColor;       // Physical color for empty cubemap faces
-    } DUMMYUNIONNAMEN(3);
-    DDCOLORKEY          ddckCKDestBlt;          // color key for destination blt use
-    DDCOLORKEY          ddckCKSrcOverlay;       // color key for source overlay use
-    DDCOLORKEY          ddckCKSrcBlt;           // color key for source blt use
-    union
-    {
-        DDPIXELFORMAT   ddpfPixelFormat;        // pixel format description of the surface
-        DWORD           dwFVF;                  // vertex format description of vertex buffers
-    } DUMMYUNIONNAMEN(4);
-    DDSCAPS2            ddsCaps;                // direct draw surface capabilities
-    DWORD               dwTextureStage;         // stage in multitexture cascade
-} DDSURFACEDESC2, FAR* LPDDSURFACEDESC2;
-
-#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, int *width, int *height, int *bpp, int *compression_type);
-
-//reads bitmap
-//size of the data it stored in size
-int dds_read_bitmap(char *filename, int *size, uint* data);
-
-//returns a string from a DDS error code
-const char* dds_error_string(int code);
-
-extern int Texture_compression_enabled;
-
-#endif //__DDS_H

fs2_open/code/debris/debris.cpp

@@ -9,25 +9,13 @@
 
 /*
  * $Logfile: /Freespace2/code/Debris/Debris.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:56 $
  * $Author: penguin $
  *
  * Code for the pieces of exploding object debris.
  *
  * $Log: not supported by cvs2svn $
- * Revision 2.0  2002/06/03 04:02:21  penguin
- * Warpcore CVS sync
- *
- * Revision 1.4  2002/05/13 21:43:37  mharris
- * A little more network and sound cleanup
- *
- * Revision 1.3  2002/05/10 20:42:43  mharris
- * use "ifndef NO_NETWORK" all over the place
- *
- * Revision 1.2  2002/05/03 22:07:08  mharris
- * got some stuff to compile
- *
  * Revision 1.1  2002/05/02 18:03:04  mharris
  * Initial checkin - converted filenames and includes to lower case
  *
@@ -220,27 +208,24 @@
  * $NoKeywords: $
  */
 
-#include "render/3d.h"
-#include "bmpman/bmpman.h"
-#include "object/object.h"
-#include "debris/debris.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 "network/multi.h"
-#include "network/multimsgs.h"
-#include "network/multiutil.h"
-#endif
+#include "3d.h"
+#include "bmpman.h"
+#include "object.h"
+#include "debris.h"
+#include "fireballs.h"
+#include "radar.h"
+#include "missionparse.h"		// For MAX_SPECIES_NAMES
+#include "gamesnd.h"
+#include "objectsnd.h"
+#include "linklist.h"
+#include "systemvars.h"
+#include "multi.h"
+#include "multimsgs.h"
+#include "particle.h"
+#include "freespace.h"
+#include "multiutil.h"
+#include "objcollide.h"
+#include "timer.h"
 
 #define MAX_LIFE									10.0f
 #define MIN_RADIUS_FOR_PERSISTANT_DEBRIS	50		// ship radius at which debris from it becomes persistant
@@ -285,10 +270,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);
@@ -512,9 +495,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 {
@@ -794,11 +775,9 @@ object *debris_create(object *source_obj, int model_num, int submodel_num, vecto
 	// 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!
 
@@ -973,12 +952,10 @@ void debris_hit(object *debris_obj, object *other_obj, vector *hitpos, float dam
 		particle_emit( &pe, PARTICLE_FIRE, 0 );
 	}
 
-#ifndef NO_NETWORK
 	// multiplayer clients bail here
 	if(MULTIPLAYER_CLIENT){
 		return;
 	}
-#endif
 
 	if ( damage < 0.0f ) {
 		damage = 0.0f;
@@ -990,11 +967,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
 	}
 }
 
@@ -1112,8 +1087,7 @@ int debris_check_collision(object *pdebris, object *other_obj, vector *hitpos, c
 				pm = model_get(Ships[heavy_obj->instance].modelnum);
 
 				// turn off all rotating submodels and test for collision
-				int i;
-				for (i=0; i<num_rotating_submodels; i++) {
+				for (int i=0; i<num_rotating_submodels; i++) {
 					pm->submodel[submodel_list[i]].blown_off = 1;
 				}
 
@@ -1273,25 +1247,25 @@ int debris_get_team(object *objp)
 void calc_debris_physics_properties( physics_info *pi, vector *mins, vector *maxs )
 {
 	float dx, dy, dz, mass;
-	dx = maxs->xyz.x - mins->xyz.x;
-	dy = maxs->xyz.y - mins->xyz.y;
-	dz = maxs->xyz.z - mins->xyz.z;
+	dx = maxs->x - mins->x;
+	dy = maxs->y - mins->y;
+	dz = maxs->z - mins->z;
 
 	// John, with new bspgen, just set pi->mass = mass
 	mass = 0.12f * dx * dy * dz;
 	pi->mass = (float) pow(mass, 0.6666667f) * 4.65f;
 
-	pi->I_body_inv.vec.rvec.xyz.x = 12.0f / (pi->mass *  (dy*dy + dz*dz));
-	pi->I_body_inv.vec.rvec.xyz.y = 0.0f;
-	pi->I_body_inv.vec.rvec.xyz.z = 0.0f;
+	pi->I_body_inv.rvec.x = 12.0f / (pi->mass *  (dy*dy + dz*dz));
+	pi->I_body_inv.rvec.y = 0.0f;
+	pi->I_body_inv.rvec.z = 0.0f;
 
-	pi->I_body_inv.vec.uvec.xyz.x = 0.0f;
-	pi->I_body_inv.vec.uvec.xyz.y = 12.0f / (pi->mass *  (dx*dx + dz*dz));
-	pi->I_body_inv.vec.uvec.xyz.z = 0.0f;
+	pi->I_body_inv.uvec.x = 0.0f;
+	pi->I_body_inv.uvec.y = 12.0f / (pi->mass *  (dx*dx + dz*dz));
+	pi->I_body_inv.uvec.z = 0.0f;
 
-	pi->I_body_inv.vec.fvec.xyz.x = 0.0f;
-	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));
+	pi->I_body_inv.fvec.x = 0.0f;
+	pi->I_body_inv.fvec.y = 0.0f;
+	pi->I_body_inv.fvec.z = 12.0f / (pi->mass *  (dx*dx + dy*dy));
 }
 
 

fs2_open/code/debris/debris.h

@@ -9,8 +9,8 @@
 
 /*
  * $Logfile: /Freespace2/code/Debris/Debris.h $
- * $Revision: 2.0 $
- * $Date: 2002-06-03 04:02:21 $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:56 $
  * $Author: penguin $
  *
  * Code for the pieces of exploding object debris.

fs2_open/code/debugconsole/console.cpp

@@ -9,16 +9,13 @@
 
 /*
  * $Logfile: /Freespace2/code/DebugConsole/Console.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:56 $
  * $Author: penguin $
  *
  * Routines for managing the debug console window.
  *
  * $Log: not supported by cvs2svn $
- * 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
  *
@@ -104,14 +101,14 @@
 #include <setjmp.h>
 #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 "pstypes.h"
+#include "freespace.h"
+#include "font.h"
+#include "timer.h"
+#include "2d.h"
+#include "key.h"
+#include "alphacolors.h"
+#include "osapi.h"
 
 #define MAX_COMMANDS 300
 

fs2_open/code/debugconsole/dbugfile.cpp

@@ -1,254 +0,0 @@
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
-#include <time.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/timeb.h>
-
-#include "dbugfile.h"
-
-bool dbugfile_init_var = false;
-
-char dbugfile_filename[512];
-
-void dbugfile_output(char *buffer)
-{
-	if(dbugfile_init_var == false)
-	{
-		return;
-	}
-
-
-	FILE *fp = fopen(dbugfile_filename, "a");
-	
-	if(fp == NULL)
-	{
-		return;
-	}
-
-	fwrite(buffer, sizeof(char) * strlen(buffer), 1, fp);
-	fclose(fp);
-}
-
-void dbugfile_init()
-{
-	char big_buffer[1000];
-	char temp_buff[512];
-
-	strcpy(dbugfile_filename, "DBUG-");
-	strcpy(big_buffer, "DBUGFILE Active: ");
-
-#ifdef _WIN32
-	{
-		unsigned long len = 512;
-		GetUserName(temp_buff, &len);
-		
-		strcat(dbugfile_filename, temp_buff);
-		strcat(big_buffer, temp_buff);
-		
-		strcat(dbugfile_filename, "-");
-		strcat(big_buffer, " ");
-	}
-#endif
-
-    _tzset();
-
-    // Display operating system-style date and time.
-    _strtime( temp_buff);
-	strcat(dbugfile_filename, "(");
-	strcat(dbugfile_filename,temp_buff);
-	strcat(big_buffer,temp_buff);
-
-	strcat(dbugfile_filename, ")-(");
-	strcat(big_buffer, " ");
-    _strdate( temp_buff);
-	strcat(dbugfile_filename,temp_buff);
-	strcat(big_buffer,temp_buff);
-
-	strcat(dbugfile_filename, ").txt");
-	strcat(big_buffer, "\n");
-
-	// Remove invalid slash chars
-	int len = strlen(dbugfile_filename);
-	while(len >= 0)
-	{
-		if(dbugfile_filename[len] == '/' || dbugfile_filename[len] == ':')
-		{
-			dbugfile_filename[len] = '-';
-		}
-		len--;
-	}
-
-	// open file
-	FILE *fp = fopen(dbugfile_filename, "w");
-
-	if(fp == NULL)
-	{
-		return;
-	}
-
-	fwrite(big_buffer, sizeof(char) * strlen(big_buffer), 1, fp);
-
-#ifdef _WIN32
-
-	// detect OS type
-
-	OSVERSIONINFO version_info;
-	version_info.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-
-	if(GetVersionEx(&version_info) != false)
-	{
-		char *error = "Error in detecting OS version";
-		char *version = error;
-
-		switch(version_info.dwMajorVersion)
-		{
-			case 4:
-			{
-				if(version_info.dwMinorVersion == 0)
-				{
-					version = "Windows 95"; 
-				}
-				else if(version_info.dwMinorVersion == 10)
-				{
-					version = "Windows 98";  
-				}
-				else if(version_info.dwMinorVersion == 90)
-				{
-					version = "Windows Me";
-				}
-				break;
-			}
-			case 5:
-			{
-				if(version_info.dwMinorVersion == 0)
-				{
-					version = "Windows 2000"; 
-				}
-				else if(version_info.dwMinorVersion == 1)
-				{
-					version = "Windows XP";
-				}
-				break;
-			}
-		}
-
-		char *release_type = NULL;
-#ifdef _DEBUG 
-		release_type = "Debug";
-#else
-		release_type = "Release";
-#endif
-		sprintf(big_buffer, "OS: %s %s\n", version, release_type);
-	}				  
-
-	fwrite(big_buffer, sizeof(char) * strlen(big_buffer), 1, fp);
-
-#endif
-
-	fclose(fp);
-
-	dbugfile_init_var = true;
-}
-
-void dbugfile_deinit()
-{
-	dbugfile_output("Normal end");
-	dbugfile_init_var = false;
-}
-
-void dbugfile_sprintf(int line, char *file, const char *format, ...)
-{
-	if(dbugfile_init_var == false)
-	{
-		return;
-	}
-
-	// find last slash (for PC) to crop file path
-	char *ptr = strrchr(file, '\\');
-
-	if(ptr == NULL)
-	{
-		ptr = file;
-	}
-	else
-	{
-		ptr++;
-	}
-
-	char buffer[1000];
-	int i =  sprintf(buffer, "[%s,%4d] ", ptr, line);
-
-	va_list ap;
-	char *p, *sval;
-	long ival;
-	double dval;
-
-	// Add each extra parameter to string
-	va_start(ap, format);
-
-	for(p = (char *) format; *p; p++)
-	{
-		if(*p != '%')
-		{
-			*(buffer + i) = *p;
-			i++;
-			continue;
-		}
-
-		p++;
-
-		switch(*p)
-		{
-			case 'd':
-			{
-				ival = va_arg(ap, int);
-				i += sprintf(buffer+i,"%d", ival);
-				break;
-			}
-			case 'c':
-			{
-				ival = va_arg(ap, char);
-				buffer[i] = (char) ival;
-				i++;
-				break;
-			}
-			case 'x':
-			{
-				ival = va_arg(ap, int);
-				i += sprintf(buffer+i,"%x", ival);
-				break;
-			}
-
-			case 'f':
-			{
-				dval = va_arg(ap, double);
-				i += sprintf(buffer+i,"%f", dval);
-				break;
-			}
-			case 's':
-			{
-				for(sval = va_arg(ap, char *); *sval; sval++)
-				{
-					*(buffer + i++) = *sval;
-				}
-				break;
-			}
-			default:
-			{
-				i += sprintf(buffer+i,"N/A: %%%c", *p);
-				break;
-			}
-		}
-	}
-
-	va_end(ap);
-
-	i += sprintf(buffer + i, "\n");
-
-	dbugfile_output(buffer);
-}
-
-

fs2_open/code/debugconsole/dbugfile.h

@@ -1,41 +0,0 @@
-#ifndef _DBUGFILE_HEADER_
-#define _DBUGFILE_HEADER_
-
-void dbugfile_init();
-void dbugfile_deinit();
-void dbugfile_sprintf(int line, char *file, const char *format, ...);
-
-#ifdef DBUGFILE_ACTIVE 
-
-#define DBUGFILE_INIT()   dbugfile_init();
-#define DBUGFILE_DEINIT() dbugfile_deinit();
-
-#define DBUGFILE_OUTPUT_0(t) dbugfile_sprintf(__LINE__, __FILE__, t);
-#define DBUGFILE_OUTPUT_1(t,a) dbugfile_sprintf(__LINE__, __FILE__, t,a);
-#define DBUGFILE_OUTPUT_2(t,a,b) dbugfile_sprintf(__LINE__, __FILE__, t,a,b);
-#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_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);
-
-#else
-
-#define DBUGFILE_INIT()   ;
-#define DBUGFILE_DEINIT() ;
-
-#define DBUGFILE_OUTPUT_0(t) ;
-#define DBUGFILE_OUTPUT_1(t,a) ;
-#define DBUGFILE_OUTPUT_2(t,a,b) ;
-#define DBUGFILE_OUTPUT_3(t,a,b,c) ;
-#define DBUGFILE_OUTPUT_4(t,a,b,c,d) ;
-#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) ;
-
-#endif
-
-#endif
-

fs2_open/code/debugconsole/timerbar.cpp

@@ -1,148 +0,0 @@
-#ifdef _WIN32
-#include <windows.h>
-#include <winbase.h>
-
-#include "dbugfile.h"
-#include "timerbar.h"
-
-typedef	struct 
-{
-	LARGE_INTEGER start_value;
-	LARGE_INTEGER total_value;
-
-	LARGE_INTEGER average;
-	LARGE_INTEGER frame_total;
-
-} timerbar_profile;
-
-timerbar_profile profiles[TIMERBAR_COLOUR_MAX];
-int timerbar_current_profile = 0;
-
-LARGE_INTEGER timerbar_ultimate_start_value;
-LARGE_INTEGER timerbar_last_start_value;
-
-void (*draw_func_ptr)(int colour, float x, float y, float w, float h) = NULL;
-
-void timerbar_start_frame()
-{
-	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;
-
-}
-
-const int WIDTH = 480;
-const float WIDTHF = ((float) WIDTH) * 1.05f;
-
-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 < TIMERBAR_COLOUR_MAX; i++)
-	{		
-		// Nothing to render this frame	 
-		if(profiles[i].frame_total.QuadPart == 0)
-		{
-			continue;
-		}
-
-		int xsize = (int) profiles[i].frame_total.QuadPart / 60;
-
-		// break condition in else
-		for (;;)
-		{
-			// 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 >= TIMERBAR_COLOUR_MAX)
-	{
-		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");
-	}
-}
-
-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;
-}
-
-
-#endif

fs2_open/code/debugconsole/timerbar.h

@@ -1,34 +0,0 @@
-#ifndef _TIMERBAR_HEADER_
-#define _TIMERBAR_HEADER_
-
-enum 
-{
-	TIMERBAR_COLOUR_RED,
-	TIMERBAR_COLOUR_GREEN,
-	TIMERBAR_COLOUR_BLUE,
-	TIMERBAR_COLOUR_MAX,
-};
-
-void timerbar_start_frame();
-void timerbar_end_frame();
-void timerbar_switch_type(int num);
-void timerbar_set_draw_func(void (*new_draw_func_ptr)(int colour, float x, float y, float w, float h));
-
-#ifdef TIMEBAR_ACTIVE 
-
-#define TIMERBAR_SET_DRAW_FUNC(f) timerbar_set_draw_func(f);
-#define TIMERBAR_START_FRAME()   timerbar_start_frame();
-#define TIMERBAR_END_FRAME()     timerbar_end_frame();
-#define TIMERBAR_SWITCH_TYPE(n)  timerbar_switch_type(n);
-
-#else
-
-#define TIMERBAR_SET_DRAW_FUNC(f) ;
-#define TIMERBAR_START_FRAME()   ;
-#define TIMERBAR_END_FRAME()     ;
-#define TIMERBAR_SWITCH_TYPE(n)  ;
-
-#endif
-
-#endif
-

fs2_open/code/decals/decals.cpp

@@ -1,824 +0,0 @@
-//sorce file for decals-Bobboau
-//and no, I don't have any idea what I'm doing
-
-#include "decals/decals.h"
-#include "ship/ship.h"
-#include "render/3d.h"
-#include "io/timer.h"
-#include "math/fvi.h"
-#include "lighting/lighting.h"
-
-//#define DECALS_ENABLED
-
-int decal_intersect_seg_with_cube(vector * poly_point, vector start, vector end, vector cube_point[8], matrix orient, int ints=1);
-
-int decal_intersect_poly_with_cube(vector * poly_point, vector point[3], vector cube_point[8], int ints);
-
-decal_model d_model;
-
-int poly_num = 0;
-
-static vector decal_cube_point[8];
-static vector decal_cube_plane[6][2];
-static vector decal_hit_point;
-static vector decal_hit_vect;
-static float decal_hit_radius;
-
-static matrix decal_orient;
-
-static vector *	decal_point_list[MAX_DECAL_DEFPOINTS];
-
-static int decal_poly[MAX_DECAL_DEFPOINTS];
-
-static decal * new_decal;
-
-static int nverts;
-
-static float min_rad;
-
-static int back_faceing;
-
-/*
-	vector uvec, rvec;
-	vector temp;
-
-	temp = *pos;
-
-	vm_vec_sub( &rvec, Eyeposition, &temp );
-	vm_vec_normalize( &rvec );	
-
-	vm_vec_crossprod(&uvec,fvec,&rvec);
-	vm_vec_normalize(&uvec);
-
-	vm_vec_scale_add( top, &temp, &uvec, w/2.0f );
-	vm_vec_scale_add( bot, &temp, &uvec, -w/2.0f );	
-*/
-
-int decal_find_next(object *obj){
-	ship *shipp = &Ships[obj->instance];
-	int oldest = shipp->decals[0].timestamp;
-	for(int i = 0; i < MAX_SHIP_DECALS; i++){
-		if(shipp->decals[i].is_valid != 1){			//use up all the unused decals first
-			return i%MAX_SHIP_DECALS;
-		}
-	}
-	for(i = 1; i < MAX_SHIP_DECALS; i++){
-		if(shipp->decals[i].timestamp > oldest){	//then get the oldest one
-			oldest = i;
-		}
-	}
-	return oldest%MAX_SHIP_DECALS;
-}
-
-int decal_create_simple(object *obj, decal_point *point, int texture){//makes a simple non-clipped decal
-#ifdef DECALS_ENABLED
-	mprintf(("a decal is about to be made at %0.2f, %0.2f, %0.2f\n", point->pnt.xyz.x, point->pnt.xyz.y, point->pnt.xyz.z));
-	mprintf(("orient fvec at %0.2f, %0.2f, %0.2f\n", point->orient.vec.fvec.xyz.x, point->orient.vec.fvec.xyz.y, point->orient.vec.fvec.xyz.z));
-
-	if(obj->type != OBJ_SHIP){
-		return 0;
-	}
-//	vertex vert[1][2];
-//	vector vec[4];
-
-	vector center = point->pnt;
-	float rad = point->radius;
-	if(rad <=0) rad = 10;
-	mprintf(("radius %f\n",rad));
-	vector plain_point[4];
-//	mprintf(("orient uvec x %0.2f %0.2f %0.2f\n", point->orient.vec.uvec.xyz.x, point->orient.vec.uvec.xyz.y, point->orient.vec.uvec.xyz.z));
-//	mprintf(("orient rvec x %0.2f %0.2f %0.2f\n", point->orient.vec.rvec.xyz.x, point->orient.vec.rvec.xyz.y, point->orient.vec.rvec.xyz.z));
-//	mprintf(("orient fvec x %0.2f %0.2f %0.2f\n", point->orient.vec.fvec.xyz.x, point->orient.vec.fvec.xyz.y, point->orient.vec.fvec.xyz.z));
-	plain_point[0] = point->orient.vec.uvec;
-	plain_point[1] = plain_point[0];
-		vm_vec_negate(&plain_point[1]);
-	plain_point[2] = point->orient.vec.rvec;
-	plain_point[3] = plain_point[2];
-		vm_vec_negate(&plain_point[3]);
-
-	mprintf(("\n"));
-
-	int dinx = decal_find_next(obj);
-
-	ship *shipp = &Ships[obj->instance];
-	decal *dec = shipp->decals;
-
-		vm_vec_scale_add( &dec[0].vert[0], &center, &plain_point[0], rad );
-		vm_vec_scale_add( &dec[0].vert[1], &center, &plain_point[2], rad );
-		vm_vec_scale_add( &dec[0].vert[2], &center, &plain_point[1], rad );
-		vm_vec_scale_add( &dec[0].vert[3], &center, &plain_point[3], rad );
-
-	dec[dinx].poly[0].point[0] = 0;
-	dec[dinx].poly[0].point[1] = 1;
-	dec[dinx].poly[0].point[2] = 2;
-
-	dec[dinx].poly[1].point[0] = 0;
-	dec[dinx].poly[1].point[1] = 3;
-	dec[0].poly[1].point[2] = 2;
-
-	dec[dinx].poly[0].uv[0].u = 0;	dec[0].poly[0].uv[0].v = 0;
-	dec[dinx].poly[0].uv[1].u = 0;	dec[0].poly[0].uv[1].v = 1;
-	dec[dinx].poly[0].uv[2].u = 1;	dec[0].poly[0].uv[2].v = 1;
-
-	dec[dinx].poly[1].uv[0].u = 0;	dec[0].poly[1].uv[0].v = 0;
-	dec[dinx].poly[1].uv[1].u = 1;	dec[0].poly[1].uv[1].v = 0;
-	dec[dinx].poly[1].uv[2].u = 1;	dec[0].poly[1].uv[2].v = 1;
-
-	dec[dinx].texture = texture;
-	dec[dinx].n_poly = 2;
-	dec[dinx].is_valid = 1;
-	dec[dinx].timestamp = timestamp();
-
-	mprintf(("a decal should have been made at %0.2f %0.2f %0.2f\n", point->pnt.xyz.x, point->pnt.xyz.y, point->pnt.xyz.z));
-//Int3();
-#endif
-	return 1;
-}
-
-#define duw(p)	(*((uint *) (p)))
-#define dw(p)	(*((int *) (p)))
-#define dwp(p)	((int *) (p))
-#define dvp(p)	((vector *) (p))
-#define dfl(p)	(*((float *) (p)))
-
-
-//creates a decal, returns decal index on succes, -1 on failure
-
-int decal_create(object * obj, decal_point *point, int subobject, int texture, int backfaced_texture){
-#ifdef DECALS_ENABLED
-	mprintf(("a decal is about to be made at %0.2f, %0.2f, %0.2f\n", point->pnt.xyz.x, point->pnt.xyz.y, point->pnt.xyz.z));
-
-	if(obj->type != OBJ_SHIP){
-		return -1;
-	}
-	if(texture == -1)return -1;
-	if(point->radius <= 0)return -1;
-
-	vector center = point->pnt;
-	float rad = point->radius;
-	if(rad <=0) rad = 1;
-	mprintf(("radius %f\n",rad));
-	vector plain_point[4];
-	vector cube_point[8];
-//define the decals dimentions
-	plain_point[0] = point->orient.vec.uvec;
-	plain_point[1] = plain_point[0];
-		vm_vec_negate(&plain_point[1]);
-	plain_point[2] = point->orient.vec.rvec;
-	plain_point[3] = plain_point[2];
-		vm_vec_negate(&plain_point[3]);
-
-	vector topcenter;
-	vector bvec = point->orient.vec.fvec;
-	vm_vec_negate(&bvec);
-	vm_vec_scale_add(&topcenter, &center, &bvec, rad);
-
-	for(int i = 0; i < 4; i++){
-		vm_vec_scale_add( &cube_point[i], &topcenter, &plain_point[i], rad );
-		vm_vec_scale_add( &cube_point[i+4], &cube_point[i], &point->orient.vec.fvec, rad*2);
-	}
-
-	float max_rad = vm_vec_dist_quick(&center, &cube_point[0]);	//the cube points are all equidistant, right?
-	min_rad = fl_sqrt((rad * rad)/2);	//the cube points are all equidistant, right?
-mprintf(("decal defined\n"));
-
-//define the decals dimentions
-	
-//set up the decal model
-	ship *shipp = &Ships[obj->instance];
-	decal *sdec = shipp->decals;
-
-	polymodel *pm = model_get(shipp->modelnum);
-	bsp_info * sm;
-	sm = &pm->submodel[subobject];
-//	decal_model dmod = pm->submodel[subobject].dec_model;// sm->dec_model;
-//	decal_model tdec;	//temporary decal model for holding the culled down part of the decal
-
-//setting up the decal cube
-	vector test_vec, temp1, temp2;
-	for(i = 0; i<8; i++)decal_cube_point[i] = cube_point[i];
-
-	decal_orient = point->orient;
-
-	decal_cube_plane[0][0] = cube_point[5];
-
-	temp1 = decal_orient.vec.uvec;
-	temp2 = decal_orient.vec.rvec;
-
-	vm_vec_avg(&test_vec, &temp1, &temp2);
-	vm_vec_normalize(&test_vec);
-
-	decal_cube_plane[0][1] = test_vec;
-
-//	mprintf(("plane 0 position is x %0.2f y %0.2f z %0.2f\n", decal_cube_plane[0][0].xyz.x, decal_cube_plane[0][0].xyz.y, decal_cube_plane[0][0].xyz.z));
-//	mprintf(("plane 0 normal is x %0.2f y %0.2f z %0.2f\n", decal_cube_plane[0][1].xyz.x, decal_cube_plane[0][1].xyz.y, decal_cube_plane[0][1].xyz.z));
-
-
-
-	decal_cube_plane[1][0] = cube_point[0];
-
-	vm_vec_negate(&test_vec);
-
-	decal_cube_plane[1][1] = test_vec;
-//	mprintf(("plane 1 position is x %0.2f y %0.2f z %0.2f\n", decal_cube_plane[1][0].xyz.x, decal_cube_plane[1][0].xyz.y, decal_cube_plane[1][0].xyz.z));
-//	mprintf(("plane 1 normal is x %0.2f y %0.2f z %0.2f\n", decal_cube_plane[1][1].xyz.x, decal_cube_plane[1][1].xyz.y, decal_cube_plane[1][1].xyz.z));
-
-
-
-	decal_cube_plane[2][0] = cube_point[5];
-
-	vm_vec_negate(&temp2);
-	vm_vec_avg(&test_vec, &temp1, &temp2);
-	vm_vec_normalize(&test_vec);
-
-	decal_cube_plane[2][1] = test_vec;
-
-//	mprintf(("plane 2 position is x %0.2f y %0.2f z %0.2f\n", decal_cube_plane[2][0].xyz.x, decal_cube_plane[2][0].xyz.y, decal_cube_plane[2][0].xyz.z));
-//	mprintf(("plane 2 normal is x %0.2f y %0.2f z %0.2f\n", decal_cube_plane[2][1].xyz.x, decal_cube_plane[2][1].xyz.y, decal_cube_plane[2][1].xyz.z));
-
-
-
-	decal_cube_plane[3][0] = cube_point[0];
-
-	vm_vec_negate(&test_vec);
-
-	decal_cube_plane[3][1] = test_vec;
-
-//	mprintf(("plane 3 position is x %0.2f y %0.2f z %0.2f\n", decal_cube_plane[3][0].xyz.x, decal_cube_plane[3][0].xyz.y, decal_cube_plane[3][0].xyz.z));
-//	mprintf(("plane 3 normal is x %0.2f y %0.2f z %0.2f\n", decal_cube_plane[3][1].xyz.x, decal_cube_plane[3][1].xyz.y, decal_cube_plane[3][1].xyz.z));
-
-
-
-	test_vec = decal_orient.vec.fvec;
-
-	decal_cube_plane[4][0] = cube_point[0];
-
-	decal_cube_plane[4][1] = test_vec;
-
-//	mprintf(("plane 4 position is x %0.2f y %0.2f z %0.2f\n", decal_cube_plane[4][0].xyz.x, decal_cube_plane[4][0].xyz.y, decal_cube_plane[4][0].xyz.z));
-//	mprintf(("plane 4 normal is x %0.2f y %0.2f z %0.2f\n", decal_cube_plane[4][1].xyz.x, decal_cube_plane[4][1].xyz.y, decal_cube_plane[4][1].xyz.z));
-
-
-
-	vm_vec_negate(&test_vec);
-	decal_cube_plane[5][0] = cube_point[5];
-
-	decal_cube_plane[5][1] = test_vec;
-
-//	mprintf(("plane 5 position is x %0.2f y %0.2f z %0.2f\n", decal_cube_plane[5][0].xyz.x, decal_cube_plane[5][0].xyz.y, decal_cube_plane[5][0].xyz.z));
-//	mprintf(("plane 5 normal is x %0.2f y %0.2f z %0.2f\n", decal_cube_plane[5][1].xyz.x, decal_cube_plane[5][1].xyz.y, decal_cube_plane[5][1].xyz.z));
-//setting up the decal cube
-
-mprintf(("cube set up\n"));
-
-	decal_hit_point = point->pnt;
-	decal_hit_radius = max_rad;
-	decal_hit_vect = point->orient.vec.fvec;
-	poly_num = 0;
-	nverts = 0;
-
-//go and find decals for each submodel
-//	for(int z = 0; z<pm->n_models;z++){
-
-	int dinx = decal_find_next(obj);
-	mprintf(("decal is number %d\n", dinx));
-
-	sdec[dinx].is_valid = 0;
-
-		new_decal = &shipp->decals[dinx];
-
-		if(backfaced_texture != -1){
-			back_faceing = 1;
-		}else{
-			back_faceing = 0;
-		}
-		decal_create_sub((ubyte *)pm->submodel[subobject].bsp_data);
-
-mprintf(("deacal defined\n"));
-
-	sdec[dinx].texture = texture;
-	sdec[dinx].backfaced_texture = backfaced_texture;
-	sdec[dinx].is_valid = 1;
-	sdec[dinx].timestamp = timestamp();
-	sdec[dinx].n_poly = poly_num;
-	sdec[dinx].state = 1;
-	sdec[dinx].lifetime = 3000;
-	sdec[dinx].frames = 1;
-	sdec[dinx].importance = 0;
-	sdec[dinx].radius = max_rad;
-	sdec[dinx].position = point->pnt;
-
-	mprintf(("a decal should have been made with %d polys\n",sdec[0].n_poly));
-
-
-return dinx;
-
-#else
-return -1;
-#endif
-}
-//decal_model d_model;
-
-// Point list
-// +0      int         id
-// +4      int         size
-// +8      int         n_verts
-// +12     int         n_norms
-// +16     int         offset from start of chunk to vertex data
-// +20     n_verts*char    norm_counts
-// +offset             vertex data. Each vertex n is a point followed by norm_counts[n] normals.     
-void decal_create_defpoints(ubyte * p )
-{
-//	mprintf(("entering decal decal_create_defpoints\n"));
-
-
-	int n;
-	nverts = dw(p+8);	
-	int offset = dw(p+16);	
-
-	mprintf(("%d verts\n",nverts));
-	ubyte * normcount = p+20;
-	vector *src = dvp(p+offset);
-	
-	Assert( nverts < 1200 );
-
-
-
-	for (n=0; n<nverts; n++ )	{
-
-
-		decal_point_list[n] = src;
-		new_decal->vert[n].xyz = src->xyz;
-		src += normcount[n]+1;
-//		mprintf(("defpoint %d, x %0.2f, y %0.2f, z %0.2f\n",n,d_model.vert[n].xyz.x,d_model.vert[n].xyz.y,d_model.vert[n].xyz.z));
-	} 
-
-}
-
-
-// Sortnorms
-// +0      int         id
-// +4      int         size 
-// +8      vector      normal
-// +20     vector      center
-// +32     float       radius
-// 36     int     front offset
-// 40     int     back offset
-// 44     int     prelist offset
-// 48     int     postlist offset
-// 52     int     online offset
-
-void decal_create_sortnorm(ubyte * p)
-{
-//	mprintf(("entering decal_create_sortnorm\n"));
-	int frontlist = dw(p+36);
-	int backlist = dw(p+40);
-	int prelist = dw(p+44);
-	int postlist = dw(p+48);
-	int onlist = dw(p+52);
-
-	vector min, max;
-	min.xyz = dvp(p+56)->xyz;
-	max.xyz = dvp(p+68)->xyz;
-	min.xyz.x += decal_hit_radius;
-	min.xyz.y += decal_hit_radius;
-	min.xyz.z += decal_hit_radius;
-	max.xyz.x += decal_hit_radius;
-	max.xyz.y += decal_hit_radius;
-	max.xyz.z += decal_hit_radius;
-
-/*	if (!fvi_ray_boundingbox( &min, &max, &decal_hit_point, &decal_hit_vect, NULL ))	{
-		return;
-	}
-*/
-	if (prelist) decal_create_sub(p+prelist);
-	if (backlist) decal_create_sub(p+backlist);
-	if (onlist) decal_create_sub(p+onlist);
-	if (frontlist) decal_create_sub(p+frontlist);
-	if (postlist) decal_create_sub(p+postlist);
-}
-
-/*
-typedef struct model_tmap_vert {
-	short vertnum;
-	short normnum;
-	float u,v;
-} model_tmap_vert;
-*/
-//int poly_num = 0;
-// Textured Poly
-// +0      int         id
-// +4      int         size 
-// +8      vector      normal
-// +20     vector      normal_point
-// +32     int         tmp = 0
-// +36     int         nverts
-// +40     int         tmap_num
-// +44     nverts*(model_tmap_vert) vertlist (n,u,v)
-void decal_create_tmappoly(ubyte * p)
-{
-//	mprintf(("entering decal_create_tmappoly\n"));
-
-	if(poly_num >= MAX_DECAL_POLY){
-		mprintf(("bugging out becase there are too many polys in the decal\n"));		
-		return;
-	}
-
-
-	int i;
-	int nv;
-//	uv_pair uvlist[TMAP_MAX_VERTS];
-//	vector points[TMAP_MAX_VERTS];
-	model_tmap_vert *verts;
-
-	nv = dw(p+36);
-	if ( nv < 0 ) return;
-
-//	int tmap_num = dw(p+40);
-/*
-	if ( (!(Mc->flags & MC_CHECK_INVISIBLE_FACES)) && (Mc_pm->textures[tmap_num] < 0) )	{
-		// Don't check invisible polygons.
-		return;
-	}
-*/
-	verts = (model_tmap_vert *)(p+44);
-	vector temppoly[820];
-
-	for (i=0;i<nv;i++)	{
-		decal_poly[i] = (int)verts[i].vertnum;
-		temppoly[i].xyz = decal_point_list[decal_poly[i]]->xyz;
-	}
-
-	vector pnorm;
-	vm_vec_perp(&pnorm, decal_point_list[decal_poly[0]], decal_point_list[decal_poly[1]], decal_point_list[decal_poly[2]]);
-
-	float back = vm_vec_dot(&decal_cube_plane[4][1], &pnorm);
-
-	if( (back_faceing == 0) && (back >= 0) )return;
-
-//poly culling 
-	vector pcenter;
-	vm_vec_avg_n(&pcenter, nv, temppoly);
-	float pradius = 0;
-	float dist = 0;
-	for (i=0;i<nv;i++)	{
-		dist = vm_vec_dist(decal_point_list[decal_poly[i]], &pcenter);
-		if(dist>pradius){
-			pradius = dist;
-		}
-	}
-
-	//if it's too far to posably get near the cube get out
-	if(vm_vec_dist_quick(&pcenter, &decal_hit_point) >= (pradius + decal_hit_radius)){
-//		mprintf(("leaveing becase poly is too far away\n"));
-		return;
-	}
-
-//this is for faster testing, I'm not sure if it's realy makeing it faster or not
-	for(int k = 0; k<6; k++){
-		int first_good = -1;
-		for(i = 0; ((i< nv) && (first_good == -1)); i++){
-			if(fvi_point_dist_plane(&decal_cube_plane[k][0], &decal_cube_plane[k][1], decal_point_list[decal_poly[i]]) > 0){
-				first_good = i;
-			}
-		}
-		if(first_good == -1){
-//			mprintf(("all points are behind a plane, polygon is not in the cube\n"));
-			return;
-		}
-	}
-
-//poly culling
-	int temp_poly[820];
-
-	int skip = 0, numv = 0, valid = 0;
-
-//	mprintf(("starting to test the poly, with %d verts in it\n",nv));
-	for(k = 0; k<6; k++){
-	//find the first point in front of the plain
-		int first_good = -1;
-		for(i = 0; ((i< nv) && (first_good == -1)); i++){
-//			mprintf(("testing point %d with plane %d\n", i, k));
-//			mprintf(("point's position is x %0.2f y %0.2f z %0.2f\n", decal_point_list[decal_poly[i]]->xyz.x, decal_point_list[decal_poly[i]]->xyz.y, decal_point_list[decal_poly[i]]->xyz.z));
-//			mprintf(("plane's position is x %0.2f y %0.2f z %0.2f\n", decal_cube_plane[k][0].xyz.x, decal_cube_plane[k][0].xyz.y, decal_cube_plane[k][0].xyz.z));
-//			mprintf(("plane's normal is x %0.2f y %0.2f z %0.2f\n", decal_cube_plane[k][1].xyz.x, decal_cube_plane[k][1].xyz.y, decal_cube_plane[k][1].xyz.z));
-			if(fvi_point_dist_plane(&decal_cube_plane[k][0], &decal_cube_plane[k][1], decal_point_list[decal_poly[i]]) > 0){
-				first_good = i;
-//				mprintf(("%d is the first good point\n", i));
-			}
-		}
-		if(first_good == -1){
-//			mprintf(("all points are behind a plane, polygon is not in the cube\n"));
-			return;
-		}else{
-			valid = 1;
-		}
-
-		//first point in front of the plane is good of corse
-	//	temp_poly[0] =  decal_poly[(first_good + nv)%nv];
-		numv = 0;
-	//go through each point and see if there is an intersection between it the next point and the current plane
-	//if there is then make the intersection point the next point in the poly
-	//ignor all points untill there is another intersection
-	//other wise make the next point the next point in the poly
-//		if(k==1)Int3();
-		int is_infront = 1, is_infront2 = 1;
-		for(i = first_good; i < (nv + first_good); i++){
-//							mprintf(("looking for intersections between point %d and point %d, with plane %d\n", i%nv, (i + 1)%nv, k));
-//							mprintf((" point %d, is at, x %0.2f y %0.2f z %0.2f and point %d, is at, x %0.2f y %0.2f z %0.2f\n", i%nv, decal_point_list[decal_poly[i]]->xyz.x, decal_point_list[decal_poly[i]]->xyz.y, decal_point_list[decal_poly[i]]->xyz.z,  (i + 1)%nv, decal_point_list[decal_poly[(i + 1)%nv]]->xyz.x, decal_point_list[decal_poly[(i + 1)%nv]]->xyz.y, decal_point_list[decal_poly[(i + 1)%nv]]->xyz.z));
-			is_infront2 = is_infront;
-			float is_in = fvi_point_dist_plane(&decal_cube_plane[k][0], &decal_cube_plane[k][1], decal_point_list[decal_poly[(i + 1)%nv]]);
-			if(is_in > 0){
-				is_infront = 1;
-			}else{
-				is_infront= 0;
-			}
-			if(is_infront != is_infront2){
-				if(fvi_segment_plane(&new_decal->vert[nverts], &decal_cube_plane[k][0], &decal_cube_plane[k][1], decal_point_list[decal_poly[i%nv]], decal_point_list[decal_poly[(i + 1)%nv]], 0)){
-//								mprintf(("segment %d %d has an an itersection\n", i%nv, (i + 1)%nv));
-					decal_point_list[nverts] = &new_decal->vert[nverts];
-//								mprintf(("new decal defpoint has been added as number %d at x %0.2f y %0.2f z %0.2f\n",nverts, new_decal->vert[nverts].xyz.x, new_decal->vert[nverts].xyz.y, new_decal->vert[nverts].xyz.z));
-					temp_poly[numv] = nverts++;
-//								mprintf(("temp_poly point %d, should have been set to defpoint %d, it was set to %d\n",numv, nverts-1, temp_poly[numv]));
-					skip = (skip+1)%2;
-//								mprintf(("skip has been set to %d\n",skip));
-					numv++;
-					if((skip == 0)){
-//				mprintf(("adding point, becase it is after an intersection point\n", (i + 1)%nv));
-						temp_poly[numv] = decal_poly[(i + 1)%nv];
-						numv++;
-					}
-				}else{
-//					mprintf(("there sould have been an intersection but there wasnt"));
-				}
-
-			}else{
-				if((skip == 0)){//don't copy the first point
-//				mprintf(("segment %d %d has no itersection, copying\n", i%nv, (i + 1)%nv));
-					temp_poly[numv] = decal_poly[(i + 1)%nv];
-						numv++;
-				}else{
-//					mprintf(("skipping segment %d %d becase it isn't in front of the plane\n", i%nv, (i + 1)%nv));
-				}
-			}
-		}
-
-//		mprintf(("temp poly has %d points\n", numv));
-		for(int h = 0; h < numv; h++){
-			decal_poly[h] = temp_poly[h];
-			mprintf(("seting decal_poly point %d to %d\n",h,temp_poly[h]));
-		}
-		nv = numv;
-		numv=0;
-//		mprintf(("decal_poly now has has %d points\n", nv));
-		if(nv < 3)return;	//if at any time we get fewer than three points this poly is dead
-	}
-
-
-//	mprintf(("copying the poly to the decal\n"));
-	//copy a triangulated version of the poly to the new decal
-	if((valid == 1) && (nv > 2)){
-/*		for (i=1;i<(nv-1);i++)	{
-			if(poly_num >= MAX_DECAL_POLY){
-				mprintf(("bugging out becase there are too many polys in the decal\n"));		
-				return;
-			}
-			new_decal->poly[poly_num].point[0] = decal_poly[0];
-			new_decal->poly[poly_num].point[1] = decal_poly[i];
-			new_decal->poly[poly_num].point[2] = decal_poly[i+1];
-			new_decal->poly[poly_num].norm = pnorm;
-			if(back > 0){
-				new_decal->poly[poly_num].backfaced = 0;
-			}else{
-				new_decal->poly[poly_num].backfaced = 1;
-			}
-			for (k=0;k<3;k++)	{
-				//calculate the UV coords
-				new_decal->poly[poly_num].uv[k].u = (fvi_point_dist_plane(&decal_cube_plane[0][0], &decal_cube_plane[0][1], &new_decal->vert[new_decal->poly[poly_num].point[k]]) / (min_rad*2));
-				new_decal->poly[poly_num].uv[k].v = (fvi_point_dist_plane(&decal_cube_plane[2][0], &decal_cube_plane[2][1], &new_decal->vert[new_decal->poly[poly_num].point[k]]) / (min_rad*2));
-			}
-//			mprintf(("decal poly %d, vert 0 being set to %d, vert 1 %d, and vert 2 %d\n", poly_num, new_decal->poly[poly_num].point[0], new_decal->poly[poly_num].point[1], new_decal->poly[poly_num].point[2]));
-			poly_num++;
-		}*/
-		for (i=1;i<nv;i++){
-			if(poly_num >= MAX_DECAL_POLY){
-				mprintf(("bugging out becase there are too many polys in the decal\n"));		
-				return;
-			}
-			if(i >= MAX_DECAL_POLY_POINT){
-				mprintf(("bugging out becase there are too many points in the poly\n"));		
-				return;
-			}
-			new_decal->poly[poly_num].point[i] = decal_poly[i];
-			new_decal->poly[poly_num].norm = pnorm;
-			if(back > 0){
-				new_decal->poly[poly_num].backfaced = 0;
-			}else{
-				new_decal->poly[poly_num].backfaced = 1;
-			}
-				//calculate the UV coords
-			new_decal->poly[poly_num].uv[i].u = (fvi_point_dist_plane(&decal_cube_plane[0][0], &decal_cube_plane[0][1], &new_decal->vert[new_decal->poly[poly_num].point[i]]) / (min_rad*2));
-			new_decal->poly[poly_num].uv[i].v = (fvi_point_dist_plane(&decal_cube_plane[2][0], &decal_cube_plane[2][1], &new_decal->vert[new_decal->poly[poly_num].point[i]]) / (min_rad*2));
-//			mprintf(("decal poly %d, vert 0 being set to %d, vert 1 %d, and vert 2 %d\n", poly_num, new_decal->poly[poly_num].point[0], new_decal->poly[poly_num].point[1], new_decal->poly[poly_num].point[2]));
-		}
-		poly_num++;
-	}else{
-//		mprintf(("no poly, all points are out side of planes"));
-	}
-	mprintf(("there are now %d polys in the current decal\n", poly_num));
-
-	
-}
-
-
-int decal_create_sub(void *model_ptr )
-{
-
-//		mprintf(("plane 0 position is x %0.2f y %0.2f z %0.2f\n", decal_cube_plane[0][0].xyz.x, decal_cube_plane[0][0].xyz.y, decal_cube_plane[0][0].xyz.z));
-//		mprintf(("plane 0 normal is x %0.2f y %0.2f z %0.2f\n", decal_cube_plane[0][1].xyz.x, decal_cube_plane[0][1].xyz.y, decal_cube_plane[0][1].xyz.z));
-
-//	mprintf(("entering decal_create_sub\n"));
-
-	ubyte *p = (ubyte *)model_ptr;
-	int chunk_type, chunk_size;
-
-	chunk_type = dw(p);
-	chunk_size = dw(p+4);
-
-//		mprintf(("plane 0 position is x %0.2f y %0.2f z %0.2f\n", decal_cube_plane[0][0].xyz.x, decal_cube_plane[0][0].xyz.y, decal_cube_plane[0][0].xyz.z));
-//		mprintf(("plane 0 normal is x %0.2f y %0.2f z %0.2f\n", decal_cube_plane[0][1].xyz.x, decal_cube_plane[0][1].xyz.y, decal_cube_plane[0][1].xyz.z));
-
-
-	while (chunk_type != DP_EOF)	{
-
-//		mprintf(( "Processing chunk type %d, len=%d\n", chunk_type, chunk_size ));
-//			mprintf(("plane 0 position is x %0.2f y %0.2f z %0.2f\n", decal_cube_plane[0][0].xyz.x, decal_cube_plane[0][0].xyz.y, decal_cube_plane[0][0].xyz.z));
-//			mprintf(("plane 0 normal is x %0.2f y %0.2f z %0.2f\n", decal_cube_plane[0][1].xyz.x, decal_cube_plane[0][1].xyz.y, decal_cube_plane[0][1].xyz.z));
-
-
-		switch (chunk_type) {
-		case DP_EOF: return 1;
-		case DP_DEFPOINTS:		decal_create_defpoints(p); break;
-		case DP_FLATPOLY:		break;// I don't want any of these anyway-Bobboau decal_create_flatpoly(p); break;
-		case DP_TMAPPOLY:		decal_create_tmappoly(p); break;
-		case DP_SORTNORM:		decal_create_sortnorm(p); break;
-		case DP_BOUNDBOX:	
-/*			if (!mc_ray_boundingbox( vp(p+8), vp(p+20), &Mc_p0, &Mc_direction, NULL ))	{
-				return 1;
-			}*/
-			break;
-		default:
-			mprintf(( "Bad chunk type %d, len=%d in decal_create_sub\n", chunk_type, chunk_size ));
-			Int3();		// Bad chunk type!
-			return 0;
-		}
-//				mprintf(( "current chunk offset %d\n", (int)p ));
-
-		p += chunk_size;
-		chunk_type = dw(p);
-		chunk_size = dw(p+4);
-	}
-
-
-	return 1;
-}
-
-
-int decal_make_model(polymodel * pm){
-
-	return 1;
-}
-/*
-void decal_render_all(object * obj){
-
-	if(obj->type != OBJ_SHIP){
-		return;
-	}
-
-	vertex vecs[3];
-	vertex *vlist[3] = { &vecs[0], &vecs[1], &vecs[2] };
-	
-//		mprintf(("about to render all decals\n"));
-
-	ship *shipp = &Ships[obj->instance];
-
-	for(int h = 0; h < MAX_SHIP_DECALS; h++){
-		decal *dec = &shipp->decals[h];
-		if(dec->is_valid){
-			mprintf(("decal %d is valid, and has %d polys\n",h,dec->n_poly));
-			for(int i = 0; i<dec->n_poly; i++){
-
-mprintf(("drawing decal poly %d, with bitmap %d\n", i, dec->texture));
-					gr_set_bitmap(dec->texture, 0, GR_BITBLT_MODE_NORMAL, 1.0f );
-					if((dec->poly[i].backfaced == 1) && (dec->backfaced_texture)){
-						gr_set_bitmap(dec->backfaced_texture, 0, GR_BITBLT_MODE_NORMAL, 1.0f );
-					}
-
-					for( int j = 0; j < 3; j++){
-//						vecs[j] = dec->vert[i][j];
-//						vector pos;
-//						vm_vert2vec(&vecs[j], &pos);
-					//	vm_vec_add2(&pos, &obj->pos);
-						g3_rotate_vertex(&vecs[j], &dec->vert[dec->poly[i].point[j]]);
-						g3_project_vertex(&vecs[j]);
-						vecs[j].u = dec->poly[i].uv[j].u;
-						vecs[j].v = dec->poly[i].uv[j].v;
-mprintf(("vert %d at x %0.2f y %0.2f z %0.2f u %0.2f v %0.2f\n", j, vecs[j].x, vecs[j].y, vecs[j].z, vecs[j].u, vecs[j].v));
-
-					}
-
-					gr_set_cull(0);
-					g3_draw_poly(3, vlist, TMAP_FLAG_TEXTURED | TMAP_FLAG_CORRECT );
-					gr_set_cull(1);
-			}
-		}
-	}
-//	mprintf(("decals rendered\n"));
-
-}
-*/
-
-
-void decal_render_all(object * obj){
-#ifdef DECALS_ENABLED
-	if(obj->type != OBJ_SHIP){
-		return;
-	}
-
-	vertex vecs[3];
-	vertex *vlist[3] = { &vecs[0], &vecs[1], &vecs[2] };
-	
-//		mprintf(("about to render all decals\n"));
-
-	ship *shipp = &Ships[obj->instance];
-	polymodel *pm = model_get( shipp->modelnum );
-
-	for(int h = 0; h < MAX_SHIP_DECALS; h++){
-		decal *dec = &shipp->decals[h];
-		if(dec->is_valid){
-			mprintf(("decal %d is valid, and has %d polys\n",h,dec->n_poly));
-			vector g_pos;
-			vm_vec_add(&g_pos, &dec->position, &obj->pos);
-			float dist = vm_vec_dist_quick(&g_pos, &View_position);
-				if(dist < (dec->radius*10)){
-					mprintf(("decal %d too far away to be drawn %0.2f\n", h, dist));
-					continue;
-				}
-			for(int i = 0; i<dec->n_poly; i++){
-
-			//	if((pm->submodel[dec->submodel_parent].blown_off != 0) && (dec->submodel_parent > 0))continue;
-
-					for( int j = 0; j < 3; j++){
-//						vecs[j] = dec->vert[i][j];
-//						vector pos;
-//						vm_vert2vec(&vecs[j], &pos);
-					//	vm_vec_add2(&pos, &obj->pos);
-						vector pnt = dec->vert[dec->poly[i].point[j]];
-					if(dec->submodel_parent != pm->detail[0]){
-							matrix m;
-							angles angs = pm->submodel[dec->submodel_parent].angs;
-							angs.b = PI2 - angs.b;
-							angs.p = PI2 - angs.p;
-							angs.h = PI2 - angs.h;
-							mprintf(("decal is child of a submodel, who's angles are b %0.2f p %0.2f h %0.2f, it should be rotateing with it\n", angs.b, angs.p, angs.h));
-
-							vector offset = pm->submodel[dec->submodel_parent].offset;
-							vm_angles_2_matrix(&m, &angs);
-
-							vector p = pnt;
-							vm_vec_rotate(&pnt, &p, &m);
-
-							vm_vec_add2(&pnt, &offset);
-						}
-
-						g3_rotate_vertex(&vecs[j], &pnt);
-						g3_project_vertex(&vecs[j]);
-						vecs[j].u = dec->poly[i].uv[j].u;
-						vecs[j].v = dec->poly[i].uv[j].v;
-mprintf(("vert %d at x %0.2f y %0.2f z %0.2f u %0.2f v %0.2f\n", j, vecs[j].x, vecs[j].y, vecs[j].z, vecs[j].u, vecs[j].v));
-/*
-						if ( D3D_enabled )	{
-							light_apply_rgb( &vlist[j]->r, &vlist[j]->g, &vlist[j]->b, &pnt, &dec->poly[i].norm, 0 );
-						} else {
-							vlist[j]->b = light_apply( &pnt, &dec->poly[i].norm, 0 );
-						}
-*/
-					}
-
-					gr_set_bitmap(dec->texture, 0, GR_BITBLT_MODE_NORMAL, 1.0f );
-					if((dec->poly[i].backfaced == 1) && (dec->backfaced_texture > -1)){
-						gr_set_bitmap(dec->backfaced_texture, 0, GR_BITBLT_MODE_NORMAL, 1.0f );
-						mprintf(("drawing decal poly %d, with bitmap %d\n", i, dec->backfaced_texture));
-					}else{
-						mprintf(("drawing decal poly %d, with bitmap %d\n", i, dec->texture));
-					}
-
-//					gr_set_cull(0);
-					g3_draw_poly(3, vlist, TMAP_FLAG_TEXTURED | TMAP_FLAG_CORRECT | TMAP_FLAG_RGB | TMAP_FLAG_GOURAUD );
-//					gr_set_cull(1);
-			}
-		}
-	}
-//	mprintf(("decals rendered\n"));
-#endif
-}

fs2_open/code/decals/decals.h

@@ -1,80 +0,0 @@
-//header file for makeing decals-Bobboau
- 
-#ifndef _DECAL_H
-#define _DECAL_H
-
-#define MAX_DECAL_POLY 20
-#define MAX_DECAL_POLY_POINT 10
-#define MAX_DECAL_DEFPOINTS 1000
-#define MAX_DECAL_POINT 10
-#define MAX_SHIP_DECALS 25
-#include "globalincs/pstypes.h"
-#include "object/object.h"
-
-#define DP_EOF 			0
-#define DP_DEFPOINTS 	1
-#define DP_FLATPOLY		2
-#define DP_TMAPPOLY		3
-#define DP_SORTNORM		4
-#define DP_BOUNDBOX		5
-
-typedef struct decal_model{	//this will store a triangulated version of the ships polygons
-	struct{
-		int point[3];		//an index to the vert list-Bobboau
-		vector center;		//the center of the poly
-		float radius;		//the max radius of the poly
-	}poly[MAX_DECAL_POLY];
-	vector vert[MAX_DECAL_DEFPOINTS];	//the defpoints-Bobboau
-	int n_polys;
-}decal_model;
-
-//extern decal_model d_model;
-
-typedef struct decal{
-	struct{
-		int backfaced;		//flag that this poly uses the backfaced texture
-		uv_pair uv[MAX_DECAL_POLY_POINT];		//uv coordanants
-		int point[MAX_DECAL_POLY_POINT];		//an index to the vert list-Bobboau
-		int n_poly;
-		vector norm;		//the normal used for lighting
-	}poly[MAX_DECAL_POLY];
-	vector position;
-	float radius;
-	int submodel_parent;	//the submodel this is part of
-	vector vert[1000];		//the defpoints-Bobboau
-	int frames;				//number of frames in an animation
-	int fps;				//frames per second
-	int starting_keyframe;	//the frame that indicates the end of the inital nonlooped portion and the start of the middle looped part
-	int ending_keyframe;	//the frame that indicates the end of the loopable portion and the start of the end part
-	int texture;			//the texture to be used, first in animation
-	int backfaced_texture;	//the texture to be used by backfaced polys, first in animation
-	int is_valid;			//this means it is a good decal that should be rendered-Bobboau
-	int n_poly;				//the number of polys
-	int timestamp;			//this is when the decal was made-Bobboau
-	int lifetime;			//this is how long the decal should be alive for-Bobboau
-	int importance;			//this is for big things large beam marks and bomb craters should last longer than the odd laser impacts-Bobboau
-	int state;				//1 starting, 2 looping(mostly for beams), 3 ending, 4 static
-}decal;
-
-typedef struct decal_point{
-vector pnt;
-matrix orient;
-float radius;
-}decal_point;
-
-int decal_create(object * obj, decal_point *point, int subobject, int texture, int backfaced_texture = -1);//makes the decal
-
-#endif
-
-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(object * obj, decal_point *point, int subobject, int texture, int backfaced_texture);//makes the decal
-
-int decal_create_sub(void *model_ptr);
-
-/*
-
-int decal_is_in_face(int n, vertex vertlist[n]);//sees if a poly is inside a decal: 0 is yes, 1 is sort of, -1 is no
-*/

fs2_open/code/demo/demo.cpp

@@ -9,18 +9,12 @@
 
 /*
  * $Logfile: /Freespace2/code/Demo/Demo.cpp $
- * $Revision: 2.2 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:56 $
  * $Author: penguin $
  *
  *
  * $Log: not supported by cvs2svn $
- * 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.1  2002/05/02 18:03:04  mharris
  * Initial checkin - converted filenames and includes to lower case
  *
@@ -47,21 +41,20 @@
  * $NoKeywords: $
  */
 
-#include "globalincs/pstypes.h"
-#include "demo/demo.h"
-#include "mission/missionload.h"
-#include "ship/ship.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 "demo.h"
+#include "missionload.h"
+#include "ship.h"
+#include "linklist.h"
+#include "freespace.h"
+#include "object.h"
+#include "timer.h"
+#include "gamesequence.h"
+#include "systemvars.h"
+#include "cfile.h"
+#include "missionmessage.h"
+#include "missionparse.h"
+#include "shipfx.h"
+#include "shiphit.h"
 
 // -----------------------------------------------------------------------------------------------------------------------------
 // DEMO DEFINES/VARS

fs2_open/code/demo/demo.h

@@ -9,8 +9,8 @@
 
 /*
  * $Logfile: /Freespace2/code/Demo/Demo.h $
- * $Revision: 2.0 $
- * $Date: 2002-06-03 04:02:21 $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:56 $
  * $Author: penguin $
  *
  *

fs2_open/code/directx/dx8show.cpp

@@ -1,240 +0,0 @@
-#include <dshow.h>
-#include <stdio.h>
-
-#include "osapi/osapi.h"
-#include "dx8show.h"
-#include "debugconsole/dbugfile.h"
-
-//
-// Constants
-//
-const int KEYBOARD_SAMPLE_FREQ = 200;  // Sample user input on an interval
-
-//
-// Globals
-//
-IGraphBuilder  *pGB = NULL;
-IMediaControl  *pMC = NULL;
-IVideoWindow   *pVW = NULL;
-IMediaEvent    *pME = NULL;
-
-//
-// Function prototypes
-//
-HRESULT get_interfaces(void);
-bool play_media(LPTSTR movie_filename);
-bool set_fullscreen(void);
-void cleanup_interfaces(void);
-
-HWND internal_hwnd = NULL;
-
-// This define, 0 by default, if set to 1 will run window binding code which currently 
-// doesnt work, left in for fun
-#define VIS_CODE 0
-//
-// Helper Macros (Jump-If-Failed, Log-If-Failed)
-//
-#define RUN_FUNCTION_ROF(x) if(FAILED(hr=(x))) \
-   	{DBUGFILE_OUTPUT_0("FAILED in " #x); return false;}
-
-#define RUN_FUNCTION_GET_INTERFACE(x) if(FAILED(hr=(x))) \
-    {DBUGFILE_OUTPUT_0("FAILED " #x); cleanup_interfaces(); return hr;}
-
-#define RUN_FUNCTION(x) if(FAILED(hr=(x))) \
-    {DBUGFILE_OUTPUT_0("FAILED " #x);}
-
-#define RELEASE(i) {if (i) i->Release(); i = NULL;}
-
-void process_messages(HWND hwnd)
-{
-	MSG msg;
-   	while(PeekMessage(&msg, hwnd, 0, 0, PM_REMOVE))
-   	{
-   		TranslateMessage(&msg);
-   		DispatchMessage(&msg);
-   	}
-}
-
-void dx8show_set_hwnd(void *hwnd)
-{
-	internal_hwnd = (HWND) hwnd;
-}
-
-bool dx8show_play_cutscene(char *movie_file)
-{
-    HRESULT hr;
-
-    // Initialize COM
-	RUN_FUNCTION_ROF(CoInitialize(NULL));
-
-    // Get DirectShow interfaces
-    RUN_FUNCTION_ROF(get_interfaces());
-
-	if(internal_hwnd == NULL)
-	{
-		internal_hwnd = (HWND) os_get_window();
-	}			
-
-#if VIS_CODE
-	RUN_FUNCTION(pVW->put_Visible(OATRUE));
-	RUN_FUNCTION(pVW->put_Owner((OAHWND) internal_hwnd));
-#endif
-
-    // Play the movie / cutscene
-    play_media(movie_file);
-    
-#if VIS_CODE
-    RUN_FUNCTION(pVW->put_Visible(OAFALSE));
-	RUN_FUNCTION(pVW->put_Owner(NULL));
-#endif
-
-    // Release DirectShow interfaces
-    cleanup_interfaces();
-    CoUninitialize();
-
-    return true;
-}
-
-HRESULT get_interfaces(void)
-{
-    HRESULT hr = S_OK;
-
-	// Instantiate filter graph interface
-	RUN_FUNCTION_GET_INTERFACE(CoCreateInstance(CLSID_FilterGraph, NULL, CLSCTX_INPROC, IID_IGraphBuilder, (void **) &pGB));
-    // Get interfaces to control playback & screensize
-    RUN_FUNCTION_GET_INTERFACE(pGB->QueryInterface(IID_IMediaControl,  (void **) &pMC));
-    RUN_FUNCTION_GET_INTERFACE(pGB->QueryInterface(IID_IVideoWindow,   (void **) &pVW));
-
-    // Get interface to allow the app to wait for completion of playback
-    RUN_FUNCTION_GET_INTERFACE(pGB->QueryInterface(IID_IMediaEventEx,  (void **)&pME));
-
-    return hr;
-}
-
-void cleanup_interfaces(void)
-{
-    // Release the DirectShow interfaces
-    RELEASE(pMC);
-    RELEASE(pVW);
-    RELEASE(pME);
-    RELEASE(pGB);
-}
-
-bool play_media(LPTSTR movie_filename)
-{
-    HRESULT hr;
-    WCHAR file_name[MAX_PATH];
-
-#ifndef UNICODE
-    MultiByteToWideChar(CP_ACP, 0, movie_filename, -1, file_name, MAX_PATH);
-#else
-    lstrcpy(file_name, movie_filename);
-#endif
-
-	// Allow DirectShow to create the FilterGraph for this media file
-	RUN_FUNCTION_ROF(pGB->RenderFile(file_name, NULL));
-
-    // Set the message drain of the video window to point to our hidden application window.  This allows 
-	// keyboard input to be transferred to our main window for processing.
-    //
-    // If this is an audio-only or MIDI file, then put_MessageDrain will fail.
-    //	
-	RUN_FUNCTION(pVW->put_MessageDrain((OAHWND) internal_hwnd));
-
-    if(set_fullscreen() == false)
-	{
-		return false;
-	}
-	
-    // Display first frame of the movie and play
- 	RUN_FUNCTION_ROF(pMC->Pause());
-  	RUN_FUNCTION_ROF(pMC->Run());
-
-    // Update state variables
-    bool movie_continue = true;
-
-    // Enter a loop of checking for events and sampling keyboard input
-    while (movie_continue)
-    {
-        long event_code, param1, param2;
-
-        // Has there been a media event?  Look for end of stream condition.
-        if(E_ABORT != pME->GetEvent(&event_code, &param1, &param2, 0))
-        {
-            // Is this the end of the movie?
-            if (event_code == EC_COMPLETE)
-            {
-				movie_continue = false;
-            }
-
-			// Free the media event resources.
-            RUN_FUNCTION(pME->FreeEventParams(event_code, param1, param2));
-        }
-
-		
-        // Give system threads time to run (and don't sample user input madly)
-        Sleep(KEYBOARD_SAMPLE_FREQ);
-
-		MSG msg;
-		// Quits movie if escape, space or return is pressed
-		while(PeekMessage(&msg, internal_hwnd, 0, 0, PM_REMOVE))
-		{
- 			TranslateMessage(&msg);
-			
-			if(msg.message != WM_KEYDOWN)
-			{
-				DispatchMessage(&msg);
-				continue;
-			}
-
-			switch(msg.wParam )
-			{
-				case VK_ESCAPE:
-			    case VK_SPACE:
-			    case VK_RETURN:
-				{
-					DBUGFILE_OUTPUT_0("User skipped cut scene");
-				 	movie_continue = false;
-			    }
-			}
- 		}
-		
-    }
-
-    return true;
-}
-
-bool set_fullscreen(void)
-{
-    HRESULT hr;
-    LONG mode;
-    HWND drain=0;
-
-    if (!pVW)
-	{
-        return S_FALSE;
-	}
-
-    // Read current state
-	RUN_FUNCTION_ROF(pVW->get_FullScreenMode(&mode));
-
-    if (mode == OAFALSE)	
-    {
-        // Save current message drain
-		RUN_FUNCTION_ROF(pVW->get_MessageDrain((OAHWND *) &drain));
-
-		// This is very important. It ensures that the video window doesnt end
-		// up playing behind the main window
-		SetFocus(drain);
-
-        // Set message drain to application main window
-		RUN_FUNCTION_ROF(pVW->put_MessageDrain((OAHWND) internal_hwnd));
-		  
-        // Switch to full-screen mode
-        mode = OATRUE;
-			
-		RUN_FUNCTION_ROF(pVW->put_FullScreenMode(mode));
-    }
-
-    return true;
-}

fs2_open/code/directx/dx8show.h

@@ -1,8 +0,0 @@
-#ifndef _DX8SHOW_HEADER_FILE
-#define _DX8SHOW_HEADER_FILE
-
-bool dx8show_play_cutscene(char *filename);
-void dx8show_set_hwnd(void *hwnd);
-
-#endif
-

fs2_open/code/directx/vd3d.h

@@ -97,8 +97,8 @@ typedef struct IDirect3DViewport2	*LPDIRECT3DVIEWPORT2;
 
 #endif
 
-#include "directx/vd3dtypes.h"
-#include "directx/vd3dcaps.h"
+#include "vd3dtypes.h"
+#include "vd3dcaps.h"
 
 #ifdef __cplusplus
 extern "C" {

fs2_open/code/directx/vd3dcaps.h

@@ -13,7 +13,7 @@
 /* 
  *  Pull in DirectDraw include file automatically:
  */
-#include "directx/vddraw.h"
+#include "vddraw.h"
 
 #pragma pack(4)
 

fs2_open/code/directx/vd3di.h

@@ -6,7 +6,7 @@
  *  Content:	Direct3D internal include file
  *@@BEGIN_MSINTERNAL
  * 
- *  $Id: vd3di.h,v 2.2 2002-08-01 01:41:04 penguin Exp $
+ *  $Id: vd3di.h,v 1.1 2002-06-03 03:25:56 penguin Exp $
  *
  *  History:
  *   Date	By	Reason
@@ -33,11 +33,11 @@
 #include "vddrawp.h"
 #if 0
 //@@END_MSINTERNAL
-#include "directx/vddraw.h"
+#include "vddraw.h"
 //@@BEGIN_MSINTERNAL
 #endif
 //@@END_MSINTERNAL
-#include "directx/vd3d.h"
+#include "vd3d.h"
 
 // @@BEGIN_MSINTERNAL
 #if !defined(BUILD_RLAPI) && !defined(BUILD_DDDDK)
@@ -45,7 +45,7 @@
 
 #include "rlreg.h"
 #include "lists.h"
-#include "object/object.h"
+#include "object.h"
 
 
 /*
@@ -383,7 +383,7 @@ typedef struct _DIRECT3DDEVICEI
     D3DVALUE			perspective_tolerance;
 
     /* Library information */
-#ifdef _WIN32
+#ifdef WIN32
     HINSTANCE		hDrvDll;
     char		dllname[MAXPATH];
     char		base[256];

fs2_open/code/directx/vd3drm.h

@@ -10,8 +10,8 @@
 #ifndef __D3DRM_H__
 #define __D3DRM_H__
 
-#include "directx/vddraw.h"
-#include "directx/vd3drmobj.h"
+#include "vddraw.h"
+#include "vd3drmobj.h"
 
 #ifdef __cplusplus
 extern "C" {

fs2_open/code/directx/vd3drmdef.h

@@ -11,9 +11,9 @@
 #define __D3DRMDEFS_H__
 
 #include <stddef.h>
-#include "directx/vd3dtypes.h"
+#include "vd3dtypes.h"
 
-#ifdef _WIN32
+#ifdef WIN32
 #define D3DRMAPI  __stdcall
 #else
 #define D3DRMAPI

fs2_open/code/directx/vd3drmobj.h

@@ -13,8 +13,8 @@
 #include <objbase.h> /* Use Windows header files */
 #define VIRTUAL
 
-#include "directx/vd3drmdef.h"
-#include "directx/vd3d.h"
+#include "vd3drmdef.h"
+#include "vd3d.h"
 
 #ifdef __cplusplus
 extern "C" {

fs2_open/code/directx/vd3drmwin.h

@@ -10,16 +10,13 @@
 #ifndef __D3DRMWIN_H__
 #define __D3DRMWIN_H__
 
-#ifdef _WIN32
 #ifndef WIN32
 #define WIN32
 #endif
-#endif
 
-
-#include "directx/vd3drm.h"
-#include "directx/vddraw.h"
-#include "directx/vd3d.h"
+#include "vd3drm.h"
+#include "vddraw.h"
+#include "vd3d.h"
 
 /*
  * GUIDS used by Direct3DRM Windows interface

fs2_open/code/directx/vd3dtypes.h

@@ -10,14 +10,14 @@
 #ifndef _D3DTYPES_H_
 #define _D3DTYPES_H_
 
-#if (! defined _WIN32) && (! defined WIN95)
+#if (! defined WIN32) && (! defined WIN95)
 #include "subwtype.h"
 #else
 #include <windows.h>
 #endif
 
 #include <float.h>
-#include "directx/vddraw.h"
+#include "vddraw.h"
 
 #pragma pack(4)
 

fs2_open/code/directx/vdplobby.h

@@ -8,7 +8,7 @@
 #ifndef __DPLOBBY_INCLUDED__
 #define __DPLOBBY_INCLUDED__
 
-#include "directx/vdplay.h"
+#include "vdplay.h"
 
 #ifdef __cplusplus
 extern "C" {

fs2_open/code/directx/vdsound.h

@@ -10,7 +10,7 @@
 #ifndef __DSOUND_INCLUDED__
 #define __DSOUND_INCLUDED__
 
-#include "directx/vd3dtypes.h"
+#include "vd3dtypes.h"
 
 #define COM_NO_WINDOWS_H
 #include <objbase.h>

fs2_open/code/exceptionhandler/exceptionhandler.cpp

@@ -9,8 +9,8 @@
 
 /*
  * $Logfile: /Freespace2/code/ExceptionHandler/ExceptionHandler.cpp $
- * $Revision: 2.0 $
- * $Date: 2002-06-03 04:02:22 $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:57 $
  * $Author: penguin $
  *
  * Main file for dealing with exception handling

fs2_open/code/exceptionhandler/exceptionhandler.h

@@ -9,19 +9,13 @@
 
 /*
  * $Logfile: /Freespace2/code/ExceptionHandler/ExceptionHandler.h $
- * $Revision: 2.1 $
- * $Date: 2002-07-07 19:55:58 $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:57 $
  * $Author: penguin $
  *
  * Header file for program exception handling
  *
  * $Log: not supported by cvs2svn $
- * Revision 2.0  2002/06/03 04:02:22  penguin
- * Warpcore CVS sync
- *
- * Revision 1.2  2002/05/07 02:58:10  mharris
- * ifdef around pragma
- *
  * Revision 1.1  2002/05/02 18:03:05  mharris
  * Initial checkin - converted filenames and includes to lower case
  *
@@ -35,9 +29,7 @@
  * $NoKeywords: $
  */
 
-#ifdef _MSC_VER
 #pragma once		// Include this file only once
-#endif
 
 #ifndef __EXCEPTION_HANDLER_H
 #define __EXCEPTION_HANDLER_H

fs2_open/code/fireball/fireballs.cpp

@@ -9,27 +9,13 @@
 
 /*
  * $Logfile: /Freespace2/code/Fireball/FireBalls.cpp $
- * $Revision: 2.3 $
- * $Date: 2002-12-07 01:37:41 $
- * $Author: bobboau $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:57 $
+ * $Author: penguin $
  *
  * Code to move, render and otherwise deal with fireballs.
  *
  * $Log: not supported by cvs2svn $
- * Revision 2.2  2002/11/14 04:18:16  bobboau
- * added warp model and type 1 glow points
- * and well as made the new glow file type,
- * some general improvement to fighter beams,
- *
- * Revision 2.1  2002/08/01 01:41:04  penguin
- * The big include file move
- *
- * Revision 2.0  2002/06/03 04:02:22  penguin
- * Warpcore CVS sync
- *
- * Revision 1.2  2002/05/03 22:07:08  mharris
- * got some stuff to compile
- *
  * Revision 1.1  2002/05/02 18:03:07  mharris
  * Initial checkin - converted filenames and includes to lower case
  *
@@ -332,28 +318,26 @@
 
 #include <stdlib.h>
 
-#include "math/vecmat.h"
-#include "graphics/tmapper.h"
-#include "graphics/2d.h"
-#include "render/3d.h"
-#include "bmpman/bmpman.h"
-#include "model/model.h"
-#include "io/key.h"
-#include "physics/physics.h"
-#include "math/floating.h"
-#include "model/model.h"
-#include "lighting/lighting.h"
-#include "object/object.h"
-#include "ship/ship.h"
-#include "globalincs/systemvars.h"
-#include "fireball/fireballs.h"
-#include "globalincs/linklist.h"
-#include "gamesnd/gamesnd.h"
-#include "localization/localize.h"
+#include "vecmat.h"
+#include "tmapper.h"
+#include "2d.h"
+#include "3d.h"
+#include "bmpman.h"
+#include "model.h"
+#include "key.h"
+#include "physics.h"
+#include "floating.h"
+#include "model.h"
+#include "lighting.h"
+#include "object.h"
+#include "ship.h"
+#include "systemvars.h"
+#include "fireballs.h"
+#include "linklist.h"
+#include "gamesnd.h"
+#include "localize.h"
 
-int wm;
-
-#define WARPHOLE_GROW_TIME		(3.5f)	// time for warphole to reach max size (also time to shrink to nothing once it begins to shrink)
+#define WARPHOLE_GROW_TIME		(1.5f)	// time for warphole to reach max size (also time to shrink to nothing once it begins to shrink)
 
 #define MAX_FIREBALL_LOD						4
 
@@ -518,9 +502,7 @@ void fireball_load_data()
 
 	if ( Warp_glow_bitmap == -1 )	{
 		Warp_glow_bitmap = bm_load( NOX("warpglow01") );
-	}
-	
-//	polymodel Warp_pm;
+	}	
 
 }
 
@@ -549,11 +531,6 @@ void fireball_init()
 		Fireballs[i].objnum	= -1;
 	}
 
-	mprintf(("loading warp model"));
-	wm = -1;
-	wm = model_load("warp.pof", 0, NULL, 0);
-	mprintf((" %d\n", wm));
-
 
 }
 
@@ -647,7 +624,6 @@ void fireball_render(object * obj)
 					//rad = (fb->total_time - t )*obj->radius/WARPHOLE_GROW_TIME;
 				}
 				//rad = obj->radius;
-//				obj->alt_rad = rad;
 
 
 				warpin_render(&obj->orient, &obj->pos, Fireballs[num].current_bitmap, rad, percent_life, obj->radius );
@@ -945,7 +921,7 @@ int fireball_get_lod(vector *pos, fireball_info *fd, float size)
 		vector temp;
 
 		behind = 1;
-		vm_vec_scale_add(&temp, &Eye_position, &Eye_matrix.vec.fvec, dist);
+		vm_vec_scale_add(&temp, &Eye_position, &Eye_matrix.fvec, dist);
 		g3_rotate_vertex(&v, &temp);
 
 		// if still behind, bail and go with default
@@ -1112,8 +1088,8 @@ int fireball_create( vector * pos, int fireball_type, int parent_obj, float size
 			if (reverse)	{
 				fb->orient = 1;
 				// if warp out, then reverse the orientation
-				vm_vec_scale( &obj->orient.vec.fvec, -1.0f );	// Reverse the forward vector
-				vm_vec_scale( &obj->orient.vec.rvec, -1.0f );	// Reverse the right vector
+				vm_vec_scale( &obj->orient.fvec, -1.0f );	// Reverse the forward vector
+				vm_vec_scale( &obj->orient.rvec, -1.0f );	// Reverse the right vector
 			} else {
 				fb->orient = 0;
 			}

fs2_open/code/fireball/fireballs.h

@@ -5,23 +5,17 @@
  * or otherwise commercially exploit the source or things you created based on the 
  * source.
  *
-*/  
+*/ 
 
 /*
  * $Logfile: /Freespace2/code/Fireball/FireBalls.h $
- * $Revision: 2.2 $
- * $Date: 2002-11-14 04:18:16 $
- * $Author: bobboau $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:57 $
+ * $Author: penguin $
  *
  * Prototypes for fireball functions
  *
  * $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:22  penguin
- * Warpcore CVS sync
- *
  * Revision 1.1  2002/05/02 18:03:07  mharris
  * Initial checkin - converted filenames and includes to lower case
  *
@@ -163,8 +157,8 @@
 #ifndef _FIREBALLS_H
 #define _FIREBALLS_H
 
-#include "object/object.h"
-#include "cfile/cfile.h"
+#include "object.h"
+#include "cfile.h"
 
 // these values correspond to the fireball.tbl entries
 #define FIREBALL_EXPLOSION_MEDIUM	0				// Used for the 4 little explosions before a ship explodes
@@ -210,5 +204,3 @@ extern void warpin_render(matrix *orient, vector *pos, int texture_bitmap_num, f
 extern int Warp_glow_bitmap;			// Internal
 
 #endif /* _FIREBALLS_H */
-
-extern int wm;

fs2_open/code/fireball/warpineffect.cpp

@@ -7,29 +7,15 @@
  *
 */ 
 
-/* 
+/*
  * $Logfile: /Freespace2/code/Fireball/WarpInEffect.cpp $
- * $Revision: 2.3 $
- * $Date: 2003-01-05 23:41:50 $
- * $Author: bobboau $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:57 $
+ * $Author: penguin $
  *
  * Code for rendering the warp in effects for ships
  *
  * $Log: not supported by cvs2svn $
- * Revision 2.2  2002/11/14 04:18:16  bobboau
- * added warp model and type 1 glow points
- * and well as made the new glow file type,
- * some general improvement to fighter beams,
- *
- * Revision 2.1  2002/08/01 01:41:04  penguin
- * The big include file move
- *
- * Revision 2.0  2002/06/03 04:02:22  penguin
- * Warpcore CVS sync
- *
- * Revision 1.2  2002/05/03 22:07:08  mharris
- * got some stuff to compile
- *
  * Revision 1.1  2002/05/02 18:03:07  mharris
  * Initial checkin - converted filenames and includes to lower case
  *
@@ -125,27 +111,24 @@
  */
 
 
-#include "math/vecmat.h"
-#include "graphics/tmapper.h"
-#include "graphics/2d.h"
-#include "render/3d.h"
-#include "bmpman/bmpman.h"
-#include "model/model.h"
-#include "io/key.h"
-#include "physics/physics.h"
-#include "math/floating.h"
-#include "model/model.h"
-#include "lighting/lighting.h"
-#include "object/object.h"
-#include "ship/ship.h"
-#include "globalincs/systemvars.h"
-#include "anim/animplay.h"
-#include "fireball/fireballs.h"
-#include "globalincs/linklist.h"
-#include "io/timer.h"
-#include "Weapon/Beam.h"
-
-extern int wm;
+#include "vecmat.h"
+#include "tmapper.h"
+#include "2d.h"
+#include "3d.h"
+#include "bmpman.h"
+#include "model.h"
+#include "key.h"
+#include "physics.h"
+#include "floating.h"
+#include "model.h"
+#include "lighting.h"
+#include "object.h"
+#include "ship.h"
+#include "systemvars.h"
+#include "animplay.h"
+#include "fireballs.h"
+#include "linklist.h"
+#include "timer.h"
 
 DCF(norm,"normalize a zero length vector")
 {
@@ -175,129 +158,59 @@ void draw_face( vertex *v1, vertex *v2, vertex *v3 )
 
 }
 
-#define wSTUFF_VERTICES()	do { verts[0]->u = 0.5f; verts[0]->v = 0.0f;	verts[1]->u = 1.0f; verts[1]->v = 0.0f; verts[2]->u = 1.0f;	verts[2]->v = 1.0f; verts[3]->u = 0.5f; verts[3]->v = 1.0f; } while(0);
-#define wR_VERTICES()		do { g3_rotate_vertex(verts[0], &bottom1); g3_rotate_vertex(verts[1], &bottom2);	g3_rotate_vertex(verts[2], &top2); g3_rotate_vertex(verts[3], &top1); } while(0);
-#define wP_VERTICES()		do { for(idx=0; idx<4; idx++){ g3_project_vertex(verts[idx]); } } while(0);
-
 void warpin_render(matrix *orient, vector *pos, int texture_bitmap_num, float radius, float life_percent, float max_radius )
 {
-
 	int i;
 
 	int saved_gr_zbuffering = gr_zbuffer_get();
 
 //	gr_zbuffering = 0;
 
+	gr_set_bitmap( texture_bitmap_num, GR_ALPHABLEND_FILTER, GR_BITBLT_MODE_NORMAL, 1.0f );
 
 	float Grid_depth = radius/2.5f;
 
 	vector center;
 
-	vm_vec_scale_add( &center, pos, &orient->vec.fvec, -(max_radius/2.5f)/3.0f );
+	vm_vec_scale_add( &center, pos, &orient->fvec, -(max_radius/2.5f)/3.0f );
 
-//	Warp_Map = texture_bitmap_num;//sets the warp map, and thus sets the interp flag for this being a warpin effect
 	vector vecs[5];
 	vertex verts[5];
 
-	if(wm > -1){
-		float model_Interp_scale_x = radius /20;
-		float model_Interp_scale_y = radius /20;
-		float model_Interp_scale_z = max_radius /20;
+	vm_vec_scale_add( &vecs[0], &center, &orient->uvec, radius );
+	vm_vec_scale_add2( &vecs[0], &orient->rvec, -radius );
+	vm_vec_scale_add2( &vecs[0], &orient->fvec, Grid_depth );
 
-		set_warp_gloabals(model_Interp_scale_x, model_Interp_scale_y, model_Interp_scale_z, texture_bitmap_num, (radius/max_radius) );
-		
-		float dist = vm_vec_dist_quick( pos, &Eye_position );
+	vm_vec_scale_add( &vecs[1], &center, &orient->uvec, radius );
+	vm_vec_scale_add2( &vecs[1], &orient->rvec, radius );
+	vm_vec_scale_add2( &vecs[1], &orient->fvec, Grid_depth );
 
-		model_set_detail_level((int)(dist / (radius * 10.0f)));
-		gr_set_cull(0);
-		model_render( wm, orient, pos, MR_NO_LIGHTING | MR_NORMAL);
-		gr_set_cull(1);
+	vm_vec_scale_add( &vecs[2], &center, &orient->uvec, -radius );
+	vm_vec_scale_add2( &vecs[2], &orient->rvec, radius );
+	vm_vec_scale_add2( &vecs[2], &orient->fvec, Grid_depth );
 
-//	Warp_Map = -1;//un sets the warp map
+	vm_vec_scale_add( &vecs[3], &center, &orient->uvec, -radius );
+	vm_vec_scale_add2( &vecs[3], &orient->rvec, -radius );
+	vm_vec_scale_add2( &vecs[3], &orient->fvec, Grid_depth );
 
-		model_Interp_scale_x = 1.0f;
-		model_Interp_scale_y = 1.0f;
-		model_Interp_scale_z = 1.0f;
-
-		set_warp_gloabals(model_Interp_scale_x, model_Interp_scale_y, model_Interp_scale_z, -1, 0.0f);
-
-		gr_set_cull(0);
-/*
-//this is that half done effect that was pissing people off-Bobboau
-		matrix m;
-		vector ray_dir;
-		vm_vector_2_matrix(&m, &orient->vec.fvec, NULL, NULL);//this is the beam things that will come outof the point-Bobboau
-		float angle = ANG_TO_RAD(135.0f);
-		if(life_percent < 0.2f){
-			angle = ANG_TO_RAD(135.0f * (life_percent * 5.0f));
-		}
-		for(int idx=0; idx<1; idx++){
-			vm_vec_random_cone(&ray_dir, &orient->vec.fvec, angle, &m);
-			mprintf(( "ray direction %f %f %f, orentation %f %f %f, angle %f\n",ray_dir.xyz.x, ray_dir.xyz.y, ray_dir.xyz.z, orient->vec.fvec.xyz.x, orient->vec.fvec.xyz.y, orient->vec.fvec.xyz.z, angle));
-			vector p_temp = *pos;
-			vm_vec_scale_add(&p_temp, pos, &ray_dir, (max_radius * 10 * frand_range(0.75f, 0.9f)));
-			mprintf(( "end %f %f %f",p_temp.xyz.x, p_temp.xyz.y, p_temp.xyz.z));
+//	vm_vec_scale_add( &vecs[4], &center, &orient->fvec, -Grid_depth );
+	vecs[4] = center;
 			
-			vertex h1[4];				// halves of a beam section	
-			vertex *verts[4] = { &h1[0], &h1[1], &h1[2], &h1[3] };	
-			vector top1, bottom1, top2, bottom2;
+	verts[0].u = 0.01f; verts[0].v = 0.01f; 
+	verts[1].u = 0.99f; verts[1].v = 0.01f; 
+	verts[2].u = 0.99f; verts[2].v = 0.99f; 
+	verts[3].u = 0.01f; verts[3].v = 0.99f; 
+	verts[4].u = 0.5f; verts[4].v = 0.5f; 
 
-			beam_calc_facing_pts(&top1, &bottom1, &ray_dir, pos, 1.0f, 1.0f);	
-			beam_calc_facing_pts(&top2, &bottom2, &ray_dir, &p_temp, 1.0f, 1.0f);	
-			
-			mprintf(( "top1 %f %f %f, botom1 %f %f %f, \n",top1.xyz.x, top1.xyz.y, top1.xyz.z, bottom1.xyz.x, bottom1.xyz.y, bottom1.xyz.z));
-			mprintf(( "top2 %f %f %f, botom2 %f %f %f, \n",top2.xyz.x, top2.xyz.y, top2.xyz.z, bottom2.xyz.x, bottom2.xyz.y, bottom2.xyz.z));
-			wR_VERTICES();																// rotate and project the vertices
-			wP_VERTICES();						
-			wSTUFF_VERTICES();		// stuff the beam with creamy goodness (texture coords)
-
-			gr_set_bitmap(Warp_glow_bitmap, GR_ALPHABLEND_FILTER, GR_BITBLT_MODE_NORMAL, 0.9999f);		
-			g3_draw_poly( 4, verts, TMAP_FLAG_TILED | TMAP_FLAG_TEXTURED | TMAP_FLAG_CORRECT); // added TMAP_FLAG_TILED flag for beam texture tileing -Bobboau
-		}
-*/
-		gr_set_cull(1);
-
-		vecs[4] = center;		//this is for the warp glow-Bobboau
-		verts[4].u = 0.5f; verts[4].v = 0.5f; 
-		g3_rotate_vertex( &verts[4], &vecs[4] );
-
-	}else{
-		gr_set_bitmap( texture_bitmap_num, GR_ALPHABLEND_FILTER, GR_BITBLT_MODE_NORMAL, 1.0f );	
-
-		vm_vec_scale_add( &vecs[0], &center, &orient->vec.uvec, radius );
-		vm_vec_scale_add2( &vecs[0], &orient->vec.rvec, -radius );
-		vm_vec_scale_add2( &vecs[0], &orient->vec.fvec, Grid_depth );
-
-		vm_vec_scale_add( &vecs[1], &center, &orient->vec.uvec, radius );
-		vm_vec_scale_add2( &vecs[1], &orient->vec.rvec, radius );
-		vm_vec_scale_add2( &vecs[1], &orient->vec.fvec, Grid_depth );
-
-		vm_vec_scale_add( &vecs[2], &center, &orient->vec.uvec, -radius );
-		vm_vec_scale_add2( &vecs[2], &orient->vec.rvec, radius );
-		vm_vec_scale_add2( &vecs[2], &orient->vec.fvec, Grid_depth );
-
-		vm_vec_scale_add( &vecs[3], &center, &orient->vec.uvec, -radius );
-		vm_vec_scale_add2( &vecs[3], &orient->vec.rvec, -radius );
-		vm_vec_scale_add2( &vecs[3], &orient->vec.fvec, Grid_depth );
-
-//	vm_vec_scale_add( &vecs[4], ¢er, &orient->vec.fvec, -Grid_depth );
-		vecs[4] = center;
-			
-		verts[0].u = 0.01f; verts[0].v = 0.01f; 
-		verts[1].u = 0.99f; verts[1].v = 0.01f; 
-		verts[2].u = 0.99f; verts[2].v = 0.99f; 
-		verts[3].u = 0.01f; verts[3].v = 0.99f; 
-		verts[4].u = 0.5f; verts[4].v = 0.5f; 
-
-		for (i=0; i<5; i++ )	{
-			g3_rotate_vertex( &verts[i], &vecs[i] );
-		}
-
-		draw_face( &verts[0], &verts[4], &verts[1] );
-		draw_face( &verts[1], &verts[4], &verts[2] );
-		draw_face( &verts[4], &verts[3], &verts[2] );
-		draw_face( &verts[0], &verts[3], &verts[4] );
+	for (i=0; i<5; i++ )	{
+		g3_rotate_vertex( &verts[i], &vecs[i] );
 	}
+
+	draw_face( &verts[0], &verts[4], &verts[1] );
+	draw_face( &verts[1], &verts[4], &verts[2] );
+	draw_face( &verts[4], &verts[3], &verts[2] );
+	draw_face( &verts[0], &verts[3], &verts[4] );
+
 	if ( Warp_glow_bitmap != -1 )	{
 		gr_set_bitmap( Warp_glow_bitmap, GR_ALPHABLEND_FILTER, GR_BITBLT_MODE_NORMAL, 1.0f );
 
@@ -346,3 +259,9 @@ void warpin_render(matrix *orient, vector *pos, int texture_bitmap_num, float ra
 	gr_zbuffer_set( saved_gr_zbuffering );
 }
 
+
+
+
+
+
+

fs2_open/code/freespace2/freespace.h

@@ -9,16 +9,13 @@
 
 /*
  * $Logfile: /Freespace2/code/FREESPACE2/FreeSpace.h $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:57 $
  * $Author: penguin $
  *
  * FreeSpace, the game, not the project, header information.
  *
  * $Log: not supported by cvs2svn $
- * Revision 2.0  2002/06/03 04:02:22  penguin
- * Warpcore CVS sync
- *
  * Revision 1.1  2002/05/02 18:03:07  mharris
  * Initial checkin - converted filenames and includes to lower case
  *
@@ -150,9 +147,9 @@
 #define _FREESPACE_H
 #ifndef STAMPER_PROGRAM							// because of all the dependancies, I have to do this...yuck!!!  MWA 7/21/97
 
-#include "globalincs/pstypes.h"
-#include "globalincs/systemvars.h"
-#include "graphics/2d.h"
+#include "pstypes.h"
+#include "systemvars.h"
+#include "2d.h"
 
 // --------------------------------------------------------------------------------------------------------
 // FREESPACE DEFINES/VARS

fs2_open/code/freespace2/levelpaging.cpp

@@ -9,16 +9,13 @@
 
 /*
  * $Logfile: /Freespace2/code/Freespace2/LevelPaging.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:57 $
  * $Author: penguin $
  *
  * Code to page in all the bitmaps at the beginning of a level.
  *
  * $Log: not supported by cvs2svn $
- * Revision 2.0  2002/06/03 04:02:22  penguin
- * Warpcore CVS sync
- *
  * Revision 1.1  2002/05/02 18:03:07  mharris
  * Initial checkin - converted filenames and includes to lower case
  *
@@ -56,9 +53,9 @@
  * $NoKeywords: $
  */
 
-#include "freespace2/freespace.h"
-#include "bmpman/bmpman.h"
-#include "freespace2/levelpaging.h"
+#include "freespace.h"
+#include "bmpman.h"
+#include "levelpaging.h"
 
 // All the page in functions
 extern void ship_page_in();

fs2_open/code/freespace2/levelpaging.h

@@ -9,8 +9,8 @@
 
 /*
  * $Logfile: /Freespace2/code/FREESPACE2/LevelPaging.h $
- * $Revision: 2.0 $
- * $Date: 2002-06-03 04:02:22 $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:57 $
  * $Author: penguin $
  *
  * Code to page in all the bitmaps at the beginning of a level.

fs2_open/code/gamehelp/contexthelp.cpp

@@ -9,19 +9,13 @@
 
 /*
  * $Logfile: /Freespace2/code/GameHelp/ContextHelp.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:57 $
  * $Author: penguin $
  *
  * Functions to drive the context-sensitive help 
  *
  * $Log: not supported by cvs2svn $
- * Revision 2.0  2002/06/03 04:02:22  penguin
- * Warpcore CVS sync
- *
- * Revision 1.2  2002/05/03 22:07:08  mharris
- * got some stuff to compile
- *
  * Revision 1.1  2002/05/02 18:03:07  mharris
  * Initial checkin - converted filenames and includes to lower case
  *
@@ -110,21 +104,21 @@
 #include <string.h>
 #include <setjmp.h>
 
-#include "gamehelp/contexthelp.h"
-#include "gamesequence/gamesequence.h"
-#include "freespace2/freespace.h"
-#include "menuui/mainhallmenu.h"
-#include "io/key.h"
-#include "bmpman/bmpman.h"
-#include "graphics/2d.h"
-#include "io/timer.h"
+#include "contexthelp.h"
+#include "gamesequence.h"
+#include "freespace.h"
+#include "mainhallmenu.h"
+#include "key.h"
+#include "bmpman.h"
+#include "2d.h"
+#include "timer.h"
 #include "math.h"
-#include "io/mouse.h"
-#include "controlconfig/controlsconfig.h"
-#include "menuui/techmenu.h"
-#include "parse/parselo.h"
-#include "localization/localize.h"
-#include "globalincs/alphacolors.h"
+#include "mouse.h"
+#include "controlsconfig.h"
+#include "techmenu.h"
+#include "parselo.h"
+#include "localize.h"
+#include "alphacolors.h"
 
 
 ////////////////////////////////////////////////////////////////////
@@ -516,23 +510,23 @@ void parse_helptbl()
 					for (i=0; i<help_overlaylist[overlay_id].plinelist[GR_640][currcount].vtxcount; i++) {
 						stuff_int(&a);
 						stuff_int(&b);
-						help_overlaylist[overlay_id].plinelist[GR_640][currcount].vtx[i].xyz.x = (float)a;
-						help_overlaylist[overlay_id].plinelist[GR_640][currcount].vtx[i].xyz.y = (float)b;
-						help_overlaylist[overlay_id].plinelist[GR_640][currcount].vtx[i].xyz.z = 0.0f;
+						help_overlaylist[overlay_id].plinelist[GR_640][currcount].vtx[i].x = (float)a;
+						help_overlaylist[overlay_id].plinelist[GR_640][currcount].vtx[i].y = (float)b;
+						help_overlaylist[overlay_id].plinelist[GR_640][currcount].vtx[i].z = 0.0f;
 						help_overlaylist[overlay_id].plinelist[GR_640][currcount].pvtx[i] = &help_overlaylist[overlay_id].plinelist[GR_640][currcount].vtx[i];
 					}
 					// get 1024x768 vertex coordinates
 					for (i=0; i<help_overlaylist[overlay_id].plinelist[GR_640][currcount].vtxcount; i++) {
 						stuff_int(&a);
 						stuff_int(&b);
-						help_overlaylist[overlay_id].plinelist[GR_1024][currcount].vtx[i].xyz.x = (float)a;
-						help_overlaylist[overlay_id].plinelist[GR_1024][currcount].vtx[i].xyz.y = (float)b;
-						help_overlaylist[overlay_id].plinelist[GR_1024][currcount].vtx[i].xyz.z = 0.0f;
+						help_overlaylist[overlay_id].plinelist[GR_1024][currcount].vtx[i].x = (float)a;
+						help_overlaylist[overlay_id].plinelist[GR_1024][currcount].vtx[i].y = (float)b;
+						help_overlaylist[overlay_id].plinelist[GR_1024][currcount].vtx[i].z = 0.0f;
 						help_overlaylist[overlay_id].plinelist[GR_1024][currcount].pvtx[i] = &help_overlaylist[overlay_id].plinelist[GR_1024][currcount].vtx[i];
 					}
 				}
 
-				//mprintf(("Found pline - start location (%f,%f), end location (%f,%f)\n", help_overlaylist[overlay_id].plinelist[GR_640][currcount].vtx[0].xyz.x, help_overlaylist[overlay_id].plinelist[GR_640][currcount].vtx[0].xyz.y, help_overlaylist[overlay_id].plinelist[GR_640][currcount].vtx[2].xyz.x, help_overlaylist[overlay_id].plinelist[GR_640][currcount].vtx[2].xyz.y));
+				//mprintf(("Found pline - start location (%f,%f), end location (%f,%f)\n", help_overlaylist[overlay_id].plinelist[GR_640][currcount].vtx[0].x, help_overlaylist[overlay_id].plinelist[GR_640][currcount].vtx[0].y, help_overlaylist[overlay_id].plinelist[GR_640][currcount].vtx[2].x, help_overlaylist[overlay_id].plinelist[GR_640][currcount].vtx[2].y));
 				help_overlaylist[overlay_id].plinecount++;
 
 			} else if (optional_string("+text")) {
@@ -674,11 +668,11 @@ void nudgetext_y(int textnum, int amount)
 }
 void nudgepline_x(int plinenum, int plinevert, int amount)
 {
-	help_overlaylist[current_helpid].plinelist[gr_screen.res][plinenum].vtx[plinevert].xyz.x += amount;
+	help_overlaylist[current_helpid].plinelist[gr_screen.res][plinenum].vtx[plinevert].x += amount;
 }
 void nudgepline_y(int plinenum, int plinevert, int amount)
 {
-	help_overlaylist[current_helpid].plinelist[gr_screen.res][plinenum].vtx[plinevert].xyz.y += amount;
+	help_overlaylist[current_helpid].plinelist[gr_screen.res][plinenum].vtx[plinevert].y += amount;
 }
 void nudgerbracket_x(int num, int amount)
 {
@@ -714,7 +708,7 @@ void showplinepos(int plinenum)
 	dc_printf("pline %d on overlay %d vertices are now ", plinenum, current_helpid, help_overlaylist[current_helpid].textlist[gr_screen.res][plinenum].y_coord );
 	for (i=0; i<help_overlaylist[current_helpid].plinelist[GR_640][plinenum].vtxcount; i++)
 	{
-		dc_printf("(%3.0f %3.0f) ", help_overlaylist[current_helpid].plinelist[gr_screen.res][plinenum].vtx[i].xyz.x, help_overlaylist[current_helpid].plinelist[gr_screen.res][plinenum].vtx[i].xyz.y);
+		dc_printf("(%3.0f %3.0f) ", help_overlaylist[current_helpid].plinelist[gr_screen.res][plinenum].vtx[i].x, help_overlaylist[current_helpid].plinelist[gr_screen.res][plinenum].vtx[i].y);
 	}
 }
 

fs2_open/code/gamehelp/gameplayhelp.cpp

@@ -9,16 +9,13 @@
 
 /*
  * $Logfile: /Freespace2/code/GameHelp/GameplayHelp.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:57 $
  * $Author: penguin $
  *
  * Module for displaying in-game help
  *
  * $Log: not supported by cvs2svn $
- * Revision 2.0  2002/06/03 04:02:22  penguin
- * Warpcore CVS sync
- *
  * Revision 1.1  2002/05/02 18:03:07  mharris
  * Initial checkin - converted filenames and includes to lower case
  *
@@ -118,22 +115,22 @@
  * $NoKeywords: $
  */
 
-#include "gamehelp/contexthelp.h"
-#include "gamesequence/gamesequence.h"
-#include "freespace2/freespace.h"
-#include "io/key.h"
-#include "bmpman/bmpman.h"
-#include "graphics/2d.h"
-#include "io/timer.h"
+#include "contexthelp.h"
+#include "gamesequence.h"
+#include "freespace.h"
+#include "key.h"
+#include "bmpman.h"
+#include "2d.h"
+#include "timer.h"
 #include "math.h"
-#include "io/mouse.h"
-#include "controlconfig/controlsconfig.h"
-#include "ui/ui.h"
-#include "gamesnd/gamesnd.h"
-#include "missionui/missionscreencommon.h"
-#include "globalincs/alphacolors.h"
-#include "weapon/beam.h"
-#include "sound/audiostr.h"
+#include "mouse.h"
+#include "controlsconfig.h"
+#include "ui.h"
+#include "gamesnd.h"
+#include "missionscreencommon.h"
+#include "alphacolors.h"
+#include "beam.h"
+#include "audiostr.h"
 
 // text positioning constats
 #define TITLE_Y			35

fs2_open/code/gamehelp/gameplayhelp.h

@@ -9,8 +9,8 @@
 
 /*
  * $Logfile: /Freespace2/code/GameHelp/GameplayHelp.h $
- * $Revision: 2.0 $
- * $Date: 2002-06-03 04:02:22 $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:57 $
  * $Author: penguin $
  *
  * Header for displaying in-game help

fs2_open/code/gamesequence/gamesequence.cpp

@@ -9,16 +9,13 @@
 
 /*
  * $Logfile: /Freespace2/code/GameSequence/GameSequence.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:57 $
  * $Author: penguin $
  *
  * File to control Game Sequencing
  *
  * $Log: not supported by cvs2svn $
- * Revision 2.0  2002/06/03 04:02:22  penguin
- * Warpcore CVS sync
- *
  * Revision 1.1  2002/05/02 18:03:07  mharris
  * Initial checkin - converted filenames and includes to lower case
  *
@@ -243,8 +240,8 @@
  *  States should always be referred to using the macros.
 */
 
-#include "freespace2/freespace.h"
-#include "gamesequence/gamesequence.h"
+#include "freespace.h"
+#include "gamesequence.h"
 
 // local defines
 #define MAX_GAMESEQ_EVENTS		20		// maximum number of events on the game sequencing queue

fs2_open/code/gamesequence/gamesequence.h

@@ -9,16 +9,13 @@
 
 /*
  * $Logfile: /Freespace2/code/GameSequence/GameSequence.h $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:57 $
  * $Author: penguin $
  *
  * Header file for Game Sequencing items
  *
  * $Log: not supported by cvs2svn $
- * Revision 2.0  2002/06/03 04:02:22  penguin
- * Warpcore CVS sync
- *
  * Revision 1.1  2002/05/02 18:03:07  mharris
  * Initial checkin - converted filenames and includes to lower case
  *
@@ -334,7 +331,7 @@
 #ifndef __GAMESEQUENCE_H__
 #define __GAMESEQUENCE_H__
 
-#include "globalincs/pstypes.h"
+#include "pstypes.h"
 
 // defines for game sequencing events
 //

fs2_open/code/gamesnd/eventmusic.cpp

@@ -9,19 +9,13 @@
 
 /*
  * $Logfile: /Freespace2/code/Gamesnd/EventMusic.cpp $
- * $Revision: 2.2 $
- * $Date: 2003-01-25 04:17:39 $
- * $Author: Goober5000 $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:57 $
+ * $Author: penguin $
  *
  * C module for high-level control of event driven music 
  *
  * $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:22  penguin
- * Warpcore CVS sync
- *
  * Revision 1.1  2002/05/02 18:03:07  mharris
  * Initial checkin - converted filenames and includes to lower case
  *
@@ -117,22 +111,22 @@
  */
 
 
-#include	"globalincs/pstypes.h"
-#include "gamesnd/eventmusic.h"
-#include "object/object.h"
-#include "ship/ship.h"
-#include "globalincs/linklist.h"
-#include "mission/missionload.h"	/* for Builtin_mission_names[] */
-#include "mission/missionparse.h"
-#include "io/timer.h"
-#include "freespace2/freespace.h"
-#include "sound/audiostr.h"
-#include "mission/missioncampaign.h"
-#include "sound/sound.h"
+#include	"pstypes.h"
+#include "eventmusic.h"
+#include "object.h"
+#include "ship.h"
+#include "linklist.h"
+#include "missionload.h"	/* for Builtin_mission_names[] */
+#include "missionparse.h"
+#include "timer.h"
+#include "freespace.h"
+#include "audiostr.h"
+#include "missioncampaign.h"
+#include "sound.h"
 #include "time.h"
-#include "cmdline/cmdline.h"
-#include "mission/missiongoals.h"
-#include "localization/localize.h"
+#include "cmdline.h"
+#include "missiongoals.h"
+#include "localize.h"
 
 #pragma optimize("", off)
 
@@ -1418,30 +1412,6 @@ int event_music_next_soundtrack(int delta)
 	return Current_soundtrack_num;
 }
 
-// Goober5000 - along the same lines; this is for the sexp
-void event_sexp_change_music(char *name)
-{
-	Assert(name);
-
-	int i, new_soundtrack = -1;
-
-	if ( Event_music_enabled == FALSE || Event_music_level_inited == FALSE )
-	{
-		return;
-	}
-
-	for (i=0; i<Num_soundtracks; i++)
-	{
-		if (!stricmp(name, Soundtracks[i].name))
-		{
-			new_soundtrack = i;
-		}
-	}
-
-	event_music_level_close();
-	event_music_level_init(new_soundtrack);
-}
-
 // ----------------------------------------------------------------
 // event_music_get_soundtrack_name()
 //

fs2_open/code/gamesnd/eventmusic.h

@@ -9,22 +9,13 @@
 
 /*
  * $Logfile: /Freespace2/code/Gamesnd/EventMusic.h $
- * $Revision: 2.2 $
- * $Date: 2003-01-25 04:17:39 $
- * $Author: Goober5000 $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:57 $
+ * $Author: penguin $
  *
  * Header file for high-level control of event driven music 
  *
  * $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:22  penguin
- * Warpcore CVS sync
- *
- * Revision 1.2  2002/05/10 06:08:08  mharris
- * Porting... added ifndef NO_SOUND
- *
  * Revision 1.1  2002/05/02 18:03:07  mharris
  * Initial checkin - converted filenames and includes to lower case
  *
@@ -130,7 +121,7 @@
 #ifndef __EVENT_MUSIC_H__
 #define __EVENT_MUSIC_H__
 
-#include "parse/parselo.h"
+#include "parselo.h"
 
 // Identifies songs in the Soundtrack_filenames[] structure.  The order matches up with
 // what is in music.tbl.  Do not modify without synching music.tbl.
@@ -188,13 +179,11 @@ typedef struct tagSOUNDTRACK_INFO {
 	char	pattern_fnames[MAX_PATTERNS][MAX_FILENAME_LEN];
 } SOUNDTRACK_INFO;
 
-#define MAX_SOUNDTRACKS	25
+#define MAX_SOUNDTRACKS	10
 
 extern SOUNDTRACK_INFO Soundtracks[MAX_SOUNDTRACKS];
 extern int Num_soundtracks;
 
-#ifndef NO_SOUND
-
 void	event_music_init();
 void	event_music_close();
 void	event_music_level_init(int force_soundtrack = -1);
@@ -220,7 +209,6 @@ void	event_music_start_default();
 void	event_music_get_info(char *outbuf);
 void	event_music_get_soundtrack_name(char *outbuf);
 int	event_music_next_soundtrack(int delta);
-void event_sexp_change_music(char *name);
 void	event_music_set_soundtrack(char *name);
 void	event_music_set_score(int score_index, char *name);
 int	event_music_get_spooled_music_index(char *name);
@@ -229,47 +217,4 @@ int	event_music_player_respawn();
 int	event_music_player_respawn_as_observer();
 void event_music_hostile_ship_destroyed();
 
-#else
-
-#define	event_music_init()
-#define	event_music_close()
-#define	event_music_level_init(force_soundtrack)		  ((void)(force_soundtrack))
-#define	event_music_level_close()
-#define	event_music_do_frame()
-#define	event_music_disable()
-#define	event_music_enable()
-#define	event_music_pause()
-#define	event_music_unpause()
-#define	event_music_set_volume_all(volume)				  ((void)(volume))
-#define	event_music_parse_musictbl()
-#define	event_music_change_pattern(new_pattern)		  ((void)(new_pattern))
-#define	event_music_return_current_pattern()			  (0)
-#define	event_music_first_pattern()
-#define	event_music_battle_start()							  (0)
-#define	event_music_enemy_arrival()						  (0)
-#define	event_music_friendly_arrival()					  (0)
-#define	event_music_arrival(team)							  ((void)(team))
-#define	event_music_primary_goals_met()					  (0)
-#define	event_music_primary_goal_failed()				  (0)
-#define	event_music_player_death()							  (0)
-#define	event_music_start_default()
-inline void	event_music_get_info(char *outbuf)
-{
-	if (outbuf) *outbuf = '\0';
-}
-inline void	event_music_get_soundtrack_name(char *outbuf)
-{
-	if (outbuf) *outbuf = '\0';
-}
-#define	event_music_next_soundtrack(delta)				  (0)
-#define	event_music_set_soundtrack(name)					  ((void)(name))
-#define	event_music_set_score(score_index, name)		  ((void)((score_index), (name)))
-#define	event_music_get_spooled_music_index(name)		  (-1)
-#define	event_music_reset_choices()
-#define	event_music_player_respawn()						  (0)
-#define	event_music_player_respawn_as_observer()		  (0)
-#define event_music_hostile_ship_destroyed()
-
-#endif  // ifndef NO_SOUND
-
 #endif /* __EVENT_MUSIC_H__  */

fs2_open/code/gamesnd/gamesnd.cpp

@@ -9,16 +9,13 @@
 
 /*
  * $Logfile: /Freespace2/code/Gamesnd/GameSnd.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:57 $
  * $Author: penguin $
  *
  * Routines to keep track of which sound files go where
  *
  * $Log: not supported by cvs2svn $
- * Revision 2.0  2002/06/03 04:02:22  penguin
- * Warpcore CVS sync
- *
  * Revision 1.1  2002/05/02 18:03:07  mharris
  * Initial checkin - converted filenames and includes to lower case
  *
@@ -170,11 +167,11 @@
  * $NoKeywords: $
  */
 
-#include "globalincs/pstypes.h"
-#include "gamesnd/gamesnd.h"
-#include "sound/sound.h"
-#include "parse/parselo.h"
-#include "localization/localize.h"
+#include "pstypes.h"
+#include "gamesnd.h"
+#include "sound.h"
+#include "parselo.h"
+#include "localize.h"
 
 // Global array that holds data about the gameplay sound effects.
 game_snd Snds[MAX_GAME_SOUNDS];

fs2_open/code/gamesnd/gamesnd.h

@@ -9,22 +9,13 @@
 
 /*
  * $Logfile: /Freespace2/code/Gamesnd/GameSnd.h $
- * $Revision: 2.2 $
- * $Date: 2002-12-10 05:43:35 $
- * $Author: Goober5000 $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:57 $
+ * $Author: penguin $
  *
  * Routines to keep track of which sound files go where
  *
  * $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:22  penguin
- * Warpcore CVS sync
- *
- * Revision 1.2  2002/05/10 06:08:08  mharris
- * Porting... added ifndef NO_SOUND
- *
  * Revision 1.1  2002/05/02 18:03:07  mharris
  * Initial checkin - converted filenames and includes to lower case
  *
@@ -326,10 +317,8 @@
 #ifndef __GAMESND_H__
 #define __GAMESND_H__
 
-#include "sound/sound.h"
-#include "mission/missionparse.h"
-
-#ifndef NO_SOUND
+#include "sound.h"
+#include "missionparse.h"
 
 void gamesnd_parse_soundstbl();	// Loads in general game sounds from sounds.tbl
 void gamesnd_init_sounds();		// initializes the Snds[] and Snds_iface[] array
@@ -344,24 +333,6 @@ void gamesnd_play_error_beep();
 
 void common_play_highlight_sound();	// called from interface code
 
-#else
-
-#define gamesnd_parse_soundstbl()
-#define gamesnd_init_sounds()
-#define gamesnd_load_gameplay_sounds()
-#define gamesnd_unload_gameplay_sounds()
-#define gamesnd_load_interface_sounds()
-#define gamesnd_unload_interface_sounds()
-#define gamesnd_preload_common_sounds()
-#define gamesnd_play_iface(n)							((void)(n))
-#define gamesnd_play_error_beep()
-
-// this is a callback, so it needs to be a real function
-void common_play_highlight_sound();
-
-#endif  // ifndef NO_SOUND
-
-
 // Misc_sounds[] holds handles for misc sounds in the game (list appears in sounds.tbl)
 #define MAX_GAME_SOUNDS					200
 #define MAX_INTERFACE_SOUNDS			70
@@ -533,10 +504,6 @@ extern game_snd Snds_flyby[MAX_SPECIES_NAMES][2];
 // copilot
 #define	SND_COPILOT							162
 
-// added for ballistic primaries - Goober5000
-#define	SND_BALLISTIC_START_LOAD		165
-#define	SND_BALLISTIC_LOAD				166
-
 // supernova 1 and supernova 2
 #define	SND_SUPERNOVA_1					173
 #define	SND_SUPERNOVA_2					174
@@ -545,6 +512,7 @@ extern game_snd Snds_flyby[MAX_SPECIES_NAMES][2];
 #define	SND_LIGHTNING_1					180
 #define	SND_LIGHTNING_2					181
 
+
 //---------------------------------------------------
 // Interface sounds
 //---------------------------------------------------

fs2_open/code/glide/3dfx.h

@@ -41,7 +41,7 @@ typedef struct { float r, g, b, a; } FxColor4;
 ** export macros
 */
 
-#if defined(_MSC_VER)
+#if defined(__MSC__)
   #if defined (MSVC16)
     #define FX_ENTRY 
     #define FX_CALL

fs2_open/code/glide/fxdll.h

@@ -42,7 +42,7 @@
 
 #if defined(FX_DLL_DEFINITION)
   #if defined(FX_DLL_ENABLE)
-    #if defined(_MSC_VER)
+    #if defined(__MSC__)
       #ifndef KERNEL
         #define FX_ENTRY __declspec( dllexport )
         #define FX_EXPORT __declspec( dllexport )

fs2_open/code/glide/fxos.h

@@ -17,7 +17,7 @@
 extern "C" {
 #   endif
 
-#   ifdef _WIN32
+#   ifdef WIN32
 void sleep(int secs);
 #define gethostname fxGethostname
 

fs2_open/code/glide/glide.cpp

@@ -1,18 +1,12 @@
 /*
  * $Logfile: /Freespace2/code/glide/Glide.cpp $
- * $Revision: 2.2 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 1.1 $
+ * $Date: 2002-06-03 03:25:57 $
  * $Author: penguin $
  *
  * Code for dynamically loading glide libraries
  *
  * $Log: not supported by cvs2svn $
- * Revision 2.1  2002/07/07 19:55:59  penguin
- * Back-port to MSVC
- *
- * Revision 2.0  2002/06/03 04:02:22  penguin
- * Warpcore CVS sync
- *
  * Revision 1.1  2002/05/02 18:03:07  mharris
  * Initial checkin - converted filenames and includes to lower case
  *
@@ -39,11 +33,12 @@
  * $NoKeywords: $
  */
 
+#define __MSC__
 #include <windows.h>
 #include <windowsx.h>
 
-#include "glide/glide.h"
-#include "globalincs/pstypes.h"
+#include "glide.h"
+#include "pstypes.h"
 
 static HMODULE Glide_lib_handle;
 

fs2_open/code/glide/glide.h

@@ -22,11 +22,12 @@
 #ifndef __GLIDE_H__
 #define __GLIDE_H__
 
+#define __MSC__
 #define FX_GLIDE_NO_FUNC_PROTO
 
-#include "glide/3dfx.h"
-#include "glide/sst1vid.h"
-#include "glide/glidesys.h"
+#include "3dfx.h"
+#include "sst1vid.h"
+#include "glidesys.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -1088,7 +1089,7 @@ grHints(GrHint_t hintType, FxU32 hintMask);
 }
 #endif
 
-#include "glide/glideutl.h"
+#include "glideutl.h"
 
 #endif /* __GLIDE_H__ */
 

fs2_open/code/glide/glidesys.h

@@ -3,7 +3,7 @@
 ** All Rights Reserved.
 **
 **
-** $Header: /cvs/cvsroot/fs2open/fs2_open/code/glide/glidesys.h,v 2.0 2002-06-03 04:02:22 penguin Exp $
+** $Header: /cvs/cvsroot/fs2open/fs2_open/code/glide/glidesys.h,v 1.1 2002-06-03 03:25:57 penguin Exp $
 ** $Log: not supported by cvs2svn $
 ** Revision 1.1  2002/05/02 18:03:07  mharris
 ** Initial checkin - converted filenames and includes to lower case