shithub: rott

Download patch

ref: 9b9141523518038073c238204eb54225162046c5
parent: 63e5174993095a441ff6bf9f366ae65f3b79e7bd
author: levesqu8 <levesqu8@msu.edu>
date: Mon Oct 16 22:16:14 EDT 2017 

Revert "fixed multiple definitions error"

This reverts commit 0b3541b4a8125d2af135d7b33a60fc6dd96ee862.


--- a/rott/rt_cfg.c
+++ b/rott/rt_cfg.c
@@ -119,7 +119,7 @@
 boolean autoAimMissileWeps = 0;
 boolean autoAim = 1;
 boolean enableExtraPistolDrops = 0;
-boolean ricochetingRocketsEnabled;
+boolean ricochetingRocketsEnabled = 0;
 
 
 boolean joystickenabled  = 0;
@@ -1776,8 +1776,11 @@
     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