Skip to content

Commit

Permalink
Revert "MP houses are named and allowed to house TechnoTypes owned by…
Browse files Browse the repository at this point in the history
… them on the map (Phobos-developers#1134)"

This reverts commit 2a1d2f0.

Reverted as it does not work as advertised. Should be implemented in the spawner, instead.
  • Loading branch information
ZivDero committed Nov 2, 2024
1 parent 804eadb commit db0385b
Show file tree
Hide file tree
Showing 7 changed files with 0 additions and 51 deletions.
1 change: 0 additions & 1 deletion CREDITS.md
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,6 @@ This page lists all the individual contributions to the project by their author.
- Flashing Technos on selecting
- Promotion animation
- **ZivDero**
- Allow giving ownership of buildings to players in Skirmish and MP using <Player @ A-H>
- Re-enable the Veinhole Monster and Weeds from TS
- Recreate the weed-charging of SWs like the TS Chemical Missile
- Allow to change the speed of gas particles
Expand Down
1 change: 0 additions & 1 deletion Phobos.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
<ClCompile Include="src\Ext\Trigger\Hooks.cpp" />
<ClCompile Include="src\Ext\Unit\Hooks.Crushing.cpp" />
<ClCompile Include="src\Locomotion\TestLocomotionClass.cpp" />
<ClCompile Include="src\Misc\Hooks.AssignHouses.cpp" />
<ClCompile Include="src\Misc\Hooks.Gamespeed.cpp" />
<ClCompile Include="src\Misc\Hooks.Ares.cpp" />
<ClCompile Include="src\Misc\Hooks.Crates.cpp" />
Expand Down
1 change: 0 additions & 1 deletion docs/Fixed-or-Improved-Logics.md
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ This page describes all ingame logics that are fixed or improved in Phobos witho
- Fixed `DeployToFire` not considering building placement rules for `DeploysInto` buildings and as a result not working properly with `WaterBound` buildings.
- Fixed `DeployToFire` not recalculating firer's position on land if it cannot currently deploy.
- `Arcing=true` projectile elevation inaccuracy can now be fixed by setting `Arcing.AllowElevationInaccuracy=false`.
- You can now specify houses named `<Player @ A>` through `<Player @ H>` as the owner of TechnoTypes preplaced on the map in the editor, and they will be correctly given to players starting on points 1-8. Originally, it was only possible to use these house names in events, actions and teams.
- Wall overlays are now drawn with the custom palette defined in `Palette` in `artmd.ini` if possible.
- `Secondary` will now be used against walls if `Primary` weapon Warhead has `Wall=false`, `Secondary` has `Wall=true` and the firer does not have `NoSecondaryWeaponFallback` set to true.
- Setting `ReloadInTransport` to true on units with `Ammo` will allow the ammo to be reloaded according to `Reload` or `EmptyReload` timers even while the unit is inside a transport.
Expand Down
1 change: 0 additions & 1 deletion docs/Whats-New.md
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,6 @@ New:
- Unhardcoded timer blinking color scheme (by Starkku)
- Customizing shield self-healing timer restart when shield is damaged (by Starkku)
- Customizing minimum & maximum amount of damage shield can take from a single hit (by Starkku)
- Players can now be given ownership of preplaced buildings in Skirmish and Multiplayer in maps using houses of the format <Player @ X> where X goes from A to H for spawn positions 1-8 (by ZivDero)
- `AutoDeath.Technos(Dont)Exist` can optionally track limboed (not physically on map, e.g transports etc) technos (by Starkku)
- Wall overlay `Palette` support (by Starkku)
- Show designator & inhibitor range (by Morton)
Expand Down
22 changes: 0 additions & 22 deletions src/Ext/House/Body.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -361,28 +361,6 @@ void HouseExt::GetAIChronoshiftSupers(HouseClass* pThis, SuperClass*& pSuperCSph
}
}

// Gives player houses names based on their spawning spot
void HouseExt::SetSkirmishHouseName(HouseClass* pHouse)
{
int spawn_position = pHouse->GetSpawnPosition();

// Default behaviour if something went wrong
if (spawn_position < 0 || spawn_position > 7)
{
if (pHouse->IsHumanPlayer)
sprintf(pHouse->PlainName, "<human player>");
else
sprintf(pHouse->PlainName, "Computer");
}
else
{
const char letters[9] = "ABCDEFGH";
sprintf(pHouse->PlainName, "<Player @ %c>", letters[spawn_position]);
}

Debug::Log("%s, %ls, position %d\n", pHouse->PlainName, pHouse->UIName, spawn_position);
}

// Ares
HouseClass* HouseExt::GetHouseKind(OwnerHouseKind const kind, bool const allowRandom, HouseClass* const pDefault, HouseClass* const pInvoker, HouseClass* const pVictim)
{
Expand Down
1 change: 0 additions & 1 deletion src/Ext/House/Body.h
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,6 @@ class HouseExt
static HouseClass* GetHouseKind(OwnerHouseKind kind, bool allowRandom, HouseClass* pDefault, HouseClass* pInvoker = nullptr, HouseClass* pVictim = nullptr);
static CellClass* GetEnemyBaseGatherCell(HouseClass* pTargetHouse, HouseClass* pCurrentHouse, CoordStruct defaultCurrentCoords, SpeedType speedTypeZone, int extraDistance = 0);
static void GetAIChronoshiftSupers(HouseClass* pThis, SuperClass*& pSuperCSphere, SuperClass*& pSuperCWarp);
static void SetSkirmishHouseName(HouseClass* pHouse);

static bool IsDisabledFromShell(
HouseClass const* pHouse, BuildingTypeClass const* pItem);
Expand Down
24 changes: 0 additions & 24 deletions src/Misc/Hooks.AssignHouses.cpp

This file was deleted.

0 comments on commit db0385b

Please sign in to comment.