Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
dyingIsMainstream
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
2
Issues
2
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gamejam-gpn15
dyingIsMainstream
Commits
ce991bfa
Commit
ce991bfa
authored
Jun 06, 2015
by
Philipp Adolf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix shields not being deleted on restart
parent
97c74495
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
ShieldScript.cs
Assets/Scripts/ShieldScript.cs
+3
-1
No files found.
Assets/Scripts/ShieldScript.cs
View file @
ce991bfa
...
@@ -12,6 +12,7 @@ public class ShieldScript : MonoBehaviour
...
@@ -12,6 +12,7 @@ public class ShieldScript : MonoBehaviour
// used to store the position while the trap is deactivated
// used to store the position while the trap is deactivated
private
Vector2
spawnPosition
;
private
Vector2
spawnPosition
;
private
Transform
spawnParent
;
public
float
relayDelay
=
0.25f
;
public
float
relayDelay
=
0.25f
;
private
bool
canRelay
=
true
;
private
bool
canRelay
=
true
;
...
@@ -21,6 +22,7 @@ public class ShieldScript : MonoBehaviour
...
@@ -21,6 +22,7 @@ public class ShieldScript : MonoBehaviour
void
Start
()
void
Start
()
{
{
spawnPosition
=
transform
.
position
;
spawnPosition
=
transform
.
position
;
spawnParent
=
transform
.
parent
;
pickupAudio
=
GetComponent
<
AudioSource
>();
pickupAudio
=
GetComponent
<
AudioSource
>();
}
}
...
@@ -53,7 +55,7 @@ public class ShieldScript : MonoBehaviour
...
@@ -53,7 +55,7 @@ public class ShieldScript : MonoBehaviour
CancelInvoke
(
"stopShielding"
);
CancelInvoke
(
"stopShielding"
);
if
(
parentHealth
!=
null
)
parentHealth
.
setShield
(
false
);
if
(
parentHealth
!=
null
)
parentHealth
.
setShield
(
false
);
parentHealth
=
null
;
parentHealth
=
null
;
transform
.
parent
=
null
;
transform
.
parent
=
spawnParent
;
transform
.
position
=
new
Vector2
(
100
,
100
);
transform
.
position
=
new
Vector2
(
100
,
100
);
Invoke
(
"Activate"
,
respawnTime
);
Invoke
(
"Activate"
,
respawnTime
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment