# HG changeset patch
# User John "Elwin" Edwards
# Date 1448632764 18000
# Node ID 4438569c1b02579c5fc099a2fdc3e6cd7c2ae279
# Parent 4146e2a06bc12a8209e8f8d2f1332478084adcb0# Parent ca876944b1960e9804c68d0a8fe043855f966896
Merge the MSVC branch.
diff -r ca876944b196 -r 4438569c1b02 README.txt
--- a/README.txt Sat Aug 22 10:55:53 2015 -0400
+++ b/README.txt Fri Nov 27 08:59:24 2015 -0500
@@ -26,8 +26,12 @@
To install on Windows:
-Use the included Visual Studio solution files. Warning: they have not been
-tested recently.
+Visual Studio solution and project files are included. They are still being
+tested but should work with Visual Studio 2015 on Windows 8.1.
+
+You will need pdcurses before you can build. Create a folder called 'pdcurses'
+in this folder and copy into it curses.h, term.h, and pdcurses.lib from the
+pdcurses distribution.
You can also build on Windows using MinGW. Make sure pdcurses is installed.
You will have to go into the '/lib' folder and copy 'libpdcurses.a' to
@@ -37,8 +41,8 @@
It is recommended to run 'configure' with the '--disable-logfile' option, and
'make' with the 'LDFLAGS=-static' option.
-The games should all build with MinGW and run, but Super-Rogue has problems
-with restoring saved games.
+Note that Super-Rogue has problems with restoring saved games on Windows,
+whichever build system is used.
See the individual games' subdirectories for further documentation. Some of
the manpages may be outdated, but the guides to playing should be accurate.
diff -r ca876944b196 -r 4438569c1b02 arogue5/arogue5.vcxproj
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/arogue5/arogue5.vcxproj Fri Nov 27 08:59:24 2015 -0500
@@ -0,0 +1,184 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ x64
+
+
+
+ {F9B8E5FE-F748-453D-8A6B-012D28841D5A}
+ arogue5
+ 8.1
+
+
+
+ Application
+ true
+ v140
+ MultiByte
+
+
+ Application
+ false
+ v140
+ true
+ MultiByte
+
+
+ Application
+ true
+ v140
+ MultiByte
+
+
+ Application
+ false
+ v140
+ true
+ MultiByte
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Level3
+ Disabled
+ true
+ ..\pdcurses
+ _CRT_SECURE_NO_WARNINGS;SCOREFILE="arogue5.scr";SAVEDIR=".";%(PreprocessorDefinitions)
+
+
+ true
+ ..\pdcurses
+ pdcurses.lib;%(AdditionalDependencies)
+
+
+
+
+ Level3
+ Disabled
+ true
+ ..\pdcurses
+ _CRT_SECURE_NO_WARNINGS;SCOREFILE="arogue5.scr";SAVEDIR=".";%(PreprocessorDefinitions)
+
+
+ true
+ ..\pdcurses
+ pdcurses.lib;%(AdditionalDependencies)
+
+
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ true
+ ..\pdcurses
+ _CRT_SECURE_NO_WARNINGS;SCOREFILE="arogue5.scr";SAVEDIR=".";%(PreprocessorDefinitions)
+
+
+ true
+ true
+ true
+ ..\pdcurses
+ pdcurses.lib;%(AdditionalDependencies)
+
+
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ true
+ ..\pdcurses
+ _CRT_SECURE_NO_WARNINGS;SCOREFILE="arogue5.scr";SAVEDIR=".";%(PreprocessorDefinitions)
+
+
+ true
+ true
+ true
+ ..\pdcurses
+ pdcurses.lib;%(AdditionalDependencies)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r ca876944b196 -r 4438569c1b02 arogue5/arogue5.vcxproj.filters
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/arogue5/arogue5.vcxproj.filters Fri Nov 27 08:59:24 2015 -0500
@@ -0,0 +1,144 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+ {93995380-89BD-4b04-88EB-625FBE52EBFB}
+ h;hh;hpp;hxx;hm;inl;inc;xsd
+
+
+ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
+ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+
\ No newline at end of file
diff -r ca876944b196 -r 4438569c1b02 arogue5/arogue58.sln
--- a/arogue5/arogue58.sln Sat Aug 22 10:55:53 2015 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 7.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "arogue58", "arogue58.vcproj", "{2EEE53AB-A85A-4D4D-8DB2-B5F23513F415}"
-EndProject
-Global
- GlobalSection(SolutionConfiguration) = preSolution
- ConfigName.0 = Debug
- ConfigName.1 = Release
- ConfigName.2 = test
- EndGlobalSection
- GlobalSection(ProjectDependencies) = postSolution
- EndGlobalSection
- GlobalSection(ProjectConfiguration) = postSolution
- {2EEE53AB-A85A-4D4D-8DB2-B5F23513F415}.Debug.ActiveCfg = Debug|Win32
- {2EEE53AB-A85A-4D4D-8DB2-B5F23513F415}.Debug.Build.0 = Debug|Win32
- {2EEE53AB-A85A-4D4D-8DB2-B5F23513F415}.Release.ActiveCfg = Release|Win32
- {2EEE53AB-A85A-4D4D-8DB2-B5F23513F415}.Release.Build.0 = Release|Win32
- {2EEE53AB-A85A-4D4D-8DB2-B5F23513F415}.test.ActiveCfg = Debug|Win32
- {2EEE53AB-A85A-4D4D-8DB2-B5F23513F415}.test.Build.0 = Debug|Win32
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- EndGlobalSection
- GlobalSection(ExtensibilityAddIns) = postSolution
- EndGlobalSection
-EndGlobal
diff -r ca876944b196 -r 4438569c1b02 arogue5/arogue58.vcproj
--- a/arogue5/arogue58.vcproj Sat Aug 22 10:55:53 2015 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,305 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -r ca876944b196 -r 4438569c1b02 arogue5/init.c
--- a/arogue5/init.c Sat Aug 22 10:55:53 2015 -0400
+++ b/arogue5/init.c Fri Nov 27 08:59:24 2015 -0500
@@ -15,6 +15,7 @@
#include "curses.h"
#include
#include
+#include
#include "rogue.h"
#include "mach_dep.h"
diff -r ca876944b196 -r 4438569c1b02 arogue5/mdport.c
--- a/arogue5/mdport.c Sat Aug 22 10:55:53 2015 -0400
+++ b/arogue5/mdport.c Fri Nov 27 08:59:24 2015 -0500
@@ -36,7 +36,6 @@
#if defined(_WIN32)
#include
#include
-#include
#include
#include
#undef MOUSE_MOVED
@@ -69,6 +68,10 @@
#include
#endif
+#if defined(_WIN32)
+#include
+#endif
+
#include
#include
#include
@@ -209,6 +212,15 @@
return(fd);
}
+FILE *
+md_fdopen(int fd, char *mode)
+{
+#ifdef _WIN32
+ return( _fdopen(fd, mode) );
+#else
+ return( fdopen(fd, mode) );
+#endif
+}
int
md_normaluser()
@@ -322,16 +334,6 @@
return(homedir);
}
-int
-md_sleep(int s)
-{
-#ifdef _WIN32
- _sleep(s);
-#else
- sleep(s);
-#endif
-}
-
char *
md_getshell()
{
diff -r ca876944b196 -r 4438569c1b02 arogue5/player.c
--- a/arogue5/player.c Sat Aug 22 10:55:53 2015 -0400
+++ b/arogue5/player.c Fri Nov 27 08:59:24 2015 -0500
@@ -168,7 +168,7 @@
else if (slow_invent) {
register char c;
- char *spellp;
+ char *spellp = "";
for (i=0; it_stats.s_hpt;
turn_off(*tp, CANSURPRISE);
@@ -783,7 +783,7 @@
int segments; /* Number of segments since last called */
{
register struct linked_list *item;
- register struct thing *tp;
+ register struct thing *tp = NULL;
register min_time = 20; /* Minimum time until a monster can act */
/*
diff -r ca876944b196 -r 4438569c1b02 arogue7/arogue7.vcxproj
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/arogue7/arogue7.vcxproj Fri Nov 27 08:59:24 2015 -0500
@@ -0,0 +1,187 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ x64
+
+
+
+ {93C1D81C-0424-4DC3-8671-D1B5F4BB6E5F}
+ arogue7
+ 8.1
+
+
+
+ Application
+ true
+ v140
+ MultiByte
+
+
+ Application
+ false
+ v140
+ true
+ MultiByte
+
+
+ Application
+ true
+ v140
+ MultiByte
+
+
+ Application
+ false
+ v140
+ true
+ MultiByte
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Level3
+ Disabled
+ true
+ ..\pdcurses
+ _CRT_SECURE_NO_WARNINGS;SCOREFILE="arogue7.scr";SAVEDIR=".";%(PreprocessorDefinitions)
+
+
+ true
+ ..\pdcurses
+ pdcurses.lib;%(AdditionalDependencies)
+
+
+
+
+ Level3
+ Disabled
+ true
+ _CRT_SECURE_NO_WARNINGS;SCOREFILE="arogue7.scr";SAVEDIR=".";%(PreprocessorDefinitions)
+ ..\pdcurses
+
+
+ true
+ ..\pdcurses
+ pdcurses.lib;%(AdditionalDependencies)
+
+
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ true
+ _CRT_SECURE_NO_WARNINGS;SCOREFILE="arogue7.scr";SAVEDIR=".";%(PreprocessorDefinitions)
+ ..\pdcurses
+
+
+ true
+ true
+ true
+ ..\pdcurses
+ pdcurses.lib;%(AdditionalDependencies)
+
+
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ true
+ _CRT_SECURE_NO_WARNINGS;SCOREFILE="arogue7.scr";SAVEDIR=".";%(PreprocessorDefinitions)
+ ..\pdcurses
+
+
+ true
+ true
+ true
+ ..\pdcurses
+ pdcurses.lib;%(AdditionalDependencies)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff -r ca876944b196 -r 4438569c1b02 arogue7/arogue7.vcxproj.filters
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/arogue7/arogue7.vcxproj.filters Fri Nov 27 08:59:24 2015 -0500
@@ -0,0 +1,153 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+ {93995380-89BD-4b04-88EB-625FBE52EBFB}
+ h;hh;hpp;hxx;hm;inl;inc;xsd
+
+
+ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
+ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms
+
+
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+
\ No newline at end of file
diff -r ca876944b196 -r 4438569c1b02 arogue7/arogue77.sln
--- a/arogue7/arogue77.sln Sat Aug 22 10:55:53 2015 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 7.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "arogue77", "arogue77.vcproj", "{D95CFDAC-E66E-47D3-87B7-F76149F6A51D}"
-EndProject
-Global
- GlobalSection(SolutionConfiguration) = preSolution
- ConfigName.0 = Debug
- ConfigName.1 = Release
- EndGlobalSection
- GlobalSection(ProjectDependencies) = postSolution
- EndGlobalSection
- GlobalSection(ProjectConfiguration) = postSolution
- {D95CFDAC-E66E-47D3-87B7-F76149F6A51D}.Debug.ActiveCfg = Debug|Win32
- {D95CFDAC-E66E-47D3-87B7-F76149F6A51D}.Debug.Build.0 = Debug|Win32
- {D95CFDAC-E66E-47D3-87B7-F76149F6A51D}.Release.ActiveCfg = Release|Win32
- {D95CFDAC-E66E-47D3-87B7-F76149F6A51D}.Release.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- EndGlobalSection
- GlobalSection(ExtensibilityAddIns) = postSolution
- EndGlobalSection
-EndGlobal
diff -r ca876944b196 -r 4438569c1b02 arogue7/arogue77.vcproj
--- a/arogue7/arogue77.vcproj Sat Aug 22 10:55:53 2015 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,270 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -r ca876944b196 -r 4438569c1b02 arogue7/command.c
--- a/arogue7/command.c Sat Aug 22 10:55:53 2015 -0400
+++ b/arogue7/command.c Fri Nov 27 08:59:24 2015 -0500
@@ -1078,7 +1078,7 @@
bool mark;
{
register struct object *obj;
- register char **guess, *elsewise;
+ register char **guess = NULL, *elsewise = NULL;
register bool *know;
if (item == NULL) {
diff -r ca876944b196 -r 4438569c1b02 arogue7/daemons.c
--- a/arogue7/daemons.c Sat Aug 22 10:55:53 2015 -0400
+++ b/arogue7/daemons.c Fri Nov 27 08:59:24 2015 -0500
@@ -417,7 +417,7 @@
alchemy(obj)
register struct object *obj;
{
- register struct object *tobj;
+ register struct object *tobj = NULL;
register struct linked_list *item;
/*
@@ -535,7 +535,7 @@
*/
quill_charge()
{
- register struct object *tobj;
+ register struct object *tobj = NULL;
register struct linked_list *item;
/*
diff -r ca876944b196 -r 4438569c1b02 arogue7/fight.c
--- a/arogue7/fight.c Sat Aug 22 10:55:53 2015 -0400
+++ b/arogue7/fight.c Fri Nov 27 08:59:24 2015 -0500
@@ -331,7 +331,7 @@
bool back_stab;
{
register struct stats *att, *def;
- register char *cp;
+ register char *cp = NULL;
register int ndice, nsides, nplus, def_arm;
bool did_hit = FALSE;
int prop_hplus, prop_dplus;
diff -r ca876944b196 -r 4438569c1b02 arogue7/mach_dep.h
--- a/arogue7/mach_dep.h Sat Aug 22 10:55:53 2015 -0400
+++ b/arogue7/mach_dep.h Fri Nov 27 08:59:24 2015 -0500
@@ -44,7 +44,8 @@
/*
* where scorefile should live
*/
-#ifndef HAVE_CONFIG_H
+/* File locations can be defined here, if necessary. */
+#if 0
#define SCOREFILE "arogue7.scr"
#define LOGFILE "arogue7.log"
#endif
diff -r ca876944b196 -r 4438569c1b02 arogue7/mdport.c
--- a/arogue7/mdport.c Sat Aug 22 10:55:53 2015 -0400
+++ b/arogue7/mdport.c Fri Nov 27 08:59:24 2015 -0500
@@ -32,7 +32,6 @@
#if defined(_WIN32)
#include
#include
-#include
#include
#include
#include
@@ -48,7 +47,7 @@
#include
#if defined(_WIN32) && !defined(__MINGW32__)
-#define PATH_MAX _PATH_MAX
+#define PATH_MAX _MAX_PATH
#endif
#include
@@ -61,6 +60,10 @@
#endif
#endif
+#if defined(_WIN32)
+#include
+#endif
+
#include
#include
#include
@@ -89,18 +92,6 @@
#endif
}
-int
-md_hasclreol()
-{
-#ifndef attron
- return(!CE);
-#elif !defined(__PDCURSES__)
- return(clr_eol != NULL);
-#else
- return(TRUE);
-#endif
-}
-
#ifdef attron
# define _puts(s) tputs(s, 0, md_putchar);
# define SO enter_standout_mode
@@ -184,6 +175,26 @@
#endif
}
+FILE *
+md_fdopen(int fd, char *mode)
+{
+#ifdef _WIN32
+ return( _fdopen(fd, mode) );
+#else
+ return( fdopen(fd, mode) );
+#endif
+}
+
+int
+md_fileno(FILE *fp)
+{
+#ifdef _WIN32
+ return( _fileno(fp) );
+#else
+ return( fileno(fp) );
+#endif
+}
+
int
md_creat(char *file, int mode)
{
@@ -306,16 +317,6 @@
return(homedir);
}
-int
-md_sleep(int s)
-{
-#ifdef _WIN32
- _sleep(s);
-#else
- sleep(s);
-#endif
-}
-
char *
md_getshell()
{
diff -r ca876944b196 -r 4438569c1b02 arogue7/misc.c
--- a/arogue7/misc.c Sat Aug 22 10:55:53 2015 -0400
+++ b/arogue7/misc.c Fri Nov 27 08:59:24 2015 -0500
@@ -277,7 +277,7 @@
register struct linked_list *item;
{
- register struct linked_list *titem;
+ register struct linked_list *titem = NULL;
register struct object *obj, *tobj;
bool doit = TRUE;
@@ -838,8 +838,8 @@
use_mm(which)
int which;
{
- register struct object *obj;
- register struct linked_list *item;
+ register struct object *obj = NULL;
+ register struct linked_list *item = NULL;
bool cursed, blessed, is_mm;
cursed = FALSE;
diff -r ca876944b196 -r 4438569c1b02 arogue7/move.c
--- a/arogue7/move.c Sat Aug 22 10:55:53 2015 -0400
+++ b/arogue7/move.c Fri Nov 27 08:59:24 2015 -0500
@@ -46,10 +46,10 @@
register coord *tc;
{
register struct trap *tp;
- register char ch, *mname;
+ register char ch, *mname = "";
register bool is_player = (th == &player),
can_see;
- register struct linked_list *mitem;
+ register struct linked_list *mitem = NULL;
register struct thing *mp;
@@ -764,7 +764,7 @@
register struct room *rp, *orp;
register char ch;
struct linked_list *item;
- register struct thing *tp;
+ register struct thing *tp = NULL;
coord old_hero;
register int wasfirstmove, moved, num_hits;
bool changed=FALSE; /* Did we switch places with a friendly monster? */
diff -r ca876944b196 -r 4438569c1b02 arogue7/pack.c
--- a/arogue7/pack.c Sat Aug 22 10:55:53 2015 -0400
+++ b/arogue7/pack.c Fri Nov 27 08:59:24 2015 -0500
@@ -34,8 +34,8 @@
register struct linked_list *item, **packret;
bool silent;
{
- register struct linked_list *ip, *lp, *ap;
- register struct object *obj, *op;
+ register struct linked_list *ip, *lp = NULL, *ap;
+ register struct object *obj, *op = NULL;
register bool exact, from_floor;
if (packret != NULL)
@@ -576,7 +576,7 @@
reg struct linked_list *item;
reg struct object *obj;
reg int cnt, pagecnt, ch, och, maxx, curx, confused;
- struct linked_list *saveitem;
+ struct linked_list *saveitem = NULL;
char description[2*LINELEN+1];
char cost[LINELEN/2];
#ifdef PC7300
diff -r ca876944b196 -r 4438569c1b02 arogue7/passages.c
--- a/arogue7/passages.c Sat Aug 22 10:55:53 2015 -0400
+++ b/arogue7/passages.c Fri Nov 27 08:59:24 2015 -0500
@@ -28,7 +28,7 @@
do_passages()
{
- register struct rdes *r1, *r2;
+ register struct rdes *r1, *r2 = NULL;
register int i, j;
register int roomcount;
static struct rdes
@@ -137,7 +137,7 @@
conn(r1, r2)
int r1, r2;
{
- register struct room *rpf, *rpt;
+ register struct room *rpf, *rpt = NULL;
register char rmt;
register int distance, max_diag, offset, i;
register int rm;
diff -r ca876944b196 -r 4438569c1b02 arogue7/rogue.h
--- a/arogue7/rogue.h Sat Aug 22 10:55:53 2015 -0400
+++ b/arogue7/rogue.h Fri Nov 27 08:59:24 2015 -0500
@@ -1303,3 +1303,5 @@
extern int demoncnt, fusecnt, between, chance;
#define CCHAR(x) ( (char) (x & A_CHARTEXT) )
extern char *md_gethostname(), *md_getusername(), *md_gethomedir(), *md_getroguedir(), *md_crypt();
+extern FILE * md_fdopen(int fd, char *mode);
+extern int md_fileno(FILE *fp);
diff -r ca876944b196 -r 4438569c1b02 arogue7/save.c
--- a/arogue7/save.c Sat Aug 22 10:55:53 2015 -0400
+++ b/arogue7/save.c Fri Nov 27 08:59:24 2015 -0500
@@ -111,7 +111,7 @@
*/
if (save_file(savefd) == FALSE) {
msg("Cannot create save file.");
- unlink(file_name);
+ md_unlink(file_name);
return(FALSE);
}
else return(TRUE);
@@ -160,7 +160,7 @@
num_written = ENCWRITE(version, num_to_write, savefd);
sprintf(prbuf,"%d x %d\n", LINES, COLS);
ENCWRITE(prbuf,80,savefd);
- savef = (FILE *) fdopen(savefd,"wb");
+ savef = (FILE *) md_fdopen(savefd,"wb");
ret = rs_save_file(savef);
fclose(savef);
if (num_to_write == num_written && ret == 0) return(TRUE);
diff -r ca876944b196 -r 4438569c1b02 arogue7/scrolls.c
--- a/arogue7/scrolls.c Sat Aug 22 10:55:53 2015 -0400
+++ b/arogue7/scrolls.c Fri Nov 27 08:59:24 2015 -0500
@@ -62,7 +62,7 @@
int flag;
bool is_scroll;
{
- register struct object *obj, *nobj;
+ register struct object *obj = NULL, *nobj;
register struct linked_list *item, *nitem;
register int i,j;
register char ch, nch;
diff -r ca876944b196 -r 4438569c1b02 arogue7/state.c
--- a/arogue7/state.c Sat Aug 22 10:55:53 2015 -0400
+++ b/arogue7/state.c Fri Nov 27 08:59:24 2015 -0500
@@ -79,7 +79,7 @@
if (write_error)
return(WRITESTAT);
- if (encwrite(ptr, size, fileno(savef)) != size)
+ if (encwrite(ptr, size, md_fileno(savef)) != size)
write_error = 1;
return(WRITESTAT);
diff -r ca876944b196 -r 4438569c1b02 arogue7/sticks.c
--- a/arogue7/sticks.c Sat Aug 22 10:55:53 2015 -0400
+++ b/arogue7/sticks.c Fri Nov 27 08:59:24 2015 -0500
@@ -33,13 +33,13 @@
int which;
int flags;
{
- register struct linked_list *item;
+ register struct linked_list *item = NULL;
register struct thing *tp;
register int y, x, bonus;
struct linked_list *nitem;
struct object *nobj;
bool cursed, blessed, is_player;
- char *mname;
+ char *mname = "";
cursed = flags & ISCURSED;
blessed = flags & ISBLESSED;
diff -r ca876944b196 -r 4438569c1b02 arogue7/util.c
--- a/arogue7/util.c Sat Aug 22 10:55:53 2015 -0400
+++ b/arogue7/util.c Fri Nov 27 08:59:24 2015 -0500
@@ -1006,7 +1006,7 @@
move_hero(why)
int why;
{
- char *action;
+ char *action = "";
char which;
coord c;
@@ -1207,7 +1207,7 @@
tr_name(ch)
char ch;
{
- register char *s;
+ register char *s = "";
switch (ch)
{
diff -r ca876944b196 -r 4438569c1b02 arogue7/wizard.c
--- a/arogue7/wizard.c Sat Aug 22 10:55:53 2015 -0400
+++ b/arogue7/wizard.c Fri Nov 27 08:59:24 2015 -0500
@@ -537,7 +537,7 @@
teleport()
{
- register struct room *new_rp, *old_rp = roomin(&hero);
+ register struct room *new_rp = NULL, *old_rp = roomin(&hero);
register int rm, which;
coord old;
bool got_position = FALSE;
diff -r ca876944b196 -r 4438569c1b02 rogue3/chase.c
--- a/rogue3/chase.c Sat Aug 22 10:55:53 2015 -0400
+++ b/rogue3/chase.c Fri Nov 27 08:59:24 2015 -0500
@@ -162,7 +162,7 @@
int x, y;
int dist, thisdist;
struct linked_list *item;
- struct object *obj;
+ struct object *obj = NULL;
coord *er = &tp->t_pos;
int ch;
diff -r ca876944b196 -r 4438569c1b02 rogue3/move.c
--- a/rogue3/move.c Sat Aug 22 10:55:53 2015 -0400
+++ b/rogue3/move.c Fri Nov 27 08:59:24 2015 -0500
@@ -339,7 +339,7 @@
int ch;
int ex, ey, nopen = 0;
struct linked_list *item;
- struct object *obj;
+ struct object *obj = NULL;
static coord ret; /* what we will be returning */
static coord dest;
diff -r ca876944b196 -r 4438569c1b02 rogue3/pack.c
--- a/rogue3/pack.c Sat Aug 22 10:55:53 2015 -0400
+++ b/rogue3/pack.c Fri Nov 27 08:59:24 2015 -0500
@@ -22,8 +22,8 @@
void
add_pack(struct linked_list *item, int silent)
{
- struct linked_list *ip, *lp;
- struct object *obj, *op;
+ struct linked_list *ip, *lp = NULL;
+ struct object *obj, *op = NULL;
int exact, from_floor;
if (item == NULL)
diff -r ca876944b196 -r 4438569c1b02 rogue3/passages.c
--- a/rogue3/passages.c Sat Aug 22 10:55:53 2015 -0400
+++ b/rogue3/passages.c Fri Nov 27 08:59:24 2015 -0500
@@ -22,7 +22,7 @@
void
do_passages()
{
- struct rdes *r1, *r2;
+ struct rdes *r1, *r2 = NULL;
int i, j;
int roomcount;
static struct rdes
@@ -131,7 +131,7 @@
void
conn(int r1, int r2)
{
- struct room *rpf, *rpt;
+ struct room *rpf, *rpt = NULL;
int rmt;
int distance, turn_spot, turn_distance;
int rm;
diff -r ca876944b196 -r 4438569c1b02 rogue3/rogue3.vcxproj
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/rogue3/rogue3.vcxproj Fri Nov 27 08:59:24 2015 -0500
@@ -0,0 +1,177 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ x64
+
+
+
+ {0CD113D6-2654-41FC-8A77-240A0CCF7BC5}
+ rogue3
+ 8.1
+
+
+
+ Application
+ true
+ v140
+ MultiByte
+
+
+ Application
+ false
+ v140
+ true
+ MultiByte
+
+
+ Application
+ true
+ v140
+ MultiByte
+
+
+ Application
+ false
+ v140
+ true
+ MultiByte
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Level3
+ Disabled
+ true
+ ..\pdcurses
+ _CRT_SECURE_NO_WARNINGS;SCOREFILE="rogue3.scr";SAVEDIR=".";%(PreprocessorDefinitions)
+
+
+ true
+ ..\pdcurses;%(AdditionalLibraryDirectories)
+ pdcurses.lib;%(AdditionalDependencies)
+
+
+
+
+ Level3
+ Disabled
+ true
+ ..\pdcurses
+ _CRT_SECURE_NO_WARNINGS;SCOREFILE="rogue3.scr";SAVEDIR=".";%(PreprocessorDefinitions)
+
+
+ true
+ ..\pdcurses
+ pdcurses.lib;%(AdditionalDependencies)
+
+
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ true
+ ..\pdcurses
+ _CRT_SECURE_NO_WARNINGS;SCOREFILE="rogue3.scr";SAVEDIR=".";%(PreprocessorDefinitions)
+
+
+ true
+ true
+ true
+ ..\pdcurses
+ pdcurses.lib;%(AdditionalDependencies)
+
+
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ true
+ ..\pdcurses
+ _CRT_SECURE_NO_WARNINGS;SCOREFILE="rogue3.scr";SAVEDIR=".";%(PreprocessorDefinitions)
+
+
+ true
+ true
+ true
+ ..\pdcurses
+ pdcurses.lib;%(AdditionalDependencies)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r ca876944b196 -r 4438569c1b02 rogue3/rogue3.vcxproj.filters
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/rogue3/rogue3.vcxproj.filters Fri Nov 27 08:59:24 2015 -0500
@@ -0,0 +1,123 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+ {93995380-89BD-4b04-88EB-625FBE52EBFB}
+ h;hh;hpp;hxx;hm;inl;inc;xsd
+
+
+ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
+ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms
+
+
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+
\ No newline at end of file
diff -r ca876944b196 -r 4438569c1b02 rogue3/rogue36.sln
--- a/rogue3/rogue36.sln Sat Aug 22 10:55:53 2015 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rogue36", "rogue36.vcproj", "{B986AB16-E9C2-4299-A772-F02B28620521}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {B986AB16-E9C2-4299-A772-F02B28620521}.Debug|Win32.ActiveCfg = Debug|Win32
- {B986AB16-E9C2-4299-A772-F02B28620521}.Debug|Win32.Build.0 = Debug|Win32
- {B986AB16-E9C2-4299-A772-F02B28620521}.Release|Win32.ActiveCfg = Release|Win32
- {B986AB16-E9C2-4299-A772-F02B28620521}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff -r ca876944b196 -r 4438569c1b02 rogue3/rogue36.vcproj
--- a/rogue3/rogue36.vcproj Sat Aug 22 10:55:53 2015 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,360 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -r ca876944b196 -r 4438569c1b02 rogue4/mdport.c
--- a/rogue4/mdport.c Sat Aug 22 10:55:53 2015 -0400
+++ b/rogue4/mdport.c Fri Nov 27 08:59:24 2015 -0500
@@ -36,7 +36,6 @@
#if defined(_WIN32)
#include
#include
-#include
#include
#include
#include
@@ -73,6 +72,10 @@
#include
#endif
+#if defined(_WIN32)
+#include
+#endif
+
#include
#include
#include
diff -r ca876944b196 -r 4438569c1b02 rogue4/rogue4.vcxproj
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/rogue4/rogue4.vcxproj Fri Nov 27 08:59:24 2015 -0500
@@ -0,0 +1,179 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ x64
+
+
+
+ {E36D1F88-95A9-425B-A538-AAADDD34FE1E}
+ rogue4
+ 8.1
+
+
+
+ Application
+ true
+ v140
+ MultiByte
+
+
+ Application
+ false
+ v140
+ true
+ MultiByte
+
+
+ Application
+ true
+ v140
+ MultiByte
+
+
+ Application
+ false
+ v140
+ true
+ MultiByte
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Level3
+ Disabled
+ true
+ ..\pdcurses
+ _CRT_SECURE_NO_WARNINGS;SCOREFILE="rogue4.scr";SAVEDIR=".";%(PreprocessorDefinitions)
+ false
+
+
+ true
+ ..\pdcurses
+ pdcurses.lib;%(AdditionalDependencies)
+
+
+
+
+ Level3
+ Disabled
+ true
+ ..\pdcurses
+ _CRT_SECURE_NO_WARNINGS;SCOREFILE="rogue4.scr";SAVEDIR=".";%(PreprocessorDefinitions)
+
+
+ true
+ ..\pdcurses
+ pdcurses.lib;%(AdditionalDependencies)
+
+
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ true
+ ..\pdcurses
+ _CRT_SECURE_NO_WARNINGS;SCOREFILE="rogue4.scr";SAVEDIR=".";%(PreprocessorDefinitions)
+
+
+ true
+ true
+ true
+ ..\pdcurses
+ pdcurses.lib;%(AdditionalDependencies)
+
+
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ true
+ ..\pdcurses
+ _CRT_SECURE_NO_WARNINGS;SCOREFILE="rogue4.scr";SAVEDIR=".";%(PreprocessorDefinitions)
+
+
+ true
+ true
+ true
+ ..\pdcurses
+ pdcurses.lib;%(AdditionalDependencies)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r ca876944b196 -r 4438569c1b02 rogue4/rogue4.vcxproj.filters
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/rogue4/rogue4.vcxproj.filters Fri Nov 27 08:59:24 2015 -0500
@@ -0,0 +1,126 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+ {93995380-89BD-4b04-88EB-625FBE52EBFB}
+ h;hh;hpp;hxx;hm;inl;inc;xsd
+
+
+ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
+ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+
+
+ Header Files
+
+
+ Header Files
+
+
+
\ No newline at end of file
diff -r ca876944b196 -r 4438569c1b02 rogue4/rogue52.sln
--- a/rogue4/rogue52.sln Sat Aug 22 10:55:53 2015 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rogue52", "rogue52.vcproj", "{8D92C587-9CBA-41FE-BB30-F0A7142AC625}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {8D92C587-9CBA-41FE-BB30-F0A7142AC625}.Debug|Win32.ActiveCfg = Debug|Win32
- {8D92C587-9CBA-41FE-BB30-F0A7142AC625}.Debug|Win32.Build.0 = Debug|Win32
- {8D92C587-9CBA-41FE-BB30-F0A7142AC625}.Release|Win32.ActiveCfg = Release|Win32
- {8D92C587-9CBA-41FE-BB30-F0A7142AC625}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff -r ca876944b196 -r 4438569c1b02 rogue4/rogue52.vcproj
--- a/rogue4/rogue52.vcproj Sat Aug 22 10:55:53 2015 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,405 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -r ca876944b196 -r 4438569c1b02 rogue4/save.c
--- a/rogue4/save.c Sat Aug 22 10:55:53 2015 -0400
+++ b/rogue4/save.c Fri Nov 27 08:59:24 2015 -0500
@@ -160,7 +160,10 @@
/*
* close any open score file
*/
- close(fd);
+ if (fd >= 0) {
+ close(fd);
+ fd = -1;
+ }
move(LINES-1, 0);
refresh();
fstat(md_fileno(savef), &sbuf);
diff -r ca876944b196 -r 4438569c1b02 rogue5/rogue5.vcxproj
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/rogue5/rogue5.vcxproj Fri Nov 27 08:59:24 2015 -0500
@@ -0,0 +1,179 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ x64
+
+
+
+ {A27E881B-F9E5-45CB-802B-D9E46B2E2438}
+ rogue5
+ 8.1
+
+
+
+ Application
+ true
+ v140
+ MultiByte
+
+
+ Application
+ false
+ v140
+ true
+ MultiByte
+
+
+ Application
+ true
+ v140
+ MultiByte
+
+
+ Application
+ false
+ v140
+ true
+ MultiByte
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Level3
+ Disabled
+ true
+ ..\pdcurses
+ _CRT_SECURE_NO_WARNINGS;SCOREFILE="rogue5.scr";SAVEDIR=".";NUMSCORES=10;NUMNAME="Ten";%(PreprocessorDefinitions)
+
+
+ true
+ ..\pdcurses
+ pdcurses.lib;%(AdditionalDependencies)
+
+
+
+
+ Level3
+ Disabled
+ true
+ ..\pdcurses
+ _CRT_SECURE_NO_WARNINGS;SCOREFILE="rogue5.scr";SAVEDIR=".";NUMSCORES=10;NUMNAME="Ten";%(PreprocessorDefinitions)
+
+
+ true
+ ..\pdcurses
+ pdcurses.lib;%(AdditionalDependencies)
+
+
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ true
+ ..\pdcurses
+ _CRT_SECURE_NO_WARNINGS;SCOREFILE="rogue5.scr";SAVEDIR=".";NUMSCORES=10;NUMNAME="Ten";%(PreprocessorDefinitions)
+
+
+ true
+ true
+ true
+ ..\pdcurses
+ pdcurses.lib;%(AdditionalDependencies)
+
+
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ true
+ ..\pdcurses
+ _CRT_SECURE_NO_WARNINGS;SCOREFILE="rogue5.scr";SAVEDIR=".";NUMSCORES=10;NUMNAME="Ten";%(PreprocessorDefinitions)
+
+
+ true
+ true
+ true
+ pdcurses.lib;%(AdditionalDependencies)
+ ..\pdcurses
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r ca876944b196 -r 4438569c1b02 rogue5/rogue5.vcxproj.filters
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/rogue5/rogue5.vcxproj.filters Fri Nov 27 08:59:24 2015 -0500
@@ -0,0 +1,129 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+ {93995380-89BD-4b04-88EB-625FBE52EBFB}
+ h;hh;hpp;hxx;hm;inl;inc;xsd
+
+
+ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
+ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms
+
+
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+
\ No newline at end of file
diff -r ca876944b196 -r 4438569c1b02 rogue5/rogue54.sln
--- a/rogue5/rogue54.sln Sat Aug 22 10:55:53 2015 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rogue54", "rogue54.vcproj", "{9EA0D326-8097-4ADA-82EA-4DB1F5CAA8F6}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1C23D043-B375-4844-ACA0-32848BFCC987}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {9EA0D326-8097-4ADA-82EA-4DB1F5CAA8F6}.Debug|Win32.ActiveCfg = Debug|Win32
- {9EA0D326-8097-4ADA-82EA-4DB1F5CAA8F6}.Debug|Win32.Build.0 = Debug|Win32
- {9EA0D326-8097-4ADA-82EA-4DB1F5CAA8F6}.Release|Win32.ActiveCfg = Release|Win32
- {9EA0D326-8097-4ADA-82EA-4DB1F5CAA8F6}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff -r ca876944b196 -r 4438569c1b02 rogue5/rogue54.vcproj
--- a/rogue5/rogue54.vcproj Sat Aug 22 10:55:53 2015 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,362 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -r ca876944b196 -r 4438569c1b02 roguelike.sln
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/roguelike.sln Fri Nov 27 08:59:24 2015 -0500
@@ -0,0 +1,88 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.23107.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rogue3", "rogue3\rogue3.vcxproj", "{0CD113D6-2654-41FC-8A77-240A0CCF7BC5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rogue4", "rogue4\rogue4.vcxproj", "{E36D1F88-95A9-425B-A538-AAADDD34FE1E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rogue5", "rogue5\rogue5.vcxproj", "{A27E881B-F9E5-45CB-802B-D9E46B2E2438}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "srogue", "srogue\srogue.vcxproj", "{FE28341F-1129-4A66-A170-5486CAEF3464}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "arogue5", "arogue5\arogue5.vcxproj", "{F9B8E5FE-F748-453D-8A6B-012D28841D5A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "arogue7", "arogue7\arogue7.vcxproj", "{93C1D81C-0424-4DC3-8671-D1B5F4BB6E5F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrogue", "xrogue\xrogue.vcxproj", "{DE1CC319-96C4-40AA-A144-8F00B4C73CC9}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|x64 = Debug|x64
+ Debug|x86 = Debug|x86
+ Release|x64 = Release|x64
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {0CD113D6-2654-41FC-8A77-240A0CCF7BC5}.Debug|x64.ActiveCfg = Debug|x64
+ {0CD113D6-2654-41FC-8A77-240A0CCF7BC5}.Debug|x64.Build.0 = Debug|x64
+ {0CD113D6-2654-41FC-8A77-240A0CCF7BC5}.Debug|x86.ActiveCfg = Debug|Win32
+ {0CD113D6-2654-41FC-8A77-240A0CCF7BC5}.Debug|x86.Build.0 = Debug|Win32
+ {0CD113D6-2654-41FC-8A77-240A0CCF7BC5}.Release|x64.ActiveCfg = Release|x64
+ {0CD113D6-2654-41FC-8A77-240A0CCF7BC5}.Release|x64.Build.0 = Release|x64
+ {0CD113D6-2654-41FC-8A77-240A0CCF7BC5}.Release|x86.ActiveCfg = Release|Win32
+ {0CD113D6-2654-41FC-8A77-240A0CCF7BC5}.Release|x86.Build.0 = Release|Win32
+ {E36D1F88-95A9-425B-A538-AAADDD34FE1E}.Debug|x64.ActiveCfg = Debug|x64
+ {E36D1F88-95A9-425B-A538-AAADDD34FE1E}.Debug|x64.Build.0 = Debug|x64
+ {E36D1F88-95A9-425B-A538-AAADDD34FE1E}.Debug|x86.ActiveCfg = Debug|Win32
+ {E36D1F88-95A9-425B-A538-AAADDD34FE1E}.Debug|x86.Build.0 = Debug|Win32
+ {E36D1F88-95A9-425B-A538-AAADDD34FE1E}.Release|x64.ActiveCfg = Release|x64
+ {E36D1F88-95A9-425B-A538-AAADDD34FE1E}.Release|x64.Build.0 = Release|x64
+ {E36D1F88-95A9-425B-A538-AAADDD34FE1E}.Release|x86.ActiveCfg = Release|Win32
+ {E36D1F88-95A9-425B-A538-AAADDD34FE1E}.Release|x86.Build.0 = Release|Win32
+ {A27E881B-F9E5-45CB-802B-D9E46B2E2438}.Debug|x64.ActiveCfg = Debug|x64
+ {A27E881B-F9E5-45CB-802B-D9E46B2E2438}.Debug|x64.Build.0 = Debug|x64
+ {A27E881B-F9E5-45CB-802B-D9E46B2E2438}.Debug|x86.ActiveCfg = Debug|Win32
+ {A27E881B-F9E5-45CB-802B-D9E46B2E2438}.Debug|x86.Build.0 = Debug|Win32
+ {A27E881B-F9E5-45CB-802B-D9E46B2E2438}.Release|x64.ActiveCfg = Release|x64
+ {A27E881B-F9E5-45CB-802B-D9E46B2E2438}.Release|x64.Build.0 = Release|x64
+ {A27E881B-F9E5-45CB-802B-D9E46B2E2438}.Release|x86.ActiveCfg = Release|Win32
+ {A27E881B-F9E5-45CB-802B-D9E46B2E2438}.Release|x86.Build.0 = Release|Win32
+ {FE28341F-1129-4A66-A170-5486CAEF3464}.Debug|x64.ActiveCfg = Debug|x64
+ {FE28341F-1129-4A66-A170-5486CAEF3464}.Debug|x64.Build.0 = Debug|x64
+ {FE28341F-1129-4A66-A170-5486CAEF3464}.Debug|x86.ActiveCfg = Debug|Win32
+ {FE28341F-1129-4A66-A170-5486CAEF3464}.Debug|x86.Build.0 = Debug|Win32
+ {FE28341F-1129-4A66-A170-5486CAEF3464}.Release|x64.ActiveCfg = Release|x64
+ {FE28341F-1129-4A66-A170-5486CAEF3464}.Release|x64.Build.0 = Release|x64
+ {FE28341F-1129-4A66-A170-5486CAEF3464}.Release|x86.ActiveCfg = Release|Win32
+ {FE28341F-1129-4A66-A170-5486CAEF3464}.Release|x86.Build.0 = Release|Win32
+ {F9B8E5FE-F748-453D-8A6B-012D28841D5A}.Debug|x64.ActiveCfg = Debug|x64
+ {F9B8E5FE-F748-453D-8A6B-012D28841D5A}.Debug|x64.Build.0 = Debug|x64
+ {F9B8E5FE-F748-453D-8A6B-012D28841D5A}.Debug|x86.ActiveCfg = Debug|Win32
+ {F9B8E5FE-F748-453D-8A6B-012D28841D5A}.Debug|x86.Build.0 = Debug|Win32
+ {F9B8E5FE-F748-453D-8A6B-012D28841D5A}.Release|x64.ActiveCfg = Release|x64
+ {F9B8E5FE-F748-453D-8A6B-012D28841D5A}.Release|x64.Build.0 = Release|x64
+ {F9B8E5FE-F748-453D-8A6B-012D28841D5A}.Release|x86.ActiveCfg = Release|Win32
+ {F9B8E5FE-F748-453D-8A6B-012D28841D5A}.Release|x86.Build.0 = Release|Win32
+ {93C1D81C-0424-4DC3-8671-D1B5F4BB6E5F}.Debug|x64.ActiveCfg = Debug|x64
+ {93C1D81C-0424-4DC3-8671-D1B5F4BB6E5F}.Debug|x64.Build.0 = Debug|x64
+ {93C1D81C-0424-4DC3-8671-D1B5F4BB6E5F}.Debug|x86.ActiveCfg = Debug|Win32
+ {93C1D81C-0424-4DC3-8671-D1B5F4BB6E5F}.Debug|x86.Build.0 = Debug|Win32
+ {93C1D81C-0424-4DC3-8671-D1B5F4BB6E5F}.Release|x64.ActiveCfg = Release|x64
+ {93C1D81C-0424-4DC3-8671-D1B5F4BB6E5F}.Release|x64.Build.0 = Release|x64
+ {93C1D81C-0424-4DC3-8671-D1B5F4BB6E5F}.Release|x86.ActiveCfg = Release|Win32
+ {93C1D81C-0424-4DC3-8671-D1B5F4BB6E5F}.Release|x86.Build.0 = Release|Win32
+ {DE1CC319-96C4-40AA-A144-8F00B4C73CC9}.Debug|x64.ActiveCfg = Debug|x64
+ {DE1CC319-96C4-40AA-A144-8F00B4C73CC9}.Debug|x64.Build.0 = Debug|x64
+ {DE1CC319-96C4-40AA-A144-8F00B4C73CC9}.Debug|x86.ActiveCfg = Debug|Win32
+ {DE1CC319-96C4-40AA-A144-8F00B4C73CC9}.Debug|x86.Build.0 = Debug|Win32
+ {DE1CC319-96C4-40AA-A144-8F00B4C73CC9}.Release|x64.ActiveCfg = Release|x64
+ {DE1CC319-96C4-40AA-A144-8F00B4C73CC9}.Release|x64.Build.0 = Release|x64
+ {DE1CC319-96C4-40AA-A144-8F00B4C73CC9}.Release|x86.ActiveCfg = Release|Win32
+ {DE1CC319-96C4-40AA-A144-8F00B4C73CC9}.Release|x86.Build.0 = Release|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff -r ca876944b196 -r 4438569c1b02 srogue/command.c
--- a/srogue/command.c Sat Aug 22 10:55:53 2015 -0400
+++ b/srogue/command.c Fri Nov 27 08:59:24 2015 -0500
@@ -23,6 +23,8 @@
#include "rogue.ext"
#ifdef __DJGPP__
#include
+#elif defined(_WIN32)
+#include
#else
#include
#endif
diff -r ca876944b196 -r 4438569c1b02 srogue/main.c
--- a/srogue/main.c Sat Aug 22 10:55:53 2015 -0400
+++ b/srogue/main.c Fri Nov 27 08:59:24 2015 -0500
@@ -172,7 +172,7 @@
/* START NEW GAME */
dnum = (wizard && getenv("SEED") != NULL ?
- atoi(getenv("SEED")) : lowtime + getpid());
+ atoi(getenv("SEED")) : lowtime + md_getpid());
if(wizard)
printf("Hello %s, welcome to dungeon #%d\n", whoami, dnum);
@@ -438,7 +438,7 @@
struct stat sb;
if (stat(dirname, &sb) == 0) /* path exists */
- return (S_ISDIR (sb.st_mode));
+ return ((sb.st_mode & S_IFMT) == S_IFDIR);
return(0);
}
diff -r ca876944b196 -r 4438569c1b02 srogue/mdport.c
--- a/srogue/mdport.c Sat Aug 22 10:55:53 2015 -0400
+++ b/srogue/mdport.c Fri Nov 27 08:59:24 2015 -0500
@@ -42,9 +42,9 @@
#pragma warning( default: 4201 )
#include
#undef MOUSE_MOVED
+#define HAVE_PROCESS_H
#endif
-#include
#include "rogue.h"
#if defined(HAVE_SYS_TYPES)
@@ -81,8 +81,6 @@
#endif
#endif
-#include /* AIX requires curses.h be included before term.h */
-
#if defined(HAVE_TERM_H)
#include
#elif defined(HAVE_NCURSES_TERM_H)
@@ -358,6 +356,16 @@
#endif
}
+FILE *
+md_fdopen(int fd, char *mode)
+{
+#ifdef _WIN32
+ return( _fdopen(fd, mode) );
+#else
+ return( fdopen(fd, mode) );
+#endif
+}
+
int
md_chmod(const char *filename, int mode)
{
diff -r ca876944b196 -r 4438569c1b02 srogue/pack.c
--- a/srogue/pack.c Sat Aug 22 10:55:53 2015 -0400
+++ b/srogue/pack.c Fri Nov 27 08:59:24 2015 -0500
@@ -29,7 +29,7 @@
bool silent;
{
reg struct linked_list *ip, *lp;
- reg struct object *obj, *op;
+ reg struct object *obj, *op = NULL;
bool from_floor;
char delchar;
@@ -292,7 +292,7 @@
char *purpose;
int type;
{
- reg struct linked_list *obj, *pit, *savepit;
+ reg struct linked_list *obj, *pit, *savepit = NULL;
struct object *pob;
int ch, och, anr, cnt;
diff -r ca876944b196 -r 4438569c1b02 srogue/passages.c
--- a/srogue/passages.c Sat Aug 22 10:55:53 2015 -0400
+++ b/srogue/passages.c Fri Nov 27 08:59:24 2015 -0500
@@ -24,7 +24,7 @@
do_passages()
{
- reg struct rdes *r1, *r2;
+ reg struct rdes *r1, *r2 = NULL;
reg int i, j;
reg int roomcount;
static struct rdes {
@@ -126,7 +126,7 @@
conn(r1, r2)
int r1, r2;
{
- reg struct room *rpf, *rpt;
+ reg struct room *rpf, *rpt = NULL;
reg char rmt, direc;
reg int distance, turn_spot, turn_distance, rm;
struct coord curr, turn_delta, spos, epos;
diff -r ca876944b196 -r 4438569c1b02 srogue/rip.c
--- a/srogue/rip.c Sat Aug 22 10:55:53 2015 -0400
+++ b/srogue/rip.c Fri Nov 27 08:59:24 2015 -0500
@@ -145,7 +145,7 @@
*/
if ((fd = scorefd) < 0)
return;
- outf = (FILE *) fdopen(fd, "w");
+ outf = (FILE *) md_fdopen(fd, "w");
for (scp = top_ten; scp <= &top_ten[9]; scp++) {
scp->sc_score = 0;
for (i = 0; i < 80; i++)
diff -r ca876944b196 -r 4438569c1b02 srogue/rogue.h
--- a/srogue/rogue.h Sat Aug 22 10:55:53 2015 -0400
+++ b/srogue/rogue.h Fri Nov 27 08:59:24 2015 -0500
@@ -29,6 +29,9 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
+#elif defined(_WIN32) && defined(__PDCURSES__)
+#define HAVE_ERASECHAR
+#define HAVE_KILLCHAR
#endif
/* mdport functions */
@@ -36,10 +39,21 @@
#include
#endif
+#ifndef uid_t
+typedef unsigned int uid_t;
+#endif
+#ifndef gid_t
+typedef unsigned int gid_t;
+#endif
+#ifndef pid_t
+typedef int pid_t;
+#endif
+
int md_chmod(const char *filename, int mode);
char *md_crypt(const char *key, const char *salt);
int md_dsuspchar(void);
int md_erasechar(void);
+FILE * md_fdopen(int fd, char *mode);
char *md_gethomedir(void);
char *md_getusername(void);
uid_t md_getuid(void);
diff -r ca876944b196 -r 4438569c1b02 srogue/save.c
--- a/srogue/save.c Sat Aug 22 10:55:53 2015 -0400
+++ b/srogue/save.c Fri Nov 27 08:59:24 2015 -0500
@@ -14,15 +14,18 @@
* See the file LICENSE.TXT for full copyright and licensing information.
*/
+#include
#include
#include
-#include
#include
#include
#include
#include
#include
#include
+#if !defined(_WIN32)
+#include
+#endif
#include "rogue.h"
#include "rogue.ext"
@@ -157,7 +160,6 @@
save_file(savef)
FILE *savef;
{
- reg int fnum;
int slines = LINES;
int scols = COLS;
@@ -165,20 +167,12 @@
_djstat_flags |= _STAT_INODE; /* so turn off computing it for now */
#endif
- /*
- * force allocation of the buffer now so that inodes, etc
- * can be checked when restoring saved games.
- */
- fnum = fileno(savef);
- fstat(fnum, &sbuf);
- write(fnum, "RDK", 4);
- lseek(fnum, 0L, 0);
encwrite(version,strlen(version)+1,savef);
encwrite(&slines,sizeof(slines),savef);
encwrite(&scols,sizeof(scols),savef);
msg("");
rs_save_file(savef);
- close(fnum);
+ fclose(savef);
md_onsignal_exit();
wclear(cw);
draw(cw);
@@ -283,7 +277,7 @@
#endif
if (!wizard)
{
- if (unlink(file) < 0)
+ if (md_unlink(file) < 0)
{
endwin();
printf("Cannot unlink file\n");
@@ -302,6 +296,6 @@
strcpy(file_name, file);
setup();
restscr(cw);
- md_srandom(getpid());
+ md_srandom(md_getpid());
playit();
}
diff -r ca876944b196 -r 4438569c1b02 srogue/srogue.vcxproj
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/srogue/srogue.vcxproj Fri Nov 27 08:59:24 2015 -0500
@@ -0,0 +1,183 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ x64
+
+
+
+ {FE28341F-1129-4A66-A170-5486CAEF3464}
+ srogue
+ 8.1
+
+
+
+ Application
+ true
+ v140
+ MultiByte
+
+
+ Application
+ false
+ v140
+ true
+ MultiByte
+
+
+ Application
+ true
+ v140
+ MultiByte
+
+
+ Application
+ false
+ v140
+ true
+ MultiByte
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Level3
+ Disabled
+ true
+ ..\pdcurses
+ _CRT_SECURE_NO_WARNINGS;SCOREFILE="srogue.scr";%(PreprocessorDefinitions)
+
+
+ true
+ ..\pdcurses
+ pdcurses.lib;%(AdditionalDependencies)
+
+
+
+
+ Level3
+ Disabled
+ true
+ ..\pdcurses
+ _CRT_SECURE_NO_WARNINGS;SCOREFILE="srogue.scr";%(PreprocessorDefinitions)
+
+
+ true
+ ..\pdcurses
+ pdcurses.lib;%(AdditionalDependencies)
+
+
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ true
+ _CRT_SECURE_NO_WARNINGS;SCOREFILE="srogue.scr";%(PreprocessorDefinitions)
+ ..\pdcurses;%(AdditionalIncludeDirectories)
+
+
+ true
+ true
+ true
+ ..\pdcurses
+ pdcurses.lib;%(AdditionalDependencies)
+
+
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ true
+ ..\pdcurses
+ _CRT_SECURE_NO_WARNINGS;SCOREFILE="srogue.scr";%(PreprocessorDefinitions)
+
+
+ true
+ true
+ true
+ ..\pdcurses
+ pdcurses.lib;%(AdditionalDependencies)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r ca876944b196 -r 4438569c1b02 srogue/srogue.vcxproj.filters
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/srogue/srogue.vcxproj.filters Fri Nov 27 08:59:24 2015 -0500
@@ -0,0 +1,137 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+ {93995380-89BD-4b04-88EB-625FBE52EBFB}
+ h;hh;hpp;hxx;hm;inl;inc;xsd
+
+
+ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
+ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+
+
+ Header Files
+
+
+
+
+ Header Files
+
+
+
\ No newline at end of file
diff -r ca876944b196 -r 4438569c1b02 xrogue/mach_dep.h
--- a/xrogue/mach_dep.h Sat Aug 22 10:55:53 2015 -0400
+++ b/xrogue/mach_dep.h Fri Nov 27 08:59:24 2015 -0500
@@ -62,8 +62,8 @@
#define FUDGE_TIME 200
-/* file locations */
-#ifndef HAVE_CONFIG_H
+/* File locations. Define here if necessary. */
+#if 0
#define SCOREFILE "xrogue.scr"
#define LOGFILE "xrogue.log"
#endif
diff -r ca876944b196 -r 4438569c1b02 xrogue/save.c
--- a/xrogue/save.c Sat Aug 22 10:55:53 2015 -0400
+++ b/xrogue/save.c Fri Nov 27 08:59:24 2015 -0500
@@ -19,6 +19,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -30,6 +31,8 @@
extern unsigned char encstr[];
extern int big_endian;
+int md_unlink(char *file);
+
bool
save_game()
{
@@ -94,7 +97,7 @@
if (save_file(savef) == FALSE) {
fclose(savef);
msg("Cannot create save file.");
- unlink(file_name);
+ md_unlink(file_name);
return(FALSE);
}
fclose(savef);
@@ -224,7 +227,7 @@
close(inf);
if (!wizard)
- unlink(file);
+ md_unlink(file);
mpos = 0;
environ = envp;
diff -r ca876944b196 -r 4438569c1b02 xrogue/state.c
--- a/xrogue/state.c Sat Aug 22 10:55:53 2015 -0400
+++ b/xrogue/state.c Fri Nov 27 08:59:24 2015 -0500
@@ -55,7 +55,6 @@
#if defined(_WIN32)
#include
#include
-#include
#include
#include
#undef VOID
@@ -82,6 +81,11 @@
#include "rogue.h"
#include "mach_dep.h"
+#if defined(_WIN32)
+#include
+#endif
+
+int md_fileno(FILE *fp);
#define READSTAT ((format_error == 0) && (read_error == 0))
#define WRITESTAT (write_error == 0)
@@ -2922,8 +2926,9 @@
rs_read_scorefile(FILE *savef, struct sc_ent *entries, int count)
{
int i,available = 0;
-
- rs_read_int(fileno(savef), &available);
+ int sfd = md_fileno(savef);
+
+ rs_read_int(sfd, &available);
if (end_of_file)
return(-1);
@@ -2933,15 +2938,15 @@
for(i = 0; i < count; i++)
{
- rs_read_ulong(fileno(savef), &entries[i].sc_score);
- rs_read(fileno(savef), entries[i].sc_name, sizeof(entries[i].sc_name));
- rs_read(fileno(savef), entries[i].sc_system, sizeof(entries[i].sc_system));
- rs_read(fileno(savef), entries[i].sc_login, sizeof(entries[i].sc_login));
- rs_read_short(fileno(savef), &entries[i].sc_flags);
- rs_read_short(fileno(savef), &entries[i].sc_level);
- rs_read_short(fileno(savef), &entries[i].sc_ctype);
- rs_read_short(fileno(savef), &entries[i].sc_monster);
- rs_read_short(fileno(savef), &entries[i].sc_quest);
+ rs_read_ulong(sfd, &entries[i].sc_score);
+ rs_read(sfd, entries[i].sc_name, sizeof(entries[i].sc_name));
+ rs_read(sfd, entries[i].sc_system, sizeof(entries[i].sc_system));
+ rs_read(sfd, entries[i].sc_login, sizeof(entries[i].sc_login));
+ rs_read_short(sfd, &entries[i].sc_flags);
+ rs_read_short(sfd, &entries[i].sc_level);
+ rs_read_short(sfd, &entries[i].sc_ctype);
+ rs_read_short(sfd, &entries[i].sc_monster);
+ rs_read_short(sfd, &entries[i].sc_quest);
}
return(0);
@@ -3322,18 +3327,38 @@
return(killchar());
}
-long
-md_ntohl(netlong)
-long netlong;
+int md_endian = 0x01020304;
+
+unsigned long int
+md_ntohl(unsigned long int x)
{
- return( ntohl(netlong) );
+#ifdef _WIN32
+ if ( *((char *)&md_endian) == 0x01 )
+ return(x);
+ else
+ return( ((x & 0x000000ffU) << 24) |
+ ((x & 0x0000ff00U) << 8) |
+ ((x & 0x00ff0000U) >> 8) |
+ ((x & 0xff000000U) >> 24) );
+#else
+ return( ntohl(x) );
+#endif
}
-long
-md_htonl(netlong)
-long netlong;
+unsigned long int
+md_htonl(unsigned long int x)
{
- return(htonl(netlong));
+#ifdef _WIN32
+ if ( *((char *)&md_endian) == 0x01 )
+ return(x);
+ else
+ return( ((x & 0x000000ffU) << 24) |
+ ((x & 0x0000ff00U) << 8) |
+ ((x & 0x00ff0000U) >> 8) |
+ ((x & 0xff000000U) >> 24) );
+#else
+ return( htonl(x) );
+#endif
}
void
@@ -3467,3 +3492,24 @@
setgid(getgid());
#endif
}
+
+int
+md_fileno(FILE *fp)
+{
+#ifdef _WIN32
+ return( _fileno(fp) );
+#else
+ return( fileno(fp) );
+#endif
+}
+
+int
+md_unlink(char *file)
+{
+#ifdef _WIN32
+ chmod(file, 0600);
+ return( _unlink(file) );
+#else
+ return(unlink(file));
+#endif
+}
diff -r ca876944b196 -r 4438569c1b02 xrogue/xcrypt.c
--- a/xrogue/xcrypt.c Sat Aug 22 10:55:53 2015 -0400
+++ b/xrogue/xcrypt.c Fri Nov 27 08:59:24 2015 -0500
@@ -54,6 +54,9 @@
#define _PASSWORD_EFMT1 '_'
+unsigned long int md_htonl(unsigned long int x);
+unsigned long int md_ntohl(unsigned long int x);
+
static unsigned char IP[64] = {
58, 50, 42, 34, 26, 18, 10, 2, 60, 52, 44, 36, 28, 20, 12, 4,
62, 54, 46, 38, 30, 22, 14, 6, 64, 56, 48, 40, 32, 24, 16, 8,
diff -r ca876944b196 -r 4438569c1b02 xrogue/xrogue.sln
--- a/xrogue/xrogue.sln Sat Aug 22 10:55:53 2015 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 7.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrogue", "xrogue.vcproj", "{ABD49D61-EFA9-41BA-9EA1-8DE4B4FA4FF6}"
-EndProject
-Global
- GlobalSection(SolutionConfiguration) = preSolution
- ConfigName.0 = Debug
- ConfigName.1 = Release
- EndGlobalSection
- GlobalSection(ProjectDependencies) = postSolution
- EndGlobalSection
- GlobalSection(ProjectConfiguration) = postSolution
- {ABD49D61-EFA9-41BA-9EA1-8DE4B4FA4FF6}.Debug.ActiveCfg = Debug|Win32
- {ABD49D61-EFA9-41BA-9EA1-8DE4B4FA4FF6}.Debug.Build.0 = Debug|Win32
- {ABD49D61-EFA9-41BA-9EA1-8DE4B4FA4FF6}.Release.ActiveCfg = Release|Win32
- {ABD49D61-EFA9-41BA-9EA1-8DE4B4FA4FF6}.Release.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- EndGlobalSection
- GlobalSection(ExtensibilityAddIns) = postSolution
- EndGlobalSection
-EndGlobal
diff -r ca876944b196 -r 4438569c1b02 xrogue/xrogue.vcproj
--- a/xrogue/xrogue.vcproj Sat Aug 22 10:55:53 2015 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,278 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -r ca876944b196 -r 4438569c1b02 xrogue/xrogue.vcxproj
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/xrogue/xrogue.vcxproj Fri Nov 27 08:59:24 2015 -0500
@@ -0,0 +1,189 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ x64
+
+
+
+ {DE1CC319-96C4-40AA-A144-8F00B4C73CC9}
+ xrogue
+ 8.1
+
+
+
+ Application
+ true
+ v140
+ MultiByte
+
+
+ Application
+ false
+ v140
+ true
+ MultiByte
+
+
+ Application
+ true
+ v140
+ MultiByte
+
+
+ Application
+ false
+ v140
+ true
+ MultiByte
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Level3
+ Disabled
+ true
+ ..\pdcurses
+ _CRT_SECURE_NO_WARNINGS;SCOREFILE="xrogue.scr";SAVEDIR=".";%(PreprocessorDefinitions)
+
+
+ true
+ ..\pdcurses
+ pdcurses.lib;%(AdditionalDependencies)
+
+
+
+
+ Level3
+ Disabled
+ true
+ _CRT_SECURE_NO_WARNINGS;SCOREFILE="xrogue.scr";SAVEDIR=".";%(PreprocessorDefinitions)
+ ..\pdcurses
+
+
+ true
+ ..\pdcurses
+ pdcurses.lib;%(AdditionalDependencies)
+
+
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ true
+ _CRT_SECURE_NO_WARNINGS;SCOREFILE="xrogue.scr";SAVEDIR=".";%(PreprocessorDefinitions)
+ ..\pdcurses
+
+
+ true
+ true
+ true
+ ..\pdcurses
+ pdcurses.lib;%(AdditionalDependencies)
+
+
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ true
+ _CRT_SECURE_NO_WARNINGS;SCOREFILE="xrogue.scr";SAVEDIR=".";%(PreprocessorDefinitions)
+ ..\pdcurses
+
+
+ true
+ true
+ true
+ ..\pdcurses
+ pdcurses.lib;%(AdditionalDependencies)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff -r ca876944b196 -r 4438569c1b02 xrogue/xrogue.vcxproj.filters
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/xrogue/xrogue.vcxproj.filters Fri Nov 27 08:59:24 2015 -0500
@@ -0,0 +1,159 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+ {93995380-89BD-4b04-88EB-625FBE52EBFB}
+ h;hh;hpp;hxx;hm;inl;inc;xsd
+
+
+ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
+ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms
+
+
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+
\ No newline at end of file