1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

****************************************************************************

Browse Source 
** Merged Source Code from Development trunk, for the Spring 2011 Release **
****************************************************************************
o Development Trunk (Revision: 4444):  https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP
o This trunk (the official 1.13 source trunk) will only be used for fixing bugs. No new features will be added here.
  New Features are only included in the Development trunk
o !!! After we have fixed a bug here in this trunk, we should MANUALLY merge the bugfix in the development trunk !!!

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4446 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2011-05-26 11:04:47 +00:00
parent c999420bb7
commit 6e2bdd557c
191 changed files with 17816 additions and 6106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Multiplayer/server.cpp
+14 -12
View File
@@ -676,26 +676,28 @@ void requestSETTINGS(RPCParameters *rpcParameters )
lan.damageMultiplier = gDamageMultiplier;
lan.sameMercAllowed = gSameMercAllowed;
lan.gsMercArriveSectorX=gsMercArriveSectorX;
lan.gsMercArriveSectorY=gsMercArriveSectorY;
lan.gsMercArriveSectorX = gsMercArriveSectorX;
lan.gsMercArriveSectorY = gsMercArriveSectorY;
lan.enemyEnabled = gEnemyEnabled;
lan.creatureEnabled = gCreatureEnabled;
lan.militiaEnabled = gMilitiaEnabled;
lan.civEnabled = gCivEnabled;
lan.gameType=gGameType;
lan.gameType = gGameType;
lan.disableMorale=gDisableMorale;
lan.reportHiredMerc=gReportHiredMerc;
lan.disableMorale = gDisableMorale;
lan.reportHiredMerc = gReportHiredMerc;
lan.secondsPerTick = gSecondsPerTick;
lan.soubBobbyRay=gGameOptions.ubBobbyRay;
lan.sofGunNut=gGameOptions.fGunNut;
lan.soubGameStyle=gGameOptions.ubGameStyle;
lan.soubDifficultyLevel=gDifficultyLevel;
lan.soubSkillTraits=gSkillTraits;
lan.sofTurnTimeLimit=gGameOptions.fTurnTimeLimit;
lan.sofIronManMode=gGameOptions.fIronManMode;
// WANNE.MP: Check
lan.soubBobbyRay = BR_AWESOME;
lan.sofGunNut = TRUE;
lan.soubGameStyle = STYLE_REALISTIC;
lan.soubDifficultyLevel = gDifficultyLevel;
lan.soubSkillTraits = gSkillTraits;
lan.sofTurnTimeLimit = TRUE;
lan.sofIronManMode = FALSE;
lan.startingCash = gStartingCash;
// Old/Old