revert the directory move

remove extraneous fs2_open folder from all branches and tags
This commit was manufactured by cvs2svn to create tag 'fs2_open_0_1'.
2026-11-11 04:31:35 -10:00 · 2008-02-09 21:33:46 +00:00 · 2008-02-09 19:21:05 +00:00 · 2002-06-03 05:03:46 +00:00
408 changed files with 5798 additions and 21567 deletions
@@ -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 "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "WIN32" /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" /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
@@ -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>
-{{{
-}}}
-
-###############################################################################
-
@@ -0,0 +1,80 @@
+README for fs2_open, Release 0.1
+
+WARNINGS:
+========
+This is very much an pre-alpha build.  Don't expect too much from it!
+
+In particular, do not run this in the same directory as existing pilot
+files or anything else that you don't want to get destroyed...
+
+I have tried to modify as little code as possible to keep the existing
+Windows code from breaking, but I have not verified that this code
+will still work on Windows.  Some changes may be necessary.
+
+There are occasional crashes and segfaults from time to time.
+
+All of this was tested on my system only.  I don't know if any
+assumptions about my hardware have crept into the code.  I guess it
+goes without saying that this will only work on x86-based Linux
+systems :-)
+
+
+STATUS:
+=======
+Most 2D graphics appear to be working, although very slowly.
+Improving the performance of the 2D graphic system is a high priority.
+
+3D graphics are in a very primitive state right now.  No texturing is
+done, so all objects (ships, lasers, explosions, etc.) look "ghostly."
+
+Nebula missions do not work at all.
+
+Sound, joystick, and network are all disabled.
+
+
+REQUIREMENTS:
+=============
+The only "non-standard" package that you will need (as far as I can
+tell) is the SDL library, available at http://www.libsdl.org I think
+SDL requires XFree86 release 4 or higher.
+
+
+INSTALLING:
+===========
+There is no configure script, no options, etc. -- just a Makefile.  It
+is likely that you will need to adjust it to match your configuration,
+in particular the location of the SDL files.
+
+If everything is right, you should be able to run 'make' from the
+fs2_open/code directory and create an 'fs2' executable.
+
+
+RUNNING:
+========
+The fs2 executable should be copied (or symlinked) to the same
+directory as the *.VP files.  All the *.VP files that you need should
+be here -- the code isn't smart enough to look in your CD for command
+brief ANIs, etc.
+
+It only runs in windowed mode, no full screen.
+
+I have never run it in high-resolution mode (1024x768), so all bets
+are off if you try it.
+
+There seems to be a bug in some of the 'glob' routines that scan for
+files in the 'data' directory, so you will have better results if you:
+  1.  Keep everything in the *.VP file (i.e., no mods)
+  2.  Only have one player file
+
+I recommend that background graphics be turned off via the "Options"
+screen or it will look very odd.  Your in-game framerate will be
+significantly higher if you turn off (or set to 'popup') as many HUD
+gauges as possible.
+
+Due to the painful slowness of the 2D UI, you might need to hold the
+mouse button down a little longer to get buttons to activate.
+
+===
+
+Mike Harris (HLP penguin)
+02 June 2002
@@ -1,452 +1,376 @@
 TARGET  = fs2

-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
-
-
-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. \
+ -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 \
 -fno-exceptions \
+ -IWeapon -ILocalization -INebula -IDemo -IInetfile -IExceptionHandler \
 -D_DEBUG -DNO_CD_CHECK -UNDEBUG \
- -DNO_DIRECT3D $(SOUND_DEF) $(JOYSTICK_DEF) $(NETWORK_DEF) $(OPENGL_DEF)
+ -DNO_DIRECT3D -DNO_SOUND -DNO_JOYSTICK -DNO_NETWORK
+

 ANIM_OBJFILES = \
- anim/animplay.o \
- anim/packunpack.o
+ Anim/animplay.o \
+ Anim/packunpack.o

 ASTEROID_OBJFILES = \
- asteroid/asteroid.o
+ Asteroid/asteroid.o

 BMPMAN_OBJFILES = \
- bmpman/bmpman.o
+ Bmpman/bmpman.o

 CFILE_OBJFILES = \
- cfile/cfile.o \
- cfile/cfilearchive.o \
- cfile/cfilelist.o \
- cfile/cfilesystem.o
+ CFile/cfile.o \
+ CFile/cfilearchive.o \
+ CFile/cfilelist.o \
+ CFile/cfilesystem.o

 CMDLINE_OBJFILES = \
- cmdline/cmdline.o
+ Cmdline/cmdline.o

 CMEASURE_OBJFILES = \
- cmeasure/cmeasure.o
+ CMeasure/cmeasure.o

 CONTROLCONFIG_OBJFILES = \
- controlconfig/controlsconfig.o \
- controlconfig/controlsconfigcommon.o
+ ControlConfig/controlsconfig.o \
+ ControlConfig/controlsconfigcommon.o

 CUTSCENE_OBJFILES = \
- cutscene/cutscenes.o
+ Cutscene/cutscenes.o

 DEBRIS_OBJFILES = \
- debris/debris.o
+ Debris/debris.o

 DEBUGCONSOLE_OBJFILES = \
- debugconsole/console.o
+ DebugConsole/console.o

 DEMO_OBJFILES = \
- demo/demo.o
+ Demo/demo.o

 EXCEPTIONHANDLER_OBJFILES = \
- exceptionhandler/exceptionhandler.o
+ ExceptionHandler/exceptionhandler.o

 FIREBALL_OBJFILES = \
- fireball/fireballs.o \
- fireball/warpineffect.o
+ Fireball/fireballs.o \
+ Fireball/warpineffect.o

 GAMEHELP_OBJFILES = \
- gamehelp/contexthelp.o \
- gamehelp/gameplayhelp.o
+ GameHelp/contexthelp.o \
+ GameHelp/gameplayhelp.o

 GAMESEQUENCE_OBJFILES = \
- gamesequence/gamesequence.o
+ GameSequence/gamesequence.o

-# gamesnd/eventmusic.o
-# gamesnd/gamesnd.o
+# Gamesnd/eventmusic.o
+# Gamesnd/gamesnd.o
 GAMESND_OBJFILES =

-# glide/glide.o
 GLIDE_OBJFILES = 
+#GLIDE_OBJFILES = \
+# Glide/glide.o

-# globalincs/windebug.o
+# GlobalIncs/windebug.o
 GLOBALINCS_OBJFILES = \
- globalincs/alphacolors.o \
- globalincs/crypt.o \
- globalincs/systemvars.o \
- globalincs/version.o
+ 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/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
+ 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/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
+ 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
+ Inetfile/cftp.o \
+ Inetfile/chttpget.o \
+ Inetfile/inetgetfile.o

-# io/joy.o
-# io/joy_ff.o
-# io/swff_lib.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
+ Io/key.o \
+ Io/keycontrol.o \
+ Io/mouse.o \
+ Io/timer.o \
+ Io/xmouse.o

 JUMPNODE_OBJFILES = \
- jumpnode/jumpnode.o
+ JumpNode/jumpnode.o

 LIGHTING_OBJFILES = \
- lighting/lighting.o
+ Lighting/lighting.o

 LOCALIZATION_OBJFILES = \
- localization/fhash.o \
- localization/localize.o
+ 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
+ Math/fix.o \
+ Math/floating.o \
+ Math/fvi.o \
+ Math/spline.o \
+ Math/staticrand.o \
+ Math/vecmat.o

-# menuui/optionsmenumulti.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
+ 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
+ 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/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
+ 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
+ Model/modelcollide.o \
+ Model/modelinterp.o \
+ Model/modeloctant.o \
+ Model/modelread.o

 NEBULA_OBJFILES = \
- nebula/neb.o \
- nebula/neblightning.o
+ 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/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
+ Network/multiutil.o

-# object/objectsnd.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
+ 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
+ Observer/observer.o

 OSAPI_OBJFILES = \
- osapi/osapi_unix.o \
- osapi/osregistry_unix.o \
- osapi/outwnd_unix.o
+ OsApi/osapi_unix.o \
+ OsApi/osregistry_unix.o \
+ OsApi/outwnd_unix.o

 PALMAN_OBJFILES = \
- palman/palman.o
+ Palman/palman.o

 PARSE_OBJFILES = \
- parse/encrypt.o \
- parse/parselo.o \
- parse/sexp.o
+ Parse/encrypt.o \
+ Parse/parselo.o \
+ Parse/sexp.o

 PARTICLE_OBJFILES = \
- particle/particle.o
+ Particle/particle.o

 PCXUTILS_OBJFILES = \
- pcxutils/pcxutils.o
+ PcxUtils/pcxutils.o

 PHYSICS_OBJFILES = \
- physics/physics.o
+ Physics/physics.o

 PLAYERMAN_OBJFILES = \
- playerman/managepilot.o \
- playerman/playercontrol.o
+ Playerman/managepilot.o \
+ Playerman/playercontrol.o

 POPUP_OBJFILES = \
- popup/popup.o \
- popup/popupdead.o
+ Popup/popup.o \
+ Popup/popupdead.o

 RADAR_OBJFILES = \
- radar/radar.o
+ Radar/radar.o

 RENDER_OBJFILES = \
- render/3dclipper.o \
- render/3ddraw.o \
- render/3dlaser.o \
- render/3dmath.o \
- render/3dsetup.o
+ 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
+ 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
+ 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
+ Starfield/nebula.o \
+ Starfield/starfield.o \
+ Starfield/supernova.o

 STATS_OBJFILES = \
- stats/medals.o \
- stats/scoring.o \
- stats/stats.o
+ Stats/medals.o \
+ Stats/scoring.o \
+ Stats/stats.o

 TGAUTILS_OBJFILES = \
- tgautils/tgautils.o
+ 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
+ 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
+ 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
+ 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  
@@ -554,14 +478,11 @@ LIB_OBJFILES = \
 $(NEBULA_OBJFILES)  \
 $(LOCALIZATION_OBJFILES)  \
 $(TGAUTILS_OBJFILES)  \
- $(DEMO_OBJFILES) \
- $(SOUND_OBJS) \
- $(JOYSTICK_OBJS) \
- $(NETWORK_OBJS)
+ $(DEMO_OBJFILES)

 FREESPACE2_OBJFILES = \
- freespace2/freespace.o \
- freespace2/levelpaging.o
+ FREESPACE2/freespace.o \
+ FREESPACE2/levelpaging.o

 STUB_OBJFILES = \
 windows_stub/stubs.o
@@ -644,7 +565,7 @@ fs2:	libcode.a $(FREESPACE2_OBJFILES) $(STUB_OBJFILES)


 # exceptions to the rule...
-freespace2/freespace.o:	freespace2/freespace.cpp
+FREESPACE2/freespace.o:	FREESPACE2/freespace.cpp
 	$(CXX) $(CXXFLAGS) -fexceptions -c -o $@ $<

 ANIM_OBJFILES:  $(ANIM_OBJFILES)
@@ -9,16 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/Anim/AnimPlay.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:21 $
 * $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;

@@ -9,16 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/Anim/AnimPlay.h $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:21 $
 * $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
 *
@@ -102,7 +99,7 @@
 #ifndef __ANIMPLAY_H__
 #define __ANIMPLAY_H__

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

 struct anim;
 struct anim_info;
@@ -9,8 +9,8 @@

 /*
 * $Logfile: /Freespace2/code/Anim/PackUnpack.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:21 $
 * $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;
@@ -9,8 +9,8 @@

 /*
 * $Logfile: /Freespace2/code/Anim/PackUnpack.h $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:21 $
 * $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.2  2002/05/03 22:07:07  mharris
 * got some stuff to compile
 *
@@ -151,7 +148,7 @@
 #ifndef __PACKUNPACK_H__
 #define __PACKUNPACK_H__

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

 struct CFILE;

@@ -9,16 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/Asteroid/Asteroid.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:21 $
 * $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
 *
@@ -266,29 +263,29 @@
 * $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"
+#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 "staticrand.h"
+#include "systemvars.h"
+#include "localize.h"
+#include "scoring.h"
+#include "hudtarget.h"

 #ifndef NO_NETWORK
-#include "network/multiutil.h"
-#include "network/multimsgs.h"
-#include "network/multi.h"
+#include "multiutil.h"
+#include "multimsgs.h"
+#include "multi.h"
 #endif

 #ifndef FS2_DEMO
@@ -9,16 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/Asteroid/Asteroid.h $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:21 $
 * $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
 *
@@ -125,8 +122,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;
@@ -9,19 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/Bmpman/BmpMan.cpp $
- * $Revision: 2.2 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:21 $
 * $Author: penguin $
 *
 * Code to load and manage all bitmaps for the game
 *
 * $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.4  2002/05/21 15:36:25  mharris
 * Added ifdef WIN32
 *
@@ -477,20 +471,20 @@
 */

 #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 "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
@@ -2343,7 +2337,7 @@ void BM_SELECT_SCREEN_FORMAT()
 	Gr_current_alpha = &Gr_alpha;

 	// setup pointers
-#ifdef _WIN32
+#ifdef WIN32
 	if(gr_screen.mode == GR_GLIDE){
 		bm_set_components = bm_set_components_argb;
 	} else if(gr_screen.mode == GR_DIRECT3D){
@@ -2374,7 +2368,7 @@ void BM_SELECT_TEX_FORMAT()
 	Gr_current_alpha = &Gr_t_alpha;

 	// setup pointers
-#ifdef _WIN32
+#ifdef WIN32
 	if(gr_screen.mode == GR_GLIDE){
 		bm_set_components = bm_set_components_argb;
 	} else if(gr_screen.mode == GR_DIRECT3D){
@@ -2405,7 +2399,7 @@ void BM_SELECT_ALPHA_TEX_FORMAT()
 	Gr_current_alpha = &Gr_ta_alpha;

 	// setup pointers
-#ifdef _WIN32
+#ifdef WIN32
 	if(gr_screen.mode == GR_GLIDE){
 		bm_set_components = bm_set_components_argb;
 	} else if(gr_screen.mode == GR_DIRECT3D){
@@ -9,35 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/CFile/cfile.cpp $
- * $Revision: 2.7 $
- * $Date: 2002-11-10 16:29:53 $
- * $Author: DTP $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:21 $
+ * $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
 *
@@ -204,14 +182,11 @@
 #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>
@@ -219,16 +194,15 @@
 #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] = "";

@@ -299,7 +273,7 @@ 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
+#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);
@@ -369,7 +343,7 @@ int cfile_init(char *exe_dir, char *cdrom_dir)

 		// are we in a root directory?		
 		if(cfile_in_root_dir(buf)){
-#if defined _WIN32
+#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");
@@ -387,7 +361,7 @@ int cfile_init(char *exe_dir, char *cdrom_dir)
 			buf[i] = 0;						
 			cfile_chdir(buf);
 		} else {
-#if defined _WIN32
+#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");
@@ -423,7 +397,7 @@ void cfile_refresh()
 }


-#ifdef _WIN32
+#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.
@@ -469,7 +443,7 @@ int cfile_push_chdir(int type)
 	Drive = strchr(dir, ':');

 	if (Drive) {
-	   #ifdef _WIN32
+	   #ifdef WIN32
 		if (!cfile_chdrive( *(Drive - 1) - 'a' + 1, 1))
 			return 1;

@@ -486,7 +460,7 @@ int cfile_push_chdir(int type)
 	// This chdir might get a critical error!
 	e = _chdir( Path );
 	if (e) {
-		#ifdef _WIN32
+		#ifdef WIN32
 		cfile_chdrive( OriginalDirectory[0] - 'a' + 1, 1 );
 		#endif
 		return 2;
@@ -508,7 +482,7 @@ int cfile_chdir(char *dir)

 	Drive = strchr(dir, ':');
 	if (Drive)	{
-		#ifdef _WIN32
+		#ifdef WIN32
 		if (!cfile_chdrive( *(Drive - 1) - 'a' + 1, 1))
 			return 1;

@@ -525,7 +499,7 @@ int cfile_chdir(char *dir)
 	// This chdir might get a critical error!
 	e = _chdir( Path );
 	if (e) {
-		#ifdef _WIN32
+		#ifdef WIN32
 		cfile_chdrive( OriginalDirectory[0] - 'a' + 1, 1 );
 		#endif
 		return 2;
@@ -557,7 +531,7 @@ int cfile_flush_dir(int dir_type)

 	// proceed to delete the files
 	del_count = 0;
-#if defined _WIN32
+#if defined WIN32
 	_finddata_t find;
 	find_handle = _findfirst( "*", &find );
 	if (find_handle != -1) {
@@ -674,7 +648,7 @@ int cf_exist( char *filename, int dir_type )
 	return 0;
 }

-#ifdef _WIN32
+#ifdef WIN32
 void cf_attrib(char *filename, int set, int clear, int dir_type)
 {
 	char longname[MAX_PATH_LEN];
@@ -845,7 +819,7 @@ 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
+#if defined WIN32
 				HANDLE hFile;

 				hFile = CreateFile(longname, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
@@ -948,7 +922,7 @@ int cfclose( CFILE * cfile )
 	result = 0;
 	if ( cb->data ) {
 		// close memory mapped file
-#if defined _WIN32
+#if defined WIN32
 		result = UnmapViewOfFile((void*)cb->data);
 		Assert(result);
 		result = CloseHandle(cb->hInFile);		
@@ -999,7 +973,7 @@ CFILE *cf_open_fill_cfblock(FILE *fp, int type)
 		cfbp->fp = fp;
 		cfbp->dir_type = type;
 		
-#if defined _WIN32
+#if defined WIN32
 		cf_init_lowlevel_read_code(cfp,0,filelength(fileno(fp)) );
 #elif defined unix
 		struct stat statbuf;
@@ -1052,7 +1026,7 @@ CFILE *cf_open_packed_cfblock(FILE *fp, int type, int offset, int size)
 //
 // returns:   ptr CFILE structure.  
 //
-#if defined _WIN32
+#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)
@@ -1072,13 +1046,13 @@ 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
+#if defined WIN32
 		cfbp->hInFile = hFile;
 #endif
 		cfbp->dir_type = type;

 		cf_init_lowlevel_read_code(cfp,0 , 0 );
-#if defined _WIN32
+#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")); 
@@ -1782,4 +1756,3 @@ int cflush(CFILE *cfile)



-
@@ -9,32 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/CFile/cfile.h $
- * $Revision: 2.6 $
- * $Date: 2002-11-10 16:29:53 $
- * $Author: DTP $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:21 $
+ * $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
 *
@@ -357,9 +338,9 @@
 #define __CFILE_H__

 #include <time.h>
-#include "globalincs/pstypes.h"
+#include "pstypes.h"

-#if defined _WIN32
+#if defined WIN32
  #define DIR_SEPARATOR_CHAR '\\'
  #define DIR_SEPARATOR_STR  "\\"
 #elif defined unix
@@ -391,45 +372,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))
@@ -628,7 +608,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
+#ifdef WIN32
 int cfile_chdrive(int DriveNum, int flag);
 #endif

@@ -9,20 +9,14 @@

 /*
 * $Logfile: /Freespace2/code/CFile/CfileArchive.cpp $
- * $Revision: 2.2 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:21 $
 * $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

@@ -9,17 +9,14 @@

 /*
 * $Logfile: /Freespace2/code/CFile/CfileArchive.h $
- * $Revision: 2.1 $
- * $Date: 2002-07-07 19:55:58 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:21 $
 * $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
 *
@@ -66,7 +63,7 @@ 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
+#ifdef WIN32
 	HANDLE	hInFile;			// Handle from CreateFile()
 	HANDLE	hMapFile;		// Handle from CreateFileMapping()
 #else
@@ -9,19 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/CFile/CfileList.cpp $
- * $Revision: 2.2 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:21 $
 * $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
@@ -9,9 +9,9 @@

 /*
 * $Logfile: /Freespace2/code/CFile/CfileSystem.cpp $
- * $Revision: 2.6 $
- * $Date: 2002-11-10 16:28:08 $
- * $Author: DTP $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:21 $
+ * $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,24 +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
 *
@@ -118,25 +100,24 @@
 #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
+#include <errno.h>

 #ifdef unix
 #include <glob.h>
 #include <sys/stat.h>
 #endif

-#include "cmdline/cmdline.h"
-#include "globalincs/pstypes.h"
-#include "cfile/cfile.h"
-#include "cfile/cfilesystem.h"
-#include "localization/localize.h"
+#include "pstypes.h"
+//#include "outwnd.h"
+//#include "vecmat.h"
+//#include "timer.h"
+#include "cfile.h"
+#include "cfilesystem.h"
+#include "localize.h"

 #define CF_ROOTTYPE_PATH 0
 #define CF_ROOTTYPE_PACK 1
@@ -258,14 +239,13 @@ 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, DIR_SEPARATOR_STR );
 		}

-#if defined _WIN32
+#if defined WIN32
 		strcat( filespec, "*.vp" );

 		int find_handle;
@@ -348,15 +328,13 @@ 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 );
+
+		if(strlen(Pathtypes[i].path)){
+			strcat( filespec, Pathtypes[i].path );		
 			strcat( filespec, DIR_SEPARATOR_STR );
 		}
-		

-
-#if defined _WIN32
+#if defined WIN32
 		strcat( filespec, "*.vp" );

 		int find_handle;
@@ -375,13 +353,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 );
+					if(strlen(Pathtypes[i].path)){
+						strcat(rptr_sort->path, Pathtypes[i].path );					
 						strcat(rptr_sort->path, DIR_SEPARATOR_STR);
 					}
-					
+
 					strcat(rptr_sort->path, find.name );
 					rptr_sort->roottype = CF_ROOTTYPE_PACK;
 					rptr_sort->cf_type = i;
@@ -448,17 +425,12 @@ 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 );
 	}
@@ -467,8 +439,6 @@ void cf_build_root_list(char *cdrom_dir)
 	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
 	}
-
-	   
 	root->roottype = CF_ROOTTYPE_PATH;

   //======================================================
@@ -521,12 +491,12 @@ 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 );
 		} 

-#if defined _WIN32
+#if defined WIN32
 		strcat( search_path, "*.*" );

 		int find_handle;
@@ -614,7 +584,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 +612,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;

@@ -664,35 +635,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,7 +696,7 @@ 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 );
+		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 )	{
@@ -799,7 +773,7 @@ int cf_find_file_location( char *filespec, int pathtype, char *pack_filename, in
 		FILE *fp = fopen(filespec, "rb" );
 		if (fp)	{
 			if ( size ) {
-#if defined _WIN32
+#if defined WIN32
 				*size = filelength(fileno(fp));
 #elif defined unix
 				struct stat statbuf;
@@ -840,7 +814,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
+#if defined WIN32
 				*size = filelength(fileno(fp));
 #elif defined unix
 				struct stat statbuf;
@@ -885,8 +859,8 @@ int cf_find_file_location( char *filespec, int pathtype, char *pack_filename, in
 							strcat( pack_filename, DIR_SEPARATOR_STR );
 							strcat( pack_filename, f->name_ext );
 						}
-					}
-					return 1;
+					}				
+					return 1;		
 				}
 				// restore original filespec
 				strcpy(filespec, temp);
@@ -909,13 +883,12 @@ int cf_find_file_location( char *filespec, int pathtype, char *pack_filename, in

 						strcat( pack_filename, f->name_ext );
 					}
-				}
-				
-				return 1;
+				}				
+				return 1;		
 			}
 		}
-		
-		return 0;
+	
+	return 0;
 }


@@ -971,7 +944,6 @@ int cf_get_file_list( int max, char **list, int pathtype, char *filter, int sort

 	if (max < 1) {
 		Get_file_list_filter = NULL;
-
 		return 0;
 	}

@@ -986,13 +958,12 @@ 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
+#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)) {
@@ -1067,9 +1038,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 +1082,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 +1115,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;
 	}

@@ -1170,14 +1138,14 @@ int cf_get_file_list_preallocated( int max, char arr[][MAX_FILENAME_LEN], char *
 				pathtype, filter));

 	// Search the default directories
-#if defined _WIN32
+#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)) {
@@ -1252,7 +1220,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 +1260,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 +1292,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, DIR_SEPARATOR_STR);
 		}

 		// add filename
@@ -9,44 +9,11 @@

 /*
 * $Logfile: /Freespace2/code/Cmdline/cmdline.cpp $
- * $Revision: 2.11 $
- * $Date: 2002-11-10 16:32:42 $
- * $Author: DTP $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:21 $
+ * $Author: penguin $
 *
 * $Log: not supported by cvs2svn $
- * 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
 *
@@ -229,12 +196,12 @@

 #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 "pstypes.h"
+#include "cmdline.h"
+#include "linklist.h"
+#include "systemvars.h"
+#include "multi.h"
+#include "cfile.h"

 // variables
 class cmdline_parm {
@@ -274,11 +241,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 mod_arg("-mod", NULL); //DTP modsupport

 int Cmdline_multi_stream_chat_to_file = 0;
 int Cmdline_freespace_no_sound = 0;
@@ -296,8 +258,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;
@@ -307,12 +267,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;
-
-
-

 static cmdline_parm Parm_list(NULL, NULL);
 static int Parm_list_inited = 0;
@@ -528,13 +482,13 @@ char *cmdline_parm::str()
 }

 // external entry point into this modules
-#ifdef _WIN32
+#ifdef WIN32
 int parse_cmdline(char *cmdline)
 #else
 int parse_cmdline(int argc, char *argv[])
 #endif
 {
-   #ifdef _WIN32
+   #ifdef WIN32
 	os_init_cmdline(cmdline);
   #else
 	if (argc > 1) {
@@ -671,26 +625,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(mod_arg.found() ) {
-		Cmdline_mod = mod_arg.str();
-	}

 	return 1;
 }
@@ -5,45 +5,15 @@
 * or otherwise commercially exploit the source or things you created based on the 
 * source.
 *
-
 */ 

 /*
 * $Logfile: /Freespace2/code/Cmdline/cmdline.h $
- * $Revision: 2.12 $
- * $Date: 2002-11-10 16:30:53 $
- * $Author: DTP $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:21 $
+ * $Author: penguin $
 *
 * $Log: not supported by cvs2svn $
- * 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
 *
@@ -184,7 +154,7 @@
 #ifndef FS_CMDLINE_HEADER_FILE
 #define FS_CMDLINE_HEADER_FILE

-#ifdef _WIN32
+#ifdef WIN32
 int parse_cmdline(char *cmdline);
 #else
 int parse_cmdline(int argc, char *argv[]);
@@ -221,10 +191,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 char *Cmdline_mod; //DTP for mod support

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

 /*
 * $Logfile: /Freespace2/code/CMeasure/CMeasure.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:21 $
 * $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
 *
@@ -208,26 +205,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];
@@ -9,16 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/CMeasure/CMeasure.h $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:21 $
 * $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

@@ -9,16 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/ControlConfig/ControlsConfig.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:21 $
 * $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
 *
@@ -303,33 +300,33 @@
 *
 */

-#include "freespace2/freespace.h"
-#include "controlconfig/controlsconfig.h"
-#include "gamesequence/gamesequence.h"
-#include "playerman/player.h"
-#include "graphics/2d.h"
-#include "hud/hudsquadmsg.h"
-#include "io/key.h"
-#include "io/timer.h"
+#include "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"
+#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 "contexthelp.h"
+#include "popup.h"
+#include "uidefs.h"
+#include "alphacolors.h"

 #ifndef NO_NETWORK
-#include "network/multi_pmsg.h"
-#include "network/multiutil.h"
+#include "multi_pmsg.h"
+#include "multiutil.h"
 #endif

 #define NUM_SYSTEM_KEYS			14
@@ -9,20 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/ControlConfig/ControlsConfig.h $
- * $Revision: 2.2 $
- * $Date: 2002-10-19 19:29:27 $
- * $Author: bobboau $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:21 $
+ * $Author: penguin $
 *
 * Header file for keyboard, joystick and mouse configuration
 *
 * $Log: not supported by cvs2svn $
- * 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
 *
@@ -452,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;
@@ -9,23 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/ControlConfig/ControlsConfigCommon.cpp $
- * $Revision: 2.3 $
- * $Date: 2002-10-19 19:29:27 $
- * $Author: bobboau $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:21 $
+ * $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,				"" }
 };

@@ -9,16 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/Cryptstring/cryptstring.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:21 $
 * $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)
 {
@@ -9,22 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/Cutscene/Cutscenes.cpp $
- * $Revision: 2.4 $
- * $Date: 2002-08-27 13:38:57 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:21 $
 * $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
 *
@@ -153,19 +144,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",
@@ -232,7 +223,7 @@ void cutscene_init()
 // returns -1 on failure.
 int cutscenes_get_cd_num( char *filename )
 {
-#ifdef _WIN32
+#ifdef WIN32
 #if defined(OEM_BUILD)
 	return 0;				// only 1 cd for OEM
 #else
@@ -366,7 +357,7 @@ static char *Text_lines[MAX_TEXT_LINES];

 int cutscenes_validate_cd(char *mve_name, int prompt_for_cd)
 {
-#ifdef _WIN32
+#ifdef WIN32
 	int cd_present = 0;
 	int cd_drive_num;
 	int cd_mve_is_on;
@@ -9,16 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/Cutscene/Cutscenes.h $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:21 $
 * $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

@@ -9,16 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/Debris/Debris.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:21 $
 * $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
 *
@@ -220,26 +217,26 @@
 * $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"
+#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 "particle.h"
+#include "freespace.h"
+#include "objcollide.h"
+#include "timer.h"

 #ifndef NO_NETWORK
-#include "network/multi.h"
-#include "network/multimsgs.h"
-#include "network/multiutil.h"
+#include "multi.h"
+#include "multimsgs.h"
+#include "multiutil.h"
 #endif

 #define MAX_LIFE									10.0f
@@ -9,16 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/DebugConsole/Console.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:21 $
 * $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

@@ -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);
-}
-
-
@@ -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
-
@@ -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
-		while(1)
-		{
-			// if bar runs over
-			if(last_xpos + xsize > WIDTH)
-			{
-				int rem_len = WIDTH - last_xpos;
-
-				// Draw from current position to the end of the bar
-				timerbar_conv_and_draw(i, last_xpos, rem_len, y_pos);
-
-				xsize -= rem_len;
-				last_xpos = 0;
-				y_pos++;
-			}
-			else
-			{
-				// Draw whats left and break for the next bar
-				timerbar_conv_and_draw(i,last_xpos, xsize, y_pos);
-
-				last_xpos += xsize;
-				break;
-			}
-		}
-
-		// reset for next frame
-		profiles[i].frame_total.QuadPart = 0;
-	}
-}
-
-void timerbar_switch_type(int num)
-{
-	if(num >= 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
@@ -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
-
@@ -9,18 +9,12 @@

 /*
 * $Logfile: /Freespace2/code/Demo/Demo.cpp $
- * $Revision: 2.2 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:21 $
 * $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
@@ -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" {
@@ -13,7 +13,7 @@
 /* 
 *  Pull in DirectDraw include file automatically:
 */
-#include "directx/vddraw.h"
+#include "vddraw.h"

 #pragma pack(4)

@@ -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 2.0 2002-06-03 04:02:21 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];
@@ -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" {
@@ -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
@@ -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" {
@@ -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
@@ -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)

@@ -8,7 +8,7 @@
 #ifndef __DPLOBBY_INCLUDED__
 #define __DPLOBBY_INCLUDED__

-#include "directx/vdplay.h"
+#include "vdplay.h"

 #ifdef __cplusplus
 extern "C" {
@@ -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>
@@ -9,16 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/ExceptionHandler/ExceptionHandler.h $
- * $Revision: 2.1 $
- * $Date: 2002-07-07 19:55:58 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:22 $
 * $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
 *
@@ -35,7 +32,7 @@
 * $NoKeywords: $
 */

-#ifdef _MSC_VER
+#ifdef MSVC
 #pragma once		// Include this file only once
 #endif

@@ -9,16 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/Fireball/FireBalls.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:22 $
 * $Author: penguin $
 *
 * Code to move, render and otherwise deal with fireballs.
 *
 * $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
 *
@@ -324,24 +321,24 @@

 #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"

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

@@ -9,16 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/Fireball/FireBalls.h $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:22 $
 * $Author: penguin $
 *
 * Prototypes for fireball functions
 *
 * $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
 *
@@ -160,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
@@ -9,16 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/Fireball/WarpInEffect.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:22 $
 * $Author: penguin $
 *
 * Code for rendering the warp in effects for ships
 *
 * $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
 *
@@ -117,24 +114,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 "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")
 {
@@ -9,16 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/FREESPACE2/FreeSpace.h $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:22 $
 * $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
@@ -9,16 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/Freespace2/LevelPaging.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:22 $
 * $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();
@@ -9,16 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/GameHelp/ContextHelp.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:22 $
 * $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
 *
@@ -110,21 +107,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"


 ////////////////////////////////////////////////////////////////////
@@ -9,16 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/GameHelp/GameplayHelp.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:22 $
 * $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
@@ -9,16 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/GameSequence/GameSequence.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:22 $
 * $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
@@ -9,16 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/GameSequence/GameSequence.h $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:22 $
 * $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
 //
@@ -9,16 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/Gamesnd/EventMusic.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:22 $
 * $Author: penguin $
 *
 * C module for high-level control of event driven music 
 *
 * $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
 *
@@ -114,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)

@@ -9,16 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/Gamesnd/EventMusic.h $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:22 $
 * $Author: penguin $
 *
 * Header file for high-level control of event driven music 
 *
 * $Log: not supported by cvs2svn $
- * 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
 *
@@ -127,7 +124,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.
@@ -9,16 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/Gamesnd/GameSnd.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:22 $
 * $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];
@@ -9,16 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/Gamesnd/GameSnd.h $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:22 $
 * $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.2  2002/05/10 06:08:08  mharris
 * Porting... added ifndef NO_SOUND
 *
@@ -323,8 +320,8 @@
 #ifndef __GAMESND_H__
 #define __GAMESND_H__

-#include "sound/sound.h"
-#include "mission/missionparse.h"
+#include "sound.h"
+#include "missionparse.h"

 #ifndef NO_SOUND

@@ -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
@@ -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 )
@@ -17,7 +17,7 @@
 extern "C" {
 #   endif

-#   ifdef _WIN32
+#   ifdef WIN32
 void sleep(int secs);
 #define gethostname fxGethostname

@@ -1,18 +1,12 @@
 /*
 * $Logfile: /Freespace2/code/glide/Glide.cpp $
- * $Revision: 2.2 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:22 $
 * $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;

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

@@ -7,8 +7,8 @@
 *
 */ 

-#include "graphics/2d.h"
-#include "globalincs/alphacolors.h"
+#include "2d.h"
+#include "alphacolors.h"

 // -----------------------------------------------------------------------------------
 // ALPHA DEFINES/VARS
@@ -9,16 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/GlobalIncs/crypt.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:22 $
 * $Author: penguin $
 *
 * Files for cypting stuff
 *
 * $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
 *
@@ -35,7 +32,7 @@
 */

 #include <string.h>
-#include "globalincs/crypt.h"
+#include "crypt.h"

 char *jcrypt (char *plainstring)
 {
@@ -9,25 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/GlobalIncs/PsTypes.h $
- * $Revision: 2.4 $
- * $Date: 2002-08-06 01:49:08 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:22 $
 * $Author: penguin $
 *
 * Header file containg global typedefs, constants and macros
 *
 * $Log: not supported by cvs2svn $
- * Revision 2.3  2002/08/01 01:41:04  penguin
- * The big include file move
- *
- * Revision 2.2  2002/07/22 01:04:37  penguin
- * took out GAME_CD_CHECK define
- *
- * 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.4  2002/05/09 13:50:20  mharris
 * define AsmInt3() to abort()
 *
@@ -209,9 +197,9 @@
 // #define DVD_MESSAGE_HACK


-//  #if defined(MULTIPLAYER_BETA_BUILD) || defined(E3_BUILD) || defined(RELEASE_REAL)
-//  	#define GAME_CD_CHECK
-//  #endif
+#if defined(MULTIPLAYER_BETA_BUILD) || defined(E3_BUILD) || defined(RELEASE_REAL)
+	#define GAME_CD_CHECK
+#endif

 // 4127 is constant conditional (assert)
 // 4100 is unreferenced formal parameters,
@@ -234,8 +222,7 @@
 #include <memory.h>
 #include <malloc.h>
 #include <string.h>
-
-#include "windows_stub/config.h"
+#include "config.h"

 // value to represent an uninitialized state in any int or uint
 #define UNINITIALIZED 0x7f8e6d9c
@@ -253,7 +240,7 @@

 #define LOCAL static			// make module local varilable static.

-#if defined( _WIN32 ) && defined( _MSC_VER )
+#if defined( WINDOWS ) && defined( MSVC )
 typedef __int64 longlong;
 typedef unsigned __int64 ulonglong;
 #elif defined ( __GNUC__ )
@@ -272,7 +259,7 @@ typedef unsigned int uint;

 //Stucture to store clipping codes in a word
 typedef struct ccodes {
-	ubyte cc_or, cc_and;		//or is low byte, and is high byte
+	ubyte or,and;	//or is low byte, and is high byte
 } ccodes;

 typedef struct vector {
@@ -364,7 +351,7 @@ extern void _cdecl WinAssert(char * text,char *filename, int line);
 extern void _cdecl Error( char * filename, int line, char * format, ... );
 extern void _cdecl Warning( char * filename, int line, char * format, ... );

-#include "osapi/outwnd.h"
+#include "outwnd.h"

 // To debug printf do this:
 // mprintf(( "Error opening %s\n", filename ));
@@ -398,7 +385,7 @@ void gr_activate(int);

 	// define to call from Warning function above since it calls Int3, so without this, we
 	// get put into infinite dialog boxes
-   #ifdef _WIN32
+   #ifdef WIN32
 	  #define AsmInt3() _asm { int 3 }
   #else
     #define AsmInt3() abort()
@@ -539,14 +526,13 @@ void dc_printf( char *format, ... );
 //======================================================================================


-#include "math/fix.h"
-#include "math/floating.h"
+#include "config.h"
+#include "fix.h"
+#include "floating.h"

 // Some constants for stuff
-#ifdef _WIN32
-#define MAX_FILENAME_LEN	32			// Length for filenames, ie "title.pcx"
-#define MAX_PATH_LEN			128		// Length for pathnames, ie "c:\bitmaps\title.pcx"
-#endif
+//  #define MAX_FILENAME_LEN	32			// Length for filenames, ie "title.pcx"
+//  #define MAX_PATH_LEN			128		// Length for pathnames, ie "c:\bitmaps\title.pcx"

 // contants and defined for byteswapping routines (useful for mac)

@@ -9,16 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/GlobalIncs/SystemVars.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:22 $
 * $Author: penguin $
 *
 * Variables and constants common to FreeSpace and Fred.
 *
 * $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
 *
@@ -194,10 +191,10 @@
 * $NoKeywords: $
 */

-#include "globalincs/pstypes.h"
-#include "globalincs/systemvars.h"
-#include "io/timer.h"
-#include "nebula/neb.h"
+#include "pstypes.h"
+#include "systemvars.h"
+#include "timer.h"
+#include "neb.h"

 fix Missiontime;
 fix Frametime;
@@ -9,19 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/GlobalIncs/SystemVars.h $
- * $Revision: 2.2 $
- * $Date: 2002-10-05 16:46:09 $
- * $Author: randomtiger $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:22 $
+ * $Author: penguin $
 *
 * Variables and constants common to FreeSpace and Fred.
 *
 * $Log: not supported by cvs2svn $
- * Revision 2.1  2002/08/15 04:41:17  penguin
- * Added #include, needed for FRED
- *
- * 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
 *
@@ -198,7 +192,6 @@
 #ifndef _SYSTEMVARS_H
 #define _SYSTEMVARS_H

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

 #define	GM_MULTIPLAYER					(1 << 0)
@@ -353,10 +346,4 @@ int current_detail_level();
 extern int TotalRam;
 void windebug_memwatch_init();

-enum
-{
-	TIMERBAR_DEFAULT,
-	TIMERBAR_D3DCODE,
-};
-
 #endif
@@ -9,15 +9,12 @@

 /*
 * $Logfile: /Freespace2/code/GlobalIncs/version.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:22 $
 * $Author: penguin $
 *
 *
 * $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
 *
@@ -39,8 +36,8 @@

 #include <stdio.h>
 #include <string.h>
-#include "globalincs/version.h"
-#include "osapi/osregistry.h"
+#include "version.h"
+#include "osregistry.h"

 // ----------------------------------------------------------------------------------------------------------------
 // VERSION DEFINES/VARS
@@ -9,21 +9,12 @@

 /*
 * $Logfile: /Freespace2/code/GlobalIncs/version.h $
- * $Revision: 2.3 $
- * $Date: 2002-11-10 20:40:02 $
- * $Author: inquisitor $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:22 $
+ * $Author: penguin $
 *
 *
 * $Log: not supported by cvs2svn $
- * Revision 2.2  2002/08/13 03:32:25  penguin
- * Bumped to version 3.2
- *
- * Revision 2.1  2002/08/04 05:11:36  penguin
- * Update version number to 3.1
- *
- * 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
 *
@@ -123,14 +114,19 @@
 //		1.01	Patch for Win95 volume label bug
 //		1.20	German release version

-
-// fs2_open version numbers:
-//   the first version is 3.0 :-)
-//   Major.Minor.Bugfix
-
-#define FS_VERSION_MAJOR 3					// major version
-#define FS_VERSION_MINOR 3					// increase by 1 for minor revs
-#define FS_VERSION_BUILD 0					// bugfix release
+#if defined (FS2_DEMO)
+	#define FS_VERSION_MAJOR 01					// Major is 0 for pre-release and 1 for 1.0 release
+	#define FS_VERSION_MINOR 10					// Increase by 1 for minor revs, 10 for major.
+	#define FS_VERSION_BUILD 00					// Build version 
+#elif defined(OEM_BUILD)
+	#define FS_VERSION_MAJOR 01					// Major is 0 for pre-release and 1 for 1.0 release
+	#define FS_VERSION_MINOR 00					// Increase by 1 for minor revs, 10 for major.
+	#define FS_VERSION_BUILD 00					// Build version 
+#else
+	#define FS_VERSION_MAJOR 01					// Major is 0 for pre-release and 1 for 1.0 release
+	#define FS_VERSION_MINOR 20					// Increase by 1 for minor revs, 10 for major.
+	#define FS_VERSION_BUILD 00					// Build version 
+#endif

 #define VERSION_LOC_FNAME			"version.nfo"
 #define MOTD_LOC_FNAME				"motd.txt"
@@ -9,16 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/GlobalIncs/WinDebug.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:22 $
 * $Author: penguin $
 *
 * Debug stuff
 *
 * $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,7 +115,7 @@
 #include <stdio.h>
 #include <crtdbg.h>

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

 //Uncomment SHOW_CALL_STACK to show the call stack in Asserts, Warnings, and Errors
 #define SHOW_CALL_STACK
@@ -9,25 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/Graphics/2d.cpp $
- * $Revision: 2.3 $
- * $Date: 2002-08-01 01:41:04 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:22 $
 * $Author: penguin $
 *
 * Main file for 2d primitives.
 *
 * $Log: not supported by cvs2svn $
- * Revision 2.2  2002/07/30 14:29:15  unknownplayer
- *
- * Started work on DX8.1 implementation. Updated the project files to encompass
- * the new files. Disable the compiler tag to use old DX code (THERE IS NO
- * NEW CODE YET!)
- *
- * 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.5  2002/05/26 14:10:29  mharris
 * More testing
 *
@@ -449,31 +437,29 @@
 * $NoKeywords: $
 */

-#ifdef _WIN32
 #include <windows.h>
 #include <windowsx.h>
-#endif

-#include "globalincs/pstypes.h"
-#include "osapi/osapi.h"
-#include "graphics/2d.h"
-#include "render/3d.h"
-#include "bmpman/bmpman.h"
-#include "palman/palman.h"
-#include "graphics/font.h"
-#include "graphics/grinternal.h"
-#include "globalincs/systemvars.h"
-#include "cmdline/cmdline.h"
+#include "pstypes.h"
+#include "osapi.h"
+#include "2d.h"
+#include "3d.h"
+#include "bmpman.h"
+#include "palman.h"
+#include "font.h"
+#include "grinternal.h"
+#include "systemvars.h"
+#include "cmdline.h"

 // 3dnow stuff
 // #include "amd3d.h"

 // Includes for different rendering systems
-#include "graphics/grsoft.h"
-#include "graphics/grd3d.h"
-#include "graphics/grglide.h"
-#include "graphics/gropengl.h"
-#include "graphics/grdirectdraw.h"
+#include "grsoft.h"
+#include "grd3d.h"
+#include "grglide.h"
+#include "gropengl.h"
+#include "grdirectdraw.h"

 screen gr_screen;

@@ -512,7 +498,7 @@ void gr_close()
 	palette_flush();

 	switch( gr_screen.mode )	{
-#ifdef _WIN32
+#ifdef WIN32
 	case GR_SOFTWARE:		
 		gr_soft_cleanup();
 		break;
@@ -527,13 +513,9 @@ void gr_close()
 		gr_glide_cleanup();
 		break;
 #endif
-
-#ifdef USE_OPENGL
 	case GR_OPENGL:
 		gr_opengl_cleanup();
 		break;
-#endif  // ifdef USE_OPENGL
-
 	default:
 		Int3();		// Invalid graphics mode
 	}
@@ -587,7 +569,7 @@ DCF(gr,"Changes graphics mode")
 		dc_printf( "         B=software directdraw fullscreen (obsolete)\n" );
 		dc_printf( "         D=Direct3d\n" );
 		dc_printf( "         G=Glide\n" );
-		dc_printf( "         O=OpenGL\n" );
+		dc_printf( "         O=OpenGl (obsolete)\n" );
 		Dc_status = 0;	// don't print status if help is printed.  Too messy.
 	}

@@ -693,7 +675,7 @@ void gr_set_palette( char *name, ubyte * palette, int restrict_font_to_128 )

 //void gr_test();

-#if defined( _WIN32 ) && defined( _MSC_VER )
+#if defined( WINDOWS ) && defined( MSVC )		

 #define CPUID _asm _emit 0fh _asm _emit 0a2h

@@ -863,7 +845,7 @@ void gr_detect_cpu(int *cpu, int *mmx, int *amd3d, int *katmai )
 	if (katmai)
 		*katmai = 0;
 }
-#endif // if defined( _WIN32 ) && defined( _MSC_VER )
+#endif // if defined( WINDOWS ) && defined( MSVC )		



@@ -886,7 +868,7 @@ int gr_init(int res, int mode, int depth, int fred_x, int fred_y)
 	// If already inited, shutdown the previous graphics
 	if ( Gr_inited )	{
 		switch( gr_screen.mode )	{
-#ifdef _WIN32
+#ifdef WIN32
 		case GR_SOFTWARE:			
 			gr_soft_cleanup();
 			break;
@@ -894,24 +876,16 @@ int gr_init(int res, int mode, int depth, int fred_x, int fred_y)
 			Int3();
 			gr_directdraw_cleanup();
 			break;
-		case GR_DIRECT3D:
-#ifdef USE_DX81
-			// TODO: Add Dx8.1 clean up call here - unknownplayer
-#else
+		case GR_DIRECT3D:			
 			gr_d3d_cleanup();
-#endif	// USE_DX81 //
 			break;
 		case GR_GLIDE:
 			gr_glide_cleanup();
 			break;
 #endif
-
-#ifdef USE_OPENGL
 		case GR_OPENGL:
 			gr_opengl_cleanup();
 			break;
-#endif  // USE_OPENGL
-
 		default:
 			Int3();		// Invalid graphics mode
 		}
@@ -919,7 +893,7 @@ int gr_init(int res, int mode, int depth, int fred_x, int fred_y)
 		first_time = 1;
 	}

-#if defined(HARDWARE_ONLY) && defined(_WIN32)
+#if defined(HARDWARE_ONLY) && defined(WIN32)
 	if(!Fred_running && !Pofview_running && !Nebedit_running && !Is_standalone){
 		if((mode != GR_GLIDE) && (mode != GR_DIRECT3D)){
 			mprintf(("Forcing glide startup!\n"));
@@ -977,7 +951,7 @@ int gr_init(int res, int mode, int depth, int fred_x, int fred_y)
 	gr_screen.clip_height = gr_screen.max_h;

 	switch( gr_screen.mode )	{
-#ifdef _WIN32
+#ifdef WIN32
 		case GR_SOFTWARE:
 			Assert(Fred_running || Pofview_running || Is_standalone || Nebedit_running);
 			gr_soft_init();
@@ -988,15 +962,9 @@ int gr_init(int res, int mode, int depth, int fred_x, int fred_y)
 			gr_directdraw_init();
 			break;
 		case GR_DIRECT3D:
-// Check if we want to use the DX8.1 routines - unknownplayer
-// This is here so we can revert to the old ones if necessary
-#ifdef USE_DX81
-			// TODO: Insert new initialization for DX8.1 here - unknownplayer
-#else
 			// we only care about possible 32 bit stuff here
 			Cmdline_force_32bit = 0;
-			if(depth == 32)
-			{
+			if(depth == 32){
 				Cmdline_force_32bit = 1;
 			} 

@@ -1004,12 +972,11 @@ int gr_init(int res, int mode, int depth, int fred_x, int fred_y)

 			// bad startup - stupid D3D
 			extern int D3D_inited;
-			if(!D3D_inited)
-			{
+			if(!D3D_inited){
 				Gr_inited = 0;
 				return 1;
 			}
-#endif	// USE_DX81 //
+
 			break;
 		case GR_GLIDE:
 			// if we're in high-res. force polygon interface
@@ -1019,13 +986,9 @@ int gr_init(int res, int mode, int depth, int fred_x, int fred_y)
 			gr_glide_init();
 			break;
 #endif  // ifdef WIN32
-
-#ifdef USE_OPENGL
 		case GR_OPENGL:
 			gr_opengl_init();
 			break;
-#endif  // ifdef USE_OPENGL
-
 		default:
 			Int3();		// Invalid graphics mode
 	}
@@ -1062,7 +1025,7 @@ void gr_force_windowed()
 	if ( !Gr_inited )	return;

 	switch( gr_screen.mode )	{
-#ifdef _WIN32
+#ifdef WIN32
 		case GR_SOFTWARE:
 			{				
 				extern void gr_soft_force_windowed();
@@ -1085,13 +1048,9 @@ void gr_force_windowed()
 			}
 			break;
 #endif  // ifdef WIN32
-
-#ifdef USE_OPENGL
 		case GR_OPENGL:
 			break;

-#endif  // ifdef USE_OPENGL
-
 		default:
 			Int3();		// Invalid graphics mode
 	}
@@ -1106,7 +1065,7 @@ void gr_activate(int active)
 	if ( !Gr_inited ) return;

 	switch( gr_screen.mode )	{
-#ifdef _WIN32
+#ifdef WIN32
 		case GR_SOFTWARE:
 			{				
 				extern void gr_soft_activate(int active);
@@ -1137,12 +1096,8 @@ void gr_activate(int active)
 			}
 			break;
 #endif  // ifdef WIN32
-
-#ifdef USE_OPENGL
 		case GR_OPENGL:
 			break;
-#endif  // ifdef USE_OPENGL
-
 		default:
 			Int3();		// Invalid graphics mode
 	}
@@ -1235,7 +1190,7 @@ void gr_bitmap(int x, int y)

 	// old school bitmaps
 	switch(gr_screen.mode){
-#ifdef _WIN32
+#ifdef WIN32
 	case GR_SOFTWARE:
 		grx_bitmap(x, y);
 		break;
@@ -1254,19 +1209,16 @@ void gr_bitmap(int x, int y)

 #endif  // ifdef WIN32

-#ifdef USE_OPENGL
 	case GR_OPENGL:
 		gr_opengl_bitmap(x, y);
 		break;
-#endif  // ifdef USE_OPENGL
-
 	}
 }

 void gr_bitmap_ex(int x, int y, int w, int h, int sx, int sy)
 {
 	switch(gr_screen.mode){
-#ifdef _WIN32
+#ifdef WIN32
 	case GR_SOFTWARE:
 		grx_bitmap_ex(x, y, w, h, sx, sy);
 		break;
@@ -1284,10 +1236,8 @@ void gr_bitmap_ex(int x, int y, int w, int h, int sx, int sy)
 		break;
 #endif  // ifdef WIN32

-#ifdef USE_OPENGL
 	case GR_OPENGL:
 		gr_opengl_bitmap_ex(x, y, w, h, sx, sy);
-#endif // ifdef USE_OPENGL
 	}
 }

@@ -9,16 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/Graphics/2d.h $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:05 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:22 $
 * $Author: penguin $
 *
 * Header file for 2d primitives.
 *
 * $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
 *
@@ -325,8 +322,8 @@ gr_line(x1,y1,x2,y2)
 
 */

-#include "globalincs/pstypes.h"
-#include "graphics/tmapper.h"
+#include "pstypes.h"
+#include "tmapper.h"

 // This is a structure used by the shader to keep track
 // of the values you want to use in the shade primitive.
@@ -9,19 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/Graphics/aaline.cpp $
- * $Revision: 2.2 $
- * $Date: 2002-08-01 01:41:05 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:22 $
 * $Author: penguin $
 *
 * Code to draw antialiased lines
 *
 * $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.2  2002/05/03 22:07:08  mharris
 * got some stuff to compile
 *
@@ -112,11 +106,11 @@
 #include <stdio.h>
 #include <stdlib.h>

-#include "globalincs/pstypes.h"
-#include "graphics/2d.h"
-#include "graphics/line.h"
-#include "graphics/grinternal.h"
-#include "palman/palman.h"
+#include "pstypes.h"
+#include "2d.h"
+#include "line.h"
+#include "grinternal.h"
+#include "palman.h"

 // Convert from floating-point to internal fixed-point formats
 #define ONE_XY			(long int) 0x00100000
@@ -246,7 +240,7 @@ void aaline_init_tables()
 // less than 1.0 and less total bits are sufficient.
 // Some of the steps here are not needed.  This was originally
 // written to simulate exact hardware behavior.
-#if defined( _WIN32 ) && defined( _MSC_VER )		
+#if defined( WINDOWS ) && defined( MSVC )		
 long int fix_xy_mult(long int oa, fix_xy ob)
 {
 	int retval;
@@ -262,7 +256,7 @@ long int fix_xy_mult(long int oa, fix_xy ob)
 }
 #else
 long int fix_xy_mult(long int oa, fix_xy ob);
-#endif // if defined( _WIN32 ) && defined( _MSC_VER )		
+#endif // if defined( WINDOWS ) && defined( MSVC )		



@@ -9,16 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/Graphics/Bitblt.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:05 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:22 $
 * $Author: penguin $
 *
 * Code to do software bitblt type stuff
 *
 * $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
 *
@@ -43,18 +40,18 @@
 * $NoKeywords: $
 */

-#include "globalincs/pstypes.h"
-#include "osapi/osapi.h"
-#include "graphics/2d.h"
-#include "bmpman/bmpman.h"
-#include "io/key.h"
-#include "math/floating.h"
-#include "palman/palman.h"
-#include "graphics/grsoft.h"
-#include "graphics/grinternal.h"
+#include "pstypes.h"
+#include "osapi.h"
+#include "2d.h"
+#include "bmpman.h"
+#include "key.h"
+#include "floating.h"
+#include "palman.h"
+#include "grsoft.h"
+#include "grinternal.h"

 // Headers for 2d functions
-#include "graphics/bitblt.h"
+#include "bitblt.h"

 MONITOR( Num2dBitmaps );	

@@ -9,16 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/Graphics/Circle.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:05 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:22 $
 * $Author: penguin $
 *
 * Code to draw circles.
 *
 * $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 "graphics/2d.h"
-#include "graphics/pixel.h"
-#include "graphics/circle.h"
+#include "2d.h"
+#include "pixel.h"
+#include "circle.h"

 // THIS COULD BE OPTIMIZED BY MOVING THE GR_RECT CODE INTO HERE!!!!!!!!

@@ -9,16 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/Graphics/Colors.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:05 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:22 $
 * $Author: penguin $
 *
 * Functions to deal with colors & alphacolors
 *
 * $Log: not supported by cvs2svn $
- * Revision 2.0  2002/06/03 04:02:22  penguin
- * Warpcore CVS sync
- *
 * Revision 1.4  2002/05/26 14:10:29  mharris
 * More testing
 *
@@ -178,13 +175,13 @@
 * $NoKeywords: $
 */

-#include "globalincs/pstypes.h"
-#include "graphics/2d.h"
-#include "graphics/grinternal.h"
-#include "graphics/colors.h"
-#include "palman/palman.h"
-#include "cfile/cfile.h"
-#include "globalincs/systemvars.h"
+#include "pstypes.h"
+#include "2d.h"
+#include "grinternal.h"
+#include "colors.h"
+#include "palman.h"
+#include "cfile.h"
+#include "systemvars.h"

 //#define MAX_ALPHACOLORS 36
 #define MAX_ALPHACOLORS 256
@@ -1,146 +0,0 @@
-/*
-	Main code file for the new DirectX 8.1 and up graphics routines.
-	Doing things this way makes sure that we don't break any of the existing code.
-
-	Notes about coding the update:
-	
-	 *Copy what you need from [V]'s code - it's faster
-	
-	 *When you rewrite a function from the original, append an 8 after the 'd3d' so we and the compiler
-	 can differentiate the functions - this is going to be completely separate so no overloading
-	
-	 *This is by no means the only file, just a starter one, it will essentially be identical to
-	 [V]'s original structurally.
-
-	 *By no means have I completely stripped all the files for their functions yet, this was just
-	 added late at night. There will be problems initially.
-
-
-	Post all updates to the developer mailing list or the forum, preferably in the DX8.1 thread
-
-	##UnknownPlayer##
-*/
-
-// Commented out includes are those awaiting rewriting
-#include <math.h>
-
-#include "graphics/directx8/grd3d81internal.h"	// Updated to point to the correct include file
-
-#include "osapi/osapi.h"
-#include "graphics/2d.h"
-#include "bmpman/bmpman.h"
-#include "io/key.h"
-#include "math/floating.h"
-#include "palman/palman.h"
-#include "osapi/osregistry.h"
-#include "grd3d81.h"		// Updated to point to the include for this file
-#include "graphics/line.h"
-#include "graphics/font.h"
-#include "graphics/grinternal.h"
-#include "io/mouse.h"
-#include "globalincs/alphacolors.h"
-#include "globalincs/systemvars.h"
-#include "cfile/cfile.h"
-#include "cmdline/cmdline.h"
-
-void gr_d3d8_init()
-{
-
-}
-
-void gr_d3d8_cleanup()
-{
-
-}
-
-void gr_d3d8_get_tex_format(int alpha)
-{
-
-}
-
-void gr_d3d8_bitmap(int x, int y)
-{
-
-}
-
-void gr_d3d8_bitmap_ex(int x, int y, int w, int h, int sx, int sy)
-{
-
-}
-
-int gr_d3d8_create_rendering_objects(int clear)
-{
-
-}
-
-void gr_d3d8_release_rendering_objects()
-{
-
-}
-
-
-void gr_d3d8_set_initial_render_state()
-{
-
-}
-
-char* d3d8_error_string(HRESULT error)
-{
-    switch(error) 
-	{
-        case D3DERR_BADMAJORVERSION:
-            return "D3DERR_BADMAJORVERSION\0";
-        case D3DERR_BADMINORVERSION:
-            return "D3DERR_BADMINORVERSION\0";
-        case D3DERR_EXECUTE_LOCKED:
-            return "D3DERR_EXECUTE_LOCKED\0";
-        case D3DERR_EXECUTE_NOT_LOCKED:
-            return "D3DERR_EXECUTE_NOT_LOCKED\0";
-        case D3DERR_EXECUTE_CREATE_FAILED:
-            return "D3DERR_EXECUTE_CREATE_FAILED\0";
-        case D3DERR_EXECUTE_DESTROY_FAILED:
-            return "D3DERR_EXECUTE_DESTROY_FAILED\0";
-        case D3DERR_EXECUTE_LOCK_FAILED:
-            return "D3DERR_EXECUTE_LOCK_FAILED\0";
-        case D3DERR_EXECUTE_UNLOCK_FAILED:
-            return "D3DERR_EXECUTE_UNLOCK_FAILED\0";
-        case D3DERR_EXECUTE_FAILED:
-            return "D3DERR_EXECUTE_FAILED\0";
-        case D3DERR_EXECUTE_CLIPPED_FAILED:
-            return "D3DERR_EXECUTE_CLIPPED_FAILED\0";
-        case D3DERR_TEXTURE_NO_SUPPORT:
-            return "D3DERR_TEXTURE_NO_SUPPORT\0";
-        case D3DERR_TEXTURE_NOT_LOCKED:
-            return "D3DERR_TEXTURE_NOT_LOCKED\0";
-        case D3DERR_TEXTURE_LOCKED:
-            return "D3DERR_TEXTURELOCKED\0";
-        case D3DERR_TEXTURE_CREATE_FAILED:
-            return "D3DERR_TEXTURE_CREATE_FAILED\0";
-        case D3DERR_TEXTURE_DESTROY_FAILED:
-            return "D3DERR_TEXTURE_DESTROY_FAILED\0";
-        case D3DERR_TEXTURE_LOCK_FAILED:
-            return "D3DERR_TEXTURE_LOCK_FAILED\0";
-        case D3DERR_TEXTURE_UNLOCK_FAILED:
-            return "D3DERR_TEXTURE_UNLOCK_FAILED\0";
-        case D3DERR_TEXTURE_LOAD_FAILED:
-            return "D3DERR_TEXTURE_LOAD_FAILED\0";
-        case D3DERR_MATRIX_CREATE_FAILED:
-            return "D3DERR_MATRIX_CREATE_FAILED\0";
-        case D3DERR_MATRIX_DESTROY_FAILED:
-            return "D3DERR_MATRIX_DESTROY_FAILED\0";
-        case D3DERR_MATRIX_SETDATA_FAILED:
-            return "D3DERR_MATRIX_SETDATA_FAILED\0";
-        case D3DERR_SETVIEWPORTDATA_FAILED:
-            return "D3DERR_SETVIEWPORTDATA_FAILED\0";
-        case D3DERR_MATERIAL_CREATE_FAILED:
-            return "D3DERR_MATERIAL_CREATE_FAILED\0";
-        case D3DERR_MATERIAL_DESTROY_FAILED:
-            return "D3DERR_MATERIAL_DESTROY_FAILED\0";
-        case D3DERR_MATERIAL_SETDATA_FAILED:
-            return "D3DERR_MATERIAL_SETDATA_FAILED\0";
-        case D3DERR_LIGHT_SET_FAILED:
-            return "D3DERR_LIGHT_SET_FAILED\0";
-        default:
-            return "Unrecognized error value.\0";
-    }
-}
@@ -1,27 +0,0 @@
-/*
-	Main header file for the DX8.1 graphics routines.
-	See the .cpp for more info.
-	This is going to essentially resemble the original [V] one.
-*/
-
-#ifndef _GRD3D81_H
-#define _GRD3D81_H
-
-void gr_d3d8_init();
-void gr_d3d8_cleanup();
-
-// call this to safely fill in the texture shift and scale values for the specified texture type (Gr_t_*)
-void gr_d3d8_get_tex_format(int alpha);
-
-// bitmap functions
-void gr_d3d8_bitmap(int x, int y);
-void gr_d3d8_bitmap_ex(int x, int y, int w, int h, int sx, int sy);
-
-// create all rendering objects (surfaces, d3d device, viewport, etc)
-int gr_d3d8_create_rendering_objects(int clear);
-void gr_d3d8_release_rendering_objects();
-
-
-void gr_d3d8_set_initial_render_state();
-
-#endif // _GRD3D81_H	
@@ -1,99 +0,0 @@
-/*
-	Prototypes for variables used by the D3D 8.1 renderer.
-	Note, because there are gonna be some changes to the way things are done, in this header
-	particularly we will not be mirroring the [V] headers.
-*/
-
-#ifndef _GRD3D81INTERNAL_H
-#define _GRD3D81INTERNAL_H
-
-#include <windows.h>
-#include <windowsx.h>
-
-#include <d3d8.h>
-#include <d3dx8.h>			// This is the Dx8.1 utility library. Automates some functions and
-							// provides the D3D_OVERLOADS functionality
-#include "graphics/2d.h"
-#include "graphics/grinternal.h"
-
-/*				!!! All of these need to be replaced with up to date versions
-extern LPDIRECTDRAW			lpDD1;
-extern LPDIRECTDRAW2			lpDD;
-extern LPDIRECT3D2			lpD3D;
-extern LPDIRECT3DDEVICE		lpD3DDeviceEB; 
-extern LPDIRECT3DDEVICE2	lpD3DDevice; 
-extern LPDIRECTDRAWSURFACE	lpBackBuffer;
-extern LPDIRECTDRAWSURFACE	lpFrontBuffer;
-extern LPDIRECTDRAWSURFACE	lpZBuffer;
-
-extern LPDIRECT3DVIEWPORT2	lpViewport;
-extern LPDIRECTDRAWPALETTE	lpPalette;
-
-extern DDPIXELFORMAT			AlphaTextureFormat;
-extern DDPIXELFORMAT			NonAlphaTextureFormat;
-extern DDPIXELFORMAT			ScreenFormat;
-
-extern D3DDEVICEDESC D3DHWDevDesc, D3DHELDevDesc;
-extern LPD3DDEVICEDESC lpDevDesc;
-extern DDCAPS DD_driver_caps;
-extern DDCAPS DD_hel_caps;
-*/
-extern int D3D8_texture_divider;
-
-extern int D3D8_32bit;
-
-extern char* d3d8_error_string(HRESULT error);
-
-void d3d8_tcache_init(int use_sections);
-void d3d8_tcache_cleanup();
-void d3d8_tcache_flush();
-void d3d8_tcache_frame();
-
-// Flushes any pending operations
-void d3d8_flush();
-
-int d3d8_tcache_set(int bitmap_id, int bitmap_type, float *u_ratio, float *v_ratio, int fail_on_full=0, int sx = -1, int sy = -1, int force = 0);
-
-// Functions in GrD3DRender.cpp stuffed into gr_screen structure
-void gr_d3d8_flash(int r, int g, int b);
-void gr_d3d8_zbuffer_clear(int mode);
-int gr_d3d8_zbuffer_get();
-int gr_d3d8_zbuffer_set(int mode);
-void gr_d3d8_tmapper( int nverts, vertex **verts, uint flags );
-void gr_d3d8_scaler(vertex *va, vertex *vb );
-void gr_d3d8_aascaler(vertex *va, vertex *vb );
-void gr_d3d8_pixel(int x, int y);
-void gr_d3d8_clear();
-void gr_d3d8_set_clip(int x,int y,int w,int h);
-void gr_d3d8_reset_clip();
-void gr_d3d8_init_color(color *c, int r, int g, int b);
-void gr_d3d8_init_alphacolor( color *clr, int r, int g, int b, int alpha, int type );
-void gr_d3d8_set_color( int r, int g, int b );
-void gr_d3d8_get_color( int * r, int * g, int * b );
-void gr_d3d8_set_color_fast(color *dst);
-void gr_d3d8_set_bitmap( int bitmap_num, int alphablend_mode, int bitblt_mode, float alpha, int sx=-1, int sy=-1 );
-void gr_d3d8_bitmap_ex(int x,int y,int w,int h,int sx,int sy);
-void gr_d3d8_bitmap(int x, int y);
-void gr_d3d8_aabitmap_ex(int x,int y,int w,int h,int sx,int sy);
-void gr_d3d8_aabitmap(int x, int y);
-void gr_d3d8_rect(int x,int y,int w,int h);
-void gr_d3d8_create_shader(shader * shade, float r, float g, float b, float c );
-void gr_d3d8_set_shader( shader * shade );
-void gr_d3d8_shade(int x,int y,int w,int h);
-void gr_d3d8_create_font_bitmap();
-void gr_d3d8_char(int x,int y,int letter);
-void gr_d3d8_string( int sx, int sy, char *s );
-void gr_d3d8_circle( int xc, int yc, int d );
-void gr_d3d8_line(int x1,int y1,int x2,int y2);
-void gr_d3d8_aaline(vertex *v1, vertex *v2);
-void gr_d3d8_gradient(int x1,int y1,int x2,int y2);
-void gr_d3d8_set_palette(ubyte *new_palette, int restrict_alphacolor);
-void gr_d3d8_diamond(int x, int y, int width, int height);
-void gr_d3d8_print_screen(char *filename);
-
-
-// Functions used to render.  Calls either DrawPrim or Execute buffer code
-HRESULT d3d8_SetRenderState( D3DRENDERSTATETYPE dwRenderStateType,  DWORD dwRenderState );
-HRESULT d3d8_DrawPrimitive( D3DPRIMITIVETYPE dptPrimitiveType, D3DVERTEXTYPE dvtVertexType, LPVOID lpvVertices, DWORD dwVertexCount, DWORD dwFlags );
-
-#endif // _GRD3D81INTERNAL_H
@@ -9,22 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/Graphics/Font.cpp $
- * $Revision: 2.3 $
- * $Date: 2002-08-01 01:41:05 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:22 $
 * $Author: penguin $
 *
 * source file for font stuff
 *
 * $Log: not supported by cvs2svn $
- * Revision 2.2  2002/07/29 20:12:31  penguin
- * added #ifdef _WIN32 around windows-specific system headers
- *
- * 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.2  2002/05/16 13:43:25  mharris
 * ifdef WIN32 around (unused?) win-specific code
 *
@@ -232,21 +223,18 @@
 * $NoKeywords: $
 */

-#ifdef _WIN32
 #include <windows.h>
 #include <windowsx.h>
-#endif
-
 #include <stdio.h>
 #include <stdarg.h>
-#include "graphics/grinternal.h"
-#include "graphics/2d.h"
-#include "cfile/cfile.h"
-#include "graphics/font.h"
-#include "palman/palman.h"
-#include "io/key.h"
-#include "bmpman/bmpman.h"
-#include "localization/localize.h"
+#include "grinternal.h"
+#include "2d.h"
+#include "cfile.h"
+#include "font.h"
+#include "palman.h"
+#include "key.h"
+#include "bmpman.h"
+#include "localize.h"

 int Num_fonts = 0;
 font Fonts[MAX_FONTS];
@@ -644,7 +632,7 @@ void gr8_string(int sx, int sy, char *s )
 	gr_unlock();
 }

-#ifdef _WIN32
+#ifdef WIN32
 HFONT MyhFont = NULL;
 extern HDC hDibDC;

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

 /*
 * $Logfile: /Freespace2/code/Graphics/Font.h $
- * $Revision: 2.2 $
- * $Date: 2002-08-01 01:41:05 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:22 $
 * $Author: penguin $
 *
 * header file for font stuff
 *
 * $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.2  2002/05/03 22:07:08  mharris
 * got some stuff to compile
 *
@@ -95,7 +89,7 @@
 #ifndef _FONT_H
 #define _FONT_H

-#include "globalincs/pstypes.h"
+#include "config.h"

 #define MAX_FONTS 3

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

 /*
 * $Logfile: /Freespace2/code/Graphics/Gradient.cpp $
- * $Revision: 2.2 $
- * $Date: 2002-08-01 01:41:05 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:22 $
 * $Author: penguin $
 *
 * Routines to draw rectangular gradients.
 *
 * $Log: not supported by cvs2svn $
- * Revision 2.1  2002/07/29 20:12:31  penguin
- * added #ifdef _WIN32 around windows-specific system headers
- *
- * 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
 *
@@ -94,17 +88,15 @@
 * $NoKeywords: $
 */

-#ifdef _WIN32
 #include <windows.h>
 #include <windowsx.h>
-#endif

-#include "graphics/2d.h"
-#include "graphics/grinternal.h"
-#include "graphics/gradient.h"
-#include "math/floating.h"
-#include "graphics/line.h"
-#include "palman/palman.h"
+#include "2d.h"
+#include "grinternal.h"
+#include "gradient.h"
+#include "floating.h"
+#include "line.h"
+#include "palman.h"
 		
 void gr8_gradient(int x1,int y1,int x2,int y2)
 {
@@ -9,25 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/Graphics/GrD3D.cpp $
- * $Revision: 2.3 $
- * $Date: 2002-10-05 16:46:09 $
- * $Author: randomtiger $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:22 $
+ * $Author: penguin $
 *
 * Code for our Direct3D renderer
 *
 * $Log: not supported by cvs2svn $
- * Revision 2.2  2002/08/01 01:41:05  penguin
- * The big include file move
- *
- * Revision 2.1  2002/07/30 14:29:15  unknownplayer
- *
- * Started work on DX8.1 implementation. Updated the project files to encompass
- * the new files. Disable the compiler tag to use old DX code (THERE IS NO
- * NEW CODE YET!)
- *
- * 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
 *
@@ -194,25 +182,24 @@

 #include <math.h>

-#include "graphics/grd3dinternal.h"
+#include "grd3dinternal.h"

-#include "osapi/osapi.h"
-#include "graphics/2d.h"
-#include "bmpman/bmpman.h"
-#include "io/key.h"
-#include "math/floating.h"
-#include "palman/palman.h"
-#include "osapi/osregistry.h"
-#include "graphics/grd3d.h"
-#include "graphics/line.h"
-#include "graphics/font.h"
-#include "graphics/grinternal.h"
-#include "io/mouse.h"
-#include "globalincs/alphacolors.h"
-#include "globalincs/systemvars.h"
-#include "cfile/cfile.h"
-#include "cmdline/cmdline.h"
-#include "debugconsole/timerbar.h"
+#include "osapi.h"
+#include "2d.h"
+#include "bmpman.h"
+#include "key.h"
+#include "floating.h"
+#include "palman.h"
+#include "osregistry.h"
+#include "grd3d.h"
+#include "line.h"
+#include "font.h"
+#include "grinternal.h"
+#include "mouse.h"
+#include "alphacolors.h"
+#include "systemvars.h"
+#include "cfile.h"
+#include "cmdline.h"


 LPDIRECTDRAW			lpDD1 = NULL;
@@ -795,10 +782,7 @@ void d3d_stop_frame()

 	In_frame--;
 	
-	TIMERBAR_END_FRAME();
 	ddrval = lpD3DDevice->EndScene();
-	TIMERBAR_START_FRAME();
-
 	if (ddrval != D3D_OK )	{
 		//mprintf(( "Failed to end scene!\n%s\n", d3d_error_string(ddrval) ));
 		return;
@@ -2690,8 +2674,6 @@ void gr_d3d_init()
 	if(os_config_read_uint(NULL, "DisableZbias", 0)){
 		D3D_zbias = 0;
 	}
-
-	// perform a check for bump mapping capabilities - unknownplayer
 	
 	d3d_start_frame();	

@@ -2825,8 +2807,6 @@ void gr_d3d_init()
 	gr_clear();
 	gr_flip();
 	Mouse_hidden--;
-
-	TIMERBAR_SET_DRAW_FUNC(d3d_render_timer_bar);
 }

 char* d3d_error_string(HRESULT error)
@@ -9,19 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/Graphics/GrD3DInternal.h $
- * $Revision: 2.2 $
- * $Date: 2002-10-05 16:46:09 $
- * $Author: randomtiger $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:22 $
+ * $Author: penguin $
 *
 * Prototypes for the variables used internally by the Direct3D renderer
 *
 * $Log: not supported by cvs2svn $
- * Revision 2.1  2002/08/01 01:41:05  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
 *
@@ -134,15 +128,15 @@
 #include <windowsx.h>

 #define D3D_OVERLOADS
-#include "directx/vddraw.h"
+#include "vddraw.h"

 // To remove an otherwise well-lodged compiler error
 // 4201 nonstandard extension used : nameless struct/union (happens a lot in Windows include headers)
 #pragma warning(disable: 4201)

-#include "directx/vd3d.h"
-#include "graphics/2d.h"
-#include "graphics/grinternal.h"
+#include "vd3d.h"
+#include "2d.h"
+#include "grinternal.h"


 extern LPDIRECTDRAW			lpDD1;
@@ -220,7 +214,6 @@ void gr_d3d_set_palette(ubyte *new_palette, int restrict_alphacolor);
 void gr_d3d_diamond(int x, int y, int width, int height);
 void gr_d3d_print_screen(char *filename);

-void d3d_render_timer_bar(int colour, float x, float y, float w, float h);

 // Functions used to render.  Calls either DrawPrim or Execute buffer code
 HRESULT d3d_SetRenderState( D3DRENDERSTATETYPE dwRenderStateType,  DWORD dwRenderState );
@@ -9,38 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/Graphics/GrD3DRender.cpp $
- * $Revision: 2.4 $
- * $Date: 2002-10-05 16:46:09 $
- * $Author: randomtiger $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:22 $
+ * $Author: penguin $
 *
 * Code to actually render stuff using Direct3D
 *
 * $Log: not supported by cvs2svn $
- * Revision 2.3  2002/08/07 00:45:25  DTP
- * Implented -GF4FIX commandline switch & #include "cmdline/cmdline.h"
- *
- * Revision 2.2  2002/08/03 19:42:17  randomtiger
- * Fixed Geforce 4 bug that caused font and hall video distortion.
- * Very small change in 'gr_d3d_aabitmap_ex_internal'
- *
- * Tested and works on the following systems
- *
- * OUTSIDER Voodoo 3 win98
- * OUTSIDER Geforce 2 win2000
- * Me Geforce 4 PNY 4600 XP
- * JBX-Phoenix Geforce 4 PNY XP
- * Mehrunes GeForce 3 XP
- * WMCoolmon nVidia TNT2 M64 win2000
- * Orange GeForce 4 4200 XP
- * ShadowWolf_IH Monster2 win98
- * ShadowWolf_IH voodoo 2 win98
- *
- * Revision 2.1  2002/08/01 01:41:05  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
 *
@@ -336,17 +311,15 @@
 * $NoKeywords: $
 */

-#include "graphics/grd3dinternal.h"
-#include "graphics/2d.h"
-#include "globalincs/pstypes.h"
-#include "bmpman/bmpman.h"
-#include "palman/palman.h"
-#include "graphics/line.h"
-#include "cfile/cfile.h"
-#include "nebula/neb.h"
-#include "render/3d.h"
-#include "cmdline/cmdline.h"	//DTP for random tigers GF4fix, and the commandline switch.
-#include "debugconsole/timerbar.h"
+#include "grd3dinternal.h"
+#include "2d.h"
+#include "pstypes.h"
+#include "bmpman.h"
+#include "palman.h"
+#include "line.h"
+#include "cfile.h"
+#include "neb.h"
+#include "3d.h"

 typedef enum gr_texture_source {
 	TEXTURE_SOURCE_NONE,
@@ -1510,30 +1483,19 @@ void gr_d3d_aabitmap_ex_internal(int x,int y,int w,int h,int sx,int sy)

 	bm_get_info( gr_screen.current_bitmap, &bw, &bh );

-	// Rendition 
+	// Rendition
 	if ( D3d_rendition_uvs )	{
 		u0 = u_scale*(i2fl(sx)+0.5f)/i2fl(bw);
 		v0 = v_scale*(i2fl(sy)+0.5f)/i2fl(bh);

 		u1 = u_scale*(i2fl(sx+w)+0.5f)/i2fl(bw);
 		v1 = v_scale*(i2fl(sy+h)+0.5f)/i2fl(bh);
-	//} else { //DTP; commented out, for easy re-editing
-	//	u0 = u_scale*i2fl((sx)-0.5f)/i2fl(bw);
-	//	v0 = v_scale*i2fl((sy)-0.5f)/i2fl(bh);
-
-	//	u1 = u_scale*i2fl((sx+w)-0.5f)/i2fl(bw);
-	//	v1 = v_scale*i2fl((sy+h)-0.5f)/i2fl(bh);
-	//}
-	} else if (!Cmdline_gf4fix) { //DTP if not set at commandline do the original code
+	} else {
 		u0 = u_scale*i2fl(sx)/i2fl(bw);
 		v0 = v_scale*i2fl(sy)/i2fl(bh);
+
 		u1 = u_scale*i2fl(sx+w)/i2fl(bw);
 		v1 = v_scale*i2fl(sy+h)/i2fl(bh);
-	} else {	//DTP; these next 4 lines is random tigers Fix. activated by setting -GF4FIX in the commandline.
-		u0 = u_scale*(i2fl(sx)-0.5f)/i2fl(bw);
-		v0 = v_scale*(i2fl(sy)-0.5f)/i2fl(bh);
-		u1 = u_scale*(i2fl(sx+w)-0.5f)/i2fl(bw);
-		v1 = v_scale*(i2fl(sy+h)-0.5f)/i2fl(bh);
 	}

 	x1 = i2fl(x+gr_screen.offset_x);
@@ -2301,44 +2263,5 @@ void gr_d3d_print_screen(char *filename)

 }

-void d3d_render_timer_bar(int colour, float x, float y, float w, float h)
-{
-	static D3DCOLOR pre_set_colours[TIMERBAR_COLOUR_MAX] = 
-	{
-		0xffff0000, // red
-		0xff00ff00, // green
-		0xff0000ff, // blue
-	};
-
-	D3DTLVERTEX d3d_verts[4];
-
-	static float max_fw = (float) gr_screen.max_w; 
-	static float max_fh = (float) gr_screen.max_h; 
-
-	d3d_verts[0].rhw   = 1;
-	d3d_verts[0].color = pre_set_colours[colour];
-	d3d_verts[0].sx = max_fw * x;
-	d3d_verts[0].sy = max_fh * y;
-
-	d3d_verts[1].rhw   = 1;
-	d3d_verts[1].color = pre_set_colours[colour];
-	d3d_verts[1].sx = max_fw * (x + w);
-	d3d_verts[1].sy = max_fh * y;
-
-	d3d_verts[2].rhw   = 1;
-	d3d_verts[2].color = pre_set_colours[colour];
-	d3d_verts[2].sx = max_fw * (x + w);
-	d3d_verts[2].sy = max_fh * (y + h);
-
-	d3d_verts[3].rhw   = 1;
-	d3d_verts[3].color = pre_set_colours[colour];
-	d3d_verts[3].sx = max_fw * x;
-	d3d_verts[3].sy = max_fh * (y + h);
-
-	gr_d3d_set_state(TEXTURE_SOURCE_NONE, ALPHA_BLEND_NONE, ZBUFFER_TYPE_NONE);
-	d3d_DrawPrimitive(D3DPT_TRIANGLEFAN,D3DVT_TLVERTEX,(LPVOID)d3d_verts,4,NULL);
-}
-
-


@@ -9,16 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/Graphics/GrD3DTexture.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:05 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:22 $
 * $Author: penguin $
 *
 * Code to manage loading textures into VRAM for Direct3D
 *
 * $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
 *
@@ -229,16 +226,16 @@
 * $NoKeywords: $
 */

-#include "graphics/grd3d.h"
-#include "graphics/grd3dinternal.h"
-#include "graphics/2d.h"
-#include "globalincs/pstypes.h"
-#include "bmpman/bmpman.h"
-#include "io/key.h"
-#include "globalincs/systemvars.h"
-#include "osapi/osregistry.h"
+#include "grd3d.h"
+#include "grd3dinternal.h"
+#include "2d.h"
+#include "pstypes.h"
+#include "bmpman.h"
+#include "key.h"
+#include "systemvars.h"
+#include "osregistry.h"

-#include "network/multi_log.h"
+#include "multi_log.h"

 typedef struct tcache_slot_d3d {
 	LPDIRECTDRAWSURFACE		vram_texture_surface;
@@ -9,16 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/Graphics/GrDirectDraw.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:05 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:22 $
 * $Author: penguin $
 *
 * Code for software 8-bpp rendering using DirectDraw
 *
 * $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
 *
@@ -125,34 +122,34 @@
 #include <windows.h>
 #include <windowsx.h>

-#include "directx/vddraw.h"
+#include "vddraw.h"

-#include "osapi/osapi.h"
-#include "graphics/2d.h"
-#include "bmpman/bmpman.h"
-#include "io/key.h"
-#include "math/floating.h"
-#include "palman/palman.h"
-#include "graphics/grsoft.h"
-#include "graphics/grinternal.h"
+#include "osapi.h"
+#include "2d.h"
+#include "bmpman.h"
+#include "key.h"
+#include "floating.h"
+#include "palman.h"
+#include "grsoft.h"
+#include "grinternal.h"

 // Headers for 2d functions
-#include "graphics/pixel.h"
-#include "graphics/line.h"
-#include "graphics/scaler.h"
-#include "graphics/tmapper.h"
-#include "graphics/circle.h"
-#include "graphics/shade.h"
-#include "graphics/rect.h"
-#include "graphics/gradient.h"
-#include "pcxutils/pcxutils.h"
-#include "osapi/osapi.h"
-#include "io/mouse.h"
-#include "graphics/font.h"
-#include "io/timer.h"
-#include "graphics/colors.h"
-#include "graphics/bitblt.h"
-#include "graphics/grzbuffer.h"
+#include "pixel.h"
+#include "line.h"
+#include "scaler.h"
+#include "tmapper.h"
+#include "circle.h"
+#include "shade.h"
+#include "rect.h"
+#include "gradient.h"
+#include "pcxutils.h"
+#include "osapi.h"
+#include "mouse.h"
+#include "font.h"
+#include "timer.h"
+#include "colors.h"
+#include "bitblt.h"
+#include "grzbuffer.h"

 static LPDIRECTDRAW			lpDD = NULL;
 static LPDIRECTDRAWSURFACE	lpBackBuffer = NULL;
@@ -9,16 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/Graphics/GrGlide.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:05 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:22 $
 * $Author: penguin $
 *
 * Code that uses 3DFX's Glide graphics library
 *
 * $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
 *
@@ -216,26 +213,26 @@

 #include <windows.h>
 #include <windowsx.h>
-#include "glide/glide.h"
-#include "glide/glideutl.h"
+#include "glide.h"
+#include "glideutl.h"

-#include "osapi/osapi.h"
-#include "graphics/2d.h"
-#include "bmpman/bmpman.h"
-#include "math/floating.h"
-#include "palman/palman.h"
-#include "graphics/grinternal.h"
-#include "graphics/grglide.h"
-#include "graphics/line.h"
-#include "graphics/font.h"
-#include "io/mouse.h"
-#include "io/key.h"
-#include "globalincs/systemvars.h"
-#include "graphics/grglideinternal.h"
-#include "cfile/cfile.h"
-#include "io/timer.h"
+#include "osapi.h"
+#include "2d.h"
+#include "bmpman.h"
+#include "floating.h"
+#include "palman.h"
+#include "grinternal.h"
+#include "grglide.h"
+#include "line.h"
+#include "font.h"
+#include "mouse.h"
+#include "key.h"
+#include "systemvars.h"
+#include "grglideinternal.h"
+#include "cfile.h"
+#include "timer.h"
 // #include "movie.h"
-#include "nebula/neb.h"
+#include "neb.h"

 #define NEBULA_COLORS 20

@@ -9,16 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/Graphics/GrGlideInternal.h $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:05 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:22 $
 * $Author: penguin $
 *
 * Common include file for Glide modules
 *
 * $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
 *
@@ -54,7 +51,7 @@
 #ifndef _GRGLIDEINTERNAL_H
 #define _GRGLIDEINTERNAL_H

-#include "graphics/grinternal.h"
+#include "grinternal.h"

 void glide_tcache_init();
 void glide_tcache_cleanup();
@@ -9,16 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/Graphics/GrGlideTexture.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:05 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:22 $
 * $Author: penguin $
 *
 * Code to manage Glide texture RAM
 *
 * $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
 *
@@ -133,22 +130,22 @@

 #include <windows.h>
 #include <windowsx.h>
-#include "glide/glide.h"
-#include "glide/glideutl.h"
+#include "glide.h"
+#include "glideutl.h"

-#include "osapi/osapi.h"
-#include "graphics/2d.h"
-#include "bmpman/bmpman.h"
-#include "math/floating.h"
-#include "palman/palman.h"
-#include "graphics/grinternal.h"
-#include "graphics/grglide.h"
-#include "graphics/line.h"
-#include "graphics/font.h"
-#include "io/mouse.h"
-#include "io/key.h"
-#include "globalincs/systemvars.h"
-#include "graphics/grglideinternal.h"
+#include "osapi.h"
+#include "2d.h"
+#include "bmpman.h"
+#include "floating.h"
+#include "palman.h"
+#include "grinternal.h"
+#include "grglide.h"
+#include "line.h"
+#include "font.h"
+#include "mouse.h"
+#include "key.h"
+#include "systemvars.h"
+#include "grglideinternal.h"

 #define TEXMEM_2MB_EDGE (2*1024*1024)

@@ -9,16 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/Graphics/GrInternal.h $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:05 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:22 $
 * $Author: penguin $
 *
 * Include file for our Graphics directory
 *
 * $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
 *
@@ -137,9 +134,9 @@
 #ifndef _GRINTERNAL_H
 #define _GRINTERNAL_H

-#include "graphics/font.h"
-#include "graphics/2d.h"
-#include "graphics/grzbuffer.h"
+#include "font.h"
+#include "2d.h"
+#include "grzbuffer.h"

 extern int Gr_cursor;

@@ -9,23 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/Graphics/GrOpenGL.cpp $
- * $Revision: 2.3 $
- * $Date: 2002-08-01 01:41:05 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 03:55:40 $
 * $Author: penguin $
 *
 * Code that uses the OpenGL graphics library
 *
 * $Log: not supported by cvs2svn $
- * Revision 2.2  2002/07/16 14:39:16  unknownplayer
- * Updated to enable compilation under MSVC++ - all changes are marked
- * with my name ##UnknownPlayer##
- *
- * Revision 2.1  2002/07/07 19:55:59  penguin
- * Back-port to MSVC
- *
- * Revision 2.0  2002/06/03 03:55:40  penguin
- * Warpcore CVS sync
- *
 * Revision 1.12  2002/06/03 03:40:34  mharris
 * Only set projection matrix once (at init);  aabitmap now uses
 * the current_alpha setting
@@ -161,26 +151,24 @@
 * $NoKeywords: $
 */

-#ifndef WIN32					// ##UnknownPlayer##
-
-#if defined _WIN32				// ##UnknownPlayer## - What's the point of this here?
-#include <windows.h>			// These should actually be the Win32 files for it I'd imagine
+#if defined WIN32
+#include <windows.h>
 #include <windowsx.h>
 #else
 #include <SDL.h>
 #include <SDL_opengl.h>
 #endif

-#include "globalincs/pstypes.h"
-#include "osapi/osapi.h"
-#include "graphics/2d.h"
-#include "bmpman/bmpman.h"
-#include "math/floating.h"
-#include "palman/palman.h"
-#include "graphics/grinternal.h"
-#include "graphics/gropengl.h"
-#include "graphics/line.h"
-#include "graphics/colors.h"
+#include "pstypes.h"
+#include "osapi.h"
+#include "2d.h"
+#include "bmpman.h"
+#include "floating.h"
+#include "palman.h"
+#include "grinternal.h"
+#include "gropengl.h"
+#include "line.h"
+#include "colors.h"

 SDL_Surface *opengl_screen = NULL;
 ubyte *opengl_bmp_buffer = NULL;
@@ -1502,5 +1490,3 @@ int RunGLTest( int argc, char* argv[],
 	opengl_bmp_buffer = (ubyte *)malloc(w * h * 4);  // 4 bytes for RGBA 
 	return 0;
 }
-
-#endif // WIN32 //
@@ -9,19 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/Graphics/GrSoft.cpp $
- * $Revision: 2.2 $
- * $Date: 2002-08-01 01:41:05 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:23 $
 * $Author: penguin $
 *
 * Code for our software renderer using standard Win32 functions.  (Dibsections, etc)
 *
 * $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:23  penguin
- * Warpcore CVS sync
- *
 * Revision 1.2  2002/05/17 02:52:38  mharris
 * More porting hacks
 *
@@ -367,33 +361,33 @@
 #include <windows.h>
 #include <windowsx.h>

-#include "osapi/osapi.h"
-#include "graphics/2d.h"
-#include "bmpman/bmpman.h"
-#include "io/key.h"
-#include "math/floating.h"
-#include "palman/palman.h"
-#include "graphics/grsoft.h"
-#include "graphics/grinternal.h"
+#include "osapi.h"
+#include "2d.h"
+#include "bmpman.h"
+#include "key.h"
+#include "floating.h"
+#include "palman.h"
+#include "grsoft.h"
+#include "grinternal.h"

 // Headers for 2d functions
-#include "graphics/pixel.h"
-#include "graphics/line.h"
-#include "graphics/scaler.h"
-#include "graphics/tmapper.h"
-#include "graphics/circle.h"
-#include "graphics/shade.h"
-#include "graphics/rect.h"
-#include "graphics/gradient.h"
-#include "pcxutils/pcxutils.h"
-#include "osapi/osapi.h"
-#include "io/mouse.h"
-#include "graphics/font.h"
-#include "io/timer.h"
-#include "graphics/colors.h"
-#include "graphics/bitblt.h"
+#include "pixel.h"
+#include "line.h"
+#include "scaler.h"
+#include "tmapper.h"
+#include "circle.h"
+#include "shade.h"
+#include "rect.h"
+#include "gradient.h"
+#include "pcxutils.h"
+#include "osapi.h"
+#include "mouse.h"
+#include "font.h"
+#include "timer.h"
+#include "colors.h"
+#include "bitblt.h"

-#ifdef _WIN32
+#ifdef WIN32
 // Windows specific

 // This structure is the same as LOGPALETTE except that LOGPALETTE
@@ -9,16 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/Graphics/GrZbuffer.cpp $
- * $Revision: 2.1 $
- * $Date: 2002-08-01 01:41:05 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:23 $
 * $Author: penguin $
 *
 * Code for the software renderer's zbuffer
 *
 * $Log: not supported by cvs2svn $
- * Revision 2.0  2002/06/03 04:02:23  penguin
- * Warpcore CVS sync
- *
 * Revision 1.2  2002/05/08 02:36:01  mharris
 * porting
 *
@@ -37,12 +34,12 @@
 * $NoKeywords: $
 */

-#include "globalincs/pstypes.h"
-#include "osapi/osapi.h"
-#include "graphics/2d.h"
-#include "math/floating.h"
-#include "graphics/grsoft.h"
-#include "graphics/grinternal.h"
+#include "pstypes.h"
+#include "osapi.h"
+#include "2d.h"
+#include "floating.h"
+#include "grsoft.h"
+#include "grinternal.h"

 int gr_zcount=GR_Z_COUNT;
 int gr_zoffset=0;
@@ -9,19 +9,13 @@

 /*
 * $Logfile: /Freespace2/code/Graphics/Line.cpp $
- * $Revision: 2.2 $
- * $Date: 2002-08-01 01:41:05 $
+ * $Revision: 2.0 $
+ * $Date: 2002-06-03 04:02:23 $
 * $Author: penguin $
 *
 * Routines for drawing lines.
 *
 * $Log: not supported by cvs2svn $
- * Revision 2.1  2002/07/29 20:12:31  penguin
- * added #ifdef _WIN32 around windows-specific system headers
- *
- * Revision 2.0  2002/06/03 04:02:23  penguin
- * Warpcore CVS sync
- *
 * Revision 1.1  2002/05/02 18:03:07  mharris
 * Initial checkin - converted filenames and includes to lower case
 *
@@ -91,16 +85,14 @@
 * $NoKeywords: $
 */

-#ifdef _WIN32
 #include <windows.h>
 #include <windowsx.h>
-#endif

-#include "graphics/2d.h"
-#include "graphics/grinternal.h"
-#include "math/floating.h"
-#include "graphics/line.h"
-#include "io/key.h"
+#include "2d.h"
+#include "grinternal.h"
+#include "floating.h"
+#include "line.h"
+#include "key.h"


 void gr8_uline(int x1,int y1,int x2,int y2)
Author	SHA1	Message	Date
Goober5000	0744732ccb	revert the directory move	2008-02-09 21:33:46 +00:00
Goober5000	89d3aba76f	remove extraneous fs2_open folder from all branches and tags	2008-02-09 19:21:05 +00:00
(no author)	a1e488a931	This commit was manufactured by cvs2svn to create tag 'fs2_open_0_1'.	2002-06-03 05:03:46 +00:00