mirror of
https://gitea.wildfiregames.com/0ad/0ad.git
synced 2026-07-19 12:37:15 +00:00
Integrated Player attributes with the status pane and manual, and created a really rough test map with different player civs.
This was SVN commit r1742.
This commit is contained in:
@@ -118,7 +118,7 @@
|
||||
Player Name (temporary):
|
||||
</object>
|
||||
|
||||
<object type="input" name="pregame_mp_ip_playername" sprite="only_black" absolute="false" size="220 80 350 100" textcolor="0 0 0">
|
||||
<object type="input" name="pregame_mp_ip_playername" sprite="only_black" absolute="false" size="220 80 350 100" textcolor="255 255 255">
|
||||
Player
|
||||
</object>
|
||||
<!-- END PLAYER NAME controls -->
|
||||
@@ -134,7 +134,7 @@
|
||||
Map Name:
|
||||
</object>
|
||||
|
||||
<object type="input" name="pregame_mp_ip_host_mapname" sprite="only_black" absolute="false" size="50 150 200 170" textcolor="0 0 0">
|
||||
<object type="input" name="pregame_mp_ip_host_mapname" sprite="only_black" absolute="false" size="50 150 200 170" textcolor="255 255 255">
|
||||
test01.pmp
|
||||
</object>
|
||||
|
||||
@@ -160,7 +160,7 @@
|
||||
IP address:
|
||||
</object>
|
||||
|
||||
<object type="input" name="pregame_mp_ip_joinip" sprite="only_black" absolute="false" size="50 210 200 230" textcolor="0 0 0">
|
||||
<object type="input" name="pregame_mp_ip_joinip" sprite="only_black" absolute="false" size="50 210 200 230" textcolor="255 255 255">
|
||||
127.0.0.1
|
||||
</object>
|
||||
|
||||
|
||||
@@ -44,6 +44,20 @@ function manualDisplay()
|
||||
ManualRollover.caption += "Civilisation: " + selection[0].traits.id.civ + " (" + selection[0].traits.id.civ_code + ")" + "\n";
|
||||
if (!selection[0].traits.id.civ_code)
|
||||
ManualRollover.caption += "Civilisation: " + selection[0].traits.id.civ + "\n";
|
||||
|
||||
// Display player info.
|
||||
if (selection[0].player){
|
||||
if (selection[0].player.name)
|
||||
ManualRollover.caption += "Player Name: " + selection[0].player.name + "\n";
|
||||
if (selection[0].player.id)
|
||||
ManualRollover.caption += "Player ID: " + selection[0].player.id + "\n";
|
||||
if (selection[0].player.colour)
|
||||
ManualRollover.caption += "Player Colour: " + selection[0].player.colour + "\n";
|
||||
if (selection[0].player.controlled)
|
||||
ManualRollover.caption += "Player Controlled: " + selection[0].player.controlled + "\n";
|
||||
// if (players[])
|
||||
// ManualRollover.caption += "Players[]: " + players[] + "\n";
|
||||
}
|
||||
|
||||
// Display hitpoints.
|
||||
if (selection[0].traits.health.curr && selection[0].traits.health.max && selection[0].traits.health)
|
||||
|
||||
@@ -700,7 +700,7 @@ function UpdateStatusOrb()
|
||||
{
|
||||
// Update heading.
|
||||
GUIObject = getGUIObjectByName("session_panel_status_heading");
|
||||
GUIObject.caption = "Acumen"; // Player name (placeholder; replace with proper callsign).
|
||||
GUIObject.caption = selection[0].player.name; // Player name (placeholder; replace with proper callsign).
|
||||
if (selection[0].traits.id.civ)
|
||||
GUIObject.caption += " [icon=bullet_icon] " + selection[0].traits.id.civ;
|
||||
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user