ref: 665cda618b74efce0373cc49bed530cba0feeb80
parent: 9b9141523518038073c238204eb54225162046c5
author: levesqu8 <[email protected]>
date: Mon Oct 16 22:17:02 EDT 2017
Revert "merging with master" This reverts commit e4c0fddc67ca4870502a4df0ff44bb95f3c92ad8, reversing changes made to e1de7bdf07eeb410f734b2de212885bf7de6699e.
--- a/rott/rt_cfg.c
+++ b/rott/rt_cfg.c
@@ -119,9 +119,7 @@
boolean autoAimMissileWeps = 0;
boolean autoAim = 1;
boolean enableExtraPistolDrops = 0;
-boolean ricochetingRocketsEnabled = 0;
-
boolean joystickenabled = 0;
boolean joypadenabled = 0;
int joystickport = 0;
@@ -405,7 +403,7 @@
unsigned int j;
char temp[3];
- memset(temp,0,sizeof(*temp));
+ memset(temp,0,sizeof(temp));
for (i=0; i<13; i++)
{@@ -1776,11 +1774,7 @@
SafeWriteString(file, "\n;\n");
SafeWriteString(file, "; 1 - Enemies equipped with pistols have a chance of dropping an extra pistol when killed.\n");
SafeWriteString(file, "; 0 - Enemies will not drop extra pistols at all. (Default)\n");
-<<<<<<< HEAD
WriteParameter(file, "EnableExtraPistolDrops ", enableExtraPistolDrops);
-=======
- WriteParameter(file, "EnableExtraPistolDrops ", enableExtraPistolDrops);
->>>>>>> master
// Write out MouseEnabled
@@ -2076,7 +2070,7 @@
// Writeout password Password string
SafeWriteString(file,"\n;\nSecretPassword ");
- memset(passwordtemp,0,sizeof(*passwordtemp));
+ memset(passwordtemp,0,sizeof(passwordtemp));
ConvertPasswordStringToString ( &passwordtemp[0] );
SafeWriteString(file,&passwordtemp[0]);
@@ -2101,7 +2095,7 @@
if (!stricmp (token, tokenstr))
{GetTokenEOL (false);
- memset (&info->path[0], 0, sizeof (*info->path));
+ memset (&info->path[0], 0, sizeof (info->path));
strcpy (&info->path[0], &name[0]);
}
}
@@ -2128,7 +2122,7 @@
{#if (SHAREWARE == 0)
info->avail = true;
- memset (&info->file[0], 0, sizeof (*info->file));
+ memset (&info->file[0], 0, sizeof (info->file));
strcpy (&info->file[0], &token[0]);
#else
printf("Alternate file %s ignored.\n",token);