commit a15ba75736d15409876c1f0a44fffc99adf1c192
Author: James Haley <haleyjd@hotmail.com>
AuthorDate: Sat Feb 12 05:36:12 2011 +0000
Commit: James Haley <haleyjd@hotmail.com>
CommitDate: Sat Feb 12 05:36:12 2011 +0000
Bug fix for save/load/name your character menus, and some tweaks to the
project files.
Subversion-branch: /branches/strife-branch
Subversion-revision: 2256
---
msvc/libopl.vcproj | 1 +
msvc/libpcsound.vcproj | 3 ++-
msvc/libtextscreen.vcproj | 1 +
msvc/strife.vcproj | 8 +++++---
src/strife/m_menu.c | 18 +++++++++---------
5 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/msvc/libopl.vcproj b/msvc/libopl.vcproj
index f7fbb59b..6c651776 100644
--- a/msvc/libopl.vcproj
+++ b/msvc/libopl.vcproj
@@ -127,6 +127,7 @@
/>
<Tool
Name="VCLibrarianTool"
+ IgnoreDefaultLibraryNames="msvcrtd"
/>
<Tool
Name="VCALinkTool"
diff --git a/msvc/libpcsound.vcproj b/msvc/libpcsound.vcproj
index 2ecda5c7..da6162b5 100644
--- a/msvc/libpcsound.vcproj
+++ b/msvc/libpcsound.vcproj
@@ -109,7 +109,7 @@
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
WarningLevel="3"
- DebugInformationFormat="3"
+ DebugInformationFormat="0"
CompileAs="1"
/>
<Tool
@@ -123,6 +123,7 @@
/>
<Tool
Name="VCLibrarianTool"
+ IgnoreDefaultLibraryNames="msvcrtd"
/>
<Tool
Name="VCALinkTool"
diff --git a/msvc/libtextscreen.vcproj b/msvc/libtextscreen.vcproj
index 161d7c2d..1b016597 100644
--- a/msvc/libtextscreen.vcproj
+++ b/msvc/libtextscreen.vcproj
@@ -127,6 +127,7 @@
/>
<Tool
Name="VCLibrarianTool"
+ IgnoreDefaultLibraryNames="msvcrtd"
/>
<Tool
Name="VCALinkTool"
diff --git a/msvc/strife.vcproj b/msvc/strife.vcproj
index 0890b2dd..b99e9459 100644
--- a/msvc/strife.vcproj
+++ b/msvc/strife.vcproj
@@ -69,6 +69,7 @@
AdditionalDependencies="SDL.lib SDL_mixer.lib SDL_net.lib SDLmain.lib ..\lib\libpcsound.lib ..\lib\libtextscreen.lib ..\lib\libopl.lib"
OutputFile="$(OutDir)\chocolate-strife-dbg.exe"
LinkIncremental="2"
+ IgnoreAllDefaultLibraries="false"
IgnoreDefaultLibraryNames="msvcrtd.lib"
GenerateDebugInformation="true"
SubSystem="1"
@@ -124,13 +125,13 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories=".;..\src;..\src\strife;..\src\doom;..\textscreen;..\pcsound"
+ AdditionalIncludeDirectories=".;..\src;..\src\strife;..\src\doom;..\textscreen;..\pcsound;..\opl"
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"
+ DebugInformationFormat="0"
CompileAs="1"
/>
<Tool
@@ -144,9 +145,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="SDL.lib SDL_mixer.lib SDL_net.lib SDLmain.lib ..\lib\libpcsound.lib ..\lib\libtextscreen.lib"
+ AdditionalDependencies="SDL.lib SDL_mixer.lib SDL_net.lib SDLmain.lib ..\lib\libpcsound.lib ..\lib\libtextscreen.lib ..\lib\libopl.lib"
OutputFile="$(OutDir)\chocolate-strife.exe"
LinkIncremental="0"
+ IgnoreDefaultLibraryNames="msvcrtd"
GenerateDebugInformation="false"
SubSystem="1"
OptimizeReferences="2"
diff --git a/src/strife/m_menu.c b/src/strife/m_menu.c
index 2bd6560e..92564e96 100644
--- a/src/strife/m_menu.c
+++ b/src/strife/m_menu.c
@@ -591,8 +591,8 @@ void M_DrawNameChar(void)
if (saveStringEnter)
{
- i = M_StringWidth(savegamestrings[saveSlot]); // STRIFE-TODO: verify variable
- M_WriteText(LoadDef.x + i,LoadDef.y+LINEHEIGHT*saveSlot,"_");
+ i = M_StringWidth(savegamestrings[quickSaveSlot]);
+ M_WriteText(LoadDef.x + i,LoadDef.y+LINEHEIGHT*quickSaveSlot,"_");
}
}
@@ -728,8 +728,8 @@ void M_DrawSave(void)
if (saveStringEnter)
{
- i = M_StringWidth(savegamestrings[saveSlot]);
- M_WriteText(LoadDef.x + i,LoadDef.y+LINEHEIGHT*saveSlot,"_");
+ i = M_StringWidth(savegamestrings[quickSaveSlot]);
+ M_WriteText(LoadDef.x + i,LoadDef.y+LINEHEIGHT*quickSaveSlot,"_");
}
}
@@ -1793,13 +1793,13 @@ boolean M_Responder (event_t* ev)
if (saveCharIndex > 0)
{
saveCharIndex--;
- savegamestrings[saveSlot][saveCharIndex] = 0;
+ savegamestrings[quickSaveSlot][saveCharIndex] = 0;
}
break;
case KEY_ESCAPE:
saveStringEnter = 0;
- strcpy(&savegamestrings[saveSlot][0],saveOldString);
+ strcpy(&savegamestrings[quickSaveSlot][0],saveOldString);
break;
case KEY_ENTER:
@@ -1822,11 +1822,11 @@ boolean M_Responder (event_t* ev)
if (ch >= 32 && ch <= 127 &&
saveCharIndex < SAVESTRINGSIZE-1 &&
- M_StringWidth(savegamestrings[saveSlot]) <
+ M_StringWidth(savegamestrings[quickSaveSlot]) <
(SAVESTRINGSIZE-2)*8)
{
- savegamestrings[saveSlot][saveCharIndex++] = ch;
- savegamestrings[saveSlot][saveCharIndex] = 0;
+ savegamestrings[quickSaveSlot][saveCharIndex++] = ch;
+ savegamestrings[quickSaveSlot][saveCharIndex] = 0;
}
break;
}