ref: 6694dd0891e2aae773e5b8709575f92996fa2e08
parent: d9520b6415f8e373cf759f316094b986e57f0f5a
author: James Haley <haleyjd@hotmail.com>
date: Sun Aug 22 20:23:05 EDT 2010
Made some repairs to VC2008 solution and added Chocolate Strife project. Added Visual Studio autogenerated files and directories to appropriate ignore lists. Started some modifications of strings and version checking in d_englsh.h and d_main.c. Subversion-branch: /branches/strife-branch Subversion-revision: 1965
--- a/.gitignore
+++ b/.gitignore
@@ -1,21 +1,24 @@
-Makefile.in
-Makefile
-INSTALL
CMDLINE
-autotools
+INSTALL
+Makefile
+Makefile.in
+TAGS
aclocal.m4
-configure
+autom4te.cache
+autotools
+bin
+config.h
config.hin
config.log
config.status
-config.h
-autom4te.cache
+configure
+lib
+obj
rpm.spec
stamp-h
stamp-h.in
stamp-h1
tags
-TAGS
# These are the default patterns globally ignored by Subversion:
*.o
--- /dev/null
+++ b/msvc/.gitignore
@@ -1,0 +1,5 @@
+*.cfg
+*.ncb
+*.suo
+*.user
+savegames
--- a/msvc/chocolate.sln
+++ b/msvc/chocolate.sln
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual C++ Express 2008
+# Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Doom", "doom.vcproj", "{8B744A3B-8F18-41A0-85A3-293816E85B6E}"
ProjectSection(ProjectDependencies) = postProject
{66CD7F50-73B9-482F-8B69-1AF54983F845} = {66CD7F50-73B9-482F-8B69-1AF54983F845}
@@ -30,6 +30,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtextscreen", "libtextscreen.vcproj", "{35F435DB-AC4A-4F28-BA2D-812E638FB01A}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Strife", "strife.vcproj", "{FC4DACBA-2A3E-4AF0-804A-AF5FFFD13B08}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -64,6 +66,10 @@
{35F435DB-AC4A-4F28-BA2D-812E638FB01A}.Debug|Win32.Build.0 = Debug|Win32
{35F435DB-AC4A-4F28-BA2D-812E638FB01A}.Release|Win32.ActiveCfg = Release|Win32
{35F435DB-AC4A-4F28-BA2D-812E638FB01A}.Release|Win32.Build.0 = Release|Win32
+ {FC4DACBA-2A3E-4AF0-804A-AF5FFFD13B08}.Debug|Win32.ActiveCfg = Debug|Win32
+ {FC4DACBA-2A3E-4AF0-804A-AF5FFFD13B08}.Debug|Win32.Build.0 = Debug|Win32
+ {FC4DACBA-2A3E-4AF0-804A-AF5FFFD13B08}.Release|Win32.ActiveCfg = Release|Win32
+ {FC4DACBA-2A3E-4AF0-804A-AF5FFFD13B08}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
--- /dev/null
+++ b/msvc/strife.vcproj
@@ -1,0 +1,1024 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="Strife"
+ ProjectGUID="{FC4DACBA-2A3E-4AF0-804A-AF5FFFD13B08}"
+ RootNamespace="Strife"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="196613"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="..\bin"
+ IntermediateDirectory="..\obj\strife\$(ConfigurationName)"
+ ConfigurationType="1"
+ CharacterSet="0"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=".;..\src;..\src\strife;..\src\doom;..\textscreen;..\pcsound"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROGRAM_PREFIX="\"chocolate-\"""
+ MinimalRebuild="true"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ ExpandAttributedSource="true"
+ AssemblerOutput="2"
+ WarningLevel="0"
+ DebugInformationFormat="4"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="SDL.lib SDL_mixer.lib SDL_net.lib SDLmain.lib ..\lib\libpcsound.lib ..\lib\libtextscreen.lib"
+ OutputFile="$(OutDir)\chocolate-strife-dbg.exe"
+ LinkIncremental="2"
+ IgnoreDefaultLibraryNames="msvcrtd.lib"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="..\bin"
+ IntermediateDirectory="..\obj\strife\$(ConfigurationName)"
+ ConfigurationType="1"
+ CharacterSet="0"
+ WholeProgramOptimization="0"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ EnableIntrinsicFunctions="true"
+ AdditionalIncludeDirectories=".;..\src;..\src\strife;..\src\doom;..\textscreen;..\pcsound"
+ PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROGRAM_PREFIX="\"chocolate-\"""
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="SDL.lib SDL_mixer.lib SDL_net.lib SDLmain.lib ..\lib\libpcsound.lib ..\lib\libtextscreen.lib"
+ OutputFile="$(OutDir)\chocolate-strife.exe"
+ LinkIncremental="0"
+ GenerateDebugInformation="false"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ LinkTimeCodeGeneration="1"
+ DataExecutionPrevention="0"
+ TurnOffAssemblyGeneration="false"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Header Files"
+ >
+ <File
+ RelativePath="..\src\d_event.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\d_iwad.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\d_mode.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\d_ticcmd.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\deh_io.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\deh_main.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\deh_mapping.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\deh_str.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\doomfeatures.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\doomkeys.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\doomtype.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\i_cdmus.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\i_endoom.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\i_joystick.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\i_scale.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\i_sound.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\i_swap.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\i_system.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\i_timer.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\i_video.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\m_argv.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\m_bbox.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\m_cheat.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\m_config.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\m_controls.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\m_fixed.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\m_misc.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\md5.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\memio.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\mus2mid.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_client.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_common.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_dedicated.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_defs.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_gui.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_io.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_loop.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_packet.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_query.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_sdl.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_server.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_structrw.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\tables.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\v_patch.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\v_video.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\w_checksum.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\w_file.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\w_merge.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\w_wad.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\z_zone.h"
+ >
+ </File>
+ <Filter
+ Name="strife"
+ >
+ <File
+ RelativePath="..\src\strife\am_map.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\d_englsh.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\d_items.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\d_main.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\d_net.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\d_player.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\d_textur.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\d_think.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\deh_defs.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\deh_io.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\deh_main.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\deh_mapping.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\deh_misc.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\doomdata.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\doomdef.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\doomstat.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\dstrings.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\f_finale.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\f_wipe.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\g_game.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\hu_lib.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\hu_stuff.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\info.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\m_menu.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\m_random.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\p_inter.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\p_local.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\p_mobj.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\p_pspr.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\p_saveg.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\p_setup.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\p_spec.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\p_tick.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\r_bsp.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\r_data.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\r_defs.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\r_draw.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\r_local.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\r_main.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\r_plane.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\r_segs.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\r_sky.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\r_state.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\r_things.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\s_sound.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\sounds.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\st_lib.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\st_stuff.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\wi_stuff.h"
+ >
+ </File>
+ </Filter>
+ </Filter>
+ <Filter
+ Name="Source Files"
+ >
+ <File
+ RelativePath="..\src\d_event.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\d_iwad.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\d_mode.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\deh_io.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\deh_main.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\deh_mapping.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\deh_str.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\deh_text.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\i_cdmus.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\i_endoom.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\i_joystick.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\i_main.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\i_pcsound.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\i_scale.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\i_sdlmusic.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\i_sdlsound.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\i_sound.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\i_system.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\i_timer.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\i_video.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\icon.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\m_argv.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\m_bbox.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\m_cheat.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\m_config.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\m_controls.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\m_fixed.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\m_misc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\md5.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\memio.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\mus2mid.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_common.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_io.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_loop.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_packet.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_query.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_sdl.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\net_structrw.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\tables.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\v_video.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\w_checksum.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\w_file.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\w_file_posix.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\w_file_stdc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\w_file_win32.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\w_merge.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\w_wad.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\z_zone.c"
+ >
+ </File>
+ <Filter
+ Name="strife"
+ >
+ <File
+ RelativePath="..\src\strife\am_map.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\d_items.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\d_main.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\d_net.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\deh_ammo.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\deh_cheat.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\deh_frame.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\deh_misc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\deh_ptr.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\deh_sound.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\deh_strife.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\deh_thing.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\deh_weapon.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\doomdef.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\doomstat.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\dstrings.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\f_finale.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\f_wipe.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\g_game.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\hu_lib.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\hu_stuff.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\info.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\m_menu.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\m_random.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\p_ceilng.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\p_doors.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\p_enemy.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\p_floor.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\p_inter.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\p_lights.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\p_map.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\p_maputl.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\p_mobj.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\p_plats.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\p_pspr.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\p_saveg.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\p_setup.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\p_sight.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\p_spec.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\p_switch.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\p_telept.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\p_tick.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\p_user.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\r_bsp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\r_data.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\r_draw.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\r_main.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\r_plane.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\r_segs.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\r_sky.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\r_things.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\s_sound.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\sounds.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\st_lib.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\st_stuff.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\strife\wi_stuff.c"
+ >
+ </File>
+ </Filter>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ >
+ <File
+ RelativePath=".\win32.rc"
+ >
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
--- a/src/strife/d_englsh.h
+++ b/src/strife/d_englsh.h
@@ -36,7 +36,7 @@
// D_Main.C
//
#define D_DEVSTR "Development mode ON.\n"
-#define D_CDROM "CD-ROM Version: default.cfg from c:\\doomdata\n"
+#define D_CDROM "CD-ROM Version: Accessing strife.cd\n"
//
// M_Menu.C
--- a/src/strife/d_main.c
+++ b/src/strife/d_main.c
@@ -150,10 +150,13 @@
void D_ProcessEvents (void)
{event_t* ev;
+
+ // haleyjd 08/22/2010: [STRIFE] there is no such thing as a "store demo"
+ // version of Strife
// IF STORE DEMO, DO NOT ACCEPT INPUT
- if (storedemo)
- return;
+ //if (storedemo)
+ // return;
while ((ev = D_PopEvent()) != NULL)
{@@ -488,6 +491,8 @@
// D_PageTicker
// Handles timing for warped projection
//
+// haleyjd 08/22/2010: [STRIFE] verified unmodified
+//
void D_PageTicker (void)
{if (--pagetic < 0)
@@ -509,6 +514,8 @@
// D_AdvanceDemo
// Called after each demo or intro demosequence finishes
//
+// haleyjd 08/22/2010: [STRIFE] verified unmodified
+//
void D_AdvanceDemo (void)
{advancedemo = true;
@@ -841,18 +848,16 @@
// Copyright message banners
// Some dehacked mods replace these. These are only displayed if they are
// replaced by dehacked.
-
+// haleyjd 08/22/2010: [STRIFE] altered to match strings from binary
static char *copyright_banners[] =
{"===========================================================================\n"
- "ATTENTION: This version of DOOM has been modified. If you would like to\n"
- "get a copy of the original game, call 1-800-IDGAMES or see the readme file.\n"
+ "ATTENTION: This version of STRIFE has extra files added to it.\n"
" You will not receive technical support for modified games.\n"
- " press enter to continue\n"
"===========================================================================\n",
"===========================================================================\n"
- " Commercial product - do not distribute!\n"
+ " This version is NOT SHAREWARE, do not distribute!\n"
" Please report software piracy to the SPA: 1-800-388-PIR8\n"
"===========================================================================\n",
@@ -1206,7 +1211,8 @@
{printf(D_CDROM);
- M_SetConfigDir("c:\\doomdata\\");+ // haleyjd 08/22/2010: [STRIFE] Use strife.cd folder for -cdrom
+ M_SetConfigDir("c:\\strife.cd\\");}
else
#endif
@@ -1248,8 +1254,9 @@
V_Init();
// Load configuration files before initialising other subsystems.
+ // haleyjd 08/22/2010: [STRIFE] - use strife.cfg
printf(DEH_String("M_LoadDefaults: Load system defaults.\n"));- M_SetConfigFilenames("default.cfg", PROGRAM_PREFIX "doom.cfg");+ M_SetConfigFilenames("default.cfg", PROGRAM_PREFIX "strife.cfg");D_BindVariables();
M_LoadDefaults();
@@ -1516,22 +1523,24 @@
{// These are the lumps that will be checked in IWAD,
// if any one is not present, execution will be aborted.
- char name[23][8]=
+ // haleyjd 08/22/2010: [STRIFE] Check for Strife lumps.
+ char name[3][8]=
{- "e2m1","e2m2","e2m3","e2m4","e2m5","e2m6","e2m7","e2m8","e2m9",
- "e3m1","e3m3","e3m3","e3m4","e3m5","e3m6","e3m7","e3m8","e3m9",
- "dphoof","bfgga0","heada1","cybra1","spida1d1"
+ "map23", "map30", "ROB3E1"
};
int i;
+ // haleyjd 08/22/2010: [STRIFE] Changed string to match binary
+ // STRIFE-FIXME: Needs to test isdemoversion variable
if ( gamemode == shareware)
- I_Error(DEH_String("\nYou cannot -file with the shareware "- "version. Register!"));
+ I_Error(DEH_String("\nYou cannot -file with the demo "+ "version. You must buy the real game!"));
// Check for fake IWAD with right name,
// but w/o all the lumps of the registered version.
+ // STRIFE-FIXME: Needs to test isregistered variable
if (gamemode == registered)
- for (i = 0;i < 23; i++)
+ for (i = 0; i < 3; i++)
if (W_CheckNumForName(name[i])<0)
I_Error(DEH_String("\nThis is not the registered version."));}
@@ -1689,7 +1698,8 @@
printf (DEH_String("M_Init: Init miscellaneous info.\n"));M_Init ();
- printf (DEH_String("R_Init: Init DOOM refresh daemon - "));+ // haleyjd 08/22/2010: [STRIFE] Modified string to match binary
+ printf (DEH_String("R_Init: Loading Graphics - "));R_Init ();
printf (DEH_String("\nP_Init: Init Playloop state.\n"));