projects
/
super-star-trek.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix another basic error.
[super-star-trek.git]
/
src
/
sst.py
diff --git
a/src/sst.py
b/src/sst.py
index 47c50d9d8191cc5d0037c67ecb15ab12db2b1646..51ad07b53cdf03fa18d9e7a55bad2bddfbb6c357 100644
(file)
--- a/
src/sst.py
+++ b/
src/sst.py
@@
-240,7
+240,7
@@
class coord:
def is_valid(self):
return self.x != None and self.y != None
def __eq__(self, other):
def is_valid(self):
return self.x != None and self.y != None
def __eq__(self, other):
- return other != None and self.x == other.
y
and self.y == other.y
+ return other != None and self.x == other.
x
and self.y == other.y
def __add__(self, other):
return coord(self.x+other.x, self.y+other.y)
def __sub__(self, other):
def __add__(self, other):
return coord(self.x+other.x, self.y+other.y)
def __sub__(self, other):
@@
-1535,7
+1535,7
@@
def fry(hit):
def attack(torps_ok):
# bad guy attacks us
# torps_ok == False forces use of phasers in an attack
def attack(torps_ok):
# bad guy attacks us
# torps_ok == False forces use of phasers in an attack
- # game could be over at this point, check
+ # game could be over at this point, check
if game.alldone:
return
attempt = False; ihurt = False;
if game.alldone:
return
attempt = False; ihurt = False;