marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use only SetCursor for Clonk selection

stable-5.1
Günther Brammer 2010-07-30 22:00:28 +02:00
parent e0db866aee
commit 51e064398a
11 changed files with 12 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
planet/Objects.c4d/Goals.c4d/LastManStanding.c4d/Script.c
View File

@ -81,7 +81,6 @@ protected func RelaunchPlayer(int plr, int killer)
var clonk = CreateObject(Clonk, 0, 0, plr);
clonk->MakeCrewMember(plr);
SetCursor(plr, clonk);
SelectCrew(plr, clonk, true);
JoinPlayer(plr);
// Scenario script callback.
GameCall("OnPlrRelaunch", plr);

1
planet/Objects.c4d/Goals.c4d/Parkour.c4d/Script.c
View File

@ -284,7 +284,6 @@ protected func RelaunchPlayer(int plr)
var clonk = CreateObject(Clonk, 0, 0, plr);
clonk->MakeCrewMember(plr);
SetCursor(plr, clonk);
SelectCrew(plr, clonk, true);
JoinPlayer(plr);
// Scenario script callback.
GameCall("PlrHasRespawned", plr, respawn_list[plr]);

5
planet/Objects.c4d/HUD.c4d/Elements.c4d/CrewSelector.c4d/Script.c
View File

@ -81,8 +81,7 @@ public func MouseSelection(int plr)
StopSelected();
// set cursor if not disabled etc.
UnselectCrew(plr);
return SelectCrew(plr,crew, true);
return SetCursor(plr, crew);
}
public func SetCrew(object c)
@ -149,7 +148,7 @@ public func UpdateSelectionStatus()
if(!crew) return;
if(!hotkey) return;
if(crew->GetCrewSelected())
if(crew == GetCursor(crew->GetOwner()))
{
SetObjDrawTransform(1200,0,0,0,1200,0, 1);
}

25
planet/System.c4g/PlayerControl.c
View File

@ -155,26 +155,14 @@ global func Control2Player(int plr, int ctrl, int x, int y, int strength, bool r
StopSelected();
// set cursor if not disabled etc.
UnselectCrew(plr);
return SelectCrew(plr,crew, true);
return SetCursor(plr, crew);
}
// select the complete crew
if (ctrl == CON_AllCrew)
{
for(var i = 0; i < GetCrewCount(plr); ++i)
{
var crew = GetCrew(plr,i);
SelectCrew(plr,crew, true);
}
StopSelected(plr);
}
// cursor pos info - store in player values
if (ctrl == CON_CursorPos)
{
if (!g_player_cursor_pos) g_player_cursor_pos = CreateArray(plr+1);
g_player_cursor_pos[plr] = [x, y];
return true;
}
/*
@ -196,8 +184,8 @@ global func GetPlayerCursorPos(int plr)
global func StopSelected(int plr)
{
var cursor;
for(var i = 0; cursor = GetCursor(plr,i); ++i)
var cursor = GetCursor(plr);
if(cursor)
{
cursor->SetCommand("None");
cursor->SetComDir(COMD_Stop);
@ -415,8 +403,7 @@ global func ShiftCursor(int plr, bool back)
StopSelected();
UnselectCrew(plr);
return SelectCrew(plr, GetCrew(plr,index), true);
return SetCursor(plr, GetCrew(plr,index));
}
// Temporarily used for Debugging!
@ -455,9 +442,9 @@ global func ComDir2XY(int comd, &x, &y)
// Give a command to all selected Clonks of a player
global func PlayerObjectCommand(int plr, bool exclude_cursor, string command, object target, int tx, int ty, object target2)
{
for (var i=exclude_cursor; i<GetSelectCount(plr); ++i)
if (!exclude_cursor)
{
var follow_clonk = GetCursor(plr, i);
var follow_clonk = GetCursor(plr);
if (follow_clonk)
{
follow_clonk->ObjectCommand(command,target,tx,ty,target2);

7
planet/System.c4g/PlayerControls.txt
View File

@ -20,7 +20,7 @@
#
# Enter Exit
#
# NextCrew PreviousCrew AllCrew
# NextCrew PreviousCrew
#
# MenuCancel MenuOK MenuDown MenuUp MenuLeft MenuRight MenuSelect
# ObjectMenuCancel ObjectMenuOK ObjectMenuSelect ObjectMenuSelectAll
@ -308,11 +308,6 @@
Identifier=PreviousCrew
GUIName=Previous crew member
GUIDesc=Control previous crew member
[ControlDef]
Identifier=AllCrew
GUIName=All the crew
GUIDesc=Control all crew member at the same time
[ControlDef]
Identifier=PlayerHotkey1

1
planet/Tests.c4f/Clonk50.c4s/Script.c
View File

@ -11,7 +11,6 @@
var clonk = CreateObject(Clonk, 0, 0, iPlr);
clonk->MakeCrewMember(iPlr);
SetCursor(iPlr,clonk);
SelectCrew(iPlr, clonk, true);
JoinPlayer(iPlr);
return;
}

1
planet/Tests.c4f/Lines.c4s/Script.c
View File

@ -18,7 +18,6 @@ func Initialize()
var clonk = CreateObject(Clonk, 0, 0, iPlr);
clonk->MakeCrewMember(iPlr);
SetCursor(iPlr,clonk);
SelectCrew(iPlr, clonk, true);
JoinPlayer(iPlr);
return;
}

1
planet/Tests.c4f/Windmill.c4s/Script.c
View File

@ -115,7 +115,6 @@ func RelaunchPlayer(int plr)
var clonk = CreateObject(Clonk, LandscapeWidth()/2, 600, plr);
clonk->MakeCrewMember(plr);
SetCursor(plr, clonk);
SelectCrew(plr, clonk, true);
JoinPlayer(plr);
var gui_arrow = FindObject(Find_ID(GUI_GoalArrow), Find_Owner(plr));
gui_arrow->SetAction("Show", GetCursor(plr));

1
planet/Tutorial.c4f/Tutorial.c4d/TutorialGoal.c4d/Script.c
View File

@ -134,7 +134,6 @@ func RelaunchPlayer(int plr)
var clonk = CreateObject(Clonk, 0, 0, plr);
clonk->MakeCrewMember(plr);
SetCursor(plr, clonk);
SelectCrew(plr, clonk, true);
JoinPlayer(plr);
// Log message.
Log(RndRespawnMsg(), GetPlayerName(plr));

11
planet/Tutorial.c4f/Tutorial02.c4s/Script.c
View File

@ -141,8 +141,7 @@ protected func InitializePlayer(int plr)
EffectVar(0, shovel, effect) = clonk;
// Select first clonk
UnselectCrew(plr);
SelectCrew(plr, GetCrew(plr, 0), true);
SetCursor(plr, GetCrew(plr));
// Create tutorial guide, add messages, show first.
guide = CreateTutorialGuide(plr);
@ -226,9 +225,7 @@ global func FxClonkOneRestoreStop(object target, int num, int reason, bool temp
var plr = target->GetOwner();
var clonk = CreateObject(Clonk, 0, 0, plr);
clonk->GrabObjectInfo(target);
SetCursor(plr, target);
UnselectCrew(plr);
SelectCrew(plr, clonk, true);
SetCursor(plr, clonk);
clonk->DoEnergy(100000);
// Transfer contents(grapple bow and shovel).
for (var transfer in FindObjects(Find_Container(target), Find_Or(Find_ID(Shovel), Find_ID(GrappleBow))))
@ -287,9 +284,7 @@ global func FxClonkTwoRestoreStop(object target, int num, int reason, bool temp
var plr = target->GetOwner();
var clonk = CreateObject(Clonk, 0, 0, plr);
clonk->GrabObjectInfo(target);
SetCursor(plr, target);
UnselectCrew(plr);
SelectCrew(plr, clonk, true);
SetCursor(plr, clonk);
clonk->DoEnergy(100000);
// Transfer contents(grapple bow and shovel).
for (var transfer in FindObjects(Find_Container(target), Find_Or(Find_ID(Shovel), Find_ID(GrappleBow))))

1
planet/Tutorial.c4f/Tutorial03.c4s/Script.c
View File

@ -195,7 +195,6 @@ func InitializePlayer(int iPlr, int iX, int iY, object pBase, int iTeam)
var clonk = CreateObject(Clonk, 0, 0, iPlr);
clonk->MakeCrewMember(iPlr);
SetCursor(iPlr,clonk);
SelectCrew(iPlr, clonk, true);
JoinPlayer(iPlr);
return;
}