Changeset 232


Ignore:
Timestamp:
Apr 20, 2015, 7:21:24 PM (10 years ago)
Author:
alloc
Message:

Fixes

Location:
binary-improvements
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • binary-improvements/7dtd-server-fixes/src/API.cs

    r230 r232  
    1414               
    1515                public override void SavePlayerData (int _clientId, PlayerDataFile _playerDataFile) {
     16                        PlayerDataStuff.GM_SavePlayerData (_clientId, _playerDataFile);
    1617                }
    1718

  • binary-improvements/7dtd-server-fixes/src/AssemblyInfo.cs

    r230 r232  
    1818// and "{Major}.{Minor}.{Build}.*" will update just the revision.
    1919
    20 [assembly: AssemblyVersion("0.113.*")]
     20[assembly: AssemblyVersion("0.11.3.0")]
    2121
    2222// The following attributes are used to specify the signing key for the assembly,

  • binary-improvements/7dtd-server-fixes/src/PersistentData/Inventory.cs

    r224 r232  
    3333                                                int count = sourceFields [i].count;
    3434                                                int maxAllowed = ItemBase.list [sourceFields [i].itemValue.type].Stacknumber.Value;
    35                                                 string name = getInvFieldName (sourceFields [i]);
     35                                                string name = ItemBase.list [sourceFields [i].itemValue.type].GetItemName ();
    3636
    3737                                                if (count > maxAllowed)
    … …  
    4545                }
    4646
    47                 private string getInvFieldName (InventoryField item)
    48                 {
    49                         ItemBase iBase = ItemBase.list [item.itemValue.type];
    50                         return iBase.GetItemName ();
    51                 }
    52 
    5347
    5448        }

  • binary-improvements/7dtd-server-fixes/src/PlayerDataStuff.cs

    r230 r232  
    88        {
    99
    10                 public static void GM_SavePlayerData (GameManager manager, int _clientId, PlayerDataFile _playerDataFile)
     10                public static void GM_SavePlayerData (int _clientId, PlayerDataFile _playerDataFile)
    1111                {
    1212                        try {

  • binary-improvements/7dtd-server-fixes/src/StateManager.cs

    r230 r232  
    99                {
    1010                        try {
    11                                 Log.Out ("[7dtd-server-fixes by Alloc] Version: " + Assembly.GetExecutingAssembly ().GetName ().Version);
    12 
    1311                                ItemList.Instance.Init ();
    1412

  • binary-improvements/AllocsCommands/AssemblyInfo.cs

    r224 r232  
    1818// and "{Major}.{Minor}.{Build}.*" will update just the revision.
    1919
    20 [assembly: AssemblyVersion("1.0.*")]
     20[assembly: AssemblyVersion("0.0.0.0")]
    2121
    2222// The following attributes are used to specify the signing key for the assembly,

  • binary-improvements/MapRendering/AssemblyInfo.cs

    r224 r232  
    1818// and "{Major}.{Minor}.{Build}.*" will update just the revision.
    1919
    20 [assembly: AssemblyVersion("1.0.*")]
     20[assembly: AssemblyVersion("0.0.0.0")]
    2121
    2222// The following attributes are used to specify the signing key for the assembly,

  • binary-improvements/bundle_creation/makefile

    r230 r232  
    2626SERVERFIXES:
    2727        @echo Copying server fixes...
    28         @rm 7DaysToDie_Data -R
    29         @rm Mods -R
     28        @rm 7DaysToDie_Data -Rf
     29        @rm Mods -Rf
    3030        @mkdir -p 7DaysToDie_Data/Managed
    3131        @cp ../7dtd-binaries/Assembly-CSharp.dll 7DaysToDie_Data/Managed/Assembly-CSharp.dll

  • binary-improvements/server-fixes.userprefs

    r230 r232  
    11<Properties>
    22  <MonoDevelop.Ide.Workspace ActiveConfiguration="Release_Version" />
    3   <MonoDevelop.Ide.Workbench ActiveDocument="MapRendering/Web/Web.cs">
     3  <MonoDevelop.Ide.Workbench ActiveDocument="7dtd-server-fixes/src/PersistentData/Inventory.cs">
    44    <Files>
    5       <File FileName="MapRendering/MapRendering/MapRendering.cs" Line="34" Column="26" />
    6       <File FileName="MapRendering/ModInfo.xml" Line="4" Column="52" />
    7       <File FileName="MapRendering/API.cs" Line="18" Column="1" />
    8       <File FileName="MapRendering/Web/Web.cs" Line="63" Column="1" />
     5      <File FileName="MapRendering/Web/MimeType.cs" Line="28" Column="54" />
     6      <File FileName="7dtd-server-fixes/src/PersistentData/InvItem.cs" Line="11" Column="3" />
     7      <File FileName="7dtd-server-fixes/src/PersistentData/Inventory.cs" Line="36" Column="7" />
     8      <File FileName="7dtd-server-fixes/src/PersistentData/PersistentContainer.cs" Line="38" Column="52" />
     9      <File FileName="AllocsCommands/Commands/ShowInventory.cs" Line="27" Column="60" />
     10      <File FileName="7dtd-server-fixes/src/PersistentData/Players.cs" Line="56" Column="3" />
     11      <File FileName="7dtd-server-fixes/src/PlayerDataStuff.cs" Line="14" Column="68" />
    912    </Files>
    1013    <Pads>
Note: See TracChangeset for help on using the changeset viewer.