shithub: rott

Info  •  Files  •  Log  •  Branches

fixed multiple definitions error

--- 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 = 0;

+boolean ricochetingRocketsEnabled;

 boolean joystickenabled  = 0;

@@ -1776,11 +1776,8 @@

     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